e-pTRIP test for e-pTeX

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

10 files changed, 279 insertions, 127 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 265af18e661..81685cf5c70 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* triptrap-sh: Add support for e-pTRIP test.
+
 2011-01-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, ac/web2c.ac, texmfmp.h, lib/texmfmp.c: 
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 84812a7aed4..00ed80ed93f 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -49,13 +49,13 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_6) \
 noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT)
 check_PROGRAMS = $(am__EXEEXT_21) $(am__EXEEXT_22) $(am__EXEEXT_23) \
 	$(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \
-	md5main$(EXEEXT)
-TESTS = tangle.test $(am__EXEEXT_29) ctiedir/ctie.test \
+	$(am__EXEEXT_27) md5main$(EXEEXT)
+TESTS = tangle.test $(am__EXEEXT_30) ctiedir/ctie.test \
 	cwebdir/cweave.test tiedir/tie.test $(am__append_4) \
 	$(am__append_10) $(am__append_14) $(am__append_18) \
-	$(am__append_23) $(am__append_28) $(am__append_32) \
-	$(am__append_46) $(am__append_49) $(am__append_50) \
-	libmd5/md5.test
+	$(am__append_23) $(am__append_27) $(am__append_31) \
+	$(am__append_35) $(am__append_49) $(am__append_52) \
+	$(am__append_53) libmd5/md5.test
 DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 	$(srcdir)/../../build-aux/config.guess \
 	$(srcdir)/../../build-aux/config.sub \
@@ -116,32 +116,35 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 @PTEX_TRUE@am__append_24 = dvitype pltotf tftopl
 @PTEX_TRUE@am__append_25 = ptrip.diffs
 @EPTEX_TRUE@am__append_26 = eptex
-@PDFTEX_TRUE@am__append_27 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_28 = $(pdftex_tests)
-@MINGW32_TRUE@am__append_29 = \
+@EPTEX_TRUE@am__append_27 = $(eptex_tests)
+@EPTEX_TRUE@am__append_28 = dvitype pltotf tftopl
+@EPTEX_TRUE@am__append_29 = eptrip.diffs
+@PDFTEX_TRUE@am__append_30 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_31 = $(pdftex_tests)
+@MINGW32_TRUE@am__append_32 = \
 @MINGW32_TRUE@	pdftexdir/regex/regex.c \
 @MINGW32_TRUE@	pdftexdir/regex/regex.h
 
-@LUATEX_TRUE@am__append_30 = luatex
-@LUATEX_TRUE@am__append_31 = luatex:texlua luatex:texluac
-@LUATEX_TRUE@am__append_32 = $(luatex_tests)
-@MINGW32_FALSE@am__append_33 = -DLUA_USE_POSIX
-@XETEX_TRUE@am__append_34 = xetex
-@XETEX_MACOSX_TRUE@am__append_35 = -DXETEX_MAC
-@XETEX_MACOSX_TRUE@am__append_36 = libxetexmm.a
-@XETEX_MACOSX_FALSE@am__append_37 = -DXETEX_OTHER $(XPDF_INCLUDES) \
+@LUATEX_TRUE@am__append_33 = luatex
+@LUATEX_TRUE@am__append_34 = luatex:texlua luatex:texluac
+@LUATEX_TRUE@am__append_35 = $(luatex_tests)
+@MINGW32_FALSE@am__append_36 = -DLUA_USE_POSIX
+@XETEX_TRUE@am__append_37 = xetex
+@XETEX_MACOSX_TRUE@am__append_38 = -DXETEX_MAC
+@XETEX_MACOSX_TRUE@am__append_39 = libxetexmm.a
+@XETEX_MACOSX_FALSE@am__append_40 = -DXETEX_OTHER $(XPDF_INCLUDES) \
 @XETEX_MACOSX_FALSE@	$(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_38 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_FALSE@am__append_39 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
-@XETEX_GRAPHITE_TRUE@am__append_40 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
-@XETEX_GRAPHITE_TRUE@am__append_41 = $(GRAPHITE_LIBS)
-@XETEX_GRAPHITE_TRUE@am__append_42 = $(GRAPHITE_DEPEND)
-@XETEX_MACOSX_TRUE@am__append_43 = \
+@XETEX_MACOSX_FALSE@am__append_41 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_FALSE@am__append_42 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
+@XETEX_GRAPHITE_TRUE@am__append_43 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
+@XETEX_GRAPHITE_TRUE@am__append_44 = $(GRAPHITE_LIBS)
+@XETEX_GRAPHITE_TRUE@am__append_45 = $(GRAPHITE_DEPEND)
+@XETEX_MACOSX_TRUE@am__append_46 = \
 @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_44 = \
+@XETEX_MACOSX_FALSE@am__append_47 = \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.cpp \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeX_pic.c \
@@ -158,59 +161,59 @@ 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_45 = \
+@XETEX_GRAPHITE_TRUE@am__append_48 = \
 @XETEX_GRAPHITE_TRUE@	xetexdir/XeTeXGrLayout.cpp \
 @XETEX_GRAPHITE_TRUE@	xetexdir/XeTeXGrLayout.h
 
-@XETEX_TRUE@am__append_46 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_47 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_48 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_49 = $(OTANGLE_tests)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_50 = $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_51 = pltotf tftopl
-@ALEPH_TRUE@am__append_52 = aleph
-@TEX_SYNCTEX_TRUE@am__append_53 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_49 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_50 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_51 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_52 = $(OTANGLE_tests)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_53 = $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_54 = pltotf tftopl
+@ALEPH_TRUE@am__append_55 = aleph
+@TEX_SYNCTEX_TRUE@am__append_56 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__
-@TEX_SYNCTEX_TRUE@am__append_54 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_55 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_56 = \
+@TEX_SYNCTEX_TRUE@am__append_57 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_58 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_59 = \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-tex.h
 
-@TEX_SYNCTEX_TRUE@am__append_57 = \
+@TEX_SYNCTEX_TRUE@am__append_60 = \
 @TEX_SYNCTEX_TRUE@	synctex.c
 
-@ETEX_SYNCTEX_TRUE@am__append_58 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_61 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__
-@ETEX_SYNCTEX_TRUE@am__append_59 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_60 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_61 = \
+@ETEX_SYNCTEX_TRUE@am__append_62 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_63 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_64 = \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-etex.h
 
-@ETEX_SYNCTEX_TRUE@am__append_62 = \
+@ETEX_SYNCTEX_TRUE@am__append_65 = \
 @ETEX_SYNCTEX_TRUE@	synctex-e.c
 
-@PDFTEX_SYNCTEX_TRUE@am__append_63 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_66 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__
-@PDFTEX_SYNCTEX_TRUE@am__append_64 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_67 = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-pdftex.h
 
-@PDFTEX_SYNCTEX_TRUE@am__append_65 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_68 = \
 @PDFTEX_SYNCTEX_TRUE@	synctex-pdf.c
 
-@XETEX_SYNCTEX_TRUE@am__append_66 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_69 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__
-@XETEX_SYNCTEX_TRUE@am__append_67 = \
+@XETEX_SYNCTEX_TRUE@am__append_70 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-xetex.h
 
-@XETEX_SYNCTEX_TRUE@am__append_68 = \
+@XETEX_SYNCTEX_TRUE@am__append_71 = \
 @XETEX_SYNCTEX_TRUE@	synctex-xe.c
 
 subdir = .
@@ -550,7 +553,9 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
 @ETEX_TRUE@	tftopl$(EXEEXT)
 @PTEX_TRUE@am__EXEEXT_25 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @PTEX_TRUE@	tftopl$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_26 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@EPTEX_TRUE@am__EXEEXT_26 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@EPTEX_TRUE@	tftopl$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_27 = pltotf$(EXEEXT) tftopl$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 dist_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) \
 	aleph-alephextra.$(OBJEXT)
@@ -972,13 +977,13 @@ ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
-am__EXEEXT_27 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_28 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
 	gftopk.test gftype.test mft.test patgen.test pktogf.test \
 	pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
 	vptovf.test weave.test
-am__EXEEXT_28 = $(am__EXEEXT_27) tests/bibtex-openout-test.pl \
+am__EXEEXT_29 = $(am__EXEEXT_28) tests/bibtex-openout-test.pl \
 	tests/bibtex-longline-test.pl tests/bibtex-mem.test
-@WEB_TRUE@am__EXEEXT_29 = $(am__EXEEXT_28)
+@WEB_TRUE@am__EXEEXT_30 = $(am__EXEEXT_29)
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -1283,10 +1288,11 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	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.diffs $(eptex_web_srcs) $(eptex_ch_srcs) \
-	eptexdir/eptex.defines eptexdir/ChangeLog \
-	eptexdir/ChangeLog.TL eptexdir/README.txt $(pdftex_ch_srcs) \
-	etexdir/etex.ch pdftexdir/pdftex.defines pdftexdir/pdftex.h \
+	ptexdir/ptrip.diffs $(eptex_tests) $(eptex_web_srcs) \
+	$(eptex_ch_srcs) eptexdir/eptex.defines eptexdir/ChangeLog \
+	eptexdir/ChangeLog.TL eptexdir/README.txt \
+	eptexdir/eptrip.diffs $(pdftex_ch_srcs) etexdir/etex.ch \
+	pdftexdir/pdftex.defines pdftexdir/pdftex.h \
 	pdftexdir/ChangeLog pdftexdir/NEWS pdftexdir/README \
 	pdftexdir/change-files.txt $(pdftex_tests) \
 	pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
@@ -1464,8 +1470,8 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	tests/xstory.dvityp tests/xpagenum.typ tests/xcmr10.tfm \
 	tests/xcmr10.pl tests/xsample.typ tests/x*min10.* ptrip.diffs \
 	$(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c eptex.p \
-	eptex.pool eptex-tangle $(nodist_pdftex_SOURCES) pdftex.ch \
-	pdftex-web2c pdftex.p pdftex.pool pdftex-tangle \
+	eptex.pool eptex-tangle eptrip.diffs $(nodist_pdftex_SOURCES) \
+	pdftex.ch pdftex-web2c pdftex.p pdftex.pool pdftex-tangle \
 	$(nodist_libluatex_a_SOURCES) $(nodist_xetex_SOURCES) \
 	xetex.web xetex-web2c xetex.p xetex.pool xetex-tangle \
 	$(omegaware_programs:=.c) $(omegaware_programs:=.h) \
@@ -1481,8 +1487,8 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	aleph.web aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
 CLEANFILES = 
 TRIPTRAP = $(am__append_6) $(am__append_9) $(am__append_16) \
-	$(am__append_20) $(am__append_25)
-bin_links = $(am__append_13) $(am__append_31)
+	$(am__append_20) $(am__append_25) $(am__append_29)
+bin_links = $(am__append_13) $(am__append_34)
 web2c = $(SHELL) ./web2c-sh $@
 makecpool = web2c/makecpool
 
@@ -1566,19 +1572,19 @@ cweave_CFLAGS = $(WARNING_CFLAGS)
 nodist_tie_SOURCES = tie.c
 tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
 tie_CFLAGS = $(WARNING_CFLAGS)
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_53)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_56)
 tex_CFLAGS = $(WARNING_CFLAGS)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_54)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_57)
 
 # TeX C sources
 tex_c_h = texini.c tex0.c texcoerce.h texd.h
