Changeset 477 for trunk


Ignore:
Timestamp:
Mar 25, 2011, 4:47:54 PM (10 years ago)
Author:
Silvan Scherrer
Message:

japanese font hack fixes ticket:226

Location:
trunk/poppler
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/poppler/fc-emulate-os2/fontconfig/fontconfig.cpp

    r476 r477  
    448448//
    449449#define DEFAULT_SERIF_FONT          "times new roman"
     450#define DEFAULT_SERIF_FONTJA       "times new roman wt j"
    450451#define DEFAULT_SANSSERIF_FONT      "helvetica"
    451452#define DEFAULT_MONOSPACED_FONT     "courier"
     
    490491    if ( fontmap->find( key ) == fontmap->end() ) {
    491492        // not found: try substitutions
     493        if (!stricmp(p->lang, "ja"))
     494        {
     495            key = DEFAULT_SERIF_FONTJA;
     496        } else {
     497
    492498        if ( p->spacing == FC_MONO ) {
    493499            key = DEFAULT_MONOSPACED_FONT;
     
    508514                        key = DEFAULT_SYMBOL_FONT;
    509515                } else {
    510                     key = DEFAULT_SERIF_FONT;
     516                        key = DEFAULT_SERIF_FONT;
    511517                }
    512518            }
    513519        }
    514 
     520       }
    515521    }
    516522
     
    550556    pat->filename = newstrdup( (*fontmap)[ key ].c_str() );
    551557
    552 //    printf( "fontfamily: %s --> MATCHED STYLE: %s, FILENAME: %s\n", pat->family, key.c_str(), pat->filename );
    553 //    printf("SLANT: %d, WEIGHT:%d, WIDTH:%d, SPACING:%d\n", pat->slant, pat->weight, pat->width, pat->spacing);
     558    printf( "fontfamily: %s --> MATCHED STYLE: %s, FILENAME: %s\n", pat->family, key.c_str(), pat->filename );
     559    printf("SLANT: %d, WEIGHT:%d, WIDTH:%d, SPACING:%d, LANG:%s\n", pat->slant, pat->weight, pat->width, pat->spacing, pat->lang);
    554560
    555561    FcFontSet *fs = new FcFontSet;
     
    595601                    const char *fcLang, FcType tLang, const char *lang, void * )
    596602{
    597     //printf( "FAMILY: %s, LANG: %s\n", family, lang );
     603//    printf( "FAMILY: %s, LANG: %s\n", family, lang );
    598604
    599605    FcPattern *p = new FcPattern;
  • trunk/poppler/mypoppler/config.h

    r470 r477  
    163163
    164164/* Poppler data dir */
    165 #define POPPLER_DATADIR "/usr/local/share/poppler"
     165#define POPPLER_DATADIR "/@unixroot/usr/local/share/poppler"
    166166
    167167/* Support for curl based doc builder is compiled in. */
Note: See TracChangeset for help on using the changeset viewer.