last-minute luatex fixes

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

1 files changed, 13 insertions, 13 deletions

diff --git a/Build/source/texk/web2c/luatexdir/font/writefont.w b/Build/source/texk/web2c/luatexdir/font/writefont.w
index 5db7218f15a..5749f633333 100644
--- a/Build/source/texk/web2c/luatexdir/font/writefont.w
+++ b/Build/source/texk/web2c/luatexdir/font/writefont.w
@@ -20,8 +20,8 @@
 
 @ @c
 static const char _svn_version[] =
-    "$Id: writefont.w 3836 2010-08-29 09:29:04Z taco $ "
-"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.66.0/source/texk/web2c/luatexdir/font/writefont.w $";
+    "$Id: writefont.w 4269 2011-05-16 06:08:10Z taco $ "
+"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.70.x/source/texk/web2c/luatexdir/font/writefont.w $";
 
 #include "ptexlib.h"
 #include "lua/luatex-api.h"
@@ -519,17 +519,17 @@ static void write_fontdescriptor(PDF pdf, fd_entry * fd)
     }
     pdf_printf(pdf, "/Flags %i\n", fd_flags);
     write_fontmetrics(pdf, fd);
-    if (is_cidkeyed(fd->fm)) {
-        if (is_type1(fd->fm))
-            pdf_printf(pdf, "/FontFile3 %i 0 R\n", (int) fd->ff_objnum);
-        else if (is_truetype(fd->fm))
-            pdf_printf(pdf, "/FontFile2 %i 0 R\n", (int) fd->ff_objnum);
-        else if (is_opentype(fd->fm))
-            pdf_printf(pdf, "/FontFile3 %i 0 R\n", (int) fd->ff_objnum);
-        else
-            assert(0);
-    } else {
-        if (fd->ff_found) {
+    if (fd->ff_found) {
+        if (is_cidkeyed(fd->fm)) {
+            if (is_type1(fd->fm))
+                pdf_printf(pdf, "/FontFile3 %i 0 R\n", (int) fd->ff_objnum);
+            else if (is_truetype(fd->fm))
+                pdf_printf(pdf, "/FontFile2 %i 0 R\n", (int) fd->ff_objnum);
+            else if (is_opentype(fd->fm))
+                pdf_printf(pdf, "/FontFile3 %i 0 R\n", (int) fd->ff_objnum);
+            else
+                assert(0);
+        } else {
             if (is_subsetted(fd->fm) && is_type1(fd->fm)) {
                 /* /CharSet is optional; names may appear in any order */
                 assert(fd->gl_tree != NULL);