From 342660cefdbcaf02dd26950cd356583679e9e95b Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 15 Jan 2011 15:38:27 +0000 Subject: e-TeX, pTeX, e-pTeX, and trip/trap tests git-svn-id: svn://tug.org/texlive/trunk@21078 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 6 + Build/source/texk/web2c/Makefile.am | 7 +- Build/source/texk/web2c/Makefile.in | 219 ++++++++++++------------ Build/source/texk/web2c/am/texmf.am | 10 +- Build/source/texk/web2c/eptexdir/ChangeLog.TL | 4 + Build/source/texk/web2c/eptexdir/am/eptex.am | 6 +- Build/source/texk/web2c/eptexdir/eptex.ech | 6 + Build/source/texk/web2c/eptexdir/eptrip.diffs | Bin 28591 -> 28654 bytes Build/source/texk/web2c/eptexdir/etex.ch1 | 4 +- Build/source/texk/web2c/etexdir/ChangeLog | 8 + Build/source/texk/web2c/etexdir/am/etex.am | 4 +- Build/source/texk/web2c/etexdir/etrip/etrip.tex | 4 +- Build/source/texk/web2c/mplibdir/ChangeLog | 4 + Build/source/texk/web2c/mplibdir/am/mplib.am | 6 +- Build/source/texk/web2c/ptexdir/ChangeLog | 4 + Build/source/texk/web2c/ptexdir/am/ptex.am | 2 +- Build/source/texk/web2c/ptexdir/ptex-base.ch | 2 +- 17 files changed, 169 insertions(+), 127 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 81685cf5c70..01ce52c9f83 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,9 @@ +2011-01-14 Peter Breitenlohner + + * Makefile.am (clean-local, triptrap-clean): Use TRIPTRAP_CLEAN + and drop double-colon rules. + * am/texmf.am (trip-clean, trap-clean): Use TRIPTRAP_CLEAN. + 2011-01-13 Peter Breitenlohner * triptrap-sh: Add support for e-pTRIP test. diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 9914a89515f..6fd3d4354c4 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/web2c/ ## -## Copyright (C) 2009, 2010 Peter Breitenlohner +## Copyright (C) 2009 - 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 -I m4 @@ -31,6 +31,7 @@ EXTRA_LIBRARIES = EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h DISTCLEANFILES = $(EXTRA_LIBRARIES) CLEANFILES = +TRIPTRAP_CLEAN = TRIPTRAP = bin_links = @@ -124,6 +125,10 @@ triptrap: $(SHELL) $(srcdir)/triptrap-sh $(TRIPTRAP) EXTRA_DIST += triptrap-sh +clean-local: triptrap-clean +.PHONY: triptrap-clean +triptrap-clean: $(TRIPTRAP_CLEAN) + # The environment for making dumps. # No need to specify TEXMF, as ../kpathsea/texmf.cnf should contain # suitable absolute paths at this point. Those are converted to diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 00ed80ed93f..6a86012c7c6 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -52,10 +52,10 @@ check_PROGRAMS = $(am__EXEEXT_21) $(am__EXEEXT_22) $(am__EXEEXT_23) \ $(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_27) $(am__append_31) \ - $(am__append_35) $(am__append_49) $(am__append_52) \ - $(am__append_53) libmd5/md5.test + $(am__append_10) $(am__append_16) $(am__append_21) \ + $(am__append_27) $(am__append_32) $(am__append_37) \ + $(am__append_41) $(am__append_55) $(am__append_58) \ + $(am__append_59) libmd5/md5.test DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ @@ -96,55 +96,61 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ @TEX_TRUE@am__append_4 = $(tex_tests) @TEX_TRUE@am__append_5 = dvitype pltotf tftopl @TEX_TRUE@am__append_6 = trip.diffs -@MF_TRUE@am__append_7 = mf -@MFN_TRUE@@MF_TRUE@am__append_8 = mf-nowin -@MF_TRUE@am__append_9 = mftrap.diffs +@TEX_TRUE@am__append_7 = trip-clean +@MF_TRUE@am__append_8 = mf +@MFN_TRUE@@MF_TRUE@am__append_9 = mf-nowin @MF_TRUE@am__append_10 = $(mf_tests) @MF_TRUE@am__append_11 = gftype tftopl -@MP_TRUE@am__append_12 = mpost -@MP_TRUE@am__append_13 = mpost:dvitomp -@MP_TRUE@am__append_14 = $(mp_tests) -@MP_TRUE@am__append_15 = pltotf tftopl -@MP_TRUE@am__append_16 = mptrap.diffs -@ETEX_TRUE@am__append_17 = etex -@ETEX_TRUE@am__append_18 = $(etex_tests) -@ETEX_TRUE@am__append_19 = dvitype pltotf tftopl -@ETEX_TRUE@am__append_20 = etrip.diffs -@PTEX_TRUE@am__append_21 = ptex -@PTEX_TRUE@@WEB_TRUE@am__append_22 = $(pweb_programs) -@PTEX_TRUE@am__append_23 = $(ptex_tests) -@PTEX_TRUE@am__append_24 = dvitype pltotf tftopl -@PTEX_TRUE@am__append_25 = ptrip.diffs -@EPTEX_TRUE@am__append_26 = eptex -@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 = \ +@MF_TRUE@am__append_12 = mftrap.diffs +@MF_TRUE@am__append_13 = trap-clean +@MP_TRUE@am__append_14 = mpost +@MP_TRUE@am__append_15 = mpost:dvitomp +@MP_TRUE@am__append_16 = $(mp_tests) +@MP_TRUE@am__append_17 = pltotf tftopl +@MP_TRUE@am__append_18 = mptrap.diffs +@MP_TRUE@am__append_19 = mptrap-clean +@ETEX_TRUE@am__append_20 = etex +@ETEX_TRUE@am__append_21 = $(etex_tests) +@ETEX_TRUE@am__append_22 = dvitype pltotf tftopl +@ETEX_TRUE@am__append_23 = etrip.diffs +@ETEX_TRUE@am__append_24 = etrip-clean +@PTEX_TRUE@am__append_25 = ptex +@PTEX_TRUE@@WEB_TRUE@am__append_26 = $(pweb_programs) +@PTEX_TRUE@am__append_27 = $(ptex_tests) +@PTEX_TRUE@am__append_28 = dvitype pltotf tftopl +@PTEX_TRUE@am__append_29 = ptrip.diffs +@PTEX_TRUE@am__append_30 = ptrip-clean +@EPTEX_TRUE@am__append_31 = eptex +@EPTEX_TRUE@am__append_32 = $(eptex_tests) +@EPTEX_TRUE@am__append_33 = dvitype pltotf tftopl +@EPTEX_TRUE@am__append_34 = eptrip.diffs +@EPTEX_TRUE@am__append_35 = eptrip-clean +@PDFTEX_TRUE@am__append_36 = pdftex ttf2afm pdftosrc +@PDFTEX_TRUE@am__append_37 = $(pdftex_tests) +@MINGW32_TRUE@am__append_38 = \ @MINGW32_TRUE@ pdftexdir/regex/regex.c \ @MINGW32_TRUE@ pdftexdir/regex/regex.h -@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) \ +@LUATEX_TRUE@am__append_39 = luatex +@LUATEX_TRUE@am__append_40 = luatex:texlua luatex:texluac +@LUATEX_TRUE@am__append_41 = $(luatex_tests) +@MINGW32_FALSE@am__append_42 = -DLUA_USE_POSIX +@XETEX_TRUE@am__append_43 = xetex +@XETEX_MACOSX_TRUE@am__append_44 = -DXETEX_MAC +@XETEX_MACOSX_TRUE@am__append_45 = libxetexmm.a +@XETEX_MACOSX_FALSE@am__append_46 = -DXETEX_OTHER $(XPDF_INCLUDES) \ @XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES) -@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_FALSE@am__append_47 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS) +@XETEX_MACOSX_FALSE@am__append_48 = $(XPDF_DEPEND) $(LIBPNG_DEPEND) +@XETEX_GRAPHITE_TRUE@am__append_49 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES) +@XETEX_GRAPHITE_TRUE@am__append_50 = $(GRAPHITE_LIBS) +@XETEX_GRAPHITE_TRUE@am__append_51 = $(GRAPHITE_DEPEND) +@XETEX_MACOSX_TRUE@am__append_52 = \ @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_47 = \ +@XETEX_MACOSX_FALSE@am__append_53 = \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeX_pic.c \ @@ -161,59 +167,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_48 = \ +@XETEX_GRAPHITE_TRUE@am__append_54 = \ @XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.cpp \ @XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.h -@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 \ +@XETEX_TRUE@am__append_55 = $(xetex_tests) +@OTANGLE_TRUE@am__append_56 = $(omegaware_tools) +@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_57 = $(omegaware_font_tools) +@OTANGLE_TRUE@am__append_58 = $(OTANGLE_tests) +@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_59 = $(OMFONTS_tests) +@OTANGLE_TRUE@am__append_60 = pltotf tftopl +@ALEPH_TRUE@am__append_61 = aleph +@TEX_SYNCTEX_TRUE@am__append_62 = -I$(srcdir)/synctexdir \ @TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ -@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@am__append_63 = $(ZLIB_LIBS) +@TEX_SYNCTEX_TRUE@am__append_64 = $(ZLIB_DEPEND) +@TEX_SYNCTEX_TRUE@am__append_65 = \ @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_60 = \ +@TEX_SYNCTEX_TRUE@am__append_66 = \ @TEX_SYNCTEX_TRUE@ synctex.c -@ETEX_SYNCTEX_TRUE@am__append_61 = -I$(srcdir)/synctexdir \ +@ETEX_SYNCTEX_TRUE@am__append_67 = -I$(srcdir)/synctexdir \ @ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ -@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@am__append_68 = $(ZLIB_LIBS) +@ETEX_SYNCTEX_TRUE@am__append_69 = $(ZLIB_DEPEND) +@ETEX_SYNCTEX_TRUE@am__append_70 = \ @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_65 = \ +@ETEX_SYNCTEX_TRUE@am__append_71 = \ @ETEX_SYNCTEX_TRUE@ synctex-e.c -@PDFTEX_SYNCTEX_TRUE@am__append_66 = -I$(srcdir)/synctexdir \ +@PDFTEX_SYNCTEX_TRUE@am__append_72 = -I$(srcdir)/synctexdir \ @PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ -@PDFTEX_SYNCTEX_TRUE@am__append_67 = \ +@PDFTEX_SYNCTEX_TRUE@am__append_73 = \ @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_68 = \ +@PDFTEX_SYNCTEX_TRUE@am__append_74 = \ @PDFTEX_SYNCTEX_TRUE@ synctex-pdf.c -@XETEX_SYNCTEX_TRUE@am__append_69 = -I$(srcdir)/synctexdir \ +@XETEX_SYNCTEX_TRUE@am__append_75 = -I$(srcdir)/synctexdir \ @XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ -@XETEX_SYNCTEX_TRUE@am__append_70 = \ +@XETEX_SYNCTEX_TRUE@am__append_76 = \ @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_71 = \ +@XETEX_SYNCTEX_TRUE@am__append_77 = \ @XETEX_SYNCTEX_TRUE@ synctex-xe.c subdir = . @@ -1486,9 +1492,11 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \ omegaware/tests/xspecialhex.* $(nodist_aleph_SOURCES) \ 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) $(am__append_29) -bin_links = $(am__append_13) $(am__append_34) +TRIPTRAP_CLEAN = $(am__append_7) $(am__append_13) $(am__append_19) \ + $(am__append_24) $(am__append_30) $(am__append_35) +TRIPTRAP = $(am__append_6) $(am__append_12) $(am__append_18) \ + $(am__append_23) $(am__append_29) $(am__append_34) +bin_links = $(am__append_15) $(am__append_40) web2c = $(SHELL) ./web2c-sh $@ makecpool = web2c/makecpool @@ -1572,19 +1580,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_56) +tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_62) tex_CFLAGS = $(WARNING_CFLAGS) # With --enable-ipc, TeX may need to link with -lsocket. -tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_57) +tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_63) # 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_60) -dist_tex_SOURCES = texextra.c $(am__append_59) +nodist_tex_SOURCES = $(tex_c_h) tex-pool.c $(am__append_66) +dist_tex_SOURCES = texextra.c $(am__append_65) # We must create texd.h before building the tex_OBJECTS. -tex_prereq = texd.h $(am__append_58) +tex_prereq = texd.h $(am__append_64) tex_ch_srcs = \ tex.web \ tex.ch \ @@ -1652,21 +1660,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_61) +etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_67) etex_CFLAGS = $(WARNING_CFLAGS) # With --enable-ipc, e-TeX may need to link with -lsocket. -etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_62) +etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_68) # 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_65) + $(am__append_71) dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \ - $(am__append_64) + $(am__append_70) # 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_63) +etex_prereq = etexd.h etexdir/etex_version.h $(am__append_69) etex_web_srcs = \ tex.web \ etexdir/etex.ch @@ -1784,7 +1792,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_66) +pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_72) pdftex_CFLAGS = $(WARNING_CFLAGS) pdftex_CXXFLAGS = $(WARNING_CXXFLAGS) @@ -1797,9 +1805,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_68) + $(am__append_74) dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \ - $(am__append_67) + $(am__append_73) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -1826,7 +1834,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_32) + pdftexdir/writezip.c $(am__append_38) 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 @@ -1865,7 +1873,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_36) +liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_42) liblua51_a_CFLAGS = # $(WARNING_CFLAGS) liblua51_a_SOURCES = \ luatexdir/lua51/lapi.c \ @@ -2296,17 +2304,17 @@ libluatex_a_SOURCES = \ # Force Automake to use CXXLD for linking nodist_EXTRA_xetex_SOURCES = dummy.cxx -libxetex = libxetex.a $(am__append_39) +libxetex = libxetex.a $(am__append_45) xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \ - $(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) + $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_44) \ + $(am__append_46) $(am__append_49) $(ZLIB_INCLUDES) +xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_47) \ + $(am__append_50) $(FREETYPE2_LIBS) $(ZLIB_LIBS) xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \ - $(TECKIT_DEPEND) $(am__append_42) $(am__append_45) \ + $(TECKIT_DEPEND) $(am__append_48) $(am__append_51) \ $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime -xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_69) +xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_75) xetex_CFLAGS = # $(WARNING_CFLAGS) xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) @@ -2316,9 +2324,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_71) + $(am__append_77) dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \ - $(am__append_70) + $(am__append_76) xetex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -2349,7 +2357,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_46) $(am__append_47) $(am__append_48) + $(am__append_52) $(am__append_53) $(am__append_54) # We must create xetexd.h etc. before building the libxetex_a_OBJECTS. libxetex_prereq = xetexd.h $(xetex_dependencies) @@ -8853,6 +8861,10 @@ triptrap: srcdir=$(srcdir) MAKE=$(MAKE) \ $(SHELL) $(srcdir)/triptrap-sh $(TRIPTRAP) +clean-local: triptrap-clean +.PHONY: triptrap-clean +triptrap-clean: $(TRIPTRAP_CLEAN) + .PRECIOUS: %.ch %.p %.c tangle.c tangle.h: tangle-web2c @$(web2c) tangle @@ -9020,9 +9032,8 @@ tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch tangle-sh tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs) $(tie) -c $@ $(tex_ch_srcs) -.PHONY: trip-clean -clean-local:: trip-clean # trip.test +.PHONY: trip-clean trip-clean: rm -f trip.tfm trip.pl trip.tex trip.fmt tripin.fot tripin.log rm -f trip.fot trip.log trip.dvi trip.typ tripos.tex 8terminal.tex @@ -9054,9 +9065,8 @@ mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch tangle-sh mf-final.ch: tie$(EXEEXT) $(mf_ch_src) $(tie) -c $@ $(mf_ch_src) -.PHONY: trap-clean -clean-local:: trap-clean # trap.test +.PHONY: trap-clean trap-clean: rm -f trap.mf trap.base rm -f mftrapin.fot mftrapin.log @@ -9072,9 +9082,7 @@ mpxout-tangle: ctangle$(EXEEXT) mplibdir/mpxout.w tangle-sh @$(mp_ctangle_sh) mpxout $(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a - .PHONY: mptrap-clean -clean-local:: mptrap-clean mptrap-clean: rm -f mtrap.mp mtrap.mem trapf.tfm rm -f mtrap.log mtrap.0 mtrap.1 writeo writeo.log writeo.2 @@ -9142,9 +9150,8 @@ etex.web: tie$(EXEEXT) $(etex_web_srcs) 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.test +.PHONY: 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 @@ -9220,7 +9227,6 @@ ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch $(tie) -m ptftopl.web tftopl.web tftopl.ch .PHONY: ptrip-clean -clean-local:: ptrip-clean ptrip-clean: rm -f trip.tfm trip.pl trip.tex trip.fmt ptripin.fot ptripin.log rm -f ptrip.fot ptrip.log trip.log trip.dvi trip.typ @@ -9250,9 +9256,9 @@ eptexdir/etex_version.h: etexdir/etex.ch | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ # Extract ptex version -eptexdir/ptex_version.h: ptexdir/ptex-base.ch +eptexdir/ptex_version.h: eptexdir/eptex.ech $(MKDIR_P) eptexdir - grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ + grep '^@d pTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ # Generate eptex.web @@ -9263,7 +9269,6 @@ eptex.web: tie$(EXEEXT) $(eptex_web_srcs) 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 diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am index 022c9b3fa2f..e74c437214f 100644 --- a/Build/source/texk/web2c/am/texmf.am +++ b/Build/source/texk/web2c/am/texmf.am @@ -72,12 +72,12 @@ if TEX TESTS += $(tex_tests) check_PROGRAMS += dvitype pltotf tftopl TRIPTRAP += trip.diffs +TRIPTRAP_CLEAN += trip-clean endif TEX DISTCLEANFILES += trip.diffs -.PHONY: trip-clean -clean-local:: trip-clean # trip.test +.PHONY: trip-clean trip-clean: rm -f trip.tfm trip.pl trip.tex trip.fmt tripin.fot tripin.log rm -f trip.fot trip.log trip.dvi trip.typ tripos.tex 8terminal.tex @@ -90,7 +90,6 @@ bin_PROGRAMS += mf if MFN bin_PROGRAMS += mf-nowin endif MFN -TRIPTRAP += mftrap.diffs endif MF EXTRA_PROGRAMS += mf mf-nowin DISTCLEANFILES += mftrap.diffs @@ -170,11 +169,12 @@ EXTRA_DIST += $(mf_tests) if MF TESTS += $(mf_tests) check_PROGRAMS += gftype tftopl +TRIPTRAP += mftrap.diffs +TRIPTRAP_CLEAN += trap-clean endif MF -.PHONY: trap-clean -clean-local:: trap-clean # trap.test +.PHONY: trap-clean trap-clean: rm -f trap.mf trap.base rm -f mftrapin.fot mftrapin.log diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL index fc251bc2b73..13df2a3f1dd 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog.TL +++ b/Build/source/texk/web2c/eptexdir/ChangeLog.TL @@ -1,6 +1,10 @@ ChangeLog.TL: TeX Live (TL) changes for e-pTeX ============================================== +2011-01-14 Peter Breitenlohner + + * am/eptex.am (eptrip-clean): Use TRIPTRAP_CLEAN. + 2011-01-13 Peter Breitenlohner * eptrip.test (new): Shell script for e-pTRIP test, diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am index ac658c51c25..0c69b955518 100644 --- a/Build/source/texk/web2c/eptexdir/am/eptex.am +++ b/Build/source/texk/web2c/eptexdir/am/eptex.am @@ -52,9 +52,9 @@ eptexdir/etex_version.h: etexdir/etex.ch | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ # Extract ptex version -eptexdir/ptex_version.h: ptexdir/ptex-base.ch +eptexdir/ptex_version.h: eptexdir/eptex.ech $(MKDIR_P) eptexdir - grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ + grep '^@d pTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ # Generate eptex.web @@ -95,6 +95,7 @@ if EPTEX TESTS += $(eptex_tests) check_PROGRAMS += dvitype pltotf tftopl TRIPTRAP += eptrip.diffs +TRIPTRAP_CLEAN += eptrip-clean endif EPTEX ## Test data and results @@ -102,7 +103,6 @@ endif EPTEX ## 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 diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech index ada966d46f8..424dfe732be 100644 --- a/Build/source/texk/web2c/eptexdir/eptex.ech +++ b/Build/source/texk/web2c/eptexdir/eptex.ech @@ -8,6 +8,12 @@ \def\epTeX{$\varepsilon$-p\TeX} @z +@x [1.2] l.200 - pTeX: +@d pTeX_version_string=='-p3.1.11' {current p\TeX\ version} +@y +@d pTeX_version_string=='-p3.1.11-110102' {current \epTeX\ version} +@z + @x e-pTeX: banner {printed when p\TeX\ starts} @y diff --git a/Build/source/texk/web2c/eptexdir/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip.diffs index 63b01ff8062..0ac4fb35ff3 100644 Binary files a/Build/source/texk/web2c/eptexdir/eptrip.diffs and b/Build/source/texk/web2c/eptexdir/eptrip.diffs differ diff --git a/Build/source/texk/web2c/eptexdir/etex.ch1 b/Build/source/texk/web2c/eptexdir/etex.ch1 index 0145dd260da..a722016c77e 100644 --- a/Build/source/texk/web2c/eptexdir/etex.ch1 +++ b/Build/source/texk/web2c/eptexdir/etex.ch1 @@ -33,14 +33,14 @@ @x [26.420] if box(cur_val)=null then cur_val:=0 else - begin q:=box(cur_val); + begin q:=box(cur_val); while (q<>null)and(box_dir(q)<>abs(direction)) do q:=link(q); if q=null then begin q:=new_dir_node(box(cur_val),abs(direction)); @y if q=null then cur_val:=0 else - begin qx:=q; + begin qx:=q; while (q<>null)and(box_dir(q)<>abs(direction)) do q:=link(q); if q=null then begin q:=new_dir_node(qx,abs(direction)); diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index d194cfd5949..106ebd2b468 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,11 @@ +2011-01-15 Peter Breitenlohner + + * etrip/etrip.tex: Fixed 'wrong last node type' diagnostic. + +2011-01-14 Peter Breitenlohner + + * am/etex.am (etrip-clean): Use TRIPTRAP_CLEAN. + 2011-01-14 Peter Breitenlohner * etex.ch: Mention \protected in error and help messages only diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 90793c47ba1..008aeebc65a 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -85,12 +85,12 @@ if ETEX TESTS += $(etex_tests) check_PROGRAMS += dvitype pltotf tftopl TRIPTRAP += etrip.diffs +TRIPTRAP_CLEAN += etrip-clean endif ETEX DISTCLEANFILES += etrip.diffs -.PHONY: etrip-clean -clean-local:: etrip-clean # etrip.test +.PHONY: 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 diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.tex b/Build/source/texk/web2c/etexdir/etrip/etrip.tex index dd9459d7fe2..33f747a8b18 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.tex +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.tex @@ -302,8 +302,8 @@ \ifnum-1=\lastnodetype empty\else UNKNOWN!\fi\fi}% \typeout{last node type (l.\number\inputlineno): \6}} \def\2 #1 {\relax\ifnum#1=\lastnodetype \5\else - \typeout{wrong last node type: - \number\lastnodetype\space should be #1!}\fi} + \edef\6{\number\lastnodetype}% + \typeout{wrong last node type: \6 should be #1!}\fi} \def\3 #1 {\relax\ifnum#1=\currentgrouplevel \else \typeout{wrong current group level: \number\currentgrouplevel\space should be #1!}\fi} diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index b388d7d3487..06a08fc820e 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,7 @@ +2011-01-14 Peter Breitenlohner + + * am/mplib.am (mptrap-clean): Use TRIPTRAP_CLEAN. + 2010-12-23 Peter Breitenlohner * am/mplib.am: install-exec-hook and uninstall-hook rules now diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index 1c2bbc630bf..0898cf3aac7 100644 --- a/Build/source/texk/web2c/mplibdir/am/mplib.am +++ b/Build/source/texk/web2c/mplibdir/am/mplib.am @@ -1,6 +1,6 @@ ## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost. ## -## Copyright (C) 2009, 2010 Peter Breitenlohner +## Copyright (C) 2009 - 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## MetaPost @@ -52,14 +52,14 @@ if MP TESTS += $(mp_tests) check_PROGRAMS += pltotf tftopl TRIPTRAP += mptrap.diffs +TRIPTRAP_CLEAN += mptrap-clean endif MP DISTCLEANFILES += mptrap.diffs -.PHONY: mptrap-clean -clean-local:: mptrap-clean ## dvitomp.test DISTCLEANFILES += ptmr.mpx tests/xptmr.mpx tests/xstory.mpx ## mptrap.test +.PHONY: mptrap-clean mptrap-clean: rm -f mtrap.mp mtrap.mem trapf.tfm rm -f mtrap.log mtrap.0 mtrap.1 writeo writeo.log writeo.2 diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 406b995c873..f2f03424c15 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2011-01-14 Peter Breitenlohner + + * am/ptex.am (ptrip-clean): Use TRIPTRAP_CLEAN. + 2011-01-13 Peter Breitenlohner * ptex-base.ch: Reformulate if_*_code definitions, for e-pTeX. diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index 3119f7a3999..df62eeb7c8b 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -186,6 +186,7 @@ if PTEX TESTS += $(ptex_tests) check_PROGRAMS += dvitype pltotf tftopl TRIPTRAP += ptrip.diffs +TRIPTRAP_CLEAN += ptrip-clean endif PTEX ## Test data and results @@ -214,7 +215,6 @@ DISTCLEANFILES += tests/x*min10.* ## ptexdir/ptrip.test EXTRA_DIST += ptexdir/ptrip.diffs .PHONY: ptrip-clean -clean-local:: ptrip-clean ptrip-clean: rm -f trip.tfm trip.pl trip.tex trip.fmt ptripin.fot ptripin.log rm -f ptrip.fot ptrip.log trip.log trip.dvi trip.typ diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch index f5653d61da5..b648dbbbe6c 100644 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch +++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch @@ -1953,7 +1953,7 @@ if box(cur_val)=null then cur_val:=0 @+else cur_val:=mem[box(cur_val)+m].sc; @y if box(cur_val)=null then cur_val:=0 else - begin q:=box(cur_val); + begin q:=box(cur_val); while (q<>null)and(box_dir(q)<>abs(direction)) do q:=link(q); if q=null then begin q:=new_dir_node(box(cur_val),abs(direction)); -- cgit v1.2.3