[NTG-pdftex] pdftex-1.20b patches

Thomas Esser te at dbs.uni-hannover.de
Mon Nov 22 06:44:17 CET 2004


> From: Jason Riedy <ejr at EECS.Berkeley.EDU>
> To: tetex-pretest at dbs.uni-hannover.de
> 
> Here is a subset from his mail:

Some more things that have been adressed by people on the tetex-pretest
list are missing. Here is what should find its way into pdftex.

Thomas

--- /t/texlive/Build/source.development/TeX/texk/web2c/pdfetexdir/pdfetex.mk	2004-08-26 23:46:34.000000000 +0200
+++ /t/src/tetex-src/texk/web2c/pdfetexdir/pdfetex.mk	2004-11-03 22:09:50.000000000 +0100
@@ -19,7 +19,7 @@
 # C file dependencies.
 $(pdfetex_c) pdfetexcoerce.h pdfetexd.h: pdfetex.p $(web2c_texmf)
 	$(web2c) pdfetex
-pdfetexextra.c: lib/texmfmp.c
+pdfetexextra.c: pdfetexdir/pdfetexextra.h lib/texmfmp.c
 	sed s/TEX-OR-MF-OR-MP/pdfetex/ $(srcdir)/lib/texmfmp.c >$@
 pdfetexdir/pdfetexextra.h: pdfetexdir/pdfetexextra.in pdftexdir/pdftex.version etexdir/etex.version
 	sed -e s/PDFTEX-VERSION/`cat pdftexdir/pdftex.version`/ \
@@ -90,7 +90,6 @@
 	$(dumpenv) $(MAKE) progname=pdflatex files="latex.ltx" prereq-check
 	$(dumpenv) ./pdfetex --progname=pdflatex --jobname=pdflatex --ini \*\\pdfoutput=1\\input latex.ltx </dev/null
 
-
 # Installation.
 install-pdfetex: install-pdfetex-exec install-pdfetex-data
 install-pdfetex-exec: install-pdfetex-links
