diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2012-05-06 02:59:09 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2012-05-06 02:59:09 +0000 |
commit | e32c88ce7825f06c60d6979514ed58eb9d52ad1f (patch) | |
tree | 1d45ab2726cc4afafa30061c6b2ac1b4e6c0992f /Build/source/texk/xdvipdfmx | |
parent | 7d64ebb4d26fdcfa7bb0fe488ee1cb0b5417b3af (diff) |
allow to read a map file without PS name
git-svn-id: svn://tug.org/texlive/trunk@26226 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvipdfmx')
-rw-r--r-- | Build/source/texk/xdvipdfmx/ChangeLog.TL | 2 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/fontmap.c | 18 |
2 files changed, 12 insertions, 8 deletions
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; |