luaTeX, pdfTeX: treat unknown 'post' table versions as Version 3.0, i.e., without Glyph names

git-svn-id: svn://tug.org/texlive/trunk@31313 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 19 insertions, 11 deletions

diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 67310a70fd5..ac3061a279d 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* font/writettf.w: Treat unknown 'post' table versions
+	(found in some broken fonts) as 3.0, i.e., no Glyph names.
+
 2013-07-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/luatex.am, tests/luaimage.tex: Add a .pdf image.
diff --git a/Build/source/texk/web2c/luatexdir/font/writettf.w b/Build/source/texk/web2c/luatexdir/font/writettf.w
index 60f581ff34c..f20792de7cc 100644
--- a/Build/source/texk/web2c/luatexdir/font/writettf.w
+++ b/Build/source/texk/web2c/luatexdir/font/writettf.w
@@ -816,14 +816,13 @@ void ttf_read_post(void)
             }
         }
         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);
     }
 }
 
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 74bf7a85244..daf06b71a2c 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ttf2afm.c, writettf.c: Treat unknown 'post' table versions
+	(found in some broken fonts) as 3.0, i.e., no Glyph names.
+
 2013-07-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/pdftex.am, tests/pdfimage.tex: Add a .pdf image.
diff --git a/Build/source/texk/web2c/pdftexdir/ttf2afm.c b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
index 13f2b7b48ad..5ccb31ab154 100644
--- a/Build/source/texk/web2c/pdftexdir/ttf2afm.c
+++ b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
@@ -521,15 +521,15 @@ static void read_font(void)
             }
         }
         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) {
diff --git a/Build/source/texk/web2c/pdftexdir/writettf.c b/Build/source/texk/web2c/pdftexdir/writettf.c
index f92b453d7d3..30bd614c96f 100644
--- a/Build/source/texk/web2c/pdftexdir/writettf.c
+++ b/Build/source/texk/web2c/pdftexdir/writettf.c
@@ -517,14 +517,13 @@ static void ttf_read_post(void)
             }
         }
         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);
     }
 }