-nodist_tex_SOURCES = $(tex_c_h) tex-pool.c $(am__append_57)
-dist_tex_SOURCES = texextra.c $(am__append_56)
+nodist_tex_SOURCES = $(tex_c_h) tex-pool.c $(am__append_60)
+dist_tex_SOURCES = texextra.c $(am__append_59)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_55)
+tex_prereq = texd.h $(am__append_58)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -1646,21 +1652,21 @@ svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
 tfmin_c_h = mptfmin.h tfmin.c
 libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
 	mplibdir/memio.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_58)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_61)
 etex_CFLAGS = $(WARNING_CFLAGS)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_59)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_62)
 
 # 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 \
-	$(am__append_62)
+	$(am__append_65)
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
-	$(am__append_61)
+	$(am__append_64)
 
 # 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_60)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_63)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -1731,6 +1737,10 @@ nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h
 ptftopl_SOURCES = ptexdir/kanji.h
 ptftopl_CPPFLAGS = $(ptex_cppflags)
 ptftopl_LDADD = $(ptex_ldadd)
+
+# e-pTeX Tests
+#
+eptex_tests = eptexdir/eptrip.test
 eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
 eptex_CFLAGS = $(WARNING_CFLAGS)
 
@@ -1774,7 +1784,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_63)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_66)
 pdftex_CFLAGS = $(WARNING_CFLAGS)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
