diff options
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 12 | ||||
| -rw-r--r-- | Build/source/texk/web2c/Makefile.in | 190 | ||||
| -rw-r--r-- | Build/source/texk/web2c/etexdir/am/etex.am | 42 | ||||
| -rwxr-xr-x | Build/source/texk/web2c/etexdir/etrip.test | 104 | ||||
| -rw-r--r-- | Build/source/texk/web2c/vftovp.ch | 1 |
5 files changed, 267 insertions, 82 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 20cac92f2bd..6423cf52157 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,15 @@ +2009-05-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * vftovp.ch: Send print_real to stderr. + +2009-05-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * trap.test (new): Shell script for TRAP tests. + +2009-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * trip.test (new): Shell script for TRIP test. + 2009-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> * bibtex.test, ... (new): Shell scripts for 'make check' tests. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index ef1e5ed9ca9..a9ef999892c 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -45,11 +45,12 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \ $(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) \ $(am__EXEEXT_16) synctex$(EXEEXT) noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) -check_PROGRAMS = $(am__EXEEXT_17) $(am__EXEEXT_18) md5main$(EXEEXT) -TESTS = tangle.test $(am__EXEEXT_21) ctiedir/ctie.test \ +check_PROGRAMS = $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \ + md5main$(EXEEXT) +TESTS = tangle.test $(am__EXEEXT_22) ctiedir/ctie.test \ cwebdir/cweave.test tiedir/tie.test $(am__append_5) \ - $(am__append_9) $(am__append_16) $(am__append_32) \ - libmd5/md5.test + $(am__append_9) $(am__append_13) $(am__append_18) \ + $(am__append_34) libmd5/md5.test DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ @@ -95,30 +96,32 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ @MF_TRUE@am__append_10 = gftype tftopl @MP_TRUE@am__append_11 = oldmpost mpost @ETEX_TRUE@am__append_12 = etex -@PDFTEX_TRUE@am__append_13 = pdftex ttf2afm pdftosrc -@MINGW32_TRUE@am__append_14 = \ +@ETEX_TRUE@am__append_13 = $(etex_tests) +@ETEX_TRUE@am__append_14 = dvitype pltotf tftopl +@PDFTEX_TRUE@am__append_15 = pdftex ttf2afm pdftosrc +@MINGW32_TRUE@am__append_16 = \ @MINGW32_TRUE@ pdftexdir/regex/regex.c \ @MINGW32_TRUE@ pdftexdir/regex/regex.h -@LUATEX_TRUE@am__append_15 = luatex luatangle -@LUATEX_TRUE@am__append_16 = luatexdir/luatangle.test -@MINGW32_FALSE@am__append_17 = -DLUA_USE_POSIX -@XETEX_TRUE@am__append_18 = xetex -@XETEX_MACOSX_TRUE@am__append_19 = -DXETEX_MAC -@XETEX_MACOSX_TRUE@am__append_20 = libxetexmm.a -@XETEX_MACOSX_FALSE@am__append_21 = -DXETEX_OTHER $(XPDF_INCLUDES) \ +@LUATEX_TRUE@am__append_17 = luatex luatangle +@LUATEX_TRUE@am__append_18 = luatexdir/luatangle.test +@MINGW32_FALSE@am__append_19 = -DLUA_USE_POSIX +@XETEX_TRUE@am__append_20 = xetex +@XETEX_MACOSX_TRUE@am__append_21 = -DXETEX_MAC +@XETEX_MACOSX_TRUE@am__append_22 = libxetexmm.a +@XETEX_MACOSX_FALSE@am__append_23 = -DXETEX_OTHER $(XPDF_INCLUDES) \ @XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES) -@XETEX_MACOSX_FALSE@am__append_22 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS) -@XETEX_MACOSX_FALSE@am__append_23 = $(XPDF_DEPEND) $(LIBPNG_DEPEND) -@XETEX_GRAPHITE_TRUE@am__append_24 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES) -@XETEX_GRAPHITE_TRUE@am__append_25 = $(GRAPHITE_LIBS) -@XETEX_GRAPHITE_TRUE@am__append_26 = $(GRAPHITE_DEPEND) -@XETEX_MACOSX_TRUE@am__append_27 = \ +@XETEX_MACOSX_FALSE@am__append_24 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS) +@XETEX_MACOSX_FALSE@am__append_25 = $(XPDF_DEPEND) $(LIBPNG_DEPEND) +@XETEX_GRAPHITE_TRUE@am__append_26 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES) +@XETEX_GRAPHITE_TRUE@am__append_27 = $(GRAPHITE_LIBS) +@XETEX_GRAPHITE_TRUE@am__append_28 = $(GRAPHITE_DEPEND) +@XETEX_MACOSX_TRUE@am__append_29 = \ @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_28 = \ +@XETEX_MACOSX_FALSE@am__append_30 = \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeX_pic.c \ @@ -135,30 +138,30 @@ 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_29 = \ +@XETEX_GRAPHITE_TRUE@am__append_31 = \ @XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.cpp \ @XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.h -@OTANGLE_TRUE@am__append_30 = $(omegaware_tools) -@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_31 = $(omegaware_font_tools) -@OTANGLE_TRUE@am__append_32 = omegaware/otangle.test -@ALEPH_TRUE@am__append_33 = aleph -@TEX_SYNCTEX_TRUE@am__append_34 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -@TEX_SYNCTEX_TRUE@am__append_35 = $(ZLIB_LIBS) -@TEX_SYNCTEX_TRUE@am__append_36 = \ +@OTANGLE_TRUE@am__append_32 = $(omegaware_tools) +@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_33 = $(omegaware_font_tools) +@OTANGLE_TRUE@am__append_34 = omegaware/otangle.test +@ALEPH_TRUE@am__append_35 = aleph +@TEX_SYNCTEX_TRUE@am__append_36 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) +@TEX_SYNCTEX_TRUE@am__append_37 = $(ZLIB_LIBS) +@TEX_SYNCTEX_TRUE@am__append_38 = \ @TEX_SYNCTEX_TRUE@ synctex.c -@ETEX_SYNCTEX_TRUE@am__append_37 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -@ETEX_SYNCTEX_TRUE@am__append_38 = $(ZLIB_LIBS) -@ETEX_SYNCTEX_TRUE@am__append_39 = \ +@ETEX_SYNCTEX_TRUE@am__append_39 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) +@ETEX_SYNCTEX_TRUE@am__append_40 = $(ZLIB_LIBS) +@ETEX_SYNCTEX_TRUE@am__append_41 = \ @ETEX_SYNCTEX_TRUE@ synctex-e.c -@PDFTEX_SYNCTEX_TRUE@am__append_40 = -I$(srcdir)/synctexdir -@PDFTEX_SYNCTEX_TRUE@am__append_41 = \ +@PDFTEX_SYNCTEX_TRUE@am__append_42 = -I$(srcdir)/synctexdir +@PDFTEX_SYNCTEX_TRUE@am__append_43 = \ @PDFTEX_SYNCTEX_TRUE@ synctex-pdf.c -@XETEX_SYNCTEX_TRUE@am__append_42 = -I$(srcdir)/synctexdir -@XETEX_SYNCTEX_TRUE@am__append_43 = \ +@XETEX_SYNCTEX_TRUE@am__append_44 = -I$(srcdir)/synctexdir +@XETEX_SYNCTEX_TRUE@am__append_45 = \ @XETEX_SYNCTEX_TRUE@ synctex-xe.c subdir = . @@ -464,6 +467,8 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @TEX_TRUE@am__EXEEXT_17 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @TEX_TRUE@ tftopl$(EXEEXT) @MF_TRUE@am__EXEEXT_18 = gftype$(EXEEXT) tftopl$(EXEEXT) +@ETEX_TRUE@am__EXEEXT_19 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@ETEX_TRUE@ tftopl$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) am__objects_9 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT) \ @@ -785,12 +790,12 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags -am__EXEEXT_19 = bibtex.test dvicopy.test dvitomp.test dvitype.test \ +am__EXEEXT_20 = bibtex.test dvicopy.test dvitomp.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_20 = $(am__EXEEXT_19) -@WEB_TRUE@am__EXEEXT_21 = $(am__EXEEXT_20) +am__EXEEXT_21 = $(am__EXEEXT_20) +@WEB_TRUE@am__EXEEXT_22 = $(am__EXEEXT_21) DIST_SUBDIRS = doc lib man mpware web2c . window omegafonts otps DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -1034,30 +1039,38 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \ $(mpost_web) $(libmplib_web) mplibdir/lmplib.c \ $(etex_web_srcs) $(etex_ch_srcs) etexdir/etexextra.in \ lib/texmfmp.c tmf-pool.h etexdir/ChangeLog etexdir/INSTALL \ - etexdir/README etexdir/etex_gen.tex etexdir/etex.mak \ - etexdir/etex.mk $(pdftex_ch_srcs) pdftexdir/pdftex.defines \ - pdftexdir/pdftex.h pdftexdir/pdftexextra.in \ - pdftexdir/ChangeLog pdftexdir/NEWS pdftexdir/README \ - pdftexdir/change-files.txt pdftexdir/pdftex.mak \ - pdftexdir/Makefile.in.orig pdftexdir/pdftex.mk \ - pdftexdir/pdftexlib.mk pdftexdir/regex/COPYING.LIB \ - pdftexdir/regex/README $(luatex_sources) \ - luatexdir/luatex.defines luatexdir/luatexextra.in \ - luatexdir/ptexlib.h $(luatangle_sources) \ - luatexdir/luatangle.test luatexdir/lua51/Makefile \ - luatexdir/lua51/liolib.c luatexdir/lua51/lua.c \ - luatexdir/lua51/luac.c luatexdir/lua51/print.c \ - luatexdir/zziplib/COPYING.LIB luatexdir/zziplib/ChangeLog \ - luatexdir/zziplib/README luatexdir/zziplib/TODO \ - luatexdir/zziplib/zziplib.spec luatexdir/zziplib/Makefile.am \ - luatexdir/zziplib/Makefile.in luatexdir/zziplib/Makefile.mk \ - luatexdir/zziplib/SDL luatexdir/zziplib/aclocal.m4 \ - luatexdir/zziplib/bins luatexdir/zziplib/config.h.in \ - luatexdir/zziplib/configure luatexdir/zziplib/configure.ac \ - luatexdir/zziplib/docs luatexdir/zziplib/m4 \ - luatexdir/zziplib/msvc6 luatexdir/zziplib/msvc7 \ - luatexdir/zziplib/msvc8 luatexdir/zziplib/test \ - luatexdir/zziplib/uses luatexdir/zziplib/zzip/Makefile \ + etexdir/README etexdir/etex_gen.tex $(etex_tests) \ + etexdir/etrip/etrip.diffs etexdir/etrip/etrip.fot \ + etexdir/etrip/etrip.log etexdir/etrip/etrip.out \ + etexdir/etrip/etrip.pl etexdir/etrip/etrip.tex \ + etexdir/etrip/etrip.typ 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 \ + etexdir/etex.mak etexdir/etex.mk $(pdftex_ch_srcs) \ + pdftexdir/pdftex.defines pdftexdir/pdftex.h \ + pdftexdir/pdftexextra.in pdftexdir/ChangeLog pdftexdir/NEWS \ + pdftexdir/README pdftexdir/change-files.txt \ + pdftexdir/pdftex.mak pdftexdir/Makefile.in.orig \ + pdftexdir/pdftex.mk pdftexdir/pdftexlib.mk \ + pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \ + $(luatex_sources) luatexdir/luatex.defines \ + luatexdir/luatexextra.in luatexdir/ptexlib.h \ + $(luatangle_sources) luatexdir/luatangle.test \ + luatexdir/lua51/Makefile luatexdir/lua51/liolib.c \ + luatexdir/lua51/lua.c luatexdir/lua51/luac.c \ + luatexdir/lua51/print.c luatexdir/zziplib/COPYING.LIB \ + luatexdir/zziplib/ChangeLog luatexdir/zziplib/README \ + luatexdir/zziplib/TODO luatexdir/zziplib/zziplib.spec \ + luatexdir/zziplib/Makefile.am luatexdir/zziplib/Makefile.in \ + luatexdir/zziplib/Makefile.mk luatexdir/zziplib/SDL \ + luatexdir/zziplib/aclocal.m4 luatexdir/zziplib/bins \ + luatexdir/zziplib/config.h.in luatexdir/zziplib/configure \ + luatexdir/zziplib/configure.ac luatexdir/zziplib/docs \ + luatexdir/zziplib/m4 luatexdir/zziplib/msvc6 \ + luatexdir/zziplib/msvc7 luatexdir/zziplib/msvc8 \ + luatexdir/zziplib/test luatexdir/zziplib/uses \ + luatexdir/zziplib/zzip/Makefile \ luatexdir/zziplib/zzip/Makefile.am \ luatexdir/zziplib/zzip/Makefile.in \ luatexdir/zziplib/zzip/_msvc.h \ @@ -1276,14 +1289,14 @@ web_tests = $(web_programs:=.test) nodist_ctie_SOURCES = ctie.c nodist_cweave_SOURCES = cweave.c cweb.c nodist_tie_SOURCES = tie.c -tex_CPPFLAGS = $(am__append_34) +tex_CPPFLAGS = $(am__append_36) # With --enable-ipc, TeX may need to link with -lsocket. -tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_35) +tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_37) # TeX C sources tex_c_h = texini.c tex0.c tex1.c tex2.c texcoerce.h texd.h -nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_36) +nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_38) tex_ch_srcs = \ tex.web \ tex.ch \ @@ -1339,15 +1352,15 @@ 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/memio.w mplibdir/tfmin.w -etex_CPPFLAGS = $(am__append_37) +etex_CPPFLAGS = $(am__append_39) # With --enable-ipc, e-TeX may need to link with -lsocket. -etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_38) +etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_40) # e-TeX C sources etex_c_h = etexini.c etex0.c etex1.c etex2.c etexcoerce.h etexd.h nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c \ - etexdir/etexextra.h $(am__append_39) + etexdir/etexextra.h $(am__append_41) etex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -1361,6 +1374,7 @@ etex_ch_srcs = \ etexdir/tex.ech \ etexdir/etex-binpool.ch +etex_tests = etexdir/etrip.test pdftex_cppflags = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) \ $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \ -I$(srcdir)/pdftexdir @@ -1370,12 +1384,12 @@ pdftex_dependencies = $(proglib) $(LIBPNG_DEPEND) $(ZLIB_DEPEND) \ $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a nodist_EXTRA_pdftex_SOURCES = dummy.cxx pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(buildenv) $(TANGLE) -pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_40) +pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_42) pdftex_LDADD = $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs) pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a pdftex_c_h = pdftexini.c pdftex0.c pdftex1.c pdftex2.c pdftex3.c pdftexcoerce.h pdftexd.h nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c \ - pdftexdir/pdftexextra.h $(am__append_41) + pdftexdir/pdftexextra.h $(am__append_43) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -1395,7 +1409,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \ 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_14) + $(am__append_16) 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 @@ -1425,7 +1439,7 @@ nodist_luatex_SOURCES = $(luatex_c_h) luatex-pool.c luatexextra.c luatexdir/luat luatex_sources = luatexdir/luatex.web luatexdir/luatex.ch nodist_luatangle_SOURCES = luatangle.c luatangle.h luatangle_sources = luatexdir/luatangle.web luatexdir/luatangle.ch -liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_17) +liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_19) liblua51_a_SOURCES = \ luatexdir/lua51/lapi.c \ luatexdir/lua51/lapi.h \ @@ -1807,23 +1821,23 @@ libluatex_a_SOURCES = \ EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c nodist_EXTRA_xetex_SOURCES = dummy.cxx -libxetex = libxetex.a $(am__append_20) +libxetex = libxetex.a $(am__append_22) xetex_cppflags = -DU_STATIC_IMPLEMENTATION -I$(srcdir)/xetexdir \ - $(ICU_INCLUDES) $(TECKIT_INCLUDES) $(am__append_19) \ - $(am__append_21) $(am__append_24) $(FREETYPE2_INCLUDES) \ + $(ICU_INCLUDES) $(TECKIT_INCLUDES) $(am__append_21) \ + $(am__append_23) $(am__append_26) $(FREETYPE2_INCLUDES) \ $(ZLIB_INCLUDES) -xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_22) \ - $(am__append_25) $(FREETYPE2_LIBS) $(ZLIB_LIBS) +xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_24) \ + $(am__append_27) $(FREETYPE2_LIBS) $(ZLIB_LIBS) xetex_dependencies = $(proglib) $(ICU_DEPEND) $(TECKIT_DEPEND) \ - $(am__append_23) $(am__append_26) $(FREETYPE2_DEPEND) \ + $(am__append_25) $(am__append_28) $(FREETYPE2_DEPEND) \ $(ZLIB_DEPEND) @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime -xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_42) +xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_44) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) xetex_DEPENDENCIES = $(xetex_dependencies) $(libxetex) xetex_c_h = xetexini.c xetex0.c xetex1.c xetex2.c xetexcoerce.h xetexd.h nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c xetexextra.c \ - xetexdir/xetexextra.h $(am__append_43) + xetexdir/xetexextra.h $(am__append_45) xetex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -1847,8 +1861,8 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/FontTableCache.cpp \ xetexdir/XeTeXOTMath.h xetexdir/XeTeX_ext.c \ xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \ xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \ - xetexdir/trans.h xetexdir/xetex.h $(am__append_27) \ - $(am__append_28) $(am__append_29) + xetexdir/trans.h xetexdir/xetex.h $(am__append_29) \ + $(am__append_30) $(am__append_31) libxetexmm_a_CPPFLAGS = $(xetex_cppflags) libxetexmm_a_CXXFLAGS = -ObjC++ libxetexmm_a_SOURCES = \ @@ -8307,6 +8321,18 @@ etex.web: tie$(EXEEXT) $(etex_web_srcs) # Generate etex.ch etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs) $(tie) -c etex.ch etex.web $(etex_ch_srcs) + +.PHONY: etrip-clean +clean-local:: etrip-clean +etrip-clean: + rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log + rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ + rm -f xtripin.fot xtripin.log + rm -f xtrip.fot xtrip.log xtrip.typ + rm -f etrip.tfm etrip.pl etrip.tex etrip.fmt etripin.fot etripin.log + rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ + rm -f tripos.tex 8terminal.tex + rm -rf tfm $(pdftex_c_h): pdftex-web2c pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines $(web2c) pdftex diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 257a7ac154c..e346298f0d0 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -80,6 +80,48 @@ EXTRA_DIST += \ etexdir/README \ etexdir/etex_gen.tex +## e-TeX Tests +## +etex_tests = etexdir/etrip.test + +EXTRA_DIST += $(etex_tests) + +if ETEX +TESTS += $(etex_tests) +check_PROGRAMS += dvitype pltotf tftopl +endif ETEX + +.PHONY: etrip-clean +clean-local:: etrip-clean +## trip.test +etrip-clean: + rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log + rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ + rm -f xtripin.fot xtripin.log + rm -f xtrip.fot xtrip.log xtrip.typ + rm -f etrip.tfm etrip.pl etrip.tex etrip.fmt etripin.fot etripin.log + rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ + rm -f tripos.tex 8terminal.tex + rm -rf tfm + +## Test data +## +EXTRA_DIST += \ + etexdir/etrip/etrip.diffs \ + etexdir/etrip/etrip.fot \ + etexdir/etrip/etrip.log \ + etexdir/etrip/etrip.out \ + etexdir/etrip/etrip.pl \ + etexdir/etrip/etrip.tex \ + etexdir/etrip/etrip.typ \ + 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 + ## Not used ## EXTRA_DIST += etexdir/etex.mak diff --git a/Build/source/texk/web2c/etexdir/etrip.test b/Build/source/texk/web2c/etexdir/etrip.test new file mode 100755 index 00000000000..41fd9034f98 --- /dev/null +++ b/Build/source/texk/web2c/etexdir/etrip.test @@ -0,0 +1,104 @@ +#! /bin/sh + +testdir=$srcdir/triptrap +etestdir=$srcdir/etexdir/etrip + +TEXMFCNF=$etestdir; export TEXMFCNF + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" + +echo ">>> Running e-TRIP test for e-TeX." >&2 +echo ">>> See $etestdir/etrip.diffs for example of acceptable diffs." >&2 + +rm -f trip.tfm trip.pl trip.tex trip.fmt trip.dvi \ + ctripin.fot ctripin.log ctrip.fot ctrip.log ctrip.typ \ + xtripin.fot xtripin.log xtrip.fot xtrip.log xtrip.typ \ + etrip.tfm etrip.pl etrip.tex etrip.fmt etrip.dvi \ + etripin.fot etripin.log etrip.fot etrip.log etrip.out etrip.typ \ + tripos.tex 8terminal.tex +rm -rf tfm + +is_OK=: + +set -x + +echo "*** TRIP test for e-TeX 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 . + +./etex --progname=einitex --ini <$testdir/trip1.in >ctripin.fot +mv trip.log ctripin.log || exit 1 +diff $testdir/tripin.log ctripin.log + +# May as well test non-ini second time through. +./etex --progname=etex <$testdir/trip2.in >ctrip.fot +mv trip.log ctrip.log +diff $testdir/trip.fot ctrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +## $DIFF $DIFFFLAGS $testdir/trip.log ctrip.log + +eval ./dvitype $dvitype_args trip.dvi >ctrip.typ || exit 1 +## $DIFF $DIFFFLAGS $testdir/trip.typ ctrip.typ + +# ============================== + +echo "*** TRIP test for e-TeX in extended mode ***." + +./etex --progname=einitex --ini <$etestdir/etrip1.in >xtripin.fot +mv trip.log xtripin.log || exit 1 +diff ctripin.log xtripin.log + +# May as well test non-ini second time through. +./etex --progname=etex <$etestdir/trip2.in >xtrip.fot +mv trip.log xtrip.log +diff ctrip.fot xtrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS ctrip.log xtrip.log + +eval ./dvitype $dvitype_args trip.dvi >xtrip.typ || exit 1 +$DIFF $DIFFFLAGS ctrip.typ xtrip.typ + +# ============================== + +echo "*** e-TeX specific part of e-TRIP test ***." + +./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 . + +./etex --progname=einitex --ini <$etestdir/etrip2.in >etripin.fot +mv etrip.log etripin.log || exit 1 +diff $etestdir/etripin.log etripin.log + +# May as well test non-ini second time through. +./etex --progname=etex <$etestdir/etrip3.in >etrip.fot +diff $etestdir/etrip.fot etrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $etestdir/etrip.log etrip.log + +eval ./dvitype $dvitype_args etrip.dvi >etrip.typ || exit 1 +$DIFF $DIFFFLAGS $etestdir/etrip.typ etrip.typ + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + diff --git a/Build/source/texk/web2c/vftovp.ch b/Build/source/texk/web2c/vftovp.ch index 5a00b582f5a..4cbd04bf65a 100644 --- a/Build/source/texk/web2c/vftovp.ch +++ b/Build/source/texk/web2c/vftovp.ch @@ -16,6 +16,7 @@ @y @d print(#)==write(stderr,#) @d print_ln(#)==write_ln(stderr,#) +@d print_real(#)==fprint_real(stderr,#) @z @x still [2] Set up for path reading. |