summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2010-04-23 10:54:26 +0000
committerTaco Hoekwater <taco@elvenkind.com>2010-04-23 10:54:26 +0000
commit57c7d41397ed1ec0e244316a88a33bd2b0324ec1 (patch)
tree55261033f25361e0efe4e2b840de75c7185e2290 /Build
parent6c83b2609bba73ed2fb8bf4e11eee8522ff173bb (diff)
another luatex update
git-svn-id: svn://tug.org/texlive/trunk@17973 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.h1
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdffont.w5
3 files changed, 7 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index f9ca6e7962e..be2f95db99d 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-23 Taco Hoekwater <taco@luatex>
+
+ * new import from luatex repository (HEAD of 0.60.x branch)
+
2010-04-20 Taco Hoekwater <taco@luatex>
* new import from luatex repository (HEAD of 0.60.x branch)
diff --git a/Build/source/texk/web2c/luatexdir/luatex.h b/Build/source/texk/web2c/luatexdir/luatex.h
index 69ed3fe157c..b933237dfce 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.h
+++ b/Build/source/texk/web2c/luatexdir/luatex.h
@@ -67,7 +67,6 @@
/* Restore underscores. */
# define kpsetexformat kpse_tex_format
-# define mainbody main_body
# define t_open_in topenin
/* Executing shell commands. */
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdffont.w b/Build/source/texk/web2c/luatexdir/pdf/pdffont.w
index 14693850c0b..0be685661c4 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdffont.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdffont.w
@@ -21,7 +21,7 @@
@ @c
static const char _svn_version[] =
- "$Id: pdffont.w 3571 2010-04-02 13:50:45Z taco $"
+ "$Id: pdffont.w 3638 2010-04-20 14:00:47Z taco $"
"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdffont.w $";
#include "ptexlib.h"
@@ -190,7 +190,8 @@ internal_font_number pdf_set_font(PDF pdf, internal_font_number f)
or some font with the same tfm name at different size and/or expansion.
*/
ff = pdf_font_num(f) < 0 ? -pdf_font_num(f) : f; /* aka |set_ff(f)| */
- addto_page_resources(pdf, obj_type_font, ff);
+ assert(pdf_font_num(ff) > 0); /* base font object number */
+ addto_page_resources(pdf, obj_type_font, pdf_font_num(ff));
return ff;
}