reautoconf, svn:ignore more autom4te.cache

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

1 files changed, 205 insertions, 178 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index fc044cf1d1d..705a15aee51 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -99,8 +99,8 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
 	$(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) \
 	euptex$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
 	pdftosrc$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) \
-	xetex$(EXEEXT) $(am__EXEEXT_4) \
-	aleph$(EXEEXT) synctex$(EXEEXT) md5main$(EXEEXT)
+	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+	md5main$(EXEEXT)
 bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
@@ -114,16 +114,16 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
 noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
 	$(am__EXEEXT_31) $(am__EXEEXT_32) $(am__EXEEXT_33) \
 	$(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \
-	$(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39)
-TESTS = tangle.test $(am__EXEEXT_42) ctiedir/ctie.test \
+	$(am__EXEEXT_37) $(am__EXEEXT_38)
+TESTS = tangle.test $(am__EXEEXT_41) ctiedir/ctie.test \
 	cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
 	$(am__append_16) $(am__append_26) $(am__append_36) \
 	$(am__append_44) $(am__append_57) $(am__append_58) \
 	$(am__append_60) $(am__append_65) $(am__append_68) \
 	$(am__append_70) $(am__append_75) $(am__append_78) \
 	$(am__append_80) $(am__append_85) $(am__append_96) \
-	$(am__append_97) $(am__append_105) $(am__append_107) \
-	$(am__append_109) $(am__append_143) libmd5/md5.test
+	$(am__append_97) $(am__append_104) $(am__append_106) \
+	$(am__append_108) $(am__append_142) libmd5/md5.test
 @WEB_TRUE@am__append_1 = $(web_programs)
 @WEB_TRUE@am__append_2 = $(web_tests)
 @TEX_TRUE@am__append_3 = tex
@@ -225,116 +225,116 @@ TESTS = tangle.test $(am__EXEEXT_42) ctiedir/ctie.test \
 @LUAJITTEX_TRUE@@WIN32_FALSE@am__append_95 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
 @LUATEX_TRUE@am__append_96 = $(luatex_tests)
 @LUAJITTEX_TRUE@am__append_97 = $(luajittex_tests)
-@XETEX_TRUE@am__append_99 = xetex
-@XETEX_MACOSX_TRUE@am__append_100 = -DXETEX_MAC
-@XETEX_MACOSX_FALSE@am__append_101 = $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_102 = $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_TRUE@am__append_103 = \
+@XETEX_TRUE@am__append_98 = xetex
+@XETEX_MACOSX_TRUE@am__append_99 = -DXETEX_MAC
+@XETEX_MACOSX_FALSE@am__append_100 = $(FONTCONFIG_INCLUDES)
+@XETEX_MACOSX_FALSE@am__append_101 = $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_TRUE@am__append_102 = \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.cpp \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontMgr_Mac.mm \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontMgr_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeX_mac.c
 
-@XETEX_MACOSX_FALSE@am__append_104 = \
+@XETEX_MACOSX_FALSE@am__append_103 = \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.cpp \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h
 
-@XETEX_TRUE@am__append_105 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_106 = $(omegaware_programs)
-@OTANGLE_TRUE@am__append_107 = $(OTANGLE_tests) $(OMFONTS_tests)
-@ALEPH_TRUE@am__append_108 = aleph
-@ALEPH_TRUE@am__append_109 = $(aleph_tests)
-@SYNCTEX_TRUE@am__append_110 = synctex
-@SYNCTEX_TRUE@am__append_111 = $(LTLIBSYNCTEX)
-@SYNCTEX_TRUE@am__append_112 = $(LIBSYNCTEX)
+@XETEX_TRUE@am__append_104 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_105 = $(omegaware_programs)
+@OTANGLE_TRUE@am__append_106 = $(OTANGLE_tests) $(OMFONTS_tests)
+@ALEPH_TRUE@am__append_107 = aleph
+@ALEPH_TRUE@am__append_108 = $(aleph_tests)
+@SYNCTEX_TRUE@am__append_109 = synctex
+@SYNCTEX_TRUE@am__append_110 = $(LTLIBSYNCTEX)
+@SYNCTEX_TRUE@am__append_111 = $(LIBSYNCTEX)
+@MINGW32_TRUE@am__append_112 = -lshlwapi
 @MINGW32_TRUE@am__append_113 = -lshlwapi
-@MINGW32_TRUE@am__append_114 = -lshlwapi
-@TEX_SYNCTEX_TRUE@am__append_115 = -I$(srcdir)/synctexdir \
+@TEX_SYNCTEX_TRUE@am__append_114 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @TEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_116 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_117 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_118 = \
+@TEX_SYNCTEX_TRUE@am__append_115 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_116 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_117 = \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-tex.h
 
-@ETEX_SYNCTEX_TRUE@am__append_119 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_118 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @ETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_120 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_121 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_122 = \
+@ETEX_SYNCTEX_TRUE@am__append_119 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_120 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_121 = \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-etex.h
 
-@PTEX_SYNCTEX_TRUE@am__append_123 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_122 = -I$(srcdir)/synctexdir \
 @PTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @PTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-@PTEX_SYNCTEX_TRUE@am__append_124 = $(ZLIB_LIBS)
-@PTEX_SYNCTEX_TRUE@am__append_125 = $(ZLIB_DEPEND)
-@PTEX_SYNCTEX_TRUE@am__append_126 = \
+@PTEX_SYNCTEX_TRUE@am__append_123 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_124 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_125 = \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-ptex.h
 
-@UPTEX_SYNCTEX_TRUE@am__append_127 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@am__append_126 = -I$(srcdir)/synctexdir \
 @UPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @UPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-@UPTEX_SYNCTEX_TRUE@am__append_128 = $(ZLIB_LIBS)
-@UPTEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_DEPEND)
-@UPTEX_SYNCTEX_TRUE@am__append_130 = \
+@UPTEX_SYNCTEX_TRUE@am__append_127 = $(ZLIB_LIBS)
+@UPTEX_SYNCTEX_TRUE@am__append_128 = $(ZLIB_DEPEND)
+@UPTEX_SYNCTEX_TRUE@am__append_129 = \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-uptex.h
 
