diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-08-24 08:01:47 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-08-24 08:01:47 +0000 |
| commit | 9e82db30ffdc8ecdc1ddb1085d686a34699832b8 (patch) | |
| tree | d6cc92ba1d27a08fbd06d03d456198f7bd2c3390 /Build/source/texk | |
| parent | da7ca18222c1c8e21d88f0589eef1f824ddf0674 (diff) | |
upTeX and e-upTeX: final(?) version + some test cases
git-svn-id: svn://tug.org/texlive/trunk@23678 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
22 files changed, 1941 insertions, 124 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index cc593ffb2b3..57ece7188ea 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2011-08-23 Peter Breitenlohner <peb@mp.mpg.de> + + * triptrap-sh: Add uptrip and euptrip tests. + 2011-08-20 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * texmfmem.h: upTeX uses Aleph-type memory words. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 2e64b9bd8af..777c393a0d3 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -50,16 +50,18 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_7) \ $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \ synctex$(EXEEXT) noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ - $(am__EXEEXT_34) $(am__EXEEXT_35) + $(am__EXEEXT_36) $(am__EXEEXT_37) check_PROGRAMS = $(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \ $(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32) \ - $(am__EXEEXT_33) md5main$(EXEEXT) -TESTS = tangle.test $(am__EXEEXT_38) ctiedir/ctie.test \ + $(am__EXEEXT_33) $(am__EXEEXT_34) $(am__EXEEXT_35) \ + md5main$(EXEEXT) +TESTS = tangle.test $(am__EXEEXT_40) 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_38) $(am__append_40) \ - $(am__append_48) $(am__append_55) $(am__append_69) \ - $(am__append_72) $(am__append_73) libmd5/md5.test + $(am__append_46) $(am__append_50) $(am__append_52) \ + $(am__append_57) $(am__append_64) $(am__append_78) \ + $(am__append_81) $(am__append_82) libmd5/md5.test DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ @@ -141,36 +143,45 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ @EPTEX_TRUE@am__append_43 = eptrip-clean @UPTEX_TRUE@am__append_44 = uptex @UPWEB_TRUE@am__append_45 = $(upweb_programs) -@EUPTEX_TRUE@am__append_46 = euptex -@PDFTEX_TRUE@am__append_47 = pdftex ttf2afm pdftosrc -@PDFTEX_TRUE@am__append_48 = $(pdftex_tests) -@MINGW32_TRUE@am__append_49 = \ +@UPTEX_TRUE@am__append_46 = $(uptex_tests) +@UPTEX_TRUE@am__append_47 = dvitype pltotf tftopl +@UPTEX_TRUE@am__append_48 = uptrip.diffs +@UPTEX_TRUE@am__append_49 = uptrip-clean +@UPWEB_TRUE@am__append_50 = $(upweb_tests) +@EUPTEX_TRUE@am__append_51 = euptex +@EUPTEX_TRUE@am__append_52 = $(euptex_tests) +@EUPTEX_TRUE@am__append_53 = dvitype pltotf tftopl +@EUPTEX_TRUE@am__append_54 = euptrip.diffs +@EUPTEX_TRUE@am__append_55 = euptrip-clean +@PDFTEX_TRUE@am__append_56 = pdftex ttf2afm pdftosrc +@PDFTEX_TRUE@am__append_57 = $(pdftex_tests) +@MINGW32_TRUE@am__append_58 = \ @MINGW32_TRUE@ pdftexdir/regex/regex.c \ @MINGW32_TRUE@ pdftexdir/regex/regex.h -@LUATEX_TRUE@am__append_50 = luatex -@LUATEX_TRUE@@WIN32_TRUE@am__append_51 = call_luatex -@LUATEX_TRUE@@WIN32_TRUE@am__append_52 = install-luatex-links -@LUATEX_TRUE@@WIN32_TRUE@am__append_53 = uninstall-luatex-links -@LUATEX_TRUE@@WIN32_FALSE@am__append_54 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac -@LUATEX_TRUE@am__append_55 = $(luatex_tests) -@MINGW32_FALSE@am__append_56 = -DLUA_USE_POSIX -@XETEX_TRUE@am__append_57 = xetex -@XETEX_MACOSX_TRUE@am__append_58 = -DXETEX_MAC -@XETEX_MACOSX_TRUE@am__append_59 = libxetexmm.a -@XETEX_MACOSX_FALSE@am__append_60 = -DXETEX_OTHER $(POPPLER_INCLUDES) \ +@LUATEX_TRUE@am__append_59 = luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_60 = call_luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_61 = install-luatex-links +@LUATEX_TRUE@@WIN32_TRUE@am__append_62 = uninstall-luatex-links +@LUATEX_TRUE@@WIN32_FALSE@am__append_63 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac +@LUATEX_TRUE@am__append_64 = $(luatex_tests) +@MINGW32_FALSE@am__append_65 = -DLUA_USE_POSIX +@XETEX_TRUE@am__append_66 = xetex +@XETEX_MACOSX_TRUE@am__append_67 = -DXETEX_MAC +@XETEX_MACOSX_TRUE@am__append_68 = libxetexmm.a +@XETEX_MACOSX_FALSE@am__append_69 = -DXETEX_OTHER $(POPPLER_INCLUDES) \ @XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES) -@XETEX_MACOSX_FALSE@am__append_61 = $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS) -@XETEX_MACOSX_FALSE@am__append_62 = $(POPPLER_DEPEND) $(LIBPNG_DEPEND) -@XETEX_GRAPHITE_TRUE@am__append_63 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES) -@XETEX_GRAPHITE_TRUE@am__append_64 = $(GRAPHITE_LIBS) -@XETEX_GRAPHITE_TRUE@am__append_65 = $(GRAPHITE_DEPEND) -@XETEX_MACOSX_TRUE@am__append_66 = \ +@XETEX_MACOSX_FALSE@am__append_70 = $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS) +@XETEX_MACOSX_FALSE@am__append_71 = $(POPPLER_DEPEND) $(LIBPNG_DEPEND) +@XETEX_GRAPHITE_TRUE@am__append_72 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES) +@XETEX_GRAPHITE_TRUE@am__append_73 = $(GRAPHITE_LIBS) +@XETEX_GRAPHITE_TRUE@am__append_74 = $(GRAPHITE_DEPEND) +@XETEX_MACOSX_TRUE@am__append_75 = \ @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_67 = \ +@XETEX_MACOSX_FALSE@am__append_76 = \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeX_pic.c \ @@ -187,96 +198,96 @@ 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_68 = \ +@XETEX_GRAPHITE_TRUE@am__append_77 = \ @XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.cpp \ @XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.h -@XETEX_TRUE@am__append_69 = $(xetex_tests) -@OTANGLE_TRUE@am__append_70 = $(omegaware_tools) -@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_71 = $(omegaware_font_tools) -@OTANGLE_TRUE@am__append_72 = $(OTANGLE_tests) -@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_73 = $(OMFONTS_tests) -@OTANGLE_TRUE@am__append_74 = pltotf tftopl -@ALEPH_TRUE@am__append_75 = aleph -@TEX_SYNCTEX_TRUE@am__append_76 = -I$(srcdir)/synctexdir \ +@XETEX_TRUE@am__append_78 = $(xetex_tests) +@OTANGLE_TRUE@am__append_79 = $(omegaware_tools) +@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_80 = $(omegaware_font_tools) +@OTANGLE_TRUE@am__append_81 = $(OTANGLE_tests) +@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_82 = $(OMFONTS_tests) +@OTANGLE_TRUE@am__append_83 = pltotf tftopl +@ALEPH_TRUE@am__append_84 = aleph +@TEX_SYNCTEX_TRUE@am__append_85 = -I$(srcdir)/synctexdir \ @TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\" -@TEX_SYNCTEX_TRUE@am__append_77 = $(ZLIB_LIBS) -@TEX_SYNCTEX_TRUE@am__append_78 = $(ZLIB_DEPEND) -@TEX_SYNCTEX_TRUE@am__append_79 = \ +@TEX_SYNCTEX_TRUE@am__append_86 = $(ZLIB_LIBS) +@TEX_SYNCTEX_TRUE@am__append_87 = $(ZLIB_DEPEND) +@TEX_SYNCTEX_TRUE@am__append_88 = \ @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_80 = -I$(srcdir)/synctexdir \ +@ETEX_SYNCTEX_TRUE@am__append_89 = -I$(srcdir)/synctexdir \ @ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\" -@ETEX_SYNCTEX_TRUE@am__append_81 = $(ZLIB_LIBS) -@ETEX_SYNCTEX_TRUE@am__append_82 = $(ZLIB_DEPEND) -@ETEX_SYNCTEX_TRUE@am__append_83 = \ +@ETEX_SYNCTEX_TRUE@am__append_90 = $(ZLIB_LIBS) +@ETEX_SYNCTEX_TRUE@am__append_91 = $(ZLIB_DEPEND) +@ETEX_SYNCTEX_TRUE@am__append_92 = \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h -@PTEX_SYNCTEX_TRUE@am__append_84 = -I$(srcdir)/synctexdir \ +@PTEX_SYNCTEX_TRUE@am__append_93 = -I$(srcdir)/synctexdir \ @PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\" -@PTEX_SYNCTEX_TRUE@am__append_85 = $(ZLIB_LIBS) -@PTEX_SYNCTEX_TRUE@am__append_86 = $(ZLIB_DEPEND) -@PTEX_SYNCTEX_TRUE@am__append_87 = \ +@PTEX_SYNCTEX_TRUE@am__append_94 = $(ZLIB_LIBS) +@PTEX_SYNCTEX_TRUE@am__append_95 = $(ZLIB_DEPEND) +@PTEX_SYNCTEX_TRUE@am__append_96 = \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex-ptex.h -@UPTEX_SYNCTEX_TRUE@am__append_88 = -I$(srcdir)/synctexdir \ +@UPTEX_SYNCTEX_TRUE@am__append_97 = -I$(srcdir)/synctexdir \ @UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\" -@UPTEX_SYNCTEX_TRUE@am__append_89 = $(ZLIB_LIBS) -@UPTEX_SYNCTEX_TRUE@am__append_90 = $(ZLIB_DEPEND) -@UPTEX_SYNCTEX_TRUE@am__append_91 = \ +@UPTEX_SYNCTEX_TRUE@am__append_98 = $(ZLIB_LIBS) +@UPTEX_SYNCTEX_TRUE@am__append_99 = $(ZLIB_DEPEND) +@UPTEX_SYNCTEX_TRUE@am__append_100 = \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-uptex.h -@EPTEX_SYNCTEX_TRUE@am__append_92 = -I$(srcdir)/synctexdir \ +@EPTEX_SYNCTEX_TRUE@am__append_101 = -I$(srcdir)/synctexdir \ @EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\" -@EPTEX_SYNCTEX_TRUE@am__append_93 = $(ZLIB_LIBS) -@EPTEX_SYNCTEX_TRUE@am__append_94 = $(ZLIB_DEPEND) -@EPTEX_SYNCTEX_TRUE@am__append_95 = \ +@EPTEX_SYNCTEX_TRUE@am__append_102 = $(ZLIB_LIBS) +@EPTEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_DEPEND) +@EPTEX_SYNCTEX_TRUE@am__append_104 = \ @EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-eptex.h -@EUPTEX_SYNCTEX_TRUE@am__append_96 = -I$(srcdir)/synctexdir \ +@EUPTEX_SYNCTEX_TRUE@am__append_105 = -I$(srcdir)/synctexdir \ @EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\" -@EUPTEX_SYNCTEX_TRUE@am__append_97 = $(ZLIB_LIBS) -@EUPTEX_SYNCTEX_TRUE@am__append_98 = $(ZLIB_DEPEND) -@EUPTEX_SYNCTEX_TRUE@am__append_99 = \ +@EUPTEX_SYNCTEX_TRUE@am__append_106 = $(ZLIB_LIBS) +@EUPTEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_DEPEND) +@EUPTEX_SYNCTEX_TRUE@am__append_108 = \ @EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-euptex.h -@PDFTEX_SYNCTEX_TRUE@am__append_100 = -I$(srcdir)/synctexdir \ +@PDFTEX_SYNCTEX_TRUE@am__append_109 = -I$(srcdir)/synctexdir \ @PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\" -@PDFTEX_SYNCTEX_TRUE@am__append_101 = \ +@PDFTEX_SYNCTEX_TRUE@am__append_110 = \ @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_102 = -I$(srcdir)/synctexdir \ +@XETEX_SYNCTEX_TRUE@am__append_111 = -I$(srcdir)/synctexdir \ @XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\" -@XETEX_SYNCTEX_TRUE@am__append_103 = \ +@XETEX_SYNCTEX_TRUE@am__append_112 = \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @@ -634,9 +645,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ @PTEX_TRUE@ tftopl$(EXEEXT) @EPTEX_TRUE@am__EXEEXT_32 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @EPTEX_TRUE@ tftopl$(EXEEXT) -@OTANGLE_TRUE@am__EXEEXT_33 = pltotf$(EXEEXT) tftopl$(EXEEXT) -@MP_TRUE@@WIN32_TRUE@am__EXEEXT_34 = call_mpost$(EXEEXT) -@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_35 = call_luatex$(EXEEXT) +@UPTEX_TRUE@am__EXEEXT_33 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@UPTEX_TRUE@ tftopl$(EXEEXT) +@EUPTEX_TRUE@am__EXEEXT_34 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@EUPTEX_TRUE@ tftopl$(EXEEXT) +@OTANGLE_TRUE@am__EXEEXT_35 = pltotf$(EXEEXT) tftopl$(EXEEXT) +@MP_TRUE@@WIN32_TRUE@am__EXEEXT_36 = call_mpost$(EXEEXT) +@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_luatex$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) dist_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) \ aleph-alephextra.$(OBJEXT) @@ -1077,13 +1092,13 @@ ETAGS = etags CTAGS = ctags am__tty_colors = \ red=; grn=; lgn=; blu=; std= -am__EXEEXT_36 = bibtex.test dvicopy.test dvitype.test gftodvi.test \ +am__EXEEXT_38 = 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_37 = $(am__EXEEXT_36) tests/bibtex-openout-test.pl \ +am__EXEEXT_39 = $(am__EXEEXT_38) tests/bibtex-openout-test.pl \ tests/bibtex-longline-test.pl tests/bibtex-mem.test -@WEB_TRUE@am__EXEEXT_38 = $(am__EXEEXT_37) +@WEB_TRUE@am__EXEEXT_40 = $(am__EXEEXT_39) DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -1397,12 +1412,19 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ eptexdir/Changes.txt eptexdir/README.txt \ eptexdir/eptrip/eptrip.diffs eptexdir/eptrip/etrip.log \ eptexdir/eptrip/etrip.tex eptexdir/eptrip/texmf.cnf \ - $(uptex_web_srcs) $(uptex_ch_srcs) uptexdir/uptex.defines \ - ptexdir/pbibtex.ch uptexdir/upbibtex.ch ptexdir/pdvitype.ch \ - uptexdir/updvitype.ch ptexdir/ppltotf.ch uptexdir/uppltotf.ch \ - ptexdir/ptftopl.ch uptexdir/uptftopl.ch $(euptex_web_srcs) \ - $(euptex_ch_srcs) euptexdir/euptex.defines $(pdftex_ch_srcs) \ - etexdir/etex.ch pdftexdir/pdftex.defines pdftexdir/pdftex.h \ + $(uptex_tests) $(upweb_tests) $(uptex_web_srcs) \ + $(uptex_ch_srcs) uptexdir/uptex.defines ptexdir/pbibtex.ch \ + uptexdir/upbibtex.ch ptexdir/pdvitype.ch uptexdir/updvitype.ch \ + ptexdir/ppltotf.ch uptexdir/uppltotf.ch ptexdir/ptftopl.ch \ + uptexdir/uptftopl.ch uptexdir/COPYRIGHT uptexdir/COPYRIGHT.jis \ + uptexdir/ChangeLog uptexdir/uptrip/uptrip.diffs \ + uptexdir/uptrip/texmf.cnf $(euptex_tests) $(euptex_web_srcs) \ + $(euptex_ch_srcs) euptexdir/euptex.defines euptexdir/COPYRIGHT \ + euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \ + euptexdir/EUPTEX.txt eptexdir/eptrip/etrip.log \ + eptexdir/eptrip/etrip.tex euptexdir/euptrip/euptrip.diffs \ + euptexdir/euptrip/texmf.cnf $(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 \ @@ -1581,14 +1603,19 @@ 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 eptrip.diffs $(nodist_uptex_SOURCES) \ - uptex.web uptex.ch uptex-web2c uptex.p uptex.pool uptex-tangle \ + eptex.pool eptex-tangle eptrip.diffs $(upweb_programs:=.c) \ + $(upweb_programs:=.h) $(upweb_programs:=.p) \ + $(upweb_programs:=-web2c) $(upweb_programs:=.web) \ + $(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c uptex.p \ + uptex.pool uptex-tangle tests/xexampl.aux tests/xexampl.bbl \ + tests/xexampl.blg tests/xstory.dvityp tests/xpagenum.typ \ + tests/xcmr10.tfm tests/xcmr10.pl uptrip.diffs \ $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \ - euptex.p euptex.pool euptex-tangle $(nodist_pdftex_SOURCES) \ - pdftex.ch pdftex-web2c pdftex.p pdftex.pool pdftex-tangle \ - $(nodist_libluatex_a_SOURCES) txt2zlib.c \ - $(nodist_xetex_SOURCES) xetex.web xetex-web2c xetex.p \ - xetex.pool xetex-tangle $(omegaware_programs:=.c) \ + euptex.p euptex.pool euptex-tangle euptrip.diffs \ + $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \ + pdftex.pool pdftex-tangle $(nodist_libluatex_a_SOURCES) \ + txt2zlib.c $(nodist_xetex_SOURCES) xetex.web xetex-web2c \ + xetex.p xetex.pool xetex-tangle $(omegaware_programs:=.c) \ $(omegaware_programs:=.h) $(omegaware_programs:=.p) \ $(omegaware_programs:=-web2c) omegaware/tests/xlevel1.ofm \ omegaware/tests/xlevel1.opl ofont*vf omegaware/tests/xofont* \ @@ -1602,13 +1629,15 @@ 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_43) + $(am__append_31) $(am__append_37) $(am__append_43) \ + $(am__append_49) $(am__append_55) TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \ - $(am__append_30) $(am__append_36) $(am__append_42) + $(am__append_30) $(am__append_36) $(am__append_42) \ + $(am__append_48) $(am__append_54) bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \ - $(am__append_54) -install_exe_links = $(am__append_20) $(am__append_52) -uninstall_exe_links = $(am__append_21) $(am__append_53) + $(am__append_63) +install_exe_links = $(am__append_20) $(am__append_61) +uninstall_exe_links = $(am__append_21) $(am__append_62) web2c = $(SHELL) ./web2c-sh $@ makecpool = web2c/makecpool @@ -1692,18 +1721,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_76) +tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_85) # With --enable-ipc, TeX may need to link with -lsocket. -tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_77) +tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_86) # 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_79) +dist_tex_SOURCES = texextra.c $(am__append_88) # We must create texd.h before building the tex_OBJECTS. -tex_prereq = texd.h $(am__append_78) +tex_prereq = texd.h $(am__append_87) tex_ch_srcs = \ tex.web \ tex.ch \ @@ -1771,19 +1800,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_80) +etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_89) # With --enable-ipc, e-TeX may need to link with -lsocket. -etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_81) +etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_90) # 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_83) + $(am__append_92) # 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_82) +etex_prereq = etexd.h etexdir/etex_version.h $(am__append_91) etex_web_srcs = \ tex.web \ etexdir/etex.ch @@ -1818,20 +1847,20 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \ pproglib = lib/libp.a libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h libkanji_a_CPPFLAGS = $(ptex_cppflags) -ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_84) +ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_93) # With --enable-ipc, pTeX may need to link with -lsocket. -ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_85) +ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_94) ptex_DEPENDENCIES = $(ptex_dependencies) # pTeX C sources ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexdir/ptex_version.h dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \ - $(am__append_87) + $(am__append_96) # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS. -ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_86) +ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_95) ptex_web_srcs = \ tex.web \ tex.ch @@ -1865,23 +1894,23 @@ ptftopl_DEPENDENCIES = $(ptex_dependencies) # e-pTeX Tests # eptex_tests = eptexdir/eptrip.test -eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_92) +eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_101) # With --enable-ipc, e-pTeX may need to link with -lsocket. eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) $(am__append_93) + $(ipc_socketlibs) $(am__append_102) eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) # 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/eptex_version.h eptexdir/ptex_version.h dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \ - $(am__append_95) + $(am__append_104) # 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/eptex_version.h eptexdir/ptex_version.h \ - $(am__append_94) + $(am__append_103) eptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -1906,23 +1935,32 @@ uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) up_tangle = WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) $(TANGLE) upweb_programs = upbibtex updvitype uppltotf uptftopl + +# upTeX Tests +uptex_tests = uptexdir/uptrip.test +upweb_tests = \ + uptexdir/upbibtex.test \ + uptexdir/updvitype.test \ + uptexdir/uppltotf.test \ + uptexdir/uptftopl.test + libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h libukanji_a_CPPFLAGS = $(uptex_cppflags) -uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_88) +uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_97) # With --enable-ipc, upTeX may need to link with -lsocket. -uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_89) +uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_98) uptex_DEPENDENCIES = $(uptex_dependencies) # upTeX C sources uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c uptexdir/ptex_version.h uptexdir/uptex_version.h dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \ - $(am__append_91) + $(am__append_100) # We must create uptexd.h and uptexdir/*ptex_version.h before building the uptex_OBJECTS. uptex_prereq = uptexd.h uptexdir/ptex_version.h \ - uptexdir/uptex_version.h $(am__append_90) + uptexdir/uptex_version.h $(am__append_99) uptex_web_srcs = \ tex.web \ tex.ch @@ -1953,11 +1991,15 @@ uptftopl_SOURCES = uptexdir/kanji.h uptftopl_CPPFLAGS = $(uptex_cppflags) -DDHEX_CHAR_CODE uptftopl_LDADD = $(uptex_ldadd) uptftopl_DEPENDENCIES = $(uptex_dependencies) -euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_96) + +# e-upTeX Tests +# +euptex_tests = euptexdir/euptrip.test +euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_105) # With --enable-ipc, e-upTeX may need to link with -lsocket. euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) $(am__append_97) + $(ipc_socketlibs) $(am__append_106) euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) # e-upTeX C sources @@ -1966,12 +2008,12 @@ nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c euptexdir/etex_version.h \ euptexdir/eptex_version.h euptexdir/ptex_version.h euptexdir/uptex_version.h dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \ - $(am__append_99) + $(am__append_108) # We must create euptexd.h and euptexdir/*tex_version.h before building the euptex_OBJECTS. euptex_prereq = euptexd.h euptexdir/etex_version.h \ euptexdir/eptex_version.h euptexdir/ptex_version.h \ - euptexdir/uptex_version.h $(am__append_98) + euptexdir/uptex_version.h $(am__append_107) euptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -2008,7 +2050,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_100) +pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_109) pdftex_CXXFLAGS = $(WARNING_CXXFLAGS) # With --enable-ipc, pdfTeX may need to link with -lsocket. @@ -2022,7 +2064,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_101) + $(am__append_110) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -2048,7 +2090,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_49) + pdftexdir/writezip.c $(am__append_58) 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 @@ -2089,7 +2131,7 @@ call_luatex_LDADD = # luaTeX Tests # luatex_tests = luatexdir/luatex.test -liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_56) +liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_65) liblua51_a_CFLAGS = # $(WARNING_CFLAGS) liblua51_a_SOURCES = \ luatexdir/lua51/lapi.c \ @@ -2467,17 +2509,17 @@ txt2zlib_LDADD = $(ZLIB_LIBS) # Force Automake to use CXXLD for linking nodist_EXTRA_xetex_SOURCES = dummy.cxx -libxetex = libxetex.a $(am__append_59) +libxetex = libxetex.a $(am__append_68) xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \ - $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_58) \ - $(am__append_60) $(am__append_63) $(ZLIB_INCLUDES) -xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_61) \ - $(am__append_64) $(FREETYPE2_LIBS) $(ZLIB_LIBS) + $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_67) \ + $(am__append_69) $(am__append_72) $(ZLIB_INCLUDES) +xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_70) \ + $(am__append_73) $(FREETYPE2_LIBS) $(ZLIB_LIBS) xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \ - $(TECKIT_DEPEND) $(am__append_62) $(am__append_65) \ + $(TECKIT_DEPEND) $(am__append_71) $(am__append_74) \ $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime -xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_102) +xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_111) xetex_CFLAGS = # $(WARNING_CFLAGS) xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) @@ -2489,7 +2531,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_103) + $(am__append_112) xetex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -2520,7 +2562,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_66) $(am__append_67) $(am__append_68) + $(am__append_75) $(am__append_76) $(am__append_77) # We must create xetexd.h etc. before building the libxetex_a_OBJECTS. libxetex_prereq = xetexd.h $(xetex_dependencies) @@ -9816,6 +9858,15 @@ uptftopl.p: tangle$(EXEEXT) uptftopl.web uptexdir/uptftopl.ch $(up_tangle) uptftopl uptftopl uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch ptexdir/ptftopl.ch $(tie) -m uptftopl.web tftopl.web tftopl.ch ptexdir/ptftopl.ch +uptrip.diffs: uptex$(EXEEXT) + $(triptrap_diffs) $@ +.PHONY: uptrip-clean +uptrip-clean: + rm -f trip.tfm trip.pl trip.tex trip.fmt uptripin.fot uptripin.log + rm -f uptrip.fot uptrip.log trip.log trip.dvi trip.typ + rm -f uptrip.fot uptrip.log uptrip.dvi uptrip.typ + rm -f tripos.tex 8terminal.tex + rm -rf tfm $(euptex_OBJECTS): $(euptex_prereq) $(euptex_c_h): euptex-web2c @@ -9863,6 +9914,17 @@ euptex.web: tie$(EXEEXT) $(euptex_web_srcs) # Generate euptex.ch euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs) $(tie) -c euptex.ch euptex.web $(euptex_ch_srcs) +euptrip.diffs: euptex$(EXEEXT) + $(triptrap_diffs) $@ +.PHONY: euptrip-clean +euptrip-clean: + rm -f trip.tfm trip.pl trip.tex trip.fmt trip.log trip.dvi + rm -f cuptripin.fot cuptripin.log cuptrip.fot cuptrip.log cuptrip.typ + rm -f xuptripin.fot xuptripin.log xuptrip.fot xuptrip.log xuptrip.typ + rm -f euptripin.fot euptripin.log euptrip.fot euptrip.log euptrip.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/euptexdir/COPYRIGHT b/Build/source/texk/web2c/euptexdir/COPYRIGHT new file mode 100644 index 00000000000..9f2495ecb04 --- /dev/null +++ b/Build/source/texk/web2c/euptexdir/COPYRIGHT @@ -0,0 +1,25 @@ +Copyright (C) 2009 ASCII MEDIA WORKS. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the author may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Build/source/texk/web2c/euptexdir/COPYRIGHT.jis b/Build/source/texk/web2c/euptexdir/COPYRIGHT.jis new file mode 100644 index 00000000000..fb491511cc7 --- /dev/null +++ b/Build/source/texk/web2c/euptexdir/COPYRIGHT.jis @@ -0,0 +1,32 @@ +($BCm(B) $B0J2<$O!"1QJ8$N7@Ls>r9`$rF|K\8l$KK]Lu$7$?$b$N$G$"$k!#F|K\8lLu$H1Q(B +$B8lI=5-$N4V$Ksrsw$,$"$C$?>l9g$K$O!"7@Ls>r7o$O1Q8lI=5-$K$h$k7@Ls>r9`$K=>(B +$B$&!#(B + +$B!ZCx:n8"I=<(![(B +Copyright (C) 2009 ASCII MEDIA WORKS. +All rights reserved. + +$B!Z7@Ls>r7o![(B +$B2~JQ$NM-L5$K$+$+$o$i$:!"K\%=%U%H%&%'%"$N%=!<%9%3!<%I5Z$S%P%$%J%j!<%3!<(B +$B%I7A<0$K$h$k:FHRI[5Z$S;HMQ$O!"<!$N7@Ls>r7o$N2<$K5vBz$5$l$k!#(B +1. $B%=!<%9%3!<%I$N:FHRI[$K:]$7$F$O!">e5-$N!ZCx:n8"I=<(![!"$3$N!Z7@Ls>r(B + $B7o![5Z$S<!$N!ZLH@U>r9`![$NI=5-$r!"0z$-B3$-0];}$7$FL@5-$7$J$1$l$P$J(B + $B$i$J$$!#(B +2. $B%P%$%J%j!<7A<0$K$h$k:FHRI[$K:]$7$F$O!">e5-$N!ZCx:n8"I=<(![!"$3$N(B + $B!Z7@Ls>r7o![5Z$S<!$N!ZLH@U>r9`![$r!":FHRI[$K:]$7Ds6!$9$k@bL@=q5Z$S(B + $B$=$NB>$N4XO";qNA$K2~$a$FL@5-$7$J$1$l$P$J$i$J$$!#(B +3. $BFCJL$J;vA0$N=qLL$K$h$k5vBz$,$J$$8B$j!"K\%=%U%H%&%'%"$+$iGI@8$7$?@=(B + $BIJ$r?d>)Kt$O@kEA$9$k$?$a$K!"Cx:n8"<TL>$O;HMQ$7$F$O$J$i$J$$!#(B + +$B!ZLH@U>r9`![(B +$BK\%=%U%H%&%'%"$O!"Cx:n8"<T$K$h$j!"!V8=>uM-;Q$N$^$^!J$=$N$^$^$N7A$G!K!W(B +$BDs6!$5$l$k$b$N$G$"$j!">&IJ@-Kt$OFCDjL\E*$X$NE,9g@-$K4X$9$kL[<(E*J]>Z$J(B +$B$I!"L@<(Kt$OL[<($NJ]>Z$rLd$o$:!"$$$+$J$kJ]>Z$r$b9T$&$b$N$G$O$J$$!#(B +$B$$$+$J$kM}M3$K$h$C$F$b!"$^$?!"7@Ls@UG$!"873J@UG$Kt$O!J2a<:$K$h$k$b$N$r(B +$B4^$`!KITK!9T0Y@UG$$rLd$o$:$I$N$h$&$J@UG$$NM}O@$K$h$C$F$b!"Cx:n8"<T$O!"(B +$B$$$+$J$k>l9g$b!"K\%=%U%H%&%'%"$r;HMQ$9$k$3$H$K$h$jH/@8$9$k!"$"$i$f$kD>(B +$B@\B;32!"4V@\B;32!"6vH/B;32!"FCJLB;32!"D(H3E*B;32$"$k$$$OGI@8E*B;32!JBe(B +$BBX@=IJ!&BeBX%5!<%S%9$ND4C#!";HMQMx1W!"%G!<%?Kt$O<}1W$K4X$9$kB;<:!"1D6H(B +$BCfCG$K$h$kB;<:$J$I!K$K$D$$$F2?$i$N@UG$$bIi$o$J$$!#$3$l$O!"K\%=%U%H%&%'(B +$B%"$r;HMQ$9$k$3$H$K$h$j!"$3$l$i$NB;32$,H/@8$9$k2DG=@-$K$D$$$F!"$"$i$+$8(B +$B$a<(:6$5$l$F$$$?>l9g$G$"$C$F$bF1MM$G$"$k!#(B diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog new file mode 100644 index 00000000000..0c730933bf6 --- /dev/null +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -0,0 +1,6 @@ +2011-08-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported e-upTeX into TeX Live, based on the W32TeX version + from Akira Kakuto <kakuto@fuk.kindai.ac.jp> + and on the TL patches in tlsvn23478-uptex-1108111825.tar.xz + from Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>. diff --git a/Build/source/texk/web2c/euptexdir/EUPTEX.txt b/Build/source/texk/web2c/euptexdir/EUPTEX.txt new file mode 100644 index 00000000000..59b5614a39d --- /dev/null +++ b/Build/source/texk/web2c/euptexdir/EUPTEX.txt @@ -0,0 +1,10 @@ + e-upTeX ‚ɂ‚¢‚Ä + +e-upTeX ‚Í –kì O“T‚³‚ñ (H7K) h_kitagawa2001@yahoo.co.jp ‚É‚æ‚Á‚ÄAupTeX ‚É +e-TeX Šg’£‹@”\‚ªŽÀ‘•‚³‚ꂽ‚à‚Ì‚Å‚·B‚Ü‚½•‚“®¬”“_ŒvŽZ‹@”\‚à•t‰Á‚µ‚ÄŽÀ‘•‚µ +‚Ä‚ ‚è‚Ü‚·BÚ×‚Í $TEXMFMAIN/doc/eptex/ ˆÈ‰º‚É–k삳‚ñ‚É‚æ‚镶‘‚ª‚ ‚è‚Ü‚· +‚Ì‚ÅA‚»‚ê‚ðŽQÆ‚µ‚Ä‚‚¾‚³‚¢B‚È‚¨ $TEXMFMAIN/doc/eptex/ ˆÈ‰º‚Ì•¶‘‚ÍA +ptex-3.1.10-w32.tar.bz2 ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚é‚Æ“ü‚è‚Ü‚·B + +-- +A. Kakuto diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am index f69b15b7bcf..62b0e2f036d 100644 --- a/Build/source/texk/web2c/euptexdir/am/euptex.am +++ b/Build/source/texk/web2c/euptexdir/am/euptex.am @@ -10,6 +10,12 @@ bin_PROGRAMS += euptex endif EUPTEX EXTRA_PROGRAMS += euptex +# e-upTeX Tests +# +euptex_tests = euptexdir/euptrip.test + +EXTRA_DIST += $(euptex_tests) + euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) # With --enable-ipc, e-upTeX may need to link with -lsocket. @@ -99,3 +105,38 @@ EXTRA_DIST += $(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines DISTCLEANFILES += $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \ euptex.p euptex.pool euptex-tangle +## +EXTRA_DIST += \ + euptexdir/COPYRIGHT \ + euptexdir/COPYRIGHT.jis \ + euptexdir/ChangeLog \ + euptexdir/EUPTEX.txt + +if EUPTEX +TESTS += $(euptex_tests) +check_PROGRAMS += dvitype pltotf tftopl +TRIPTRAP += euptrip.diffs +TRIPTRAP_CLEAN += euptrip-clean +endif EUPTEX + +## Test data and results +## +## eptexdir/eptrip.test +EXTRA_DIST += \ + eptexdir/eptrip/etrip.log \ + eptexdir/eptrip/etrip.tex \ + euptexdir/euptrip/euptrip.diffs \ + euptexdir/euptrip/texmf.cnf +euptrip.diffs: euptex$(EXEEXT) + $(triptrap_diffs) $@ +.PHONY: euptrip-clean +euptrip-clean: + rm -f trip.tfm trip.pl trip.tex trip.fmt trip.log trip.dvi + rm -f cuptripin.fot cuptripin.log cuptrip.fot cuptrip.log cuptrip.typ + rm -f xuptripin.fot xuptripin.log xuptrip.fot xuptrip.log xuptrip.typ + rm -f euptripin.fot euptripin.log euptrip.fot euptrip.log euptrip.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 += euptrip.diffs + diff --git a/Build/source/texk/web2c/euptexdir/euptrip.test b/Build/source/texk/web2c/euptexdir/euptrip.test new file mode 100755 index 00000000000..1d4120b5184 --- /dev/null +++ b/Build/source/texk/web2c/euptexdir/euptrip.test @@ -0,0 +1,119 @@ +#! /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 +eptestdir=$srcdir/eptexdir/eptrip +euptestdir=$srcdir/euptexdir/euptrip + +TEXMFCNF=$euptestdir; export TEXMFCNF + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" + +echo ">>> Running e-TRIP test for e-upTeX." >&2 +echo ">>> See $euptestdir/euptrip.diffs for example of acceptable diffs." >&2 + +rm -f trip.tfm trip.pl trip.tex trip.log trip.fmt trip.log trip.dvi \ + cuptripin.fot cuptripin.log cuptrip.fot cuptrip.log cuptrip.typ \ + xuptripin.fot xuptripin.log xuptrip.fot xuptrip.log xuptrip.typ \ + euptripin.fot euptripin.log euptrip.fot euptrip.log euptrip.typ \ + etrip.tfm etrip.pl etrip.tex etrip.log etrip.fmt etrip.dvi etrip.out \ + tripos.tex 8terminal.tex +rm -rf tfm + +# upTeX 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-upTeX 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 +./euptex --progname=eupinitex --ini <$testdir/trip1.in >cuptripin.fot +sed "$P_SED1" trip.log > cuptripin.log || exit 1 +diff $testdir/tripin.log cuptripin.log + +# May as well test non-ini second time through. +rm -f trip.log +./euptex --progname=euptex <$testdir/trip2.in >cuptrip.fot +sed "$P_SED1;$P_SED2" trip.log > cuptrip.log +diff $testdir/trip.fot cuptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log cuptrip.log + +eval ./dvitype $dvitype_args trip.dvi >cuptrip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ cuptrip.typ + +# ================================= + +echo "*** TRIP test for e-upTeX in extended mode ***." + +rm -f trip.log +./euptex --progname=eupinitex --ini <$etestdir/etrip1.in >xuptripin.fot +sed "$P_SED1" trip.log > xuptripin.log || exit 1 +diff $testdir/tripin.log xuptripin.log + +# May as well test non-ini second time through. +rm -f trip.log +./euptex --progname=euptex <$etestdir/trip2.in >xuptrip.fot +sed "$P_SED1;$P_SED2" trip.log > xuptrip.log +diff $testdir/trip.fot xuptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log xuptrip.log + +eval ./dvitype $dvitype_args trip.dvi >xuptrip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ xuptrip.typ + +# ================================= + +echo "*** e-TeX specific part of e-TRIP test for e-upTeX ***." + +./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 $eptestdir/etrip.tex . + +./euptex --progname=eupinitex --ini <$etestdir/etrip2.in >euptripin.fot +sed "$P_SED1" etrip.log > euptripin.log || exit 1 +diff $etestdir/etripin.log euptripin.log + +# May as well test non-ini second time through. +./euptex --progname=euptex <$etestdir/etrip3.in >euptrip.fot +sed "$P_SED1;$P_SED2" etrip.log > euptrip.log +diff $etestdir/etrip.fot euptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $eptestdir/etrip.log euptrip.log + +eval ./dvitype $dvitype_args etrip.dvi >euptrip.typ || exit 1 +$DIFF $DIFFFLAGS $etestdir/etrip.typ euptrip.typ + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + diff --git a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs new file mode 100644 index 00000000000..e48da5d7052 --- /dev/null +++ b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs @@ -0,0 +1,867 @@ +>>> Running e-TRIP test for e-upTeX. +>>> See SRCDIR/euptexdir/euptrip/euptrip.diffs for example of acceptable diffs. ++ echo '*** TRIP test for e-upTeX in compatibility mode ***.' +*** TRIP test for e-upTeX in compatibility mode ***. ++ ./pltotf SRCDIR/triptrap/trip.pl trip.tfm ++ ./tftopl ./trip.tfm trip.pl ++ diff SRCDIR/triptrap/trip.pl trip.pl ++ ln -s SRCDIR/triptrap/trip.tex . ++ rm -f trip.log ++ ./euptex --progname=eupinitex --ini ++ sed 's/, yoko direction//;s/yoko direction, //' trip.log ++ diff SRCDIR/triptrap/tripin.log cuptripin.log +1c1 +< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 +--- +> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (INITEX) 23 AUG 2011 22:09 +3,11c3 +< (trip.tex +< ! Bad character code (256). +< <to be read again> +< - +< l.26 \nonstopmode\lccode256- +< 0\mathchardef\a="8000\def\a{ SC... +< A character number must be between 0 and 255. +< I changed this one to zero. +< +--- +> (./trip.tex +91c83,84 +< ### horizontal mode entered at line 77 (language255:hyphenmin1,63) +--- +> ### horizontal mode entered at line 77 (language255:hyph +> enmin1,63) +450,453c443,446 +< (preloaded format=trip 2008.3.15) +< 1326 strings of total length 23646 +< 471 memory locations dumped; current usage is 96&278 +< 341 multiletter control sequences +--- +> (format=trip 2011.8.23) +> 1610 strings of total length 27667 +> 489 memory locations dumped; current usage is 110&278 +> 393 multiletter control sequences +461c454 +< Hyphenation trie of length 273 has 9 ops out of 500 +--- +> Hyphenation trie of length 273 has 9 ops out of 35111 ++ rm -f trip.log ++ ./euptex --progname=euptex ++ sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log ++ diff SRCDIR/triptrap/trip.fot cuptrip.fot +1,3c1,2 +< This is TeX, Version 3.1415926 (INITEX) +< ** &trip trip +< (trip.tex ## +--- +> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) +> **(./trip.tex ## +17c16 +< Memory usage before: 159&313; after: 102&278; still untouched: 1613 +--- +> Memory usage before: 194&313; after: 118&278; still untouched: 2109 +75c74 +< Memory usage before: 334&431; after: 292&418; still untouched: 175 +--- +> Memory usage before: 456&431; after: 394&418; still untouched: 483 ++ diff SRCDIR/triptrap/trip.log cuptrip.log +1c1 +< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 +--- +> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (format=trip 2011.8.23) 23 AUG 2011 22:09 +3c3 +< (trip.tex ## +--- +> (./trip.tex ## +58a59,62 +> \openout0 = `8terminal.tex'. +> +> \openout10 = `tripos.tex'. +> +73c77 +< Memory usage before: 159&313; after: 102&278; still untouched: 1613 +--- +> Memory usage before: 194&313; after: 118&278; still untouched: 2109 +385,386c389,390 +< \insert100, natural size 803.09999; split(1.0 plus 43.0,-2.0); float cos +< t 100 +--- +> \insert100Y, natural size 803.09999; split(1.0 plus 43.0,-2.0); float co +> st 100 +426c430 +< \insert200, natural size 400.0; split(0.0,-2.0); float cost 100 +--- +> \insert200Y, natural size 400.0; split(0.0,-2.0); float cost 100 +441c445 +< \insert200, natural size 400.0; split(1.0,-1.0); float cost 100 +--- +> \insert200Y, natural size 400.0; split(1.0,-1.0); float cost 100 +456c460 +< \insert200, natural size 400.0; split(2.0,-1.0); float cost 100 +--- +> \insert200Y, natural size 400.0; split(2.0,-1.0); float cost 100 +474c478 +< \special{^^80-1000.0pt} +--- +> \special{€-1000.0pt} +483,484c487,488 +< \insert200, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +< 3 +--- +> \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +> 3 +642c646 +< Memory usage before: 747&484; after: 581&481; still untouched: 1492 +--- +> Memory usage before: 1090&483; after: 842&480; still untouched: 1989 +647c651,652 +< ### internal vertical mode entered at line 150 (\output routine) +--- +> ### internal vertical mode entered at line 150 (\output +> routine) +689c694 +< \special{^^80-1000.0pt} +--- +> \special{€-1000.0pt} +693,694c698,699 +< \insert100, natural size 535.4; split(1.0 plus 43.0,-2.0); float cost 10 +< 0 +--- +> \insert100Y, natural size 535.4; split(1.0 plus 43.0,-2.0); float cost 1 +> 00 +701c706 +< \insert200, natural size 2.0; split(2.0,-1.0); float cost 100 +--- +> \insert200Y, natural size 2.0; split(2.0,-1.0); float cost 100 +714,715c719,720 +< \insert200, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +< 3 +--- +> \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +> 3 +815c820 +< Memory usage before: 475&470; after: 290&466; still untouched: 1473 +--- +> Memory usage before: 694&469; after: 410&465; still untouched: 1970 +820c825,826 +< ### internal vertical mode entered at line 150 (\output routine) +--- +> ### internal vertical mode entered at line 150 (\output +> routine) +915c921 +< Memory usage before: 218&459; after: 149&458; still untouched: 1473 +--- +> Memory usage before: 308&458; after: 198&457; still untouched: 1970 +920c926,927 +< ### internal vertical mode entered at line 150 (\output routine) +--- +> ### internal vertical mode entered at line 150 (\output +> routine) +1070c1077 +< Memory usage before: 118&328; after: 102&328; still untouched: 1473 +--- +> Memory usage before: 150&327; after: 126&327; still untouched: 1970 +1405c1412 +< \vbox(16383.99998+0.0)x1000.0, glue set 16342.0fil +--- +> \vbox(16383.99998+0.0)x1000.0, glue set 16341.99998fil +1504a1512 +> ..\displace 0.0 +1511c1519 +< Memory usage before: 990&376; after: 584&370; still untouched: 735 +--- +> Memory usage before: 1490&375; after: 842&369; still untouched: 1970 +1954c1962 +< (tripos.tex +--- +> (./tripos.tex +2018c2026 +< \vbox(16383.99998+1.0)x100.0, glue set 16239.0fil +--- +> \vbox(16383.99998+1.0)x100.0, glue set 16238.99998fil +2048,2049c2056,2057 +< ..\rip ^^82 (ligature CA) +< ..\rip ^^82 (ligature CA) +--- +> ..\rip ‚ (ligature CA) +> ..\rip ‚ (ligature CA) +2189c2197 +< Memory usage before: 950&531; after: 546&448; still untouched: 706 +--- +> Memory usage before: 1458&530; after: 808&447; still untouched: 1941 +2397c2405 +< ! Improper alphabetic constant. +--- +> ! Improper alphabetic or KANJI constant. +2533c2541 +< \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil +--- +> \vbox(16383.99998+0.0)x20.0, glue set 16330.99998fil +2575c2583 +< Memory usage before: 339&413; after: 236&405; still untouched: 706 +--- +> Memory usage before: 493&411; after: 327&403; still untouched: 1941 +2830c2838 +< Since I expected to read a number between 0 and 15, +--- +> Since I expected to read a number between 0 and 255, +3051c3059 +< \insert0, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 +--- +> \insert0Y, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 +3054c3062 +< .\fam0 ^^c8 +--- +> .\fam0 ì +3143a3152 +> ....\displace 0.0 +3235c3244 +< ! \textfont 0 is undefined (character ^^c8). +--- +> ! \textfont 0 is undefined (character ì ©. +3326c3335 +< \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil +--- +> \vbox(10000.0+2.0)x28.0, glue set 9737.58742fil +3411c3420 +< p ^^82 +--- +> p ‚ +3547a3557 +> .........\displace 0.0 +3616c3626 +< Memory usage before: 2170&521; after: 1181&459; still untouched: 175 +--- +> Memory usage before: 3263&519; after: 1743&457; still untouched: 483 +3864c3874 +< \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil +--- +> \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil +3951c3961 +< Memory usage before: 640&415; after: 397&410; still untouched: 175 +--- +> Memory usage before: 959&413; after: 573&408; still untouched: 483 +3985c3995 +< ^^82 +--- +> ‚ +3991c4001 +< []\ip A ^^82 +--- +> []\ip A ‚ +4034c4044 +< \vbox(16383.99998+0.0)x8236.0, glue set 16344.0fil +--- +> \vbox(16383.99998+0.0)x8236.0, glue set 16343.99998fil +4041c4051 +< ..\ip ^^82 +--- +> ..\ip ‚ +4053c4063 +< Memory usage before: 235&401; after: 178&399; still untouched: 175 +--- +> Memory usage before: 342&399; after: 248&397; still untouched: 483 +4420c4430 +< \vbox(16383.99998+0.0)x100.0, glue set 16332.0fil +--- +> \vbox(16383.99998+0.0)x100.0, glue set 16331.99998fil +4506c4516 +< Memory usage before: 651&432; after: 417&418; still untouched: 175 +--- +> Memory usage before: 992&431; after: 598&417; still untouched: 483 +4742c4752,4753 +< \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil +--- +> \vbox(16383.99998+0.0)x205.12613, glue set 16343.99998fil, yoko directio +> n +4828c4839 +< Memory usage before: 776&458; after: 464&452; still untouched: 175 +--- +> Memory usage before: 1174&457; after: 676&451; still untouched: 483 +4881,4888d4891 +< ! Bad number (16). +< <to be read again> +< = +< l.346 ...ewlinechar}\textfont16= +< \relax +< Since I expected to read a number between 0 and 15, +< I changed this one to zero. +< +5700c5703 +< ! \textfont 0 is undefined (character ^^c8). +--- +> ! \textfont 0 is undefined (character ì ©. +6380c6383 +< (tripos.tex +--- +> (./tripos.tex +6501c6504 +< l.429 ...^^M=13 \def^^M{\relax}# +--- +> l.429 ...^^M=13 \defqqM{\relax}# +6595c6598 +< Memory usage before: 819&428; after: 720&426; still untouched: 175 +--- +> Memory usage before: 1220&428; after: 1070&426; still untouched: 483 +7155c7158 +< Memory usage before: 895&439; after: 290&420; still untouched: 175 +--- +> Memory usage before: 1336&439; after: 392&420; still untouched: 483 +7288c7291 +< Memory usage before: 334&431; after: 292&418; still untouched: 175 +--- +> Memory usage before: 456&431; after: 394&418; still untouched: 483 +7296,7299c7299,7302 +< 47 strings out of 1674 +< 253 string characters out of 8354 +< 2825 words of memory out of 3000 +< 372 multiletter control sequences out of 2100 +--- +> 44 strings out of 1690 +> 261 string characters out of 8333 +> 4017 words of memory out of 4500 +> 424 multiletter control sequences out of 15000+0 +7301c7304 +< 2 hyphenation exceptions out of 307 +--- +> 1 hyphenation exception out of 659 ++ eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi +++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi ++ diff SRCDIR/triptrap/trip.typ cuptrip.typ +1c1 +< This is DVItype, Version 3.6 +--- +> This is DVItype, Version 3.6 (TeX Live 2012) +9c9 +< ' TeX output 2008.03.15:0223' +--- +> ' TeX output 2011.08.23:2209' +419c419 +< 1121: down4 639342208 +--- +> 1121: down4 639342177 +1087,1088c1087,1088 +< 2535: y4 203921760 +< 2540: y0 203921760 +--- +> 2535: y4 203921756 +> 2540: y0 203921756 ++ echo '*** TRIP test for e-upTeX in extended mode ***.' +*** TRIP test for e-upTeX in extended mode ***. ++ rm -f trip.log ++ ./euptex --progname=eupinitex --ini ++ sed 's/, yoko direction//;s/yoko direction, //' trip.log ++ diff SRCDIR/triptrap/tripin.log xuptripin.log +1,11c1,4 +< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 +< **\input trip +< (trip.tex +< ! Bad character code (256). +< <to be read again> +< - +< l.26 \nonstopmode\lccode256- +< 0\mathchardef\a="8000\def\a{ SC... +< A character number must be between 0 and 255. +< I changed this one to zero. +< +--- +> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (INITEX) 23 AUG 2011 22:09 +> entering extended mode +> ***\input trip +> (./trip.tex +36,41d28 +< ! Bad register code (256). +< l.29 ...{1} \toksdef\tokens=256 +< \show\errorstopmode +< A register number must be between 0 and 255. +< I changed this one to zero. +< +91c78,79 +< ### horizontal mode entered at line 77 (language255:hyphenmin1,63) +--- +> ### horizontal mode entered at line 77 (language255:hyph +> enmin1,63) +450,453c438,441 +< (preloaded format=trip 2008.3.15) +< 1326 strings of total length 23646 +< 471 memory locations dumped; current usage is 96&278 +< 341 multiletter control sequences +--- +> (format=trip 2011.8.23) +> 1610 strings of total length 27667 +> 536 memory locations dumped; current usage is 157&278 +> 465 multiletter control sequences +461c449 +< Hyphenation trie of length 273 has 9 ops out of 500 +--- +> Hyphenation trie of length 273 has 9 ops out of 35111 ++ rm -f trip.log ++ ./euptex --progname=euptex ++ sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log ++ diff SRCDIR/triptrap/trip.fot xuptrip.fot +1,3c1,3 +< This is TeX, Version 3.1415926 (INITEX) +< ** &trip trip +< (trip.tex ## +--- +> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) +> **entering extended mode +> ## (./trip.tex +17c17 +< Memory usage before: 159&313; after: 102&278; still untouched: 1613 +--- +> Memory usage before: 194&313; after: 118&278; still untouched: 2109 +75c75 +< Memory usage before: 334&431; after: 292&418; still untouched: 175 +--- +> Memory usage before: 456&431; after: 394&418; still untouched: 483 +77a78,80 +> +> ### semi simple group (level 1) entered at line 429 (begingroup) +> ### bottom level ++ diff SRCDIR/triptrap/trip.log xuptrip.log +1,3c1,4 +< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 +< ** &trip trip +< (trip.tex ## +--- +> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (format=trip 2011.8.23) 23 AUG 2011 22:09 +> entering extended mode +> **&trip \toksdef\tokens=0 \input trip +> (./trip.tex +58a60,63 +> \openout0 = `8terminal.tex'. +> +> \openout10 = `tripos.tex'. +> +73c78 +< Memory usage before: 159&313; after: 102&278; still untouched: 1613 +--- +> Memory usage before: 194&313; after: 118&278; still untouched: 2109 +385,386c390,391 +< \insert100, natural size 803.09999; split(1.0 plus 43.0,-2.0); float cos +< t 100 +--- +> \insert100Y, natural size 803.09999; split(1.0 plus 43.0,-2.0); float co +> st 100 +426c431 +< \insert200, natural size 400.0; split(0.0,-2.0); float cost 100 +--- +> \insert200Y, natural size 400.0; split(0.0,-2.0); float cost 100 +441c446 +< \insert200, natural size 400.0; split(1.0,-1.0); float cost 100 +--- +> \insert200Y, natural size 400.0; split(1.0,-1.0); float cost 100 +456c461 +< \insert200, natural size 400.0; split(2.0,-1.0); float cost 100 +--- +> \insert200Y, natural size 400.0; split(2.0,-1.0); float cost 100 +474c479 +< \special{^^80-1000.0pt} +--- +> \special{€-1000.0pt} +483,484c488,489 +< \insert200, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +< 3 +--- +> \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +> 3 +642c647 +< Memory usage before: 747&484; after: 581&481; still untouched: 1492 +--- +> Memory usage before: 1090&483; after: 842&480; still untouched: 1989 +647c652,653 +< ### internal vertical mode entered at line 150 (\output routine) +--- +> ### internal vertical mode entered at line 150 (\output +> routine) +689c695 +< \special{^^80-1000.0pt} +--- +> \special{€-1000.0pt} +693,694c699,700 +< \insert100, natural size 535.4; split(1.0 plus 43.0,-2.0); float cost 10 +< 0 +--- +> \insert100Y, natural size 535.4; split(1.0 plus 43.0,-2.0); float cost 1 +> 00 +701c707 +< \insert200, natural size 2.0; split(2.0,-1.0); float cost 100 +--- +> \insert200Y, natural size 2.0; split(2.0,-1.0); float cost 100 +714,715c720,721 +< \insert200, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +< 3 +--- +> \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +> 3 +815c821 +< Memory usage before: 475&470; after: 290&466; still untouched: 1473 +--- +> Memory usage before: 694&469; after: 410&465; still untouched: 1970 +820c826,827 +< ### internal vertical mode entered at line 150 (\output routine) +--- +> ### internal vertical mode entered at line 150 (\output +> routine) +915c922 +< Memory usage before: 218&459; after: 149&458; still untouched: 1473 +--- +> Memory usage before: 308&458; after: 198&457; still untouched: 1970 +920c927,928 +< ### internal vertical mode entered at line 150 (\output routine) +--- +> ### internal vertical mode entered at line 150 (\output +> routine) +1070c1078 +< Memory usage before: 118&328; after: 102&328; still untouched: 1473 +--- +> Memory usage before: 150&327; after: 126&327; still untouched: 1970 +1405c1413 +< \vbox(16383.99998+0.0)x1000.0, glue set 16342.0fil +--- +> \vbox(16383.99998+0.0)x1000.0, glue set 16341.99998fil +1504a1513 +> ..\displace 0.0 +1511c1520 +< Memory usage before: 990&376; after: 584&370; still untouched: 735 +--- +> Memory usage before: 1490&375; after: 842&369; still untouched: 1970 +1769d1777 +< {restoring \fam=-1} +1779d1786 +< {restoring \displayindent=0.0pt} +1833d1839 +< {restoring \fam=-1} +1954c1960 +< (tripos.tex +--- +> (./tripos.tex +2018c2024 +< \vbox(16383.99998+1.0)x100.0, glue set 16239.0fil +--- +> \vbox(16383.99998+1.0)x100.0, glue set 16238.99998fil +2048,2049c2054,2055 +< ..\rip ^^82 (ligature CA) +< ..\rip ^^82 (ligature CA) +--- +> ..\rip ‚ (ligature CA) +> ..\rip ‚ (ligature CA) +2135c2141 +< .\hbox(0.0+0.0)x0.0, shifted 50.0 +--- +> .\hbox(0.0+0.0)x0.0, shifted 50.0, display +2138c2144 +< .\hbox(0.0+0.0)x0.0, shifted 100.0 +--- +> .\hbox(0.0+0.0)x0.0, shifted 100.0, display +2189c2195 +< Memory usage before: 950&531; after: 546&448; still untouched: 706 +--- +> Memory usage before: 1458&530; after: 808&447; still untouched: 1941 +2397c2403 +< ! Improper alphabetic constant. +--- +> ! Improper alphabetic or KANJI constant. +2533c2539 +< \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil +--- +> \vbox(16383.99998+0.0)x20.0, glue set 16330.99998fil +2570c2576,2577 +< .\hbox(0.0+0.0)x15.0, glue set 0.1875, shifted 5.0 +--- +> .\hbox(0.0+0.0)x15.0, glue set 0.1875, shifted 5.0, display, yoko direct +> ion +2575c2582 +< Memory usage before: 339&413; after: 236&405; still untouched: 706 +--- +> Memory usage before: 493&411; after: 327&403; still untouched: 1941 +2830c2837 +< Since I expected to read a number between 0 and 15, +--- +> Since I expected to read a number between 0 and 255, +2835d2841 +< {restoring current font=\ip} +3051c3057 +< \insert0, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 +--- +> \insert0Y, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 +3054c3060 +< .\fam0 ^^c8 +--- +> .\fam0 ì +3143a3150 +> ....\displace 0.0 +3223d3229 +< {restoring \fam=-1} +3235c3241 +< ! \textfont 0 is undefined (character ^^c8). +--- +> ! \textfont 0 is undefined (character ì ©. +3326c3332 +< \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil +--- +> \vbox(10000.0+2.0)x28.0, glue set 9737.58742fil +3372c3378 +< .\hbox(68.26251+98.15005)x19.0, glue set - 1.0, shifted 9.0 +--- +> .\hbox(68.26251+98.15005)x19.0, glue set - 1.0, shifted 9.0, display +3411c3417 +< p ^^82 +--- +> p ‚ +3547a3554 +> .........\displace 0.0 +3557c3564 +< .\hbox(20.5+50.80002)x8.27895, shifted 19.72105 +--- +> .\hbox(20.5+50.80002)x8.27895, shifted 19.72105, display +3616c3623 +< Memory usage before: 2170&521; after: 1181&459; still untouched: 175 +--- +> Memory usage before: 3263&519; after: 1743&457; still untouched: 483 +3766d3772 +< {restoring \fam=-1} +3839d3844 +< {restoring \fam=-1} +3864c3869 +< \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil +--- +> \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil +3895c3900 +< ..\hbox(12.0+4.0)x8.1778 +--- +> ..\hbox(12.0+4.0)x8.1778, display +3917c3922 +< ..\hbox(0.0+13.00002)x-0.1778, glue set - 57.67767fil +--- +> ..\hbox(0.0+13.00002)x-0.1778, glue set - 57.67767fil, display +3925c3930 +< ....\hbox(7.0+1.0)x5.0, shifted 47.5 +--- +> ....\hbox(7.0+1.0)x5.0, shifted 47.5, display +3951c3956 +< Memory usage before: 640&415; after: 397&410; still untouched: 175 +--- +> Memory usage before: 959&413; after: 573&408; still untouched: 483 +3985c3990 +< ^^82 +--- +> ‚ +3991c3996 +< []\ip A ^^82 +--- +> []\ip A ‚ +4011d4015 +< {restoring \fam=-1} +4034c4038 +< \vbox(16383.99998+0.0)x8236.0, glue set 16344.0fil +--- +> \vbox(16383.99998+0.0)x8236.0, glue set 16343.99998fil +4041c4045 +< ..\ip ^^82 +--- +> ..\ip ‚ +4047c4051 +< .\hbox(0.0+0.0)x1009.0, shifted 7227.0 +--- +> .\hbox(0.0+0.0)x1009.0, shifted 7227.0, display +4051c4055 +< .\hbox(0.0+0.0)x-7127.0, shifted 7227.0 +--- +> .\hbox(0.0+0.0)x-7127.0, shifted 7227.0, display +4053c4057 +< Memory usage before: 235&401; after: 178&399; still untouched: 175 +--- +> Memory usage before: 342&399; after: 248&397; still untouched: 483 +4420c4424 +< \vbox(16383.99998+0.0)x100.0, glue set 16332.0fil +--- +> \vbox(16383.99998+0.0)x100.0, glue set 16331.99998fil +4506c4510 +< Memory usage before: 651&432; after: 417&418; still untouched: 175 +--- +> Memory usage before: 992&431; after: 598&417; still untouched: 483 +4742c4746,4747 +< \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil +--- +> \vbox(16383.99998+0.0)x205.12613, glue set 16343.99998fil, yoko directio +> n +4828c4833 +< Memory usage before: 776&458; after: 464&452; still untouched: 175 +--- +> Memory usage before: 1174&457; after: 676&451; still untouched: 483 +4845c4850 +< I'll pretend you didn't say \long or \outer or \global. +--- +> I'll pretend you didn't say \long or \outer or \global or \protected. +4881,4888d4885 +< ! Bad number (16). +< <to be read again> +< = +< l.346 ...ewlinechar}\textfont16= +< \relax +< Since I expected to read a number between 0 and 15, +< I changed this one to zero. +< +5700c5697 +< ! \textfont 0 is undefined (character ^^c8). +--- +> ! \textfont 0 is undefined (character ì ©. +6380c6377 +< (tripos.tex +--- +> (./tripos.tex +6501c6498 +< l.429 ...^^M=13 \def^^M{\relax}# +--- +> l.429 ...^^M=13 \defqqM{\relax}# +6595c6592 +< Memory usage before: 819&428; after: 720&426; still untouched: 175 +--- +> Memory usage before: 1220&428; after: 1070&426; still untouched: 483 +7155c7152 +< Memory usage before: 895&439; after: 290&420; still untouched: 175 +--- +> Memory usage before: 1336&439; after: 392&420; still untouched: 483 +7288c7285 +< Memory usage before: 334&431; after: 292&418; still untouched: 175 +--- +> Memory usage before: 456&431; after: 394&418; still untouched: 483 +7291a7289,7291 +> +> ### semi simple group (level 1) entered at line 429 (begingroup) +> ### bottom level +7296,7299c7296,7299 +< 47 strings out of 1674 +< 253 string characters out of 8354 +< 2825 words of memory out of 3000 +< 372 multiletter control sequences out of 2100 +--- +> 44 strings out of 1690 +> 261 string characters out of 8333 +> 4017 words of memory out of 4500 +> 496 multiletter control sequences out of 15000+0 +7301,7302c7301,7302 +< 2 hyphenation exceptions out of 307 +< 7i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s +--- +> 1 hyphenation exception out of 659 +> 7i,7n,9p,136b,40s stack positions out of 200i,40n,60p,500b,600s ++ eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi +++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi ++ diff SRCDIR/triptrap/trip.typ xuptrip.typ +1c1 +< This is DVItype, Version 3.6 +--- +> This is DVItype, Version 3.6 (TeX Live 2012) +9c9 +< ' TeX output 2008.03.15:0223' +--- +> ' TeX output 2011.08.23:2209' +419c419 +< 1121: down4 639342208 +--- +> 1121: down4 639342177 +1087,1088c1087,1088 +< 2535: y4 203921760 +< 2540: y0 203921760 +--- +> 2535: y4 203921756 +> 2540: y0 203921756 ++ echo '*** e-TeX specific part of e-TRIP test for e-upTeX ***.' +*** e-TeX specific part of e-TRIP test for e-upTeX ***. ++ ./pltotf SRCDIR/etexdir/etrip/etrip.pl etrip.tfm ++ ./tftopl ./etrip.tfm etrip.pl ++ diff SRCDIR/etexdir/etrip/etrip.pl etrip.pl ++ ln -s SRCDIR/eptexdir/eptrip/etrip.tex . ++ ./euptex --progname=eupinitex --ini ++ sed 's/, yoko direction//;s/yoko direction, //' etrip.log ++ diff SRCDIR/etexdir/etrip/etripin.log euptripin.log +1c1 +< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX) 7 APR 2011 11:46 +--- +> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (INITEX) 23 AUG 2011 22:09 +26,29c26,29 +< (format=etrip 2011.4.7) +< 1490 strings of total length 26209 +< 280 memory locations dumped; current usage is 36&166 +< 408 multiletter control sequences +--- +> (format=etrip 2011.8.23) +> 1611 strings of total length 27698 +> 283 memory locations dumped; current usage is 40&166 +> 465 multiletter control sequences ++ ./euptex --progname=euptex ++ sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' etrip.log ++ diff SRCDIR/etexdir/etrip/etrip.fot euptrip.fot +1c1 +< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) +--- +> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) ++ diff SRCDIR/eptexdir/eptrip/etrip.log euptrip.log +1c1 +< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 11:46 +--- +> This is e-upTeX, Version 3.1415926-p3.2-u0.30-110415-2.3 (utf8.uptex) (TeX Live 2012) (format=etrip 2011.8.23) 23 AUG 2011 22:09 +4c4 +< (etrip.tex e-IniTeX: e-Trip format loaded. +--- +> (./etrip.tex e-IniTeX: e-Trip format loaded. +671,672c671,674 +< Memory usage before: 50&182; after: 36&176; still untouched: 680 +< (etrip.out) ( +--- +> \openout1 = `etrip.out'. +> +> Memory usage before: 57&183; after: 40&177; still untouched: 2171 +> (./etrip.out) ( +764c766 +< % end of outer \scantokens) (etrip.out +--- +> % end of outer \scantokens) (./etrip.out +2184,2190c2186 +< A character number must be between 0 and 255. +< I changed this one to zero. +< +< ! Bad character code (256). +< l.674 \iffontchar\font 256 +< \else \fi % <== bad character... +< A character number must be between 0 and 255. +--- +> A character number must be between 0 and 255, or KANJI code. +2697c2693 +< Memory usage before: 51&320; after: 44&320; still untouched: 680 +--- +> Memory usage before: 58&321; after: 48&321; still untouched: 1171 +2699c2695 +< Memory usage before: 51&320; after: 44&320; still untouched: 680 +--- +> Memory usage before: 58&321; after: 48&321; still untouched: 1171 +4273,4276c4269,4272 +< 22 strings out of 1665 +< 132 string characters out of 8410 +< 2661 words of memory out of 3000 +< 408 multiletter control sequences out of 2100 +--- +> 18 strings out of 1689 +> 140 string characters out of 8302 +> 3329 words of memory out of 4500 +> 466 multiletter control sequences out of 15000+0 +4278c4274 +< 10 hyphenation exceptions out of 307 +--- +> 9 hyphenation exceptions out of 659 ++ eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' etrip.dvi +++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' etrip.dvi ++ diff SRCDIR/etexdir/etrip/etrip.typ euptrip.typ +1c1 +< This is DVItype, Version 3.6 +--- +> This is DVItype, Version 3.6 (TeX Live 2012) +9c9 +< ' TeX output 2011.04.07:1213' +--- +> ' TeX output 2011.08.23:2209' ++ : +PASS: euptexdir/euptrip.test diff --git a/Build/source/texk/web2c/euptexdir/euptrip/texmf.cnf b/Build/source/texk/web2c/euptexdir/euptrip/texmf.cnf new file mode 100644 index 00000000000..61739d6d58c --- /dev/null +++ b/Build/source/texk/web2c/euptexdir/euptrip/texmf.cnf @@ -0,0 +1,41 @@ +% euptexdir/euptrip/texmf.cnf -- configuration for the e-uptrip test. + +% These values apply to all the programs, and they are necessary for any +% kind of reasonable diff. +error_line = 64 +half_error_line = 32 +max_print_line = 72 + +% e-upTeX. +mem_bot = 1 +main_memory = 4500 +max_strings = 3300 +pool_size = 36000 + +string_vacancies = 8000 + +% TeX end e-TeX. +font_mem_size = 20000 +font_max = 75 +stack_size = 200 +nest_size = 40 +buf_size = 500 +save_size = 600 +dvi_buf_size = 800 +% Although hyph_size is settable, it can't be <hyph_prime, which is 607, +% and the original trip setting is 307, so no point in changing the default. + +% Avoid running any MakeTeX* program. +MAKETEXTFM = 0 +MAKETEXTEX = 0 +MAKETEXMF = 0 + +% Search paths. +% (e)trip.tex: +TEXINPUTS = . +% (e)trip.tfm: +TFMFONTS = . +% (e)trip.fmt: +TEXFORMATS = . +% etex.pool: +TEXPOOL = . diff --git a/Build/source/texk/web2c/triptrap-sh b/Build/source/texk/web2c/triptrap-sh index a60e9b2a41c..8e2a15bbe66 100755 --- a/Build/source/texk/web2c/triptrap-sh +++ b/Build/source/texk/web2c/triptrap-sh @@ -25,6 +25,8 @@ do 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';; + uptrip.diffs) tst=uptexdir/uptrip; msg='TRIP test for upTeX';; + euptrip.diffs) tst=euptexdir/euptrip; msg='e-TRIP test for e-upTeX';; *) echo "$me: Bad argument \`$file'"; exit 1;; esac echo ">>> Running $msg." @@ -38,6 +40,8 @@ do -e "s%$srcdir/etexdir%SRCDIR/etexdir%" \ -e "s%$srcdir/ptexdir%SRCDIR/ptexdir%" \ -e "s%$srcdir/eptexdir%SRCDIR/eptexdir%" \ + -e "s%$srcdir/uptexdir%SRCDIR/uptexdir%" \ + -e "s%$srcdir/euptexdir%SRCDIR/euptexdir%" \ $tmp >>$file echo "PASS: $tst.test" >>$file rm -f $tmp diff --git a/Build/source/texk/web2c/uptexdir/COPYRIGHT b/Build/source/texk/web2c/uptexdir/COPYRIGHT new file mode 100644 index 00000000000..9f2495ecb04 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/COPYRIGHT @@ -0,0 +1,25 @@ +Copyright (C) 2009 ASCII MEDIA WORKS. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the author may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Build/source/texk/web2c/uptexdir/COPYRIGHT.jis b/Build/source/texk/web2c/uptexdir/COPYRIGHT.jis new file mode 100644 index 00000000000..fb491511cc7 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/COPYRIGHT.jis @@ -0,0 +1,32 @@ +($BCm(B) $B0J2<$O!"1QJ8$N7@Ls>r9`$rF|K\8l$KK]Lu$7$?$b$N$G$"$k!#F|K\8lLu$H1Q(B +$B8lI=5-$N4V$Ksrsw$,$"$C$?>l9g$K$O!"7@Ls>r7o$O1Q8lI=5-$K$h$k7@Ls>r9`$K=>(B +$B$&!#(B + +$B!ZCx:n8"I=<(![(B +Copyright (C) 2009 ASCII MEDIA WORKS. +All rights reserved. + +$B!Z7@Ls>r7o![(B +$B2~JQ$NM-L5$K$+$+$o$i$:!"K\%=%U%H%&%'%"$N%=!<%9%3!<%I5Z$S%P%$%J%j!<%3!<(B +$B%I7A<0$K$h$k:FHRI[5Z$S;HMQ$O!"<!$N7@Ls>r7o$N2<$K5vBz$5$l$k!#(B +1. $B%=!<%9%3!<%I$N:FHRI[$K:]$7$F$O!">e5-$N!ZCx:n8"I=<(![!"$3$N!Z7@Ls>r(B + $B7o![5Z$S<!$N!ZLH@U>r9`![$NI=5-$r!"0z$-B3$-0];}$7$FL@5-$7$J$1$l$P$J(B + $B$i$J$$!#(B +2. $B%P%$%J%j!<7A<0$K$h$k:FHRI[$K:]$7$F$O!">e5-$N!ZCx:n8"I=<(![!"$3$N(B + $B!Z7@Ls>r7o![5Z$S<!$N!ZLH@U>r9`![$r!":FHRI[$K:]$7Ds6!$9$k@bL@=q5Z$S(B + $B$=$NB>$N4XO";qNA$K2~$a$FL@5-$7$J$1$l$P$J$i$J$$!#(B +3. $BFCJL$J;vA0$N=qLL$K$h$k5vBz$,$J$$8B$j!"K\%=%U%H%&%'%"$+$iGI@8$7$?@=(B + $BIJ$r?d>)Kt$O@kEA$9$k$?$a$K!"Cx:n8"<TL>$O;HMQ$7$F$O$J$i$J$$!#(B + +$B!ZLH@U>r9`![(B +$BK\%=%U%H%&%'%"$O!"Cx:n8"<T$K$h$j!"!V8=>uM-;Q$N$^$^!J$=$N$^$^$N7A$G!K!W(B +$BDs6!$5$l$k$b$N$G$"$j!">&IJ@-Kt$OFCDjL\E*$X$NE,9g@-$K4X$9$kL[<(E*J]>Z$J(B +$B$I!"L@<(Kt$OL[<($NJ]>Z$rLd$o$:!"$$$+$J$kJ]>Z$r$b9T$&$b$N$G$O$J$$!#(B +$B$$$+$J$kM}M3$K$h$C$F$b!"$^$?!"7@Ls@UG$!"873J@UG$Kt$O!J2a<:$K$h$k$b$N$r(B +$B4^$`!KITK!9T0Y@UG$$rLd$o$:$I$N$h$&$J@UG$$NM}O@$K$h$C$F$b!"Cx:n8"<T$O!"(B +$B$$$+$J$k>l9g$b!"K\%=%U%H%&%'%"$r;HMQ$9$k$3$H$K$h$jH/@8$9$k!"$"$i$f$kD>(B +$B@\B;32!"4V@\B;32!"6vH/B;32!"FCJLB;32!"D(H3E*B;32$"$k$$$OGI@8E*B;32!JBe(B +$BBX@=IJ!&BeBX%5!<%S%9$ND4C#!";HMQMx1W!"%G!<%?Kt$O<}1W$K4X$9$kB;<:!"1D6H(B +$BCfCG$K$h$kB;<:$J$I!K$K$D$$$F2?$i$N@UG$$bIi$o$J$$!#$3$l$O!"K\%=%U%H%&%'(B +$B%"$r;HMQ$9$k$3$H$K$h$j!"$3$l$i$NB;32$,H/@8$9$k2DG=@-$K$D$$$F!"$"$i$+$8(B +$B$a<(:6$5$l$F$$$?>l9g$G$"$C$F$bF1MM$G$"$k!#(B diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog new file mode 100644 index 00000000000..15e1e82a1e7 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -0,0 +1,6 @@ +2011-08-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported upTeX into TeX Live, based on the W32TeX version + from Akira Kakuto <kakuto@fuk.kindai.ac.jp> + and on the TL patches in tlsvn23478-uptex-1108111825.tar.xz + from Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>. diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am index 541f69547e6..98b589bb106 100644 --- a/Build/source/texk/web2c/uptexdir/am/uptex.am +++ b/Build/source/texk/web2c/uptexdir/am/uptex.am @@ -10,6 +10,18 @@ up_tangle = WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) $(TANGLE) upweb_programs = upbibtex updvitype uppltotf uptftopl +# upTeX Tests +uptex_tests = uptexdir/uptrip.test +upweb_tests = \ + uptexdir/upbibtex.test \ + uptexdir/updvitype.test \ + uptexdir/uppltotf.test \ + uptexdir/uptftopl.test + +EXTRA_DIST += $(uptex_tests) $(upweb_tests) +DISTCLEANFILES += $(upweb_programs:=.c) $(upweb_programs:=.h) \ + $(upweb_programs:=.p) $(upweb_programs:=-web2c) $(upweb_programs:=.web) + ## libukanji.a for upTeX and e-upTeX ## EXTRA_LIBRARIES += libukanji.a @@ -156,3 +168,42 @@ uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch ptexdir/ptftopl.ch $(tie) -m uptftopl.web tftopl.web tftopl.ch ptexdir/ptftopl.ch EXTRA_DIST += ptexdir/ptftopl.ch uptexdir/uptftopl.ch +## +EXTRA_DIST += \ + uptexdir/COPYRIGHT \ + uptexdir/COPYRIGHT.jis \ + uptexdir/ChangeLog + +if UPTEX +TESTS += $(uptex_tests) +check_PROGRAMS += dvitype pltotf tftopl +TRIPTRAP += uptrip.diffs +TRIPTRAP_CLEAN += uptrip-clean +endif UPTEX +if UPWEB +TESTS += $(upweb_tests) +endif UPWEB + +## Test data and results +## +## uptexdir/upbibtex.test +DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg +## uptexdir/updvitype.test +DISTCLEANFILES += tests/xstory.dvityp tests/xpagenum.typ +## uptexdir/uppltotf.test +DISTCLEANFILES += tests/xcmr10.tfm +## uptexdir/uptftopl.test +DISTCLEANFILES += tests/xcmr10.pl +## uptexdir/uptrip.test +EXTRA_DIST += uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf +uptrip.diffs: uptex$(EXEEXT) + $(triptrap_diffs) $@ +.PHONY: uptrip-clean +uptrip-clean: + rm -f trip.tfm trip.pl trip.tex trip.fmt uptripin.fot uptripin.log + rm -f uptrip.fot uptrip.log trip.log trip.dvi trip.typ + rm -f uptrip.fot uptrip.log uptrip.dvi uptrip.typ + rm -f tripos.tex 8terminal.tex + rm -rf tfm +DISTCLEANFILES += uptrip.diffs + diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.test b/Build/source/texk/web2c/uptexdir/upbibtex.test new file mode 100755 index 00000000000..ba59d7ad4e8 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/upbibtex.test @@ -0,0 +1,14 @@ +#! /bin/sh + +# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +test -d tests || mkdir -p tests + +cp $srcdir/tests/exampl.aux tests/xexampl.aux + +TEXMFCNF=$srcdir/../kpathsea \ + BSTINPUTS=$srcdir/tests \ + BIBINPUTS=$srcdir/tests \ + ./upbibtex tests/xexampl || exit 1 + diff --git a/Build/source/texk/web2c/uptexdir/updvitype.test b/Build/source/texk/web2c/uptexdir/updvitype.test new file mode 100755 index 00000000000..4931fbdbe33 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/updvitype.test @@ -0,0 +1,19 @@ +#! /bin/sh + +# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +test -d tests || mkdir -p tests + +if tfmpath=`$KPSEWHICH cmbx10.tfm`; then + + TEXMFCNF=$srcdir/../kpathsea \ + TFMFONTS=`dirname $tfmpath` \ + ./updvitype -show-opcodes $srcdir/tests/story >tests/xstory.dvityp || exit 1 + +fi + +TEXMFCNF=$srcdir/../kpathsea \ + TFMFONTS=$srcdir/tests \ + ./updvitype --p=\*.\*.2 $srcdir/tests/pagenum.dvi >tests/xpagenum.typ || exit 1 + diff --git a/Build/source/texk/web2c/uptexdir/uppltotf.test b/Build/source/texk/web2c/uptexdir/uppltotf.test new file mode 100755 index 00000000000..ae7d9663332 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/uppltotf.test @@ -0,0 +1,9 @@ +#! /bin/sh + +# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +test -d tests || mkdir -p tests + +./uppltotf -verbose $srcdir/tests/cmr10 tests/xcmr10 || exit 1 + diff --git a/Build/source/texk/web2c/uptexdir/uptftopl.test b/Build/source/texk/web2c/uptexdir/uptftopl.test new file mode 100755 index 00000000000..8628eb339dc --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/uptftopl.test @@ -0,0 +1,10 @@ +#! /bin/sh + +# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +test -d tests || mkdir -p tests + +TEXMFCNF=$srcdir/../kpathsea \ + ./uptftopl -verbose $srcdir/tests/cmr10 tests/xcmr10 || exit 1 + diff --git a/Build/source/texk/web2c/uptexdir/uptrip.test b/Build/source/texk/web2c/uptexdir/uptrip.test new file mode 100755 index 00000000000..e9976a5b128 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/uptrip.test @@ -0,0 +1,62 @@ +#! /bin/sh + +# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +testdir=$srcdir/triptrap +uptestdir=$srcdir/uptexdir/uptrip + +TEXMFCNF=$uptestdir; export TEXMFCNF + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" + +echo ">>> Running TRIP test for upTeX." >&2 +echo ">>> See $uptestdir/uptrip.diffs for example of acceptable diffs." >&2 + +rm -f trip.tfm trip.pl trip.tex trip.fmt trip.dvi \ + uptripin.fot uptripin.log uptrip.fot uptrip.log uptrip.typ \ + tripos.tex 8terminal.tex +rm -rf tfm + +# upTeX 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 upTeX ***." + +./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 +./uptex --progname=upinitex --ini <$testdir/trip1.in >uptripin.fot +sed "$P_SED1" trip.log > uptripin.log || exit 1 +diff $testdir/tripin.log uptripin.log + +# May as well test non-ini second time through. +rm -f trip.log +./uptex --progname=uptex <$testdir/trip2.in >uptrip.fot +sed "$P_SED1;$P_SED2" trip.log > uptrip.log +diff $testdir/trip.fot uptrip.fot + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log uptrip.log + +eval ./dvitype $dvitype_args trip.dvi >uptrip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ uptrip.typ + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + diff --git a/Build/source/texk/web2c/uptexdir/uptrip/texmf.cnf b/Build/source/texk/web2c/uptexdir/uptrip/texmf.cnf new file mode 100644 index 00000000000..bc7cde7871d --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/uptrip/texmf.cnf @@ -0,0 +1,41 @@ +% uptexdir/uptrip/texmf.cnf -- configuration for the uptrip test. + +% These values apply to all the programs, and they are necessary for any +% kind of reasonable diff. +error_line = 64 +half_error_line = 32 +max_print_line = 72 + +% upTeX. +mem_bot = 1 +main_memory = 4500 +max_strings = 3000 +pool_size = 40000 + +string_vacancies = 8000 + +font_mem_size = 20000 +font_max = 75 +stack_size = 200 +nest_size = 40 +buf_size = 500 +save_size = 600 +dvi_buf_size = 800 +% Although hyph_size is settable, it can't be <hyph_prime, which is 607, +% and the original trip setting is 307, so no point in changing the default. + +% Avoid running any MakeTeX* program. +MAKETEXTFM = 0 +MAKETEXTEX = 0 +MAKETEXMF = 0 + +% Search paths. +% trip.tex: +TEXINPUTS = . +% trip.tfm: +TFMFONTS = . +% trip.fmt: +TEXFORMATS = . +% tex.pool: +TEXPOOL = . + diff --git a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs new file mode 100644 index 00000000000..a02bf7d6558 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs @@ -0,0 +1,337 @@ +>>> Running TRIP test for upTeX. +>>> See SRCDIR/uptexdir/uptrip/uptrip.diffs for example of acceptable diffs. ++ echo '*** TRIP test for upTeX ***.' +*** TRIP test for upTeX ***. ++ ./pltotf SRCDIR/triptrap/trip.pl trip.tfm ++ ./tftopl ./trip.tfm trip.pl ++ diff SRCDIR/triptrap/trip.pl trip.pl ++ ln -s SRCDIR/triptrap/trip.tex . ++ rm -f trip.log ++ ./uptex --progname=upinitex --ini ++ sed 's/, yoko direction//;s/yoko direction, //' trip.log ++ diff SRCDIR/triptrap/tripin.log uptripin.log +1c1 +< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 +--- +> This is upTeX, Version 3.1415926-p3.2-u0.30 (utf8.uptex) (TeX Live 2012) (INITEX) 23 AUG 2011 21:31 +3,11c3 +< (trip.tex +< ! Bad character code (256). +< <to be read again> +< - +< l.26 \nonstopmode\lccode256- +< 0\mathchardef\a="8000\def\a{ SC... +< A character number must be between 0 and 255. +< I changed this one to zero. +< +--- +> (./trip.tex +91c83,84 +< ### horizontal mode entered at line 77 (language255:hyphenmin1,63) +--- +> ### horizontal mode entered at line 77 (language255:hyph +> enmin1,63) +450,453c443,446 +< (preloaded format=trip 2008.3.15) +< 1326 strings of total length 23646 +< 471 memory locations dumped; current usage is 96&278 +< 341 multiletter control sequences +--- +> (format=trip 2011.8.23) +> 1458 strings of total length 25415 +> 485 memory locations dumped; current usage is 106&278 +> 383 multiletter control sequences +461c454 +< Hyphenation trie of length 273 has 9 ops out of 500 +--- +> Hyphenation trie of length 273 has 9 ops out of 35111 ++ rm -f trip.log ++ ./uptex --progname=uptex ++ sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log ++ diff SRCDIR/triptrap/trip.fot uptrip.fot +1,3c1,2 +< This is TeX, Version 3.1415926 (INITEX) +< ** &trip trip +< (trip.tex ## +--- +> This is upTeX, Version 3.1415926-p3.2-u0.30 (utf8.uptex) (TeX Live 2012) +> **(./trip.tex ## +17c16 +< Memory usage before: 159&313; after: 102&278; still untouched: 1613 +--- +> Memory usage before: 190&313; after: 114&278; still untouched: 3113 +75c74 +< Memory usage before: 334&431; after: 292&418; still untouched: 175 +--- +> Memory usage before: 452&431; after: 390&418; still untouched: 241 ++ diff SRCDIR/triptrap/trip.log uptrip.log +1c1 +< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 +--- +> This is upTeX, Version 3.1415926-p3.2-u0.30 (utf8.uptex) (TeX Live 2012) (format=trip 2011.8.23) 23 AUG 2011 21:31 +3c3 +< (trip.tex ## +--- +> (./trip.tex ## +58a59,62 +> \openout0 = `8terminal.tex'. +> +> \openout10 = `tripos.tex'. +> +73c77 +< Memory usage before: 159&313; after: 102&278; still untouched: 1613 +--- +> Memory usage before: 190&313; after: 114&278; still untouched: 3113 +385,386c389,390 +< \insert100, natural size 803.09999; split(1.0 plus 43.0,-2.0); float cos +< t 100 +--- +> \insert100Y, natural size 803.09999; split(1.0 plus 43.0,-2.0); float co +> st 100 +426c430 +< \insert200, natural size 400.0; split(0.0,-2.0); float cost 100 +--- +> \insert200Y, natural size 400.0; split(0.0,-2.0); float cost 100 +441c445 +< \insert200, natural size 400.0; split(1.0,-1.0); float cost 100 +--- +> \insert200Y, natural size 400.0; split(1.0,-1.0); float cost 100 +456c460 +< \insert200, natural size 400.0; split(2.0,-1.0); float cost 100 +--- +> \insert200Y, natural size 400.0; split(2.0,-1.0); float cost 100 +474c478 +< \special{^^80-1000.0pt} +--- +> \special{€-1000.0pt} +483,484c487,488 +< \insert200, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +< 3 +--- +> \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +> 3 +642c646 +< Memory usage before: 747&484; after: 581&481; still untouched: 1492 +--- +> Memory usage before: 1086&483; after: 838&480; still untouched: 1993 +647c651,652 +< ### internal vertical mode entered at line 150 (\output routine) +--- +> ### internal vertical mode entered at line 150 (\output +> routine) +689c694 +< \special{^^80-1000.0pt} +--- +> \special{€-1000.0pt} +693,694c698,699 +< \insert100, natural size 535.4; split(1.0 plus 43.0,-2.0); float cost 10 +< 0 +--- +> \insert100Y, natural size 535.4; split(1.0 plus 43.0,-2.0); float cost 1 +> 00 +701c706 +< \insert200, natural size 2.0; split(2.0,-1.0); float cost 100 +--- +> \insert200Y, natural size 2.0; split(2.0,-1.0); float cost 100 +714,715c719,720 +< \insert200, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +< 3 +--- +> \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost +> 3 +815c820 +< Memory usage before: 475&470; after: 290&466; still untouched: 1473 +--- +> Memory usage before: 690&469; after: 406&465; still untouched: 1974 +820c825,826 +< ### internal vertical mode entered at line 150 (\output routine) +--- +> ### internal vertical mode entered at line 150 (\output +> routine) +915c921 +< Memory usage before: 218&459; after: 149&458; still untouched: 1473 +--- +> Memory usage before: 304&458; after: 194&457; still untouched: 1974 +920c926,927 +< ### internal vertical mode entered at line 150 (\output routine) +--- +> ### internal vertical mode entered at line 150 (\output +> routine) +1070c1077 +< Memory usage before: 118&328; after: 102&328; still untouched: 1473 +--- +> Memory usage before: 146&327; after: 122&327; still untouched: 1974 +1405c1412 +< \vbox(16383.99998+0.0)x1000.0, glue set 16342.0fil +--- +> \vbox(16383.99998+0.0)x1000.0, glue set 16341.99998fil +1504a1512 +> ..\displace 0.0 +1511c1519 +< Memory usage before: 990&376; after: 584&370; still untouched: 735 +--- +> Memory usage before: 1486&375; after: 838&369; still untouched: 1974 +1954c1962 +< (tripos.tex +--- +> (./tripos.tex +2018c2026 +< \vbox(16383.99998+1.0)x100.0, glue set 16239.0fil +--- +> \vbox(16383.99998+1.0)x100.0, glue set 16238.99998fil +2048,2049c2056,2057 +< ..\rip ^^82 (ligature CA) +< ..\rip ^^82 (ligature CA) +--- +> ..\rip ‚ (ligature CA) +> ..\rip ‚ (ligature CA) +2189c2197 +< Memory usage before: 950&531; after: 546&448; still untouched: 706 +--- +> Memory usage before: 1454&530; after: 804&447; still untouched: 1945 +2397c2405 +< ! Improper alphabetic constant. +--- +> ! Improper alphabetic or KANJI constant. +2533c2541 +< \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil +--- +> \vbox(16383.99998+0.0)x20.0, glue set 16330.99998fil +2575c2583 +< Memory usage before: 339&413; after: 236&405; still untouched: 706 +--- +> Memory usage before: 489&411; after: 323&403; still untouched: 1945 +3051c3059 +< \insert0, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 +--- +> \insert0Y, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 +3054c3062 +< .\fam0 ^^c8 +--- +> .\fam0 ì +3143a3152 +> ....\displace 0.0 +3235c3244 +< ! \textfont 0 is undefined (character ^^c8). +--- +> ! \textfont 0 is undefined (character ì ©. +3326c3335 +< \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil +--- +> \vbox(10000.0+2.0)x28.0, glue set 9737.58742fil +3411c3420 +< p ^^82 +--- +> p ‚ +3547a3557 +> .........\displace 0.0 +3616c3626 +< Memory usage before: 2170&521; after: 1181&459; still untouched: 175 +--- +> Memory usage before: 3259&519; after: 1739&457; still untouched: 241 +3864c3874 +< \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil +--- +> \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil +3951c3961 +< Memory usage before: 640&415; after: 397&410; still untouched: 175 +--- +> Memory usage before: 955&413; after: 569&408; still untouched: 241 +3985c3995 +< ^^82 +--- +> ‚ +3991c4001 +< []\ip A ^^82 +--- +> []\ip A ‚ +4034c4044 +< \vbox(16383.99998+0.0)x8236.0, glue set 16344.0fil +--- +> \vbox(16383.99998+0.0)x8236.0, glue set 16343.99998fil +4041c4051 +< ..\ip ^^82 +--- +> ..\ip ‚ +4053c4063 +< Memory usage before: 235&401; after: 178&399; still untouched: 175 +--- +> Memory usage before: 338&399; after: 244&397; still untouched: 241 +4420c4430 +< \vbox(16383.99998+0.0)x100.0, glue set 16332.0fil +--- +> \vbox(16383.99998+0.0)x100.0, glue set 16331.99998fil +4506c4516 +< Memory usage before: 651&432; after: 417&418; still untouched: 175 +--- +> Memory usage before: 988&431; after: 594&417; still untouched: 241 +4742c4752,4753 +< \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil +--- +> \vbox(16383.99998+0.0)x205.12613, glue set 16343.99998fil, yoko directio +> n +4828c4839 +< Memory usage before: 776&458; after: 464&452; still untouched: 175 +--- +> Memory usage before: 1170&457; after: 672&451; still untouched: 241 +5700c5711 +< ! \textfont 0 is undefined (character ^^c8). +--- +> ! \textfont 0 is undefined (character ì ©. +6380c6391 +< (tripos.tex +--- +> (./tripos.tex +6501c6512 +< l.429 ...^^M=13 \def^^M{\relax}# +--- +> l.429 ...^^M=13 \defqqM{\relax}# +6595c6606 +< Memory usage before: 819&428; after: 720&426; still untouched: 175 +--- +> Memory usage before: 1216&428; after: 1066&426; still untouched: 241 +7155c7166 +< Memory usage before: 895&439; after: 290&420; still untouched: 175 +--- +> Memory usage before: 1332&439; after: 388&420; still untouched: 241 +7288c7299 +< Memory usage before: 334&431; after: 292&418; still untouched: 175 +--- +> Memory usage before: 452&431; after: 390&418; still untouched: 241 +7296,7299c7307,7310 +< 47 strings out of 1674 +< 253 string characters out of 8354 +< 2825 words of memory out of 3000 +< 372 multiletter control sequences out of 2100 +--- +> 44 strings out of 1542 +> 261 string characters out of 14585 +> 4259 words of memory out of 4500 +> 414 multiletter control sequences out of 15000+0 +7301c7312 +< 2 hyphenation exceptions out of 307 +--- +> 1 hyphenation exception out of 659 ++ eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi +++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi ++ diff SRCDIR/triptrap/trip.typ uptrip.typ +1c1 +< This is DVItype, Version 3.6 +--- +> This is DVItype, Version 3.6 (TeX Live 2012) +9c9 +< ' TeX output 2008.03.15:0223' +--- +> ' TeX output 2011.08.23:2131' +419c419 +< 1121: down4 639342208 +--- +> 1121: down4 639342177 +1087,1088c1087,1088 +< 2535: y4 203921760 +< 2540: y0 203921760 +--- +> 2535: y4 203921756 +> 2540: y0 203921756 ++ : +PASS: uptexdir/uptrip.test |