@@ -1787,9 +1797,9 @@ pdftex_prereq = libpdftex.a pdftexdir/etex_version.h pdftexdir/pdftex_version.h
 pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
 nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \
 	pdftexdir/etex_version.h pdftexdir/pdftex_version.h \
-	$(am__append_65)
+	$(am__append_68)
 dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
-	$(am__append_64)
+	$(am__append_67)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -1816,7 +1826,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_29)
+	pdftexdir/writezip.c $(am__append_32)
 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
@@ -1855,7 +1865,7 @@ luatex_SOURCES = luatexdir/luatex_svnversion.h luatexdir/luatex.c luatexdir/luat
 # luaTeX Tests
 #
 luatex_tests = luatexdir/luatex.test
-liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_33)
+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_36)
 liblua51_a_CFLAGS = # $(WARNING_CFLAGS)
 liblua51_a_SOURCES = \
 	luatexdir/lua51/lapi.c \
@@ -2286,17 +2296,17 @@ libluatex_a_SOURCES = \
 
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_xetex_SOURCES = dummy.cxx
-libxetex = libxetex.a $(am__append_36)
+libxetex = libxetex.a $(am__append_39)
 xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
-	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_35) \
-	$(am__append_37) $(am__append_40) $(ZLIB_INCLUDES)
-xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_38) \
-	$(am__append_41) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_38) \
+	$(am__append_40) $(am__append_43) $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_41) \
+	$(am__append_44) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
 xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