-@EPTEX_SYNCTEX_TRUE@am__append_131 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@am__append_130 = -I$(srcdir)/synctexdir \
 @EPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
-@EPTEX_SYNCTEX_TRUE@am__append_132 = $(ZLIB_LIBS)
-@EPTEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_DEPEND)
-@EPTEX_SYNCTEX_TRUE@am__append_134 = \
+@EPTEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_132 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_133 = \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-eptex.h
 
-@EUPTEX_SYNCTEX_TRUE@am__append_135 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@am__append_134 = -I$(srcdir)/synctexdir \
 @EUPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EUPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
-@EUPTEX_SYNCTEX_TRUE@am__append_136 = $(ZLIB_LIBS)
-@EUPTEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_DEPEND)
-@EUPTEX_SYNCTEX_TRUE@am__append_138 = \
+@EUPTEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_136 = $(ZLIB_DEPEND)
+@EUPTEX_SYNCTEX_TRUE@am__append_137 = \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-euptex.h
 
-@PDFTEX_SYNCTEX_TRUE@am__append_139 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_138 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @PDFTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_140 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_139 = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-pdftex.h
 
-@XETEX_SYNCTEX_TRUE@am__append_141 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_140 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @XETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_142 = \
+@XETEX_SYNCTEX_TRUE@am__append_141 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-xetex.h
 
-@SYNCTEX_TRUE@am__append_143 = $(synctex_tests)
+@SYNCTEX_TRUE@am__append_142 = $(synctex_tests)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -719,9 +719,8 @@ am__objects_8 = libluatex_a-dvigen.$(OBJEXT) \
 	libluatex_a-writejpg.$(OBJEXT) libluatex_a-writejp2.$(OBJEXT) \
 	libluatex_a-writepng.$(OBJEXT) libluatex_a-pdftoepdf.$(OBJEXT) \
 	libluatex_a-texlang.$(OBJEXT) libluatex_a-hyphen.$(OBJEXT) \
-	libluatex_a-hnjalloc.$(OBJEXT) \
-	libluatex_a-luainit.$(OBJEXT) libluatex_a-luanode.$(OBJEXT) \
-	libluatex_a-luatoken.$(OBJEXT) \
+	libluatex_a-hnjalloc.$(OBJEXT) libluatex_a-luainit.$(OBJEXT) \
+	libluatex_a-luanode.$(OBJEXT) libluatex_a-luatoken.$(OBJEXT) \
 	libluatex_a-pdfpagetree.$(OBJEXT) \
 	libluatex_a-pdfaction.$(OBJEXT) libluatex_a-pdfannot.$(OBJEXT) \
 	libluatex_a-pdfcolorstack.$(OBJEXT) \
