Changeset 473 for trunk


Ignore:
Timestamp:
Mar 10, 2011, 3:07:32 PM (10 years ago)
Author:
Silvan Scherrer
Message:

adjusted own fc to behave more standard

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Lucide/changelog

    r471 r473  
    77  - updated freetype to 2.4.4
    88  - updated jpeg to 8b
     9  - WPI: installing the right readme, if translated
    910
    1011
  • trunk/poppler/fc-emulate-os2/fontconfig/fontconfig.cpp

    r471 r473  
    592592FcPattern *FcPatternBuild( void *,
    593593                    const char *fcFamily, FcType tFamily, const char *family,
    594                     const char *fcSlant, FcType tSlant, int slant,
    595                     const char *fcWeight, FcType tWeight, int weight,
    596                     const char *fcWidth, FcType tWidth, int width,
    597                     const char *fcSpacing, FcType tSpacing, int spacing,
    598594                    const char *fcLang, FcType tLang, const char *lang, void * )
    599595{
    600         //printf( "FAMILY: %s, SLANT: %d, WEIGHT: %d, WIDTH: %d, SPACING: %d, LANG: %s\n",
    601     //        family, slant, weight, width, spacing, lang );
     596    //printf( "FAMILY: %s, LANG: %s\n", family, lang );
    602597
    603598    FcPattern *p = new FcPattern;
    604599    p->family   = newstrdup( family );
    605600    strlwr( p->family );
    606     p->slant    = slant;
    607     p->weight   = weight;
    608     p->width    = width;
    609     p->spacing  = spacing;
     601    p->slant    = -1;
     602    p->weight   = -1;
     603    p->width    = -1;
     604    p->spacing  = -1;
    610605    p->lang     = newstrdup( lang );
    611606    p->filename = NULL;
     
    614609}
    615610
     611void FcPatternAddInteger(FcPattern *p, const char *fcType, int value)
     612{
     613// handle all possible int values
     614   if (!strcmp(fcType, FC_SLANT)) {
     615      p->slant = value;
     616   }
     617
     618   if (!strcmp(fcType, FC_WEIGHT)) {
     619      p->weight = value;
     620   }
     621
     622   if (!strcmp(fcType, FC_WIDTH)) {
     623      p->width = value;
     624   }
     625
     626   if (!strcmp(fcType, FC_SPACING)) {
     627      p->spacing = value;
     628   }
     629
     630//   printf("FAMILY: %s, SLANT: %d, WEIGHT:%d, WIDTH:%d, SPACING:%d\n", p->family, p->slant, p->weight, p->width, p->spacing);
     631
     632   return;
     633}
     634
  • trunk/poppler/fc-emulate-os2/fontconfig/fontconfig.h

    r367 r473  
    139139
    140140FcPattern *FcPatternBuild(void *,
    141                                         const char *fcFamily, FcType tFamily, const char *family,
    142                                         const char *fcSlant, FcType tSlant, int slant,
    143                                         const char *fcWeight, FcType tWeight, int weight,
    144                                         const char *fcWidth, FcType tWidth, int width,
    145                                         const char *fcSpacing, FcType tSpacing, int spacing,
    146                                         const char *fcLang, FcType tLang, const char *lang,
    147                     void *);
     141                                const char *fcFamily, FcType tFamily, const char *family,
     142                                const char *fcLang, FcType tLang, const char *lang,
     143                                void *);
     144
     145void FcPatternAddInteger(FcPattern *p, const char *fcType, int value);
    148146
    149147#endif // _ERFONTCONFIG_H_
  • trunk/poppler/mypoppler/poppler/GlobalParams.cc

    r461 r473  
    11531153  p = FcPatternBuild(NULL,
    11541154                    FC_FAMILY, FcTypeString, family,
    1155 #ifdef OS2
    1156                     FC_SLANT, FcTypeInteger, slant,
    1157                     FC_WEIGHT, FcTypeInteger, weight,
    1158                     FC_WIDTH, FcTypeInteger, width,
    1159                     FC_SPACING, FcTypeInteger, spacing,
    1160 #endif
    11611155                    FC_LANG, FcTypeString, lang,
    11621156                    NULL);
    1163 #ifndef OS2
     1157
    11641158  if (slant != -1) FcPatternAddInteger(p, FC_SLANT, slant);
    11651159  if (weight != -1) FcPatternAddInteger(p, FC_WEIGHT, weight);
    11661160  if (width != -1) FcPatternAddInteger(p, FC_WIDTH, width);
    11671161  if (spacing != -1) FcPatternAddInteger(p, FC_SPACING, spacing);
    1168 #endif
     1162
    11691163
    11701164  if (deleteFamily)
  • trunk/warpin/lucide.wis.tpl

    r461 r473  
    2323Select
    2424 When _id = 'DE' Then Do
    25   _title = 'Lucide - Document Viewer'
    26   _folder = 'Lucide for eCS'
     25  _title = 'Lucide - Dokumentbetrachter'
     26  _folder = 'Lucide fuer eCS (OS/2)'
    2727  _prog = 'Lucide'
    2828  _readme = 'Lucide Readme'
     
    3434 When _id = 'NL' Then Do
    3535  _title = 'Lucide - Document Bekijker'
    36   _folder = 'Lucide for eCS'
     36  _folder = 'Lucide for eCS (OS/2)'
    3737  _prog = 'Lucide'
    3838  _readme = 'Lucide Readme'
     
    4444 When _id = 'FR' Then Do
    4545  _title = 'Lucide - Afficheur de document'
    46   _folder = 'Lucide for eCS'
     46  _folder = 'Lucide pour eCS (OS/2)'
    4747  _prog = 'Lucide'
    4848  _readme = 'Lucide Readme'
     
    5454 When _id = 'ES' Then Do
    5555  _title = 'Lucide - Visor de documentos'
    56   _folder = 'Lucide para eCS'
     56  _folder = 'Lucide para eCS (OS/2)'
    5757  _prog = 'Lucide'
    5858  _readme = 'L‚eme de Lucide'
     
    6464 When _id = 'SV' Then Do
    6565  _title = 'Lucide - Dokumentvisare'
    66   _folder = 'Lucide for eCS'
     66  _folder = 'Lucide for eCS (OS/2)'
    6767  _prog = 'Lucide'
    6868  _readme = 'Lucide Readme'
     
    7474 Otherwise Do
    7575  _title = 'Lucide - Document Viewer'
    76   _folder = 'Lucide for eCS'
     76  _folder = 'Lucide for eCS (OS/2)'
    7777  _prog = 'Lucide'
    7878  _readme = 'Lucide Readme'
     
    121121Return WirexxGetEnv('plug_jpeg')
    122122</REXX>
     123<REXX NAME=readme_XX>
     124_lang = Value('lang',,'os2environment')
     125_id = Translate(Left(_lang,2))
     126If pos(_id,"CS,ES,FR,IT") > 0 then _readme = "readme_"_id; else _readme = "readme"
     127return _readme
     128</REXX>
    123129<PCK INDEX=1
    124130     PACKAGEID="netlabs.org\Lucide\Lucide core\${WPIVERSION}\${WPIBUILD}"
     
    128134     CREATEOBJECT='WPFolder|=("folder")|<WP_DESKTOP>|OBJECTID=<LUCIDEFOLDER>;ICONFILE=$(1)\lucide_fldr_1.ico;ICONNFILE=1,$(1)\lucide_fldr_2.ico;OPEN=DEFAULT;ALWAYSSORT=YES;'
    129135     CREATEOBJECT='REPLACE WPProgram|=("prog")|<LUCIDEFOLDER>|EXENAME=$(1)\lucide.exe;OBJECTID=<LUCIDEFOLDER_LUCIDEEXE>;PROGTYPE=PM;STARTUPDIR=$(1);ASSOCFILTER=*.PDF,*.DJVU;ASSOCTYPE=Acrobat Document;CCVIEW=YES;'
    130      CREATEOBJECT='REPLACE WPProgram|=("readme")|<LUCIDEFOLDER>|EXENAME=e.exe;OBJECTID=<LUCIDEFOLDER_README>;PROGTYPE=PM;PARAMETERS=$(1)\readme;STARTUPDIR=$(1);'
     136     CREATEOBJECT='REPLACE WPProgram|=("readme")|<LUCIDEFOLDER>|EXENAME=e.exe;OBJECTID=<LUCIDEFOLDER_README>;PROGTYPE=PM;PARAMETERS=$(1)\=("readme_XX");STARTUPDIR=$(1);'
    131137     CREATEOBJECT='REPLACE WPProgram|=("change")|<LUCIDEFOLDER>|EXENAME=e.exe;OBJECTID=<LUCIDEFOLDER_CHANGELOG>;PROGTYPE=PM;PARAMETERS=$(1)\changelog;STARTUPDIR=$(1);'
    132138     WRITEPROFILE="USER\Lucide\Path|$(1)"
Note: See TracChangeset for help on using the changeset viewer.