Changeset 94

Timestamp:

Aug 7, 2006, 6:34:19 PM (19 years ago)

Author:

Eugene Romanenko

Message:

font substitution fixes, fixed missed 'Page' in NLS-file

Location:

trunk

Files:

• Lucide/BIN/Lucide.lng (modified) (1 diff)
• Lucide/SOURCE/gui/indexWindow.cpp (modified) (5 diffs)
• Lucide/SOURCE/gui/messages.cpp (modified) (1 diff)
• Lucide/SOURCE/gui/messages.h (modified) (1 diff)
• Lucide/SOURCE/plugins/lujpeg/lujpeg.cpp (modified) (8 diffs)
• Lucide/SOURCE/plugins/lujpeg/lujpeg.idl (modified) (1 diff)
• Lucide/SOURCE/plugins/lujpeg/lujpeg.xh (modified) (6 diffs)
• Lucide/SOURCE/plugins/lupoppler/lupoppler.xh (modified) (3 diffs)
• poppler/fc-emulate-os2/fontconfig/fontconfig.cpp (modified) (5 diffs)

trunk/Lucide/BIN/Lucide.lng ¶

@@ -69 +69 @@
 MSGS_OVERWRITE_FILE=File already exist. Overwrite?
 MSGS_FILE_SAVE_ERROR=Error saving file!
+MSGS_PAGE=Page
 
 #

trunk/Lucide/SOURCE/gui/indexWindow.cpp ¶

@@ -43 +43 @@
 #include "luutils.h"
 #include "tb_spl.h"
+#include "messages.h"
 
 
@@ -167 +168 @@
 void IndexWindow::loadPagesList()
 {
+    char *msgpage = newstrdupL( MSGS_PAGE );
     CNRINFO ci;
     ci.cb = sizeof( CNRINFO );
@@ -174 +176 @@
     WinSendMsg( hWndIndex, CM_SETCNRINFO, MPFROMP( &ci ), MPFROMLONG( CMA_FLWINDOWATTR ) );
 
-    char pgbuf[ 20 ];
+    char pgbuf[ 64 ];
     for ( int i = 0; i < totalpages; i++ )
     {
-        snprintf( pgbuf, sizeof(pgbuf), "Page %d", i + 1 );
+        snprintf( pgbuf, sizeof(pgbuf), "%s %d", msgpage, i + 1 );
         RECORDINSERT ri;
         TreeRecord *pr = (TreeRecord *)WinSendMsg( hWndIndex, CM_ALLOCRECORD,
@@ -198 +200 @@
         WinSendMsg( hWndIndex, CM_INSERTRECORD, MPFROMP( pr ), MPFROMP( &ri ) );
     }
+    delete msgpage;
 }
 
@@ -225 +228 @@
         return true;
     }