-	$(TECKIT_DEPEND) $(am__append_39) $(am__append_42) \
+	$(TECKIT_DEPEND) $(am__append_42) $(am__append_45) \
 	$(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
 @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_66)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_69)
 xetex_CFLAGS = # $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -2306,9 +2316,9 @@ xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h
 xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
 nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c \
 	xetexdir/etex_version.h xetexdir/xetex_version.h \
-	$(am__append_68)
+	$(am__append_71)
 dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
-	$(am__append_67)
+	$(am__append_70)
 xetex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2339,7 +2349,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_43) $(am__append_44) $(am__append_45)
+	$(am__append_46) $(am__append_47) $(am__append_48)
 
 # We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
 libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -9252,6 +9262,16 @@ eptex.web: tie$(EXEEXT) $(eptex_web_srcs)
 # Generate eptex.ch
 eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs)
 	$(tie) -c eptex.ch eptex.web $(eptex_ch_srcs)
+.PHONY: eptrip-clean
+clean-local:: eptrip-clean
+eptrip-clean:
+	rm -f trip.tfm trip.pl trip.tex trip.fmt trip.log trip.dvi
+	rm -f cptripin.fot cptripin.log cptrip.fot cptrip.log cptrip.typ
+	rm -f xptripin.fot xptripin.log xptrip.fot xptrip.log xptrip.typ
+	rm -f eptripin.fot eptripin.log eptrip.fot eptrip.log eptrip.typ
+	rm -f etrip.tfm etrip.pl etrip.tex etrip.log etrip.fmt etrip.dvi etrip.out
+	rm -f tripos.tex 8terminal.tex
+	rm -rf tfm
 $(pdftex_OBJECTS): $(pdftex_prereq)
 $(pdftex_c_h): pdftex-web2c
 	@$(web2c) pdftex
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
index f44b129b936..fc251bc2b73 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog.TL
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
@@ -1,4 +1,10 @@
 ChangeLog.TL: TeX Live (TL) changes for e-pTeX
 ==============================================
 
-2011-01-11
+2011-01-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* eptrip.test (new): Shell script for e-pTRIP test,
+	from Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>.
+	* eptrip.diffs (new): Expected e-pTRIP test results.
+
+	* eptex.ech: Increase pTeX if_*_codes above e-TeX codes.
diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am
index 09eb2b1a04a..ac658c51c25 100644
--- a/Build/source/texk/web2c/eptexdir/am/eptex.am
+++ b/Build/source/texk/web2c/eptexdir/am/eptex.am
@@ -10,6 +10,12 @@ bin_PROGRAMS += eptex
 endif EPTEX
 EXTRA_PROGRAMS += eptex
 
+# e-pTeX Tests
+#
+eptex_tests = eptexdir/eptrip.test
+
+EXTRA_DIST += $(eptex_tests)
+
 eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
 eptex_CFLAGS = $(WARNING_CFLAGS)
 
@@ -85,3 +91,25 @@ EXTRA_DIST += \
 	eptexdir/ChangeLog.TL \
 	eptexdir/README.txt
 
