revert previous change - too radical - perhaps later

diff --git a/lib/common/ps_font_equiv.txt b/lib/common/ps_font_equiv.txt
index 6c4c7c5079a04e3bcf6a6404b1b2426c91569b01..ffda1d226a409398438cfe09f42dde1ab21358e8 100644 (file)
--- a/lib/common/ps_font_equiv.txt
+++ b/lib/common/ps_font_equiv.txt
@@ -1,35 +1,35 @@
-{"AvantGarde-Book",            "AvantGarde Book",              0,      0,      0,      4 },
-{"AvantGarde-BookOblique",     "AvantGarde Book Oblique",      0,      0,      0,      5 },
-{"AvantGarde-Demi",            "AvantGarde Demi",              0,      0,      0,      6 },
-{"AvantGarde-DemiOblique",     "AvantGarde Demi Oblique",      0,      0,      0,      7 },
-{"Bookman-Demi",               "Bookman Demi",                 0,      0,      0,      10},
-{"Bookman-DemiItalic",         "Bookman Demi Italic",          0,      0,      0,      11},
-{"Bookman-Light",              "Bookman Light",                0,      0,      0,      8 },
-{"Bookman-LightItalic",                "Bookman Light Italic",         0,      0,      0,      9 },
-{"Courier",                    "Courier",                      0,      0,      0,      12},
-{"Courier-Bold",               "Courier Bold",                 0,      0,      0,      14},
-{"Courier-BoldOblique",                "Courier Bold Oblique",         0,      0,      0,      15},
-{"Courier-Oblique",            "Courier Oblique",              0,      0,      0,      13},
-{"Helvetica",                  "Helvetica",                    0,      0,      0,      16},
-{"Helvetica-Bold",             "Helvetica Bold",               0,      0,      0,      18},
-{"Helvetica-BoldOblique",      "Helvetica Bold Oblique",       0,      0,      0,      19},
-{"Helvetica-Narrow",           "Helvetica Narrow",             0,      0,      0,      20},
-{"Helvetica-Narrow-Bold",      "Helvetica Narrow Bold",        0,      0,      0,      22},
-{"Helvetica-Narrow-BoldOblique","Helvetica Narrow Bold Oblique",0,     0,      0,      23},
-{"Helvetica-Narrow-Oblique",   "Helvetica Narrow Oblique",     0,      0,      0,      21},
-{"Helvetica-Oblique",          "Helvetica Oblique",            0,      0,      0,      17},
-{"NewCenturySchlbk-Bold",      "NewCenturySchlbk Bold",        0,      0,      0,      26},
-{"NewCenturySchlbk-BoldItalic",        "NewCenturySchlbk Bold Italic", 0,      0,      0,      27},
-{"NewCenturySchlbk-Italic",    "NewCenturySchlbk Italic",      0,      0,      0,      25},
-{"NewCenturySchlbk-Roman",     "NewCenturySchlbk Roman",       0,      0,      0,      24},
-{"Palatino-Bold",              "Palatino Bold",                0,      0,      0,      30},
-{"Palatino-BoldItalic",                "Palatino Bold Italic",         0,      0,      0,      31},
-{"Palatino-Italic",            "Palatino Italic",              0,      0,      0,      29},
-{"Palatino-Roman",             "Palatino Roman",               0,      0,      0,      28},
-{"Symbol",                     "Symbol",                       0,      0,      0,      32},
-{"Times-Bold",                 "Times Bold",                   0,      0,      0,      2 },
-{"Times-BoldItalic",           "Times Bold Italic",            0,      0,      0,      3 },
-{"Times-Italic",               "Times Italic",                 0,      0,      0,      1 },
-{"Times-Roman",                        "Times Roman",                  0,      0,      0,      0 },
-{"ZapfChancery-MediumItalic",  "ZapfChancery Medium Italic",   0,      0,      0,      33},
-{"ZapfDingbats",               "ZapfDingbats",                 0,      0,      0,      34},
+{"AvantGarde-Book",            "URW Gothic L",         "book",         0,              0,              4 },
+{"AvantGarde-BookOblique",     "URW Gothic L",         "book",         0,              "oblique",      5 },
+{"AvantGarde-Demi",            "URW Gothic L",         "demi",         0,              0,              6 },
+{"AvantGarde-DemiOblique",     "URW Gothic L",         "demi",         0,              "oblique",      7 },
+{"Bookman-Demi",               "URW Bookman L",        "demi",         0,              0,              10},
+{"Bookman-DemiItalic",         "URW Bookman L",        "demi",         0,              "italic",       11},
+{"Bookman-Light",              "URW Bookman L",        "light",        0,              0,              8 },
+{"Bookman-LightItalic",                "URW Bookman L",        "light",        0,              "italic",       9 },
+{"Courier",                    COURIER,                0,              0,              0,              12},
+{"Courier-Bold",               COURIER,                "bold",         0,              0,              14},
+{"Courier-BoldOblique",                COURIER,                "bold",         0,              "oblique",      15},
+{"Courier-Oblique",            COURIER,                0,              0,              "oblique",      13},
+{"Helvetica",                  HELVETICA,              0,              0,              0,              16},
+{"Helvetica-Bold",             HELVETICA,              "bold",         0,              0,              18},
+{"Helvetica-BoldOblique",      HELVETICA,              "bold",         0,              "oblique",      19},
+{"Helvetica-Narrow",           HELVETICA,              0,              "condensed",    0,              20},
+{"Helvetica-Narrow-Bold",      HELVETICA,              "bold",         "condensed",    0,              22},
+{"Helvetica-Narrow-BoldOblique",HELVETICA,             "bold",         "condensed",    "oblique",      23},
+{"Helvetica-Narrow-Oblique",   HELVETICA,              0,              "condensed",    "oblique",      21},
+{"Helvetica-Oblique",          HELVETICA,              0,              0,              "oblique",      17},
+{"NewCenturySchlbk-Bold",      "Century Schoolbook L", "bold",         0,              0,              26},
+{"NewCenturySchlbk-BoldItalic",        "Century Schoolbook L", "bold",         0,              "italic",       27},
+{"NewCenturySchlbk-Italic",    "Century Schoolbook L", 0,              0,              "italic",       25},
+{"NewCenturySchlbk-Roman",     "Century Schoolbook L", "roman",        0,              0,              24},
+{"Palatino-Bold",              PALATINO,               "bold",         0,              0,              30},
+{"Palatino-BoldItalic",                PALATINO,               "bold",         0,              "italic",       31},
+{"Palatino-Italic",            PALATINO,               0,              0,              "italic",       29},
+{"Palatino-Roman",             PALATINO,               "roman",        0,              0,              28},
+{"Symbol",                     SYMBOL,                 0,              0,              0,              32},
+{"Times-Bold",                 TIMES,                  "medium",       0,              0,              2 },
+{"Times-BoldItalic",           TIMES,                  "medium",       0,              "italic",       3 },
+{"Times-Italic",               TIMES,                  0,              0,              "italic",       1 },
+{"Times-Roman",                        TIMES,                  0,              0,              0,              0 },
+{"ZapfChancery-MediumItalic",  "URW Chancery L",       "medium",       0,              "italic",       33},
+{"ZapfDingbats",               "Dingbats",             0,              0,              0,              34},