-        
+
     SHORT atr = ( parent == NULL ) ? CMA_FIRST : CMA_FIRSTCHILD;
     TreeRecord *pr = (TreeRecord *)WinSendMsg( hWndIndex, CM_QUERYRECORD,

trunk/Lucide/SOURCE/gui/messages.cpp ¶

@@ -61 +61 @@
 const char *MSGS_OVERWRITE_FILE   = "MSGS_OVERWRITE_FILE";
 const char *MSGS_FILE_SAVE_ERROR  = "MSGS_FILE_SAVE_ERROR";
+const char *MSGS_PAGE             = "MSGS_PAGE";
 
 // Settings dialog

trunk/Lucide/SOURCE/gui/messages.h ¶

@@ -61 +61 @@
 extern const char *MSGS_OVERWRITE_FILE;
 extern const char *MSGS_FILE_SAVE_ERROR;
+extern const char *MSGS_PAGE;
 
 // Settings dialog

trunk/Lucide/SOURCE/plugins/lujpeg/lujpeg.cpp ¶

@@ +1 @@
+
+/*
+ *  This file was generated by the SOM Compiler.
+ *  Generated using:
+ *     SOM incremental update: 2.24
+ */
+
+
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: CDDL 1.0/LGPL 2.1
@@ -35 +43 @@
 
 /*
- *  This file was generated by the SOM Compiler.
- *  Generated using:
- *     SOM incremental update: 2.24
- */
-
-/*
  *  This file was generated by the SOM Compiler and Emitter Framework.
  *  Generated using template emitter:
@@ -58 +60 @@
 #include <string.h>
 #include <jpeglib.h>
+
 
 
@@ -154 +157 @@
 }
 
+
 SOM_Scope short  SOMLINK getBpp(LuJpegDocument *somSelf,  Environment *ev)
 {
     return 3;
 }
+
 
 SOM_Scope long  SOMLINK getPageCount(LuJpegDocument *somSelf,
@@ -164 +169 @@
     return 1;
 }
+
 
 SOM_Scope void  SOMLINK getPageSize(LuJpegDocument *somSelf,
@@ -179 +185 @@
     }
 }
+
 
 SOM_Scope void  SOMLINK renderPageToPixbuf(LuJpegDocument *somSelf,
@@ -207 +214 @@
         memcpy( dst, src, src_width * bpp );
     }
-    //long len = __min( pixbuf->getDataLen(ev), d->pb->getDataLen(ev) );
-    //memcpy( pixbuf->getDataPtr(ev), d->pb->getDataPtr(ev), len );
-}
+}
+
 
 SOM_Scope void SOMLINK somDefaultInit(LuJpegDocument *somSelf,
@@ -238 +244 @@
     JpegDocument *d = (JpegDocument *)somThis->data;
     if ( d->pb != NULL ) {
-            delete d->pb;
-        }
+        delete d->pb;
+    }
     delete d;
     // end of local LuJpegDocument deinitialization code

trunk/Lucide/SOURCE/plugins/lujpeg/lujpeg.idl ¶

@@ -21 +21 @@
     implementation 
     {
-
             void *data;
         

trunk/Lucide/SOURCE/plugins/lujpeg/lujpeg.xh ¶

@@ -48 +48 @@
 
 /* The API to the LuJpegDocument class object, and the methods it introduces. */
-SOMEXTERN struct LuJpegDocumentClassDataStructure {
+SOMEXTERNS struct LuJpegDocumentClassDataStructure {
         SOMClass *classObject;
 } SOMDLINK LuJpegDocumentClassData;
@@ -54 +54 @@
 
 /* The API to parentMtabs for LuJpegDocument, and the instance data it introduces. */
-SOMEXTERN struct LuJpegDocumentCClassDataStructure {
+SOMEXTERNS struct LuJpegDocumentCClassDataStructure {
         somMethodTabs parentMtab;
         somDToken              instanceDataToken;
@@ -151 +151 @@
 typedef boolean   SOMLINK somTP_LuJpegDocument_isPostScriptExportable(LuJpegDocument *somSelf, Environment *ev);
 typedef somTP_LuJpegDocument_isPostScriptExportable *somTD_LuJpegDocument_isPostScriptExportable;
-typedef void   SOMLINK somTP_LuJpegDocument_exportToPostScript(LuJpegDocument *somSelf, Environment *ev, 
+typedef boolean   SOMLINK somTP_LuJpegDocument_exportToPostScript(LuJpegDocument *somSelf, Environment *ev, 
                 string filename, 
                 long first_page, 
@@ -157 +157 @@
                 double width, 
                 double height, 
-                boolean duplex);
+                boolean duplex, 
+                boolean* brkExport);
 typedef somTP_LuJpegDocument_exportToPostScript *somTD_LuJpegDocument_exportToPostScript;
 typedef boolean   SOMLINK somTP_LuJpegDocument_isHaveFontInfo(LuJpegDocument *somSelf, Environment *ev);
@@ -587 +588 @@
 
 /* method: exportToPostScript */
-void   exportToPostScript(Environment *ev, 
+boolean   exportToPostScript(Environment *ev, 
                 string filename, 
                 long first_page, 
@@ -593 +594 @@
                 double width, 
                 double height, 
-                boolean duplex)
-{
-   SOM_ResolveD(this,LuJpegDocument,LuDocument,exportToPostScript)
-        (this, ev,filename,first_page,last_page,width,height,duplex);
+                boolean duplex, 
+                boolean* brkExport)
+{
+   return SOM_ResolveD(this,LuJpegDocument,LuDocument,exportToPostScript)
+        (this, ev,filename,first_page,last_page,width,height,duplex,brkExport);
 }
 

trunk/Lucide/SOURCE/plugins/lupoppler/lupoppler.xh ¶

@@ -48 +48 @@
 
 /* The API to the LuPopplerDocument class object, and the methods it introduces. */
-SOMEXTERN struct LuPopplerDocumentClassDataStructure {
+SOMEXTERNS struct LuPopplerDocumentClassDataStructure {
         SOMClass *classObject;
 } SOMDLINK LuPopplerDocumentClassData;
@@ -54 +54 @@
 
 /* The API to parentMtabs for LuPopplerDocument, and the instance data it introduces. */
-SOMEXTERN struct LuPopplerDocumentCClassDataStructure {
+SOMEXTERNS struct LuPopplerDocumentCClassDataStructure {
         somMethodTabs parentMtab;
         somDToken              instanceDataToken;
@@ -62 +62 @@
  * -- Typedefs for LuPopplerDocument Method Procedures
  */
-SOMEXTERNF {
+SOMEXTERN {
 
 /*

trunk/poppler/fc-emulate-os2/fontconfig/fontconfig.cpp ¶

@@ -424 +424 @@
 #define DEFAULT_MONOSPACED_FONT     "courier"
 
+static bool isSansserif( const char *family )
+{
+    return ( ( strstr( family, "swiss" ) != NULL ) ||
+             ( strstr( family, "sans" ) != NULL ) ||
+             ( strcmp( family, "arial" ) == 0 ) ||
+             ( strcmp( family, "tahoma" ) == 0 ) ||
+             ( strcmp( family, "verdana" ) == 0 ) );
+}
+
 static string buildFontKey( FcPattern *p, bool useDefaultFonts )
 {
@@ -435 +444 @@
         else
         {
-            if ( ( strstr( p->family, "swiss" ) != NULL ) ||
-                 ( strstr( p->family, "sans" ) != NULL ) )
-            {
+            if ( isSansserif( p->family ) ) {
                 key = DEFAULT_SANSSERIF_FONT;
             }
@@ -443 +450 @@
                 key = DEFAULT_SERIF_FONT;
             }
+        }
+    }
+    else
+    {
+        // use 'Symbol Set' (SYMB.PFB) instead of 'Symbol'
+        if ( strcmp( p->family, "symbol" ) == 0 ) {
+            key = "symbol set";
         }
     }
@@ -481 +495 @@
     }
 
-    //printf( "MATCHED STYLE: %s, FILENAME: %s\n", key.c_str(), pat->filename );
+//printf( "MATCHED STYLE: %s, FILENAME: %s\n", key.c_str(), pat->filename );
 
     FcFontSet *fs = new FcFontSet;
@@ -526 +540 @@
                     const char *fcLang, FcType tLang, const char *lang, void * )
 {
-    //printf( "FAMILY: %s, SLANT: %d, WEIGHT: %d, WIDTH: %d, SPACING: %d, LANG: %s\n",
-    //        family, slant, weight, width, spacing, lang );
+//printf( "FAMILY: %s, SLANT: %d, WEIGHT: %d, WIDTH: %d, SPACING: %d, LANG: %s\n",
+//            family, slant, weight, width, spacing, lang );
 
     FcPattern *p = new FcPattern;