diff options
author | Robin Watts <Robin.Watts@artifex.com> | 2020-05-20 11:23:18 +0100 |
---|---|---|
committer | Robin Watts <Robin.Watts@artifex.com> | 2020-05-20 12:42:13 +0100 |
commit | a10a03a4c9713b38c4cfcd07f0ba3c722778aae0 (patch) | |
tree | 888489e2f58fdb00c46b8ba61fcb16c24ef8635b | |
parent | ffbaace78bacb0421ae11c5a8fdef51cbd829218 (diff) | |
download | ghostpdl-a10a03a4c9713b38c4cfcd07f0ba3c722778aae0.tar.gz |
Rejig plftable.h
Rather than repeatedly including the same header to get multiple
versions of the font table built in, build the font table just
once with all the information in it.
This should be smaller (fractionally), and stop lgtm.com complaining.
-rw-r--r-- | pcl/pcl/pcfontpg.c | 6 | ||||
-rw-r--r-- | pcl/pcl/pcfsel.c | 23 | ||||
-rw-r--r-- | pcl/pl/plftable.c | 895 | ||||
-rw-r--r-- | pcl/pl/plftable.h | 929 | ||||
-rw-r--r-- | pcl/pl/pllfont.c | 77 |
5 files changed, 944 insertions, 986 deletions
diff --git a/pcl/pcl/pcfontpg.c b/pcl/pcl/pcfontpg.c index 749bc3fe0..6542ae751 100644 --- a/pcl/pcl/pcfontpg.c +++ b/pcl/pcl/pcfontpg.c @@ -23,12 +23,8 @@ #include "pcstate.h" #include "pcursor.h" #include "pcommand.h" - -#define fontnames(agfascreenfontname, agfaname, urwname) urwname -#include "plftable.h" -#undef fontnames - #include "pllfont.h" +#include "plftable.h" /* utility procedure to print n blank lines */ static int diff --git a/pcl/pcl/pcfsel.c b/pcl/pcl/pcfsel.c index a17abbad1..88b16163c 100644 --- a/pcl/pcl/pcfsel.c +++ b/pcl/pcl/pcfsel.c @@ -23,6 +23,7 @@ #include "pcfont.h" #include "pcfsel.h" #include "pcsymbol.h" +#include "plftable.h" /* hack to avoid compiler message */ #ifndef abs @@ -86,19 +87,14 @@ dmprint_font_params_t(const gs_memory_t * mem, const pl_font_params_t * pfp) (0x07FF & pfp->typeface_family)); } -#include "plftable.h" - static void dmprint_ufst_font_name(const gs_memory_t * mem, const pl_font_t * pfont) { -#define fontnames(agfascreenfontname, agfaname, urwname) agfaname -#include "plftable.h" int i; bool found = false; - (void)pl_built_in_resident_font_table_count; - for (i = 0; strlen(resident_table[i].full_font_name); i++) { - if (!memcmp(&resident_table[i].params, + for (i = 0; *pl_built_in_resident_font_table[i].full_font_name[AGFANAME]; i++) { + if (!memcmp(&pl_built_in_resident_font_table[i].params, &pfont->params, sizeof(pfont->params))) { found = true; @@ -106,7 +102,7 @@ dmprint_ufst_font_name(const gs_memory_t * mem, const pl_font_t * pfont) } } if (found) { - dmprintf1(mem, "%s ", resident_table[i].full_font_name); + dmprintf1(mem, "%s ", pl_built_in_resident_font_table[i].full_font_name[AGFANAME]); } else { if (pfont->storage == pcds_internal) { dmprintf(mem, "internal font not found in resident table"); @@ -114,20 +110,16 @@ dmprint_ufst_font_name(const gs_memory_t * mem, const pl_font_t * pfont) } dmprintf(mem, "external font "); } -#undef fontnames } static void dmprint_font_name(const gs_memory_t * mem, const pl_font_t * pfont) { -#define fontnames(agfascreenfontname, agfaname, urwname) urwname -#include "plftable.h" int i; bool found = false; - (void)pl_built_in_resident_font_table_count; - for (i = 0; strlen(resident_table[i].full_font_name); i++) { - if (!memcmp(&resident_table[i].params, + for (i = 0; pl_built_in_resident_font_table[i].full_font_name[URWNAME]; i++) { + if (!memcmp(&pl_built_in_resident_font_table[i].params, &pfont->params, sizeof(pfont->params))) { found = true; @@ -135,7 +127,7 @@ dmprint_font_name(const gs_memory_t * mem, const pl_font_t * pfont) } } if (found) { - dmprintf1(mem, "%s ", resident_table[i].full_font_name); + dmprintf1(mem, "%s ", pl_built_in_resident_font_table[i].full_font_name[URWNAME]); } else { if (pfont->storage == pcds_internal) { dmprintf(mem, "internal font not found in resident table"); @@ -143,7 +135,6 @@ dmprint_font_name(const gs_memory_t * mem, const pl_font_t * pfont) } dmprintf(mem, "external font "); } -#undef fontnames } static void diff --git a/pcl/pl/plftable.c b/pcl/pl/plftable.c index 3837c7d22..73802769a 100644 --- a/pcl/pl/plftable.c +++ b/pcl/pl/plftable.c @@ -20,3 +20,898 @@ #include "gstypes.h" #include "plfont.h" #include "plftable.h" + +const font_resident_t pl_built_in_resident_font_table[] = { +#define C(b) ((byte)((b) ^ 0xff)) +#define cc_alphabetic \ + { C(0), C(0), C(0), C(0), C(0xff), C(0xc0), C(0), C(plgv_Unicode) } +#define cc_symbol \ + { C(0), C(0), C(0), C(4), C(0), C(0), C(0), C(plgv_Unicode) } +#define cc_dingbats \ + { C(0), C(0), C(0), C(1), C(0), C(0), C(0), C(plgv_Unicode) } + /* + * Per TRM 23-87, PCL5 printers are supposed to have Univers + * and CG Times fonts. Substitute Arial for Univers and + * Times for CG Times. + */ + /* hack the vendor value to be agfa's. */ +#define agfa (4096) + /* definition for style word as defined on 11-19 PCLTRM */ +#define style_word(posture, width, structure) \ + ((posture) + (4 * (width)) + (32 * (structure))) +#define REGULAR (style_word(0, 0, 0)) +#define ITALIC (style_word(1, 0, 0)) +#define CONDENSEDITALIC (style_word(1, 1, 0)) +#define CONDENSED (style_word(0, 1, 0)) +#define LIGHT (-3) +#define NOBOLD (0) +#define MEDIUMBOLD (1) +#define TWOBOLD (2) +#define BOLD (3) +#define EXBOLD (4) + + { + { "Courier", "CourierMT", "NimbusMono-Regular" }, + {'C', 'o', 'u', 'r', 'i', 'e', 'r', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + ' ', ' '}, + {0, 0, {600.0, 720000.0 / 600.0}, 0, REGULAR, NOBOLD, 4099, 0}, + cc_alphabetic, plft_Unicode + }, + + { + { "CGTimes", "CGTimes", "NimbusRomanNo4-Regular" }, + {'C', 'G', ' ', 'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', + ' ', ' '}, + {0, 1, {295.0, 720000.0 / 295.0}, 0, REGULAR, NOBOLD, 4101, 1}, + cc_alphabetic, plft_Unicode + }, + + { + { "CGTimesBold", "CGTimes-Bold", "NimbusRomanNo4-Bold" }, + {'C', 'G', ' ', 'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', + 'B', 'd'}, + {0, 1, {295.0, 720000.0 / 295.0}, 0, REGULAR, BOLD, 4101, 2}, + cc_alphabetic, plft_Unicode + }, + + { + { "CGTimesItalic", "CGTimes-Italic", "NimbusRomanNo4-Italic" }, + {'C', 'G', ' ', 'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', + 'I', 't'}, + {0, 1, {295.0, 720000.0 / 295.0}, 0, ITALIC, NOBOLD, 4101, 3}, + cc_alphabetic, plft_Unicode + }, + + { + { "CGTimesBoldItalic", "CGTimes-BoldItalic", + "NimbusRomanNo4-BoldItalic" }, + {'C', 'G', ' ', 'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', 'B', 'd', + 'I', 't'}, + {0, 1, {295.0, 720000.0 / 295.0}, 0, ITALIC, BOLD, 4101, 4}, + cc_alphabetic, plft_Unicode + }, + + { + { "CGOmega", "CGOmega", "URWClassico-Regular" }, + {'C', 'G', ' ', 'O', 'm', 'e', 'g', 'a', ' ', ' ', ' ', ' ', ' ', ' ', + ' ', ' '}, + {0, 1, {276.0, 720000.0 / 276.0}, 0, REGULAR, NOBOLD, 4113, 5}, + cc_alphabetic, plft_Unicode + }, + + { + { "CGOmegaBold", "CGOmega-Bold", "URWClassico-Bold" }, + {'C', 'G', ' ', 'O', 'm', 'e', 'g', 'a', ' ', ' ', ' ', ' ', ' ', ' ', + 'B', 'd'}, + {0, 1, {276.0, 720000.0 / 276.0}, 0, REGULAR, BOLD, 4113, 6}, + cc_alphabetic, plft_Unicode + }, + + { + { "CGOmegaItalic", "CGOmega-Italic", "URWClassico-Italic" }, + {'C', 'G', ' ', 'O', 'm', 'e', 'g', 'a', ' ', ' ', ' ', ' ', ' ', ' ', + 'I', 't'}, + {0, 1, {276.0, 720000.0 / 276.0}, 0, ITALIC, NOBOLD, 4113, 7}, + cc_alphabetic, plft_Unicode + }, + + { + { "CGOmegaBoldItalic", "CGOmega-BoldItalic", + "URWClassico-BoldItalic" }, + {'C', 'G', ' ', 'O', 'm', 'e', 'g', 'a', ' ', ' ', ' ', ' ', 'B', 'd', + 'I', 't'}, + {0, 1, {276.0, 720000.0 / 276.0}, 0, ITALIC, BOLD, 4113, 8}, + cc_alphabetic, plft_Unicode + }, + + { + { "Coronet", "Coronet", "C093-Regular" }, + {'C', 'o', 'r', 'o', 'n', 'e', 't', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + ' ', ' '}, + {0, 1, {203.0, 720000.0 / 203.0}, 0, ITALIC, NOBOLD, 4116, 9}, + cc_alphabetic, plft_Unicode + }, + + { + { "ClarendonCondensedBold", "Clarendon-Condensed-Bold", + "C011Condensed-Bold" }, + {'C', 'l', 'a', 'r', 'e', 'n', 'd', 'o', 'n', ' ', ' ', ' ', 'C', 'd', + 'B', 'd'}, + {0, 1, {221.0, 720000.0 / 221.0}, 0, CONDENSED, BOLD, 4140, 10}, + cc_alphabetic, plft_Unicode + }, + + { + { "UniversMedium", "Univers-Medium", "URWClassicSans-Regular" }, + {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + 'M', 'd'}, + {0, 1, {332.0, 720000.0 / 332.0}, 0, REGULAR, NOBOLD, 4148, 11}, + cc_alphabetic, plft_Unicode + }, + + { + { "UniversBold", "Univers-Bold", "URWClassicSans-Bold" }, + {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + 'B', 'd'}, + {0, 1, {332.0, 720000.0 / 332.0}, 0, REGULAR, BOLD, 4148, 12}, + cc_alphabetic, plft_Unicode + }, + + { + { "UniversMediumItalic", "Univers-MediumItalic", "URWClassicSans-RegularItalic" }, + {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', 'M', 'd', + 'I', 't'}, + {0, 1, {332.0, 720000.0 / 332.0}, 0, ITALIC, NOBOLD, 4148, 13}, + cc_alphabetic, plft_Unicode + }, + + { + { "UniversBoldItalic", "Univers-BoldItalic", "URWClassicSans-BoldItalic" }, + {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', 'B', 'd', + 'I', 't'}, + {0, 1, {332.0, 720000.0 / 332.0}, 0, ITALIC, BOLD, 4148, 14}, + cc_alphabetic, plft_Unicode + }, + + { + { "UniversCondensedMedium", "Univers-Condensed-Medium", + "URWClassicSansCond-Regular" }, + {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', 'C', 'd', + 'M', 'd'}, + {0, 1, {221.0, 720000.0 / 221.0}, 0, CONDENSED, NOBOLD, 4148, 15}, + cc_alphabetic, plft_Unicode + }, + + { + { "UniversCondensedBold", "Univers-Condensed-Bold", + "URWClassicSansCond-Bold" }, + {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', 'C', 'd', + 'B', 'd'}, + {0, 1, {221.0, 720000.0 / 221.0}, 0, CONDENSED, BOLD, 4148, 16}, + cc_alphabetic, plft_Unicode + }, + + { + { "UniversCondensedMediumItalic", + "Univers-Condensed-MediumItalic", "URWClassicSansCond-Italic" }, + {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', 'C', 'd', 'M', 'd', + 'I', 't'}, + {0, 1, {221.0, 720000.0 / 221.0}, 0, CONDENSEDITALIC, NOBOLD, 4148, 17}, + cc_alphabetic, plft_Unicode + }, + + { + { "UniversCondensedBoldItalic", "Univers-Condensed-BoldItalic", + "URWClassicSansCond-BoldItalic" }, + {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', 'C', 'd', 'B', 'd', + 'I', 't'}, + {0, 1, {221.0, 720000.0 / 221.0}, 0, CONDENSEDITALIC, BOLD, 4148, 18}, + cc_alphabetic, plft_Unicode + }, + + { + { "AntiqueOlive", "AntiqueOlive", "AntiqueOlive-Regular" }, + {'A', 'n', 't', 'i', 'q', 'O', 'l', 'i', 'v', 'e', ' ', ' ', ' ', ' ', + ' ', ' '}, + {0, 1, {295.0, 720000.0 / 295.0}, 0, REGULAR, NOBOLD, 4168, 19}, + cc_alphabetic, plft_Unicode + }, + + { + { "AntiqueOliveBold", "AntiqueOlive-Bold", "AntiqueOlive-Bold" }, + {'A', 'n', 't', 'i', 'q', 'O', 'l', 'i', 'v', 'e', ' ', ' ', ' ', ' ', + 'B', 'd'}, + {0, 1, {332.0, 720000.0 / 332.0}, 0, REGULAR, BOLD, 4168, 20}, + cc_alphabetic, plft_Unicode + }, + + { + { "AntiqueOliveItalic", "AntiqueOlive-Italic", + "AntiqueOlive-Italic" }, + {'A', 'n', 't', 'i', 'q', 'O', 'l', 'i', 'v', 'e', ' ', ' ', ' ', ' ', + 'I', 't'}, + {0, 1, {294.0, 720000.0 / 294.0}, 0, ITALIC, NOBOLD, 4168, 21}, + cc_alphabetic, plft_Unicode + }, + + { + { "GaramondAntiqua", "Garamond-Antiqua", "Garamond-Antiqua" }, + {'G', 'a', 'r', 'a', 'm', 'o', 'n', 'd', ' ', 'A', 'n', 't', 'i', 'q', + 'u', 'a'}, + {0, 1, {258.0, 720000.0 / 258.0}, 0, REGULAR, NOBOLD, 4197, 22}, + cc_alphabetic, plft_Unicode + }, + + { + { "GaramondHalbfett", "Garamond-Halbfett", "Garamond-Halbfett" }, + {'G', 'a', 'r', 'a', 'm', 'o', 'n', 'd', ' ', ' ', ' ', ' ', ' ', 'H', + 'l', 'b'}, + {0, 1, {276.0, 720000.0 / 276.0}, 0, REGULAR, BOLD, 4197, 23}, + cc_alphabetic, plft_Unicode + }, + + { + { "GaramondKursiv", "Garamond-Kursiv", "Garamond-Kursiv" }, + {'G', 'a', 'r', 'a', 'm', 'o', 'n', 'd', ' ', ' ', ' ', ' ', 'K', 'r', + 's', 'v'}, + {0, 1, {240.0, 720000.0 / 240.0}, 0, ITALIC, NOBOLD, 4197, 24}, + cc_alphabetic, plft_Unicode + }, + + { + { "GaramondKursivHalbfett", "Garamond-KursivHalbfett", + "Garamond-KursivHalbfett" }, + {'G', 'a', 'r', 'a', 'm', 'o', 'n', 'd', ' ', 'K', 'r', 's', 'v', 'H', + 'l', 'b'}, + {0, 1, {258.0, 720000.0 / 258.0}, 0, ITALIC, BOLD, 4197, 25}, + cc_alphabetic, plft_Unicode + }, + + { + { "Marigold", "Marigold", "Mauritius-Regular" }, + {'M', 'a', 'r', 'i', 'g', 'o', 'l', 'd', ' ', ' ', ' ', ' ', ' ', ' ', + ' ', ' '}, + {0, 1, {221.0, 720000.0 / 221.0}, 0, REGULAR, NOBOLD, 4297, 26}, + cc_alphabetic, plft_Unicode + }, + + { + { "AlbertusMedium", "Albertus-Medium", "Algiers-Medium" }, + {'A', 'l', 'b', 'e', 'r', 't', 'u', 's', ' ', ' ', ' ', ' ', ' ', ' ', + 'M', 'd'}, + {0, 1, {313.0, 720000.0 / 313.0}, 0, REGULAR, MEDIUMBOLD, 4362, 27}, + cc_alphabetic, plft_Unicode + }, + + { + { "AlbertusExtraBold", "Albertus-ExtraBold", "Algiers-ExtraBold" }, + {'A', 'l', 'b', 'e', 'r', 't', 'u', 's', ' ', ' ', ' ', ' ', ' ', ' ', + 'X', 'b'}, + {0, 1, {369.0, 720000.0 / 369.0}, 0, REGULAR, EXBOLD, 4362, 28}, + cc_alphabetic, plft_Unicode + }, + + { + { "Arial", "Arial", "NimbusSansNo2-Regular" }, + {'A', 'r', 'i', 'a', 'l', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + ' ', ' '}, + {0, 1, {278.0, 720000.0 / 278.0}, 0, REGULAR, NOBOLD, 16602, 29}, + cc_alphabetic, plft_Unicode + }, + + { + { "Arial-BoldMT", "Arial-Bold", "NimbusSansNo2-Bold" }, + {'A', 'r', 'i', 'a', 'l', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + 'B', 'd'}, + {0, 1, {278.0, 720000.0 / 278.0}, 0, REGULAR, BOLD, 16602, 30}, + cc_alphabetic, plft_Unicode + }, + + { + { "Arial-ItalicMT", "Arial-Italic", "NimbusSansNo2-Italic" }, + {'A', 'r', 'i', 'a', 'l', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + 'I', 't'}, + {0, 1, {278.0, 720000.0 / 278.0}, 0, ITALIC, NOBOLD, 16602, 31}, + cc_alphabetic, plft_Unicode + }, + + { + { "Arial-BoldItalicMT", "Arial-BoldItalic", "NimbusSansNo2-BoldItalic" }, + {'A', 'r', 'i', 'a', 'l', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'B', 'd', + 'I', 't'}, + {0, 1, {278.0, 720000.0 / 278.0}, 0, ITALIC, BOLD, 16602, 32}, + cc_alphabetic, plft_Unicode + }, + + { + { "TimesNewRoman", "TimesNewRoman", "NimbusRomanNo9-Regular" }, + {'T', 'i', 'm', 'e', 's', 'N', 'e', 'w', 'R', 'm', 'n', ' ', ' ', ' ', + ' ', ' '}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, NOBOLD, 16901, 33}, + cc_alphabetic, plft_Unicode + }, + + { + { "TimesNewRoman-Bold", "TimesNewRoman-Bold", + "NimbusRomanNo9-Bold" }, + {'T', 'i', 'm', 'e', 's', 'N', 'e', 'w', 'R', 'm', 'n', ' ', ' ', ' ', + 'B', 'd'}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, BOLD, 16901, 34}, + cc_alphabetic, plft_Unicode + }, + + { + { "TimesNewRoman-Italic", "TimesNewRoman-Italic", + "NimbusRomanNo9-Italic" }, + {'T', 'i', 'm', 'e', 's', 'N', 'e', 'w', 'R', 'm', 'n', ' ', ' ', ' ', + 'I', 't'}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, NOBOLD, 16901, 36}, + cc_alphabetic, plft_Unicode + }, + + { + { "TimesNewRoman-BoldItalic", "TimesNewRoman-BoldItalic", + "NimbusRomanNo9-BoldItalic" }, + {'T', 'i', 'm', 'e', 's', 'N', 'e', 'w', 'R', 'm', 'n', ' ', 'B', 'd', + 'I', 't'}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, BOLD, 16901, 35}, + cc_alphabetic, plft_Unicode + }, + + { + { "Helvetica", "Helvetica", "NimbusSans-Regular" }, + {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', ' ', ' ', + ' ', ' '}, + {0, 1, {278.0, 720000.0 / 278.0}, 0, REGULAR, NOBOLD, 24580, 37}, + cc_alphabetic, plft_Unicode + }, + + { + { "Helvetica-Bold", "Helvetica-Bold", "NimbusSans-Bold" }, + {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', ' ', ' ', + 'B', 'd'}, + {0, 1, {278.0, 720000.0 / 278.0}, 0, REGULAR, BOLD, 24580, 38}, + cc_alphabetic, plft_Unicode + }, + + { + { "Helvetica-BoldOblique", "Helvetica-BoldOblique", + "NimbusSans-BoldOblique" }, + {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', 'B', 'd', + 'O', 'b'}, + {0, 1, {278.0, 720000.0 / 278.0}, 0, ITALIC, BOLD, 24580, 40}, + cc_alphabetic, plft_Unicode + }, + + { + { "Helvetica-Narrow", "Helvetica-Narrow", "NimbusSansNarrow-Regular" }, + {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', ' ', ' ', + 'N', 'r'}, + {0, 1, {228.0, 720000.0 / 228.0}, 0, CONDENSED, NOBOLD, 24580, 41}, + cc_alphabetic, plft_Unicode + }, + + { + { "Helvetica-Narrow-Bold", "Helvetica-Narrow-Bold", + "NimbusSansNarrow-Bold" }, + {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', 'N', 'r', + 'B', 'd'}, + {0, 1, {228.0, 720000.0 / 228.0}, 0, CONDENSED, BOLD, 24580, 42}, + cc_alphabetic, plft_Unicode + }, + + { + { "Helvetica-Narrow-BoldOblique", "Helvetica-Narrow-BoldOblique", + "NimbusSansNarrow-BoldOblique" }, + {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', 'N', 'r', 'B', 'd', + 'O', 'b'}, + {0, 1, {228.0, 720000.0 / 228.0}, 0, CONDENSEDITALIC, BOLD, 24580, 44}, + cc_alphabetic, plft_Unicode + }, + + { + { "Helvetica-Narrow-Oblique", "Helvetica-Narrow-Oblique", + "NimbusSansNarrow-Oblique" }, + {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', 'N', 'r', + 'O', 'b'}, + {0, 1, {228.0, 720000.0 / 228.0}, 0, CONDENSEDITALIC, NOBOLD, 24580, 43}, + cc_alphabetic, plft_Unicode + }, + + { + { "Helvetica-Oblique", "Helvetica-Oblique", + "NimbusSans-Oblique" }, + {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', ' ', ' ', + 'O', 'b'}, + {0, 1, {278.0, 720000.0 / 278.0}, 0, ITALIC, NOBOLD, 24580, 39}, + cc_alphabetic, plft_Unicode + }, + + { + { "Palatino-Roman", "Palatino-Roman", "P052-Roman" }, + {'P', 'a', 'l', 'a', 't', 'i', 'n', 'o', ' ', ' ', ' ', ' ', ' ', 'R', + 'm', 'n'}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, NOBOLD, 24591, 45}, + cc_alphabetic, plft_Unicode + }, + + { + { "Palatino-Italic", "Palatino-Italic", "P052-Italic" }, + {'P', 'a', 'l', 'a', 't', 'i', 'n', 'o', ' ', ' ', ' ', ' ', ' ', ' ', + 'I', 't'}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, NOBOLD, 24591, 47}, + cc_alphabetic, plft_Unicode + }, + + { + { "Palatino-Bold", "Palatino-Bold", "P052-Bold" }, + {'P', 'a', 'l', 'a', 't', 'i', 'n', 'o', ' ', ' ', ' ', ' ', ' ', ' ', + 'B', 'd'}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, BOLD, 24591, 46}, + cc_alphabetic, plft_Unicode + }, + + { + { "Palatino-BoldItalic", "Palatino-BoldItalic", + "P052-BoldItalic" }, + {'P', 'a', 'l', 'a', 't', 'i', 'n', 'o', ' ', ' ', ' ', ' ', 'B', 'd', + 'I', 't'}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, BOLD, 24591, 48}, + cc_alphabetic, plft_Unicode + }, + + { + { "AvantGarde-Book", "AvantGarde-Book", "URWGothic-Book" }, + {'I', 'T', 'C', 'A', 'v', 'a', 'n', 't', 'G', 'a', 'r', 'd', ' ', ' ', + 'B', 'k'}, + {0, 1, {277.0, 720000.0 / 277.0}, 0, REGULAR, NOBOLD, 24607, 49}, + cc_alphabetic, plft_Unicode + }, + + { + { "AvantGarde-Demi", "AvantGarde-Demi", "URWGothic-Demi" }, + {'I', 'T', 'C', 'A', 'v', 'a', 'n', 't', 'G', 'a', 'r', 'd', ' ', ' ', + 'D', 'b'}, + {0, 1, {280.0, 720000.0 / 280.0}, 0, REGULAR, TWOBOLD, 24607, 50}, + cc_alphabetic, plft_Unicode + }, + + { + { "AvantGarde-BookOblique", "AvantGarde-BookOblique", + "URWGothic-BookOblique" }, + {'I', 'T', 'C', 'A', 'v', 'a', 'n', 't', 'G', 'a', 'r', 'd', 'B', 'k', + 'O', 'b'}, + {0, 1, {277.0, 720000.0 / 277.0}, 0, ITALIC, NOBOLD, 24607, 51}, + cc_alphabetic, plft_Unicode + }, + + { + { "AvantGarde-DemiOblique", "AvantGarde-DemiOblique", + "URWGothic-DemiOblique" }, + {'I', 'T', 'C', 'A', 'v', 'a', 'n', 't', 'G', 'a', 'r', 'd', 'D', 'b', + 'O', 'b'}, + {0, 1, {280.0, 720000.0 / 280.0}, 0, ITALIC, TWOBOLD, 24607, 52}, + cc_alphabetic, plft_Unicode + }, + + { + { "Bookman-Light", "Bookman-Light", "URWBookman-Light" }, + {'I', 'T', 'C', 'B', 'o', 'o', 'k', 'm', 'a', 'n', ' ', ' ', ' ', ' ', + 'L', 't'}, + {0, 1, {320.0, 720000.0 / 320.0}, 0, REGULAR, LIGHT, 24623, 53}, + cc_alphabetic, plft_Unicode + }, + + { + { "Bookman-Demi", "Bookman-Demi", "URWBookman-Demi" }, + {'I', 'T', 'C', 'B', 'o', 'o', 'k', 'm', 'a', 'n', ' ', ' ', ' ', ' ', + 'D', 'b'}, + {0, 1, {340.0, 720000.0 / 340.0}, 0, REGULAR, TWOBOLD, 24623, 54}, + cc_alphabetic, plft_Unicode + }, + + { + { "Bookman-LightItalic", "Bookman-LightItalic", + "URWBookman-LightItalic" }, + {'I', 'T', 'C', 'B', 'o', 'o', 'k', 'm', 'a', 'n', ' ', ' ', 'L', 't', + 'I', 't'}, + {0, 1, {300.0, 720000.0 / 300.0}, 0, ITALIC, LIGHT, 24623, 55}, + cc_alphabetic, plft_Unicode + }, + + { + { "Bookman-DemiItalic", "Bookman-DemiItalic", + "URWBookman-DemiItalic" }, + {'I', 'T', 'C', 'B', 'o', 'o', 'k', 'm', 'a', 'n', ' ', ' ', 'D', 'b', + 'I', 't'}, + {0, 1, {340.0, 720000.0 / 340.0}, 0, ITALIC, TWOBOLD, 24623, 56}, + cc_alphabetic, plft_Unicode + }, + + { + { "NewCenturySchlbk-Bold", "NewCenturySchlbk-Bold", + "C059-Bold" }, + {'N', 'w', 'C', 'e', 'n', 't', 'S', 'c', 'h', 'l', 'b', 'k', ' ', ' ', + 'B', 'd'}, + {0, 1, {287.0, 720000.0 / 287.0}, 0, REGULAR, BOLD, 24703, 57}, + cc_alphabetic, plft_Unicode + }, + + { + { "NewCenturySchlbk-BoldItalic", "NewCenturySchlbk-BoldItalic", + "C059-BdIta" }, + {'N', 'w', 'C', 'e', 'n', 't', 'S', 'c', 'h', 'l', 'b', 'k', 'B', 'd', + 'I', 't'}, + {0, 1, {287.0, 720000.0 / 287.0}, 0, ITALIC, BOLD, 24703, 58}, + cc_alphabetic, plft_Unicode + }, + + { + { "NewCenturySchlbk-Italic", "NewCenturySchlbk-Italic", + "C059-Italic" }, + {'N', 'w', 'C', 'e', 'n', 't', 'S', 'c', 'h', 'l', 'b', 'k', ' ', ' ', + 'I', 't'}, + {0, 1, {278.0, 720000.0 / 278.0}, 0, ITALIC, NOBOLD, 24703, 59}, + cc_alphabetic, plft_Unicode + }, + + { + { "NewCenturySchlbk-Roman", "NewCenturySchlbk-Roman", + "C059-Roman" }, + {'N', 'w', 'C', 'e', 'n', 't', 'S', 'c', 'h', 'l', 'b', 'k', ' ', 'R', + 'm', 'n'}, + {0, 1, {278.0, 720000.0 / 278.0}, 0, REGULAR, NOBOLD, 24703, 60}, + cc_alphabetic, plft_Unicode + }, + + { + { "Times-Roman", "Times-Roman", "NimbusRoman-Regular" }, + {'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'R', + 'm', 'n'}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, NOBOLD, 25093, 61}, + cc_alphabetic, plft_Unicode + }, + + { + { "Times-Bold", "Times-Bold", "NimbusRoman-Bold" }, + {'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + 'B', 'd'}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, BOLD, 25093, 62}, + cc_alphabetic, plft_Unicode + }, + + { + { "Times-Italic", "Times-Italic", "NimbusRoman-Italic" }, + {'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + 'I', 't'}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, NOBOLD, 25093, 63}, + cc_alphabetic, plft_Unicode + }, + + { + { "Times-BoldItalic", "Times-BoldItalic", + "NimbusRoman-BoldItalic" }, + {'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'B', 'd', + 'I', 't'}, + {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, BOLD, 25093, 64}, + cc_alphabetic, plft_Unicode + }, + + { + { "ZapfChancery-MediumItalic", "ZapfChancery-MediumItalic", + "Z003-MediumItalic" }, + {'Z', 'a', 'p', 'f', 'C', 'h', 'a', 'n', 'c', 'e', 'r', 'y', 'M', 'd', + 'I', 't'}, + {0, 1, {220.0, 720000.0 / 220.0}, 0, ITALIC, NOBOLD, 45099, 65}, + cc_alphabetic, plft_Unicode + }, + + { + { "SymbolMT", "Symbol", "Symbols" }, + {'S', 'y', 'm', 'b', 'o', 'l', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + ' ', ' '}, + {621, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, NOBOLD, 16686, 66}, + cc_symbol, plft_8bit_printable + }, + + { + { "SymbPS", "SymbPS", "StandardSymbolsPS" }, + {'S', 'y', 'm', 'b', 'o', 'l', 'P', 'S', ' ', ' ', ' ', ' ', ' ', ' ', + ' ', ' '}, + {621, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, NOBOLD, 45358, 67}, + cc_symbol, plft_8bit_printable + }, + + { + { "Wingdings-Regular", "Wingdings-Regular", "URWDings" }, + {'W', 'i', 'n', 'g', 'd', 'i', 'n', 'g', 's', ' ', ' ', ' ', ' ', ' ', + ' ', ' '}, + {18540, 1, {1000.0, 720000.0 / 1000.0}, 0, REGULAR, NOBOLD, 31402, 68}, + cc_dingbats, plft_8bit}, + + { + { "ZapfDingbats", "ZapfDingbats", "D050000L" }, + {'Z', 'a', 'p', 'f', 'D', 'i', 'n', 'g', 'b', 'a', 't', 's', ' ', ' ', + ' ', ' '}, + {460, 1, {280.0, 720000.0 / 280.0}, 0, REGULAR, NOBOLD, 45101, 69}, + cc_dingbats, plft_8bit}, + + { + { "CourierBold", "CourierMT-Bold", "NimbusMono-Bold" }, + {'C', 'o', 'u', 'r', 'i', 'e', 'r', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + 'B', 'd'}, + {0, 0, {600.0, 720000.0 / 600.0}, 0, REGULAR, BOLD, 4099, 70}, + cc_alphabetic, plft_Unicode + }, + + { + { "CourierItalic", "CourierMT-Italic", "NimbusMono-Italic" }, + {'C', 'o', 'u', 'r', 'i', 'e', 'r', ' ', ' ', ' ', ' ', ' ', ' ', ' ', + 'I', 't'}, + {0, 0, {600.0, 720000.0 / 600.0}, 0, ITALIC, NOBOLD, 4099, 71}, + cc_alphabetic, plft_Unicode + }, + + { + { "CourierBoldItalic", "CourierMT-BoldItalic", + "NimbusMono-BoldItalic" }, + {'C', 'o', 'u', 'r', 'i', 'e', 'r', ' ', ' ', ' ', ' ', ' ', 'B', 'd', + 'I', 't'}, + {0, 0, {600.0, 720000.0 / 600.0}, 0, ITALIC, BOLD, 4099, 72}, + cc_alphabetic, plft_Unicode + }, + + { + { "LetterGothic", "LetterGothic", "LetterGothic-Regular" }, + {'L', 'e', 't', 't', 'e', 'r', 'G', 'o', 't', 'h', 'i', 'c', ' ', ' ', + ' ', ' '}, + {0, 0, {500.0, 720000.0 / 500.0}, 0, REGULAR, NOBOLD, 4102, 73}, + cc_alphabetic, plft_Unicode + }, + + { + { "LetterGothicBold", "LetterGothic-Bold", "LetterGothic-Bold" }, + {'L', 'e', 't', 't', 'e', 'r', 'G', 'o', 't', 'h', 'i', 'c', ' ', ' ', + 'B', 'd'}, + {0, 0, {500.0, 720000.0 / 500.0}, 0, REGULAR, BOLD, 4102, 74}, + cc_alphabetic, plft_Unicode + }, + + { + { "LetterGothicItalic", "LetterGothic-Italic", + "LetterGothic-Italic" }, + {'L', 'e', 't', 't', 'e', 'r', 'G', 'o', 't', 'h', 'i', 'c', ' ', ' ', + 'I', 't'}, + {0, 0, {500.0, 720000.0 / 500.0}, 0, ITALIC, NOBOLD, 4102, 75}, + cc_alphabetic, plft_Unicode + }, + + { + { "Courier", "Courier", "NimbusMonoPS-Regular" }, + {'C', 'o', 'u', 'r', 'i', 'e', 'r', 'P', 'S', ' ', ' ', ' ', ' ', ' ', + ' ', ' '}, + {0, 0, {600.0, 720000.0 / 600.0}, 0, REGULAR, NOBOLD, 24579, 76}, + cc_alphabetic, plft_Unicode + }, + + { + { "Courier-Bold", "Courier-Bold", "NimbusMonoPS-Bold" }, + {'C', 'o', 'u', 'r', 'i', 'e', 'r', 'P', 'S', ' ', ' ', ' ', ' ', ' ', + 'B', 'd'}, + {0, 0, {600.0, 720000.0 / 600.0}, 0, REGULAR, BOLD, 24579, 77}, + cc_alphabetic, plft_Unicode + }, + + { + { "Courier-BoldOblique", "Courier-BoldOblique", + "NimbusMonoPS-BoldItalic" }, + {'C', 'o', 'u', 'r', 'i', 'e', 'r', 'P', 'S', ' ', ' ', ' ', 'B', 'd', + 'O', 'b'}, + {0, 0, {600.0, 720000.0 / 600.0}, 0, ITALIC, BOLD, 24579, 78}, + cc_alphabetic, plft_Unicode + }, + + { + { "Courier-Oblique", "Courier-Oblique", "NimbusMonoPS-Italic" }, + {'C', 'o', 'u', 'r', 'i', 'e', 'r', 'P', 'S', ' ', ' ', ' ', ' ', ' ', + 'O', 'b'}, + {0, 0, {600.0, 720000.0 / 600.0}, 0, ITALIC, NOBOLD, 24579, 79}, + cc_alphabetic, plft_Unicode + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '0', 'N'}, + {14, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 80}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '6', 'N'}, + {206, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 81}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '9', 'N'}, + {302, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 82}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', + '1', '0', 'U'}, + {341, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 83}, + cc_alphabetic, plft_8bit_printable + }, + + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', '1', + '1', 'U'}, + {373, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 84}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', '1', + '2', 'U'}, + {405, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 85}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '1', 'U'}, + {53, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 86}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '2', 'N'}, + {78, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 87}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '5', 'N'}, + {174, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 88}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '8', 'U'}, + {277, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 89}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '0', 'U'}, + {21, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 90}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '1', 'E'}, + {37, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 91}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '1', 'F'}, + {38, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 92}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '1', 'G'}, + {39, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 93}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '0', 'I'}, + {9, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 94}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '0', 'S'}, + {19, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 95}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '2', 'S'}, + {83, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 96}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '0', 'D'}, + {4, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 97}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '1', 'O'}, + {47, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 98}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', '1', + '3', 'J'}, + {426, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 99}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', '1', + '3', 'U'}, + {437, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 100}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "noname", "noname", "ArtLinePrinter" }, + {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', + '4', 'U'}, + {149, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 101}, + cc_alphabetic, plft_8bit_printable + }, + + { + { "", "", "" }, + {'0', '0'}, + {0, 0, {0, 0}, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0, 0}, 0 + } + +#undef C +#undef cc_alphabetic +#undef cc_symbol +#undef cc_dingbats +#undef pitch_1 +#undef agfa_value +}; + +/* a null entry terminates the list, so - 1 */ +const int pl_built_in_resident_font_table_count = + countof(pl_built_in_resident_font_table) - 1; + diff --git a/pcl/pl/plftable.h b/pcl/pl/plftable.h index b3bc0ef25..c92d1a83d 100644 --- a/pcl/pl/plftable.h +++ b/pcl/pl/plftable.h @@ -1,13 +1,13 @@ /* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. - + This software is provided AS-IS with no warranty, either express or implied. - + This software is distributed under license and may not be copied, modified or distributed except as expressly authorized under the terms of the license contained in the file LICENSE in this distribution. - + Refer to licensing information at http://www.artifex.com or contact Artifex Software, Inc., 1305 Grant Avenue - Suite 200, Novato, CA 94945, U.S.A., +1(415)492-9861, for further information. @@ -21,925 +21,20 @@ /* resident font table */ typedef struct font_resident { - const char full_font_name[40]; /* name entry 4 in truetype fonts */ + const char full_font_name[3][40]; /* name entry 4 in truetype fonts */ const short unicode_fontname[16]; /* pxl name */ pl_font_params_t params; byte character_complement[8]; pl_font_type_t font_type; } font_resident_t; -#endif /* plftable_INCLUDED */ - -/* #define AGFA_FONT_TABLE */ -/* #define AGFA_SCREENFONTS */ - -#ifdef fontnames - -#if 0 - -#ifdef AGFA_FONT_TABLE -#ifdef AGFA_SCREENFONTS -#define fontnames(agfascreenfontname, agfaname, urwname) agfascreenfontname -#else -#define fontnames(agfascreenfontname, agfaname, urwname) agfaname -#endif -#else -#define fontnames(agfascreenfontname, agfaname, urwname) urwname -#endif -#endif - - -static const font_resident_t resident_table[] = { -#define C(b) ((byte)((b) ^ 0xff)) -#define cc_alphabetic \ - { C(0), C(0), C(0), C(0), C(0xff), C(0xc0), C(0), C(plgv_Unicode) } -#define cc_symbol \ - { C(0), C(0), C(0), C(4), C(0), C(0), C(0), C(plgv_Unicode) } -#define cc_dingbats \ - { C(0), C(0), C(0), C(1), C(0), C(0), C(0), C(plgv_Unicode) } - /* - * Per TRM 23-87, PCL5 printers are supposed to have Univers - * and CG Times fonts. Substitute Arial for Univers and - * Times for CG Times. - */ - /* hack the vendor value to be agfa's. */ -#define agfa (4096) - /* definition for style word as defined on 11-19 PCLTRM */ -#define style_word(posture, width, structure) \ - ((posture) + (4 * (width)) + (32 * (structure))) -#define REGULAR (style_word(0, 0, 0)) -#define ITALIC (style_word(1, 0, 0)) -#define CONDENSEDITALIC (style_word(1, 1, 0)) -#define CONDENSED (style_word(0, 1, 0)) -#define LIGHT (-3) -#define NOBOLD (0) -#define MEDIUMBOLD (1) -#define TWOBOLD (2) -#define BOLD (3) -#define EXBOLD (4) - - { - fontnames("Courier", "CourierMT", "NimbusMono-Regular"), - {'C', 'o', 'u', 'r', 'i', 'e', 'r', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - ' ', ' '}, - {0, 0, {600.0, 720000.0 / 600.0}, 0, REGULAR, NOBOLD, 4099, 0}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("CGTimes", "CGTimes", "NimbusRomanNo4-Regular"), - {'C', 'G', ' ', 'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', - ' ', ' '}, - {0, 1, {295.0, 720000.0 / 295.0}, 0, REGULAR, NOBOLD, 4101, 1}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("CGTimesBold", "CGTimes-Bold", "NimbusRomanNo4-Bold"), - {'C', 'G', ' ', 'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', - 'B', 'd'}, - {0, 1, {295.0, 720000.0 / 295.0}, 0, REGULAR, BOLD, 4101, 2}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("CGTimesItalic", "CGTimes-Italic", "NimbusRomanNo4-Italic"), - {'C', 'G', ' ', 'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', - 'I', 't'}, - {0, 1, {295.0, 720000.0 / 295.0}, 0, ITALIC, NOBOLD, 4101, 3}, - cc_alphabetic, plft_Unicode}, - - { - fontnames("CGTimesBoldItalic", "CGTimes-BoldItalic", - "NimbusRomanNo4-BoldItalic"), - {'C', 'G', ' ', 'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', 'B', 'd', - 'I', 't'}, - {0, 1, {295.0, 720000.0 / 295.0}, 0, ITALIC, BOLD, 4101, 4}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("CGOmega", "CGOmega", "URWClassico-Regular"), - {'C', 'G', ' ', 'O', 'm', 'e', 'g', 'a', ' ', ' ', ' ', ' ', ' ', ' ', - ' ', ' '}, - {0, 1, {276.0, 720000.0 / 276.0}, 0, REGULAR, NOBOLD, 4113, 5}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("CGOmegaBold", "CGOmega-Bold", "URWClassico-Bold"), - {'C', 'G', ' ', 'O', 'm', 'e', 'g', 'a', ' ', ' ', ' ', ' ', ' ', ' ', - 'B', 'd'}, - {0, 1, {276.0, 720000.0 / 276.0}, 0, REGULAR, BOLD, 4113, 6}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("CGOmegaItalic", "CGOmega-Italic", "URWClassico-Italic"), - {'C', 'G', ' ', 'O', 'm', 'e', 'g', 'a', ' ', ' ', ' ', ' ', ' ', ' ', - 'I', 't'}, - {0, 1, {276.0, 720000.0 / 276.0}, 0, ITALIC, NOBOLD, 4113, 7}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("CGOmegaBoldItalic", "CGOmega-BoldItalic", - "URWClassico-BoldItalic"), - {'C', 'G', ' ', 'O', 'm', 'e', 'g', 'a', ' ', ' ', ' ', ' ', 'B', 'd', - 'I', 't'}, - {0, 1, {276.0, 720000.0 / 276.0}, 0, ITALIC, BOLD, 4113, 8}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Coronet", "Coronet", "C093-Regular"), - {'C', 'o', 'r', 'o', 'n', 'e', 't', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - ' ', ' '}, - {0, 1, {203.0, 720000.0 / 203.0}, 0, ITALIC, NOBOLD, 4116, 9}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("ClarendonCondensedBold", "Clarendon-Condensed-Bold", - "C011Condensed-Bold"), - {'C', 'l', 'a', 'r', 'e', 'n', 'd', 'o', 'n', ' ', ' ', ' ', 'C', 'd', - 'B', 'd'}, - {0, 1, {221.0, 720000.0 / 221.0}, 0, CONDENSED, BOLD, 4140, 10}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("UniversMedium", "Univers-Medium", "URWClassicSans-Regular"), - {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - 'M', 'd'}, - {0, 1, {332.0, 720000.0 / 332.0}, 0, REGULAR, NOBOLD, 4148, 11}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("UniversBold", "Univers-Bold", "URWClassicSans-Bold"), - {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - 'B', 'd'}, - {0, 1, {332.0, 720000.0 / 332.0}, 0, REGULAR, BOLD, 4148, 12}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("UniversMediumItalic", "Univers-MediumItalic", "URWClassicSans-RegularItalic"), - {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', 'M', 'd', - 'I', 't'}, - {0, 1, {332.0, 720000.0 / 332.0}, 0, ITALIC, NOBOLD, 4148, 13}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("UniversBoldItalic", "Univers-BoldItalic", "URWClassicSans-BoldItalic"), - {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', 'B', 'd', - 'I', 't'}, - {0, 1, {332.0, 720000.0 / 332.0}, 0, ITALIC, BOLD, 4148, 14}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("UniversCondensedMedium", "Univers-Condensed-Medium", - "URWClassicSansCond-Regular"), - {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', 'C', 'd', - 'M', 'd'}, - {0, 1, {221.0, 720000.0 / 221.0}, 0, CONDENSED, NOBOLD, 4148, 15}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("UniversCondensedBold", "Univers-Condensed-Bold", - "URWClassicSansCond-Bold"), - {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', ' ', ' ', 'C', 'd', - 'B', 'd'}, - {0, 1, {221.0, 720000.0 / 221.0}, 0, CONDENSED, BOLD, 4148, 16}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("UniversCondensedMediumItalic", - "Univers-Condensed-MediumItalic", "URWClassicSansCond-Italic"), - {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', 'C', 'd', 'M', 'd', - 'I', 't'}, - {0, 1, {221.0, 720000.0 / 221.0}, 0, CONDENSEDITALIC, NOBOLD, 4148, 17}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("UniversCondensedBoldItalic", "Univers-Condensed-BoldItalic", - "URWClassicSansCond-BoldItalic"), - {'U', 'n', 'i', 'v', 'e', 'r', 's', ' ', ' ', ' ', 'C', 'd', 'B', 'd', - 'I', 't'}, - {0, 1, {221.0, 720000.0 / 221.0}, 0, CONDENSEDITALIC, BOLD, 4148, 18}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("AntiqueOlive", "AntiqueOlive", "AntiqueOlive-Regular"), - {'A', 'n', 't', 'i', 'q', 'O', 'l', 'i', 'v', 'e', ' ', ' ', ' ', ' ', - ' ', ' '}, - {0, 1, {295.0, 720000.0 / 295.0}, 0, REGULAR, NOBOLD, 4168, 19}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("AntiqueOliveBold", "AntiqueOlive-Bold", "AntiqueOlive-Bold"), - {'A', 'n', 't', 'i', 'q', 'O', 'l', 'i', 'v', 'e', ' ', ' ', ' ', ' ', - 'B', 'd'}, - {0, 1, {332.0, 720000.0 / 332.0}, 0, REGULAR, BOLD, 4168, 20}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("AntiqueOliveItalic", "AntiqueOlive-Italic", - "AntiqueOlive-Italic"), - {'A', 'n', 't', 'i', 'q', 'O', 'l', 'i', 'v', 'e', ' ', ' ', ' ', ' ', - 'I', 't'}, - {0, 1, {294.0, 720000.0 / 294.0}, 0, ITALIC, NOBOLD, 4168, 21}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("GaramondAntiqua", "Garamond-Antiqua", "Garamond-Antiqua"), - {'G', 'a', 'r', 'a', 'm', 'o', 'n', 'd', ' ', 'A', 'n', 't', 'i', 'q', - 'u', 'a'}, - {0, 1, {258.0, 720000.0 / 258.0}, 0, REGULAR, NOBOLD, 4197, 22}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("GaramondHalbfett", "Garamond-Halbfett", "Garamond-Halbfett"), - {'G', 'a', 'r', 'a', 'm', 'o', 'n', 'd', ' ', ' ', ' ', ' ', ' ', 'H', - 'l', 'b'}, - {0, 1, {276.0, 720000.0 / 276.0}, 0, REGULAR, BOLD, 4197, 23}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("GaramondKursiv", "Garamond-Kursiv", "Garamond-Kursiv"), - {'G', 'a', 'r', 'a', 'm', 'o', 'n', 'd', ' ', ' ', ' ', ' ', 'K', 'r', - 's', 'v'}, - {0, 1, {240.0, 720000.0 / 240.0}, 0, ITALIC, NOBOLD, 4197, 24}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("GaramondKursivHalbfett", "Garamond-KursivHalbfett", - "Garamond-KursivHalbfett"), - {'G', 'a', 'r', 'a', 'm', 'o', 'n', 'd', ' ', 'K', 'r', 's', 'v', 'H', - 'l', 'b'}, - {0, 1, {258.0, 720000.0 / 258.0}, 0, ITALIC, BOLD, 4197, 25}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Marigold", "Marigold", "Mauritius-Regular"), - {'M', 'a', 'r', 'i', 'g', 'o', 'l', 'd', ' ', ' ', ' ', ' ', ' ', ' ', - ' ', ' '}, - {0, 1, {221.0, 720000.0 / 221.0}, 0, REGULAR, NOBOLD, 4297, 26}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("AlbertusMedium", "Albertus-Medium", "Algiers-Medium"), - {'A', 'l', 'b', 'e', 'r', 't', 'u', 's', ' ', ' ', ' ', ' ', ' ', ' ', - 'M', 'd'}, - {0, 1, {313.0, 720000.0 / 313.0}, 0, REGULAR, MEDIUMBOLD, 4362, 27}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("AlbertusExtraBold", "Albertus-ExtraBold", "Algiers-ExtraBold"), - {'A', 'l', 'b', 'e', 'r', 't', 'u', 's', ' ', ' ', ' ', ' ', ' ', ' ', - 'X', 'b'}, - {0, 1, {369.0, 720000.0 / 369.0}, 0, REGULAR, EXBOLD, 4362, 28}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Arial", "Arial", "NimbusSansNo2-Regular"), - {'A', 'r', 'i', 'a', 'l', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - ' ', ' '}, - {0, 1, {278.0, 720000.0 / 278.0}, 0, REGULAR, NOBOLD, 16602, 29}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Arial-BoldMT", "Arial-Bold", "NimbusSansNo2-Bold"), - {'A', 'r', 'i', 'a', 'l', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - 'B', 'd'}, - {0, 1, {278.0, 720000.0 / 278.0}, 0, REGULAR, BOLD, 16602, 30}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Arial-ItalicMT", "Arial-Italic", "NimbusSansNo2-Italic"), - {'A', 'r', 'i', 'a', 'l', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - 'I', 't'}, - {0, 1, {278.0, 720000.0 / 278.0}, 0, ITALIC, NOBOLD, 16602, 31}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Arial-BoldItalicMT", "Arial-BoldItalic", "NimbusSansNo2-BoldItalic"), - {'A', 'r', 'i', 'a', 'l', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'B', 'd', - 'I', 't'}, - {0, 1, {278.0, 720000.0 / 278.0}, 0, ITALIC, BOLD, 16602, 32}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("TimesNewRoman", "TimesNewRoman", "NimbusRomanNo9-Regular"), - {'T', 'i', 'm', 'e', 's', 'N', 'e', 'w', 'R', 'm', 'n', ' ', ' ', ' ', - ' ', ' '}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, NOBOLD, 16901, 33}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("TimesNewRoman-Bold", "TimesNewRoman-Bold", - "NimbusRomanNo9-Bold"), - {'T', 'i', 'm', 'e', 's', 'N', 'e', 'w', 'R', 'm', 'n', ' ', ' ', ' ', - 'B', 'd'}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, BOLD, 16901, 34}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("TimesNewRoman-Italic", "TimesNewRoman-Italic", - "NimbusRomanNo9-Italic"), - {'T', 'i', 'm', 'e', 's', 'N', 'e', 'w', 'R', 'm', 'n', ' ', ' ', ' ', - 'I', 't'}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, NOBOLD, 16901, 36}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("TimesNewRoman-BoldItalic", "TimesNewRoman-BoldItalic", - "NimbusRomanNo9-BoldItalic"), - {'T', 'i', 'm', 'e', 's', 'N', 'e', 'w', 'R', 'm', 'n', ' ', 'B', 'd', - 'I', 't'}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, BOLD, 16901, 35}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Helvetica", "Helvetica", "NimbusSans-Regular"), - {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', ' ', ' ', - ' ', ' '}, - {0, 1, {278.0, 720000.0 / 278.0}, 0, REGULAR, NOBOLD, 24580, 37}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Helvetica-Bold", "Helvetica-Bold", "NimbusSans-Bold"), - {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', ' ', ' ', - 'B', 'd'}, - {0, 1, {278.0, 720000.0 / 278.0}, 0, REGULAR, BOLD, 24580, 38}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Helvetica-BoldOblique", "Helvetica-BoldOblique", - "NimbusSans-BoldOblique"), - {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', 'B', 'd', - 'O', 'b'}, - {0, 1, {278.0, 720000.0 / 278.0}, 0, ITALIC, BOLD, 24580, 40}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Helvetica-Narrow", "Helvetica-Narrow", "NimbusSansNarrow-Regular"), - {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', ' ', ' ', - 'N', 'r'}, - {0, 1, {228.0, 720000.0 / 228.0}, 0, CONDENSED, NOBOLD, 24580, 41}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Helvetica-Narrow-Bold", "Helvetica-Narrow-Bold", - "NimbusSansNarrow-Bold"), - {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', 'N', 'r', - 'B', 'd'}, - {0, 1, {228.0, 720000.0 / 228.0}, 0, CONDENSED, BOLD, 24580, 42}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Helvetica-Narrow-BoldOblique", "Helvetica-Narrow-BoldOblique", - "NimbusSansNarrow-BoldOblique"), - {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', 'N', 'r', 'B', 'd', - 'O', 'b'}, - {0, 1, {228.0, 720000.0 / 228.0}, 0, CONDENSEDITALIC, BOLD, 24580, 44}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Helvetica-Narrow-Oblique", "Helvetica-Narrow-Oblique", - "NimbusSansNarrow-Oblique"), - {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', 'N', 'r', - 'O', 'b'}, - {0, 1, {228.0, 720000.0 / 228.0}, 0, CONDENSEDITALIC, NOBOLD, 24580, 43}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Helvetica-Oblique", "Helvetica-Oblique", - "NimbusSans-Oblique"), - {'H', 'e', 'l', 'v', 'e', 't', 'i', 'c', 'a', ' ', ' ', ' ', ' ', ' ', - 'O', 'b'}, - {0, 1, {278.0, 720000.0 / 278.0}, 0, ITALIC, NOBOLD, 24580, 39}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Palatino-Roman", "Palatino-Roman", "P052-Roman"), - {'P', 'a', 'l', 'a', 't', 'i', 'n', 'o', ' ', ' ', ' ', ' ', ' ', 'R', - 'm', 'n'}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, NOBOLD, 24591, 45}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Palatino-Italic", "Palatino-Italic", "P052-Italic"), - {'P', 'a', 'l', 'a', 't', 'i', 'n', 'o', ' ', ' ', ' ', ' ', ' ', ' ', - 'I', 't'}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, NOBOLD, 24591, 47}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Palatino-Bold", "Palatino-Bold", "P052-Bold"), - {'P', 'a', 'l', 'a', 't', 'i', 'n', 'o', ' ', ' ', ' ', ' ', ' ', ' ', - 'B', 'd'}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, BOLD, 24591, 46}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Palatino-BoldItalic", "Palatino-BoldItalic", - "P052-BoldItalic"), - {'P', 'a', 'l', 'a', 't', 'i', 'n', 'o', ' ', ' ', ' ', ' ', 'B', 'd', - 'I', 't'}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, BOLD, 24591, 48}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("AvantGarde-Book", "AvantGarde-Book", "URWGothic-Book"), - {'I', 'T', 'C', 'A', 'v', 'a', 'n', 't', 'G', 'a', 'r', 'd', ' ', ' ', - 'B', 'k'}, - {0, 1, {277.0, 720000.0 / 277.0}, 0, REGULAR, NOBOLD, 24607, 49}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("AvantGarde-Demi", "AvantGarde-Demi", "URWGothic-Demi"), - {'I', 'T', 'C', 'A', 'v', 'a', 'n', 't', 'G', 'a', 'r', 'd', ' ', ' ', - 'D', 'b'}, - {0, 1, {280.0, 720000.0 / 280.0}, 0, REGULAR, TWOBOLD, 24607, 50}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("AvantGarde-BookOblique", "AvantGarde-BookOblique", - "URWGothic-BookOblique"), - {'I', 'T', 'C', 'A', 'v', 'a', 'n', 't', 'G', 'a', 'r', 'd', 'B', 'k', - 'O', 'b'}, - {0, 1, {277.0, 720000.0 / 277.0}, 0, ITALIC, NOBOLD, 24607, 51}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("AvantGarde-DemiOblique", "AvantGarde-DemiOblique", - "URWGothic-DemiOblique"), - {'I', 'T', 'C', 'A', 'v', 'a', 'n', 't', 'G', 'a', 'r', 'd', 'D', 'b', - 'O', 'b'}, - {0, 1, {280.0, 720000.0 / 280.0}, 0, ITALIC, TWOBOLD, 24607, 52}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Bookman-Light", "Bookman-Light", "URWBookman-Light"), - {'I', 'T', 'C', 'B', 'o', 'o', 'k', 'm', 'a', 'n', ' ', ' ', ' ', ' ', - 'L', 't'}, - {0, 1, {320.0, 720000.0 / 320.0}, 0, REGULAR, LIGHT, 24623, 53}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Bookman-Demi", "Bookman-Demi", "URWBookman-Demi"), - {'I', 'T', 'C', 'B', 'o', 'o', 'k', 'm', 'a', 'n', ' ', ' ', ' ', ' ', - 'D', 'b'}, - {0, 1, {340.0, 720000.0 / 340.0}, 0, REGULAR, TWOBOLD, 24623, 54}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Bookman-LightItalic", "Bookman-LightItalic", - "URWBookman-LightItalic"), - {'I', 'T', 'C', 'B', 'o', 'o', 'k', 'm', 'a', 'n', ' ', ' ', 'L', 't', - 'I', 't'}, - {0, 1, {300.0, 720000.0 / 300.0}, 0, ITALIC, LIGHT, 24623, 55}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Bookman-DemiItalic", "Bookman-DemiItalic", - "URWBookman-DemiItalic"), - {'I', 'T', 'C', 'B', 'o', 'o', 'k', 'm', 'a', 'n', ' ', ' ', 'D', 'b', - 'I', 't'}, - {0, 1, {340.0, 720000.0 / 340.0}, 0, ITALIC, TWOBOLD, 24623, 56}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("NewCenturySchlbk-Bold", "NewCenturySchlbk-Bold", - "C059-Bold"), - {'N', 'w', 'C', 'e', 'n', 't', 'S', 'c', 'h', 'l', 'b', 'k', ' ', ' ', - 'B', 'd'}, - {0, 1, {287.0, 720000.0 / 287.0}, 0, REGULAR, BOLD, 24703, 57}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("NewCenturySchlbk-BoldItalic", "NewCenturySchlbk-BoldItalic", - "C059-BdIta"), - {'N', 'w', 'C', 'e', 'n', 't', 'S', 'c', 'h', 'l', 'b', 'k', 'B', 'd', - 'I', 't'}, - {0, 1, {287.0, 720000.0 / 287.0}, 0, ITALIC, BOLD, 24703, 58}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("NewCenturySchlbk-Italic", "NewCenturySchlbk-Italic", - "C059-Italic"), - {'N', 'w', 'C', 'e', 'n', 't', 'S', 'c', 'h', 'l', 'b', 'k', ' ', ' ', - 'I', 't'}, - {0, 1, {278.0, 720000.0 / 278.0}, 0, ITALIC, NOBOLD, 24703, 59}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("NewCenturySchlbk-Roman", "NewCenturySchlbk-Roman", - "C059-Roman"), - {'N', 'w', 'C', 'e', 'n', 't', 'S', 'c', 'h', 'l', 'b', 'k', ' ', 'R', - 'm', 'n'}, - {0, 1, {278.0, 720000.0 / 278.0}, 0, REGULAR, NOBOLD, 24703, 60}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Times-Roman", "Times-Roman", "NimbusRoman-Regular"), - {'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'R', - 'm', 'n'}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, NOBOLD, 25093, 61}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Times-Bold", "Times-Bold", "NimbusRoman-Bold"), - {'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - 'B', 'd'}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, BOLD, 25093, 62}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Times-Italic", "Times-Italic", "NimbusRoman-Italic"), - {'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - 'I', 't'}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, NOBOLD, 25093, 63}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Times-BoldItalic", "Times-BoldItalic", - "NimbusRoman-BoldItalic"), - {'T', 'i', 'm', 'e', 's', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'B', 'd', - 'I', 't'}, - {0, 1, {250.0, 720000.0 / 250.0}, 0, ITALIC, BOLD, 25093, 64}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("ZapfChancery-MediumItalic", "ZapfChancery-MediumItalic", - "Z003-MediumItalic"), - {'Z', 'a', 'p', 'f', 'C', 'h', 'a', 'n', 'c', 'e', 'r', 'y', 'M', 'd', - 'I', 't'}, - {0, 1, {220.0, 720000.0 / 220.0}, 0, ITALIC, NOBOLD, 45099, 65}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("SymbolMT", "Symbol", "Symbols"), - {'S', 'y', 'm', 'b', 'o', 'l', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - ' ', ' '}, - {621, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, NOBOLD, 16686, 66}, - cc_symbol, plft_8bit_printable - }, - - { - fontnames("SymbPS", "SymbPS", "StandardSymbolsPS"), - {'S', 'y', 'm', 'b', 'o', 'l', 'P', 'S', ' ', ' ', ' ', ' ', ' ', ' ', - ' ', ' '}, - {621, 1, {250.0, 720000.0 / 250.0}, 0, REGULAR, NOBOLD, 45358, 67}, - cc_symbol, plft_8bit_printable - }, - - { - fontnames("Wingdings-Regular", "Wingdings-Regular", "URWDings"), - {'W', 'i', 'n', 'g', 'd', 'i', 'n', 'g', 's', ' ', ' ', ' ', ' ', ' ', - ' ', ' '}, - {18540, 1, {1000.0, 720000.0 / 1000.0}, 0, REGULAR, NOBOLD, 31402, 68}, - cc_dingbats, plft_8bit}, - - { - fontnames("ZapfDingbats", "ZapfDingbats", "D050000L"), - {'Z', 'a', 'p', 'f', 'D', 'i', 'n', 'g', 'b', 'a', 't', 's', ' ', ' ', - ' ', ' '}, - {460, 1, {280.0, 720000.0 / 280.0}, 0, REGULAR, NOBOLD, 45101, 69}, - cc_dingbats, plft_8bit}, - - { - fontnames("CourierBold", "CourierMT-Bold", "NimbusMono-Bold"), - {'C', 'o', 'u', 'r', 'i', 'e', 'r', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - 'B', 'd'}, - {0, 0, {600.0, 720000.0 / 600.0}, 0, REGULAR, BOLD, 4099, 70}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("CourierItalic", "CourierMT-Italic", "NimbusMono-Italic"), - {'C', 'o', 'u', 'r', 'i', 'e', 'r', ' ', ' ', ' ', ' ', ' ', ' ', ' ', - 'I', 't'}, - {0, 0, {600.0, 720000.0 / 600.0}, 0, ITALIC, NOBOLD, 4099, 71}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("CourierBoldItalic", "CourierMT-BoldItalic", - "NimbusMono-BoldItalic"), - {'C', 'o', 'u', 'r', 'i', 'e', 'r', ' ', ' ', ' ', ' ', ' ', 'B', 'd', - 'I', 't'}, - {0, 0, {600.0, 720000.0 / 600.0}, 0, ITALIC, BOLD, 4099, 72}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("LetterGothic", "LetterGothic", "LetterGothic-Regular"), - {'L', 'e', 't', 't', 'e', 'r', 'G', 'o', 't', 'h', 'i', 'c', ' ', ' ', - ' ', ' '}, - {0, 0, {500.0, 720000.0 / 500.0}, 0, REGULAR, NOBOLD, 4102, 73}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("LetterGothicBold", "LetterGothic-Bold", "LetterGothic-Bold"), - {'L', 'e', 't', 't', 'e', 'r', 'G', 'o', 't', 'h', 'i', 'c', ' ', ' ', - 'B', 'd'}, - {0, 0, {500.0, 720000.0 / 500.0}, 0, REGULAR, BOLD, 4102, 74}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("LetterGothicItalic", "LetterGothic-Italic", - "LetterGothic-Italic"), - {'L', 'e', 't', 't', 'e', 'r', 'G', 'o', 't', 'h', 'i', 'c', ' ', ' ', - 'I', 't'}, - {0, 0, {500.0, 720000.0 / 500.0}, 0, ITALIC, NOBOLD, 4102, 75}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Courier", "Courier", "NimbusMonoPS-Regular"), - {'C', 'o', 'u', 'r', 'i', 'e', 'r', 'P', 'S', ' ', ' ', ' ', ' ', ' ', - ' ', ' '}, - {0, 0, {600.0, 720000.0 / 600.0}, 0, REGULAR, NOBOLD, 24579, 76}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Courier-Bold", "Courier-Bold", "NimbusMonoPS-Bold"), - {'C', 'o', 'u', 'r', 'i', 'e', 'r', 'P', 'S', ' ', ' ', ' ', ' ', ' ', - 'B', 'd'}, - {0, 0, {600.0, 720000.0 / 600.0}, 0, REGULAR, BOLD, 24579, 77}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Courier-BoldOblique", "Courier-BoldOblique", - "NimbusMonoPS-BoldItalic"), - {'C', 'o', 'u', 'r', 'i', 'e', 'r', 'P', 'S', ' ', ' ', ' ', 'B', 'd', - 'O', 'b'}, - {0, 0, {600.0, 720000.0 / 600.0}, 0, ITALIC, BOLD, 24579, 78}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("Courier-Oblique", "Courier-Oblique", "NimbusMonoPS-Italic"), - {'C', 'o', 'u', 'r', 'i', 'e', 'r', 'P', 'S', ' ', ' ', ' ', ' ', ' ', - 'O', 'b'}, - {0, 0, {600.0, 720000.0 / 600.0}, 0, ITALIC, NOBOLD, 24579, 79}, - cc_alphabetic, plft_Unicode - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '0', 'N'}, - {14, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 80}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '6', 'N'}, - {206, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 81}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '9', 'N'}, - {302, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 82}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', - '1', '0', 'U'}, - {341, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 83}, - cc_alphabetic, plft_8bit_printable - }, - - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', '1', - '1', 'U'}, - {373, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 84}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', '1', - '2', 'U'}, - {405, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 85}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '1', 'U'}, - {53, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 86}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '2', 'N'}, - {78, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 87}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '5', 'N'}, - {174, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 88}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '8', 'U'}, - {277, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 89}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '0', 'U'}, - {21, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 90}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '1', 'E'}, - {37, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 91}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '1', 'F'}, - {38, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 92}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '1', 'G'}, - {39, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 93}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '0', 'I'}, - {9, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 94}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '0', 'S'}, - {19, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 95}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '2', 'S'}, - {83, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 96}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '0', 'D'}, - {4, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 97}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '1', 'O'}, - {47, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 98}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', '1', - '3', 'J'}, - {426, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 99}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', '1', - '3', 'U'}, - {437, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 100}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("noname", "noname", "ArtLinePrinter"), - {'L', 'i', 'n', 'e', ' ', 'P', 'r', 'i', 'n', 't', 'e', 'r', ' ', ' ', - '4', 'U'}, - {149, 0, {431.0, 720000.0 / 431.0}, 34, REGULAR, NOBOLD, 0, 101}, - cc_alphabetic, plft_8bit_printable - }, - - { - fontnames("", "", ""), - {'0', '0'}, - {0, 0, {0, 0}, 0, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0, 0, 0}, 0 - } - -#undef C -#undef cc_alphabetic -#undef cc_symbol -#undef cc_dingbats -#undef pitch_1 -#undef agfa_value +enum { + AGFASCREENNAME = 0, + AGFANAME = 1, + URWNAME = 2 }; -/* a null entry terminates the list, so - 1 */ -const int pl_built_in_resident_font_table_count = - countof(resident_table) - 1; -#endif /* fontnames */ - +extern const font_resident_t pl_built_in_resident_font_table[]; +extern const int pl_built_in_resident_font_table_count; + +#endif /* plftable_INCLUDED */ diff --git a/pcl/pl/pllfont.c b/pcl/pl/pllfont.c index ef238e2fc..038ac5b33 100644 --- a/pcl/pl/pllfont.c +++ b/pcl/pl/pllfont.c @@ -148,20 +148,19 @@ static void check_resident_ufst_fonts(pl_dict_t * pfontdict, bool use_unicode_names_for_keys, gs_memory_t * mem) { -#define fontnames(agfascreenfontname, agfaname, urwname) agfaname -#include "plftable.h" int j; - for (j = 0; strlen(resident_table[j].full_font_name) != 0 + for (j = 0; + *pl_built_in_resident_font_table[j].full_font_name[AGFANAME] != 0 && j < pl_built_in_resident_font_table_count; j++) { void *value; /* lookup unicode key in the resident table */ if (use_unicode_names_for_keys) { if (!pl_dict_lookup(pfontdict, - (const byte *)resident_table[j]. + (const byte *)pl_built_in_resident_font_table[j]. unicode_fontname, - sizeof(resident_table[j].unicode_fontname), + sizeof(pl_built_in_resident_font_table[j].unicode_fontname), &value, true, NULL) /* return data ignored */ ) { int i; @@ -169,10 +168,10 @@ check_resident_ufst_fonts(pl_dict_t * pfontdict, dmprintf(mem, "Font with unicode key: "); for (i = 0; i < - sizeof(resident_table[j].unicode_fontname) / - sizeof(resident_table[j].unicode_fontname[0]); i++) { + sizeof(pl_built_in_resident_font_table[j].unicode_fontname) / + sizeof(pl_built_in_resident_font_table[j].unicode_fontname[0]); i++) { dmprintf1(mem, "%c", - (char)resident_table[j].unicode_fontname[i]); + (char)pl_built_in_resident_font_table[j].unicode_fontname[i]); } dmprintf1(mem, " not available in font dictionary, resident table position: %d\n", @@ -190,34 +189,30 @@ check_resident_ufst_fonts(pl_dict_t * pfontdict, NULL) /* return data ignored */ ) dmprintf2(mem, "%s not available in font dictionary, resident table position: %d\n", - resident_table[j].full_font_name, j); + pl_built_in_resident_font_table[j].full_font_name, j); } } return; -#undef fontnames } static void check_resident_fonts(pl_dict_t * pfontdict, gs_memory_t * mem) { -#define fontnames(agfascreenfontname, agfaname, urwname) urwname -#include "plftable.h" int i; for (i = 0; - strlen(resident_table[i].full_font_name) != 0 + *pl_built_in_resident_font_table[i].full_font_name[URWNAME] != 0 && i < pl_built_in_resident_font_table_count; i++) if (!pl_lookup_font_by_pjl_number(pfontdict, i)) { int j; dmprintf2(mem, "%s (entry %d) not found\n", - resident_table[i].full_font_name, i); + pl_built_in_resident_font_table[i].full_font_name[URWNAME], i); dmprintf(mem, "pxl unicode name:"); - for (j = 0; j < countof(resident_table[i].unicode_fontname); j++) - dmprintf1(mem, "'%c'", resident_table[i].unicode_fontname[j]); + for (j = 0; j < countof(pl_built_in_resident_font_table[i].unicode_fontname); j++) + dmprintf1(mem, "'%c'", pl_built_in_resident_font_table[i].unicode_fontname[j]); dmprintf(mem, "\n"); } -#undef fontnames } #endif @@ -268,14 +263,12 @@ pl_load_ufst_lineprinter(gs_memory_t * mem, pl_dict_t * pfontdict, gs_font_dir * pdir, int storage, bool use_unicode_names_for_keys) { -#define fontnames(agfascreenfontname, agfaname, urwname) agfaname -#include "plftable.h" int i; for (i = 0; - strlen(resident_table[i].full_font_name) != 0 + *pl_built_in_resident_font_table[i].full_font_name[AGFANAME] != 0 && i < pl_built_in_resident_font_table_count; i++) { - if (resident_table[i].params.typeface_family == 0) { + if (pl_built_in_resident_font_table[i].params.typeface_family == 0) { const byte *header = NULL; const byte *char_data = NULL; pl_font_t *pplfont = @@ -301,14 +294,14 @@ pl_load_ufst_lineprinter(gs_memory_t * mem, pl_dict_t * pfontdict, return -1; pl_fill_in_bitmap_font(pfont, gs_next_ids(mem, 1)); - pplfont->params = resident_table[i].params; + pplfont->params = pl_built_in_resident_font_table[i].params; memcpy(pplfont->character_complement, - resident_table[i].character_complement, 8); + pl_built_in_resident_font_table[i].character_complement, 8); if (use_unicode_names_for_keys) code = pl_dict_put(pfontdict, - (const byte *)resident_table[i].unicode_fontname, - sizeof(resident_table[i].unicode_fontname), pplfont); + (const byte *)pl_built_in_resident_font_table[i].unicode_fontname, + sizeof(pl_built_in_resident_font_table[i].unicode_fontname), pplfont); else { byte key[3]; @@ -363,7 +356,6 @@ pl_load_ufst_lineprinter(gs_memory_t * mem, pl_dict_t * pfontdict, } } return 0; -#undef fontnames } static int @@ -371,9 +363,6 @@ pl_load_built_in_mtype_fonts(const char *pathname, gs_memory_t * mem, pl_dict_t * pfontdict, gs_font_dir * pdir, int storage, bool use_unicode_names_for_keys) { -#define fontnames(agfascreenfontname, agfaname, urwname) agfaname -#include "plftable.h" - int i, k; short status = 0; int bSize; @@ -386,8 +375,6 @@ pl_load_built_in_mtype_fonts(const char *pathname, gs_memory_t * mem, gs_font *pfont = NULL; gs_font_base *pbfont; - (void)pl_built_in_resident_font_table_count; - /* don't load fonts more than once */ if (pl_dict_length(pfontdict, true) > 0) return 1; @@ -493,9 +480,9 @@ pl_load_built_in_mtype_fonts(const char *pathname, gs_memory_t * mem, pname = symname; } - for (j = 0; strlen(resident_table[j].full_font_name); j++) { + for (j = 0; *pl_built_in_resident_font_table[j].full_font_name[AGFANAME]; j++) { if (strcmp - ((char *)resident_table[j].full_font_name, + ((char *)pl_built_in_resident_font_table[j].full_font_name, (char *)pname) != 0) continue; @@ -511,10 +498,10 @@ pl_load_built_in_mtype_fonts(const char *pathname, gs_memory_t * mem, plfont->pts_per_inch = 72.307f; } - plfont->font_type = resident_table[j].font_type; + plfont->font_type = pl_built_in_resident_font_table[j].font_type; plfont->storage = storage; plfont->data_are_permanent = false; - plfont->params = resident_table[j].params; + plfont->params = pl_built_in_resident_font_table[j].params; /* * NB: though the TTFONTINFOTYPE structure has a @@ -524,7 +511,7 @@ pl_load_built_in_mtype_fonts(const char *pathname, gs_memory_t * mem, * initialization structure is used. */ memcpy(plfont->character_complement, - resident_table[j].character_complement, 8); + pl_built_in_resident_font_table[j].character_complement, 8); status = gs_definefont(pdir, (gs_font *) pfont); if (status < 0) { @@ -540,8 +527,8 @@ pl_load_built_in_mtype_fonts(const char *pathname, gs_memory_t * mem, } if (use_unicode_names_for_keys) code = pl_dict_put(pfontdict, - (const byte *)resident_table[j].unicode_fontname, - sizeof(resident_table[j].unicode_fontname), + (const byte *)pl_built_in_resident_font_table[j].unicode_fontname, + sizeof(pl_built_in_resident_font_table[j].unicode_fontname), plfont); else { key[2] = (byte) j; @@ -581,7 +568,6 @@ pl_load_built_in_mtype_fonts(const char *pathname, gs_memory_t * mem, return (1); return (0); -#undef fontnames } @@ -591,8 +577,6 @@ pl_load_built_in_fonts(const char *pathname, gs_memory_t * mem, pl_dict_t * pfontdict, gs_font_dir * pdir, int storage, bool use_unicode_names_for_keys) { -#define fontnames(agfascreenfontname, agfaname, urwname) urwname -#include "plftable.h" const font_resident_t *residentp; /* get rid of this should be keyed by pjl font number */ byte key[3]; @@ -602,8 +586,6 @@ pl_load_built_in_fonts(const char *pathname, gs_memory_t * mem, file_enum *fe; int code = 0; - (void)pl_built_in_resident_font_table_count; - if ((code = pl_load_built_in_mtype_fonts(pathname, mem, pfontdict, pdir, storage, use_unicode_names_for_keys))) { @@ -665,9 +647,9 @@ pl_load_built_in_fonts(const char *pathname, gs_memory_t * mem, /* lookup the font file name in the resident table */ found = false; - for (residentp = resident_table; - strlen(residentp->full_font_name); ++residentp) { - if (strcmp(buffer, residentp->full_font_name) != 0) + for (residentp = pl_built_in_resident_font_table; + *residentp->full_font_name[URWNAME]; ++residentp) { + if (strcmp(buffer, residentp->full_font_name[URWNAME]) != 0) continue; /* load the font file into memory. NOTE: this closes the file - argh... */ if (pl_load_tt_font(in, pdir, mem, @@ -707,7 +689,7 @@ pl_load_built_in_fonts(const char *pathname, gs_memory_t * mem, sizeof(residentp->unicode_fontname), plfont); else { - key[2] = (byte) (residentp - resident_table); + key[2] = (byte) (residentp - pl_built_in_resident_font_table); key[0] = key[1] = 0; code = pl_dict_put(pfontdict, key, sizeof(key), plfont); /* leave data stored in the file. NB this should be a fatal error also. */ @@ -750,7 +732,6 @@ pl_load_built_in_fonts(const char *pathname, gs_memory_t * mem, check_resident_fonts(pfontdict, mem); #endif return found_any; -#undef fontnames } /* These are not implemented */ |