+if EPTEX
+TESTS += $(eptex_tests)
+check_PROGRAMS += dvitype pltotf tftopl
+TRIPTRAP += eptrip.diffs
+endif EPTEX
+
+## Test data and results
+##
+## eptexdir/eptrip.test
+EXTRA_DIST += eptexdir/eptrip.diffs
+.PHONY: eptrip-clean
+clean-local:: eptrip-clean
+eptrip-clean:
+	rm -f trip.tfm trip.pl trip.tex trip.fmt trip.log trip.dvi
+	rm -f cptripin.fot cptripin.log cptrip.fot cptrip.log cptrip.typ
+	rm -f xptripin.fot xptripin.log xptrip.fot xptrip.log xptrip.typ
+	rm -f eptripin.fot eptripin.log eptrip.fot eptrip.log eptrip.typ
+	rm -f etrip.tfm etrip.pl etrip.tex etrip.log etrip.fmt etrip.dvi etrip.out
+	rm -f tripos.tex 8terminal.tex
+	rm -rf tfm
+DISTCLEANFILES += eptrip.diffs
+
diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech
index 882003613ec..ada966d46f8 100644
--- a/Build/source/texk/web2c/eptexdir/eptex.ech
+++ b/Build/source/texk/web2c/eptexdir/eptex.ech
@@ -43,16 +43,10 @@
         else cur_val:=unset_node;
 @z
 