@@ -729,8 +728,7 @@ am__objects_8 = libluatex_a-dvigen.$(OBJEXT) \
 	libluatex_a-pdfgen.$(OBJEXT) libluatex_a-pdfglyph.$(OBJEXT) \
 	libluatex_a-pdfimage.$(OBJEXT) libluatex_a-pdflink.$(OBJEXT) \
 	libluatex_a-pdflistout.$(OBJEXT) \
-	libluatex_a-pdfliteral.$(OBJEXT) \
-	libluatex_a-pdfobj.$(OBJEXT) \
+	libluatex_a-pdfliteral.$(OBJEXT) libluatex_a-pdfobj.$(OBJEXT) \
 	libluatex_a-pdfoutline.$(OBJEXT) libluatex_a-pdfpage.$(OBJEXT) \
 	libluatex_a-pdfrule.$(OBJEXT) \
 	libluatex_a-pdfsaverestore.$(OBJEXT) \
@@ -738,8 +736,7 @@ am__objects_8 = libluatex_a-dvigen.$(OBJEXT) \
 	libluatex_a-pdfshipout.$(OBJEXT) \
 	libluatex_a-pdftables.$(OBJEXT) \
 	libluatex_a-pdfthread.$(OBJEXT) libluatex_a-pdfxform.$(OBJEXT) \
-	libluatex_a-align.$(OBJEXT) \
-	libluatex_a-arithmetic.$(OBJEXT) \
+	libluatex_a-align.$(OBJEXT) libluatex_a-arithmetic.$(OBJEXT) \
 	libluatex_a-buildpage.$(OBJEXT) libluatex_a-commands.$(OBJEXT) \
 	libluatex_a-conditional.$(OBJEXT) \
 	libluatex_a-directions.$(OBJEXT) \
@@ -1524,17 +1521,17 @@ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
 	$(dist_tex_SOURCES) $(nodist_tex_SOURCES) \
 	$(nodist_tftopl_SOURCES) $(nodist_tie_SOURCES) \
 	$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
-	$(upbibtex_SOURCES) \
-	$(nodist_upbibtex_SOURCES) $(updvitype_SOURCES) \
-	$(nodist_updvitype_SOURCES) $(nodist_upmpost_SOURCES) \
-	$(uppltotf_SOURCES) $(nodist_uppltotf_SOURCES) \
-	$(dist_uptex_SOURCES) $(nodist_uptex_SOURCES) \
-	$(uptftopl_SOURCES) $(nodist_uptftopl_SOURCES) \
-	$(nodist_vftovp_SOURCES) $(nodist_vptovf_SOURCES) \
-	$(nodist_weave_SOURCES) $(nodist_wofm2opl_SOURCES) \
-	$(nodist_wopl2ofm_SOURCES) $(nodist_wovf2ovp_SOURCES) \
-	$(nodist_wovp2ovf_SOURCES) $(dist_xetex_SOURCES) \
-	$(nodist_xetex_SOURCES) $(nodist_EXTRA_xetex_SOURCES)
+	$(upbibtex_SOURCES) $(nodist_upbibtex_SOURCES) \
+	$(updvitype_SOURCES) $(nodist_updvitype_SOURCES) \
+	$(nodist_upmpost_SOURCES) $(uppltotf_SOURCES) \
+	$(nodist_uppltotf_SOURCES) $(dist_uptex_SOURCES) \
+	$(nodist_uptex_SOURCES) $(uptftopl_SOURCES) \
+	$(nodist_uptftopl_SOURCES) $(nodist_vftovp_SOURCES) \
+	$(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES) \
+	$(nodist_wofm2opl_SOURCES) $(nodist_wopl2ofm_SOURCES) \
+	$(nodist_wovf2ovp_SOURCES) $(nodist_wovp2ovf_SOURCES) \
+	$(dist_xetex_SOURCES) $(nodist_xetex_SOURCES) \
+	$(nodist_EXTRA_xetex_SOURCES)
 DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
 	$(dist_libluajittex_a_SOURCES) $(dist_libluatex_a_SOURCES) \
 	$(libmd5_a_SOURCES) $(dist_libmflua_a_SOURCES) \
@@ -1761,13 +1758,13 @@ am__set_TESTS_bases = \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
 RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_40 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_39 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
 	gftopk.test gftype.test mft.test patgen.test pktogf.test \
 	pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
 	vptovf.test weave.test
-am__EXEEXT_41 = $(am__EXEEXT_40) tests/bibtex-openout-test.pl \
+am__EXEEXT_40 = $(am__EXEEXT_39) tests/bibtex-openout-test.pl \
 	tests/bibtex-longline-test.pl tests/bibtex-mem.test
