summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/pdftexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-08-03 07:15:07 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-08-03 07:15:07 +0000
commita62a786556ccac143ed30c9058d25483c04b6950 (patch)
tree7c5542d72911c90a28d130fc3e7e98b3c5295970 /Build/source/texk/web2c/pdftexdir
parent682091683666808edd331cde30d349d4dd73aba9 (diff)
e-TeX 2.5: Better tracing of font definitions
git-svn-id: svn://tug.org/texlive/trunk@27296 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir')
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am4
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web5
3 files changed, 11 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 6fe2bd253c0..cc0a5d2a588 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pdftex.web: Adapt to e-TeX Version 2.5.
+ * am/pdftex.am: Clarify *tex_version.h dependencies.
+
2012-07-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* utils.c (initversionstring): Avoid using asprintf().
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index 5257b2f2fd5..4a626634963 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -36,7 +36,7 @@ pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
# We must create libpdftex.a etc before building the pdftex_OBJECTS.
-pdftex_prereq = libpdftex.a pdftexdir/pdftex_version.h
+pdftex_prereq = libpdftex.a etexdir/etex_version.h pdftexdir/pdftex_version.h
$(pdftex_OBJECTS): $(pdftex_prereq)
pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
@@ -54,7 +54,7 @@ pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
$(makecpool) pdftex >$@ || rm -f $@
# Extract pdftex version
-pdftexdir/pdftex_version.h: pdftexdir/pdftex.web etexdir/etex_version.h
+pdftexdir/pdftex_version.h: pdftexdir/pdftex.web
$(MKDIR_P) pdftexdir
grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
| sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 4c20f370c13..9280d0ecdb4 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -110,6 +110,9 @@
% e-TeX and pTeX, in part suggested by Hironori Kitagawa
% <h_kitagawa2001@@yahoo.co.jp>, Mar 2011.
% Version 2.4 fixed an uninitialized line number bug, released in May 2012.
+% Version 2.5 development was started in Aug 2012; released in ??? 20??.
+% better tracing of font definitions, reported by
+% Bruno Le Floch <blflatex@@gmail.com>, Jul 2012.
% Although considerable effort has been expended to make the e-TeX program
% correct and reliable, no warranty is implied; the author disclaims any
@@ -31882,7 +31885,7 @@ define(u,set_font,null_font); scan_optional_equals; scan_file_name;
@<If this font has already been loaded, set |f| to the internal
font number and |goto common_ending|@>;
f:=read_font_info(u,cur_name,cur_area,s);
-common_ending: equiv(u):=f; eqtb[font_id_base+f]:=eqtb[u]; font_id_text(f):=t;
+common_ending: define(u,set_font,f); eqtb[font_id_base+f]:=eqtb[u]; font_id_text(f):=t;
end;
@ @<Scan the font size specification@>=