upstream svn31313 fix for pdftex and luatex --- texk/web2c/luatexdir/ChangeLog | 5 +++++ texk/web2c/luatexdir/font/writettf.w | 7 +++---- texk/web2c/pdftexdir/ChangeLog | 5 +++++ texk/web2c/pdftexdir/ttf2afm.c | 6 +++--- texk/web2c/pdftexdir/writettf.c | 7 +++---- 5 files changed, 19 insertions(+), 11 deletions(-) --- texlive-bin.orig/texk/web2c/luatexdir/ChangeLog +++ texlive-bin/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2013-07-30 Peter Breitenlohner + + * font/writettf.w: Treat unknown 'post' table versions + (found in some broken fonts) as 3.0, i.e., no Glyph names. + 2013-07-05 Peter Breitenlohner * pdf/pdfgen.w: Use "%"LONGINTEGER_PRI"d" format specifier to --- texlive-bin.orig/texk/web2c/luatexdir/font/writettf.w +++ texlive-bin/texk/web2c/luatexdir/font/writettf.w @@ -816,14 +816,13 @@ } } break; + default: + pdftex_warn("unsupported format (%.8X) of `post' table, assuming 3.0", + (unsigned int) post_format); case 0x00030000: for (glyph = glyph_tab; glyph - glyph_tab < NMACGLYPHS; glyph++) { glyph->name_index = (TTF_USHORT) (glyph - glyph_tab); } - break; - default: - pdftex_fail("unsupported format (%.8X) of `post' table", - (unsigned int) post_format); } } --- texlive-bin.orig/texk/web2c/pdftexdir/ChangeLog +++ texlive-bin/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2013-07-30 Peter Breitenlohner + + * ttf2afm.c, writettf.c: Treat unknown 'post' table versions + (found in some broken fonts) as 3.0, i.e., no Glyph names. + 2013-04-22 Akira Kakuto * pdftex.web: pdftex_revision = "14" --- texlive-bin.orig/texk/web2c/pdftexdir/ttf2afm.c +++ texlive-bin/texk/web2c/pdftexdir/ttf2afm.c @@ -521,15 +521,15 @@ } } break; + default: + ttf_warn("unsupported format (%.8X) of `post' table, assuming 3.0", + post_format); case 0x00030000: if (print_glyph == AS_NAME) { ttf_warn ("no names available in `post' table, print glyph names as indices"); print_glyph = AS_INDEX; } - break; - default: - ttf_fail("unsupported format (%.8X) of `post' table", post_format); } ttf_seek_tab("loca", 0); if (loca_format == 1) { --- texlive-bin.orig/texk/web2c/pdftexdir/writettf.c +++ texlive-bin/texk/web2c/pdftexdir/writettf.c @@ -517,14 +517,13 @@ } } break; + default: + pdftex_warn("unsupported format (%.8X) of `post' table, assuming 3.0", + (unsigned int) post_format); case 0x00030000: for (glyph = glyph_tab; glyph - glyph_tab < NMACGLYPHS; glyph++) { glyph->name_index = glyph - glyph_tab; } - break; - default: - pdftex_fail("unsupported format (%.8X) of `post' table", - (unsigned int) post_format); } }