diff options
| -rw-r--r-- | Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog | 2 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/fontmap.c | 18 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/ChangeLog.TL | 2 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/src/fontmap.c | 18 |
4 files changed, 24 insertions, 16 deletions
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog index d088d78d8af..d1b67915c5f 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog @@ -4,7 +4,7 @@ ChangeLog: Changes for DVIPDFMx =============================== 2012-05-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp> - * fontmap.c: fix a typo + * fontmap.c: fix a typo. allow pdftex.map without PS name. 2012-04-20 Norbert Preining <preining@logic.at> diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/fontmap.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/fontmap.c index 11aa8f81546..f0c701bd8c3 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/fontmap.c +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/fontmap.c @@ -566,13 +566,17 @@ fontmap_parse_mapdef_dps (fontmap_rec *mrec, skip_blank(&p, endptr); /* The first field (after TFM name) must be PostScript name. */ - if (p < endptr) { - q = parse_string_value(&p, endptr); - if (q) RELEASE(q); - skip_blank(&p, endptr); - } else { - WARN("Missing a PostScript font name."); - return -1; + /* However, pdftex.map allows a line without PostScript name. */ + + if (*p != '"' && *p != '<') { + if (p < endptr) { + q = parse_string_value(&p, endptr); + if (q) RELEASE(q); + skip_blank(&p, endptr); + } else { + WARN("Missing a PostScript font name."); + return -1; + } } if (p >= endptr) return 0; diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL index ccfdde706d3..5b057b955d3 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog.TL +++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL @@ -3,7 +3,7 @@ ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx 2012-05-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp> - * fontmap.c: fix a typo. + * fontmap.c: fix a typo. allow pdftex.map without PS name. 2012-04-27 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/texk/xdvipdfmx/src/fontmap.c b/Build/source/texk/xdvipdfmx/src/fontmap.c index 0d8c229ef5a..cb9817b5ffc 100644 --- a/Build/source/texk/xdvipdfmx/src/fontmap.c +++ b/Build/source/texk/xdvipdfmx/src/fontmap.c @@ -593,13 +593,17 @@ fontmap_parse_mapdef_dps (fontmap_rec *mrec, skip_blank(&p, endptr); /* The first field (after TFM name) must be PostScript name. */ - if (p < endptr) { - q = parse_string_value(&p, endptr); - if (q) RELEASE(q); - skip_blank(&p, endptr); - } else { - WARN("Missing a PostScript font name."); - return -1; + /* However, pdftex.map allows a line without PostScript name. */ + + if (*p != '"' && *p != '<') { + if (p < endptr) { + q = parse_string_value(&p, endptr); + if (q) RELEASE(q); + skip_blank(&p, endptr); + } else { + WARN("Missing a PostScript font name."); + return -1; + } } if (p >= endptr) return 0; |