diff options
4 files changed, 25 insertions, 17 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index b4a8d50d3c3..5c3d99cb672 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,11 @@ +2011-05-18 Taco Hoekwater <taco@luatex.org> + + * font/writefont.w (write_fontdescriptor): Fix for non-embedded + fonts in the PDF output. + * image/writeimg.w (read_img): Fix for non-existent images that + could case a crash. + * luatex_svnversion.h: updated to reflect latest luatex revision (4273) + 2011-05-18 Peter Breitenlohner <peb@mppmu.mpg.de> * luatex.c (ipcpage): Add 'free(cwd)', remove Aleph comment. 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); diff --git a/Build/source/texk/web2c/luatexdir/image/writeimg.w b/Build/source/texk/web2c/luatexdir/image/writeimg.w index 57f0740f04b..6e9dad2b111 100644 --- a/Build/source/texk/web2c/luatexdir/image/writeimg.w +++ b/Build/source/texk/web2c/luatexdir/image/writeimg.w @@ -22,8 +22,8 @@ @ @c static const char _svn_version[] = - "$Id: writeimg.w 4055 2011-01-10 19:52:50Z oneiros $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.66.0/source/texk/web2c/luatexdir/image/writeimg.w $"; + "$Id: writeimg.w 4271 2011-05-16 14:40:06Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.70.x/source/texk/web2c/luatexdir/image/writeimg.w $"; #include <assert.h> #include "ptexlib.h" @@ -288,7 +288,7 @@ void free_image_dict(image_dict * p) void read_img(PDF pdf, image_dict * idict, int minor_version, int inclusion_errorlevel) { - char *filepath; + char *filepath = NULL; int callback_id; assert(idict != NULL); if (img_filename(idict) == NULL) diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h index 7e1e5205f62..3440ec44eaf 100644 --- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h +++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h @@ -1 +1 @@ -#define luatex_svn_revision 4272 +#define luatex_svn_revision 4273 |