-@WEB_TRUE@am__EXEEXT_42 = $(am__EXEEXT_41)
+@WEB_TRUE@am__EXEEXT_41 = $(am__EXEEXT_40)
 TEST_SUITE_LOG = test-suite.log
 am__test_logs1 = $(TESTS:=.log)
 am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
@@ -2108,8 +2105,8 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluajit.a libmputil.a \
 	libff.a libluatex.a libluajittex.a libxetex.a libsynctex.a \
 	libmd5.a
 EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_112)
-lib_LTLIBRARIES = $(am__append_111)
+lib_LIBRARIES = $(am__append_111)
+lib_LTLIBRARIES = $(am__append_110)
 dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
 nodist_man_MANS = 
 TEST_EXTENSIONS = .pl .test
@@ -2472,28 +2469,27 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
 	pdfimage.log pdfimage.pdf postV3.afm postV7.afm test-13.pdf \
 	test-13.xref test-15.pdf test-15.xref \
 	$(nodist_libluatex_sources) luaimage.* luajitimage.* \
-	$(nodist_xetex_SOURCES) xetex.web xetex.ch \
-	xetex-web2c xetex.p xetex.pool xetex-tangle bug73.fmt \
-	bug73.log bug73.out bug73.tex $(omegaware_programs:=.c) \
-	$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
-	$(omegaware_programs:=-web2c) ofm2opl.web opl2ofm.web \
-	ovf2ovp.web ovp2ovf.web omegaware/bad*.* \
-	omegaware/tests/charwdr.* omegaware/tests/charwdv.* \
-	omegaware/tests/xcheck* omegaware/tests/xlevel1.* \
-	omegaware/tests/xlig*.* ofont*vf omegaware/tests/xpagenum.* \
-	omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
-	omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
-	omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
-	omegaware/tests/xOCherokee.* ocftest.* omegaware/tests/xinbmp* \
-	omegaware/tests/xoverbmp* omegaware/tests/xrealnum.* \
-	omegaware/tests/xrepeated.* omegaware/tests/sample*.ofm \
-	omegaware/tests/sample*.ovf omegaware/tests/sample1-h.opl \
-	omegaware/tests/xsample*.out omegaware/tests/shortend.* \
-	omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
-	omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
-	omegaware/tests/yrepeat* omegaware/tests/*yarabic* \
-	$(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
-	aleph.pool aleph-tangle
+	$(nodist_xetex_SOURCES) xetex.web xetex.ch xetex-web2c xetex.p \
+	xetex.pool xetex-tangle bug73.fmt bug73.log bug73.out \
+	bug73.tex $(omegaware_programs:=.c) $(omegaware_programs:=.h) \
+	$(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
+	ofm2opl.web opl2ofm.web ovf2ovp.web ovp2ovf.web \
+	omegaware/bad*.* omegaware/tests/charwdr.* \
+	omegaware/tests/charwdv.* omegaware/tests/xcheck* \
+	omegaware/tests/xlevel1.* omegaware/tests/xlig*.* ofont*vf \
+	omegaware/tests/xpagenum.* omegaware/tests/xofont* \
+	omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
+	omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
+	omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
+	ocftest.* omegaware/tests/xinbmp* omegaware/tests/xoverbmp* \
+	omegaware/tests/xrealnum.* omegaware/tests/xrepeated.* \
+	omegaware/tests/sample*.ofm omegaware/tests/sample*.ovf \
+	omegaware/tests/sample1-h.opl omegaware/tests/xsample*.out \
+	omegaware/tests/shortend.* omegaware/tests/specialhex.ofm \
+	omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
+	omegaware/tests/xspecialhex.* omegaware/tests/yrepeat* \
+	omegaware/tests/*yarabic* $(nodist_aleph_SOURCES) aleph.web \
+	aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
 CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES)
 TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_28) \
 	$(am__append_38) $(am__append_46) $(am__append_62) \
@@ -2622,18 +2618,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
 initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
 nodist_initex_SOURCES = callexe.c
 initex_LDADD = 
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_115)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_114)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_116)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_115)
 
 # TeX C sources
 tex_c_h = texini.c tex0.c texcoerce.h texd.h
 nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_118)
+dist_tex_SOURCES = texextra.c $(am__append_117)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_117)
+tex_prereq = texd.h $(am__append_116)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -2824,19 +2820,19 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
 	mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
 	mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
 	mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_119)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_118)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_120)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_119)
 
 # e-TeX C sources
 etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
-	etexdir/etex_version.h $(am__append_122)
+	etexdir/etex_version.h $(am__append_121)
 
 # We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_121)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_120)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -2862,20 +2858,20 @@ pweb_programs = pbibtex pdvitype ppltotf ptftopl
 pproglib = lib/libp.a
 libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
 libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_123)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_122)
 
 # With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_124)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_123)
 ptex_DEPENDENCIES = $(ptex_dependencies)
 
 # pTeX C sources
 ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
 nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
 dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
-	ptexdir/ptex_version.h $(am__append_126)
+	ptexdir/ptex_version.h $(am__append_125)
 
 # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_125)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_124)
 ptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -2915,22 +2911,22 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
 	ptexdir/pbibtex-longline-test.pl ptexdir/pbibtex-mem.test \
 	ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test
 eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
-	$(am__append_131)
+	$(am__append_130)
 
 # With --enable-ipc, e-pTeX may need to link with -lsocket.
 eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(am__append_132)
+	$(ipc_socketlibs) libmd5.a $(am__append_131)
 eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a
 
 # e-pTeX C sources
 eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
 nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
 dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
-	eptexdir/eptex_version.h $(am__append_134)
+	eptexdir/eptex_version.h $(am__append_133)
 
 # We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
 eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
-	eptexdir/eptex_version.h $(am__append_133)
+	eptexdir/eptex_version.h $(am__append_132)
 eptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2960,21 +2956,21 @@ up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv)
 upweb_programs = upbibtex updvitype uppltotf uptftopl
 libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
 libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_127)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_126)
 
 # With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_128)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_127)
 uptex_DEPENDENCIES = $(uptex_dependencies)
 
 # upTeX C sources
 uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
 nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
 dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
-	uptexdir/uptex_version.h $(am__append_130)
+	uptexdir/uptex_version.h $(am__append_129)
 
 # We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
 uptex_prereq = uptexd.h ptexdir/ptex_version.h \
-	uptexdir/uptex_version.h $(am__append_129)
+	uptexdir/uptex_version.h $(am__append_128)
 uptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -3016,23 +3012,23 @@ upweb_tests = \
 	uptexdir/yokotate.test
 
 euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
-	-I$(srcdir)/libmd5 $(am__append_135)
+	-I$(srcdir)/libmd5 $(am__append_134)
 
 # With --enable-ipc, e-upTeX may need to link with -lsocket.
 euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(am__append_136)
+	$(ipc_socketlibs) libmd5.a $(am__append_135)
 euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a
 
 # e-upTeX C sources
 euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
 nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
 dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
-	$(am__append_138)
+	$(am__append_137)
 
 # We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
 euptex_prereq = euptexd.h etexdir/etex_version.h \
 	ptexdir/ptex_version.h eptexdir/eptex_version.h \
-	uptexdir/uptex_version.h $(am__append_137)
+	uptexdir/uptex_version.h $(am__append_136)
 euptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -3088,7 +3084,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx
 pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_139)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_138)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 # With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -3101,7 +3097,7 @@ pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
 nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
 dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
 	pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
-	$(am__append_140)
+	$(am__append_139)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -3356,41 +3352,39 @@ libluatex_web = luatexdir/dvi/dvigen.w luatexdir/font/dofont.w \
 	luatexdir/image/writejpg.w luatexdir/image/writejp2.w \
 	luatexdir/image/writepng.w luatexdir/image/pdftoepdf.w \
 	luatexdir/lang/texlang.w luatexdir/lang/hyphen.w \
-	luatexdir/lang/hnjalloc.w \
-	luatexdir/lua/luainit.w luatexdir/lua/luajitstuff.w \
-	luatexdir/lua/luanode.w luatexdir/lua/luastuff.w \
-	luatexdir/lua/luatoken.w luatexdir/lua/texluac.w \
-	luatexdir/lua/texluajitc.w luatexdir/pdf/pdfpagetree.w \
-	luatexdir/pdf/pdfaction.w luatexdir/pdf/pdfannot.w \
-	luatexdir/pdf/pdfcolorstack.w luatexdir/pdf/pdfdest.w \
-	luatexdir/pdf/pdffont.w luatexdir/pdf/pdfgen.w \
-	luatexdir/pdf/pdfglyph.w luatexdir/pdf/pdfimage.w \
-	luatexdir/pdf/pdflink.w luatexdir/pdf/pdflistout.w \
-	luatexdir/pdf/pdfliteral.w \
+	luatexdir/lang/hnjalloc.w luatexdir/lua/luainit.w \
+	luatexdir/lua/luajitstuff.w luatexdir/lua/luanode.w \
+	luatexdir/lua/luastuff.w luatexdir/lua/luatoken.w \
+	luatexdir/lua/texluac.w luatexdir/lua/texluajitc.w \
+	luatexdir/pdf/pdfpagetree.w luatexdir/pdf/pdfaction.w \
+	luatexdir/pdf/pdfannot.w luatexdir/pdf/pdfcolorstack.w \
+	luatexdir/pdf/pdfdest.w luatexdir/pdf/pdffont.w \
+	luatexdir/pdf/pdfgen.w luatexdir/pdf/pdfglyph.w \
+	luatexdir/pdf/pdfimage.w luatexdir/pdf/pdflink.w \
+	luatexdir/pdf/pdflistout.w luatexdir/pdf/pdfliteral.w \
 	luatexdir/pdf/pdfobj.w luatexdir/pdf/pdfoutline.w \
 	luatexdir/pdf/pdfpage.w luatexdir/pdf/pdfrule.w \
 	luatexdir/pdf/pdfsaverestore.w luatexdir/pdf/pdfsetmatrix.w \
 	luatexdir/pdf/pdfshipout.w luatexdir/pdf/pdftables.w \
 	luatexdir/pdf/pdfthread.w luatexdir/pdf/pdfxform.w \
-	luatexdir/tex/align.w \
-	luatexdir/tex/arithmetic.w luatexdir/tex/buildpage.w \
-	luatexdir/tex/commands.w luatexdir/tex/conditional.w \
-	luatexdir/tex/directions.w luatexdir/tex/dumpdata.w \
-	luatexdir/tex/equivalents.w luatexdir/tex/errors.w \
-	luatexdir/tex/expand.w luatexdir/tex/extensions.w \
-	luatexdir/tex/filename.w luatexdir/tex/inputstack.w \
-	luatexdir/tex/linebreak.w luatexdir/tex/mainbody.w \
-	luatexdir/tex/maincontrol.w luatexdir/tex/mathcodes.w \
-	luatexdir/tex/memoryword.w luatexdir/tex/mlist.w \
-	luatexdir/tex/nesting.w luatexdir/tex/packaging.w \
-	luatexdir/tex/postlinebreak.w luatexdir/tex/primitive.w \
-	luatexdir/tex/printing.w luatexdir/tex/scanning.w \
-	luatexdir/tex/stringpool.w luatexdir/tex/texdeffont.w \
-	luatexdir/tex/texfileio.w luatexdir/tex/texmath.w \
-	luatexdir/tex/texnodes.w luatexdir/tex/textcodes.w \
-	luatexdir/tex/textoken.w luatexdir/utils/avlstuff.w \
-	luatexdir/utils/managed-sa.w luatexdir/utils/utils.w \
-	luatexdir/utils/unistring.w
+	luatexdir/tex/align.w luatexdir/tex/arithmetic.w \
+	luatexdir/tex/buildpage.w luatexdir/tex/commands.w \
+	luatexdir/tex/conditional.w luatexdir/tex/directions.w \
+	luatexdir/tex/dumpdata.w luatexdir/tex/equivalents.w \
+	luatexdir/tex/errors.w luatexdir/tex/expand.w \
+	luatexdir/tex/extensions.w luatexdir/tex/filename.w \
+	luatexdir/tex/inputstack.w luatexdir/tex/linebreak.w \
+	luatexdir/tex/mainbody.w luatexdir/tex/maincontrol.w \
+	luatexdir/tex/mathcodes.w luatexdir/tex/memoryword.w \
+	luatexdir/tex/mlist.w luatexdir/tex/nesting.w \
+	luatexdir/tex/packaging.w luatexdir/tex/postlinebreak.w \
+	luatexdir/tex/primitive.w luatexdir/tex/printing.w \
+	luatexdir/tex/scanning.w luatexdir/tex/stringpool.w \
+	luatexdir/tex/texdeffont.w luatexdir/tex/texfileio.w \
+	luatexdir/tex/texmath.w luatexdir/tex/texnodes.w \
+	luatexdir/tex/textcodes.w luatexdir/tex/textoken.w \
+	luatexdir/utils/avlstuff.w luatexdir/utils/managed-sa.w \
+	luatexdir/utils/utils.w luatexdir/utils/unistring.w
 nodist_libluatex_sources = dvigen.c dofont.c luafont.c mapfile.c \
 	pkin.c sfnt.c subfont.c texfont.c tfmofm.c tounicode.c \
 	tt_glyf.c tt_table.c vfovf.c vfpacket.c writecff.c writeenc.c \
@@ -3400,16 +3394,16 @@ nodist_libluatex_sources = dvigen.c dofont.c luafont.c mapfile.c \
 	luainit.c luanode.c luatoken.c pdfpagetree.c pdfaction.c \
 	pdfannot.c pdfcolorstack.c pdfdest.c pdffont.c pdfgen.c \
 	pdfglyph.c pdfimage.c pdflink.c pdflistout.c pdfliteral.c \
-	pdfobj.c pdfoutline.c pdfpage.c pdfrule.c \
-	pdfsaverestore.c pdfsetmatrix.c pdfshipout.c pdftables.c \
-	pdfthread.c pdfxform.c align.c arithmetic.c \
-	buildpage.c commands.c conditional.c directions.c dumpdata.c \
-	equivalents.c errors.c expand.c extensions.c filename.c \
-	inputstack.c linebreak.c mainbody.c maincontrol.c mathcodes.c \
-	memoryword.c mlist.c nesting.c packaging.c postlinebreak.c \
-	primitive.c printing.c scanning.c stringpool.c texdeffont.c \
-	texfileio.c texmath.c texnodes.c textcodes.c textoken.c \
-	avlstuff.c managed-sa.c utils.c unistring.c
+	pdfobj.c pdfoutline.c pdfpage.c pdfrule.c pdfsaverestore.c \
+	pdfsetmatrix.c pdfshipout.c pdftables.c pdfthread.c pdfxform.c \
+	align.c arithmetic.c buildpage.c commands.c conditional.c \
+	directions.c dumpdata.c equivalents.c errors.c expand.c \
+	extensions.c filename.c inputstack.c linebreak.c mainbody.c \
+	maincontrol.c mathcodes.c memoryword.c mlist.c nesting.c \
+	packaging.c postlinebreak.c primitive.c printing.c scanning.c \
+	stringpool.c texdeffont.c texfileio.c texmath.c texnodes.c \
+	textcodes.c textoken.c avlstuff.c managed-sa.c utils.c \
+	unistring.c
 dist_libluatex_sources = luatexdir/luatexcallbackids.h \
 	luatexdir/luatex.h luatexdir/luatex-common.h \
 	luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \
@@ -3432,21 +3426,19 @@ dist_libluatex_sources = luatexdir/luatexcallbackids.h \
 	luatexdir/lua/lnodelib.c luatexdir/lua/liolibext.c \
 	luatexdir/lua/loslibext.c luatexdir/lua/lpdflib.c \
 	luatexdir/lua/lstatslib.c luatexdir/lua/ltexiolib.c \
-	luatexdir/lua/ltexlib.c \
-	luatexdir/lua/lnewtokenlib.c \
+	luatexdir/lua/ltexlib.c luatexdir/lua/lnewtokenlib.c \
 	luatexdir/lua/luatex-api.h luatexdir/pdf/pdfpagetree.h \
 	luatexdir/pdf/pdfaction.h luatexdir/pdf/pdfannot.h \
 	luatexdir/pdf/pdfcolorstack.h luatexdir/pdf/pdfdest.h \
 	luatexdir/pdf/pdffont.h luatexdir/pdf/pdfgen.h \
 	luatexdir/pdf/pdfglyph.h luatexdir/pdf/pdfimage.h \
 	luatexdir/pdf/pdflink.h luatexdir/pdf/pdflistout.h \
-	luatexdir/pdf/pdfliteral.h \
-	luatexdir/pdf/pdfobj.h luatexdir/pdf/pdfoutline.h \
-	luatexdir/pdf/pdfpage.h luatexdir/pdf/pdfrule.h \
-	luatexdir/pdf/pdfsaverestore.h luatexdir/pdf/pdfsetmatrix.h \
-	luatexdir/pdf/pdfshipout.h luatexdir/pdf/pdftables.h \
-	luatexdir/pdf/pdfthread.h luatexdir/pdf/pdftypes.h \
-	luatexdir/pdf/pdfxform.h \
+	luatexdir/pdf/pdfliteral.h luatexdir/pdf/pdfobj.h \
+	luatexdir/pdf/pdfoutline.h luatexdir/pdf/pdfpage.h \
+	luatexdir/pdf/pdfrule.h luatexdir/pdf/pdfsaverestore.h \
+	luatexdir/pdf/pdfsetmatrix.h luatexdir/pdf/pdfshipout.h \
+	luatexdir/pdf/pdftables.h luatexdir/pdf/pdfthread.h \
+	luatexdir/pdf/pdftypes.h luatexdir/pdf/pdfxform.h \
 	luatexdir/tex/align.h luatexdir/tex/arithmetic.h \
 	luatexdir/tex/buildpage.h luatexdir/tex/commands.h \
 	luatexdir/tex/conditional.h luatexdir/tex/directions.h \
@@ -3474,6 +3466,41 @@ luatex_image_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/image $(c
 luatex_lang_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/lang $(ctangle)
 luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/lua $(ctangle)
 luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle)
+
+################################################################################
+################################################################################
+################################################################################
+# luatex_luascripts_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/luascripts $(ctangle)
+
+# txt2zlib.c: ctangle$(EXEEXT) luatexdir/luascripts/txt2zlib.w
+# 	$(luatex_luascripts_ctangle) txt2zlib.w
+
+# libluatex_web += \
+# 	luatexdir/luascripts/pdflua.c \
+# 	luatexdir/luascripts/pdflua.lua \
+# 	luatexdir/luascripts/txt2zlib.w
+
+# ## We normaly use the auxiliary program txt2zlib to create pdflua.c
+# ## from luatexdir/luascripts/pdflua.lua.  When cross compiling we
+# ## use instead the distributed luatexdir/luascripts/pdflua.c.
+# if cross
+# pdflua.c: luatexdir/luascripts/pdflua.c
+# 	$(AM_V_GEN)rm -f pdflua.c; \
+# 	$(LN_S) $(srcdir)/luatexdir/luascripts/pdflua.c pdflua.c
+# else !cross
+# pdflua.c: txt2zlib$(EXEEXT) luatexdir/luascripts/pdflua.lua
+# 	$(AM_V_GEN)./txt2zlib $(srcdir)/luatexdir/luascripts/pdflua.lua pdflua.c && \
+# 	cmp -s pdflua.c $(srcdir)/luatexdir/luascripts/pdflua.c || \
+# 	  cp -f pdflua.c $(srcdir)/luatexdir/luascripts/pdflua.c
+# endif !cross
+
+# nodist_libluatex_sources += pdflua.c
+
+# dist_libluatex_sources += \
+# 	luatexdir/luascripts/pdflua.h
+################################################################################
+################################################################################
+################################################################################
 luatex_tex_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/tex $(ctangle)
 luatex_utils_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/utils $(ctangle)
 
@@ -3527,17 +3554,17 @@ libxetex = libxetex.a
 xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
 	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
 	$(GRAPHITE2_INCLUDES) $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) \
-	$(ZLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_100) \
-	$(am__append_101)
+	$(ZLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_99) \
+	$(am__append_100)
 xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
 	$(ICU_LIBS) $(TECKIT_LIBS) $(POPPLER_LIBS) $(LIBPNG_LIBS) \
-	$(FREETYPE2_LIBS) $(ZLIB_LIBS) libmd5.a $(am__append_102)
+	$(FREETYPE2_LIBS) $(ZLIB_LIBS) libmd5.a $(am__append_101)
 xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
 	$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
 	$(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \
 	$(ZLIB_DEPEND) libmd5.a
 @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_141)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_140)
 xetex_CFLAGS = $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -3548,7 +3575,7 @@ xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
 nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
 dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
 	xetexdir/etex_version.h xetexdir/xetex_version.h \
-	$(am__append_142)
+	$(am__append_141)
 xetex_ch_srcs = \
 	xetexdir/xetex.web \
 	xetexdir/tex.ch0 \
@@ -3575,7 +3602,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/XeTeXFontInst.cpp \
 	xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \
 	xetexdir/image/mfileio.h xetexdir/image/numbers.c \
 	xetexdir/image/numbers.h xetexdir/image/pngimage.c \
-	xetexdir/image/pngimage.h $(am__append_103) $(am__append_104)
+	xetexdir/image/pngimage.h $(am__append_102) $(am__append_103)
 
 # We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
 libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -3679,12 +3706,12 @@ synctex_SOURCES = \
 	synctexdir/synctex_main.c
 
 synctex_CPPFLAGS = -I$(srcdir)/synctexdir
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_113)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_112)
 libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
 libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
 libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
 libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
-libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_114)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_113)
 libsynctex_la_SOURCES = \
 	synctexdir/synctex_parser.c \
 	synctexdir/synctex_parser_local.h \