-@x e-pTeX: if primitives l.27294
-current_if_type_code: if cond_ptr=null then cur_val:=0
-  else if cur_if<unless_code then cur_val:=cur_if+1
-  else cur_val:=-(cur_if-unless_code+1);
+@x e-pTeX: if primitives - leave room for three e-TeX codes
+@d if_tdir_code=if_case_code+1 { `\.{\\iftdir}' }
 @y
-current_if_type_code: begin if cond_ptr=null then cur_val:=0
-  else if cur_if<unless_code then cur_val:=cur_if+1
-  else cur_val:=cur_if-unless_code+1;
-  @<Fix |if_type_code| @>;
-  end;
+@d if_tdir_code=if_case_code+4 { `\.{\\iftdir}' }
 @z
 
 @x e-pTeX: font_char_{wd,ht,dp,ic}_code l.27306
@@ -83,11 +77,10 @@ disp:=revdisp; disped:=false;
 @x e-pTeX: reverse nodes of an hlist l.28010
 done:reverse:=l;
 @y
-done:
-{if the beginning node of the new list isn't |disp_node|, }
-{we insert |disp_node| to fix.}
+done: {if the beginning node of the new list isn't |disp_node|,
+       we insert |disp_node| to fix.}
 if (l<>null)and(type(l)<>disp_node) then begin
-  p:=get_node(small_node_size);type(p):=disp_node;
+  p:=get_node(small_node_size); type(p):=disp_node;
   disp_dimen(p):=disp; link(p):=l; reverse:=p;
   end
 else reverse:=l;
@@ -112,16 +105,6 @@ disp_node: begin
 othercases goto next_p
 @z
 
-@x e-pTeX: if primitives l.28545
-@d if_def_code=17 { `\.{\\ifdefined}' }
-@d if_cs_code=18 { `\.{\\ifcsname}' }
-@d if_font_char_code=19 { `\.{\\iffontchar}' }
-@y
-@d if_def_code=22 { `\.{\\ifdefined}' }
-@d if_cs_code=23 { `\.{\\ifcsname}' }
-@d if_font_char_code=24 { `\.{\\iffontchar}' }
-@z
-
 @x e-pTeX: ifcsname l.28620
   buffer[m]:=info(p) mod @'400; incr(m); p:=link(p);
 @y
@@ -137,19 +120,6 @@ othercases goto next_p
     b:=char_exists(orig_char_info(n)(qi(cur_val)))
 @z
 
-@x e-pTeX: fix if_type l.28637
-@ The |protected| feature of \eTeX\ defines the \.{\\protected} prefix
-@y
-@ @<Fix |if_type_code| @>=
-  if (cur_val>=if_def_code+1)and(cur_val<=if_font_char_code+1) then
-      cur_val:=cur_val-5
-  else if (cur_val<if_def_code+1)and(cur_val>if_case_code+1) then
-      cur_val:=cur_val+3;
-  if cur_if>=unless_code then cur_val:=-cur_val;
-
-@ The |protected| feature of \eTeX\ defines the \.{\\protected} prefix
-@z
-
 @x
 procedure print_direction(@!d:integer); {print the direction represented by d}
 @y
diff --git a/Build/source/texk/web2c/eptexdir/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip.diffs
new file mode 100644
index 00000000000..da3a0223b27
--- /dev/null
+++ b/Build/source/texk/web2c/eptexdir/eptrip.diffs
diff --git a/Build/source/texk/web2c/eptexdir/eptrip.test b/Build/source/texk/web2c/eptexdir/eptrip.test
new file mode 100755
index 00000000000..ea4066dfcbc
--- /dev/null
+++ b/Build/source/texk/web2c/eptexdir/eptrip.test
@@ -0,0 +1,117 @@
+#! /bin/sh
+
+# Copyright (C) 2010 Hironori Kitagawa <tex-live@tug.org>
+# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+testdir=$srcdir/triptrap
+etestdir=$srcdir/etexdir/etrip
+
+TEXMFCNF=$testdir; export TEXMFCNF
+
+dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'"
+
+echo ">>> Running e-TRIP test for e-pTeX." >&2
+echo ">>> See $srcdir/eptexdir/eptrip.diffs for example of acceptable diffs." >&2
+
+rm -f trip.tfm trip.pl trip.tex trip.log trip.fmt trip.log trip.dvi \
+  cptripin.fot cptripin.log cptrip.fot cptrip.log cptrip.typ \
+  xptripin.fot xptripin.log xptrip.fot xptrip.log xptrip.typ \
+  eptripin.fot eptripin.log eptrip.fot eptrip.log eptrip.typ \
+  etrip.tfm etrip.pl etrip.tex etrip.log etrip.fmt etrip.dvi etrip.out \
+  tripos.tex 8terminal.tex
+rm -rf tfm
+
+# pTeX outputs direction of boxes.
+P_SED1='s/, yoko direction//;s/yoko direction, //'
+P_SED2='s/yoko(math) direction, //'
+
+is_OK=:
+
+set -x
+
+echo "*** TRIP test for e-pTeX in compatibility mode ***."
+
+./pltotf $testdir/trip.pl trip.tfm || exit 1
+
+./tftopl ./trip.tfm trip.pl || exit 1
+
+diff $testdir/trip.pl trip.pl || is_OK=false
+
+# get same filename in log
+$LN_S $testdir/trip.tex .
+
+rm -f trip.log
+./eptex --progname=epinitex --ini <$testdir/trip1.in >cptripin.fot
+sed "$P_SED1" trip.log >  cptripin.log || exit 1
+diff $testdir/tripin.log cptripin.log
+
+# May as well test non-ini second time through.
+rm -f trip.log
+./eptex --progname=eptex <$testdir/trip2.in >cptrip.fot
+sed "$P_SED1;$P_SED2" trip.log > cptrip.log
+diff $testdir/trip.fot cptrip.fot
+
+# We use $DIFF instead of `diff' only for those files where there
+# might actually be legitimate numerical differences.
+$DIFF $DIFFFLAGS $testdir/trip.log cptrip.log 
+
+eval ./dvitype $dvitype_args trip.dvi >cptrip.typ || exit 1
+$DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ
+
+# =================================
+
+echo "*** TRIP test for e-pTeX in extended mode ***."
+
+rm -f trip.log
+./eptex --progname=epinitex --ini <$etestdir/etrip1.in >xptripin.fot
+sed "$P_SED1" trip.log >  xptripin.log || exit 1
+diff $testdir/tripin.log xptripin.log
+
+# May as well test non-ini second time through.
+rm -f trip.log
+./eptex --progname=eptex <$etestdir/trip2.in >xptrip.fot
+sed "$P_SED1;$P_SED2" trip.log > xptrip.log
+diff $testdir/trip.fot xptrip.fot
+
+# We use $DIFF instead of `diff' only for those files where there
+# might actually be legitimate numerical differences.
+$DIFF $DIFFFLAGS $testdir/trip.log xptrip.log 
+
+eval ./dvitype $dvitype_args trip.dvi >xptrip.typ || exit 1
+$DIFF $DIFFFLAGS $testdir/trip.typ xptrip.typ
+
+# =================================
+
+echo "*** e-TeX specific part of e-TRIP test for e-pTeX ***."
+
+./pltotf $etestdir/etrip.pl etrip.tfm || exit 1
+
+./tftopl ./etrip.tfm etrip.pl || exit 1
+
+diff $etestdir/etrip.pl etrip.pl || is_OK=false
+
+# get same filename in log
+$LN_S $etestdir/etrip.tex .
+
+./eptex --progname=epinitex --ini <$etestdir/etrip2.in >eptripin.fot
+sed "$P_SED1" etrip.log > eptripin.log || exit 1
+diff $etestdir/etripin.log eptripin.log
+
+# May as well test non-ini second time through.
+./eptex --progname=eptex <$etestdir/etrip3.in >eptrip.fot
+sed "$P_SED1;$P_SED2" etrip.log > eptrip.log
+diff $etestdir/etrip.fot eptrip.fot
+
+# We use $DIFF instead of `diff' only for those files where there
+# might actually be legitimate numerical differences.
+$DIFF $DIFFFLAGS $etestdir/etrip.log eptrip.log
+
+eval ./dvitype $dvitype_args etrip.dvi >eptrip.typ || exit 1
+$DIFF $DIFFFLAGS $etestdir/etrip.typ eptrip.typ
+
+$is_OK || {
+  echo ">>> There were some errors." >&2
+  exit 1
+}
+
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index cfab46c7a69..406b995c873 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ptex-base.ch: Reformulate if_*_code definitions, for e-pTeX.
+
 2011-01-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Somewhat rearrange to simplify building e-pTeX:
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index f5c17e61be0..f5653d61da5 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -2182,11 +2182,12 @@ string_code:if cur_cs<>0 then sprint_cs(cur_cs)
 @d if_case_code=16 { `\.{\\ifcase}' }
 @y
 @d if_case_code=16 { `\.{\\ifcase}' }
-@d if_tdir_code=17 { `\.{\\iftdir}' }
-@d if_ydir_code=18 { `\.{\\ifydir}' }
-@d if_mdir_code=19 { `\.{\\ifmdir}' }
-@d if_tbox_code=20 { `\.{\\iftbox}' }
-@d if_ybox_code=21 { `\.{\\ifybox}' }
+@#
+@d if_tdir_code=if_case_code+1 { `\.{\\iftdir}' }
+@d if_ydir_code=if_tdir_code+1 { `\.{\\ifydir}' }
+@d if_mdir_code=if_ydir_code+1 { `\.{\\ifmdir}' }
+@d if_tbox_code=if_mdir_code+1 { `\.{\\iftbox}' }
+@d if_ybox_code=if_tbox_code+1 { `\.{\\ifybox}' }
 @z
 
 @x [28.487] l.9887 - pTeX: iftdir, ifydir, iftbox, ifybox
diff --git a/Build/source/texk/web2c/triptrap-sh b/Build/source/texk/web2c/triptrap-sh
index 2f120f95376..a60e9b2a41c 100755
--- a/Build/source/texk/web2c/triptrap-sh
+++ b/Build/source/texk/web2c/triptrap-sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # shell script to run TRIP and TRAP tests and create diffs.
 #
-#   Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+#   Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
 #
 #   This file is free software; the copyright holder
 #   gives unlimited permission to copy and/or distribute it,
@@ -24,6 +24,7 @@ do
   mptrap.diffs) tst=mplibdir/mptrap; msg='MPTRAP test for MetaPost';;
   etrip.diffs) tst=etexdir/etrip; msg='e-TRIP test for e-TeX';;
   ptrip.diffs) tst=ptexdir/ptrip; msg='TRIP test for pTeX';;
+  eptrip.diffs) tst=eptexdir/eptrip; msg='e-TRIP test for e-pTeX';;
   *) echo "$me: Bad argument \`$file'"; exit 1;;
   esac
   echo ">>> Running $msg."
@@ -36,6 +37,7 @@ do
       -e "s%$srcdir/triptrap%SRCDIR/triptrap%" \
       -e "s%$srcdir/etexdir%SRCDIR/etexdir%" \
       -e "s%$srcdir/ptexdir%SRCDIR/ptexdir%" \
+      -e "s%$srcdir/eptexdir%SRCDIR/eptexdir%" \
       $tmp >>$file
   echo "PASS: $tst.test" >>$file
   rm -f $tmp