summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/ChangeLog21
-rw-r--r--Build/source/texk/web2c/Makefile.in410
-rw-r--r--Build/source/texk/web2c/ac/web2c.ac12
-rw-r--r--Build/source/texk/web2c/c-auto.in3
-rwxr-xr-xBuild/source/texk/web2c/configure339
-rw-r--r--Build/source/texk/web2c/configure.ac20
-rw-r--r--Build/source/texk/web2c/enctex.ch4
-rw-r--r--Build/source/texk/web2c/eptexdir/ChangeLog.TL10
-rw-r--r--Build/source/texk/web2c/eptexdir/am/eptex.am1
-rw-r--r--Build/source/texk/web2c/eptexdir/eptex.defines2
-rw-r--r--Build/source/texk/web2c/eptexdir/eptrip/texmf.cnf3
-rw-r--r--Build/source/texk/web2c/eptexdir/pdfsavepos.ch2
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog4
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c6
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog12
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lkpselib.c7
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog8
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftoepdf.cc4
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftosrc.cc36
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog12
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am28
-rw-r--r--Build/source/texk/web2c/ptexdir/ptex-base.ch44
-rw-r--r--Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf2
-rw-r--r--Build/source/texk/web2c/synctexdir/ChangeLog18
-rw-r--r--Build/source/texk/web2c/synctexdir/am/synctex.am74
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch025
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch123
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-ep-rec.ch116
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-eptex.h57
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-etex.h6
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-p-mem.ch025
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-p-mem.ch123
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-p-rec.ch05
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-p-rec.ch119
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-pdftex.h1
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-ptex.h57
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-tex.h6
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-xetex.h1
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex.c3
-rw-r--r--Build/source/texk/web2c/texmfmp-help.h6
-rwxr-xr-xBuild/source/texk/web2c/web2c/configure29
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog11
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.c15
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am8
-rw-r--r--Build/source/texk/web2c/xetexdir/pdfimage.cpp9
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.ch2
46 files changed, 999 insertions, 430 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 80edd9a0498..c8cf1362498 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,24 @@
+2011-07-11 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: No need to test for PDFDoc::getPDFMajorVersion
+ for poppler >= 0.12.
+
+2011-07-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * enctex.ch: Fix an off-by-one bug initializing mubyte_cswrite.
+ From Roderich Schupp <roderich.schupp@googlemail.com>,
+ Debian Bug#633011, tex-k mail Fri, 8 Jul 2011 15:56:23.
+
+2011-07-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ac/web2c.ac: Always use poppler for XeTeX instead of xpdf.
+
+2011-07-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ SyncTeX infrastructure for pTeX and e-pTeX.
+ * ac/web2c.ac: Enable SyncTeX for pTeX and e-pTeX.
+ * texmfmp-help.h (*PTEXHELP): Document the -synctex option.
+
2011-06-23 Karl Berry <karl@tug.org>
* configure.ac (AC_C_CHAR_UNSIGNED): needed for test
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 862138e9701..a8134bd1287 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -56,9 +56,9 @@ check_PROGRAMS = $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
TESTS = tangle.test $(am__EXEEXT_34) ctiedir/ctie.test \
cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
$(am__append_14) $(am__append_23) $(am__append_28) \
- $(am__append_34) $(am__append_39) $(am__append_44) \
- $(am__append_51) $(am__append_65) $(am__append_68) \
- $(am__append_69) libmd5/md5.test
+ $(am__append_34) $(am__append_38) $(am__append_40) \
+ $(am__append_45) $(am__append_52) $(am__append_66) \
+ $(am__append_69) $(am__append_70) libmd5/md5.test
DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(srcdir)/../../build-aux/config.guess \
$(srcdir)/../../build-aux/config.sub \
@@ -126,45 +126,46 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@ETEX_TRUE@am__append_30 = etrip.diffs
@ETEX_TRUE@am__append_31 = etrip-clean
@PTEX_TRUE@am__append_32 = ptex
-@PTEX_TRUE@@WEB_TRUE@am__append_33 = $(pweb_programs)
+@PWEB_TRUE@am__append_33 = $(pweb_programs)
@PTEX_TRUE@am__append_34 = $(ptex_tests)
@PTEX_TRUE@am__append_35 = dvitype pltotf tftopl
@PTEX_TRUE@am__append_36 = ptrip.diffs
@PTEX_TRUE@am__append_37 = ptrip-clean
-@EPTEX_TRUE@am__append_38 = eptex
-@EPTEX_TRUE@am__append_39 = $(eptex_tests)
-@EPTEX_TRUE@am__append_40 = dvitype pltotf tftopl
-@EPTEX_TRUE@am__append_41 = eptrip.diffs
-@EPTEX_TRUE@am__append_42 = eptrip-clean
-@PDFTEX_TRUE@am__append_43 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_44 = $(pdftex_tests)
-@MINGW32_TRUE@am__append_45 = \
+@PWEB_TRUE@am__append_38 = $(pweb_tests)
+@EPTEX_TRUE@am__append_39 = eptex
+@EPTEX_TRUE@am__append_40 = $(eptex_tests)
+@EPTEX_TRUE@am__append_41 = dvitype pltotf tftopl
+@EPTEX_TRUE@am__append_42 = eptrip.diffs
+@EPTEX_TRUE@am__append_43 = eptrip-clean
+@PDFTEX_TRUE@am__append_44 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_45 = $(pdftex_tests)
+@MINGW32_TRUE@am__append_46 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
-@LUATEX_TRUE@am__append_46 = luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_47 = call_luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_48 = install-luatex-links
-@LUATEX_TRUE@@WIN32_TRUE@am__append_49 = uninstall-luatex-links
-@LUATEX_TRUE@@WIN32_FALSE@am__append_50 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
-@LUATEX_TRUE@am__append_51 = $(luatex_tests)
-@MINGW32_FALSE@am__append_52 = -DLUA_USE_POSIX
-@XETEX_TRUE@am__append_53 = xetex
-@XETEX_MACOSX_TRUE@am__append_54 = -DXETEX_MAC
-@XETEX_MACOSX_TRUE@am__append_55 = libxetexmm.a
-@XETEX_MACOSX_FALSE@am__append_56 = -DXETEX_OTHER $(XPDF_INCLUDES) \
+@LUATEX_TRUE@am__append_47 = luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_48 = call_luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_49 = install-luatex-links
+@LUATEX_TRUE@@WIN32_TRUE@am__append_50 = uninstall-luatex-links
+@LUATEX_TRUE@@WIN32_FALSE@am__append_51 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+@LUATEX_TRUE@am__append_52 = $(luatex_tests)
+@MINGW32_FALSE@am__append_53 = -DLUA_USE_POSIX
+@XETEX_TRUE@am__append_54 = xetex
+@XETEX_MACOSX_TRUE@am__append_55 = -DXETEX_MAC
+@XETEX_MACOSX_TRUE@am__append_56 = libxetexmm.a
+@XETEX_MACOSX_FALSE@am__append_57 = -DXETEX_OTHER $(POPPLER_INCLUDES) \
@XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_57 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_FALSE@am__append_58 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
-@XETEX_GRAPHITE_TRUE@am__append_59 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
-@XETEX_GRAPHITE_TRUE@am__append_60 = $(GRAPHITE_LIBS)
-@XETEX_GRAPHITE_TRUE@am__append_61 = $(GRAPHITE_DEPEND)
-@XETEX_MACOSX_TRUE@am__append_62 = \
+@XETEX_MACOSX_FALSE@am__append_58 = $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_FALSE@am__append_59 = $(POPPLER_DEPEND) $(LIBPNG_DEPEND)
+@XETEX_GRAPHITE_TRUE@am__append_60 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
+@XETEX_GRAPHITE_TRUE@am__append_61 = $(GRAPHITE_LIBS)
+@XETEX_GRAPHITE_TRUE@am__append_62 = $(GRAPHITE_DEPEND)
+@XETEX_MACOSX_TRUE@am__append_63 = \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
-@XETEX_MACOSX_FALSE@am__append_63 = \
+@XETEX_MACOSX_FALSE@am__append_64 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeX_pic.c \
@@ -181,52 +182,74 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@XETEX_MACOSX_FALSE@ xetexdir/pngimage.c \
@XETEX_MACOSX_FALSE@ xetexdir/pngimage.h
-@XETEX_GRAPHITE_TRUE@am__append_64 = \
+@XETEX_GRAPHITE_TRUE@am__append_65 = \
@XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.cpp \
@XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.h
-@XETEX_TRUE@am__append_65 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_66 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_67 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_68 = $(OTANGLE_tests)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_69 = $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_70 = pltotf tftopl
-@ALEPH_TRUE@am__append_71 = aleph
-@TEX_SYNCTEX_TRUE@am__append_72 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_66 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_67 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_68 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_69 = $(OTANGLE_tests)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_70 = $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_71 = pltotf tftopl
+@ALEPH_TRUE@am__append_72 = aleph
+@TEX_SYNCTEX_TRUE@am__append_73 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_73 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_74 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_75 = \
+@TEX_SYNCTEX_TRUE@am__append_74 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_75 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_76 = \
@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_76 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_77 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_77 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_78 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_79 = \
+@ETEX_SYNCTEX_TRUE@am__append_78 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_79 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_80 = \
@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
-@PDFTEX_SYNCTEX_TRUE@am__append_80 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_81 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
+@PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
+@PTEX_SYNCTEX_TRUE@am__append_82 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_83 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_84 = \
+@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
+
+@EPTEX_SYNCTEX_TRUE@am__append_85 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
+@EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
+@EPTEX_SYNCTEX_TRUE@am__append_86 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_87 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_88 = \
+@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
+
+@PDFTEX_SYNCTEX_TRUE@am__append_89 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_81 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_90 = \
@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_82 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_91 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_83 = \
+@XETEX_SYNCTEX_TRUE@am__append_92 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@@ -554,7 +577,7 @@ am__EXEEXT_5 = $(am__EXEEXT_3) $(am__EXEEXT_4)
@MP_TRUE@am__EXEEXT_12 = mpost$(EXEEXT)
@ETEX_TRUE@am__EXEEXT_13 = etex$(EXEEXT)
@PTEX_TRUE@am__EXEEXT_14 = ptex$(EXEEXT)
-@PTEX_TRUE@@WEB_TRUE@am__EXEEXT_15 = $(am__EXEEXT_2)
+@PWEB_TRUE@am__EXEEXT_15 = $(am__EXEEXT_2)
@EPTEX_TRUE@am__EXEEXT_16 = eptex$(EXEEXT)
@PDFTEX_TRUE@am__EXEEXT_17 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
@PDFTEX_TRUE@ pdftosrc$(EXEEXT)
@@ -620,23 +643,30 @@ nodist_dvitype_OBJECTS = dvitype.$(OBJEXT)
dvitype_OBJECTS = $(nodist_dvitype_OBJECTS)
dvitype_LDADD = $(LDADD)
dvitype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-dist_eptex_OBJECTS = eptex-eptexextra.$(OBJEXT)
-am__objects_11 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
-nodist_eptex_OBJECTS = $(am__objects_11) eptex-eptex-pool.$(OBJEXT)
+am__dist_eptex_SOURCES_DIST = eptexdir/eptexextra.c \
+ eptexdir/eptexextra.h synctexdir/synctex.c \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-eptex.h
+@EPTEX_SYNCTEX_TRUE@am__objects_11 = eptex-synctex.$(OBJEXT)
+dist_eptex_OBJECTS = eptex-eptexextra.$(OBJEXT) $(am__objects_11)
+am__objects_12 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
+nodist_eptex_OBJECTS = $(am__objects_12) eptex-eptex-pool.$(OBJEXT)
eptex_OBJECTS = $(dist_eptex_OBJECTS) $(nodist_eptex_OBJECTS)
+@EPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
eptex_DEPENDENCIES = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_3)
am__dist_etex_SOURCES_DIST = etexdir/etexextra.c etexdir/etexextra.h \
synctexdir/synctex.c synctexdir/synctex.h \
synctexdir/synctex-common.h synctexdir/synctex-etex.h
-@ETEX_SYNCTEX_TRUE@am__objects_12 = etex-synctex.$(OBJEXT)
-dist_etex_OBJECTS = etex-etexextra.$(OBJEXT) $(am__objects_12)
-am__objects_13 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
-nodist_etex_OBJECTS = $(am__objects_13) etex-etex-pool.$(OBJEXT)
+@ETEX_SYNCTEX_TRUE@am__objects_13 = etex-synctex.$(OBJEXT)
+dist_etex_OBJECTS = etex-etexextra.$(OBJEXT) $(am__objects_13)
+am__objects_14 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
+nodist_etex_OBJECTS = $(am__objects_14) etex-etex-pool.$(OBJEXT)
etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS)
-@ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+@ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_3)
+ $(am__DEPENDENCIES_4)
am_gftodvi_OBJECTS =
nodist_gftodvi_OBJECTS = gftodvi.$(OBJEXT)
gftodvi_OBJECTS = $(am_gftodvi_OBJECTS) $(nodist_gftodvi_OBJECTS)
@@ -658,7 +688,7 @@ initex_OBJECTS = $(am_initex_OBJECTS)
initex_DEPENDENCIES =
am_luatex_OBJECTS = luatex-luatex.$(OBJEXT)
luatex_OBJECTS = $(am_luatex_OBJECTS)
-am__DEPENDENCIES_4 = libluatex.a libff.a libluamisc.a libluasocket.a \
+am__DEPENDENCIES_5 = libluatex.a libff.a libluamisc.a libluasocket.a \
liblua51.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) libmd5.a libmplib.a
@@ -670,12 +700,12 @@ md5main_OBJECTS = $(am_md5main_OBJECTS)
md5main_DEPENDENCIES = libmd5.a
dist_mf_OBJECTS = mf-mfextra.$(OBJEXT)
mf_OBJECTS = $(dist_mf_OBJECTS)
-@WIN32_FALSE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) \
+@WIN32_FALSE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1)
mf_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) \
- $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_6)
dist_mf_nowin_OBJECTS = mf_nowin-mfextra.$(OBJEXT)
mf_nowin_OBJECTS = $(dist_mf_nowin_OBJECTS)
mf_nowin_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib)
@@ -683,8 +713,8 @@ nodist_mft_OBJECTS = mft.$(OBJEXT)
mft_OBJECTS = $(nodist_mft_OBJECTS)
mft_LDADD = $(LDADD)
mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_14 = mpost-mpxout.$(OBJEXT)
-nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_14)
+am__objects_15 = mpost-mpxout.$(OBJEXT)
+nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_15)
mpost_OBJECTS = $(nodist_mpost_OBJECTS)
nodist_odvicopy_OBJECTS = odvicopy.$(OBJEXT)
odvicopy_OBJECTS = $(nodist_odvicopy_OBJECTS)
@@ -721,19 +751,19 @@ patgen_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
am_pbibtex_OBJECTS =
nodist_pbibtex_OBJECTS = pbibtex-pbibtex.$(OBJEXT)
pbibtex_OBJECTS = $(am_pbibtex_OBJECTS) $(nodist_pbibtex_OBJECTS)
-am__DEPENDENCIES_6 = $(pproglib) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_7 = $(pproglib) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2)
-pbibtex_DEPENDENCIES = $(am__DEPENDENCIES_6)
+pbibtex_DEPENDENCIES = $(am__DEPENDENCIES_7)
am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \
pdftexdir/pdftexextra.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-pdftex.h
-@PDFTEX_SYNCTEX_TRUE@am__objects_15 = pdftex-synctex.$(OBJEXT)
-dist_pdftex_OBJECTS = pdftex-pdftexextra.$(OBJEXT) $(am__objects_15)
-am__objects_16 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
-nodist_pdftex_OBJECTS = $(am__objects_16) pdftex-pdftex-pool.$(OBJEXT)
+@PDFTEX_SYNCTEX_TRUE@am__objects_16 = pdftex-synctex.$(OBJEXT)
+dist_pdftex_OBJECTS = pdftex-pdftexextra.$(OBJEXT) $(am__objects_16)
+am__objects_17 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_17) pdftex-pdftex-pool.$(OBJEXT)
pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmd5.a
pdftex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(pdftex_CXXFLAGS) $(CXXFLAGS) \
@@ -746,7 +776,7 @@ pdftosrc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
am_pdvitype_OBJECTS =
nodist_pdvitype_OBJECTS = pdvitype-pdvitype.$(OBJEXT)
pdvitype_OBJECTS = $(am_pdvitype_OBJECTS) $(nodist_pdvitype_OBJECTS)
-pdvitype_DEPENDENCIES = $(am__DEPENDENCIES_6)
+pdvitype_DEPENDENCIES = $(am__DEPENDENCIES_7)
nodist_pktogf_OBJECTS = pktogf.$(OBJEXT)
pktogf_OBJECTS = $(nodist_pktogf_OBJECTS)
pktogf_LDADD = $(LDADD)
@@ -766,17 +796,22 @@ pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
am_ppltotf_OBJECTS =
nodist_ppltotf_OBJECTS = ppltotf-ppltotf.$(OBJEXT)
ppltotf_OBJECTS = $(am_ppltotf_OBJECTS) $(nodist_ppltotf_OBJECTS)
-ppltotf_DEPENDENCIES = $(am__DEPENDENCIES_6)
-dist_ptex_OBJECTS = ptex-ptexextra.$(OBJEXT)
-am__objects_17 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_17) ptex-ptex-pool.$(OBJEXT)
+ppltotf_DEPENDENCIES = $(am__DEPENDENCIES_7)
+am__dist_ptex_SOURCES_DIST = ptexdir/ptexextra.c ptexdir/ptexextra.h \
+ synctexdir/synctex.c synctexdir/synctex.h \
+ synctexdir/synctex-common.h synctexdir/synctex-ptex.h
+@PTEX_SYNCTEX_TRUE@am__objects_18 = ptex-synctex.$(OBJEXT)
+dist_ptex_OBJECTS = ptex-ptexextra.$(OBJEXT) $(am__objects_18)
+am__objects_19 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_19) ptex-ptex-pool.$(OBJEXT)
ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
-ptex_DEPENDENCIES = libkanji.a $(am__DEPENDENCIES_6) \
- $(am__DEPENDENCIES_1)
+@PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
+ptex_DEPENDENCIES = libkanji.a $(am__DEPENDENCIES_7) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_ptftopl_OBJECTS =
nodist_ptftopl_OBJECTS = ptftopl-ptftopl.$(OBJEXT)
ptftopl_OBJECTS = $(am_ptftopl_OBJECTS) $(nodist_ptftopl_OBJECTS)
-ptftopl_DEPENDENCIES = $(am__DEPENDENCIES_6)
+ptftopl_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_synctex_OBJECTS = synctex-synctex_main.$(OBJEXT) \
synctex-synctex_parser.$(OBJEXT) \
synctex-synctex_parser_utils.$(OBJEXT)
@@ -792,14 +827,14 @@ tangleboot_LDADD = $(LDADD)
am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-tex.h
-@TEX_SYNCTEX_TRUE@am__objects_18 = tex-synctex.$(OBJEXT)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_18)
-am__objects_19 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_19) tex-tex-pool.$(OBJEXT)
+@TEX_SYNCTEX_TRUE@am__objects_20 = tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_20)
+am__objects_21 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_21) tex-tex-pool.$(OBJEXT)
tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
-@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
+@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_10)
nodist_tftopl_OBJECTS = tftopl.$(OBJEXT)
tftopl_OBJECTS = $(nodist_tftopl_OBJECTS)
tftopl_LDADD = $(LDADD)
@@ -829,20 +864,20 @@ am__dist_xetex_SOURCES_DIST = xetexdir/xetexextra.c \
xetexdir/xetexextra.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-xetex.h
-@XETEX_SYNCTEX_TRUE@am__objects_20 = xetex-synctex.$(OBJEXT)
-dist_xetex_OBJECTS = xetex-xetexextra.$(OBJEXT) $(am__objects_20)
-am__objects_21 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_21) xetex-xetex_pool.$(OBJEXT)
+@XETEX_SYNCTEX_TRUE@am__objects_22 = xetex-synctex.$(OBJEXT)
+dist_xetex_OBJECTS = xetex-xetexextra.$(OBJEXT) $(am__objects_22)
+am__objects_23 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_23) xetex-xetex_pool.$(OBJEXT)
xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
-@XETEX_MACOSX_FALSE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) \
+@XETEX_MACOSX_FALSE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) \
@XETEX_MACOSX_FALSE@ $(am__DEPENDENCIES_1) \
@XETEX_MACOSX_FALSE@ $(am__DEPENDENCIES_1)
-@XETEX_GRAPHITE_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_11 = $(libxetex) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9) \
- $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_1) \
+@XETEX_GRAPHITE_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_13 = $(libxetex) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_11) \
+ $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
-xetex_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_2) \
+xetex_DEPENDENCIES = $(am__DEPENDENCIES_13) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_1)
xetex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(xetex_CXXFLAGS) $(CXXFLAGS) \
@@ -919,15 +954,16 @@ DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
$(EXTRA_libpdftex_a_SOURCES) $(am__libxetex_a_SOURCES_DIST) \
$(libxetexmm_a_SOURCES) $(dist_aleph_SOURCES) \
$(call_luatex_SOURCES) $(call_mpost_SOURCES) \
- $(dist_eptex_SOURCES) $(am__dist_etex_SOURCES_DIST) \
+ $(am__dist_eptex_SOURCES_DIST) $(am__dist_etex_SOURCES_DIST) \
$(gftodvi_SOURCES) $(inimf_SOURCES) $(initex_SOURCES) \
$(luatex_SOURCES) $(md5main_SOURCES) $(dist_mf_SOURCES) \
$(dist_mf_nowin_SOURCES) $(pbibtex_SOURCES) \
$(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \
- $(pdvitype_SOURCES) $(ppltotf_SOURCES) $(dist_ptex_SOURCES) \
- $(ptftopl_SOURCES) $(synctex_SOURCES) \
- $(am__dist_tex_SOURCES_DIST) $(ttf2afm_SOURCES) \
- $(EXTRA_ttf2afm_SOURCES) $(am__dist_xetex_SOURCES_DIST)
+ $(pdvitype_SOURCES) $(ppltotf_SOURCES) \
+ $(am__dist_ptex_SOURCES_DIST) $(ptftopl_SOURCES) \
+ $(synctex_SOURCES) $(am__dist_tex_SOURCES_DIST) \
+ $(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
+ $(am__dist_xetex_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
@@ -1272,20 +1308,20 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
etexdir/etrip/etrip1.in etexdir/etrip/etrip2.in \
etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \
etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \
- etexdir/etrip/trip2.in $(ptex_tests) $(ptex_web_srcs) \
- $(ptex_ch_srcs) ptexdir/ptex.defines ptexdir/pbibtex.ch \
- web2c/cvtbib.sed ptexdir/pdvitype.ch ptexdir/ppltotf.ch \
- ptexdir/ptftopl.ch ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis \
- ptexdir/ChangeLog ptexdir/Changes.txt ptexdir/INSTALL.txt \
- ptexdir/README.txt ptexdir/tests/nissya_bib.aux \
- ptexdir/tests/nissya.bst ptexdir/tests/sample.bib \
- tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst \
- ptexdir/tests/goth10.tfm ptexdir/tests/sample.dvi \
- ptexdir/tests/min10.pl ptexdir/tests/min10.tfm \
- ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm \
- ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf \
- $(eptex_tests) $(eptex_web_srcs) $(eptex_ch_srcs) \
- eptexdir/eptex.defines eptexdir/ChangeLog \
+ etexdir/etrip/trip2.in $(ptex_tests) $(pweb_tests) \
+ $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines \
+ ptexdir/pbibtex.ch web2c/cvtbib.sed ptexdir/pdvitype.ch \
+ ptexdir/ppltotf.ch ptexdir/ptftopl.ch ptexdir/COPYRIGHT \
+ ptexdir/COPYRIGHT.jis ptexdir/ChangeLog ptexdir/Changes.txt \
+ ptexdir/INSTALL.txt ptexdir/README.txt \
+ ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \
+ ptexdir/tests/sample.bib tests/memdata1.bst tests/memdata2.bst \
+ tests/memdata3.bst ptexdir/tests/goth10.tfm \
+ ptexdir/tests/sample.dvi ptexdir/tests/min10.pl \
+ ptexdir/tests/min10.tfm ptexdir/tests/tmin10.pl \
+ ptexdir/tests/tmin10.tfm ptexdir/ptrip/ptrip.diffs \
+ ptexdir/ptrip/texmf.cnf $(eptex_tests) $(eptex_web_srcs) \
+ $(eptex_ch_srcs) eptexdir/eptex.defines eptexdir/ChangeLog \
eptexdir/ChangeLog.TL eptexdir/README.txt \
eptexdir/eptrip/eptrip.diffs eptexdir/eptrip/etrip.log \
eptexdir/eptrip/etrip.tex eptexdir/eptrip/texmf.cnf \
@@ -1431,9 +1467,12 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
synctexdir/synctex-rec.ch1 synctexdir/synctex-rec.ch2 \
synctexdir/synctex-e-mem.ch0 synctexdir/synctex-e-mem.ch1 \
synctexdir/synctex-e-rec.ch0 synctexdir/synctex-e-rec.ch1 \
- synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-mem.ch2 \
- synctexdir/synctex-xe-rec.ch2 synctexdir/synctex-xe-rec.ch3 \
- libmd5/md5.test
+ synctexdir/synctex-p-mem.ch0 synctexdir/synctex-p-mem.ch1 \
+ synctexdir/synctex-p-rec.ch0 synctexdir/synctex-p-rec.ch1 \
+ synctexdir/synctex-ep-mem.ch0 synctexdir/synctex-ep-mem.ch1 \
+ synctexdir/synctex-ep-rec.ch1 synctexdir/synctex-pdf-rec.ch2 \
+ synctexdir/synctex-xe-mem.ch2 synctexdir/synctex-xe-rec.ch2 \
+ synctexdir/synctex-xe-rec.ch3 libmd5/md5.test
DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
tangle-web2c tangleboot.c tangleboot.h tangleboot.p \
tangleboot-web2c ctangle.c cweb.c cweb.h ctangle-ctangle \
@@ -1483,13 +1522,13 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
aleph.pool aleph-tangle
CLEANFILES =
TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_26) \
- $(am__append_31) $(am__append_37) $(am__append_42)
+ $(am__append_31) $(am__append_37) $(am__append_43)
TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
- $(am__append_30) $(am__append_36) $(am__append_41)
+ $(am__append_30) $(am__append_36) $(am__append_42)
bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
- $(am__append_50)
-install_exe_links = $(am__append_20) $(am__append_48)
-uninstall_exe_links = $(am__append_21) $(am__append_49)
+ $(am__append_51)
+install_exe_links = $(am__append_20) $(am__append_49)
+uninstall_exe_links = $(am__append_21) $(am__append_50)
web2c = $(SHELL) ./web2c-sh $@
makecpool = web2c/makecpool
@@ -1573,18 +1612,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
initex_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_72)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_73)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_73)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_74)
# 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_75)
+dist_tex_SOURCES = texextra.c $(am__append_76)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_74)
+tex_prereq = texd.h $(am__append_75)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -1652,19 +1691,19 @@ psout_c_h = mppsout.h psout.c mplibps.h
svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
mplibdir/mpmath.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_76)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_77)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_77)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_78)
# e-TeX C sources
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h
dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
- $(am__append_79)
+ $(am__append_80)
# 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_78)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_79)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -1689,32 +1728,36 @@ pweb_programs = pbibtex pdvitype ppltotf ptftopl
# pTeX Tests
#
-ptex_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
- ptexdir/ppltotf.test ptexdir/ptftopl.test ptexdir/ptrip.test \
+ptex_tests = ptexdir/ptrip.test
+pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
+ ptexdir/ppltotf.test ptexdir/ptftopl.test \
ptexdir/pbibtex-openout-test.pl \
ptexdir/pbibtex-longline-test.pl ptexdir/pbibtex-mem.test \
ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test
pproglib = lib/libp.a
libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_81)
# With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = libkanji.a $(ptex_ldadd) $(ipc_socketlibs)
+ptex_LDADD = libkanji.a $(ptex_ldadd) $(ipc_socketlibs) \
+ $(am__append_82)
# pTeX C sources
ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexdir/ptex_version.h
-dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h
+dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
+ $(am__append_84)
# We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_83)
ptex_web_srcs = \
tex.web \
tex.ch
ptex_ch_srcs = \
ptexdir/ptex-base.ch \
+ $(ptex_ch_synctex) \
tex-binpool.ch
nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
@@ -1737,18 +1780,21 @@ ptftopl_LDADD = $(ptex_ldadd)
# e-pTeX Tests
#
eptex_tests = eptexdir/eptrip.test
-eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_85)
# With --enable-ipc, e-pTeX may need to link with -lsocket.
-eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs)
+eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
+ $(ipc_socketlibs) $(am__append_86)
# e-pTeX C sources
eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/ptex_version.h
-dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h
+dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
+ $(am__append_88)
# We must create eptexd.h and eptexdir/[ep]tex_version.h before building the eptex_OBJECTS.
-eptex_prereq = eptexd.h eptexdir/etex_version.h eptexdir/ptex_version.h
+eptex_prereq = eptexd.h eptexdir/etex_version.h \
+ eptexdir/ptex_version.h $(am__append_87)
eptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -1762,6 +1808,7 @@ eptex_ch_srcs = \
ptexdir/ptex-base.ch \
eptexdir/eptex.ech \
eptexdir/etex.ch1 \
+ $(eptex_ch_synctex) \
eptexdir/fam256.ch \
eptexdir/pdfstrcmp.ch \
eptexdir/pdfsavepos.ch \
@@ -1780,7 +1827,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 $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_80)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_89)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -1794,7 +1841,7 @@ nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \
pdftexdir/etex_version.h pdftexdir/pdftex_version.h
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
- $(am__append_81)
+ $(am__append_90)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -1820,7 +1867,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
pdftexdir/writejbig2.c pdftexdir/writejbig2.h \
pdftexdir/writejpg.c pdftexdir/writepng.c pdftexdir/writet1.c \
pdftexdir/writet3.c pdftexdir/writettf.c pdftexdir/writettf.h \
- pdftexdir/writezip.c $(am__append_45)
+ pdftexdir/writezip.c $(am__append_46)
EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
pdftexdir/regex/regex_internal.h pdftexdir/regex/regexec.c
@@ -1861,7 +1908,7 @@ call_luatex_LDADD =
# luaTeX Tests
#
luatex_tests = luatexdir/luatex.test
-liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_52)
+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_53)
liblua51_a_CFLAGS = # $(WARNING_CFLAGS)
liblua51_a_SOURCES = \
luatexdir/lua51/lapi.c \
@@ -2239,17 +2286,17 @@ txt2zlib_LDADD = $(ZLIB_LIBS)
# Force Automake to use CXXLD for linking
nodist_EXTRA_xetex_SOURCES = dummy.cxx
-libxetex = libxetex.a $(am__append_55)
+libxetex = libxetex.a $(am__append_56)
xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
- $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_54) \
- $(am__append_56) $(am__append_59) $(ZLIB_INCLUDES)
-xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_57) \
- $(am__append_60) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_55) \
+ $(am__append_57) $(am__append_60) $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_58) \
+ $(am__append_61) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
- $(TECKIT_DEPEND) $(am__append_58) $(am__append_61) \
+ $(TECKIT_DEPEND) $(am__append_59) $(am__append_62) \
$(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
@XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_82)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_91)
xetex_CFLAGS = # $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -2261,7 +2308,7 @@ nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c \
xetexdir/etex_version.h xetexdir/xetex_version.h
dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
- $(am__append_83)
+ $(am__append_92)
xetex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -2292,7 +2339,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/FontTableCache.cpp \
xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \
xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \
xetexdir/trans.h xetexdir/hz.cpp xetexdir/xetex.h \
- $(am__append_62) $(am__append_63) $(am__append_64)
+ $(am__append_63) $(am__append_64) $(am__append_65)
# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -2417,6 +2464,29 @@ synctex_LDADD = $(ZLIB_LIBS)
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0 \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch1
+@PTEX_SYNCTEX_TRUE@ptex_ch_synctex = \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch0 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch1 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch1 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch2 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
+
+@EPTEX_SYNCTEX_TRUE@eptex_ch_synctex = \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch1 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch1 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-rec.ch1 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
+
@PDFTEX_SYNCTEX_TRUE@pdftex_ch_synctex = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch1 \
@@ -2815,6 +2885,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptex0.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptexextra.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-synctex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etex-pool.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etex0.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etexextra.Po@am__quote@
@@ -3147,6 +3218,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex0.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptexextra.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-synctex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptftopl-ptftopl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synctex-synctex_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synctex-synctex_parser.Po@am__quote@
@@ -7058,6 +7130,20 @@ eptex-eptexextra.obj: eptexdir/eptexextra.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptexextra.obj `if test -f 'eptexdir/eptexextra.c'; then $(CYGPATH_W) 'eptexdir/eptexextra.c'; else $(CYGPATH_W) '$(srcdir)/eptexdir/eptexextra.c'; fi`
+eptex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-synctex.o -MD -MP -MF $(DEPDIR)/eptex-synctex.Tpo -c -o eptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/eptex-synctex.Tpo $(DEPDIR)/eptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='synctexdir/synctex.c' object='eptex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+eptex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-synctex.obj -MD -MP -MF $(DEPDIR)/eptex-synctex.Tpo -c -o eptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/eptex-synctex.Tpo $(DEPDIR)/eptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='synctexdir/synctex.c' object='eptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
eptex-eptexini.o: eptexini.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptexini.o -MD -MP -MF $(DEPDIR)/eptex-eptexini.Tpo -c -o eptex-eptexini.o `test -f 'eptexini.c' || echo '$(srcdir)/'`eptexini.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/eptex-eptexini.Tpo $(DEPDIR)/eptex-eptexini.Po
@@ -7408,6 +7494,20 @@ ptex-ptexextra.obj: ptexdir/ptexextra.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptexextra.obj `if test -f 'ptexdir/ptexextra.c'; then $(CYGPATH_W) 'ptexdir/ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/ptexextra.c'; fi`
+ptex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-synctex.o -MD -MP -MF $(DEPDIR)/ptex-synctex.Tpo -c -o ptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-synctex.Tpo $(DEPDIR)/ptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='synctexdir/synctex.c' object='ptex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+ptex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-synctex.obj -MD -MP -MF $(DEPDIR)/ptex-synctex.Tpo -c -o ptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-synctex.Tpo $(DEPDIR)/ptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='synctexdir/synctex.c' object='ptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
ptex-ptexini.o: ptexini.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptexini.o -MD -MP -MF $(DEPDIR)/ptex-ptexini.Tpo -c -o ptex-ptexini.o `test -f 'ptexini.c' || echo '$(srcdir)/'`ptexini.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index c88e73c5c6b..1249251eb3c 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -1,6 +1,6 @@
## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
dnl
-dnl Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
## configure options for TeX and MF
@@ -33,12 +33,12 @@ dnl [PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS]
m4_define([kpse_tex_progs], [dnl
[[tex], [yes], [no], [TeX], []],
[[etex], [no], [yes], [e-TeX], []],
-[[ptex], [yes], [no], [pTeX], [ptexenc]],
-[[eptex], [yes], [no], [e-pTeX], [ptexenc]],
-[[aleph], [yes], [no], [Aleph], []],
+[[ptex], [yes], [yes], [pTeX], [ptexenc]],
+[[eptex], [yes], [yes], [e-pTeX], [ptexenc]],
+[[aleph], [yes], [], [Aleph], []],
[[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng obsdcompat]],
-[[luatex], [yes], [no], [luaTeX], [poppler libpng obsdcompat zziplib]],
-[[xetex], [yes], [yes], [XeTeX], [xpdf libpng freetype2 icu-xetex teckit graphite]],
+[[luatex], [yes], [], [luaTeX], [poppler libpng obsdcompat zziplib]],
+[[xetex], [yes], [yes], [XeTeX], [poppler libpng freetype2 icu-xetex teckit graphite]],
])[]dnl
m4_foreach([Kpse_Prog], [kpse_tex_progs],
[m4_ifset([Kpse_Prog],
diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index ab57e65e0b1..c2208184515 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -89,9 +89,6 @@
/* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
-/* Define to 1 if class `PDFDoc' has the `getPDFMajorVersion' member. */
-#undef HAVE_GETPDFMAJORVERSION
-
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index a5cb65b4896..b4a5f340cde 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Web2C 2011.
+# Generated by GNU Autoconf 2.68 for Web2C 2012/dev.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Web2C'
PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2011'
-PACKAGE_STRING='Web2C 2011'
+PACKAGE_VERSION='2012/dev'
+PACKAGE_STRING='Web2C 2012/dev'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -679,6 +679,8 @@ LEX
YFLAGS
YACC
KPATHSEA_PATHS_H
+PWEB_FALSE
+PWEB_TRUE
WEB_FALSE
WEB_TRUE
MP_FALSE
@@ -705,16 +707,12 @@ XETEX_SYNCTEX_FALSE
XETEX_SYNCTEX_TRUE
XETEX_FALSE
XETEX_TRUE
-LUATEX_SYNCTEX_FALSE
-LUATEX_SYNCTEX_TRUE
LUATEX_FALSE
LUATEX_TRUE
PDFTEX_SYNCTEX_FALSE
PDFTEX_SYNCTEX_TRUE
PDFTEX_FALSE
PDFTEX_TRUE
-ALEPH_SYNCTEX_FALSE
-ALEPH_SYNCTEX_TRUE
ALEPH_FALSE
ALEPH_TRUE
EPTEX_SYNCTEX_FALSE
@@ -898,13 +896,19 @@ enable_dump_share
enable_ipc
enable_omfonts
enable_tex
+enable_tex_synctex
enable_etex
+enable_etex_synctex
enable_ptex
+enable_ptex_synctex
enable_eptex
+enable_eptex_synctex
enable_aleph
enable_pdftex
+enable_pdftex_synctex
enable_luatex
enable_xetex
+enable_xetex_synctex
enable_mf
enable_mf_nowin
with_mf_x_toolkit
@@ -1501,7 +1505,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Web2C 2011 to adapt to many kinds of systems.
+\`configure' configures Web2C 2012/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1575,7 +1579,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C 2011:";;
+ short | recursive ) echo "Configuration of Web2C 2012/dev:";;
esac
cat <<\_ACEOF
@@ -1604,13 +1608,19 @@ Optional Features:
--disable-omfonts do not compile and install omfonts (use Web2C
versions)
--disable-tex do not compile and install TeX
+ --enable-tex-synctex build TeX with SyncTeX support
--enable-etex compile and install e-TeX
+ --disable-etex-synctex build e-TeX without SyncTeX support
--disable-ptex do not compile and install pTeX
+ --disable-ptex-synctex build pTeX without SyncTeX support
--disable-eptex do not compile and install e-pTeX
+ --disable-eptex-synctex build e-pTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
--disable-pdftex do not compile and install pdfTeX
+ --disable-pdftex-synctex build pdfTeX without SyncTeX support
--disable-luatex do not compile and install luaTeX
--disable-xetex do not compile and install XeTeX
+ --disable-xetex-synctex build XeTeX without SyncTeX support
--disable-mf do not build METAFONT
--disable-mf-nowin do not build a separate non-windows-capable
METAFONT
@@ -1764,7 +1774,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C configure 2011
+Web2C configure 2012/dev
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2672,7 +2682,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Web2C $as_me 2011, which was
+It was created by Web2C $as_me 2012/dev, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3053,7 +3063,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-WEB2CVERSION=2011
+WEB2CVERSION=2012/dev
am__api_version='1.11'
@@ -8028,7 +8038,7 @@ fi
# Define the identity of the package.
PACKAGE='web2c'
- VERSION='2011'
+ VERSION='2012/dev'
cat >>confdefs.h <<_ACEOF
@@ -13166,39 +13176,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
if ${kpse_cv_warning_cflags+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "x$enable_compiler_warnings" = xno; then
+ if test "x$GCC" = xyes; then
kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+ case `$CC -dumpversion` in #(
3.4.* | 4.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
*) :
;;
esac
-case `$CC -dumpversion` in #(
+ case `$CC -dumpversion` in #(
3.[234].* | 4.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
*) :
;;
esac
-if test "x$enable_compiler_warnings" != xmin; then
- kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
- if test "x$enable_compiler_warnings" != xyes; then
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
- case `$CC -dumpversion` in #(
+ if test "x$enable_compiler_warnings" != xmin; then
+ kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+ if test "x$enable_compiler_warnings" != xyes; then
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+ case `$CC -dumpversion` in #(
3.4.* | 4.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
*) :
;;
esac
- if test "x$enable_compiler_warnings" != xmax; then
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+ if test "x$enable_compiler_warnings" != xmax; then
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+ fi
fi
fi
fi
+elif test "x$enable_compiler_warnings" = xno; then
+ kpse_cv_warning_cflags=
else
kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
fi
@@ -16817,26 +16830,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
if ${kpse_cv_warning_cxxflags+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "x$enable_compiler_warnings" = xno; then
+ if test "x$GXX" = xyes; then
kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
-case `$CXX -dumpversion` in #(
+ case `$CXX -dumpversion` in #(
3.[234].* | 4.*) :
kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
*) :
;;
esac
-if test "x$enable_compiler_warnings" != xmin; then
- kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
- if test "x$enable_compiler_warnings" != xyes; then
- kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
- kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
- fi
- if test "x$enable_compiler_warnings" != xmax; then
- kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+ if test "x$enable_compiler_warnings" != xmin; then
+ kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+ if test "x$enable_compiler_warnings" != xyes; then
+ kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+ kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+ kpse_warn_strings="-Wwrite-strings"
+ if test "x$enable_compiler_warnings" != xmax; then
+ kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+ fi
fi
+ fi
fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+ kpse_cv_warning_cxxflags=
else
kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
fi
@@ -17101,26 +17120,32 @@ $as_echo_n "checking what warning flags to pass to the Objective C++ compiler...
if ${kpse_cv_warning_objcxxflags+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "x$enable_compiler_warnings" = xno; then
+ if test "x$GOBJCXX" = xyes; then
kpse_cv_warning_objcxxflags=
-elif test "x$GOBJCXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
kpse_cv_warning_objcxxflags="-Wimplicit -Wreturn-type"
-case `$OBJCXX -dumpversion` in #(
+ case `$OBJCXX -dumpversion` in #(
3.[234].* | 4.*) :
kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wno-unknown-pragmas" ;; #(
*) :
;;
esac
-if test "x$enable_compiler_warnings" != xmin; then
- kpse_cv_warning_objcxxflags="-Wall -Wunused $kpse_cv_warning_objcxxflags"
- if test "x$enable_compiler_warnings" != xyes; then
- kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
- kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
- fi
- if test "x$enable_compiler_warnings" != xmax; then
- kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wshadow"
+ if test "x$enable_compiler_warnings" != xmin; then
+ kpse_cv_warning_objcxxflags="-Wall -Wunused $kpse_cv_warning_objcxxflags"
+ if test "x$enable_compiler_warnings" != xyes; then
+ kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+ kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wcast-qual -Wcast-align"
+ kpse_warn_strings="-Wwrite-strings"
+ if test "x$enable_compiler_warnings" != xmax; then
+ kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wshadow"
+ fi
fi
+ fi
fi
+kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+ kpse_cv_warning_objcxxflags=
else
kpse_cv_warning_objcxxflags= # FIXME: warning flags for non-GNU Objective C++ compilers
fi
@@ -17284,32 +17309,47 @@ if test "${enable_tex+set}" = set; then :
enableval=$enable_tex;
fi
case $enable_tex in #(
- yes|no) :
+ yes | no) :
;; #(
*) :
enable_tex=yes ;;
esac
+
+# Check whether --enable-tex-synctex was given.
+if test "${enable_tex_synctex+set}" = set; then :
+ enableval=$enable_tex_synctex;
+fi
# Check whether --enable-etex was given.
if test "${enable_etex+set}" = set; then :
enableval=$enable_etex;
fi
case $enable_etex in #(
- yes|no) :
+ yes | no) :
;; #(
*) :
enable_etex=no ;;
esac
+
+# Check whether --enable-etex-synctex was given.
+if test "${enable_etex_synctex+set}" = set; then :
+ enableval=$enable_etex_synctex;
+fi
# Check whether --enable-ptex was given.
if test "${enable_ptex+set}" = set; then :
enableval=$enable_ptex;
fi
case $enable_ptex in #(
- yes|no) :
+ yes | no) :
;; #(
*) :
enable_ptex=yes ;;
esac
+# Check whether --enable-ptex-synctex was given.
+if test "${enable_ptex_synctex+set}" = set; then :
+ enableval=$enable_ptex_synctex;
+fi
+
test "x$enable_web2c:$enable_ptex" = xyes:yes && {
need_ptexenc=yes
}
@@ -17318,12 +17358,17 @@ if test "${enable_eptex+set}" = set; then :
enableval=$enable_eptex;
fi
case $enable_eptex in #(
- yes|no) :
+ yes | no) :
;; #(
*) :
enable_eptex=yes ;;
esac
+# Check whether --enable-eptex-synctex was given.
+if test "${enable_eptex_synctex+set}" = set; then :
+ enableval=$enable_eptex_synctex;
+fi
+
test "x$enable_web2c:$enable_eptex" = xyes:yes && {
need_ptexenc=yes
}
@@ -17332,7 +17377,7 @@ if test "${enable_aleph+set}" = set; then :
enableval=$enable_aleph;
fi
case $enable_aleph in #(
- yes|no) :
+ yes | no) :
;; #(
*) :
enable_aleph=yes ;;
@@ -17342,12 +17387,17 @@ if test "${enable_pdftex+set}" = set; then :
enableval=$enable_pdftex;
fi
case $enable_pdftex in #(
- yes|no) :
+ yes | no) :
;; #(
*) :
enable_pdftex=yes ;;
esac
+# Check whether --enable-pdftex-synctex was given.
+if test "${enable_pdftex_synctex+set}" = set; then :
+ enableval=$enable_pdftex_synctex;
+fi
+
test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
need_xpdf=yes
need_libpng=yes
@@ -17358,7 +17408,7 @@ if test "${enable_luatex+set}" = set; then :
enableval=$enable_luatex;
fi
case $enable_luatex in #(
- yes|no) :
+ yes | no) :
;; #(
*) :
enable_luatex=yes ;;
@@ -17375,14 +17425,19 @@ if test "${enable_xetex+set}" = set; then :
enableval=$enable_xetex;
fi
case $enable_xetex in #(
- yes|no) :
+ yes | no) :
;; #(
*) :
enable_xetex=yes ;;
esac
+# Check whether --enable-xetex-synctex was given.
+if test "${enable_xetex_synctex+set}" = set; then :
+ enableval=$enable_xetex_synctex;
+fi
+
test "x$enable_web2c:$enable_xetex" = xyes:yes && {
- need_xpdf=yes
+ need_poppler=yes
need_libpng=yes
need_freetype2=yes
need_icu_xetex=yes
@@ -18315,7 +18370,16 @@ else
TEX_TRUE='#'
TEX_FALSE=
fi
- if false; then
+
+case $enable_native_texlive_build:$enable_tex_synctex in #(
+ yes:no | no:yes | no:no) :
+ ;; #(
+ *) :
+ enable_tex_synctex=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-tex-synctex=no' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-tex-synctex=no' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_tex_synctex" = xyes; then
TEX_SYNCTEX_TRUE=
TEX_SYNCTEX_FALSE='#'
else
@@ -18329,7 +18393,16 @@ else
ETEX_TRUE='#'
ETEX_FALSE=
fi
- if true; then
+
+case $enable_native_texlive_build:$enable_etex_synctex in #(
+ yes:yes | no:yes | no:no) :
+ ;; #(
+ *) :
+ enable_etex_synctex=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-etex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-etex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_etex_synctex" = xyes; then
ETEX_SYNCTEX_TRUE=
ETEX_SYNCTEX_FALSE='#'
else
@@ -18343,7 +18416,16 @@ else
PTEX_TRUE='#'
PTEX_FALSE=
fi
- if false; then
+
+case $enable_native_texlive_build:$enable_ptex_synctex in #(
+ yes:yes | no:yes | no:no) :
+ ;; #(
+ *) :
+ enable_ptex_synctex=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_ptex_synctex" = xyes; then
PTEX_SYNCTEX_TRUE=
PTEX_SYNCTEX_FALSE='#'
else
@@ -18357,7 +18439,16 @@ else
EPTEX_TRUE='#'
EPTEX_FALSE=
fi
- if false; then
+
+case $enable_native_texlive_build:$enable_eptex_synctex in #(
+ yes:yes | no:yes | no:no) :
+ ;; #(
+ *) :
+ enable_eptex_synctex=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_eptex_synctex" = xyes; then
EPTEX_SYNCTEX_TRUE=
EPTEX_SYNCTEX_FALSE='#'
else
@@ -18371,13 +18462,6 @@ else
ALEPH_TRUE='#'
ALEPH_FALSE=
fi
- if false; then
- ALEPH_SYNCTEX_TRUE=
- ALEPH_SYNCTEX_FALSE='#'
-else
- ALEPH_SYNCTEX_TRUE='#'
- ALEPH_SYNCTEX_FALSE=
-fi
if test "x$enable_pdftex" = xyes; then
PDFTEX_TRUE=
PDFTEX_FALSE='#'
@@ -18385,7 +18469,16 @@ else
PDFTEX_TRUE='#'
PDFTEX_FALSE=
fi
- if true; then
+
+case $enable_native_texlive_build:$enable_pdftex_synctex in #(
+ yes:yes | no:yes | no:no) :
+ ;; #(
+ *) :
+ enable_pdftex_synctex=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-pdftex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-pdftex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_pdftex_synctex" = xyes; then
PDFTEX_SYNCTEX_TRUE=
PDFTEX_SYNCTEX_FALSE='#'
else
@@ -18399,13 +18492,6 @@ else
LUATEX_TRUE='#'
LUATEX_FALSE=
fi
- if false; then
- LUATEX_SYNCTEX_TRUE=
- LUATEX_SYNCTEX_FALSE='#'
-else
- LUATEX_SYNCTEX_TRUE='#'
- LUATEX_SYNCTEX_FALSE=
-fi
if test "x$enable_xetex" = xyes; then
XETEX_TRUE=
XETEX_FALSE='#'
@@ -18413,7 +18499,16 @@ else
XETEX_TRUE='#'
XETEX_FALSE=
fi
- if true; then
+
+case $enable_native_texlive_build:$enable_xetex_synctex in #(
+ yes:yes | no:yes | no:no) :
+ ;; #(
+ *) :
+ enable_xetex_synctex=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-xetex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-xetex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_xetex_synctex" = xyes; then
XETEX_SYNCTEX_TRUE=
XETEX_SYNCTEX_FALSE='#'
else
@@ -19288,6 +19383,20 @@ else
fi
+if test "x$enable_ptex:$enable_eptex" = xno:no; then :
+ enable_pweb_progs=no
+else
+ enable_pweb_progs=$enable_web_progs
+fi
+ if test "x$enable_pweb_progs" != xno; then
+ PWEB_TRUE=
+ PWEB_FALSE='#'
+else
+ PWEB_TRUE='#'
+ PWEB_FALSE=
+fi
+
+
if test "x$with_system_kpathsea" = xyes; then
if test "x$with_kpathsea_includes" = x; then
list="/usr/include /usr/local/include"
@@ -20574,7 +20683,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-Web2C config.lt 2011
+Web2C config.lt 2012/dev
configured by $0, generated by GNU Autoconf 2.68.
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -22021,12 +22130,12 @@ if test "${with_system_xpdf+set}" = set; then :
withval=$with_system_xpdf;
fi
if test "x$with_system_xpdf" = xyes; then
- if $PKG_CONFIG poppler --atleast-version=0.10; then
+ if $PKG_CONFIG poppler --atleast-version=0.12; then
POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
XPDF_LIBS=`$PKG_CONFIG poppler --libs`
elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
- as_fn_error $? "did not find poppler-0.10 or better" "$LINENO" 5
+ as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5
fi
else
XPDF_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf' | sed \
@@ -22056,7 +22165,7 @@ if test "x$with_system_poppler" = xyes; then
POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
- as_fn_error $? "did not find poppler-0.10 or better" "$LINENO" 5
+ as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5
fi
else
POPPLER_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler' | sed \
@@ -22325,58 +22434,6 @@ ${top_srcdir}/../../libs/obsdcompat/*.[ch]:
cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-# Checks for xpdf (libpoppler) features.
-eval CPPFLAGS=\"$XPDF_INCLUDES \$CPPFLAGS\"
-eval LIBS=\"$XPDF_LIBS \$LIBS\"
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_link="./libtool --mode=link --tag=CXX $ac_link"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDFDoc::getPDFMajorVersion" >&5
-$as_echo_n "checking for PDFDoc::getPDFMajorVersion... " >&6; }
-if ${kpse_cv_have_getPDFMajorVersion+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <PDFDoc.h>
-int
-main ()
-{
-PDFDoc *pdfDoc; pdfDoc->getPDFMajorVersion();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- kpse_cv_have_getPDFMajorVersion=yes
-else
- kpse_cv_have_getPDFMajorVersion=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_getPDFMajorVersion" >&5
-$as_echo "$kpse_cv_have_getPDFMajorVersion" >&6; }
-if test "x$kpse_cv_have_getPDFMajorVersion" = xyes; then :
-
-$as_echo "#define HAVE_GETPDFMAJORVERSION 1" >>confdefs.h
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_link="./libtool --mode=link --tag=CC $ac_link"
-
-CPPFLAGS=$kpse_save_CPPFLAGS
-LIBS=$kpse_save_LIBS
-
-
ac_config_headers="$ac_config_headers w2c/c-auto.h:c-auto.in"
@@ -22930,10 +22987,6 @@ if test -z "${ALEPH_TRUE}" && test -z "${ALEPH_FALSE}"; then
as_fn_error $? "conditional \"ALEPH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${ALEPH_SYNCTEX_TRUE}" && test -z "${ALEPH_SYNCTEX_FALSE}"; then
- as_fn_error $? "conditional \"ALEPH_SYNCTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${PDFTEX_TRUE}" && test -z "${PDFTEX_FALSE}"; then
as_fn_error $? "conditional \"PDFTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22946,10 +22999,6 @@ if test -z "${LUATEX_TRUE}" && test -z "${LUATEX_FALSE}"; then
as_fn_error $? "conditional \"LUATEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${LUATEX_SYNCTEX_TRUE}" && test -z "${LUATEX_SYNCTEX_FALSE}"; then
- as_fn_error $? "conditional \"LUATEX_SYNCTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${XETEX_TRUE}" && test -z "${XETEX_FALSE}"; then
as_fn_error $? "conditional \"XETEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22986,6 +23035,10 @@ if test -z "${WEB_TRUE}" && test -z "${WEB_FALSE}"; then
as_fn_error $? "conditional \"WEB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${PWEB_TRUE}" && test -z "${PWEB_FALSE}"; then
+ as_fn_error $? "conditional \"PWEB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
@@ -23396,7 +23449,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C $as_me 2011, which was
+This file was extended by Web2C $as_me 2012/dev, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23462,7 +23515,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Web2C config.status 2011
+Web2C config.status 2012/dev
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index aaf79e4b6e1..ce16cc8baee 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -196,6 +196,11 @@ AM_CONDITIONAL([MP], [test "x$enable_mp" != xno])
AM_CONDITIONAL([WEB], [test "x$enable_web_progs" != xno])
+AS_IF([test "x$enable_ptex:$enable_eptex" = xno:no],
+ [enable_pweb_progs=no],
+ [enable_pweb_progs=$enable_web_progs])
+AM_CONDITIONAL([PWEB], [test "x$enable_pweb_progs" != xno])
+
dnl Although quite unusual, it is possible to build Web2C (TeX & Co)
dnl using installed (system) kpathsea headers and library.
dnl In that case we need the location of <kpathsea/paths.h>.
@@ -262,21 +267,6 @@ KPSE_TECKIT_FLAGS
KPSE_ICU_XETEX_FLAGS([icule])
KPSE_OBSDCOMPAT_FLAGS
-# Checks for xpdf (libpoppler) features.
-KPSE_ADD_FLAGS([xpdf])
-AC_LANG_PUSH([C++])
-AC_CACHE_CHECK([for PDFDoc::getPDFMajorVersion],
- [kpse_cv_have_getPDFMajorVersion],
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <PDFDoc.h>]],
- [[PDFDoc *pdfDoc; pdfDoc->getPDFMajorVersion();]])],
- [kpse_cv_have_getPDFMajorVersion=yes],
- [kpse_cv_have_getPDFMajorVersion=no])])
-AS_IF([test "x$kpse_cv_have_getPDFMajorVersion" = xyes],
- [AC_DEFINE([HAVE_GETPDFMAJORVERSION], 1,
- [Define to 1 if class `PDFDoc' has the `getPDFMajorVersion' member.])])
-AC_LANG_POP([C++])
-KPSE_RESTORE_FLAGS
-
dnl Write output here, instead of putting a zillion -D's on the command line.
AC_CONFIG_HEADERS([w2c/c-auto.h:c-auto.in],
[sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \
diff --git a/Build/source/texk/web2c/enctex.ch b/Build/source/texk/web2c/enctex.ch
index 45dbb8419b8..aff72073d0e 100644
--- a/Build/source/texk/web2c/enctex.ch
+++ b/Build/source/texk/web2c/enctex.ch
@@ -42,14 +42,14 @@ for i:=@'177 to @'377 do xchr[i]:=i;
{Initialize enc\TeX\ data.}
for i:=0 to 255 do mubyte_read[i]:=null;
for i:=0 to 255 do mubyte_write[i]:=0;
-for i:=0 to 128 do mubyte_cswrite[i]:=null;
+for i:=0 to 127 do mubyte_cswrite[i]:=null;
mubyte_keep := 0; mubyte_start := false;
write_noexpanding := false; cs_converting := false;
special_printing := false; message_printing := false;
no_convert := false; active_noconvert := false;
@z
-@x [5.59] l.1508FIXME -- enc\TeX\ modifications of |print|.
+@x [5.59] l.1508 FIXME -- enc\TeX\ modifications of |print|.
else begin if selector>pseudo then
begin print_char(s); return; {internal strings are not expanded}
end;
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
index c6c972c5358..4ad7523d8ee 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog.TL
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
@@ -1,6 +1,16 @@
ChangeLog.TL: TeX Live (TL) changes for e-pTeX
==============================================
+2011-07-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * eptex.defines: Add newline at end of file.
+
+2011-07-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/eptex.am (eptex_ch_srcs): SyncTeX infrastructure.
+ * pdfsavepos.ch: Slightly reformulate to simplify SyncTeX.
+ * eptrip/texmf.cnf (main_memory): Increase for SyncTeX.
+
2011-04-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* eptex.ech: Adapted to pTeX Version p3.2.
diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am
index 60d77c6f11c..96dbd00955e 100644
--- a/Build/source/texk/web2c/eptexdir/am/eptex.am
+++ b/Build/source/texk/web2c/eptexdir/am/eptex.am
@@ -75,6 +75,7 @@ eptex_ch_srcs = \
ptexdir/ptex-base.ch \
eptexdir/eptex.ech \
eptexdir/etex.ch1 \
+ $(eptex_ch_synctex) \
eptexdir/fam256.ch \
eptexdir/pdfstrcmp.ch \
eptexdir/pdfsavepos.ch \
diff --git a/Build/source/texk/web2c/eptexdir/eptex.defines b/Build/source/texk/web2c/eptexdir/eptex.defines
index f3d1332f096..e1c1ee2756a 100644
--- a/Build/source/texk/web2c/eptexdir/eptex.defines
+++ b/Build/source/texk/web2c/eptexdir/eptex.defines
@@ -35,4 +35,4 @@
@define function kcatcodekey ();
@define function getintone ();
-@define procedure setintone (); \ No newline at end of file
+@define procedure setintone ();
diff --git a/Build/source/texk/web2c/eptexdir/eptrip/texmf.cnf b/Build/source/texk/web2c/eptexdir/eptrip/texmf.cnf
index e7241a532b3..69e0c92edf8 100644
--- a/Build/source/texk/web2c/eptexdir/eptrip/texmf.cnf
+++ b/Build/source/texk/web2c/eptexdir/eptrip/texmf.cnf
@@ -7,7 +7,8 @@ half_error_line = 32
max_print_line = 72
% e-pTeX.
-main_memory = 3999 % can't change mem_bot, it stays 0
+mem_bot = 1
+main_memory = 4500
max_strings = 3300
pool_size = 36000
diff --git a/Build/source/texk/web2c/eptexdir/pdfsavepos.ch b/Build/source/texk/web2c/eptexdir/pdfsavepos.ch
index 2f364617abf..3c5b58f822b 100644
--- a/Build/source/texk/web2c/eptexdir/pdfsavepos.ch
+++ b/Build/source/texk/web2c/eptexdir/pdfsavepos.ch
@@ -53,11 +53,9 @@ pdf_page_height_code: print_esc("pdfpageheight");
@x
@!old_setting:0..max_selector; {saved |selector| setting}
-begin if tracing_output>0 then
@y
@!old_setting:0..max_selector; {saved |selector| setting}
@!t: scaled;
-begin if tracing_output>0 then
@z
@x
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 4ffd0c76b3b..ee8ec05b24e 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * texmfmp.c: Drop `#warning SyncTeX: -synctex command line...'.
+
2011-05-18 Peter Breitenlohner <peb@mppmu.mpg.de>
* texmfmp.c (ipcpage): Add 'free(cwd)'.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 4e4c62419ec..1cc014bd5de 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -622,7 +622,6 @@ maininit (int ac, string *av)
kpse_record_output = recorder_record_output;
#if defined(__SyncTeX__)
-# warning SyncTeX: -synctex command line option available
/* 0 means "disable Synchronize TeXnology".
synctexoption is a *.web variable.
We initialize it to a weird value to catch the -synctex command line flag.
@@ -631,11 +630,6 @@ maininit (int ac, string *av)
by the user. */
# define SYNCTEX_NO_OPTION INT_MAX
synctexoption = SYNCTEX_NO_OPTION;
-#else
-# /* Omit warning for Aleph, pTeX, epTeX, and non-TeX. */
-# if defined(TeX) && !defined(Aleph) && !defined(pTeX) && !defined(epTeX)
-# warning SyncTeX: -synctex command line option NOT available
-# endif
#endif
/* If the user says --help or --version, we need to notice early. And
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index b716eaf735b..1506e0b3d2a 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,4 +1,16 @@
+2011-06-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Reduce memory leaks.
+ * lua/lkpselib.c (do_lua_kpathsea_lookup): Free string no longer
+ used.
+
+2011-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ lua/lkpselib.c (find_dpi): Allow find_suffix() to return a
+ const string.
+
2011-05-19 Taco Hoekwater <taco@luatex.org>
+
* lua/ltexlib.c: fix a bug on negative catcode table arguments.
* luatex.c, NEWS: luatex is now version 0.70.1
* luatex_svnversion.h: updated to reflect latest luatex revision (4277)
diff --git a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c
index 2949fae16f1..7a54d138b64 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c
@@ -331,7 +331,7 @@ static int lua_kpathsea_var_value(lua_State * L)
static unsigned find_dpi(const_string s)
{
unsigned dpi_number = 0;
- string extension = find_suffix(s);
+ const_string extension = find_suffix(s);
if (extension != NULL)
sscanf(extension, "%u", &dpi_number);
@@ -622,13 +622,16 @@ static int do_lua_kpathsea_lookup(lua_State * L, kpathsea kpse, int idx)
case kpse_any_glyph_format:
{
kpse_glyph_file_type glyph_ret;
+ string temp = remove_suffix (name);
/* Try to extract the resolution from the name. */
unsigned local_dpi = find_dpi(name);
if (!local_dpi)
local_dpi = (unsigned) dpi;
ret =
- kpathsea_find_glyph(kpse, remove_suffix(name), local_dpi,
+ kpathsea_find_glyph(kpse, temp, local_dpi,
fmt, &glyph_ret);
+ if (temp != name)
+ free (temp);
}
break;
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index e6ebf36e44c..e154e64e33c 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-11 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pdftosrc.cc: Rewrite the Object Stream handling for poppler
+ (or xpdf without patch-40-objectStream-support-for-pdftosrc).
+
+ * pdftoepdf.cc: Replace `#ifdef HAVE_GETPDFMAJORVERSION' by
+ '#ifdef POPPLER_VERSION' for poppler >= 0.12.
+
2011-05-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* writepng.c: #define PNG_FP_1 for libpng < 1.5.0.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
index a5e8d3f79a8..e0981022485 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -717,7 +717,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
PdfDocument *pdf_doc;
Page *page;
PDFRectangle *pagebox;
-#ifdef HAVE_GETPDFMAJORVERSION
+#ifdef POPPLER_VERSION
int pdf_major_version_found, pdf_minor_version_found;
#else
float pdf_version_found, pdf_version_wanted;
@@ -736,7 +736,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
// this works only for PDF 1.x -- but since any versions of PDF newer
// than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
// then have to changed drastically anyway.
-#ifdef HAVE_GETPDFMAJORVERSION
+#ifdef POPPLER_VERSION
pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
if ((pdf_major_version_found > 1)
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
index a6debc4acc5..85021303cb5 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
@@ -40,6 +40,8 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "Object.h"
#include "Stream.h"
+#include "Lexer.h"
+#include "Parser.h"
#include "Array.h"
#include "Dict.h"
#include "XRef.h"
@@ -149,7 +151,39 @@ int main(int argc, char *argv[])
(e->type == xrefEntryFree ? "f" : "n"));
else { // e->offset is the object number of the object stream
#ifdef POPPLER_VERSION
- fprintf(stderr, "warning: this version of pdftosrc doesn't support object stream (use pdftosrc from TeX Live if you need it)\n");
+ Stream *str;
+ Parser *parser;
+ Object objStr, obj1, obj2;
+ int nObjects, first, n;
+ int localOffset = 0;
+ Guint firstOffset;
+
+ assert(xref->fetch(e->offset, 0, &objStr)->isStream());
+ nObjects = objStr.streamGetDict()->lookup("N", &obj1)->getInt();
+ obj1.free();
+ first = objStr.streamGetDict()->lookup("First", &obj1)->getInt();
+ obj1.free();
+ firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
+
+ // parse the header: object numbers and offsets
+ objStr.streamReset();
+ obj1.initNull();
+ str = new EmbedStream(objStr.getStream(), &obj1, gTrue, first);
+ parser = new Parser(xref, new Lexer(xref, str), gFalse);
+ for (n = 0; n < nObjects; ++n) {
+ parser->getObj(&obj1);
+ parser->getObj(&obj2);
+ if (n == e->gen)
+ localOffset = obj2.getInt();
+ obj1.free();
+ obj2.free();
+ }
+ while (str->getChar() != EOF) ;
+ delete parser;
+ objStr.free();
+
+ fprintf(outfile, "%.10lu 00000 n\n",
+ (long unsigned)(firstOffset + localOffset));
#else
// e->gen is the local index inside that object stream
//int objStrOffset = xref->getEntry(e->offset)->offset;
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 7c7790a62e8..37600573f4d 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,15 @@
+2011-07-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/ptex.am (pweb_tests): New variable for tests of pTeX
+ related Web programs (split off ptex_tests).
+
+ * ptrip/texmf.cnf (main_memory): Increase for SyncTeX.
+
+2011-06-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/ptex.am (ptex_ch_srcs): SyncTeX infrastructure.
+ * ptex-base.ch: Slightly reformulate to simplify SyncTeX.
+
2011-04-19 Peter Breitenlohner <peb@mppmu.mpg.de>
Avoid 'differ in signedness' warnings.
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index 9a989dd1647..51c38bdf5f2 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -1,6 +1,6 @@
## texk/web2c/ptexdir/am/ptex.am: Makefile fragment for pTeX.
##
-## Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2010-2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
@@ -11,14 +11,14 @@ pweb_programs = pbibtex pdvitype ppltotf ptftopl
# pTeX Tests
#
-ptex_tests = \
+ptex_tests = ptexdir/ptrip.test
+pweb_tests = \
ptexdir/pbibtex.test \
ptexdir/pdvitype.test \
ptexdir/ppltotf.test \
- ptexdir/ptftopl.test \
- ptexdir/ptrip.test
+ ptexdir/ptftopl.test
-EXTRA_DIST += $(ptex_tests)
+EXTRA_DIST += $(ptex_tests) $(pweb_tests)
DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \
$(pweb_programs:=.p) $(pweb_programs:=-web2c) $(pweb_programs:=.web)
@@ -41,10 +41,10 @@ libkanji_a_CPPFLAGS = $(ptex_cppflags)
##
if PTEX
bin_PROGRAMS += ptex
-if WEB
-bin_PROGRAMS += $(pweb_programs)
-endif WEB
endif PTEX
+if PWEB
+bin_PROGRAMS += $(pweb_programs)
+endif PWEB
EXTRA_PROGRAMS += ptex $(pweb_programs)
ptex_CPPFLAGS = $(ptex_cppflags)
@@ -93,6 +93,7 @@ ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
$(tie) -c ptex.ch ptex.web $(ptex_ch_srcs)
ptex_ch_srcs = \
ptexdir/ptex-base.ch \
+ $(ptex_ch_synctex) \
tex-binpool.ch
EXTRA_DIST += $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines
@@ -116,8 +117,8 @@ pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
$(tie) -m pbibtex.web bibtex.web bibtex.ch
EXTRA_DIST += ptexdir/pbibtex.ch web2c/cvtbib.sed
-ptex_tests += ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl
-ptex_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
+pweb_tests += ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl
+pweb_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
## pDVItype
##
@@ -135,7 +136,7 @@ pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
$(tie) -m pdvitype.web dvitype.web dvitype.ch
EXTRA_DIST += ptexdir/pdvitype.ch
-ptex_tests += ptexdir/sample.test
+pweb_tests += ptexdir/sample.test
## pPLtoTF
##
@@ -169,7 +170,7 @@ ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
$(tie) -m ptftopl.web tftopl.web tftopl.ch
EXTRA_DIST += ptexdir/ptftopl.ch
-ptex_tests += ptexdir/yokotate.test
+pweb_tests += ptexdir/yokotate.test
##
EXTRA_DIST += \
@@ -186,6 +187,9 @@ check_PROGRAMS += dvitype pltotf tftopl
TRIPTRAP += ptrip.diffs
TRIPTRAP_CLEAN += ptrip-clean
endif PTEX
+if PWEB
+TESTS += $(pweb_tests)
+endif PWEB
## Test data and results
##
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index acbcf143a81..051df8a7fce 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -673,37 +673,32 @@ end
@x [13.202] l.4056 - pTeX:
kern_node,math_node,penalty_node: do_nothing;
@y
- kern_node,disp_node,math_node,penalty_node: do_nothing;
+ disp_node,
+ kern_node,math_node,penalty_node: do_nothing;
@z
@x [14.206] l.4121 - pTeX: space_ptr, xspace_ptr, dir_node, disp_node
@ @<Case statement to copy...@>=
-case type(p) of
+@y
+@ @<Case statement to copy...@>=
+@z
+@x [14.206] l.4123
hlist_node,vlist_node,unset_node: begin r:=get_node(box_node_size);
mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
- list_ptr(r):=copy_node_list(list_ptr(p)); {this affects |mem[r+5]|}
- words:=5;
- end;
-rule_node: begin r:=get_node(rule_node_size); words:=rule_node_size;
- end;
+@y
+dir_node,
+hlist_node,vlist_node,unset_node: begin r:=get_node(box_node_size);
+ mem[r+7]:=mem[p+7];
+ mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last three words}
+ add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
+@z
+@x [14.206] l.4130
ins_node: begin r:=get_node(ins_node_size); mem[r+4]:=mem[p+4];
add_glue_ref(split_top_ptr(p));
ins_ptr(r):=copy_node_list(ins_ptr(p)); {this affects |mem[r+4]|}
words:=ins_node_size-1;
end;
@y
-@ @<Case statement to copy...@>=
-case type(p) of
-hlist_node,vlist_node,dir_node,unset_node:
- begin r:=get_node(box_node_size);
- mem[r+7]:=mem[p+7];
- mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last three words}
- add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
- list_ptr(r):=copy_node_list(list_ptr(p)); {this affects |mem[r+5]|}
- words:=5;
- end;
-rule_node: begin r:=get_node(rule_node_size); words:=rule_node_size;
- end;
ins_node: begin r:=get_node(ins_node_size);
mem[r+5]:=mem[p+5]; mem[r+4]:=mem[p+4];
add_glue_ref(split_top_ptr(p));
@@ -714,12 +709,9 @@ ins_node: begin r:=get_node(ins_node_size);
@x [14.206] l.4140 - pTeX: disp_node
kern_node,math_node,penalty_node: begin r:=get_node(small_node_size);
- words:=small_node_size;
- end;
@y
-kern_node,disp_node,math_node,penalty_node:
- begin r:=get_node(small_node_size); words:=small_node_size;
- end;
+disp_node,
+kern_node,math_node,penalty_node: begin r:=get_node(small_node_size);
@z
@x [15.207] l.4201 - pTeX: Add kanji, kana, other_kchar category codes.
@@ -2568,10 +2560,10 @@ fget; read_sixteen(nk);
fget; read_sixteen(ne);
fget; read_sixteen(np);
if jfm_flag<>dir_default then
- begin if lf<>7+lh+nt+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort
+ begin if lf<>7+lh+nt+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort;
end
else
- begin if lf<>6+lh+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort
+ begin if lf<>6+lh+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort;
end;
if (nw=0)or(nh=0)or(nd=0)or(ni=0) then abort;
end
diff --git a/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf b/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf
index 79e15b44a37..b6f41d3b62c 100644
--- a/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf
+++ b/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf
@@ -8,7 +8,7 @@ max_print_line = 72
% pTeX.
mem_bot = 1
-main_memory = 3500
+main_memory = 4500
max_strings = 3000
pool_size = 40000
diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog
index dc50ff4f15e..16be9296d5a 100644
--- a/Build/source/texk/web2c/synctexdir/ChangeLog
+++ b/Build/source/texk/web2c/synctexdir/ChangeLog
@@ -1,3 +1,21 @@
+2011-07-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ SyncTeX infrastructure for pTeX and e-pTeX.
+ * synctex-ptex.h, synctex-p-{mem,rec}.ch[01] (all new):
+ Additional files for pTeX.
+ * synctex-eptex.h, synctex-ep-{mem.ch[01],rec.ch1 (all new):
+ Additional files for e-pTeX.
+ * am/synctex.am: Adapt
+
+ * synctex.c: Drop `#warning These structures MUST be kept...'.
+
+2011-06-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * synctex-{,e}tex.h: Drop the `#warning SyncTeX for *TeX'.
+ * synctex-{,e,pdf,xe}tex.h: Move the default definition of
+ SYNCTEX_GET_CURRENT_NAME for here ...
+ * synctex.c: ... to here.
+
2011-06-11 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* synctex_parser_utils.c: fix a typo.
diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am
index afc6bd05667..bd7de749b46 100644
--- a/Build/source/texk/web2c/synctexdir/am/synctex.am
+++ b/Build/source/texk/web2c/synctexdir/am/synctex.am
@@ -1,6 +1,6 @@
## texk/web2c/synctexdir/am/synctex.am: Makefile fragment for SyncTeX.
##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## The SyncTeX tool
@@ -108,6 +108,78 @@ EXTRA_DIST += \
synctexdir/synctex-e-rec.ch0 \
synctexdir/synctex-e-rec.ch1
+## SyncTeX infrastructure: pTeX
+
+if PTEX_SYNCTEX
+
+ptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+ptex_LDADD += $(ZLIB_LIBS)
+ptex_prereq += $(ZLIB_DEPEND)
+
+ptex_ch_synctex = \
+ synctexdir/synctex-p-mem.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-mem.ch1 \
+ synctexdir/synctex-p-mem.ch1 \
+ synctexdir/synctex-p-rec.ch0 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-rec.ch2 \
+ synctexdir/synctex-p-rec.ch1
+
+dist_ptex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-ptex.h
+
+ptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
+
+endif PTEX_SYNCTEX
+
+EXTRA_DIST += \
+ synctexdir/synctex-p-mem.ch0 \
+ synctexdir/synctex-p-mem.ch1 \
+ synctexdir/synctex-p-rec.ch0 \
+ synctexdir/synctex-p-rec.ch1
+
+## SyncTeX infrastructure: e-pTeX
+
+if EPTEX_SYNCTEX
+
+eptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+eptex_LDADD += $(ZLIB_LIBS)
+eptex_prereq += $(ZLIB_DEPEND)
+
+eptex_ch_synctex = \
+ synctexdir/synctex-ep-mem.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-mem.ch1 \
+ synctexdir/synctex-e-mem.ch0 \
+ synctexdir/synctex-ep-mem.ch1 \
+ synctexdir/synctex-p-rec.ch0 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-ep-rec.ch1 \
+ synctexdir/synctex-p-rec.ch1
+
+dist_eptex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-eptex.h
+
+eptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
+
+endif EPTEX_SYNCTEX
+
+EXTRA_DIST += \
+ synctexdir/synctex-ep-mem.ch0 \
+ synctexdir/synctex-ep-mem.ch1 \
+ synctexdir/synctex-ep-rec.ch1
+
## SyncTeX infrastructure: pdfTeX
if PDFTEX_SYNCTEX
diff --git a/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch0 b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch0
new file mode 100644
index 00000000000..80d71cfe1cd
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch0
@@ -0,0 +1,25 @@
+@x tex.web l.2897
+@d box_node_size=8 {number of words to allocate for a box node}
+@y
+@d box_node_size=7 {number of words to allocate for a box node}
+@z
+
+@x tex.web l.3937
+ disp_node,
+@y
+ disp_node: do_nothing;
+@z
+
+@x tex.web l.4021:
+disp_node,
+@y
+disp_node: begin r:=get_node(small_node_size);
+ words:=small_node_size;
+ end;
+@z
+
+@x tex.web l. 24956
+@* \[54/p\TeX] System-dependent changes for p\TeX.
+@y
+@* \[54] System-dependent changes.
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch1 b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch1
new file mode 100644
index 00000000000..8747294c42e
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch1
@@ -0,0 +1,23 @@
+@x tex.web l.2897
+@d box_node_size=7+synctex_field_size {number of words to allocate for a box node}
+@y
+@d box_node_size=8+synctex_field_size {number of words to allocate for a box node}
+@z
+
+@x tex.web l.4912 + synctex-mem.ch0
+@d REMOVE ME IF synctex_code is properly defined
+@y
+@z
+
+@x tex.web l.4960 + tex.ch
+@d tex_int_pars=60 {total number of \TeX's integer parameters}
+@y
+@d synctex_code=60
+@d tex_int_pars=synctex_code+1 {total number of \TeX's integer parameters}
+@z
+
+@x tex.web l. 24956
+@* \[54] System-dependent changes.
+@y
+@* \[54/p\TeX] System-dependent changes for p\TeX.
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-ep-rec.ch1 b/Build/source/texk/web2c/synctexdir/synctex-ep-rec.ch1
new file mode 100644
index 00000000000..8535418e19d
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-ep-rec.ch1
@@ -0,0 +1,16 @@
+@x tex.web l.12378
+kern_node:cur_h:=cur_h+width(p);
+@y
+kern_node: begin
+ @<Record |kern_node| {\sl Sync\TeX} information@>;
+ cur_h:=cur_h+width(p);
+end;
+@z
+
+@x tex.web: Handle a math node in |hlist_out
+ cur_h:=cur_h+width(p);
+@y
+ @<Record |math_node| {\sl Sync\TeX} information@>;
+ cur_h:=cur_h+width(p);
+@z
+
diff --git a/Build/source/texk/web2c/synctexdir/synctex-eptex.h b/Build/source/texk/web2c/synctexdir/synctex-eptex.h
new file mode 100644
index 00000000000..dbc9c872798
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-eptex.h
@@ -0,0 +1,57 @@
+/*
+Copyright (c) 2011 jerome DOT laurens AT u-bourgogne DOT fr
+
+This file is part of the SyncTeX package.
+
+Latest Revision: Wed Jun 30 11:00:00 UTC 2011
+
+License:
+--------
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE
+
+Except as contained in this notice, the name of the copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written
+authorization from the copyright holder.
+
+Acknowledgments:
+----------------
+The author received useful remarks from the pdfTeX developers, especially Hahn The Thanh,
+and significant help from XeTeX developer Jonathan Kew
+
+Nota Bene:
+----------
+If you include or use a significant part of the synctex package into a software,
+I would appreciate to be listed as contributor and see "SyncTeX" highlighted.
+
+Version 1
+Thu Jun 30 11:00:00 UTC 2011
+
+*/
+
+#include "eptexd.h"
+
+#define box_node_size (8+synchronization_field_size)
+
+#define rule_node 3
+#define glue_node 12
+#define kern_node 13
diff --git a/Build/source/texk/web2c/synctexdir/synctex-etex.h b/Build/source/texk/web2c/synctexdir/synctex-etex.h
index 4b80f1da0bb..faca1be7a2d 100644
--- a/Build/source/texk/web2c/synctexdir/synctex-etex.h
+++ b/Build/source/texk/web2c/synctexdir/synctex-etex.h
@@ -48,8 +48,4 @@ Thu Jun 19 09:39:21 UTC 2008
*/
-# warning SyncTeX for eTeX
-
-# include "etexd.h"
-
-#define SYNCTEX_GET_CURRENT_NAME() generic_synctex_get_current_name()
+#include "etexd.h"
diff --git a/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch0 b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch0
new file mode 100644
index 00000000000..e4fd4a9f504
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch0
@@ -0,0 +1,25 @@
+@x tex.web l.2897
+@d box_node_size=8 {number of words to allocate for a box node}
+@y
+@d box_node_size=7 {number of words to allocate for a box node}
+@z
+
+@x tex.web l.3937
+ disp_node,
+@y
+ disp_node: do_nothing;
+@z
+
+@x tex.web l.4021:
+disp_node,
+@y
+disp_node: begin r:=get_node(small_node_size);
+ words:=small_node_size;
+ end;
+@z
+
+@x tex.web l. 24956
+@* \[55/p\TeX] System-dependent changes for p\TeX.
+@y
+@* \[54] System-dependent changes.
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch1 b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch1
new file mode 100644
index 00000000000..3d47ed82b3b
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch1
@@ -0,0 +1,23 @@
+@x tex.web l.2897
+@d box_node_size=7+synctex_field_size {number of words to allocate for a box node}
+@y
+@d box_node_size=8+synctex_field_size {number of words to allocate for a box node}
+@z
+
+@x tex.web l.4912 + synctex-mem.ch0
+@d REMOVE ME IF synctex_code is properly defined
+@y
+@z
+
+@x tex.web l.4960 + tex.ch
+@d int_pars=60 {total number of integer parameters}
+@y
+@d synctex_code=60
+@d int_pars=synctex_code+1 {total number of integer parameters}
+@z
+
+@x tex.web l. 24956
+@* \[54] System-dependent changes.
+@y
+@* \[55/p\TeX] System-dependent changes for p\TeX.
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch0 b/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch0
new file mode 100644
index 00000000000..b2c1bf8a73c
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch0
@@ -0,0 +1,5 @@
+@x tex.web l.12533
+left_edge:=cur_h; cur_v:=cur_v-height(this_box);
+@y
+save_loc:=dvi_offset+dvi_ptr; left_edge:=cur_h; cur_v:=cur_v-height(this_box);
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch1 b/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch1
new file mode 100644
index 00000000000..56a63cec885
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch1
@@ -0,0 +1,19 @@
+@x tex.web l.12394
+ @<Record void list {\sl Sync\TeX} information@>;
+@y
+ if type(p)<>dir_node then
+ @<Record void list {\sl Sync\TeX} information@>;
+@z
+
+@x tex.web l.12533
+save_loc:=dvi_offset+dvi_ptr; left_edge:=cur_h;
+@y
+left_edge:=cur_h;
+@z
+
+@x tex.web l.12569
+ @<Record void list {\sl Sync\TeX} information@>;
+@y
+ if type(p)<>dir_node then
+ @<Record void list {\sl Sync\TeX} information@>;
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-pdftex.h b/Build/source/texk/web2c/synctexdir/synctex-pdftex.h
index cc8a5c33efa..7c7251d742b 100644
--- a/Build/source/texk/web2c/synctexdir/synctex-pdftex.h
+++ b/Build/source/texk/web2c/synctexdir/synctex-pdftex.h
@@ -56,4 +56,3 @@ Thu Jun 19 09:39:21 UTC 2008
* the synctex_sheet function below, in the including synctex.c file. */
# define SYNCTEX_OFFSET_IS_PDF (pdfoutputvalue>0)
# define SYNCTEX_OUTPUT ((pdfoutputvalue>0)?"pdf":"dvi")
-# define SYNCTEX_GET_CURRENT_NAME() generic_synctex_get_current_name()
diff --git a/Build/source/texk/web2c/synctexdir/synctex-ptex.h b/Build/source/texk/web2c/synctexdir/synctex-ptex.h
new file mode 100644
index 00000000000..3a67d9f210c
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-ptex.h
@@ -0,0 +1,57 @@
+/*
+Copyright (c) 2011 jerome DOT laurens AT u-bourgogne DOT fr
+
+This file is part of the SyncTeX package.
+
+Latest Revision: Wed Jun 30 11:00:00 UTC 2011
+
+License:
+--------
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE
+
+Except as contained in this notice, the name of the copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written
+authorization from the copyright holder.
+
+Acknowledgments:
+----------------
+The author received useful remarks from the pdfTeX developers, especially Hahn The Thanh,
+and significant help from XeTeX developer Jonathan Kew
+
+Nota Bene:
+----------
+If you include or use a significant part of the synctex package into a software,
+I would appreciate to be listed as contributor and see "SyncTeX" highlighted.
+
+Version 1
+Thu Jun 30 11:00:00 UTC 2011
+
+*/
+
+#include "ptexd.h"
+
+#define box_node_size (8+synchronization_field_size)
+
+#define rule_node 3
+#define glue_node 12
+#define kern_node 13
diff --git a/Build/source/texk/web2c/synctexdir/synctex-tex.h b/Build/source/texk/web2c/synctexdir/synctex-tex.h
index b026b9242c2..c1ca933c586 100644
--- a/Build/source/texk/web2c/synctexdir/synctex-tex.h
+++ b/Build/source/texk/web2c/synctexdir/synctex-tex.h
@@ -48,8 +48,4 @@ Thu Jun 19 09:39:21 UTC 2008
*/
-# warning SyncTeX for TeX
-
-# include "texd.h"
-
-# define SYNCTEX_GET_CURRENT_NAME() generic_synctex_get_current_name()
+#include "texd.h"
diff --git a/Build/source/texk/web2c/synctexdir/synctex-xetex.h b/Build/source/texk/web2c/synctexdir/synctex-xetex.h
index a34a5dd8ffa..9c80d259088 100644
--- a/Build/source/texk/web2c/synctexdir/synctex-xetex.h
+++ b/Build/source/texk/web2c/synctexdir/synctex-xetex.h
@@ -68,4 +68,3 @@ Thu Jun 19 09:39:21 UTC 2008
mem[NODE+TYPE##_node_size-synchronization_field_size].hh.lhfield
# define SYNCTEX_LINE_MODEL(NODE,TYPE)\
mem[NODE+TYPE##_node_size-synchronization_field_size].hh.rh
-# define SYNCTEX_GET_CURRENT_NAME() generic_synctex_get_current_name()
diff --git a/Build/source/texk/web2c/synctexdir/synctex.c b/Build/source/texk/web2c/synctexdir/synctex.c
index 04da2c2bb2b..6e3c457a711 100644
--- a/Build/source/texk/web2c/synctexdir/synctex.c
+++ b/Build/source/texk/web2c/synctexdir/synctex.c
@@ -153,7 +153,6 @@
* and *tex.web for details, the synctex_ prefix prevents name conflicts, it
* is some kind of namespace
*/
-# warning These structures MUST be kept in synchronization with the main program
/* synctexoption is a global integer variable defined in *tex.web
* it is set to 1 by texmfmp.c if the command line has the '-synctex=1'
* option. */
@@ -303,7 +302,7 @@ mem[NODE+TYPE##_node_size-synchronization_field_size+1].cint
# define SYNCTEX_CURRENT_TAG (curinput.synctextagfield)
# endif
# if !defined(SYNCTEX_GET_CURRENT_NAME)
-# define SYNCTEX_GET_CURRENT_NAME() (gettexstring(curinput.namefield))
+# define SYNCTEX_GET_CURRENT_NAME() generic_synctex_get_current_name()
# endif
# if !defined(SYNCTEX_GET_TOTAL_PAGES)
# define SYNCTEX_GET_TOTAL_PAGES() (totalpages)
diff --git a/Build/source/texk/web2c/texmfmp-help.h b/Build/source/texk/web2c/texmfmp-help.h
index 0353eb2d4e4..b8242269e8e 100644
--- a/Build/source/texk/web2c/texmfmp-help.h
+++ b/Build/source/texk/web2c/texmfmp-help.h
@@ -122,6 +122,9 @@ const_string EPTEXHELP[] = {
"-src-specials=WHERE insert source specials in certain places of",
" the DVI file. WHERE is a comma-separated value",
" list: cr display hbox math par parend vbox",
+#if defined(__SyncTeX__)
+ "-synctex=NUMBER generate SyncTeX data for previewers if nonzero",
+#endif
"-translate-file=TCXNAME use the TCX file TCXNAME",
"-help print this message and exit.",
"-version print version information and exit.",
@@ -346,6 +349,9 @@ const_string PTEXHELP[] = {
"-src-specials=WHERE insert source specials in certain places of",
" the DVI file. WHERE is a comma-separated value",
" list: cr display hbox math par parend vbox",
+#if defined(__SyncTeX__)
+ "-synctex=NUMBER generate SyncTeX data for previewers if nonzero",
+#endif
"-translate-file=TCXNAME use the TCX file TCXNAME",
"-help print this message and exit.",
"-version print version information and exit.",
diff --git a/Build/source/texk/web2c/web2c/configure b/Build/source/texk/web2c/web2c/configure
index f476383b9fd..aa8e274b621 100755
--- a/Build/source/texk/web2c/web2c/configure
+++ b/Build/source/texk/web2c/web2c/configure
@@ -12633,39 +12633,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
if ${kpse_cv_warning_cflags+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "x$enable_compiler_warnings" = xno; then
+ if test "x$GCC" = xyes; then
kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+ case `$CC -dumpversion` in #(
3.4.* | 4.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
*) :
;;
esac
-case `$CC -dumpversion` in #(
+ case `$CC -dumpversion` in #(
3.[234].* | 4.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
*) :
;;
esac
-if test "x$enable_compiler_warnings" != xmin; then
- kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
- if test "x$enable_compiler_warnings" != xyes; then
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
- case `$CC -dumpversion` in #(
+ if test "x$enable_compiler_warnings" != xmin; then
+ kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+ if test "x$enable_compiler_warnings" != xyes; then
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+ case `$CC -dumpversion` in #(
3.4.* | 4.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
*) :
;;
esac
- if test "x$enable_compiler_warnings" != xmax; then
- kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+ if test "x$enable_compiler_warnings" != xmax; then
+ kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+ fi
fi
fi
fi
+elif test "x$enable_compiler_warnings" = xno; then
+ kpse_cv_warning_cflags=
else
kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
fi
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 24bb3d9c8bb..36852f4ad82 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,14 @@
+2011-07-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * xetex.ch: Fix an off-by-one bug initializing mubyte_cswrite.
+ From Roderich Schupp <roderich.schupp@googlemail.com>,
+ Debian Bug#633011, tex-k mail Fri, 8 Jul 2011 15:56:23.
+
+2011-07-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * XeTeX_ext.c, pdfimage.cpp, am/xetex.am: Always use poppler
+ instead of xpdf.
+
2011-04-19 Peter Breitenlohner <peb@mppmu.mpg.de>
Avoid 'differ in signedness' warnings.
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index 1650e762e7e..3362adb0cd1 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -39,14 +39,7 @@ authorization from the copyright holders.
#include <kpathsea/config.h>
#ifdef XETEX_OTHER
-#ifdef POPPLER_VERSION
-#define xpdfVersion POPPLER_VERSION
-#define xpdfString "poppler"
#include "poppler-config.h"
-#else
-#define xpdfString "xpdf"
-#include "xpdf/config.h"
-#endif
#include "png.h"
#endif
@@ -201,7 +194,7 @@ void initversionstring(char **versions)
#else
"Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n"
"Compiled with libpng version %s; using %s\n"
- "Compiled with %s version %s\n"
+ "Compiled with poppler version %s\n"
#endif
;
@@ -212,8 +205,7 @@ void initversionstring(char **versions)
#ifdef XETEX_OTHER
+ strlen(PNG_LIBPNG_VER_STRING)
+ strlen(png_libpng_ver)
- + strlen(xpdfString)
- + strlen(xpdfVersion)
+ + strlen(POPPLER_VERSION)
+ 6 * 3 /* for fontconfig version #s (won't really need 3 digits per field!) */
#endif
+ 6 * 3; /* for freetype version #s (ditto) */
@@ -237,8 +229,7 @@ void initversionstring(char **versions)
,
FC_VERSION / 10000, (FC_VERSION % 10000) / 100, FC_VERSION % 100,
fc_version / 10000, (fc_version % 10000) / 100, fc_version % 100,
- PNG_LIBPNG_VER_STRING, png_libpng_ver,
- xpdfString, xpdfVersion
+ PNG_LIBPNG_VER_STRING, png_libpng_ver, POPPLER_VERSION
#endif
);
}
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 19b805736a6..db2960f187d 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -1,6 +1,6 @@
## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX.
##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## XeTeX
@@ -37,9 +37,9 @@ libxetex += libxetexmm.a
else !XETEX_MACOSX
xetex_cppflags += -DXETEX_OTHER
-xetex_cppflags += $(XPDF_INCLUDES) $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-xetex_ldadd += $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-xetex_dependencies += $(XPDF_DEPEND) $(LIBPNG_DEPEND)
+xetex_cppflags += $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
+xetex_ldadd += $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
+xetex_dependencies += $(POPPLER_DEPEND) $(LIBPNG_DEPEND)
endif !XETEX_MACOSX
diff --git a/Build/source/texk/web2c/xetexdir/pdfimage.cpp b/Build/source/texk/web2c/xetexdir/pdfimage.cpp
index af2a10686aa..126d62ae2ca 100644
--- a/Build/source/texk/web2c/xetexdir/pdfimage.cpp
+++ b/Build/source/texk/web2c/xetexdir/pdfimage.cpp
@@ -32,16 +32,11 @@ authorization from the copyright holders.
#include "pdfimage.h"
-#ifdef POPPLER_VERSION
#include <dirent.h>
#include <poppler-config.h>
#include <goo/GooString.h>
#include <goo/gmem.h>
#include <goo/gfile.h>
-#define GString GooString
-#else
-#include "goo/GString.h"
-#endif
#include "PDFDoc.h"
#include "Catalog.h"
@@ -60,7 +55,7 @@ int
pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
/* return the box converted to TeX points */
{
- GString* name = new GString(filename);
+ GooString* name = new GooString(filename);
PDFDoc* doc = new PDFDoc(name);
if (!doc) {
@@ -119,7 +114,7 @@ int
pdf_count_pages(char* filename)
{
int pages = 0;
- GString* name = new GString(filename);
+ GooString* name = new GooString(filename);
PDFDoc* doc = new PDFDoc(name);
if (!doc) {
diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch
index 0139d24e8bb..562da5393b0 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.ch
+++ b/Build/source/texk/web2c/xetexdir/xetex.ch
@@ -328,7 +328,7 @@ for i:=@'177 to @'377 do xchr[i]:=i;
{Initialize enc\TeX\ data.}
for i:=0 to 255 do mubyte_read[i]:=null;
for i:=0 to 255 do mubyte_write[i]:=0;
-for i:=0 to 128 do mubyte_cswrite[i]:=null;
+for i:=0 to 127 do mubyte_cswrite[i]:=null;
mubyte_keep := 0; mubyte_start := false;
write_noexpanding := false; cs_converting := false;
special_printing := false; message_printing := false;