--- /t/texlive/Build/source.development/TeX/texk/web2c/pdftexdir/avl.h	2004-02-25 07:58:06.000000000 +0100
+++ /t/src/tetex-src/texk/web2c/pdftexdir/avl.h	2004-10-30 11:41:29.000000000 +0200
@@ -27,6 +27,9 @@
 #define AVL_H 1
 
 #include <stddef.h>
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
 /* Function types. */
 typedef int avl_comparison_func (const void *avl_a, const void *avl_b,
@@ -112,4 +115,8 @@
 void *avl_t_cur (struct avl_traverser *);
 void *avl_t_replace (struct avl_traverser *, void *);
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* avl.h */
--- /t/texlive/Build/source.development/TeX/texk/web2c/pdftexdir/ChangeLog	2004-09-07 19:45:32.000000000 +0200
+++ /t/src/tetex-src/texk/web2c/pdftexdir/ChangeLog	2004-10-30 15:42:24.000000000 +0200
@@ -1,3 +1,8 @@
+2004-10-29  Jan Nieuwenhuizen  <janneke at gnu.org>
+
+	* pdftex.mk (pdftex):  Build fix: pdftexextra.c depends on
+	pdftexextra.h.
+
 2004-09-07  The pdfTeX team:
 
 	* README: pdftex version 1.20a.
--- /t/texlive/Build/source.development/TeX/texk/web2c/pdftexdir/epdf.h	2004-06-07 09:51:33.000000000 +0200
+++ /t/src/tetex-src/texk/web2c/pdftexdir/epdf.h	2004-10-30 11:42:07.000000000 +0200
@@ -97,16 +97,6 @@
 /* config.c */
 extern integer cfgpar(integer);
 
-/* avl.c */
-typedef int avl_comparison_func (const void *avl_a, const void *avl_b, void *avl_param);
-typedef void avl_item_func (void *avl_item, void *avl_param);
-extern struct avl_table *avl_create (avl_comparison_func *, void *, struct libavl_allocator *);
-extern void avl_destroy (struct avl_table *, avl_item_func *);
-extern void **avl_probe (struct avl_table *, void *);
-extern void *avl_insert (struct avl_table *, void *);
-extern void *avl_delete (struct avl_table *, const void *);
-extern void *avl_find (const struct avl_table *, const void *);
-
 /* avlstuff.c */
 extern void avl_put_obj (integer, integer);
 extern integer avl_find_obj (integer, integer, integer);
--- /t/texlive/Build/source.development/TeX/texk/web2c/pdftexdir/NEWS	2004-11-19 16:42:26.000000000 +0100
+++ /t/src/tetex-src/texk/web2c/pdftexdir/NEWS	2004-09-15 12:56:51.000000000 +0200
@@ -1,12 +1,3 @@
---------------------------------------------------------------
-pdfTeX 3.141592-1.20b-beta-20041119 was released on 2004-11-19
---------------------------------------------------------------
-- Fixed numerous bugs: 112, 113, 115, 116, 199, 210
-
-- pdfTeX uses xpdf 3.00pl1
-
-- pdfTeX uses libpng 1.2.8beta4, which should fix various png-related bugs.
-
 ------------------------------------------------
 pdfTeX 3.141592-1.20a was released on 2004-09-06
 ------------------------------------------------
@@ -290,5 +281,5 @@
 pdfTeX 3.14159-1.00a-pretest-20010804 was released on 2001-08-04
 ----------------------------------------------------------------
 
-$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/NEWS#69 $
+$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/NEWS#68 $
 // vim: tw=79:ts=2:expandtab:autoindent
--- /t/texlive/Build/source.development/TeX/texk/web2c/pdftexdir/pdftex.mk	2004-10-29 11:25:59.000000000 +0200
+++ /t/src/tetex-src/texk/web2c/pdftexdir/pdftex.mk	2004-11-03 23:42:55.000000000 +0100
@@ -6,16 +6,16 @@
 # number or how they are configured requires changes to the main distribution
 # anyway.
 
-# $Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/pdftex.mk#30 $
+# $Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/pdftex.mk#29 $
 
 Makefile: pdftexdir/pdftex.mk
 
-pdftex_bin = pdftex pdfetex
-pdftex_exe = pdftex.exe pdfetex.exe
-pdftex_pool = pdftex.pool pdfetex.pool
-# pdftex_bin = pdftex pdfetex pdfxtex ttf2afm pdftosrc
-# pdftex_exe = pdftex.exe pdfetex.exe pdfxtex.exe ttf2afm.exe pdftosrc.exe
-# pdftex_pool = pdftex.pool pdfetex.pool pdfxtex.pool
+# pdftex_bin = pdfxtex
+# pdftex_exe = pdfxtex.exe
+# pdftex_pool = pdfxtex.pool
+pdftex_bin = pdftex pdfetex pdfxtex ttf2afm pdftosrc
+pdftex_exe = pdftex.exe pdfetex.exe pdfxtex.exe ttf2afm.exe pdftosrc.exe
+pdftex_pool = pdftex.pool pdfetex.pool pdfxtex.pool
 linux_build_dir = $(HOME)/pdftex/build/linux/texk/web2c
 
 # We build pdftex
@@ -39,7 +39,7 @@
 # C file dependencies.
 $(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf)
 	$(web2c) pdftex
-pdftexextra.c: lib/texmfmp.c
+pdftexextra.c: pdftexdir/pdftexextra.h lib/texmfmp.c
 	sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/lib/texmfmp.c >$@
 pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version
 	sed s/PDFTEX-VERSION/`cat pdftexdir/pdftex.version`/ \
@@ -103,7 +103,6 @@
 #	$(dumpenv) $(MAKE) progname=pdflatex files="latex.ltx" prereq-check
 #	$(dumpenv) ./pdftex --progname=pdflatex --jobname=pdflatex --ini \\pdfoutput=1 \\input latex.ltx </dev/null
 
-
 # Installation.
 install-pdftex: install-pdftex-exec install-pdftex-data
 install-pdftex-exec: install-pdftex-links
@@ -134,7 +133,6 @@
 	$(INSTALL_DATA) pdftex.pool $(texpooldir)/pdftex.pool
 
 
-
 # ttf2afm
 ttf2afm = ttf2afm
 
--- /t/texlive/Build/source.development/TeX/texk/web2c/pdftexdir/pdftoepdf.cc	2004-06-07 09:51:34.000000000 +0200
+++ /t/src/tetex-src/texk/web2c/pdftexdir/pdftoepdf.cc	2004-10-30 11:42:29.000000000 +0200
@@ -43,8 +43,8 @@
 #include "GlobalParams.h"
 #include "Error.h"
 
-#include "epdf.h"
 #include "avl.h"
+#include "epdf.h"
 
 static const char perforce_id[] = 
     "$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/pdftoepdf.cc#49 $";


More information about the ntg-pdftex mailing list