From 956c96b5886500a4c3763bb6dd171904a2740b5c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 10 Apr 2024 20:22:17 +0000 Subject: [PATCH 1/8] latexmk (10apr24) git-svn-id: svn://tug.org/texlive/trunk/Build@70909 c570f23f-e606-0410-a88d-b1316a301751 From 98cae63788cd19a0ad7a412d3b045dcb4a83501a Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sun, 14 Apr 2024 03:19:30 +0000 Subject: [PATCH 2/8] =?UTF-8?q?texmf.cnf=EF=BC=9A=20sync?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://tug.org/texlive/trunk/Build@70942 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/kpathsea/texmf.cnf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/texk/kpathsea/texmf.cnf b/source/texk/kpathsea/texmf.cnf index a3fa52826..e3617310a 100644 --- a/source/texk/kpathsea/texmf.cnf +++ b/source/texk/kpathsea/texmf.cnf @@ -941,3 +941,11 @@ guess_input_kanji_encoding.mendex = 1 % command_line_encoding = none % in a texmf.cnf prefered, for example $TEXMFLOCAL/web2c/texmf.cnf. command_line_encoding = utf-8 + +% From TeX Live 2024, the engine for ptex, eptex, platex, and +% platex-dev is euptex. Therefore the function should be switched off +% for ptex, eptex, platex and platex-dev. +command_line_encoding.ptex = none +command_line_encoding.eptex = none +command_line_encoding.platex = none +command_line_encoding.platex-dev = none From 9635ad093da885b7e273bb37a9c3bb601be55052 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sun, 14 Apr 2024 05:29:13 +0000 Subject: [PATCH 3/8] eptex: Remove web2c/eptexdir git-svn-id: svn://tug.org/texlive/trunk/Build@70943 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/ChangeLog | 7 + source/texk/web2c/Makefile.am | 3 - source/texk/web2c/Makefile.in | 804 +++--- source/texk/web2c/ac/web2c.ac | 1 - source/texk/web2c/configure | 68 - source/texk/web2c/eptexdir/COPYRIGHT | 26 - source/texk/web2c/eptexdir/am/eptex.am | 135 -- .../texk/web2c/eptexdir/char-warning-eptex.ch | 101 - source/texk/web2c/eptexdir/eptex.defines | 60 - source/texk/web2c/eptexdir/eptex.ech | 804 ------ source/texk/web2c/eptexdir/eptex_version.h | 1 - source/texk/web2c/eptexdir/eptexextra.c | 12 - source/texk/web2c/eptexdir/eptexextra.h | 26 - .../texk/web2c/eptexdir/eptrip/eptrip.diffs | 1386 ----------- source/texk/web2c/eptexdir/eptrip/texmf.cnf | 41 - source/texk/web2c/eptexdir/eptriptest.test | 220 -- source/texk/web2c/eptexdir/epver.test | 36 - source/texk/web2c/eptexdir/etex.ch0 | 261 -- source/texk/web2c/eptexdir/etex.ch1 | 214 -- source/texk/web2c/eptexdir/fam256.ch | 1537 ------------ source/texk/web2c/eptexdir/pdfprimitive.test | 27 - source/texk/web2c/eptexdir/pdfutils.ch | 2150 ----------------- source/texk/web2c/eptexdir/suppresserrors.ch | 138 -- .../eptexdir/tests/pdfprimitive-eptex.log | 57 - .../eptexdir/tests/pdfprimitive-test.tex | 47 - source/texk/web2c/eptexdir/wcfname.test | 131 - source/texk/web2c/etexdir/ChangeLog | 5 + source/texk/web2c/etexdir/etriptest.test | 2 +- source/texk/web2c/euptexdir/ChangeLog | 16 + source/texk/web2c/euptexdir/am/euptex.am | 4 +- .../epTeX_doc}/ChangeLog | 0 .../epTeX_doc}/Changes.txt | 0 .../epTeX_doc}/README.txt | 0 .../epTeX_doc}/eptex-base.ch | 0 source/texk/web2c/euptexdir/eptriptest.test | 12 +- source/texk/web2c/euptexdir/euptexextra.h | 2 +- .../eptrip => euptexdir/euptrip}/eptrip.log | 0 .../eptrip => euptexdir/euptrip}/eptrip.tex | 0 source/texk/web2c/euptexdir/euptriptest.test | 7 +- source/texk/web2c/euptexdir/pdfprimitive.test | 2 +- .../{eptexdir => euptexdir}/tests/fontchar.sh | 0 .../tests/fontchar.tex | 0 .../tests/lastnodefont.tex | 0 .../tests/lastnodesubtype_math.tex | 0 .../tests/pdforigin.sh | 0 .../tests/pdforigin.tex | 0 .../tests/pdfpagewidth.tex | 0 .../tests/pdfsavepos.tex | 0 .../tests/printkanji-eptex.tex | 0 .../tests/suppress_errors.tex | 0 .../{eptexdir => euptexdir}/tests/uchar.tex | 0 .../tests/zero_search.tex | 0 .../unbalanced-braces-eptex.ch | 0 source/texk/web2c/lib/ChangeLog | 4 + source/texk/web2c/lib/Makefile.am | 4 +- source/texk/web2c/lib/Makefile.in | 2 +- source/texk/web2c/man/ChangeLog | 4 + source/texk/web2c/man/Makefile.am | 4 +- source/texk/web2c/man/Makefile.in | 9 +- source/texk/web2c/mftraptest.test | 2 +- source/texk/web2c/ptexdir/ChangeLog | 5 + source/texk/web2c/ptexdir/ptriptest.test | 2 +- source/texk/web2c/synctexdir/ChangeLog | 4 + source/texk/web2c/synctexdir/am/synctex.am | 37 - source/texk/web2c/triptest.test | 2 +- source/texk/web2c/uptexdir/ChangeLog | 5 + source/texk/web2c/uptexdir/ptriptest.test | 2 +- source/texk/web2c/uptexdir/uptriptest.test | 2 +- 68 files changed, 352 insertions(+), 8079 deletions(-) delete mode 100644 source/texk/web2c/eptexdir/COPYRIGHT delete mode 100644 source/texk/web2c/eptexdir/am/eptex.am delete mode 100644 source/texk/web2c/eptexdir/char-warning-eptex.ch delete mode 100644 source/texk/web2c/eptexdir/eptex.defines delete mode 100644 source/texk/web2c/eptexdir/eptex.ech delete mode 100644 source/texk/web2c/eptexdir/eptex_version.h delete mode 100644 source/texk/web2c/eptexdir/eptexextra.c delete mode 100644 source/texk/web2c/eptexdir/eptexextra.h delete mode 100644 source/texk/web2c/eptexdir/eptrip/eptrip.diffs delete mode 100644 source/texk/web2c/eptexdir/eptrip/texmf.cnf delete mode 100755 source/texk/web2c/eptexdir/eptriptest.test delete mode 100755 source/texk/web2c/eptexdir/epver.test delete mode 100644 source/texk/web2c/eptexdir/etex.ch0 delete mode 100644 source/texk/web2c/eptexdir/etex.ch1 delete mode 100644 source/texk/web2c/eptexdir/fam256.ch delete mode 100755 source/texk/web2c/eptexdir/pdfprimitive.test delete mode 100644 source/texk/web2c/eptexdir/pdfutils.ch delete mode 100644 source/texk/web2c/eptexdir/suppresserrors.ch delete mode 100644 source/texk/web2c/eptexdir/tests/pdfprimitive-eptex.log delete mode 100644 source/texk/web2c/eptexdir/tests/pdfprimitive-test.tex delete mode 100755 source/texk/web2c/eptexdir/wcfname.test rename source/texk/web2c/{eptexdir => euptexdir/epTeX_doc}/ChangeLog (100%) rename source/texk/web2c/{eptexdir => euptexdir/epTeX_doc}/Changes.txt (100%) rename source/texk/web2c/{eptexdir => euptexdir/epTeX_doc}/README.txt (100%) rename source/texk/web2c/{eptexdir => euptexdir/epTeX_doc}/eptex-base.ch (100%) rename source/texk/web2c/{eptexdir/eptrip => euptexdir/euptrip}/eptrip.log (100%) rename source/texk/web2c/{eptexdir/eptrip => euptexdir/euptrip}/eptrip.tex (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/fontchar.sh (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/fontchar.tex (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/lastnodefont.tex (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/lastnodesubtype_math.tex (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/pdforigin.sh (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/pdforigin.tex (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/pdfpagewidth.tex (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/pdfsavepos.tex (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/printkanji-eptex.tex (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/suppress_errors.tex (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/uchar.tex (100%) rename source/texk/web2c/{eptexdir => euptexdir}/tests/zero_search.tex (100%) rename source/texk/web2c/{eptexdir => euptexdir}/unbalanced-braces-eptex.ch (100%) diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog index f2b53abdf..e4cff42c9 100644 --- a/source/texk/web2c/ChangeLog +++ b/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2024-04-14 TANAKA Takuji + + * ac/web2c.ac (eptex), Makefile.am, + euptexdir/am/euptex.am, eptexdir/*: Remove eptex and eptexdir/. + * {mftraptest,triptest}.test: + Filter Web2C year/dev in banner. + 2024-03-24 Karl Berry * unbalanced-braces.ch: fix from DRF in order to make diff --git a/source/texk/web2c/Makefile.am b/source/texk/web2c/Makefile.am index 843aeefe4..6e271293a 100644 --- a/source/texk/web2c/Makefile.am +++ b/source/texk/web2c/Makefile.am @@ -272,9 +272,6 @@ include $(srcdir)/etexdir/am/etex.am ## pTeX include $(srcdir)/ptexdir/am/ptex.am -## e-pTeX -include $(srcdir)/eptexdir/am/eptex.am - ## upTeX include $(srcdir)/uptexdir/am/uptex.am diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in index 2ebe89878..d1f49dec8 100644 --- a/source/texk/web2c/Makefile.in +++ b/source/texk/web2c/Makefile.in @@ -96,8 +96,8 @@ host_triplet = @host@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \ mf-nowin$(EXEEXT) mflua$(EXEEXT) mflua-nowin$(EXEEXT) \ mfluajit$(EXEEXT) mfluajit-nowin$(EXEEXT) mpost$(EXEEXT) \ - pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) eptex$(EXEEXT) \ - uptex$(EXEEXT) $(am__EXEEXT_2) euptex$(EXEEXT) pdftex$(EXEEXT) \ + pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) uptex$(EXEEXT) \ + $(am__EXEEXT_2) euptex$(EXEEXT) pdftex$(EXEEXT) \ ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) luatex$(EXEEXT) \ luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \ @@ -113,23 +113,22 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \ $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \ $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \ $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \ - $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31) + $(am__EXEEXT_29) $(am__EXEEXT_30) noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ - $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \ - $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \ - $(am__EXEEXT_38) $(am__EXEEXT_39) $(am__EXEEXT_40) \ - $(am__EXEEXT_41) $(am__EXEEXT_42) -TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \ + $(am__EXEEXT_31) $(am__EXEEXT_32) $(am__EXEEXT_33) \ + $(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \ + $(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \ + $(am__EXEEXT_40) $(am__EXEEXT_41) +TESTS = tangle.test $(am__EXEEXT_44) ctiedir/ctie.test \ cwebdir/ctwill.test cwebdir/cweave.test tiedir/tie.test \ $(am__append_6) $(am__append_16) $(am__append_25) \ $(am__append_34) $(am__append_42) $(am__append_55) \ $(am__append_56) $(am__append_58) $(am__append_62) \ - $(am__EXEEXT_46) $(am__append_68) $(am__append_73) \ - $(am__append_76) $(am__append_81) $(am__append_86) \ - $(am__append_89) $(am__append_110) $(am__append_111) \ - $(am__append_112) $(am__append_113) $(am__append_121) \ - $(am__append_123) $(am__append_125) $(am__append_152) \ - libmd5/md5.test + $(am__EXEEXT_45) $(am__append_68) $(am__append_71) \ + $(am__append_76) $(am__append_81) $(am__append_84) \ + $(am__append_105) $(am__append_106) $(am__append_107) \ + $(am__append_108) $(am__append_116) $(am__append_118) \ + $(am__append_120) $(am__append_143) libmd5/md5.test @WEB_TRUE@am__append_1 = $(web_programs) @WEB_TRUE@am__append_2 = $(web_tests) @TEX_TRUE@am__append_3 = tex @@ -199,150 +198,134 @@ TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \ @PTEX_TRUE@am__append_63 = ptrip.diffs @PTEX_TRUE@am__append_64 = ptrip-clean @PWEB_TRUE@am__append_65 = $(pweb_tests) -@EPTEX_TRUE@am__append_66 = eptex -@EPTEX_TRUE@@PTEX_FALSE@am__append_67 = eptex$(EXEEXT):ptex -@EPTEX_TRUE@am__append_68 = $(eptex_tests) -@EPTEX_TRUE@am__append_69 = eptrip.diffs -@EPTEX_TRUE@am__append_70 = eptrip-clean -@UPTEX_TRUE@am__append_71 = uptex -@UPWEB_TRUE@am__append_72 = $(upweb_programs) -@UPTEX_TRUE@am__append_73 = $(uptex_tests) -@UPTEX_TRUE@am__append_74 = uptrip.diffs -@UPTEX_TRUE@am__append_75 = uptrip-clean -@UPWEB_TRUE@am__append_76 = $(upweb_tests) -@EUPTEX_TRUE@am__append_77 = euptex -@EUPTEX_TRUE@@UPTEX_FALSE@am__append_78 = euptex$(EXEEXT):uptex -@EPTEX_FALSE@@EUPTEX_TRUE@am__append_79 = euptex$(EXEEXT):eptex -@EPTEX_FALSE@@EUPTEX_TRUE@@PTEX_FALSE@am__append_80 = euptex$(EXEEXT):ptex -@EUPTEX_TRUE@am__append_81 = $(euptex_tests) -@EUPTEX_TRUE@am__append_82 = euptrip.diffs -@EUPTEX_TRUE@am__append_83 = euptrip-clean -@HITEX_TRUE@am__append_84 = hitex hishrink histretch -@HITEX_TRUE@am__append_85 = himktables -@HITEX_TRUE@am__append_86 = $(hitex_tests) -@MINGW32_TRUE@am__append_87 = \ +@UPTEX_TRUE@am__append_66 = uptex +@UPWEB_TRUE@am__append_67 = $(upweb_programs) +@UPTEX_TRUE@am__append_68 = $(uptex_tests) +@UPTEX_TRUE@am__append_69 = uptrip.diffs +@UPTEX_TRUE@am__append_70 = uptrip-clean +@UPWEB_TRUE@am__append_71 = $(upweb_tests) +@EUPTEX_TRUE@am__append_72 = euptex +@EUPTEX_TRUE@@UPTEX_FALSE@am__append_73 = euptex$(EXEEXT):uptex +@EUPTEX_TRUE@am__append_74 = euptex$(EXEEXT):eptex +@EUPTEX_TRUE@@PTEX_FALSE@am__append_75 = euptex$(EXEEXT):ptex +@EUPTEX_TRUE@am__append_76 = $(euptex_tests) +@EUPTEX_TRUE@am__append_77 = euptrip.diffs +@EUPTEX_TRUE@am__append_78 = euptrip-clean +@HITEX_TRUE@am__append_79 = hitex hishrink histretch +@HITEX_TRUE@am__append_80 = himktables +@HITEX_TRUE@am__append_81 = $(hitex_tests) +@MINGW32_TRUE@am__append_82 = \ @MINGW32_TRUE@ pdftexdir/regex/regex.c \ @MINGW32_TRUE@ pdftexdir/regex/regex.h -@PDFTEX_TRUE@am__append_88 = pdftex ttf2afm pdftosrc -@PDFTEX_TRUE@am__append_89 = $(pdftex_tests) $(ttf2afm_tests) \ +@PDFTEX_TRUE@am__append_83 = pdftex ttf2afm pdftosrc +@PDFTEX_TRUE@am__append_84 = $(pdftex_tests) $(ttf2afm_tests) \ @PDFTEX_TRUE@ $(pdftosrc_tests) -@LUATEX_TRUE@am__append_90 = luatex -@LUATEX_TRUE@@WIN32_TRUE@am__append_91 = call_luatex -@LUATEX_TRUE@@WIN32_TRUE@am__append_92 = install-luatex-links -@LUATEX_TRUE@@WIN32_TRUE@am__append_93 = uninstall-luatex-links -@LUATEX_TRUE@@WIN32_FALSE@am__append_94 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac -@LUAHBTEX_TRUE@am__append_95 = luahbtex -@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_96 = call_luahbtex -@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_97 = install-luahbtex-links -@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_98 = uninstall-luahbtex-links +@LUATEX_TRUE@am__append_85 = luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_86 = call_luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_87 = install-luatex-links +@LUATEX_TRUE@@WIN32_TRUE@am__append_88 = uninstall-luatex-links +@LUATEX_TRUE@@WIN32_FALSE@am__append_89 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac +@LUAHBTEX_TRUE@am__append_90 = luahbtex +@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_91 = call_luahbtex +@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_92 = install-luahbtex-links +@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_93 = uninstall-luahbtex-links # keep texlua[c] as links to luatex unless luatex is not installed. -@LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE@am__append_99 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac -@LUAJITTEX_TRUE@am__append_100 = luajittex -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_101 = call_luajittex -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_102 = install-luajittex-links -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_103 = uninstall-luajittex-links -@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_104 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc -@LUAJITHBTEX_TRUE@am__append_105 = luajithbtex -@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_106 = call_luajithbtex -@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_107 = install-luajithbtex-links -@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_108 = uninstall-luajithbtex-links +@LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE@am__append_94 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac +@LUAJITTEX_TRUE@am__append_95 = luajittex +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_96 = call_luajittex +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_97 = install-luajittex-links +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_98 = uninstall-luajittex-links +@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_99 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc +@LUAJITHBTEX_TRUE@am__append_100 = luajithbtex +@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_101 = call_luajithbtex +@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_102 = install-luajithbtex-links +@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_103 = uninstall-luajithbtex-links # keep texluajit[c] as links to luajittex unless luajittex is not installed. -@LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE@am__append_109 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc -@LUATEX_TRUE@am__append_110 = $(luatex_tests) -@LUAHBTEX_TRUE@am__append_111 = $(luahbtex_tests) -@LUAJITTEX_TRUE@am__append_112 = $(luajittex_tests) -@LUAJITHBTEX_TRUE@am__append_113 = $(luajithbtex_tests) -@XETEX_TRUE@am__append_114 = xetex -@XETEX_MACOSX_TRUE@am__append_115 = -DXETEX_MAC -@XETEX_MACOSX_TRUE@am__append_116 = -std=c++11 -@XETEX_MACOSX_FALSE@am__append_117 = $(FONTCONFIG_INCLUDES) -@XETEX_MACOSX_FALSE@am__append_118 = $(FONTCONFIG_LIBS) -@XETEX_MACOSX_TRUE@am__append_119 = \ +@LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE@am__append_104 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc +@LUATEX_TRUE@am__append_105 = $(luatex_tests) +@LUAHBTEX_TRUE@am__append_106 = $(luahbtex_tests) +@LUAJITTEX_TRUE@am__append_107 = $(luajittex_tests) +@LUAJITHBTEX_TRUE@am__append_108 = $(luajithbtex_tests) +@XETEX_TRUE@am__append_109 = xetex +@XETEX_MACOSX_TRUE@am__append_110 = -DXETEX_MAC +@XETEX_MACOSX_TRUE@am__append_111 = -std=c++11 +@XETEX_MACOSX_FALSE@am__append_112 = $(FONTCONFIG_INCLUDES) +@XETEX_MACOSX_FALSE@am__append_113 = $(FONTCONFIG_LIBS) +@XETEX_MACOSX_TRUE@am__append_114 = \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.mm \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c -@XETEX_MACOSX_FALSE@am__append_120 = \ +@XETEX_MACOSX_FALSE@am__append_115 = \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h -@XETEX_TRUE@am__append_121 = $(xetex_tests) -@OTANGLE_TRUE@am__append_122 = $(omegaware_programs) -@OTANGLE_TRUE@am__append_123 = $(OTANGLE_tests) $(OMFONTS_tests) -@ALEPH_TRUE@am__append_124 = aleph -@ALEPH_TRUE@am__append_125 = $(aleph_tests) -@SYNCTEX_TRUE@am__append_126 = synctex -@SYNCTEX_TRUE@am__append_127 = $(LTLIBSYNCTEX) -@SYNCTEX_TRUE@am__append_128 = $(LIBSYNCTEX) -@MINGW32_TRUE@am__append_129 = $(KPATHSEA_INCLUDES) -@MINGW32_TRUE@am__append_130 = -lshlwapi $(KPATHSEA_LIBS) -@MINGW32_TRUE@am__append_131 = -lshlwapi -@TEX_SYNCTEX_TRUE@am__append_132 = -I$(srcdir)/synctexdir \ +@XETEX_TRUE@am__append_116 = $(xetex_tests) +@OTANGLE_TRUE@am__append_117 = $(omegaware_programs) +@OTANGLE_TRUE@am__append_118 = $(OTANGLE_tests) $(OMFONTS_tests) +@ALEPH_TRUE@am__append_119 = aleph +@ALEPH_TRUE@am__append_120 = $(aleph_tests) +@SYNCTEX_TRUE@am__append_121 = synctex +@SYNCTEX_TRUE@am__append_122 = $(LTLIBSYNCTEX) +@SYNCTEX_TRUE@am__append_123 = $(LIBSYNCTEX) +@MINGW32_TRUE@am__append_124 = $(KPATHSEA_INCLUDES) +@MINGW32_TRUE@am__append_125 = -lshlwapi $(KPATHSEA_LIBS) +@MINGW32_TRUE@am__append_126 = -lshlwapi +@TEX_SYNCTEX_TRUE@am__append_127 = -I$(srcdir)/synctexdir \ @TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\" -@TEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_LIBS) -@TEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_DEPEND) -@TEX_SYNCTEX_TRUE@am__append_135 = \ +@TEX_SYNCTEX_TRUE@am__append_128 = $(ZLIB_LIBS) +@TEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_DEPEND) +@TEX_SYNCTEX_TRUE@am__append_130 = \ @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_136 = -I$(srcdir)/synctexdir \ +@ETEX_SYNCTEX_TRUE@am__append_131 = -I$(srcdir)/synctexdir \ @ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\" -@ETEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_LIBS) -@ETEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_DEPEND) -@ETEX_SYNCTEX_TRUE@am__append_139 = \ +@ETEX_SYNCTEX_TRUE@am__append_132 = $(ZLIB_LIBS) +@ETEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_DEPEND) +@ETEX_SYNCTEX_TRUE@am__append_134 = \ @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 -@EPTEX_SYNCTEX_TRUE@am__append_140 = -I$(srcdir)/synctexdir \ -@EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ -@EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\" -@EPTEX_SYNCTEX_TRUE@am__append_141 = $(ZLIB_LIBS) -@EPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_DEPEND) -@EPTEX_SYNCTEX_TRUE@am__append_143 = \ -@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_144 = -I$(srcdir)/synctexdir \ +@EUPTEX_SYNCTEX_TRUE@am__append_135 = -I$(srcdir)/synctexdir \ @EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\" -@EUPTEX_SYNCTEX_TRUE@am__append_145 = $(ZLIB_LIBS) -@EUPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_DEPEND) -@EUPTEX_SYNCTEX_TRUE@am__append_147 = \ +@EUPTEX_SYNCTEX_TRUE@am__append_136 = $(ZLIB_LIBS) +@EUPTEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_DEPEND) +@EUPTEX_SYNCTEX_TRUE@am__append_138 = \ @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_148 = -I$(srcdir)/synctexdir \ +@PDFTEX_SYNCTEX_TRUE@am__append_139 = -I$(srcdir)/synctexdir \ @PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\" -@PDFTEX_SYNCTEX_TRUE@am__append_149 = \ +@PDFTEX_SYNCTEX_TRUE@am__append_140 = \ @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_150 = -I$(srcdir)/synctexdir \ +@XETEX_SYNCTEX_TRUE@am__append_141 = -I$(srcdir)/synctexdir \ @XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\" -@XETEX_SYNCTEX_TRUE@am__append_151 = \ +@XETEX_SYNCTEX_TRUE@am__append_142 = \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xetex.h -@SYNCTEX_TRUE@am__append_152 = $(synctex_tests) +@SYNCTEX_TRUE@am__append_143 = $(synctex_tests) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ @@ -427,37 +410,36 @@ am__EXEEXT_3 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \ @UPMP_TRUE@am__EXEEXT_15 = upmpost$(EXEEXT) @ETEX_TRUE@am__EXEEXT_16 = etex$(EXEEXT) @PTEX_TRUE@am__EXEEXT_17 = ptex$(EXEEXT) -@EPTEX_TRUE@am__EXEEXT_18 = eptex$(EXEEXT) -@UPTEX_TRUE@am__EXEEXT_19 = uptex$(EXEEXT) -@UPWEB_TRUE@am__EXEEXT_20 = $(am__EXEEXT_2) -@EUPTEX_TRUE@am__EXEEXT_21 = euptex$(EXEEXT) -@HITEX_TRUE@am__EXEEXT_22 = hitex$(EXEEXT) hishrink$(EXEEXT) \ +@UPTEX_TRUE@am__EXEEXT_18 = uptex$(EXEEXT) +@UPWEB_TRUE@am__EXEEXT_19 = $(am__EXEEXT_2) +@EUPTEX_TRUE@am__EXEEXT_20 = euptex$(EXEEXT) +@HITEX_TRUE@am__EXEEXT_21 = hitex$(EXEEXT) hishrink$(EXEEXT) \ @HITEX_TRUE@ histretch$(EXEEXT) -@PDFTEX_TRUE@am__EXEEXT_23 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \ +@PDFTEX_TRUE@am__EXEEXT_22 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \ @PDFTEX_TRUE@ pdftosrc$(EXEEXT) -@LUATEX_TRUE@am__EXEEXT_24 = luatex$(EXEEXT) -@LUAHBTEX_TRUE@am__EXEEXT_25 = luahbtex$(EXEEXT) -@LUAJITTEX_TRUE@am__EXEEXT_26 = luajittex$(EXEEXT) -@LUAJITHBTEX_TRUE@am__EXEEXT_27 = luajithbtex$(EXEEXT) -@XETEX_TRUE@am__EXEEXT_28 = xetex$(EXEEXT) -@OTANGLE_TRUE@am__EXEEXT_29 = $(am__EXEEXT_3) -@ALEPH_TRUE@am__EXEEXT_30 = aleph$(EXEEXT) -@SYNCTEX_TRUE@am__EXEEXT_31 = synctex$(EXEEXT) +@LUATEX_TRUE@am__EXEEXT_23 = luatex$(EXEEXT) +@LUAHBTEX_TRUE@am__EXEEXT_24 = luahbtex$(EXEEXT) +@LUAJITTEX_TRUE@am__EXEEXT_25 = luajittex$(EXEEXT) +@LUAJITHBTEX_TRUE@am__EXEEXT_26 = luajithbtex$(EXEEXT) +@XETEX_TRUE@am__EXEEXT_27 = xetex$(EXEEXT) +@OTANGLE_TRUE@am__EXEEXT_28 = $(am__EXEEXT_3) +@ALEPH_TRUE@am__EXEEXT_29 = aleph$(EXEEXT) +@SYNCTEX_TRUE@am__EXEEXT_30 = synctex$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(syncincludedir)" -@MF_TRUE@@WIN32_TRUE@am__EXEEXT_32 = call_mf$(EXEEXT) -@MFLUA_TRUE@@WIN32_TRUE@am__EXEEXT_33 = call_mflua$(EXEEXT) -@MFLUAJIT_TRUE@@WIN32_TRUE@am__EXEEXT_34 = call_mfluajit$(EXEEXT) -@MP_TRUE@@WIN32_TRUE@am__EXEEXT_35 = call_mpost$(EXEEXT) -@PMP_TRUE@@WIN32_TRUE@am__EXEEXT_36 = call_pmpost$(EXEEXT) -@UPMP_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_upmpost$(EXEEXT) -@HITEX_TRUE@am__EXEEXT_38 = himktables$(EXEEXT) -@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_39 = call_luatex$(EXEEXT) -@LUAHBTEX_TRUE@@WIN32_TRUE@am__EXEEXT_40 = call_luahbtex$(EXEEXT) -@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_41 = call_luajittex$(EXEEXT) -@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__EXEEXT_42 = \ +@MF_TRUE@@WIN32_TRUE@am__EXEEXT_31 = call_mf$(EXEEXT) +@MFLUA_TRUE@@WIN32_TRUE@am__EXEEXT_32 = call_mflua$(EXEEXT) +@MFLUAJIT_TRUE@@WIN32_TRUE@am__EXEEXT_33 = call_mfluajit$(EXEEXT) +@MP_TRUE@@WIN32_TRUE@am__EXEEXT_34 = call_mpost$(EXEEXT) +@PMP_TRUE@@WIN32_TRUE@am__EXEEXT_35 = call_pmpost$(EXEEXT) +@UPMP_TRUE@@WIN32_TRUE@am__EXEEXT_36 = call_upmpost$(EXEEXT) +@HITEX_TRUE@am__EXEEXT_37 = himktables$(EXEEXT) +@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_38 = call_luatex$(EXEEXT) +@LUAHBTEX_TRUE@@WIN32_TRUE@am__EXEEXT_39 = call_luahbtex$(EXEEXT) +@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_40 = call_luajittex$(EXEEXT) +@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__EXEEXT_41 = \ @LUAJITHBTEX_TRUE@@WIN32_TRUE@ call_luajithbtex$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -1322,40 +1304,28 @@ nodist_dvitype_OBJECTS = dvitype.$(OBJEXT) dvitype_OBJECTS = $(nodist_dvitype_OBJECTS) dvitype_LDADD = $(LDADD) dvitype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) -am__dist_eptex_SOURCES_DIST = eptexdir/eptexextra.c \ - eptexdir/eptexextra.h eptexdir/eptex_version.h \ - synctexdir/synctex.c synctexdir/synctex.h \ - synctexdir/synctex-common.h synctexdir/synctex-eptex.h -@EPTEX_SYNCTEX_TRUE@am__objects_32 = \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/eptex-synctex.$(OBJEXT) -dist_eptex_OBJECTS = eptexdir/eptex-eptexextra.$(OBJEXT) \ - $(am__objects_32) -am__objects_33 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT) -nodist_eptex_OBJECTS = $(am__objects_33) eptex-eptex-pool.$(OBJEXT) -eptex_OBJECTS = $(dist_eptex_OBJECTS) $(nodist_eptex_OBJECTS) -@EPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) am__dist_etex_SOURCES_DIST = etexdir/etexextra.c etexdir/etexextra.h \ etexdir/etex_version.h synctexdir/synctex.c \ synctexdir/synctex.h synctexdir/synctex-common.h \ synctexdir/synctex-etex.h -@ETEX_SYNCTEX_TRUE@am__objects_34 = synctexdir/etex-synctex.$(OBJEXT) -dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_34) -am__objects_35 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT) -nodist_etex_OBJECTS = $(am__objects_35) etex-etex-pool.$(OBJEXT) +@ETEX_SYNCTEX_TRUE@am__objects_32 = synctexdir/etex-synctex.$(OBJEXT) +dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_32) +am__objects_33 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT) +nodist_etex_OBJECTS = $(am__objects_33) etex-etex-pool.$(OBJEXT) etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS) -@ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) +@ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) am__dist_euptex_SOURCES_DIST = euptexdir/euptexextra.c \ euptexdir/euptexextra.h synctexdir/synctex.c \ synctexdir/synctex.h synctexdir/synctex-common.h \ synctexdir/synctex-euptex.h -@EUPTEX_SYNCTEX_TRUE@am__objects_36 = \ +@EUPTEX_SYNCTEX_TRUE@am__objects_34 = \ @EUPTEX_SYNCTEX_TRUE@ synctexdir/euptex-synctex.$(OBJEXT) dist_euptex_OBJECTS = euptexdir/euptex-euptexextra.$(OBJEXT) \ - $(am__objects_36) -am__objects_37 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT) -nodist_euptex_OBJECTS = $(am__objects_37) euptex-euptex-pool.$(OBJEXT) + $(am__objects_34) +am__objects_35 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT) +nodist_euptex_OBJECTS = $(am__objects_35) euptex-euptex-pool.$(OBJEXT) euptex_OBJECTS = $(dist_euptex_OBJECTS) $(nodist_euptex_OBJECTS) -@EUPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) +@EUPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) am_gftodvi_OBJECTS = nodist_gftodvi_OBJECTS = gftodvi.$(OBJEXT) gftodvi_OBJECTS = $(am_gftodvi_OBJECTS) $(nodist_gftodvi_OBJECTS) @@ -1381,19 +1351,19 @@ hishrink_OBJECTS = $(nodist_hishrink_OBJECTS) nodist_histretch_OBJECTS = histretch-hitables.$(OBJEXT) \ histretch-histretch.$(OBJEXT) histretch_OBJECTS = $(nodist_histretch_OBJECTS) -am__objects_38 = hitex-hitex.$(OBJEXT) +am__objects_36 = hitex-hitex.$(OBJEXT) nodist_hitex_OBJECTS = hitex-hitables.$(OBJEXT) hitex-hiput.$(OBJEXT) \ - $(am__objects_38) + $(am__objects_36) hitex_OBJECTS = $(nodist_hitex_OBJECTS) nodist_initex_OBJECTS = initex-callexe.$(OBJEXT) initex_OBJECTS = $(nodist_initex_OBJECTS) initex_DEPENDENCIES = -am__objects_39 = luatexdir/luahbtex-luatex.$(OBJEXT) \ +am__objects_37 = luatexdir/luahbtex-luatex.$(OBJEXT) \ mplibdir/luahbtex-lmplib.$(OBJEXT) -nodist_luahbtex_OBJECTS = $(am__objects_39) +nodist_luahbtex_OBJECTS = $(am__objects_37) luahbtex_OBJECTS = $(nodist_luahbtex_OBJECTS) -am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) -am__DEPENDENCIES_7 = libmplibcore.a $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) +am__DEPENDENCIES_6 = libmplibcore.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) libmputil.a \ @@ -1401,27 +1371,27 @@ am__DEPENDENCIES_7 = libmplibcore.a $(am__DEPENDENCIES_1) \ luahbtex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luahbtex_CXXFLAGS) \ $(CXXFLAGS) $(luahbtex_LDFLAGS) $(LDFLAGS) -o $@ -am__objects_40 = luatexdir/luajithbtex-luatex.$(OBJEXT) \ +am__objects_38 = luatexdir/luajithbtex-luatex.$(OBJEXT) \ mplibdir/luajithbtex-lmplib.$(OBJEXT) -nodist_luajithbtex_OBJECTS = $(am__objects_40) +nodist_luajithbtex_OBJECTS = $(am__objects_38) luajithbtex_OBJECTS = $(nodist_luajithbtex_OBJECTS) luajithbtex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luajithbtex_CXXFLAGS) \ $(CXXFLAGS) $(luajithbtex_LDFLAGS) $(LDFLAGS) -o $@ -am__objects_41 = luatexdir/luajittex-luatex.$(OBJEXT) \ +am__objects_39 = luatexdir/luajittex-luatex.$(OBJEXT) \ mplibdir/luajittex-lmplib.$(OBJEXT) -nodist_luajittex_OBJECTS = $(am__objects_41) +nodist_luajittex_OBJECTS = $(am__objects_39) luajittex_OBJECTS = $(nodist_luajittex_OBJECTS) -am__DEPENDENCIES_8 = libmplibcore.a $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_7 = libmplibcore.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) libmputil.a \ libunilib.a libmd5.a $(am__DEPENDENCIES_1) luajittex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(luajittex_LDFLAGS) $(LDFLAGS) -o $@ -am__objects_42 = luatexdir/luatex-luatex.$(OBJEXT) \ +am__objects_40 = luatexdir/luatex-luatex.$(OBJEXT) \ mplibdir/luatex-lmplib.$(OBJEXT) -nodist_luatex_OBJECTS = $(am__objects_42) +nodist_luatex_OBJECTS = $(am__objects_40) luatex_OBJECTS = $(nodist_luatex_OBJECTS) luatex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -1431,12 +1401,12 @@ md5main_OBJECTS = $(am_md5main_OBJECTS) md5main_DEPENDENCIES = libmd5.a dist_mf_OBJECTS = mf-mfextra.$(OBJEXT) mf_OBJECTS = $(dist_mf_OBJECTS) -@WIN32_FALSE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) \ +@WIN32_FALSE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) \ @WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @WIN32_FALSE@ $(am__DEPENDENCIES_1) mf_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) \ - $(am__DEPENDENCIES_9) + $(am__DEPENDENCIES_8) dist_mf_nowin_OBJECTS = mf_nowin-mfextra.$(OBJEXT) mf_nowin_OBJECTS = $(dist_mf_nowin_OBJECTS) mf_nowin_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) @@ -1444,17 +1414,17 @@ dist_mflua_OBJECTS = mfluadir/mflua-mfluaextra.$(OBJEXT) mflua_OBJECTS = $(dist_mflua_OBJECTS) mflua_DEPENDENCIES = libmflua.a libmfluaotfcc.a libmfluapotrace.a \ libmflualpeg.a $(am__DEPENDENCIES_2) $(windowlib) \ - $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_6) \ + $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_5) \ $(am__DEPENDENCIES_1) mflua_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(mflua_LDFLAGS) $(LDFLAGS) -o $@ -am__objects_43 = mfluadir/mflua_nowin-mfluaextra.$(OBJEXT) -nodist_mflua_nowin_OBJECTS = $(am__objects_43) +am__objects_41 = mfluadir/mflua_nowin-mfluaextra.$(OBJEXT) +nodist_mflua_nowin_OBJECTS = $(am__objects_41) mflua_nowin_OBJECTS = $(nodist_mflua_nowin_OBJECTS) mflua_nowin_DEPENDENCIES = libmflua.a libmfluaotfcc.a \ libmfluapotrace.a libmflualpeg.a $(am__DEPENDENCIES_2) \ - $(windowlib) $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_1) + $(windowlib) $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_1) mflua_nowin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(mflua_nowin_LDFLAGS) $(LDFLAGS) -o $@ @@ -1462,13 +1432,13 @@ dist_mfluajit_OBJECTS = mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT) mfluajit_OBJECTS = $(dist_mfluajit_OBJECTS) mfluajit_DEPENDENCIES = libmfluajit.a libmfluaotfcc.a \ libmfluapotrace.a libmfluajitlpeg.a $(am__DEPENDENCIES_2) \ - $(windowlib) $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_1) \ + $(windowlib) $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) mfluajit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(mfluajit_LDFLAGS) $(LDFLAGS) -o $@ -am__objects_44 = mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT) -nodist_mfluajit_nowin_OBJECTS = $(am__objects_44) +am__objects_42 = mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT) +nodist_mfluajit_nowin_OBJECTS = $(am__objects_42) mfluajit_nowin_OBJECTS = $(nodist_mfluajit_nowin_OBJECTS) mfluajit_nowin_DEPENDENCIES = libmfluajit.a libmfluaotfcc.a \ libmfluapotrace.a libmfluajitlpeg.a $(am__DEPENDENCIES_2) \ @@ -1481,8 +1451,8 @@ nodist_mft_OBJECTS = mft.$(OBJEXT) mft_OBJECTS = $(nodist_mft_OBJECTS) mft_LDADD = $(LDADD) mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) -am__objects_45 = mpost-mpxout.$(OBJEXT) -nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_45) +am__objects_43 = mpost-mpxout.$(OBJEXT) +nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_43) mpost_OBJECTS = $(nodist_mpost_OBJECTS) mpost_DEPENDENCIES = libmplibcore.a libmplibextramath.a \ libmplibbackends.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -1510,14 +1480,14 @@ am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \ pdftexdir/etex_version.h synctexdir/synctex.c \ synctexdir/synctex.h synctexdir/synctex-common.h \ synctexdir/synctex-pdftex.h -@PDFTEX_SYNCTEX_TRUE@am__objects_46 = \ +@PDFTEX_SYNCTEX_TRUE@am__objects_44 = \ @PDFTEX_SYNCTEX_TRUE@ synctexdir/pdftex-synctex.$(OBJEXT) dist_pdftex_OBJECTS = pdftexdir/pdftex-pdftexextra.$(OBJEXT) \ - $(am__objects_46) -am__objects_47 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT) -nodist_pdftex_OBJECTS = $(am__objects_47) pdftex-pdftex-pool.$(OBJEXT) + $(am__objects_44) +am__objects_45 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT) +nodist_pdftex_OBJECTS = $(am__objects_45) pdftex-pdftex-pool.$(OBJEXT) pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS) -am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) libmd5.a pdftex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftex_CXXFLAGS) \ @@ -1539,22 +1509,22 @@ nodist_pltotf_OBJECTS = pltotf.$(OBJEXT) pltotf_OBJECTS = $(nodist_pltotf_OBJECTS) pltotf_LDADD = $(LDADD) pltotf_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) -am__objects_48 = pmpost-pmp.$(OBJEXT) -am__objects_49 = pmpost-pmpmath.$(OBJEXT) -am__objects_50 = pmpost-pmpmathinterval.$(OBJEXT) -am__objects_51 = pmpost-pmpmathbinary.$(OBJEXT) -am__objects_52 = pmpost-pmpmathdecimal.$(OBJEXT) -am__objects_53 = pmpost-pmpmathdouble.$(OBJEXT) -am__objects_54 = pmpost-pmpstrings.$(OBJEXT) -am__objects_55 = pmpost-pmpxout.$(OBJEXT) -am__objects_56 = pmpost-ppngout.$(OBJEXT) -am__objects_57 = pmpost-ppsout.$(OBJEXT) -am__objects_58 = pmpost-psvgout.$(OBJEXT) -nodist_pmpost_OBJECTS = $(am__objects_48) $(am__objects_49) \ - $(am__objects_50) $(am__objects_51) $(am__objects_52) \ - $(am__objects_53) pmpost-pmpost.$(OBJEXT) $(am__objects_54) \ - $(am__objects_55) $(am__objects_56) $(am__objects_57) \ - $(am__objects_58) pmpost-ptfmin.$(OBJEXT) +am__objects_46 = pmpost-pmp.$(OBJEXT) +am__objects_47 = pmpost-pmpmath.$(OBJEXT) +am__objects_48 = pmpost-pmpmathinterval.$(OBJEXT) +am__objects_49 = pmpost-pmpmathbinary.$(OBJEXT) +am__objects_50 = pmpost-pmpmathdecimal.$(OBJEXT) +am__objects_51 = pmpost-pmpmathdouble.$(OBJEXT) +am__objects_52 = pmpost-pmpstrings.$(OBJEXT) +am__objects_53 = pmpost-pmpxout.$(OBJEXT) +am__objects_54 = pmpost-ppngout.$(OBJEXT) +am__objects_55 = pmpost-ppsout.$(OBJEXT) +am__objects_56 = pmpost-psvgout.$(OBJEXT) +nodist_pmpost_OBJECTS = $(am__objects_46) $(am__objects_47) \ + $(am__objects_48) $(am__objects_49) $(am__objects_50) \ + $(am__objects_51) pmpost-pmpost.$(OBJEXT) $(am__objects_52) \ + $(am__objects_53) $(am__objects_54) $(am__objects_55) \ + $(am__objects_56) pmpost-ptfmin.$(OBJEXT) pmpost_OBJECTS = $(nodist_pmpost_OBJECTS) pmpost_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -1566,17 +1536,17 @@ pooltype_OBJECTS = $(nodist_pooltype_OBJECTS) pooltype_LDADD = $(LDADD) pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) -am__objects_59 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT) -nodist_ptex_OBJECTS = $(am__objects_59) ptex-ptex-pool.$(OBJEXT) +am__objects_57 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT) +nodist_ptex_OBJECTS = $(am__objects_57) ptex-ptex-pool.$(OBJEXT) ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS) -am__DEPENDENCIES_11 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_10 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) am_synctex_OBJECTS = synctexdir/synctex-synctex_main.$(OBJEXT) synctex_OBJECTS = $(am_synctex_OBJECTS) -am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -@MINGW32_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) -synctex_DEPENDENCIES = $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_13) +am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@MINGW32_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1) +synctex_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_12) nodist_tangle_OBJECTS = tangle.$(OBJEXT) tangle_OBJECTS = $(nodist_tangle_OBJECTS) tangle_LDADD = $(LDADD) @@ -1587,14 +1557,14 @@ tangleboot_LDADD = $(LDADD) am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \ synctexdir/synctex.h synctexdir/synctex-common.h \ synctexdir/synctex-tex.h -@TEX_SYNCTEX_TRUE@am__objects_60 = synctexdir/tex-synctex.$(OBJEXT) -dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_60) -am__objects_61 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT) -nodist_tex_OBJECTS = $(am__objects_61) tex-tex-pool.$(OBJEXT) +@TEX_SYNCTEX_TRUE@am__objects_58 = synctexdir/tex-synctex.$(OBJEXT) +dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_58) +am__objects_59 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT) +nodist_tex_OBJECTS = $(am__objects_59) tex-tex-pool.$(OBJEXT) tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS) -@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1) +@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_14) + $(am__DEPENDENCIES_13) nodist_tftopl_OBJECTS = tftopl.$(OBJEXT) tftopl_OBJECTS = $(nodist_tftopl_OBJECTS) tftopl_LDADD = $(LDADD) @@ -1613,42 +1583,42 @@ twill_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) am_upbibtex_OBJECTS = nodist_upbibtex_OBJECTS = upbibtex-upbibtex.$(OBJEXT) upbibtex_OBJECTS = $(am_upbibtex_OBJECTS) $(nodist_upbibtex_OBJECTS) -am__DEPENDENCIES_15 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_14 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) am_updvitype_OBJECTS = nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT) updvitype_OBJECTS = $(am_updvitype_OBJECTS) \ $(nodist_updvitype_OBJECTS) -am__objects_62 = upmpost-pmp.$(OBJEXT) -am__objects_63 = upmpost-pmpmath.$(OBJEXT) -am__objects_64 = upmpost-pmpmathinterval.$(OBJEXT) -am__objects_65 = upmpost-pmpmathbinary.$(OBJEXT) -am__objects_66 = upmpost-pmpmathdecimal.$(OBJEXT) -am__objects_67 = upmpost-pmpmathdouble.$(OBJEXT) -am__objects_68 = upmpost-pmpstrings.$(OBJEXT) -am__objects_69 = upmpost-pmpxout.$(OBJEXT) -am__objects_70 = upmpost-ppngout.$(OBJEXT) -am__objects_71 = upmpost-ppsout.$(OBJEXT) -am__objects_72 = upmpost-psvgout.$(OBJEXT) -am__objects_73 = $(am__objects_62) $(am__objects_63) $(am__objects_64) \ - $(am__objects_65) $(am__objects_66) $(am__objects_67) \ - upmpost-pmpost.$(OBJEXT) $(am__objects_68) $(am__objects_69) \ - $(am__objects_70) $(am__objects_71) $(am__objects_72) \ +am__objects_60 = upmpost-pmp.$(OBJEXT) +am__objects_61 = upmpost-pmpmath.$(OBJEXT) +am__objects_62 = upmpost-pmpmathinterval.$(OBJEXT) +am__objects_63 = upmpost-pmpmathbinary.$(OBJEXT) +am__objects_64 = upmpost-pmpmathdecimal.$(OBJEXT) +am__objects_65 = upmpost-pmpmathdouble.$(OBJEXT) +am__objects_66 = upmpost-pmpstrings.$(OBJEXT) +am__objects_67 = upmpost-pmpxout.$(OBJEXT) +am__objects_68 = upmpost-ppngout.$(OBJEXT) +am__objects_69 = upmpost-ppsout.$(OBJEXT) +am__objects_70 = upmpost-psvgout.$(OBJEXT) +am__objects_71 = $(am__objects_60) $(am__objects_61) $(am__objects_62) \ + $(am__objects_63) $(am__objects_64) $(am__objects_65) \ + upmpost-pmpost.$(OBJEXT) $(am__objects_66) $(am__objects_67) \ + $(am__objects_68) $(am__objects_69) $(am__objects_70) \ upmpost-ptfmin.$(OBJEXT) -nodist_upmpost_OBJECTS = $(am__objects_73) +nodist_upmpost_OBJECTS = $(am__objects_71) upmpost_OBJECTS = $(nodist_upmpost_OBJECTS) -am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) libmputil.a -upmpost_DEPENDENCIES = $(am__DEPENDENCIES_16) +upmpost_DEPENDENCIES = $(am__DEPENDENCIES_15) am_uppltotf_OBJECTS = nodist_uppltotf_OBJECTS = uppltotf-uppltotf.$(OBJEXT) uppltotf_OBJECTS = $(am_uppltotf_OBJECTS) $(nodist_uppltotf_OBJECTS) dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT) -am__objects_74 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT) -nodist_uptex_OBJECTS = $(am__objects_74) uptex-uptex-pool.$(OBJEXT) +am__objects_72 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT) +nodist_uptex_OBJECTS = $(am__objects_72) uptex-uptex-pool.$(OBJEXT) uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS) am_uptftopl_OBJECTS = nodist_uptftopl_OBJECTS = uptftopl-uptftopl.$(OBJEXT) @@ -1686,20 +1656,20 @@ am__dist_xetex_SOURCES_DIST = xetexdir/xetexextra.c \ xetexdir/xetex_version.h synctexdir/synctex.c \ synctexdir/synctex.h synctexdir/synctex-common.h \ synctexdir/synctex-xetex.h -@XETEX_SYNCTEX_TRUE@am__objects_75 = \ +@XETEX_SYNCTEX_TRUE@am__objects_73 = \ @XETEX_SYNCTEX_TRUE@ synctexdir/xetex-synctex.$(OBJEXT) dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \ - $(am__objects_75) -am__objects_76 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT) -nodist_xetex_OBJECTS = $(am__objects_76) xetex-xetex-pool.$(OBJEXT) + $(am__objects_73) +am__objects_74 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT) +nodist_xetex_OBJECTS = $(am__objects_74) xetex-xetex-pool.$(OBJEXT) xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS) -@XETEX_MACOSX_FALSE@am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1) -am__DEPENDENCIES_18 = $(libxetex) $(am__DEPENDENCIES_1) \ +@XETEX_MACOSX_FALSE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1) +am__DEPENDENCIES_17 = $(libxetex) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_17) -xetex_DEPENDENCIES = $(am__DEPENDENCIES_18) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_16) +xetex_DEPENDENCIES = $(am__DEPENDENCIES_17) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_1) xetex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xetex_CXXFLAGS) \ @@ -1737,10 +1707,8 @@ am__depfiles_remade = ./$(DEPDIR)/aleph-aleph-pool.Po \ ./$(DEPDIR)/ctwill.Po ./$(DEPDIR)/cweave.Po \ ./$(DEPDIR)/cweb.Po ./$(DEPDIR)/cwebboot.Po \ ./$(DEPDIR)/dvicopy.Po ./$(DEPDIR)/dvitype.Po \ - ./$(DEPDIR)/eptex-eptex-pool.Po ./$(DEPDIR)/eptex-eptex0.Po \ - ./$(DEPDIR)/eptex-eptexini.Po ./$(DEPDIR)/etex-etex-pool.Po \ - ./$(DEPDIR)/etex-etex0.Po ./$(DEPDIR)/etex-etexini.Po \ - ./$(DEPDIR)/euptex-euptex-pool.Po \ + ./$(DEPDIR)/etex-etex-pool.Po ./$(DEPDIR)/etex-etex0.Po \ + ./$(DEPDIR)/etex-etexini.Po ./$(DEPDIR)/euptex-euptex-pool.Po \ ./$(DEPDIR)/euptex-euptex0.Po ./$(DEPDIR)/euptex-euptexini.Po \ ./$(DEPDIR)/gftodvi.Po ./$(DEPDIR)/gftopk.Po \ ./$(DEPDIR)/gftype.Po ./$(DEPDIR)/himktables.Po \ @@ -1824,7 +1792,6 @@ am__depfiles_remade = ./$(DEPDIR)/aleph-aleph-pool.Po \ alephdir/$(DEPDIR)/aleph-aleph.Po \ alephdir/$(DEPDIR)/aleph-alephbis.Po \ alephdir/$(DEPDIR)/aleph-alephextra.Po \ - eptexdir/$(DEPDIR)/eptex-eptexextra.Po \ etexdir/$(DEPDIR)/etex-etexextra.Po \ euptexdir/$(DEPDIR)/euptex-euptexextra.Po \ hitexdir/$(DEPDIR)/hishrink-hilexer.Po \ @@ -2366,7 +2333,6 @@ am__depfiles_remade = ./$(DEPDIR)/aleph-aleph-pool.Po \ ptexdir/$(DEPDIR)/libkanji_a-kanji.Po \ ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po \ ptexdir/$(DEPDIR)/ptex-ptexextra.Po \ - synctexdir/$(DEPDIR)/eptex-synctex.Po \ synctexdir/$(DEPDIR)/etex-synctex.Po \ synctexdir/$(DEPDIR)/euptex-synctex.Po \ synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po \ @@ -2493,7 +2459,6 @@ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ $(nodist_ctwill_refsort_SOURCES) \ $(nodist_ctwill_twinx_SOURCES) $(nodist_cweave_SOURCES) \ $(nodist_dvicopy_SOURCES) $(nodist_dvitype_SOURCES) \ - $(dist_eptex_SOURCES) $(nodist_eptex_SOURCES) \ $(dist_etex_SOURCES) $(nodist_etex_SOURCES) \ $(dist_euptex_SOURCES) $(nodist_euptex_SOURCES) \ $(gftodvi_SOURCES) $(nodist_gftodvi_SOURCES) \ @@ -2541,13 +2506,12 @@ DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ $(am__libpdftex_a_SOURCES_DIST) $(EXTRA_libpdftex_a_SOURCES) \ $(libukanji_a_SOURCES) $(libunilib_a_SOURCES) \ $(am__libxetex_a_SOURCES_DIST) $(libsynctex_la_SOURCES) \ - $(dist_aleph_SOURCES) $(am__dist_eptex_SOURCES_DIST) \ - $(am__dist_etex_SOURCES_DIST) $(am__dist_euptex_SOURCES_DIST) \ - $(gftodvi_SOURCES) himktables.c $(md5main_SOURCES) \ - $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \ - $(dist_mflua_SOURCES) $(dist_mfluajit_SOURCES) \ - $(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \ - $(dist_ptex_SOURCES) $(synctex_SOURCES) \ + $(dist_aleph_SOURCES) $(am__dist_etex_SOURCES_DIST) \ + $(am__dist_euptex_SOURCES_DIST) $(gftodvi_SOURCES) \ + himktables.c $(md5main_SOURCES) $(dist_mf_SOURCES) \ + $(dist_mf_nowin_SOURCES) $(dist_mflua_SOURCES) \ + $(dist_mfluajit_SOURCES) $(am__dist_pdftex_SOURCES_DIST) \ + $(pdftosrc_SOURCES) $(dist_ptex_SOURCES) $(synctex_SOURCES) \ $(am__dist_tex_SOURCES_DIST) $(ttf2afm_SOURCES) \ $(EXTRA_ttf2afm_SOURCES) $(upbibtex_SOURCES) \ $(updvitype_SOURCES) $(uppltotf_SOURCES) $(dist_uptex_SOURCES) \ @@ -2757,15 +2721,15 @@ am__set_TESTS_bases = \ bases=`echo $$bases` AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) -am__EXEEXT_43 = bibtex.test dvicopy.test dvitype.test gftodvi.test \ +am__EXEEXT_42 = 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 twill.test -am__EXEEXT_44 = $(am__EXEEXT_43) tests/bibtex-openout-test.pl \ +am__EXEEXT_43 = $(am__EXEEXT_42) tests/bibtex-openout-test.pl \ tests/bibtex-longline-test.pl tests/bibtex-mem.test \ tests/bibtex-bigauth.test tests/bibtex-auxinclude.test -@WEB_TRUE@am__EXEEXT_45 = $(am__EXEEXT_44) -am__EXEEXT_46 = +@WEB_TRUE@am__EXEEXT_44 = $(am__EXEEXT_43) +am__EXEEXT_45 = TEST_SUITE_LOG = test-suite.log am__test_logs1 = $(TESTS:=.log) am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) @@ -2792,8 +2756,7 @@ am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/../../am/bin_links.am \ $(srcdir)/alephdir/am/aleph.am $(srcdir)/am/bootstrap.am \ $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/am/web.am \ $(srcdir)/c-auto.in $(srcdir)/ctangleboot-sh.in \ - $(srcdir)/eptexdir/am/eptex.am $(srcdir)/etexdir/am/etex.am \ - $(srcdir)/euptexdir/am/euptex.am \ + $(srcdir)/etexdir/am/etex.am $(srcdir)/euptexdir/am/euptex.am \ $(srcdir)/hitexdir/am/hitex.am $(srcdir)/libmd5/am/md5.am \ $(srcdir)/luatexdir/am/libluatex.am \ $(srcdir)/luatexdir/am/libunilib.am \ @@ -2997,7 +2960,7 @@ NM = @NM@ NMEDIT = @NMEDIT@ OBJCXX = @OBJCXX@ OBJCXXDEPMODE = @OBJCXXDEPMODE@ -OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_116) +OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_111) OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTANGLE = @OTANGLE@ @@ -3144,8 +3107,8 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \ libluaharfbuzz.a libluajitharfbuzz.a libxetex.a libsynctex.a \ libmd5.a EXTRA_LTLIBRARIES = libsynctex.la -lib_LIBRARIES = $(am__append_128) -lib_LTLIBRARIES = $(am__append_127) +lib_LIBRARIES = $(am__append_123) +lib_LTLIBRARIES = $(am__append_122) dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 nodist_man_MANS = TEST_EXTENSIONS = .pl .test @@ -3254,19 +3217,12 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ ptexdir/tests/chcode-euc.pl ptexdir/tests/chcode-sjis.pl \ ptexdir/tests/skipjfmp.pl ptexdir/tests/skipjfmp.tfm \ ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf \ - $(eptex_web_srcs) $(eptex_ch_srcs) eptexdir/eptex.defines \ - eptexdir/ChangeLog eptexdir/Changes.txt eptexdir/README.txt \ - $(eptex_tests) eptexdir/eptrip/eptrip.diffs \ - eptexdir/eptrip/eptrip.log eptexdir/eptrip/eptrip.tex \ - eptexdir/eptrip/texmf.cnf eptexdir/pdfprimitive.test \ - eptexdir/tests/pdfprimitive-test.tex \ - eptexdir/tests/pdfprimitive-eptex.log $(uptex_web_srcs) \ - $(uptex_ch_srcs) uptexdir/uptex.defines uptexdir/upbibtex.ch \ - uptexdir/updvitype.ch uptexdir/uppltotf.ch \ - uptexdir/uptftopl.ch uptexdir/COPYRIGHT uptexdir/COPYRIGHT.ja \ - uptexdir/ChangeLog $(uptex_tests) $(upweb_tests) \ - tests/enc-u.bbl tests/enc-eu.bbl tests/enc-su.bbl \ - tests/enc-uu.bbl uptexdir/tests/uptex3.tex \ + $(uptex_web_srcs) $(uptex_ch_srcs) uptexdir/uptex.defines \ + uptexdir/upbibtex.ch uptexdir/updvitype.ch \ + uptexdir/uppltotf.ch uptexdir/uptftopl.ch uptexdir/COPYRIGHT \ + uptexdir/COPYRIGHT.ja uptexdir/ChangeLog $(uptex_tests) \ + $(upweb_tests) tests/enc-u.bbl tests/enc-eu.bbl \ + tests/enc-su.bbl tests/enc-uu.bbl uptexdir/tests/uptex3.tex \ uptexdir/tests/uptex3.dvi uptexdir/tests/uptex4.tex \ uptexdir/tests/uptex4.dvi uptexdir/tests/uptex3a.typ \ uptexdir/tests/uptex4a.typ uptexdir/tests/umin10.pl \ @@ -3545,10 +3501,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ synctexdir/synctex-mem.ch2 synctexdir/synctex-rec.ch0 \ synctexdir/synctex-rec.ch1 synctexdir/synctex-rec.ch2 \ synctexdir/synctex-e-mem.ch0 synctexdir/synctex-e-mem.ch1 \ - synctexdir/synctex-e-rec.ch0 synctexdir/synctex-ep-mem.ch0 \ - synctexdir/synctex-ep-mem.ch1 synctexdir/synctex-ep-rec.ch0 \ - synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-rec.ch3 \ - $(synctex_tests) libmd5/md5.test + synctexdir/synctex-e-rec.ch0 synctexdir/synctex-pdf-rec.ch2 \ + synctexdir/synctex-xe-rec.ch3 $(synctex_tests) libmd5/md5.test DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \ tangleboot.c tangleboot.h tangleboot.p tangleboot-web2c \ ctangle.c cweb.c common-ctangle ctangleboot.c cwebboot.c \ @@ -3596,8 +3550,6 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \ ptests/xpagenum.typ ptests/xptex[34]*.typ ptests/xcmr10.tfm \ ptests/xcmr10.pl ptests/xsample*.typ ptests/x*min10.* \ ptests/xchcode*.* ptests/xskipjfmp.* ptrip.diffs \ - $(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c eptex.p \ - eptex.pool eptex-tangle eptrip.diffs pdfprimitive-eptex.* \ $(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c uptex.p \ uptex.pool uptex-tangle $(upweb_programs:=.c) \ $(upweb_programs:=.h) $(upweb_programs:=.p) \ @@ -3646,28 +3598,25 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \ CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES) TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_27) \ $(am__append_36) $(am__append_44) $(am__append_60) \ - $(am__append_64) $(am__append_70) $(am__append_75) \ - $(am__append_83) + $(am__append_64) $(am__append_70) $(am__append_78) TRIPTRAP = $(am__append_7) $(am__append_17) $(am__append_26) \ $(am__append_35) $(am__append_43) $(am__append_59) \ - $(am__append_63) $(am__append_69) $(am__append_74) \ - $(am__append_82) + $(am__append_63) $(am__append_69) $(am__append_77) bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \ $(am__append_24) $(am__append_33) $(am__append_41) \ - $(am__append_49) $(am__append_54) $(am__append_67) \ - upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \ - uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \ - $(am__append_78) $(am__append_79) $(am__append_80) \ - $(am__append_94) $(am__append_99) $(am__append_104) \ - $(am__append_109) + $(am__append_49) $(am__append_54) upbibtex$(EXEEXT):pbibtex \ + updvitype$(EXEEXT):pdvitype uppltotf$(EXEEXT):ppltotf \ + uptftopl$(EXEEXT):ptftopl $(am__append_73) $(am__append_74) \ + $(am__append_75) $(am__append_89) $(am__append_94) \ + $(am__append_99) $(am__append_104) install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \ $(am__append_39) $(am__append_47) $(am__append_52) \ - $(am__append_92) $(am__append_97) $(am__append_102) \ - $(am__append_107) + $(am__append_87) $(am__append_92) $(am__append_97) \ + $(am__append_102) uninstall_exe_links = $(am__append_13) $(am__append_23) \ $(am__append_32) $(am__append_40) $(am__append_48) \ - $(am__append_53) $(am__append_93) $(am__append_98) \ - $(am__append_103) $(am__append_108) + $(am__append_53) $(am__append_88) $(am__append_93) \ + $(am__append_98) $(am__append_103) NEVER_DIST = `find . $(NEVER_NAMES)` cwebdir/cweave.log \ cwebdir/cweave.trs cwebdir/ctwill.log cwebdir/ctwill.trs \ cwebdir/refsort.log cwebdir/refsort.trs cwebdir/twinx.log \ @@ -3844,18 +3793,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C initex_CPPFLAGS = -DEXEPROG=\"tex.exe\" nodist_initex_SOURCES = callexe.c initex_LDADD = -tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_132) +tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_127) # With --enable-ipc, TeX may need to link with -lsocket. -tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_133) +tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_128) # 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_135) +dist_tex_SOURCES = texextra.c $(am__append_130) # We must create texd.h before building the tex_OBJECTS. -tex_prereq = texd.h $(am__append_134) +tex_prereq = texd.h $(am__append_129) tex_ch_srcs = \ tex.web \ tex.ch \ @@ -4355,21 +4304,21 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \ mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \ mplibdir/mpmathinterval.w mplibdir/mpmathdecimal.w \ mplibdir/mpmathdouble.w mplibdir/mpstrings.w mplibdir/tfmin.w -etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_136) +etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_131) # With --enable-ipc, e-TeX may need to link with -lsocket. -etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_137) +etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_132) etex_DEPENDENCIES = $(ZLIB_DEPEND) # e-TeX C sources etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h nodist_etex_SOURCES = $(etex_c_h) etex-pool.c dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \ - etexdir/etex_version.h $(am__append_139) + etexdir/etex_version.h $(am__append_134) # 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_138) +etex_prereq = etexd.h etexdir/etex_version.h $(am__append_133) etex_web_srcs = \ tex.web \ etexdir/etex.ch @@ -4436,58 +4385,6 @@ ptex_tests = \ ptexdir/pver.test \ ptexdir/wcfname.test -eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \ - $(ZLIB_INCLUDES) $(am__append_140) - -# With --enable-ipc, e-pTeX may need to link with -lsocket. -eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_141) -eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND) - -# e-pTeX C sources -eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h -nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c -dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \ - eptexdir/eptex_version.h $(am__append_143) - -# We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS. -eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \ - eptexdir/eptex_version.h $(am__append_142) -eptex_web_srcs = \ - tex.web \ - etexdir/etex.ch \ - etexdir/tex.ch0 \ - tex.ch \ - tracingstacklevels.ch \ - partoken.ch \ - locnull-optimize.ch \ - showstream.ch \ - zlib-fmt.ch \ - etexdir/tex.ech - -eptex_ch_srcs = \ - eptexdir/eptex-base.ch \ - eptexdir/etex.ch0 \ - ptexdir/ptex-base.ch \ - eptexdir/eptex.ech \ - eptexdir/etex.ch1 \ - $(eptex_ch_synctex) \ - eptexdir/fam256.ch \ - eptexdir/pdfutils.ch \ - eptexdir/suppresserrors.ch \ - eptexdir/unbalanced-braces-eptex.ch \ - eptexdir/char-warning-eptex.ch \ - tex-binpool.ch - - -# e-pTeX Tests -# -eptex_tests = \ - eptexdir/eptriptest.test \ - eptexdir/pdfprimitive.test \ - eptexdir/epver.test \ - eptexdir/wcfname.test - uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(ZLIB_INCLUDES) uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ZLIB_LIBS) uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(ZLIB_DEPEND) $(default_dependencies) @@ -4561,23 +4458,23 @@ upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \ uptexdir/newjfm.test uptexdir/uparse.test uptexdir/gkhuge.test \ uptexdir/gk256.test euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \ - -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_144) + -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_135) # With --enable-ipc, e-upTeX may need to link with -lsocket. euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_145) + $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_136) euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND) # e-upTeX C sources euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \ - $(am__append_147) + $(am__append_138) # We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS. euptex_prereq = euptexd.h etexdir/etex_version.h \ uptexdir/ptex_version.h euptexdir/eptex_version.h \ - uptexdir/uptex_version.h $(am__append_146) + uptexdir/uptex_version.h $(am__append_137) euptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -4604,7 +4501,7 @@ euptex_ch_srcs = \ euptexdir/pdfutils.ch \ euptexdir/pdfstrcmp-eup-post.ch \ euptexdir/suppresserrors.ch \ - eptexdir/unbalanced-braces-eptex.ch \ + euptexdir/unbalanced-braces-eptex.ch \ euptexdir/char-warning-eptex.ch \ tex-binpool.ch @@ -4697,7 +4594,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \ pdftexdir/writejbig2.c pdftexdir/writejpg.c \ pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \ pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \ - $(am__append_87) + $(am__append_82) @MINGW32_TRUE@REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \ pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \ @@ -4713,7 +4610,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 AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE) -pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_148) +pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_139) pdftex_CXXFLAGS = $(WARNING_CXXFLAGS) # With --enable-ipc, pdfTeX may need to link with -lsocket. @@ -4726,7 +4623,7 @@ pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \ pdftexdir/pdftex_version.h pdftexdir/etex_version.h \ - $(am__append_149) + $(am__append_140) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -5408,18 +5305,18 @@ libxetex = libxetex.a xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \ $(GRAPHITE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) \ - $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_115) \ - $(am__append_117) + $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_110) \ + $(am__append_112) xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \ $(ICU_LIBS) $(ICU_LIBS_EXTRA) $(TECKIT_LIBS) $(LIBPNG_LIBS) \ $(FREETYPE2_LIBS) $(PPLIB_LIBS) $(ZLIB_LIBS) libmd5.a \ - $(am__append_118) + $(am__append_113) xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \ $(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \ $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) \ $(PPLIB_DEPEND) libmd5.a @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa -xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_150) +xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_141) xetex_CFLAGS = $(WARNING_CFLAGS) xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) @@ -5428,7 +5325,7 @@ xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \ xetexdir/etex_version.h xetexdir/xetex_version.h \ - $(am__append_151) + $(am__append_142) xetex_ch_srcs = \ xetexdir/xetex.web \ xetexdir/tex.ch0 \ @@ -5462,7 +5359,7 @@ libxetex_a_SOURCES = xetexdir/XeTeXFontInst.cpp \ xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \ xetexdir/image/mfileio.h xetexdir/image/numbers.c \ xetexdir/image/numbers.h xetexdir/image/pngimage.c \ - xetexdir/image/pngimage.h $(am__append_119) $(am__append_120) + xetexdir/image/pngimage.h $(am__append_114) $(am__append_115) # We must create xetexd.h etc. before building the libxetex_a_OBJECTS. libxetex_prereq = xetexd.h $(xetex_dependencies) @@ -5568,13 +5465,13 @@ aleph_tests = alephdir/aleph.test synctex_SOURCES = \ synctexdir/synctex_main.c -synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_129) -synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_130) +synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_124) +synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_125) libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX) libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS) libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO) -libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_131) +libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_126) libsynctex_la_SOURCES = \ synctexdir/synctex_parser.c \ synctexdir/synctex_parser_local.h \ @@ -5606,19 +5503,6 @@ pkgconfigdir = ${libdir}/pkgconfig @ETEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0 -@EPTEX_SYNCTEX_TRUE@eptex_ch_synctex = \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch0 \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch0 \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch1 \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-rec.ch0 \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0 \ -@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1 - @EUPTEX_SYNCTEX_TRUE@euptex_ch_synctex = \ @EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \ @EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch0 \ @@ -5669,7 +5553,7 @@ all: ff-config.h .SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .pl .pl$(EXEEXT) .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluadir/am/mfluapotrace.am $(srcdir)/mfluadir/am/mflualpeg.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mfluajitdir/am/mfluajitlpeg.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluadir/am/mfluapotrace.am $(srcdir)/mfluadir/am/mflualpeg.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mfluajitdir/am/mfluajitlpeg.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -5691,7 +5575,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; -$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluadir/am/mfluapotrace.am $(srcdir)/mfluadir/am/mflualpeg.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mfluajitdir/am/mfluajitlpeg.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty): +$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluadir/am/mfluapotrace.am $(srcdir)/mfluadir/am/mflualpeg.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mfluajitdir/am/mfluajitlpeg.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -8076,20 +7960,6 @@ dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEP dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES) @rm -f dvitype$(EXEEXT) $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS) -eptexdir/$(am__dirstamp): - @$(MKDIR_P) eptexdir - @: > eptexdir/$(am__dirstamp) -eptexdir/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) eptexdir/$(DEPDIR) - @: > eptexdir/$(DEPDIR)/$(am__dirstamp) -eptexdir/eptex-eptexextra.$(OBJEXT): eptexdir/$(am__dirstamp) \ - eptexdir/$(DEPDIR)/$(am__dirstamp) -synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \ - synctexdir/$(DEPDIR)/$(am__dirstamp) - -eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES) - @rm -f eptex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS) etexdir/$(am__dirstamp): @$(MKDIR_P) etexdir @: > etexdir/$(am__dirstamp) @@ -8449,7 +8319,6 @@ uninstall-dist_binSCRIPTS: mostlyclean-compile: -rm -f *.$(OBJEXT) -rm -f alephdir/*.$(OBJEXT) - -rm -f eptexdir/*.$(OBJEXT) -rm -f etexdir/*.$(OBJEXT) -rm -f euptexdir/*.$(OBJEXT) -rm -f hitexdir/*.$(OBJEXT) @@ -8547,9 +8416,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cwebboot.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvicopy.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvitype.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptex-pool.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptex0.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptexini.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etex-pool.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etex0.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etexini.Po@am__quote@ # am--include-marker @@ -8675,7 +8541,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@alephdir/$(DEPDIR)/aleph-aleph.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@alephdir/$(DEPDIR)/aleph-alephbis.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@alephdir/$(DEPDIR)/aleph-alephextra.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@eptexdir/$(DEPDIR)/eptex-eptexextra.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@etexdir/$(DEPDIR)/etex-etexextra.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@euptexdir/$(DEPDIR)/euptex-euptexextra.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@hitexdir/$(DEPDIR)/hishrink-hilexer.Po@am__quote@ # am--include-marker @@ -9218,7 +9083,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@ptexdir/$(DEPDIR)/libkanji_a-kanji.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@ptexdir/$(DEPDIR)/ptex-ptexextra.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/eptex-synctex.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/etex-synctex.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/euptex-synctex.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po@am__quote@ # am--include-marker @@ -17348,76 +17212,6 @@ call_upmpost-callexe.obj: callexe.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_upmpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi` -eptexdir/eptex-eptexextra.o: eptexdir/eptexextra.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptexdir/eptex-eptexextra.o -MD -MP -MF eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo -c -o eptexdir/eptex-eptexextra.o `test -f 'eptexdir/eptexextra.c' || echo '$(srcdir)/'`eptexdir/eptexextra.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo eptexdir/$(DEPDIR)/eptex-eptexextra.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexdir/eptexextra.c' object='eptexdir/eptex-eptexextra.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptexdir/eptex-eptexextra.o `test -f 'eptexdir/eptexextra.c' || echo '$(srcdir)/'`eptexdir/eptexextra.c - -eptexdir/eptex-eptexextra.obj: eptexdir/eptexextra.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptexdir/eptex-eptexextra.obj -MD -MP -MF eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo -c -o eptexdir/eptex-eptexextra.obj `if test -f 'eptexdir/eptexextra.c'; then $(CYGPATH_W) 'eptexdir/eptexextra.c'; else $(CYGPATH_W) '$(srcdir)/eptexdir/eptexextra.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo eptexdir/$(DEPDIR)/eptex-eptexextra.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexdir/eptexextra.c' object='eptexdir/eptex-eptexextra.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptexdir/eptex-eptexextra.obj `if test -f 'eptexdir/eptexextra.c'; then $(CYGPATH_W) 'eptexdir/eptexextra.c'; else $(CYGPATH_W) '$(srcdir)/eptexdir/eptexextra.c'; fi` - -synctexdir/eptex-synctex.o: synctexdir/synctex.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/eptex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/eptex-synctex.Tpo -c -o synctexdir/eptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/eptex-synctex.Tpo synctexdir/$(DEPDIR)/eptex-synctex.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/eptex-synctex.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/eptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c - -synctexdir/eptex-synctex.obj: synctexdir/synctex.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/eptex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/eptex-synctex.Tpo -c -o synctexdir/eptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/eptex-synctex.Tpo synctexdir/$(DEPDIR)/eptex-synctex.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/eptex-synctex.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/eptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi` - -eptex-eptexini.o: eptexini.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptexini.o -MD -MP -MF $(DEPDIR)/eptex-eptexini.Tpo -c -o eptex-eptexini.o `test -f 'eptexini.c' || echo '$(srcdir)/'`eptexini.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptexini.Tpo $(DEPDIR)/eptex-eptexini.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexini.c' object='eptex-eptexini.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptexini.o `test -f 'eptexini.c' || echo '$(srcdir)/'`eptexini.c - -eptex-eptexini.obj: eptexini.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptexini.obj -MD -MP -MF $(DEPDIR)/eptex-eptexini.Tpo -c -o eptex-eptexini.obj `if test -f 'eptexini.c'; then $(CYGPATH_W) 'eptexini.c'; else $(CYGPATH_W) '$(srcdir)/eptexini.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptexini.Tpo $(DEPDIR)/eptex-eptexini.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexini.c' object='eptex-eptexini.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptexini.obj `if test -f 'eptexini.c'; then $(CYGPATH_W) 'eptexini.c'; else $(CYGPATH_W) '$(srcdir)/eptexini.c'; fi` - -eptex-eptex0.o: eptex0.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex0.o -MD -MP -MF $(DEPDIR)/eptex-eptex0.Tpo -c -o eptex-eptex0.o `test -f 'eptex0.c' || echo '$(srcdir)/'`eptex0.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex0.Tpo $(DEPDIR)/eptex-eptex0.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex0.c' object='eptex-eptex0.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex0.o `test -f 'eptex0.c' || echo '$(srcdir)/'`eptex0.c - -eptex-eptex0.obj: eptex0.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex0.obj -MD -MP -MF $(DEPDIR)/eptex-eptex0.Tpo -c -o eptex-eptex0.obj `if test -f 'eptex0.c'; then $(CYGPATH_W) 'eptex0.c'; else $(CYGPATH_W) '$(srcdir)/eptex0.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex0.Tpo $(DEPDIR)/eptex-eptex0.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex0.c' object='eptex-eptex0.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex0.obj `if test -f 'eptex0.c'; then $(CYGPATH_W) 'eptex0.c'; else $(CYGPATH_W) '$(srcdir)/eptex0.c'; fi` - -eptex-eptex-pool.o: eptex-pool.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex-pool.o -MD -MP -MF $(DEPDIR)/eptex-eptex-pool.Tpo -c -o eptex-eptex-pool.o `test -f 'eptex-pool.c' || echo '$(srcdir)/'`eptex-pool.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex-pool.Tpo $(DEPDIR)/eptex-eptex-pool.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex-pool.c' object='eptex-eptex-pool.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex-pool.o `test -f 'eptex-pool.c' || echo '$(srcdir)/'`eptex-pool.c - -eptex-eptex-pool.obj: eptex-pool.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex-pool.obj -MD -MP -MF $(DEPDIR)/eptex-eptex-pool.Tpo -c -o eptex-eptex-pool.obj `if test -f 'eptex-pool.c'; then $(CYGPATH_W) 'eptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/eptex-pool.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex-pool.Tpo $(DEPDIR)/eptex-eptex-pool.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex-pool.c' object='eptex-eptex-pool.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex-pool.obj `if test -f 'eptex-pool.c'; then $(CYGPATH_W) 'eptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/eptex-pool.c'; fi` - etexdir/etex-etexextra.o: etexdir/etexextra.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT etexdir/etex-etexextra.o -MD -MP -MF etexdir/$(DEPDIR)/etex-etexextra.Tpo -c -o etexdir/etex-etexextra.o `test -f 'etexdir/etexextra.c' || echo '$(srcdir)/'`etexdir/etexextra.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) etexdir/$(DEPDIR)/etex-etexextra.Tpo etexdir/$(DEPDIR)/etex-etexextra.Po @@ -19715,8 +19509,6 @@ distclean-generic: -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -rm -f alephdir/$(DEPDIR)/$(am__dirstamp) -rm -f alephdir/$(am__dirstamp) - -rm -f eptexdir/$(DEPDIR)/$(am__dirstamp) - -rm -f eptexdir/$(am__dirstamp) -rm -f etexdir/$(DEPDIR)/$(am__dirstamp) -rm -f etexdir/$(am__dirstamp) -rm -f euptexdir/$(DEPDIR)/$(am__dirstamp) @@ -19889,9 +19681,6 @@ distclean: distclean-recursive -rm -f ./$(DEPDIR)/cwebboot.Po -rm -f ./$(DEPDIR)/dvicopy.Po -rm -f ./$(DEPDIR)/dvitype.Po - -rm -f ./$(DEPDIR)/eptex-eptex-pool.Po - -rm -f ./$(DEPDIR)/eptex-eptex0.Po - -rm -f ./$(DEPDIR)/eptex-eptexini.Po -rm -f ./$(DEPDIR)/etex-etex-pool.Po -rm -f ./$(DEPDIR)/etex-etex0.Po -rm -f ./$(DEPDIR)/etex-etexini.Po @@ -20017,7 +19806,6 @@ distclean: distclean-recursive -rm -f alephdir/$(DEPDIR)/aleph-aleph.Po -rm -f alephdir/$(DEPDIR)/aleph-alephbis.Po -rm -f alephdir/$(DEPDIR)/aleph-alephextra.Po - -rm -f eptexdir/$(DEPDIR)/eptex-eptexextra.Po -rm -f etexdir/$(DEPDIR)/etex-etexextra.Po -rm -f euptexdir/$(DEPDIR)/euptex-euptexextra.Po -rm -f hitexdir/$(DEPDIR)/hishrink-hilexer.Po @@ -20560,7 +20348,6 @@ distclean: distclean-recursive -rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji.Po -rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po -rm -f ptexdir/$(DEPDIR)/ptex-ptexextra.Po - -rm -f synctexdir/$(DEPDIR)/eptex-synctex.Po -rm -f synctexdir/$(DEPDIR)/etex-synctex.Po -rm -f synctexdir/$(DEPDIR)/euptex-synctex.Po -rm -f synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po @@ -20670,9 +20457,6 @@ maintainer-clean: maintainer-clean-recursive -rm -f ./$(DEPDIR)/cwebboot.Po -rm -f ./$(DEPDIR)/dvicopy.Po -rm -f ./$(DEPDIR)/dvitype.Po - -rm -f ./$(DEPDIR)/eptex-eptex-pool.Po - -rm -f ./$(DEPDIR)/eptex-eptex0.Po - -rm -f ./$(DEPDIR)/eptex-eptexini.Po -rm -f ./$(DEPDIR)/etex-etex-pool.Po -rm -f ./$(DEPDIR)/etex-etex0.Po -rm -f ./$(DEPDIR)/etex-etexini.Po @@ -20798,7 +20582,6 @@ maintainer-clean: maintainer-clean-recursive -rm -f alephdir/$(DEPDIR)/aleph-aleph.Po -rm -f alephdir/$(DEPDIR)/aleph-alephbis.Po -rm -f alephdir/$(DEPDIR)/aleph-alephextra.Po - -rm -f eptexdir/$(DEPDIR)/eptex-eptexextra.Po -rm -f etexdir/$(DEPDIR)/etex-etexextra.Po -rm -f euptexdir/$(DEPDIR)/euptex-euptexextra.Po -rm -f hitexdir/$(DEPDIR)/hishrink-hilexer.Po @@ -21341,7 +21124,6 @@ maintainer-clean: maintainer-clean-recursive -rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji.Po -rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po -rm -f ptexdir/$(DEPDIR)/ptex-ptexextra.Po - -rm -f synctexdir/$(DEPDIR)/eptex-synctex.Po -rm -f synctexdir/$(DEPDIR)/etex-synctex.Po -rm -f synctexdir/$(DEPDIR)/euptex-synctex.Po -rm -f synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po @@ -22089,44 +21871,6 @@ ptrip-clean: rm -rf ptripdir # (end of ptex.am) -$(eptex_OBJECTS): $(eptex_prereq) - -$(eptex_c_h): eptex-web2c - @$(web2c) eptex -eptex-web2c: eptex.p $(web2c_texmf) eptexdir/eptex.defines - @$(web2c) eptex - -eptex-pool.c: eptex.pool eptexd.h $(makecpool_stamp) - $(makecpool) eptex >$@ || rm -f $@ - -# Tangling e-pTeX -eptex.p eptex.pool: eptex-tangle - $(texmf_tangle) eptex eptex -eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh - $(texmf_tangle) eptex eptex - -# Extract eptex version -$(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech - $(AM_V_GEN)grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ - | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@ - -# Generate eptex.web -eptex.web: tie$(EXEEXT) $(eptex_web_srcs) - $(tie_m) $(eptex_web_srcs) - -# Generate eptex.ch -eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs) - $(tie_c) eptex.web $(eptex_ch_srcs) -eptexdir/eptriptest.log: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) -eptexdir/pdfprimitive.log: eptex$(EXEEXT) -eptexdir/epver.log eptexdir/wcfname.log: eptex$(EXEEXT) -eptrip.diffs: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) - $(triptrap_diffs) $@ -.PHONY: eptrip-clean -eptrip-clean: - rm -rf eptripdir - -# (end of eptex.am) $(uptex_OBJECTS): $(uptex_prereq) $(uptex_c_h): uptex-web2c diff --git a/source/texk/web2c/ac/web2c.ac b/source/texk/web2c/ac/web2c.ac index 50849efab..9901c93c4 100644 --- a/source/texk/web2c/ac/web2c.ac +++ b/source/texk/web2c/ac/web2c.ac @@ -32,7 +32,6 @@ m4_define([kpse_tex_progs], [dnl [[tex], [yes], [no], [TeX], []], [[etex], [no], [yes], [e-TeX], [zlib]], [[ptex], [no], [yes], [pTeX], [ptexenc zlib]], -[[eptex], [no], [yes], [e-pTeX], [ptexenc zlib]], [[uptex], [no], [yes], [upTeX], [ptexenc zlib]], [[euptex], [yes], [yes], [e-upTeX], [ptexenc zlib]], [[aleph], [yes], [], [Aleph], []], diff --git a/source/texk/web2c/configure b/source/texk/web2c/configure index 9bfa51996..daee6c4e0 100755 --- a/source/texk/web2c/configure +++ b/source/texk/web2c/configure @@ -828,10 +828,6 @@ UPTEX_SYNCTEX_FALSE UPTEX_SYNCTEX_TRUE UPTEX_FALSE UPTEX_TRUE -EPTEX_SYNCTEX_FALSE -EPTEX_SYNCTEX_TRUE -EPTEX_FALSE -EPTEX_TRUE PTEX_SYNCTEX_FALSE PTEX_SYNCTEX_TRUE PTEX_FALSE @@ -1035,8 +1031,6 @@ enable_etex enable_etex_synctex enable_ptex enable_ptex_synctex -enable_eptex -enable_eptex_synctex enable_uptex enable_uptex_synctex enable_euptex @@ -1782,8 +1776,6 @@ Optional Features: --disable-etex-synctex build e-TeX without SyncTeX support --enable-ptex compile and install pTeX --disable-ptex-synctex build pTeX without SyncTeX support - --enable-eptex compile and install e-pTeX - --disable-eptex-synctex build e-pTeX without SyncTeX support --enable-uptex compile and install upTeX --disable-uptex-synctex build upTeX without SyncTeX support --disable-euptex do not compile and install e-upTeX @@ -20294,28 +20286,6 @@ test "x$enable_web2c:$enable_ptex" = xyes:yes && { need_ptexenc=yes need_zlib=yes } -# Check whether --enable-eptex was given. -if test ${enable_eptex+y} -then : - enableval=$enable_eptex; -fi -case $enable_eptex in #( - yes | no) : - ;; #( - *) : - enable_eptex=no ;; -esac - -# Check whether --enable-eptex-synctex was given. -if test ${enable_eptex_synctex+y} -then : - enableval=$enable_eptex_synctex; -fi - -test "x$enable_web2c:$enable_eptex" = xyes:yes && { - need_ptexenc=yes - need_zlib=yes -} # Check whether --enable-uptex was given. if test ${enable_uptex+y} then : @@ -23097,36 +23067,6 @@ esac else PTEX_SYNCTEX_TRUE='#' PTEX_SYNCTEX_FALSE= -fi - if test "x$enable_eptex" = xyes; then - EPTEX_TRUE= - EPTEX_FALSE='#' -else - EPTEX_TRUE='#' - EPTEX_FALSE= -fi - -case $enable_native_texlive_build:$enable_eptex_synctex in #( - yes:yes | no:yes | no:no) : - ;; #( - *) : - if test -z "$enable_eptex_synctex" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-eptex-synctex=yes'" >&5 -printf "%s\n" "$as_me: Assuming \`--enable-eptex-synctex=yes'" >&6;} -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&5 -printf "%s\n" "$as_me: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&2;} ;; -esac -fi - enable_eptex_synctex=yes ;; -esac - if test "x$enable_eptex_synctex" = xyes; then - EPTEX_SYNCTEX_TRUE= - EPTEX_SYNCTEX_FALSE='#' -else - EPTEX_SYNCTEX_TRUE='#' - EPTEX_SYNCTEX_FALSE= fi if test "x$enable_uptex" = xyes; then UPTEX_TRUE= @@ -29262,14 +29202,6 @@ if test -z "${PTEX_SYNCTEX_TRUE}" && test -z "${PTEX_SYNCTEX_FALSE}"; then as_fn_error $? "conditional \"PTEX_SYNCTEX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${EPTEX_TRUE}" && test -z "${EPTEX_FALSE}"; then - as_fn_error $? "conditional \"EPTEX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${EPTEX_SYNCTEX_TRUE}" && test -z "${EPTEX_SYNCTEX_FALSE}"; then - as_fn_error $? "conditional \"EPTEX_SYNCTEX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${UPTEX_TRUE}" && test -z "${UPTEX_FALSE}"; then as_fn_error $? "conditional \"UPTEX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/source/texk/web2c/eptexdir/COPYRIGHT b/source/texk/web2c/eptexdir/COPYRIGHT deleted file mode 100644 index 0ebd3f3a0..000000000 --- a/source/texk/web2c/eptexdir/COPYRIGHT +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (C) 2009 ASCII MEDIA WORKS. -Copyright (C) 2010-2023 Japanese TeX Development Community -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/source/texk/web2c/eptexdir/am/eptex.am b/source/texk/web2c/eptexdir/am/eptex.am deleted file mode 100644 index 8ff94d610..000000000 --- a/source/texk/web2c/eptexdir/am/eptex.am +++ /dev/null @@ -1,135 +0,0 @@ -## $Id$ -## texk/web2c/eptexdir/am/eptex.am: Makefile fragment for e-pTeX. -## -## Copyright 2015-2024 Karl Berry -## Copyright 2011-2015 Peter Breitenlohner -## You may freely use, modify and/or distribute this file. - -## e-pTeX -## -if EPTEX -bin_PROGRAMS += eptex -if !PTEX -bin_links += eptex$(EXEEXT):ptex -endif !PTEX -endif EPTEX -EXTRA_PROGRAMS += eptex - -eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) - -# With --enable-ipc, e-pTeX may need to link with -lsocket. -eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) -eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND) - -# e-pTeX C sources -eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h -nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c -dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h eptexdir/eptex_version.h - -# We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS. -eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h eptexdir/eptex_version.h -$(eptex_OBJECTS): $(eptex_prereq) - -$(eptex_c_h): eptex-web2c - @$(web2c) eptex -eptex-web2c: eptex.p $(web2c_texmf) eptexdir/eptex.defines - @$(web2c) eptex - -eptex-pool.c: eptex.pool eptexd.h $(makecpool_stamp) - $(makecpool) eptex >$@ || rm -f $@ - -# Tangling e-pTeX -eptex.p eptex.pool: eptex-tangle - $(texmf_tangle) eptex eptex -eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh - $(texmf_tangle) eptex eptex - -# Extract eptex version -$(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech - $(AM_V_GEN)grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ - | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@ - -# Generate eptex.web -eptex.web: tie$(EXEEXT) $(eptex_web_srcs) - $(tie_m) $(eptex_web_srcs) -eptex_web_srcs = \ - tex.web \ - etexdir/etex.ch \ - etexdir/tex.ch0 \ - tex.ch \ - tracingstacklevels.ch \ - partoken.ch \ - locnull-optimize.ch \ - showstream.ch \ - zlib-fmt.ch \ - etexdir/tex.ech - -# Generate eptex.ch -eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs) - $(tie_c) eptex.web $(eptex_ch_srcs) -eptex_ch_srcs = \ - eptexdir/eptex-base.ch \ - eptexdir/etex.ch0 \ - ptexdir/ptex-base.ch \ - eptexdir/eptex.ech \ - eptexdir/etex.ch1 \ - $(eptex_ch_synctex) \ - eptexdir/fam256.ch \ - eptexdir/pdfutils.ch \ - eptexdir/suppresserrors.ch \ - eptexdir/unbalanced-braces-eptex.ch \ - eptexdir/char-warning-eptex.ch \ - tex-binpool.ch - -EXTRA_DIST += $(eptex_web_srcs) $(eptex_ch_srcs) eptexdir/eptex.defines - -DISTCLEANFILES += $(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c \ - eptex.p eptex.pool eptex-tangle - -## -EXTRA_DIST += \ - eptexdir/ChangeLog \ - eptexdir/Changes.txt \ - eptexdir/README.txt - -# e-pTeX Tests -# -eptex_tests = \ - eptexdir/eptriptest.test \ - eptexdir/pdfprimitive.test \ - eptexdir/epver.test \ - eptexdir/wcfname.test -eptexdir/eptriptest.log: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) -eptexdir/pdfprimitive.log: eptex$(EXEEXT) -eptexdir/epver.log eptexdir/wcfname.log: eptex$(EXEEXT) - -EXTRA_DIST += $(eptex_tests) - -if EPTEX -TESTS += $(eptex_tests) -TRIPTRAP += eptrip.diffs -TRIPTRAP_CLEAN += eptrip-clean -endif EPTEX - -## Test data and results -## -## eptexdir/eptriptest.test -EXTRA_DIST += \ - eptexdir/eptrip/eptrip.diffs \ - eptexdir/eptrip/eptrip.log \ - eptexdir/eptrip/eptrip.tex \ - eptexdir/eptrip/texmf.cnf -eptrip.diffs: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) - $(triptrap_diffs) $@ -.PHONY: eptrip-clean -eptrip-clean: - rm -rf eptripdir -DISTCLEANFILES += eptrip.diffs -## eptexdir/pdfprimitive.test -EXTRA_DIST += \ - eptexdir/pdfprimitive.test \ - eptexdir/tests/pdfprimitive-test.tex \ - eptexdir/tests/pdfprimitive-eptex.log -DISTCLEANFILES += pdfprimitive-eptex.* - -# (end of eptex.am) diff --git a/source/texk/web2c/eptexdir/char-warning-eptex.ch b/source/texk/web2c/eptexdir/char-warning-eptex.ch deleted file mode 100644 index fcd528d45..000000000 --- a/source/texk/web2c/eptexdir/char-warning-eptex.ch +++ /dev/null @@ -1,101 +0,0 @@ -% $Id$ -% Public domain. See ../pdftexdir/char-warning-pdftex.ch for info. - -@x [30] If \tracinglostchars > 2, then promote full errors. -@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits); -var @!l:0..255; {small indices or counters} -old_setting: integer; {saved value of |tracing_online|} -begin if tracing_lost_chars>0 then - begin old_setting:=tracing_online; - if eTeX_ex and(tracing_lost_chars>1) then tracing_online:=1; - begin begin_diagnostic; - print_nl("Missing character: There is no "); -@.Missing character@> - if (c<" ")or(c>"~") then - begin print_char("^"); print_char("^"); - if c<64 then print_char(c+64) - else if c<128 then print_char(c-64) - else begin print_lc_hex(c div 16); print_lc_hex(c mod 16); end - end - else print_ASCII(c); - print(" in font "); - slow_print(font_name[f]); print_char("!"); end_diagnostic(false); - end; - tracing_online:=old_setting; - end; -end; -@y -@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits); -var @!l:0..255; {small indices or counters} -old_setting: integer; {saved value of |tracing_online|} -begin if tracing_lost_chars>0 then - begin old_setting:=tracing_online; - if eTeX_ex and(tracing_lost_chars>1) then tracing_online:=1; - if tracing_lost_chars > 2 then - print_err("Missing character: There is no ") - else begin - begin_diagnostic; - print_nl("Missing character: There is no ") - end; -@.Missing character@> - if (c<" ")or(c>"~") then begin - print_char("^"); print_char("^"); - if c<64 then print_char(c+64) - else if c<128 then print_char(c-64) - else begin print_lc_hex(c div 16); print_lc_hex(c mod 16); end - end - else print_ASCII(c); - if tracing_lost_chars > 2 then begin - print(" ("); - print_hex(c); - print(")"); - end; - print(" in font "); - slow_print(font_name[f]); - if tracing_lost_chars < 3 then print_char("!"); - tracing_online:=old_setting; - if tracing_lost_chars > 2 then begin - help0; - error; - end else end_diagnostic(false); - end; {of |tracing_lost_chars>0|} -end; {of procedure} -@z - -@x [30] Another warning for (u)pTeX. -@p procedure char_warning_jis(@!f:internal_font_number;@!jc:KANJI_code); -begin if tracing_lost_chars>0 then - begin begin_diagnostic; - print_nl("Character "); print_kanji(jc); print(" ("); - print_hex(jc); print(") cannot be typeset in JIS-encoded JFM "); - slow_print(font_name[f]); - print_char(","); print_nl("so I use .notdef glyph instead."); - end_diagnostic(false); - end; -end; -@y -@p procedure char_warning_jis(@!f:internal_font_number;@!jc:KANJI_code); -var old_setting: integer; {saved value of |tracing_online|} -begin if tracing_lost_chars>0 then - begin old_setting:=tracing_online; - if eTeX_ex and(tracing_lost_chars>1) then tracing_online:=1; - if tracing_lost_chars > 2 then - print_err("Character ") - else begin - begin_diagnostic; - print_nl("Character ") - end; - print_kanji(jc); print(" ("); - print_hex(jc); print(") cannot be typeset in JIS-encoded JFM "); - slow_print(font_name[f]); - print_char(","); - if tracing_lost_chars > 2 then - begin print_nl(" so I use .notdef glyph instead"); - help0; error; end - else - begin print_nl("so I use .notdef glyph instead."); - end_diagnostic(false); end; - tracing_online:=old_setting; - end; {of |tracing_lost_chars>0|} -end; {of procedure} -@z diff --git a/source/texk/web2c/eptexdir/eptex.defines b/source/texk/web2c/eptexdir/eptex.defines deleted file mode 100644 index 88035e9c7..000000000 --- a/source/texk/web2c/eptexdir/eptex.defines +++ /dev/null @@ -1,60 +0,0 @@ -{ defined at kanji.c, kanji.h, ptexenc/ptexenc.h } -@define function BYTE1 (); -@define function BYTE2 (); -@define function BYTE3 (); -@define function BYTE4 (); -@define function Hi (); -@define function Lo (); - -@define function getencstring; -@define function setencstring (); -@define function isinternalUPTEX; -@define function isterminalUTF8; - -@define function iskanji1 (); -@define function multistrlen (); -@define function multistrlenshort (); -@define function multistrlenfilename (); -@define function fromBUFF (); -@define function fromBUFFshort (); -@define function toBUFF (); - -@define function fromDVI (); -@define function toDVI (); -@define function putc2 (); -@define function fputs2 (); -@define function inputline2 (); -@define function ptencconvfirstline (); - -@define function setinfileenc (); -@define function setstdinenc (); - -@define function fromJIS (); -@define function fromEUC (); -@define function fromSJIS (); -@define function fromKUTEN (); -@define function UCStoUTF8 (); -@define function fromUCS (); -@define function toJIS (); -@define function toUCS (); - -@define function notkanjicharseq (); -@define function checkkanji (); -@define function ischarascii (); -@define function ischarkanji (); -@define function ismultiprn (); -@define function calcpos (); -@define function kcatcodekey (); - -@define function getintone (); -@define procedure setintone (); - -@define procedure dumpkanji (); -@define procedure undumpkanji (); - -@define procedure initstarttime; -@define procedure getcreationdate; -@define procedure getfilemoddate(); -@define procedure getfilesize(); -@define procedure getfiledump(); -@define procedure getmd5sum(); diff --git a/source/texk/web2c/eptexdir/eptex.ech b/source/texk/web2c/eptexdir/eptex.ech deleted file mode 100644 index bb4d31519..000000000 --- a/source/texk/web2c/eptexdir/eptex.ech +++ /dev/null @@ -1,804 +0,0 @@ -% eptexdir/eptex.ech: changefile used to build e-pTeX, see eptexdir/eptex-base.ch for details. -% Public domain. Originally written by Peter Breitenlohner . - -%% new primitives by e-pTeX -%% -%% \epTeXversion -%% \epTeXinputencoding -%% -%% \currentspacingmode: 1 iff auto_spacing -%% \currentxspacingmode: 1 iff auto_xspacing -%% \lastnodechar: the (internal) character code of the last node -%% -1: non-character or null -%% \lastnodesubtype: the (internal) subtype of the last node -%% note: returns a value from the type if the node is s math noad. -%% -1: null -%% fallback to 0 if not explicitly set -%% \readpapersizespecial -%% 1: papersize special automatically sets \pdfpage{width,height} (quick hack). -%% 0: off -%% The default value is 1. -%% - -@x e-pTeX: logo -\def\eTeX{$\varepsilon$-\TeX} -@y -\def\eTeX{$\varepsilon$-\TeX} -\def\epTeX{$\varepsilon$-\pTeX} -@z - -@x [1.2] l.190 - epTeX: -@d eTeX_version_string=='-2.6' {current \eTeX\ version} -@y -@d eTeX_version_string=='-2.6' {current \eTeX\ version} -@# -@d epTeX_version_string=='-230214' -@d epTeX_version_number==230214 -@z - -@x e-pTeX: banner - {printed when \pTeX\ starts} -@y - {printed when \pTeX\ starts} -@# -@d epTeX_version==pTeX_version_string,epTeX_version_string,eTeX_version_string -@d epTeX_banner=='This is e-pTeX, Version 3.141592653',epTeX_version -@d epTeX_banner_k==epTeX_banner - {printed when \epTeX\ starts} -@z - -@x [1.2] -@d banner==pTeX_banner -@d banner_k==pTeX_banner_k -@y -@d banner==epTeX_banner -@d banner_k==epTeX_banner_k -@z - -@x [10.135] l.2895 - e-pTeX: box_lr and box_dir -In \eTeX\ the |subtype| field records the box direction mode |box_lr|. -@y -In \eTeX\ the |subtype| field records the box direction mode |box_lr|. -In \epTeX\ the |subtype| field is |qi(16*box_lr+box_dir)|. -@z - -@x -@d box_dir(#) == (qo(subtype(#))-dir_max) {direction of a box} -@d set_box_dir(#) == subtype(#):=set_box_dir_end -@y -@d box_dir(#) == ((qo(subtype(#)))mod 16 - dir_max) {direction of a box} -@d set_box_dir(#) == subtype(#):=box_lr(#)*16+set_box_dir_end -@z - -@x [17] -@d saving_hyph_codes_code=etex_int_base+8 {save hyphenation codes for languages} -@d eTeX_state_code=etex_int_base+9 {\eTeX\ state variables} -@y -@d saving_hyph_codes_code=etex_int_base+8 {save hyphenation codes for languages} -@d read_papersize_special_code=etex_int_base+9 -@d eTeX_state_code=etex_int_base+10 {\eTeX\ state variables} -@z - -@x [17] -@d saving_hyph_codes==int_par(saving_hyph_codes_code) -@y -@d saving_hyph_codes==int_par(saving_hyph_codes_code) -@d read_papersize_special==int_par(read_papersize_special_code) -@z - -@x [26.???] prepare for |scan_font_ident| to recognize \lastnodefont -@p procedure@?scan_int; forward; {scans an integer value} -@y -@p procedure@?scan_int; forward; {scans an integer value} -procedure@?scan_something_internal_ident; forward; -@z - -@x [26.413] l.8343 - e-pTeX: scan_something_internal -var m:halfword; {|chr_code| part of the operand token} -@y -label exit; -var m:halfword; {|chr_code| part of the operand token} -@z - -@x [26.???] add |scan_something_internal_ident| (used in |scan_font_ident|) -@; -end; -@y -@; -end; - -@ @p procedure scan_something_internal_ident; - begin scan_something_internal(ident_val,false); end; -@z - -@x -@d input_line_no_code=glue_val+2 {code for \.{\\inputlineno}} -@d badness_code=glue_val+2 {code for \.{\\badness}} -@y -@d last_node_subtype_code=glue_val+2 {code for \.{\\lastnodesubtype}} -@d last_node_char_code=glue_val+3 {code for \.{\\lastnodechar}} -@d last_node_font_code=glue_val+4 {code for \.{\\lastnodefont}} -@d input_line_no_code=glue_val+5 {code for \.{\\inputlineno}} -@d badness_code=glue_val+6 {code for \.{\\badness}} -@z - -@x -@d ptex_minor_version_code=ptex_version_code+1 {code for \.{\\ptexminorversion}} -@y -@d eptex_version_code=ptex_version_code+1 {code for \.{\\epTeXversion}} -@d ptex_minor_version_code=eptex_version_code+1 {code for \.{\\ptexminorversion}} -@z - -@x e-pTeX: \current(x)spacingmode -@d eTeX_dim=eTeX_int+8 {first of \eTeX\ codes for dimensions} -@y -@d eTeX_dim=eTeX_int+10 {first of \eTeX\ codes for dimensions} -@z - -@x -primitive("ptexminorversion",last_item,ptex_minor_version_code); -@!@:ptexminorversion_}{\.{\\ptexminorversion} primitive@> -@y -primitive("epTeXversion",last_item,eptex_version_code); -@!@:epTeXversion_}{\.{\\epTeXversion} primitive@> -primitive("ptexminorversion",last_item,ptex_minor_version_code); -@!@:ptexminorversion_}{\.{\\ptexminorversion} primitive@> -@z - -@x - ptex_minor_version_code: print_esc("ptexminorversion"); -@y - eptex_version_code: print_esc("epTeXversion"); - ptex_minor_version_code: print_esc("ptexminorversion"); -@z - -@x [26.420] l.8474 - pTeX: Fetch a box dimension: dir_node -begin scan_eight_bit_int; q:=box(cur_val); -@y -begin scan_register_num; fetch_box(q); -@z - -@x [26.424] l.8508 - e-pTeX: TeXXeT and disp_node -node of the current list. -@y -node of the current list. -The macro |find_effective_tail_epTeX| sets |tx| to the last non-\.{\\endM} -non-|disp_node| of the current list. -@z - -@x [26.424] l.8510 - e-pTeX: last node -@d find_effective_tail==find_effective_tail_pTeX -@y -@d find_effective_tail_epTeX== -tx:=tail; -if not is_char_node(tx) then if type(tx)=disp_node then tx:=prev_node; -if not is_char_node(tx) then - if (type(tx)=disp_node) {|disp_node| from a discretionary} - or((type(tx)=math_node)and(subtype(tx)=end_M_code)) then - begin r:=head; q:=link(head); - while q<>tx do - begin if is_char_node(q) then r:=q - else if (type(q)<>disp_node)and - ((type(q)<>math_node)or(subtype(q)<>end_M_code)) then r:=q; - q:=link(q); - end; - tx:=r; - end -@# -@d find_effective_tail==find_effective_tail_epTeX -@# -@d find_last_char== -if font_dir[font(tx)]<>dir_default then cur_val:=KANJI(info(link(tx))) -else cur_val:=qo(character(tx)) - -@d ignore_font_kerning== -begin if ((type(tx)=glue_node) and (subtype(tx)=jfm_skip+1)) - or ((type(tx)=penalty_node) and (subtype(tx)=kinsoku_pena)) then - tx:=last_jchr -else if (type(tx)=kern_node) and (subtype(tx)=normal) then - begin r:=head; q:=link(head); - while q<>tx do - begin r:=q; - if is_char_node(q) then if font_dir[font(q)]<>dir_default then q:=link(q); - q:=link(q); - end; - if ((type(r)=penalty_node) and (subtype(r)=kinsoku_pena)) then tx:=last_jchr else tx:=r; - end; -end -@z - -@x - ptex_minor_version_code: cur_val:=pTeX_minor_version; -@y - eptex_version_code: cur_val:=epTeX_version_number; - ptex_minor_version_code: cur_val:=pTeX_minor_version; -@z - -@x [26.424] e-pTeX: node char - if cur_chr=last_node_type_code then - begin cur_val_level:=int_val; - if (tx=head)or(mode=0) then cur_val:=-1; - end - else cur_val_level:=cur_chr; -@y - if (cur_chr=last_node_type_code)or(cur_chr=last_node_subtype_code) then - begin cur_val_level:=int_val; - if (tx=head)or(mode=0) then cur_val:=-1; - end - else if cur_chr=last_node_char_code then - begin cur_val_level:=int_val; cur_val:=-1; - end - else if cur_chr=last_node_font_code then - begin cur_val_level:=ident_val; cur_val:=null_font+font_id_base; - end - else cur_val_level:=cur_chr; - if (cur_chr=last_node_char_code)or(cur_chr=last_node_font_code) then - if is_char_node(tx)and(tx<>head) then begin - { |tx| might be ``second node'' of a KANJI character; so we need to look the node before |tx| } - r:=head; q:=head; - while q<>tx do begin r:=q; q:=link(q); end; { |r| is the node just before |tx| } - if (r<>head)and is_char_node(r) then if font_dir[font(r)]<>dir_default then tx:=r; - if cur_chr=last_node_char_code then find_last_char - else cur_val:=font(tx)+font_id_base; - end; -@z - -@x [26.424] e-pTeX: node types - last_node_type_code: if type(tx)<=unset_node then cur_val:=type(tx)+1 - else cur_val:=unset_node+2; -@y - last_node_type_code: if type(tx)<=unset_node then - begin if type(tx)=dir_node then tx:=list_ptr(tx); - cur_val:=type(tx); - if cur_valdisp_node then cur_val:=cur_val-1; - end - else cur_val:=unset_node; {\epTeX's |unset_node| is \eTeX's |unset_node+2|} - last_node_subtype_code: if type(tx)<=unset_node then cur_val:=subtype(tx) - { non-math nodes } - else begin - cur_val:=type(tx); - if cur_valnull do r:=link(r); - cur_val:=qo(character(r)); - end - {else: already -1} - end; - last_node_font_code: begin - ignore_font_kerning; - if is_char_node(tx) then - cur_val:=font(tx)+font_id_base - else if type(tx)=ligature_node then - cur_val:=font(lig_char(tx))+font_id_base - {else: already nullfont} - end; -@z - -@x - last_node_type_code: cur_val:=last_node_type; -@y - last_node_type_code: cur_val:=last_node_type; - last_node_subtype_code: cur_val:=last_node_subtype; -@z - -@x e-pTeX: if primitives - leave room for three e-TeX codes -@d if_tdir_code=if_case_code+1 { `\.{\\iftdir}' } -@y -@d if_tdir_code=if_case_code+4 { `\.{\\iftdir}' } -@z - -@x [30.???] |scan_font_ident|: recognize \lastnodefont -else begin print_err("Missing font identifier"); -@y -else if (cur_cmd=last_item)and(cur_chr=last_node_font_code) then - begin scan_something_internal_ident; f:=cur_val-font_id_base; - end -else begin print_err("Missing font identifier"); -@z - -@x -@d box_lr(#) == (qo(subtype(#))) {direction mode of a box} -@d set_box_lr(#) == subtype(#):=set_box_lr_end -@d set_box_lr_end(#) == qi(#) -@y -@d box_lr(#) == ((qo(subtype(#)))div 16) {direction mode of a box} -@d set_box_lr(#) == subtype(#):=box_dir(#)+dir_max+set_box_lr_end -@d set_box_lr_end(#) == qi(16*(#)) -@z - -@x [35] -@= -text_baseline_shift_factor:=1000; -@y -@= -text_baseline_shift_factor:=1000; -read_papersize_special:=1; -@z - -@x -@!last_node_type:integer; {used to implement \.{\\lastnodetype}} -@y -@!last_node_type:integer; {used to implement \.{\\lastnodetype}} -@!last_node_subtype:integer; {used to implement \.{\\lastnodesubtype}} -@z - -@x -last_node_type:=-1; -@y -last_node_type:=-1; last_node_subtype:=-1; -@z - -@x [45.996] l.19420 -last_node_type:=type(p)+1; -@y -if type(p) - end - else if type(q)=disp_node then - begin prev_node:=p; gd:=2; - if link(q)=null then gm:=0 - else if type(link(q))=math_node then gm:=1 - else confusion("tail4"); -@:this can't happen tail4}{\quad tail4@> - end - else confusion("tail5"); -@:this can't happen tail5}{\quad tail5@> - end; -if gm=0 then if fm=2 then confusion("tail1") -@:this can't happen tail1}{\quad tail1@> - else if fm=1 then confusion("tail2"); -@:this can't happen tail2}{\quad tail2@> -if (fm+fd)=1 then begin fm:=0; fd:=0;@+end; -if gm=0 then fm:=0; -if gd=0 then fd:=0; -@# -if fd>0 then {merge a |disp_node| pair} - begin if gm=0 then {|p|$\to$|q=disp_node|$to$|null|} - begin t:=q; q:=null; link(p):=q; tail:=p;@+end - else if gm=1 then {|p|$\to$|q=disp_node|$to$|end_M|$to$|null|} - begin t:=q; q:=link(q); link(p):=q; gm:=2;@+end - else {|p|$\to$|q=end_M|$\to$|disp_node|$to$|null|} - begin t:=link(q); link(q):=null; tail:=q;@+end; -@# - if fd=1 then {|s|$\to$|r=disp_node|} - begin prev_node:=s; disp_dimen(r):=disp_dimen(t);@+end - else {|r|$\to$|p=disp_node|} - begin prev_node:=r; disp_dimen(p):=disp_dimen(t);@+end; - prev_disp:=pdisp; free_node(t,small_node_size); gd:=0; - end; -@# -if fm>0 then {drop \.{\\beginM} \.{\\endM} pair} - begin if gd=0 then {|p|$\to$|q=end_M|$to$|null|} - begin t:=q; q:=null; link(p):=q; tail:=p;@+end - else if gd=1 then {|p|$\to$|q=end_M|$to$|disp_node|$to$|null|} - begin t:=q; q:=link(q); link(p):=q; prev_node:=p; link(t):=null - end - else {|p|$\to$|q=disp_node|$\to$|end_M|$to$|null|} - begin t:=link(q); link(q):=null; tail:=q;@+end; -@# - if fm=1 then {|s|$\to$|r=begin_M|$\to$|p=disp_node|} - begin link(s):=p; link(r):=t; t:=r; prev_node:=s;@+end - else {|r|$\to$|p=begin_M|$\to$|q|} - begin link(r):=q; link(p):=t; t:=p; - if q=null then tail:=r@+else prev_node:=r; - end; - flush_node_list(t); - end -@# -@d check_effective_tail(#)==find_effective_tail_epTeX -@d fetch_effective_tail==fetch_effective_tail_epTeX -@z - -@x [47.1105] l.21246 -@!fd:boolean; {a final |disp_node| pair?} -@y -@!s:pointer; {running behind |r|} -@!t:pointer; -@!fm:integer; {1: if |r|, 2: if |p| is a \.{\\beginM} node} -@!gm:integer; {1: if |link(q)|, 2: if |q| is an \.{\\endM} node} -@!fd,@!gd:integer; {same for |disp_node|} -@z - -@x -@d set_language_code=5 {command modifier for \.{\\setlanguage}} -@y -@d set_language_code=5 {command modifier for \.{\\setlanguage}} -@d epTeX_input_encoding_code=6 {command modifier for \.{\\epTeXinputencoding}} -@z - -@x -primitive("setlanguage",extension,set_language_code);@/ -@!@:set_language_}{\.{\\setlanguage} primitive@> -@y -primitive("setlanguage",extension,set_language_code);@/ -@!@:set_language_}{\.{\\setlanguage} primitive@> -primitive("epTeXinputencoding",extension,epTeX_input_encoding_code);@/ -@!@:epTeX_input_encoding_}{\.{\\epTeXinputencoding} primitive@> -@z - -@x - set_language_code:print_esc("setlanguage"); -@y - set_language_code:print_esc("setlanguage"); - epTeX_input_encoding_code:print_esc("epTeXinputencoding"); -@z - -@x -set_language_code:@; -@y -set_language_code:@; -epTeX_input_encoding_code:@; -@z - -@x -@ @= -@y -@ @= -procedure eptex_set_input_encoding; -var j,k:integer; -begin - scan_file_name; - pack_cur_name; - if state=token_list then - begin k:=input_ptr-1; j:=-1; - while k>=0 do - begin if input_stack[k].state_field=token_list then decr(k) - else if input_stack[k].name_field>19 then - begin j:=input_stack[k].index_field; k:=-1; end - else begin j:=-(input_stack[k].name_field+1); k:=-1; end - end - end - else if name>19 then j:=index else j:=-(name+1); - if (j>=0) or (j=-1) or (j=-18) then begin - k:=true; - if j>=0 then k:=setinfileenc(input_file[j],stringcast(name_of_file+1)) - else k:=setstdinenc(stringcast(name_of_file+1)); - if k = false then - begin begin_diagnostic; - print_nl("Unknown encoding `"); - slow_print(cur_area); slow_print(cur_name); slow_print(cur_ext); - print("'"); end_diagnostic(false); - end - end - else - begin begin_diagnostic; j:=-j-1; - print_ln; - print_nl("Warning: \epTeXinputencoding is ignored, since I am current reading"); - print_nl("from "); - if j>=18 then print("a pseudo file created by \scantokens.") - else begin print("input stream "); print_int(j); print("."); end; - end_diagnostic(false); - end -end; - -@ @= -eptex_set_input_encoding - -@ @= -@z - -@x -primitive("lastnodetype",last_item,last_node_type_code); -@!@:last_node_type_}{\.{\\lastnodetype} primitive@> -@y -primitive("lastnodetype",last_item,last_node_type_code); -@!@:last_node_type_}{\.{\\lastnodetype} primitive@> -primitive("lastnodesubtype",last_item,last_node_subtype_code); -@!@:last_node_subtype_}{\.{\\lastnodesubtype} primitive@> -primitive("lastnodechar",last_item,last_node_char_code); -@!@:last_node_char_}{\.{\\lastnodechar} primitive@> -primitive("lastnodefont",last_item,last_node_font_code); -@!@:last_node_font_}{\.{\\lastnodefont} primitive@> -@z - -@x -last_node_type_code: print_esc("lastnodetype"); -@y -last_node_type_code: print_esc("lastnodetype"); -last_node_subtype_code: print_esc("lastnodesubtype"); -last_node_char_code: print_esc("lastnodechar"); -last_node_font_code: print_esc("lastnodefont"); -@z - -@x -primitive("savinghyphcodes",assign_int,int_base+saving_hyph_codes_code);@/ -@!@:saving_hyph_codes_}{\.{\\savinghyphcodes} primitive@> -@y -primitive("savinghyphcodes",assign_int,int_base+saving_hyph_codes_code);@/ -@!@:saving_hyph_codes_}{\.{\\savinghyphcodes} primitive@> -primitive("readpapersizespecial",assign_int,int_base+read_papersize_special_code);@/ -@!@:read_papersize_special_}{\.{\\readpapersizespecial} primitive@> -@z - -@x -saving_hyph_codes_code:print_esc("savinghyphcodes"); -@y -saving_hyph_codes_code:print_esc("savinghyphcodes"); -read_papersize_special_code:print_esc("readpapersizespecial"); -@z - -@x e-pTeX: font_char_{wd,ht,dp,ic}_code l.27306 -font_char_ic_code: begin scan_font_ident; q:=cur_val; scan_char_num; - if (font_bc[q]<=cur_val)and(font_ec[q]>=cur_val) then - begin i:=char_info(q)(qi(cur_val)); - case m of - font_char_wd_code: cur_val:=char_width(q)(i); - font_char_ht_code: cur_val:=char_height(q)(height_depth(i)); - font_char_dp_code: cur_val:=char_depth(q)(height_depth(i)); - font_char_ic_code: cur_val:=char_italic(q)(i); - end; {there are no other cases} - end - else cur_val:=0; - end; -@y -font_char_ic_code: begin scan_font_ident; q:=cur_val; - if font_dir[q]<>dir_default then {Japanese font} - begin scan_int; - if cur_val>=0 then - begin if is_char_kanji(cur_val) then {Japanese Character} - cur_val:=get_jfm_pos(KANJI(cur_val),q) - else cur_val:=-1 - end - else begin - cur_val:=-(cur_val+1); - if (font_bc[q]>cur_val)or(font_ec[q]-1 then - begin - i:=orig_char_info(q)(qi(cur_val)); - case m of - font_char_wd_code: cur_val:=char_width(q)(i); - font_char_ht_code: cur_val:=char_height(q)(height_depth(i)); - font_char_dp_code: cur_val:=char_depth(q)(height_depth(i)); - font_char_ic_code: cur_val:=char_italic(q)(i); - end; {there are no other cases} - end - else cur_val:=0; - end - else begin scan_ascii_num; - if (font_bc[q]<=cur_val)and(font_ec[q]>=cur_val) then - begin i:=orig_char_info(q)(qi(cur_val)); - case m of - font_char_wd_code: cur_val:=char_width(q)(i); - font_char_ht_code: cur_val:=char_height(q)(height_depth(i)); - font_char_dp_code: cur_val:=char_depth(q)(height_depth(i)); - font_char_ic_code: cur_val:=char_italic(q)(i); - end; {there are no other cases} - end - else cur_val:=0; - end - end; -@z - -@x e-pTeX: displacement value when typesetting right-to-left l.27798 -@!LR_ptr:pointer; {stack of LR codes for |hpack|, |ship_out|, and |init_math|} -@y -@!revdisp:scaled; {temporary value of displacement} -@!LR_ptr:pointer; {stack of LR codes for |hpack|, |ship_out|, and |init_math|} -@z - -@x e-pTeX: reverse nodes of an hlist l.28010 -var l:pointer; {the new list} -@y -var l,la:pointer; {the new list} -disp,disp2: scaled; { displacement } disped: boolean; -@z -@x e-pTeX: reverse nodes of an hlist l.28010 -begin g_order:=glue_order(this_box); g_sign:=glue_sign(this_box); -@y -begin g_order:=glue_order(this_box); g_sign:=glue_sign(this_box); -disp:=revdisp; disped:=false; -@z -@x e-pTeX: reverse nodes of an hlist l.28010 -done:reverse:=l; -@y -done: {if the beginning node of the new list isn't |disp_node|, - we insert |disp_node| to fix.} -if (l<>null)and(type(l)<>disp_node) then begin - p:=get_node(small_node_size); type(p):=disp_node; - disp_dimen(p):=disp; link(p):=l; reverse:=p; - end -else reverse:=l; -@z -@x e-pTeX: reverse nodes of an hlist l.28010 - q:=link(p); link(p):=l; l:=p; p:=q; -@y - if font_dir[f]<>dir_default then begin - q:=link(p); la:=l; l:=p; p:=link(q); link(q):=la; - end - else begin q:=link(p); link(p):=l; l:=p; p:=q; end; -@z -@x e-pTeX: reverse nodes of an hlist l.28010 -othercases goto next_p -@y -disp_node: begin - disp2:=disp_dimen(p); disp_dimen(p):=disp; disp:=disp2; - if not disped then disped:=true; end; -othercases goto next_p -@z - -@x e-pTeX: just_copy - hlist_node,vlist_node: begin r:=get_node(box_node_size); -@y - dir_node, - hlist_node,vlist_node: begin r:=get_node(box_node_size); -@z -@x e-pTeX: just_copy - mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words} -@y - mem[r+7]:=mem[p+7]; - mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last three words} - add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r)); -@z - -@x e-pTeX: pseudo file - buffer[last]:=w.b0; buffer[last+1]:=w.b1; - buffer[last+2]:=w.b2; buffer[last+3]:=w.b3; -@y - buffer[last]:=w.b0 mod @"100; buffer[last+1]:=w.b1 mod @"100; - buffer[last+2]:=w.b2 mod @"100; buffer[last+3]:=w.b3 mod @"100;@/ - buffer2[last]:=0; buffer2[last+1]:=0; - buffer2[last+2]:=0; buffer2[last+3]:=0; -@z - -@x e-pTeX: \readline -@ @= -if j=1 then - begin while loc<=limit do {current line not yet finished} - begin cur_chr:=buffer[loc]; incr(loc); - if cur_chr=" " then cur_tok:=space_token - @+else cur_tok:=cur_chr+other_token; -@y -@ @= -if j=1 then - begin while loc<=limit do {current line not yet finished} - begin cur_chr:=buffer[loc]; incr(loc); - if multistrlen(ustringcast(buffer), limit+1, loc-1)=2 then - begin cur_tok:=fromBUFF(ustringcast(buffer), limit+1, loc-1); incr(loc); - end - else if cur_chr=" " then cur_tok:=space_token - @+else cur_tok:=cur_chr+other_token; -@z - -@x e-pTeX: ifcsname l.28620 - buffer[m]:=info(p) mod @'400; incr(m); p:=link(p); -@y - if check_kanji(info(p)) then {|wchar_token|} - begin buffer[m]:=Hi(info(p)); buffer2[m]:=1; incr(m); buffer2[m]:=1; - end - else buffer2[m]:=0; - buffer[m]:=Lo(info(p)); incr(m); p:=link(p); -@z - -@x e-pTeX: if_font_char_code l.28633 -if_font_char_code:begin scan_font_ident; n:=cur_val; scan_char_num; - if (font_bc[n]<=cur_val)and(font_ec[n]>=cur_val) then - b:=char_exists(char_info(n)(qi(cur_val))) - else b:=false; - end; -@y -if_font_char_code:begin scan_font_ident; n:=cur_val; - if font_dir[n]<>dir_default then {Japanese font} - begin scan_int; - if cur_val>=0 then b:=is_char_kanji(cur_val) - { In u\pTeX, $\hbox{|is_char_kanji|} = \lambda x\mathpunct{.} x\ge 0$ } - else begin - cur_val:=-(cur_val+1); - b:=(font_bc[n]<=cur_val)and(font_ec[n]>=cur_val) - end - end - else begin scan_ascii_num; - if (font_bc[n]<=cur_val)and(font_ec[n]>=cur_val) then @/ - b:=char_exists(orig_char_info(n)(qi(cur_val))) - else b:=false; - end; - end; -@z - -@x e-pTeX: pTeX has \showmode, follow showstream.ch r61589 -@= -begin print_nl("> "); -@y -@= -begin - @ - print_nl("> "); -@z - -@x -procedure print_direction(@!d:integer); {print the direction represented by d} -@y -procedure print_direction_alt(@!d:integer); -var x: boolean; -begin x:=false; -case abs(d) of -dir_yoko: begin print(", yoko"); x:=true; end; -dir_tate: begin print(", tate"); x:=true; end; -dir_dtou: begin print(", dtou"); x:=true; end; -end; -if x then begin if d<0 then print("(math)"); -print(" direction"); end; -end; -@# -procedure print_direction(@!d:integer); {print the direction represented by d} -@z - -@x e-pTeX: fetch \(no)auto(x)spacing status -@* \[54] System-dependent changes. -@y -@ The \.{\\currentspacingmode} and \.{\\currentxspacingmode} commands -return the current \pTeX's status of \.{\\(no)autospacing} and -\.{\\(no)autoxspacing} respectively. - -@d current_spacing_mode_code=eTeX_int+8 {code for \.{\\currentspacingmode}} -@d current_xspacing_mode_code=eTeX_int+9 {code for \.{\\currentxspacingmode}} - -@= -primitive("currentspacingmode",last_item,current_spacing_mode_code); -@!@:current_spacing_mode_}{\.{\\currentspacingmode} primitive@> -primitive("currentxspacingmode",last_item,current_xspacing_mode_code); -@!@:current_xspacing_mode_}{\.{\\currentxspacingmode} primitive@> - -@ @= -current_spacing_mode_code: print_esc("currentspacingmode"); -current_xspacing_mode_code: print_esc("currentxspacingmode"); - -@ @= -current_spacing_mode_code: cur_val:=auto_spacing; -current_xspacing_mode_code: cur_val:=auto_xspacing; - -@* \[54] System-dependent changes. -@z diff --git a/source/texk/web2c/eptexdir/eptex_version.h b/source/texk/web2c/eptexdir/eptex_version.h deleted file mode 100644 index 297bd81e7..000000000 --- a/source/texk/web2c/eptexdir/eptex_version.h +++ /dev/null @@ -1 +0,0 @@ -#define EPTEX_VERSION "230214" diff --git a/source/texk/web2c/eptexdir/eptexextra.c b/source/texk/web2c/eptexdir/eptexextra.c deleted file mode 100644 index c60bb4292..000000000 --- a/source/texk/web2c/eptexdir/eptexextra.c +++ /dev/null @@ -1,12 +0,0 @@ -/* eptexextra.c: Hand-coded routines for e-pTeX. - - This file is public domain. */ - -#define EXTERN /* Instantiate data from eptexd.h here. */ -#define DLLPROC dlleptexmain - -/* This file defines TeX and epTeX. */ -#include - -/* Hand-coded routines for TeX or Metafont in C. */ -#include diff --git a/source/texk/web2c/eptexdir/eptexextra.h b/source/texk/web2c/eptexdir/eptexextra.h deleted file mode 100644 index 6dba1f031..000000000 --- a/source/texk/web2c/eptexdir/eptexextra.h +++ /dev/null @@ -1,26 +0,0 @@ -/* eptexextra.h: banner etc. for e-pTeX. - - This is included by e-pTeX, from eptexextra.c -*/ - -#include /* for ETEX_VERSION */ -#include /* for EPTEX_VERSION */ -#include /* for PTEX_VERSION */ - -#define BANNER "This is e-pTeX, Version 3.141592653-" PTEX_VERSION "-" EPTEX_VERSION "-" ETEX_VERSION -#define COPYRIGHT_HOLDER "D.E. Knuth" -#define AUTHOR "Japanese TeX Development Community" -#define PROGRAM_HELP EPTEXHELP -#define BUG_ADDRESS "issue@texjp.org" -#define DUMP_VAR TEXformatdefault -#define DUMP_LENGTH_VAR formatdefaultlength -#define DUMP_OPTION "fmt" -#define DUMP_EXT ".fmt" -#define INPUT_FORMAT kpse_tex_format -#define INI_PROGRAM "inieptex" -#define VIR_PROGRAM "vireptex" - -#ifdef Xchr -#undef Xchr -#define Xchr(x) (x) -#endif /* Xchr */ diff --git a/source/texk/web2c/eptexdir/eptrip/eptrip.diffs b/source/texk/web2c/eptexdir/eptrip/eptrip.diffs deleted file mode 100644 index 3891bb9d4..000000000 --- a/source/texk/web2c/eptexdir/eptrip/eptrip.diffs +++ /dev/null @@ -1,1386 +0,0 @@ -#! /bin/sh -vx -# $Id: eptriptest.test 48633 2018-09-09 17:56:55Z karl $ -# Copyright 2017-2018 Karl Berry -# Copyright 2011-2014 Peter Breitenlohner -# Copyright 2010 Hironori Kitagawa -# You may freely use, modify and/or distribute this file. - -LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE -+ LC_ALL=C -+ export LC_ALL -+ LANGUAGE=C -+ export LANGUAGE - -testdir=$abs_srcdir/triptrap -+ testdir=SRCDIR/triptrap -etestdir=$abs_srcdir/etexdir/etrip -+ etestdir=SRCDIR/etexdir/etrip -eptestdir=$abs_srcdir/eptexdir/eptrip -+ eptestdir=SRCDIR/eptexdir/eptrip - -TEXMFCNF=$eptestdir; export TEXMFCNF -+ TEXMFCNF=SRCDIR/eptexdir/eptrip -+ export TEXMFCNF - -rm -rf eptripdir -+ rm -rf eptripdir -mkdir eptripdir -+ mkdir eptripdir -cd eptripdir -+ cd eptripdir - -dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" -+ dvitype_args='-output-level=2 -dpi=72.27 -page-start='\''*.*.*.*.*.*.*.*.*.*'\''' - -echo ">>> Running e-TRIP test for e-pTeX." >&2 -+ echo '>>> Running e-TRIP test for e-pTeX.' ->>> Running e-TRIP test for e-pTeX. -echo ">>> See $eptestdir/eptrip.diffs for example of acceptable diffs." >&2 -+ echo '>>> See SRCDIR/eptexdir/eptrip/eptrip.diffs for example of acceptable diffs.' ->>> See SRCDIR/eptexdir/eptrip/eptrip.diffs for example of acceptable diffs. - -# pTeX outputs direction of boxes. -P_SED1='s/, yoko direction//;s/yoko direction, //' -+ P_SED1='s/, yoko direction//;s/yoko direction, //' -P_SED2='s/yoko(math) direction, //' -+ P_SED2='s/yoko(math) direction, //' - -is_OK=: -+ is_OK=: - -set -x -+ set -x - -echo "*** TRIP test for e-pTeX in compatibility mode ***." -+ echo '*** TRIP test for e-pTeX in compatibility mode ***.' -*** TRIP test for e-pTeX in compatibility mode ***. - -./pltotf $testdir/trip.pl trip.tfm || exit 1 -+ ./pltotf SRCDIR/triptrap/trip.pl trip.tfm - -./tftopl ./trip.tfm trip.pl || exit 1 -+ ./tftopl ./trip.tfm trip.pl - -diff $testdir/trip.pl trip.pl || is_OK=false -+ diff SRCDIR/triptrap/trip.pl trip.pl - -# get same filename in log -$LN_S $testdir/trip.tex . -+ ln -s SRCDIR/triptrap/trip.tex . - -rm -f trip.log -+ rm -f trip.log -./eptex --progname=epinitex --ini <$testdir/trip1.in >cptripin.fot -+ ./eptex --progname=epinitex --ini -if test ! -s trip.fmt; then - echo "*** trip.fmt not created by trip1.in, investigate!" >&2 - exit 1 -fi -+ test '!' -s trip.fmt -sed "$P_SED1" trip.log > cptripin.log || exit 1 -+ sed 's/, yoko direction//;s/yoko direction, //' trip.log -diff $testdir/tripin.log cptripin.log -+ diff SRCDIR/triptrap/tripin.log cptripin.log -1c1 -< This is TeX, Version 3.141592653 (INITEX) 4 JUL 1776 12:00 ---- -> This is e-pTeX, Version 3.141592653-p3.8.3-191112-2.6 (utf8.euc) (TeX Live 2021/dev) (INITEX) 27 JAN 2021 18:03 -3c3 -< (trip.tex ---- -> (./trip.tex -91c91,92 -< ### horizontal mode entered at line 77 (language255:hyphenmin1,63) ---- -> ### horizontal mode entered at line 77 (language255:hyph -> enmin1,63) -93a95 -> \displace 0.0 -95a98 -> \displace 0.0 -368a372 -> ....\displace 0.0 -370a375 -> ....\displace 0.0 -437,438d441 -< ....\rip 6 (ligature ) -< ....\rip 7 (ligature ) -450,453c453,456 -< (preloaded format=trip 1776.7.4) -< 1326 strings of total length 23633 -< 471 memory locations dumped; current usage is 96&278 -< 341 multiletter control sequences ---- -> (preloaded format=trip 2021.1.27) -> 1673 strings of total length 29297 -> 491 memory locations dumped; current usage is 112&278 -> 400 multiletter control sequences -461c464 -< Hyphenation trie of length 273 has 9 ops out of 500 ---- -> Hyphenation trie of length 273 has 9 ops out of 35111 - -# May as well test non-ini second time through. -rm -f trip.log -+ rm -f trip.log -./eptex --progname=eptex <$testdir/trip2.in >cptrip.fot -+ ./eptex --progname=eptex -sed "$P_SED1;$P_SED2" trip.log > cptrip.log -+ sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log -diff $testdir/trip.fot cptrip.fot -+ diff SRCDIR/triptrap/trip.fot cptrip.fot -1,3c1,2 -< This is TeX, Version 3.141592653 (INITEX) -< ** &trip trip -< (trip.tex ## ---- -> This is e-pTeX, Version 3.141592653-p3.8.3-191112-2.6 (utf8.euc) (TeX Live 2021/dev) (preloaded format=eptex) -> **(./trip.tex ## -17c16 -< Memory usage before: 159&313; after: 102&278; still untouched: 1613 ---- -> Memory usage before: 196&313; after: 120&278; still untouched: 2109 -75c74 -< Memory usage before: 334&431; after: 292&418; still untouched: 175 ---- -> Memory usage before: 462&431; after: 400&418; still untouched: 240 - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log cptrip.log -+ diff SRCDIR/triptrap/trip.log cptrip.log -1c1 -< This is TeX, Version 3.141592653 (preloaded format=trip 1776.7.4) 4 JUL 1776 12:00 ---- -> This is e-pTeX, Version 3.141592653-p3.8.3-191112-2.6 (utf8.euc) (TeX Live 2021/dev) (preloaded format=trip 2021.1.27) 27 JAN 2021 18:03 -3c3 -< (trip.tex ## ---- -> (./trip.tex ## -73c73 -< Memory usage before: 159&313; after: 102&278; still untouched: 1613 ---- -> Memory usage before: 196&313; after: 120&278; still untouched: 2109 -113a114 -> .\displace 0.0 -198a200 -> .\displace 0.0 -253a256 -> .\displace 0.0 -308a312 -> .\displace 0.0 -349a354 -> .\displace 0.0 -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 -406a412 -> ....\displace 0.0 -409a416 -> ....\displace 0.0 -412a420 -> ....\displace 0.0 -420a429 -> .\displace 0.0 -426c435 -< \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 -435a445 -> .\displace 0.0 -441c451 -< \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 -450a461 -> .\displace 0.0 -456c467 -< \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 -466a478 -> .\displace 0.0 -483,484c495,496 -< \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 -588a601 -> .....\displace 0.0 -591a605 -> .....\displace 0.0 -594a609 -> .....\displace 0.0 -630a646 -> ......\displace 0.0 -633a650 -> ......\displace 0.0 -636a654 -> ......\displace 0.0 -642c660 -< Memory usage before: 747&484; after: 581&481; still untouched: 1492 ---- -> Memory usage before: 1118&483; after: 864&480; still untouched: 1989 -647c665,666 -< ### internal vertical mode entered at line 150 (\output routine) ---- -> ### internal vertical mode entered at line 150 (\output -> routine) -650a670 -> .\displace 0.0 -660a681 -> .\displace 0.0 -670a692 -> .\displace 0.0 -681a704 -> .\displace 0.0 -693,694c716,717 -< \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 -701c724 -< \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,715c737,738 -< \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 -815c838 -< Memory usage before: 475&470; after: 290&466; still untouched: 1473 ---- -> Memory usage before: 710&469; after: 418&465; still untouched: 1970 -820c843,844 -< ### internal vertical mode entered at line 150 (\output routine) ---- -> ### internal vertical mode entered at line 150 (\output -> routine) -915c939 -< Memory usage before: 218&459; after: 149&458; still untouched: 1473 ---- -> Memory usage before: 308&458; after: 198&457; still untouched: 1970 -920c944,945 -< ### internal vertical mode entered at line 150 (\output routine) ---- -> ### internal vertical mode entered at line 150 (\output -> routine) -1070c1095 -< Memory usage before: 118&328; after: 102&328; still untouched: 1473 ---- -> Memory usage before: 150&327; after: 126&327; still untouched: 1970 -1405c1430 -< \vbox(16383.99998+0.0)x1000.0, glue set 16342.0fil ---- -> \vbox(16383.99998+0.0)x1000.0, glue set 16341.99998fil -1493a1519 -> ..\displace 0.0 -1503a1530 -> ..\displace 0.0 -1504a1532 -> ..\displace 0.0 -1511c1539 -< Memory usage before: 990&376; after: 584&370; still untouched: 735 ---- -> Memory usage before: 1498&375; after: 846&369; still untouched: 1970 -1887c1915 -< .\rip A ---- -> .\displace 0.0 -1923c1951 -< .\hbox(0.0+0.0)x120.0 [] ---- -> .\hbox(0.0+0.0)x120.0, yoko(math) direction [] -1954c1982 -< (tripos.tex ---- -> (./tripos.tex -2018c2046 -< \vbox(16383.99998+1.0)x100.0, glue set 16239.0fil ---- -> \vbox(16383.99998+1.0)x100.0, glue set 16238.99998fil -2022a2051 -> ..\displace 0.0 -2058a2088 -> ..\displace 0.0 -2071a2102 -> ..\displace 0.0 -2092a2124 -> ..\displace 0.0 -2113a2146 -> ..\displace 0.0 -2123a2157 -> ..\displace 0.0 -2142a2177 -> ..\displace 0.0 -2150a2186 -> ..\displace 0.0 -2171c2207,2208 -< ..\hbox(0.0+0.0)x120.0 ---- -> ..\hbox(0.0+0.0)x120.0, yoko(math) direction -> ...\displace 0.0 -2189c2226 -< Memory usage before: 950&531; after: 546&448; still untouched: 706 ---- -> Memory usage before: 1494&530; after: 826&447; still untouched: 1941 -2397c2434 -< ! Improper alphabetic constant. ---- -> ! Improper alphabetic or KANJI constant. -2533c2570 -< \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil ---- -> \vbox(16383.99998+0.0)x20.0, glue set 16330.99998fil -2544a2582 -> ..\displace 0.0 -2570c2608,2609 -< .\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, yoko(math) direction -> -2572c2611 -< ..\hbox(0.0+0.0)x0.0 ---- -> ..\hbox(0.0+0.0)x0.0, yoko(math) direction -2575c2614 -< Memory usage before: 339&413; after: 236&405; still untouched: 706 ---- -> Memory usage before: 497&411; after: 329&403; still untouched: 1941 -2650,2651c2689,2690 -< Dimensions can be in units of em, ex, in, pt, pc, -< cm, mm, dd, cc, bp, or sp; but yours is a new one! ---- -> Dimensions can be in units of em, ex, zw, zh, in, pt, pc, -> cm, mm, dd, cc, bp, H, Q, or sp; but yours is a new one! -2830c2869 -< Since I expected to read a number between 0 and 15, ---- -> Since I expected to read a number between 0 and 255, -3038c3077,3078 -< ^\hbox(7.0+1.0)x2.0 ---- -> ^\hbox(7.0+1.0)x2.0, yoko(math) direction -> ^.\displace 0.0 -3051c3091 -< \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 -3054c3094 -< .\fam0 ^^c8 ---- -> .\fam0 È -3056c3096 -< .\vbox(-2.0+0.0)x0.0 ---- -> .\vbox(-2.0+0.0)x0.0, yoko(math) direction -3060c3100,3101 -< ^.\hbox(7.0+1.0)x2.0, shifted -2.0 ---- -> ^.\hbox(7.0+1.0)x2.0, shifted -2.0, yoko(math) direction -> ^..\displace 0.0 -3140a3182 -> .....\displace 0.0 -3142a3185 -> ....|\displace 0.0 -3143a3187 -> ....\displace 0.0 -3151a3196 -> .\displace 0.0 -3235c3280 -< ! \textfont 0 is undefined (character ^^c8). ---- -> ! \textfont 0 is undefined (character È). -3286c3331 -< .\vbox(6.0+-8.0)x0.0 ---- -> .\vbox(6.0+-8.0)x0.0, yoko(math) direction -3326c3371 -< \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil ---- -> \vbox(10000.0+2.0)x28.0, glue set 9737.58742fil -3329a3375 -> ..\displace 0.0 -3374c3420 -< ..\vbox(6.0+-8.0)x0.0 ---- -> ..\vbox(6.0+-8.0)x0.0, yoko(math) direction -3385c3431,3432 -< ......\hbox(7.0+1.0)x2.0, shifted -2.0 ---- -> ......\hbox(7.0+1.0)x2.0, shifted -2.0, yoko(math) direction -> .......\displace 0.0 -3544a3592 -> ..........\displace 0.0 -3546a3595 -> .........|\displace 0.0 -3547a3597 -> .........\displace 0.0 -3564c3614,3615 -< ...\hbox(7.0+1.0)x1.99 ---- -> ...\hbox(7.0+1.0)x1.99, yoko(math) direction -> ....\displace 0.0 -3616c3667 -< Memory usage before: 2170&521; after: 1181&459; still untouched: 175 ---- -> Memory usage before: 3283&519; after: 1753&457; still untouched: 240 -3864c3915 -< \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil ---- -> \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil -3919,3920c3970,3972 -< ...\vbox(-0.00002+13.00002)x52.5, glue set - 0.00247 -< ....\vbox(-0.00002+0.0)x0.0 ---- -> ...\vbox(-0.00002+13.00002)x52.5, glue set - 0.00247, yoko(math) directi -> on -> ....\vbox(-0.00002+0.0)x0.0, yoko(math) direction -3951c4003 -< Memory usage before: 640&415; after: 397&410; still untouched: 175 ---- -> Memory usage before: 959&413; after: 573&408; still untouched: 240 -4034c4086 -< \vbox(16383.99998+0.0)x8236.0, glue set 16344.0fil ---- -> \vbox(16383.99998+0.0)x8236.0, glue set 16343.99998fil -4053c4105 -< Memory usage before: 235&401; after: 178&399; still untouched: 175 ---- -> Memory usage before: 342&399; after: 248&397; still untouched: 240 -4420c4472 -< \vbox(16383.99998+0.0)x100.0, glue set 16332.0fil ---- -> \vbox(16383.99998+0.0)x100.0, glue set 16331.99998fil -4425a4478 -> ...\displace 0.0 -4447a4501 -> ...\displace 0.0 -4475a4530 -> ...\displace 0.0 -4492a4548 -> ...\displace 0.0 -4506c4562 -< Memory usage before: 651&432; after: 417&418; still untouched: 175 ---- -> Memory usage before: 1008&431; after: 606&417; still untouched: 240 -4742c4798,4799 -< \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 -4746a4804 -> ...\displace 0.0 -4762a4821 -> .....\displace 0.0 -4777a4837 -> ......\displace 0.0 -4828c4888 -< Memory usage before: 776&458; after: 464&452; still untouched: 175 ---- -> Memory usage before: 1186&457; after: 682&451; still untouched: 240 -4881,4888d4940 -< ! Bad number (16). -< -< = -< l.346 ...ewlinechar}\textfont16= -< \relax -< Since I expected to read a number between 0 and 15, -< I changed this one to zero. -< -5701c5753 -< ! \textfont 0 is undefined (character ^^c8). ---- -> ! \textfont 0 is undefined (character È). -6381c6433 -< (tripos.tex ---- -> (./tripos.tex -6502c6554 -< l.429 ...^^M=13 \def^^M{\relax}# ---- -> l.429 ...^^M=13 \defqqM{\relax}# -6596c6648 -< Memory usage before: 819&428; after: 720&426; still untouched: 175 ---- -> Memory usage before: 1232&428; after: 1078&426; still untouched: 240 -6853c6905 -< .|vbox(0.0+0.0)x0.0 ---- -> .|vbox(0.0+0.0)x0.0, yoko(math) direction -6876a6929 -> ..|displace 0.0 -6891a6945 -> ..|displace 0.0 -6926a6981 -> .|displace 0.0 -6959a7015 -> .|displace 0.0 -6961c7017,7018 -< .|hbox(0.0+0.0)x0.0 ---- -> .|hbox(0.0+0.0)x0.0, yoko(math) direction -> ..|displace 0.0 -6991a7049 -> .|displace 0.0 -7103a7162 -> ...|displace 0.0 -7108d7166 -< ...|ip A (ligature BB) -7116a7175 -> ...|displace 0.0 -7125d7183 -< ...|kern2.0 -7126a7185 -> .|displace 0.0 -7136c7195 -< ...|vbox(0.0+0.0)x0.0 ---- -> ...|vbox(0.0+0.0)x0.0, yoko(math) direction -7156c7215 -< Memory usage before: 895&439; after: 290&420; still untouched: 175 ---- -> Memory usage before: 1350&439; after: 398&420; still untouched: 240 -7289c7348 -< Memory usage before: 334&431; after: 292&418; still untouched: 175 ---- -> Memory usage before: 462&431; after: 400&418; still untouched: 240 -7297,7300c7356,7359 -< 47 strings out of 1674 -< 253 string characters out of 8367 -< 2825 words of memory out of 3000 -< 372 multiletter control sequences out of 2100 ---- -> 44 strings out of 1627 -> 261 string characters out of 10703 -> 4260 words of memory out of 4500 -> 431 multiletter control sequences out of 15000+0 -7302c7361 -< 2 hyphenation exceptions out of 307 ---- -> 1 hyphenation exception out of 659 - -mv tripos.tex cptripos.tex -+ mv tripos.tex cptripos.tex -diff $testdir/tripos.tex cptripos.tex -+ diff SRCDIR/triptrap/tripos.tex cptripos.tex - -eval ./dvitype $dvitype_args trip.dvi >cptrip.typ || exit 1 -+ eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi -./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' trip.dvi -++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi -$DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ -+ diff SRCDIR/triptrap/trip.typ cptrip.typ -1c1 -< This is DVItype, Version 3.6 ---- -> This is DVItype, Version 3.6 (TeX Live 2021/dev) -9c9 -< ' TeX output 1776.07.04:1200' ---- -> ' TeX output 2021.01.27:1803' -419c419 -< 1121: down4 639342208 ---- -> 1121: down4 639342177 -1087,1088c1087,1088 -< 2535: y4 203921760 -< 2540: y0 203921760 ---- -> 2535: y4 203921756 -> 2540: y0 203921756 - -mv trip.fmt ctrip.fmt -+ mv trip.fmt ctrip.fmt - -# ================================= - -echo "*** TRIP test for e-pTeX in extended mode ***." -+ echo '*** TRIP test for e-pTeX in extended mode ***.' -*** TRIP test for e-pTeX in extended mode ***. - -rm -f trip.log -+ rm -f trip.log -./eptex --progname=epinitex --ini <$etestdir/etrip1.in >xptripin.fot -+ ./eptex --progname=epinitex --ini -if test ! -s trip.fmt; then - echo "*** trip.fmt not created by etrip1.in, investigate!" >&2 - exit 1 -fi -+ test '!' -s trip.fmt -sed "$P_SED1" trip.log > xptripin.log || exit 1 -+ sed 's/, yoko direction//;s/yoko direction, //' trip.log -diff $testdir/tripin.log xptripin.log -+ diff SRCDIR/triptrap/tripin.log xptripin.log -1,3c1,4 -< This is TeX, Version 3.141592653 (INITEX) 4 JUL 1776 12:00 -< **\input trip -< (trip.tex ---- -> This is e-pTeX, Version 3.141592653-p3.8.3-191112-2.6 (utf8.euc) (TeX Live 2021/dev) (INITEX) 27 JAN 2021 18:03 -> entering extended mode -> ***\input trip -> (./trip.tex -36,41d36 -< ! 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. -< -91c86,87 -< ### horizontal mode entered at line 77 (language255:hyphenmin1,63) ---- -> ### horizontal mode entered at line 77 (language255:hyph -> enmin1,63) -93a90 -> \displace 0.0 -95a93 -> \displace 0.0 -368a367 -> ....\displace 0.0 -370a370 -> ....\displace 0.0 -437,438d436 -< ....\rip 6 (ligature ) -< ....\rip 7 (ligature ) -450,453c448,451 -< (preloaded format=trip 1776.7.4) -< 1326 strings of total length 23633 -< 471 memory locations dumped; current usage is 96&278 -< 341 multiletter control sequences ---- -> (preloaded format=trip 2021.1.27) -> 1673 strings of total length 29297 -> 538 memory locations dumped; current usage is 159&278 -> 494 multiletter control sequences -461c459 -< Hyphenation trie of length 273 has 9 ops out of 500 ---- -> Hyphenation trie of length 273 has 9 ops out of 35111 - -# May as well test non-ini second time through. -rm -f trip.log -+ rm -f trip.log -./eptex --progname=eptex <$etestdir/trip2.in >xptrip.fot -+ ./eptex --progname=eptex -sed "$P_SED1;$P_SED2" trip.log > xptrip.log -+ sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log -diff $testdir/trip.fot xptrip.fot -+ diff SRCDIR/triptrap/trip.fot xptrip.fot -1,3c1,3 -< This is TeX, Version 3.141592653 (INITEX) -< ** &trip trip -< (trip.tex ## ---- -> This is e-pTeX, Version 3.141592653-p3.8.3-191112-2.6 (utf8.euc) (TeX Live 2021/dev) (preloaded format=eptex) -> **entering extended mode -> ## (./trip.tex -17c17 -< Memory usage before: 159&313; after: 102&278; still untouched: 1613 ---- -> Memory usage before: 196&313; after: 120&278; still untouched: 2109 -75c75 -< Memory usage before: 334&431; after: 292&418; still untouched: 175 ---- -> Memory usage before: 462&431; after: 400&418; still untouched: 240 -77a78,80 -> -> ### semi simple group (level 1) entered at line 429 (begingroup) -> ### bottom level - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log xptrip.log -+ diff SRCDIR/triptrap/trip.log xptrip.log -1,3c1,4 -< This is TeX, Version 3.141592653 (preloaded format=trip 1776.7.4) 4 JUL 1776 12:00 -< ** &trip trip -< (trip.tex ## ---- -> This is e-pTeX, Version 3.141592653-p3.8.3-191112-2.6 (utf8.euc) (TeX Live 2021/dev) (preloaded format=trip 2021.1.27) 27 JAN 2021 18:03 -> entering extended mode -> **&trip \toksdef\tokens=0 \input trip -> (./trip.tex -73c74 -< Memory usage before: 159&313; after: 102&278; still untouched: 1613 ---- -> Memory usage before: 196&313; after: 120&278; still untouched: 2109 -113a115 -> .\displace 0.0 -198a201 -> .\displace 0.0 -253a257 -> .\displace 0.0 -308a313 -> .\displace 0.0 -349a355 -> .\displace 0.0 -385,386c391,392 -< \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 -406a413 -> ....\displace 0.0 -409a417 -> ....\displace 0.0 -412a421 -> ....\displace 0.0 -420a430 -> .\displace 0.0 -426c436 -< \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 -435a446 -> .\displace 0.0 -441c452 -< \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 -450a462 -> .\displace 0.0 -456c468 -< \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 -466a479 -> .\displace 0.0 -483,484c496,497 -< \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 -588a602 -> .....\displace 0.0 -591a606 -> .....\displace 0.0 -594a610 -> .....\displace 0.0 -630a647 -> ......\displace 0.0 -633a651 -> ......\displace 0.0 -636a655 -> ......\displace 0.0 -642c661 -< Memory usage before: 747&484; after: 581&481; still untouched: 1492 ---- -> Memory usage before: 1118&483; after: 864&480; still untouched: 1989 -647c666,667 -< ### internal vertical mode entered at line 150 (\output routine) ---- -> ### internal vertical mode entered at line 150 (\output -> routine) -650a671 -> .\displace 0.0 -660a682 -> .\displace 0.0 -670a693 -> .\displace 0.0 -681a705 -> .\displace 0.0 -693,694c717,718 -< \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 -701c725 -< \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,715c738,739 -< \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 -815c839 -< Memory usage before: 475&470; after: 290&466; still untouched: 1473 ---- -> Memory usage before: 710&469; after: 418&465; still untouched: 1970 -820c844,845 -< ### internal vertical mode entered at line 150 (\output routine) ---- -> ### internal vertical mode entered at line 150 (\output -> routine) -915c940 -< Memory usage before: 218&459; after: 149&458; still untouched: 1473 ---- -> Memory usage before: 308&458; after: 198&457; still untouched: 1970 -920c945,946 -< ### internal vertical mode entered at line 150 (\output routine) ---- -> ### internal vertical mode entered at line 150 (\output -> routine) -1070c1096 -< Memory usage before: 118&328; after: 102&328; still untouched: 1473 ---- -> Memory usage before: 150&327; after: 126&327; still untouched: 1970 -1405c1431 -< \vbox(16383.99998+0.0)x1000.0, glue set 16342.0fil ---- -> \vbox(16383.99998+0.0)x1000.0, glue set 16341.99998fil -1493a1520 -> ..\displace 0.0 -1503a1531 -> ..\displace 0.0 -1504a1533 -> ..\displace 0.0 -1511c1540 -< Memory usage before: 990&376; after: 584&370; still untouched: 735 ---- -> Memory usage before: 1498&375; after: 846&369; still untouched: 1970 -1769d1797 -< {restoring \fam=-1} -1779d1806 -< {restoring \displayindent=0.0pt} -1833d1859 -< {restoring \fam=-1} -1887c1913 -< .\rip A ---- -> .\displace 0.0 -1923c1949 -< .\hbox(0.0+0.0)x120.0 [] ---- -> .\hbox(0.0+0.0)x120.0, yoko(math) direction [] -1954c1980 -< (tripos.tex ---- -> (./tripos.tex -2018c2044 -< \vbox(16383.99998+1.0)x100.0, glue set 16239.0fil ---- -> \vbox(16383.99998+1.0)x100.0, glue set 16238.99998fil -2022a2049 -> ..\displace 0.0 -2058a2086 -> ..\displace 0.0 -2071a2100 -> ..\displace 0.0 -2092a2122 -> ..\displace 0.0 -2113a2144 -> ..\displace 0.0 -2123a2155 -> ..\displace 0.0 -2135c2167 -< .\hbox(0.0+0.0)x0.0, shifted 50.0 ---- -> .\hbox(0.0+0.0)x0.0, shifted 50.0, display -2138c2170 -< .\hbox(0.0+0.0)x0.0, shifted 100.0 ---- -> .\hbox(0.0+0.0)x0.0, shifted 100.0, display -2142a2175 -> ..\displace 0.0 -2150a2184 -> ..\displace 0.0 -2171c2205,2206 -< ..\hbox(0.0+0.0)x120.0 ---- -> ..\hbox(0.0+0.0)x120.0, yoko(math) direction -> ...\displace 0.0 -2189c2224 -< Memory usage before: 950&531; after: 546&448; still untouched: 706 ---- -> Memory usage before: 1494&530; after: 826&447; still untouched: 1941 -2397c2432 -< ! Improper alphabetic constant. ---- -> ! Improper alphabetic or KANJI constant. -2533c2568 -< \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil ---- -> \vbox(16383.99998+0.0)x20.0, glue set 16330.99998fil -2544a2580 -> ..\displace 0.0 -2570c2606,2607 -< .\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(math) -> direction -2572c2609 -< ..\hbox(0.0+0.0)x0.0 ---- -> ..\hbox(0.0+0.0)x0.0, yoko(math) direction -2575c2612 -< Memory usage before: 339&413; after: 236&405; still untouched: 706 ---- -> Memory usage before: 497&411; after: 329&403; still untouched: 1941 -2650,2651c2687,2688 -< Dimensions can be in units of em, ex, in, pt, pc, -< cm, mm, dd, cc, bp, or sp; but yours is a new one! ---- -> Dimensions can be in units of em, ex, zw, zh, in, pt, pc, -> cm, mm, dd, cc, bp, H, Q, or sp; but yours is a new one! -2830c2867 -< Since I expected to read a number between 0 and 15, ---- -> Since I expected to read a number between 0 and 255, -2835d2871 -< {restoring current font=\ip} -3038c3074,3075 -< ^\hbox(7.0+1.0)x2.0 ---- -> ^\hbox(7.0+1.0)x2.0, yoko(math) direction -> ^.\displace 0.0 -3051c3088 -< \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 -3054c3091 -< .\fam0 ^^c8 ---- -> .\fam0 È -3056c3093 -< .\vbox(-2.0+0.0)x0.0 ---- -> .\vbox(-2.0+0.0)x0.0, yoko(math) direction -3060c3097,3098 -< ^.\hbox(7.0+1.0)x2.0, shifted -2.0 ---- -> ^.\hbox(7.0+1.0)x2.0, shifted -2.0, yoko(math) direction -> ^..\displace 0.0 -3140a3179 -> .....\displace 0.0 -3142a3182 -> ....|\displace 0.0 -3143a3184 -> ....\displace 0.0 -3151a3193 -> .\displace 0.0 -3223d3264 -< {restoring \fam=-1} -3235c3276 -< ! \textfont 0 is undefined (character ^^c8). ---- -> ! \textfont 0 is undefined (character È). -3286c3327 -< .\vbox(6.0+-8.0)x0.0 ---- -> .\vbox(6.0+-8.0)x0.0, yoko(math) direction -3326c3367 -< \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil ---- -> \vbox(10000.0+2.0)x28.0, glue set 9737.58742fil -3329a3371 -> ..\displace 0.0 -3372c3414 -< .\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 -3374c3416 -< ..\vbox(6.0+-8.0)x0.0 ---- -> ..\vbox(6.0+-8.0)x0.0, yoko(math) direction -3385c3427,3428 -< ......\hbox(7.0+1.0)x2.0, shifted -2.0 ---- -> ......\hbox(7.0+1.0)x2.0, shifted -2.0, yoko(math) direction -> .......\displace 0.0 -3544a3588 -> ..........\displace 0.0 -3546a3591 -> .........|\displace 0.0 -3547a3593 -> .........\displace 0.0 -3557c3603 -< .\hbox(20.5+50.80002)x8.27895, shifted 19.72105 ---- -> .\hbox(20.5+50.80002)x8.27895, shifted 19.72105, display -3564c3610,3611 -< ...\hbox(7.0+1.0)x1.99 ---- -> ...\hbox(7.0+1.0)x1.99, yoko(math) direction -> ....\displace 0.0 -3616c3663 -< Memory usage before: 2170&521; after: 1181&459; still untouched: 175 ---- -> Memory usage before: 3283&519; after: 1753&457; still untouched: 240 -3766d3812 -< {restoring \fam=-1} -3839d3884 -< {restoring \fam=-1} -3864c3909 -< \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil ---- -> \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil -3895c3940 -< ..\hbox(12.0+4.0)x8.1778 ---- -> ..\hbox(12.0+4.0)x8.1778, display -3917c3962 -< ..\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 -3919,3920c3964,3966 -< ...\vbox(-0.00002+13.00002)x52.5, glue set - 0.00247 -< ....\vbox(-0.00002+0.0)x0.0 ---- -> ...\vbox(-0.00002+13.00002)x52.5, glue set - 0.00247, yoko(math) directi -> on -> ....\vbox(-0.00002+0.0)x0.0, yoko(math) direction -3925c3971 -< ....\hbox(7.0+1.0)x5.0, shifted 47.5 ---- -> ....\hbox(7.0+1.0)x5.0, shifted 47.5, display -3951c3997 -< Memory usage before: 640&415; after: 397&410; still untouched: 175 ---- -> Memory usage before: 959&413; after: 573&408; still untouched: 240 -4011d4056 -< {restoring \fam=-1} -4034c4079 -< \vbox(16383.99998+0.0)x8236.0, glue set 16344.0fil ---- -> \vbox(16383.99998+0.0)x8236.0, glue set 16343.99998fil -4047c4092 -< .\hbox(0.0+0.0)x1009.0, shifted 7227.0 ---- -> .\hbox(0.0+0.0)x1009.0, shifted 7227.0, display -4051c4096 -< .\hbox(0.0+0.0)x-7127.0, shifted 7227.0 ---- -> .\hbox(0.0+0.0)x-7127.0, shifted 7227.0, display -4053c4098 -< Memory usage before: 235&401; after: 178&399; still untouched: 175 ---- -> Memory usage before: 342&399; after: 248&397; still untouched: 240 -4420c4465 -< \vbox(16383.99998+0.0)x100.0, glue set 16332.0fil ---- -> \vbox(16383.99998+0.0)x100.0, glue set 16331.99998fil -4425a4471 -> ...\displace 0.0 -4447a4494 -> ...\displace 0.0 -4475a4523 -> ...\displace 0.0 -4492a4541 -> ...\displace 0.0 -4506c4555 -< Memory usage before: 651&432; after: 417&418; still untouched: 175 ---- -> Memory usage before: 1008&431; after: 606&417; still untouched: 240 -4742c4791,4792 -< \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 -4746a4797 -> ...\displace 0.0 -4762a4814 -> .....\displace 0.0 -4777a4830 -> ......\displace 0.0 -4828c4881 -< Memory usage before: 776&458; after: 464&452; still untouched: 175 ---- -> Memory usage before: 1186&457; after: 682&451; still untouched: 240 -4845c4898 -< 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,4888d4933 -< ! Bad number (16). -< -< = -< l.346 ...ewlinechar}\textfont16= -< \relax -< Since I expected to read a number between 0 and 15, -< I changed this one to zero. -< -5701c5746 -< ! \textfont 0 is undefined (character ^^c8). ---- -> ! \textfont 0 is undefined (character È). -6381c6426 -< (tripos.tex ---- -> (./tripos.tex -6502c6547 -< l.429 ...^^M=13 \def^^M{\relax}# ---- -> l.429 ...^^M=13 \defqqM{\relax}# -6596c6641 -< Memory usage before: 819&428; after: 720&426; still untouched: 175 ---- -> Memory usage before: 1232&428; after: 1078&426; still untouched: 240 -6853c6898 -< .|vbox(0.0+0.0)x0.0 ---- -> .|vbox(0.0+0.0)x0.0, yoko(math) direction -6876a6922 -> ..|displace 0.0 -6891a6938 -> ..|displace 0.0 -6926a6974 -> .|displace 0.0 -6959a7008 -> .|displace 0.0 -6961c7010,7011 -< .|hbox(0.0+0.0)x0.0 ---- -> .|hbox(0.0+0.0)x0.0, yoko(math) direction -> ..|displace 0.0 -6991a7042 -> .|displace 0.0 -7103a7155 -> ...|displace 0.0 -7108d7159 -< ...|ip A (ligature BB) -7116a7168 -> ...|displace 0.0 -7125d7176 -< ...|kern2.0 -7126a7178 -> .|displace 0.0 -7136c7188 -< ...|vbox(0.0+0.0)x0.0 ---- -> ...|vbox(0.0+0.0)x0.0, yoko(math) direction -7156c7208 -< Memory usage before: 895&439; after: 290&420; still untouched: 175 ---- -> Memory usage before: 1350&439; after: 398&420; still untouched: 240 -7289c7341 -< Memory usage before: 334&431; after: 292&418; still untouched: 175 ---- -> Memory usage before: 462&431; after: 400&418; still untouched: 240 -7292a7345,7347 -> -> ### semi simple group (level 1) entered at line 429 (begingroup) -> ### bottom level -7297,7300c7352,7355 -< 47 strings out of 1674 -< 253 string characters out of 8367 -< 2825 words of memory out of 3000 -< 372 multiletter control sequences out of 2100 ---- -> 44 strings out of 1627 -> 261 string characters out of 10703 -> 4260 words of memory out of 4500 -> 525 multiletter control sequences out of 15000+0 -7302,7303c7357,7358 -< 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 - -mv tripos.tex xptripos.tex -+ mv tripos.tex xptripos.tex -diff $testdir/tripos.tex xptripos.tex -+ diff SRCDIR/triptrap/tripos.tex xptripos.tex - -eval ./dvitype $dvitype_args trip.dvi >xptrip.typ || exit 1 -+ eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi -./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' trip.dvi -++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi -$DIFF $DIFFFLAGS $testdir/trip.typ xptrip.typ -+ diff SRCDIR/triptrap/trip.typ xptrip.typ -1c1 -< This is DVItype, Version 3.6 ---- -> This is DVItype, Version 3.6 (TeX Live 2021/dev) -9c9 -< ' TeX output 1776.07.04:1200' ---- -> ' TeX output 2021.01.27:1803' -419c419 -< 1121: down4 639342208 ---- -> 1121: down4 639342177 -1087,1088c1087,1088 -< 2535: y4 203921760 -< 2540: y0 203921760 ---- -> 2535: y4 203921756 -> 2540: y0 203921756 - -mv trip.fmt xtrip.fmt -+ mv trip.fmt xtrip.fmt - -# ================================= - -echo "*** e-TeX specific part of e-TRIP test for e-pTeX ***." -+ echo '*** e-TeX specific part of e-TRIP test for e-pTeX ***.' -*** e-TeX specific part of e-TRIP test for e-pTeX ***. - -./pltotf $etestdir/etrip.pl etrip.tfm || exit 1 -+ ./pltotf SRCDIR/etexdir/etrip/etrip.pl etrip.tfm - -./tftopl ./etrip.tfm etrip.pl || exit 1 -+ ./tftopl ./etrip.tfm etrip.pl - -diff $etestdir/etrip.pl etrip.pl || is_OK=false -+ diff SRCDIR/etexdir/etrip/etrip.pl etrip.pl - -# get same filename in log -$LN_S $eptestdir/eptrip.tex etrip.tex -+ ln -s SRCDIR/eptexdir/eptrip/eptrip.tex etrip.tex - -./eptex --progname=epinitex --ini <$etestdir/etrip2.in >eptripin.fot -+ ./eptex --progname=epinitex --ini -if test ! -s etrip.fmt; then - echo "*** etrip.fmt not created by etrip2.in, investigate!" >&2 - exit 1 -fi -+ test '!' -s etrip.fmt -sed "$P_SED1" etrip.log > eptripin.log || exit 1 -+ sed 's/, yoko direction//;s/yoko direction, //' etrip.log -diff $etestdir/etripin.log eptripin.log -+ diff SRCDIR/etexdir/etrip/etripin.log eptripin.log -1c1 -< This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:25 ---- -> This is e-pTeX, Version 3.141592653-p3.8.3-191112-2.6 (utf8.euc) (TeX Live 2021/dev) (INITEX) 27 JAN 2021 18:03 -26,29c26,29 -< (preloaded format=etrip 2014.1.22) -< 1491 strings of total length 26258 -< 281 memory locations dumped; current usage is 36&167 -< 408 multiletter control sequences ---- -> (preloaded format=etrip 2021.1.27) -> 1674 strings of total length 29328 -> 284 memory locations dumped; current usage is 40&167 -> 494 multiletter control sequences - -# May as well test non-ini second time through. -./eptex --progname=eptex <$etestdir/etrip3.in >eptrip.fot -+ ./eptex --progname=eptex -sed "$P_SED1;$P_SED2" etrip.log > eptrip.log -+ sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' etrip.log -diff $etestdir/etrip.fot eptrip.fot -+ diff SRCDIR/etexdir/etrip/etrip.fot eptrip.fot -1c1 -< This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) ---- -> This is e-pTeX, Version 3.141592653-p3.8.3-191112-2.6 (utf8.euc) (TeX Live 2021/dev) (preloaded format=eptex) -45,46d44 -< -< \openout1 = `etrip.out'. - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $eptestdir/eptrip.log eptrip.log -+ diff SRCDIR/eptexdir/eptrip/eptrip.log eptrip.log -1c1 -< This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:25 ---- -> This is e-pTeX, Version 3.141592653-p3.8.3-191112-2.6 (utf8.euc) (TeX Live 2021/dev) (preloaded format=etrip 2021.1.27) 27 JAN 2021 18:03 -57a58 -> .\displace 0.0 -104a106 -> .\displace 0.0 -133a136 -> .\displace 0.0 -193a197 -> .\displace 0.0 -205a210 -> ..\displace 0.0 -253a259 -> ..\displace 0.0 -283a290 -> ..\displace 0.0 -303a311 -> ..\displace 0.0 -692,693d699 -< \openout1 = `etrip.out'. -< -1426c1432 -< this will be denominator of: ---- -> this will begin denominator of: -1450c1456 -< this will be denominator of: ---- -> this will begin denominator of: -1497c1503 -< this will be denominator of: ---- -> this will begin denominator of: -1545c1551 -< this will be denominator of: ---- -> this will begin denominator of: -1662a1669 -> \displace 0.0 -1873a1881 -> \displace 0.0 -1881c1889 -< .\hbox(0.0+0.0)x0.0, shifted -16.5 ---- -> .\hbox(0.0+0.0)x0.0, shifted -16.5, yoko(math) direction -1901a1910 -> \displace 0.0 -1906c1915 -< .\hbox(0.0+0.0)x0.0, shifted 3.0 ---- -> .\hbox(0.0+0.0)x0.0, shifted 3.0, yoko(math) direction -2207c2216 -< A character number must be between 0 and 255, or KANJI code. ---- -> A character number must be between 0 and 255. -2213c2222 -< A character number must be between 0 and 255, or KANJI code. ---- -> A character number must be between 0 and 255. -4025a4035 -> ..\displace 0.0 -4033a4044 -> ..\displace 0.0 -4300a4312 -> .\displace 0.0 -4421,4422c4433,4434 -< 19 strings out of 1692 -< 145 string characters out of 8157 ---- -> 19 strings out of 1626 -> 145 string characters out of 10672 -4424c4436 -< 463 multiletter control sequences out of 15000+0 ---- -> 495 multiletter control sequences out of 15000+0 - -mv etrip.out eptrip.out -+ mv etrip.out eptrip.out -diff $etestdir/etrip.out eptrip.out -+ diff SRCDIR/etexdir/etrip/etrip.out eptrip.out - -eval ./dvitype $dvitype_args etrip.dvi >eptrip.typ || exit 1 -+ eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' etrip.dvi -./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' etrip.dvi -++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' etrip.dvi -$DIFF $DIFFFLAGS $etestdir/etrip.typ eptrip.typ -+ diff SRCDIR/etexdir/etrip/etrip.typ eptrip.typ -1c1 -< This is DVItype, Version 3.6 (TeX Live 2014) ---- -> This is DVItype, Version 3.6 (TeX Live 2021/dev) -9c9 -< ' TeX output 2014.01.22:1125' ---- -> ' TeX output 2021.01.27:1803' - -$is_OK || { - echo ">>> There were some errors." >&2 - exit 1 -} -+ : - -PASS eptexdir/eptriptest.test (exit status: 0) -PASS: eptexdir/eptriptest.test diff --git a/source/texk/web2c/eptexdir/eptrip/texmf.cnf b/source/texk/web2c/eptexdir/eptrip/texmf.cnf deleted file mode 100644 index 7ad7bffd6..000000000 --- a/source/texk/web2c/eptexdir/eptrip/texmf.cnf +++ /dev/null @@ -1,41 +0,0 @@ -% eptexdir/eptrip/texmf.cnf -- configuration for the e-ptrip 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-pTeX. -mem_bot = 1 -main_memory = 4500 -max_strings = 3300 -pool_size = 40000 - -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 -# Copyright 2017-2018 Karl Berry -# Copyright 2011-2014 Peter Breitenlohner -# Copyright 2010 Hironori Kitagawa -# You may freely use, modify and/or distribute this file. - -W2CDir=${W2CDir:-..} -ExeExt=${ExeExt:-} -_eptex=$W2CDir/eptex$ExeExt -_pltotf=$W2CDir/pltotf$ExeExt -_tftopl=$W2CDir/tftopl$ExeExt -_dvitype=$W2CDir/dvitype$ExeExt - -LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE - -testdir=$abs_srcdir/triptrap -etestdir=$abs_srcdir/etexdir/etrip -eptestdir=$abs_srcdir/eptexdir/eptrip - -TEXMFCNF=$eptestdir; export TEXMFCNF - -rm -rf eptripdir -mkdir eptripdir -cd eptripdir -mkdir -p a b - -# TeX Live generic -cat >filter <<-\_EOF - /^\*\* \&trip trip/d - /^\*\*entering extended mode/d - s,^(trip\.tex ##,**(./trip.tex ##, - s,^## (\./trip\.tex,**(./trip.tex ##, - s/ (TeX Live 20[^)]*)// - s/ (Web2C 202[3-9])// - s/(preloaded format=.*tex)/(INITEX)/ - s/format=trip [^)][^)]*)/format=trip)/ - s/) [0-9A-Z: ]*$/)/ - s,^(\./,(, - s/[1-9][0-9]* strings out of [1-9].*/XX strings out of YYY/ - s/[1-9][0-9]* string characters out of [1-9].*/XXX string characters out of YYYY/ - s/sequences out of [1-9].*/sequences out of YYYY/ - s/[1-9] hyphenation exceptions* out of [1-9].*/X hyphenation exceptions out of YYY/ - s/[1-9][0-9]* strings of total length [1-9].*/XXXX strings of total length YYYYY/ - s/9 ops out of [1-9][0-9]*/9 ops out of YYY/ - s/TeX output ....\...\...:..../TeX output YYYY.MM.DD:hhmm/ - _EOF - -# x86 glue rounding -cat >>filter <<-\_EOF - s/ 16341\.999.*fil/ 16342.0fil/ - s/ 16238\.999.*fil/ 16239.0fil/ - s/ 16317\.999.*fil/ 16318.0fil/ - s/ 16330\.999.*fil/ 16331.0fil/ - s/ 16331\.999.*fil/ 16332.0fil/ - s/ 16343\.999.*fil/ 16344.0fil/ - s/ 9737\.587..fil/ 9737.58789fil/ - s/down4 639342.../down4 639342208/ - s/y4 2039217../y4 203921760/ - s/y0 2039217../y0 203921760/ - _EOF - -# epTeX -cat >>filter <<-\_EOF - s/This is .*TeX,/This is *TeX,/ - s/(utf8[^)]*) // - s/ Version 3\.141592653[^(]*(/ Version 3.141592653* (/ - s/ before: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / before: XXX\&YYY; / - s/ after: [1-9][0-9][0-9][0-9]*&[1-9][0-9][0-9][0-9]*; / after: XXX\&YYY; / - s/ still untouched: [1-9][0-9][0-9][0-9]*/ still untouched: XXX/ - _EOF -cat >filter1 <<-\_EOF - :l - N - $!b l - s/ inside a group at level 1).*bottom level/ inside a group at level 1)/ - _EOF - -dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" - -echo ">>> Running e-TRIP test for e-pTeX." >&2 -echo ">>> See $eptestdir/eptrip.diffs for example of acceptable diffs." >&2 - -# pTeX outputs direction of boxes. -P_SED1='s/, yoko direction//;s/yoko direction, //' -P_SED2='s/yoko(math) direction, //' - -is_OK=: - -set -x - -echo "*** TRIP test for e-pTeX in compatibility mode ***." - -$_pltotf $testdir/trip.pl trip.tfm || exit 1 - -$_tftopl ./trip.tfm trip.pl || exit 1 - -diff $testdir/trip.pl trip.pl || is_OK=false - -# get same filename in log -$LN_S $testdir/trip.tex . - -rm -f trip.log -$_eptex --progname=epinitex --ini <$testdir/trip1.in >cptripin.fot -if test ! -s trip.fmt; then - echo "*** trip.fmt not created by trip1.in, investigate!" >&2 - exit 1 -fi -sed "$P_SED1" trip.log > cptripin.log || exit 1 -diff $testdir/tripin.log cptripin.log - -# May as well test non-ini second time through. -rm -f trip.log -$_eptex --progname=eptex <$testdir/trip2.in >cptrip.fot -sed "$P_SED1;$P_SED2" trip.log > cptrip.log -#diff $testdir/trip.fot cptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log cptrip.log - -mv tripos.tex cptripos.tex -diff $testdir/tripos.tex cptripos.tex - -eval $_dvitype $dvitype_args trip.dvi >cptrip.typ || exit 1 -#$DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ - -for f in trip.fot trip.typ; do - sed -f filter $testdir/$f >a/$f - sed -f filter cp$f >b/$f - diff a/$f b/$f || is_OK=false -done - -mv trip.fmt ctrip.fmt - -# ================================= - -echo "*** TRIP test for e-pTeX in extended mode ***." - -rm -f trip.log -$_eptex --progname=epinitex --ini <$etestdir/etrip1.in >xptripin.fot -if test ! -s trip.fmt; then - echo "*** trip.fmt not created by etrip1.in, investigate!" >&2 - exit 1 -fi -sed "$P_SED1" trip.log > xptripin.log || exit 1 -diff $testdir/tripin.log xptripin.log - -# May as well test non-ini second time through. -rm -f trip.log -$_eptex --progname=eptex <$etestdir/trip2.in >xptrip.fot -sed "$P_SED1;$P_SED2" trip.log > xptrip.log -#diff $testdir/trip.fot xptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log xptrip.log - -mv tripos.tex xptripos.tex -diff $testdir/tripos.tex xptripos.tex - -eval $_dvitype $dvitype_args trip.dvi >xptrip.typ || exit 1 -#$DIFF $DIFFFLAGS $testdir/trip.typ xptrip.typ - -for f in trip.fot trip.typ; do - sed -f filter $testdir/$f >a/x$f - sed -f filter xp$f | sed -f filter1 >b/x$f - diff a/x$f b/x$f || is_OK=false -done - -mv trip.fmt xtrip.fmt - -# ================================= - -echo "*** e-TeX specific part of e-TRIP test for e-pTeX ***." - -$_pltotf $etestdir/etrip.pl etrip.tfm || exit 1 - -$_tftopl ./etrip.tfm etrip.pl || exit 1 - -diff $etestdir/etrip.pl etrip.pl || is_OK=false - -# get same filename in log -$LN_S $eptestdir/eptrip.tex etrip.tex - -$_eptex --progname=epinitex --ini <$etestdir/etrip2.in >eptripin.fot -if test ! -s etrip.fmt; then - echo "*** etrip.fmt not created by etrip2.in, investigate!" >&2 - exit 1 -fi -sed "$P_SED1" etrip.log > eptripin.log || exit 1 -diff $etestdir/etripin.log eptripin.log - -# May as well test non-ini second time through. -$_eptex --progname=eptex <$etestdir/etrip3.in >eptrip.fot -sed "$P_SED1;$P_SED2" etrip.log > eptrip.log -#diff $etestdir/etrip.fot eptrip.fot - -# We use $DIFF instead of `diff' only for those files where there -# might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $eptestdir/eptrip.log eptrip.log - -mv etrip.out eptrip.out -diff $etestdir/etrip.out eptrip.out - -eval $_dvitype $dvitype_args etrip.dvi >eptrip.typ || exit 1 -#$DIFF $DIFFFLAGS $etestdir/etrip.typ eptrip.typ - -for f in trip.fot trip.typ; do - sed -f filter $etestdir/e$f >a/e$f - sed -f filter ep$f >b/e$f - diff a/e$f b/e$f || is_OK=false -done - -$is_OK || { - echo ">>> There were some errors." >&2 - exit 1 -} - diff --git a/source/texk/web2c/eptexdir/epver.test b/source/texk/web2c/eptexdir/epver.test deleted file mode 100755 index 9f14d0554..000000000 --- a/source/texk/web2c/eptexdir/epver.test +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh -vx -# $Id$ -# Copyright 2019 Hironobu Yamashita -# You may freely use, modify and/or distribute this file. - -BinDir=${BinDir:-.} -ExeExt=${ExeExt:-} -_eptex=$BinDir/eptex$ExeExt - -LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE - -TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF -TEXINPUTS="$srcdir/ptexdir/tests;."; export TEXINPUTS - -# check consistency between runtime terminal and log -$_eptex -ini -etex -interaction batchmode -jobname epver1-log pver1.tex >epver1-term.log || exit 1 -sed -n 's/^This is \([-A-Za-z]*\), Version [^-]*-\([^ ]*\) \(.*\)/\1 \2/p' \ - epver1-term.log >epver1-term_ed.log || exit 2 -sed -n 's/^This is \([-A-Za-z]*\), Version [^-]*-\([^ ]*\) \(.*\)/\1 \2/p' \ - epver1-log.log >epver1-log_ed.log || exit 3 -diff epver1-term_ed.log epver1-log_ed.log || exit 4 - -# check consistency between runtime and version output -$_eptex -version >epver2-self.log || exit 5 -sed -n '1 s/^\([-A-Za-z]*\) [^-]*-\([^ ]*\) \(.*\)/\1 \2/p' \ - epver2-self.log >epver2-self_ed.log || exit 6 -diff epver1-term_ed.log epver2-self_ed.log || exit 7 - -# check consistency between version output and version primitives -$_eptex -ini -etex -interaction batchmode -jobname epver2-prim pver2.tex || exit 8 -sed -n 's/^Engine \([-A-Za-z]*\) \([^ ]*\) \(.*\)/\1 \2/p' \ - epver2-prim.log >epver2-prim_ed.log || exit 9 -diff epver2-self_ed.log epver2-prim_ed.log || exit 10 - -exit 0 - diff --git a/source/texk/web2c/eptexdir/etex.ch0 b/source/texk/web2c/eptexdir/etex.ch0 deleted file mode 100644 index d5893fa9f..000000000 --- a/source/texk/web2c/eptexdir/etex.ch0 +++ /dev/null @@ -1,261 +0,0 @@ -% eptexdir/etex.ch0: changefile used to build e-pTeX, see eptexdir/eptex-base.ch for details. -% Public domain. Originally written by Peter Breitenlohner . - -@x [10] m.135 l.2895 - e-TeX TeXXeT -|fil|, |fill|, or |filll|). The |subtype| field is not used in \TeX. -@y -|fil|, |fill|, or |filll|). The |subtype| field is not used. -@z - -@x [17.236] l.4960 - first web2c, then e-TeX additional integer parameters -@d int_pars=web2c_int_pars {total number of integer parameters} -@# -@d etex_int_base=tex_int_pars {base for \eTeX's integer parameters} -@y -@d int_pars=web2c_int_pars {total number of integer parameters} -@z - -@x [18.???] pTeX: ensure buffer2[]=0 in primitive - for j:=0 to l-1 do buffer[first+j]:=so(str_pool[k+j]); -@y - for j:=0 to l-1 do buffer[j]:=so(str_pool[k+j]); -@z - -@x [26.413] - {fetch an internal parameter} -label exit; -var m:halfword; {|chr_code| part of the operand token} -@!q,@!r:pointer; {general purpose indices} -@!tx:pointer; {effective tail node} -@y - {fetch an internal parameter} -var m:halfword; {|chr_code| part of the operand token} -@z - -@x [26.413] -exit:end; -@y -end; -@z - -@x -@d badness_code=input_line_no_code+1 {code for \.{\\badness}} -@y -@d badness_code=glue_val+2 {code for \.{\\badness}} -@z - -@x [26.420] -begin scan_register_num; fetch_box(q); -if q=null then cur_val:=0 @+else cur_val:=mem[q+m].sc; -@y -begin scan_eight_bit_int; -if box(cur_val)=null then cur_val:=0 @+else cur_val:=mem[box(cur_val)+m].sc; -@z - -@x [26.424] -legal in similar contexts. - -@y -legal in similar contexts. -@z - -@x [26.424] -@d find_effective_tail==find_effective_tail_eTeX - -@y -@z - -@x - if m>=eTeX_glue then @@; - else if m>=eTeX_dim then - begin case m of - @/@@/ - end; {there are no other cases} - cur_val_level:=dimen_val; - end - else begin case m of - input_line_no_code: cur_val:=line; - badness_code: cur_val:=last_badness; - @/@@/ - end; {there are no other cases} -@y - begin if cur_chr=input_line_no_code then cur_val:=line - else cur_val:=last_badness; {|cur_chr=badness_code|} -@z - -@x [26.424] - find_effective_tail; -@y -@z - -@x [26.424] - if not is_char_node(tx)and(mode<>0) then - case cur_chr of - int_val: if type(tx)=penalty_node then cur_val:=penalty(tx); - dimen_val: if type(tx)=kern_node then cur_val:=width(tx); - glue_val: if type(tx)=glue_node then - begin cur_val:=glue_ptr(tx); - if subtype(tx)=mu_glue then cur_val_level:=mu_val; -@y - if not is_char_node(tail)and(mode<>0) then - case cur_chr of - int_val: if type(tail)=penalty_node then cur_val:=penalty(tail); - dimen_val: if type(tail)=kern_node then cur_val:=width(tail); - glue_val: if type(tail)=glue_node then - begin cur_val:=glue_ptr(tail); - if subtype(tail)=mu_glue then cur_val_level:=mu_val; -@z - -@x [26.424] - else if (mode=vmode)and(tx=head) then -@y - else if (mode=vmode)and(tail=head) then -@z - -@x [27.468] -@d etex_convert_base=5 {base for \eTeX's command codes} -@d eTeX_revision_code=etex_convert_base {command code for \.{\\eTeXrevision}} -@d etex_convert_codes=etex_convert_base+1 {end of \eTeX's command codes} -@d job_name_code=etex_convert_codes {command code for \.{\\jobname}} -@y -@d job_name_code=5 {command code for \.{\\jobname}} -@z - -@x [30.581] -@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits); -var old_setting: integer; {saved value of |tracing_online|} -@y -@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits); -@z - -@x [32.619] -save_loc:=dvi_offset+dvi_ptr; base_line:=cur_v; -prev_p:=this_box+list_offset; -@; -left_edge:=cur_h; -@y -save_loc:=dvi_offset+dvi_ptr; base_line:=cur_v; left_edge:=cur_h; -@z - -@x [32.620] - prev_p:=link(prev_p); {N.B.: not |prev_p:=p|, |p| might be |lig_trick|} -@y -@z - -@x [32.624] l.13005 - pTeX: output a box(and dir_node) with disp - cur_h:=edge; cur_v:=base_line; -@y - cur_h:=edge+width(p); cur_v:=base_line; -@z - -@x [33.649] -exit: if TeXXeT_en then @; -hpack:=r; -@y -exit: hpack:=r; -@z - -@x [44.977] -q:=prune_page_top(q,saving_vdiscards>0); -p:=list_ptr(v); free_node(v,box_node_size); -if q<>null then q:=vpack(q,natural); -change_box(q); {the |eq_level| of the box stays the same} -@y -q:=prune_page_top(q); p:=list_ptr(v); free_node(v,box_node_size); -if q=null then box(n):=null {the |eq_level| of the box stays the same} -else box(n):=vpack(q,natural); -@z - -@x [47.1079] -@!r:pointer; {running behind |p|} -@!fm:boolean; {a final \.{\\beginM} \.{\\endM} node pair?} -@!tx:pointer; {effective tail node} -@y -@z - -@x [47.1080] -@d check_effective_tail(#)==find_effective_tail_eTeX -@d fetch_effective_tail==fetch_effective_tail_eTeX - -@y -@z -@x [47.1080] -else begin check_effective_tail(goto done); - if not is_char_node(tx) then - if (type(tx)=hlist_node)or(type(tx)=vlist_node) then - @; - done:end; -@y -else begin if not is_char_node(tail) then - if (type(tail)=hlist_node)or(type(tail)=vlist_node) then - @; - end; -@z - -@x [47.1081] -begin fetch_effective_tail(goto done); -cur_box:=tx; shift_amount(cur_box):=0; -end -@y -begin q:=head; -repeat p:=q; -if not is_char_node(q) then if type(q)=disc_node then - begin for m:=1 to replace_count(q) do p:=link(p); - if p=tail then goto done; - end; -q:=link(p); -until q=tail; -cur_box:=tail; shift_amount(cur_box):=0; -tail:=p; link(p):=null; -done:end -@z - -@x [47.1096] - else line_break(false); -@y - else line_break(widow_penalty); -@z - -@x [47.1105] -@!r:pointer; {running behind |p|} -@!fm:boolean; {a final \.{\\beginM} \.{\\endM} node pair?} -@!tx:pointer; {effective tail node} -@y -@z - -@x [47.1105] -else begin check_effective_tail(return); - if not is_char_node(tx) then if type(tx)=cur_chr then - begin fetch_effective_tail(return); - flush_node_list(tx); -@y -else begin if not is_char_node(tail) then if type(tail)=cur_chr then - begin q:=head; - repeat p:=q; - if not is_char_node(q) then if type(q)=disc_node then - begin for m:=1 to replace_count(q) do p:=link(p); - if p=tail then return; - end; - q:=link(p); - until q=tail; - link(p):=null; flush_node_list(tail); tail:=p; -@z - -@x [47.1110] -else begin link(tail):=list_ptr(p); change_box(null); -@y -else begin link(tail):=list_ptr(p); box(cur_val):=null; -@z - -@x [48.1145] -else begin line_break(true);@/ -@y -else begin line_break(display_widow_penalty);@/ -@z - -@x [49.1247] -if b<>null then mem[b+c].sc:=cur_val; -@y -if box(b)<>null then mem[box(b)+c].sc:=cur_val; -@z - diff --git a/source/texk/web2c/eptexdir/etex.ch1 b/source/texk/web2c/eptexdir/etex.ch1 deleted file mode 100644 index 5826dbcb4..000000000 --- a/source/texk/web2c/eptexdir/etex.ch1 +++ /dev/null @@ -1,214 +0,0 @@ -% eptexdir/etex.ch1: changefile used to build e-pTeX, see eptexdir/eptex-base.ch for details. -% Public domain. Originally written by Peter Breitenlohner . - -@x [12.184] - begin print(", "); print_direction(box_dir(p)); -@y - begin print_direction_alt(box_dir(p)); -@z - -@x [16.215] - e-pTeX last_node_subtype -last_glue:=max_halfword; last_penalty:=0; last_kern:=0; -last_node_type:=-1; -@y -last_glue:=max_halfword; last_penalty:=0; last_kern:=0; -last_node_type:=-1; last_node_subtype:=-1; -@z - -@x [17.236] -@d int_pars=web2c_int_pars {total number of integer parameters} -@y -@d etex_int_base=web2c_int_pars {base for \eTeX's integer parameters} -@z - -@x [18] - for j:=0 to l-1 do begin - buffer[j]:=Lo(so(str_pool[k+j])); buffer2[j]:=Hi(so(str_pool[k+j])); end; -@y - for j:=0 to l-1 do begin - buffer[first+j]:=Lo(so(str_pool[k+j])); buffer2[first+j]:=Hi(so(str_pool[k+j])); end; -@z - -@x [26.413] -@; -end; -@y -@; -exit:end; -@z - -@x -@d eTeX_int=badness_code+1 {first of \eTeX\ codes for integers} -@y -@d eTeX_int=ptex_minor_version_code+1 {first of \eTeX\ codes for integers} -@z - -@x - begin case m of - input_line_no_code: cur_val:=line; - badness_code: cur_val:=last_badness; - ptex_version_code: cur_val:=pTeX_version; - eptex_version_code: cur_val:=epTeX_version_number; - ptex_minor_version_code: cur_val:=pTeX_minor_version; - end; {there and no other cases} -@y - if m>=eTeX_glue then @@; - else if m>=eTeX_dim then - begin case m of - @/@@/ - end; {there are no other cases} - cur_val_level:=dimen_val; - end - else begin case m of - input_line_no_code: cur_val:=line; - badness_code: cur_val:=last_badness; - ptex_version_code: cur_val:=pTeX_version; - eptex_version_code: cur_val:=epTeX_version_number; - ptex_minor_version_code: cur_val:=pTeX_minor_version; - @/@@/ - end; {there are no other cases} -@z - -@x [27.468] -@d job_name_code=ptex_convert_codes {command code for \.{\\jobname}} -@y -@d etex_convert_base=ptex_convert_codes {base for \eTeX's command codes} -@d eTeX_revision_code=etex_convert_base {command code for \.{\\eTeXrevision}} -@d etex_convert_codes=etex_convert_base+1 {end of \eTeX's command codes} -@d job_name_code=etex_convert_codes {command code for \.{\\jobname}} -@z - -@x [30.581] -@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits); -var @!l:0..255; {small indices or counters} -@y -@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits); -var @!l:0..255; {small indices or counters} -old_setting: integer; {saved value of |tracing_online|} -@z - -@x [32.619] -base_line:=cur_v; left_edge:=cur_h; disp:=0; -@y -base_line:=cur_v; disp:=0; revdisp:=0; -prev_p:=this_box+list_offset; -@; -left_edge:=cur_h; -@z - -@x [32.622] -@= -@y -@= -@z -@x [32.622] - p:=link(p); -@y - prev_p:=link(prev_p); {N.B.: not |prev_p:=p|, |p| might be |lig_trick|} - p:=link(p); -@z - -@x [32.623] -disp_node: begin disp:=disp_dimen(p); cur_v:=base_line+disp; end; -@y -disp_node: begin disp:=disp_dimen(p); revdisp:=disp; cur_v:=base_line+disp; end; -@z - -@x [32.624] - cur_h:=edge+width(p); cur_v:=base_line+disp; cur_dir_hv:=save_dir; -@y - cur_h:=edge; cur_v:=base_line+disp; cur_dir_hv:=save_dir; -@z - -@x [33.649] -exit: last_disp:=disp; hpack:=r; -@y -exit: last_disp:=disp; -if TeXXeT_en then @; -hpack:=r; -@z - -@x [33.651] - disp_node:disp:=disp_dimen(p); -@y - disp_node:begin disp:=disp_dimen(p); revdisp:=disp; end; -@z - -@x [44.977] -q:=prune_page_top(q); p:=list_ptr(v); -if q=null then box(n):=null {the |eq_level| of the box stays the same} -else begin - box(n):=vpack(q,natural); set_box_dir(box(n))(box_dir(v)); - end; -@y -q:=prune_page_top(q,saving_vdiscards>0); -p:=list_ptr(v); -if q<>null then begin - q:=vpack(q,natural); set_box_dir(q)(box_dir(v)); - end; -change_box(q); -@z - -@x [47.1096] - else begin adjust_hlist(head,true); line_break(widow_penalty) -@y - else begin adjust_hlist(head,true); line_break(false) -@z - -@x [47.1110] - begin if type(box(cur_val))=dir_node then - begin delete_glue_ref(space_ptr(box(cur_val))); - delete_glue_ref(xspace_ptr(box(cur_val))); - free_node(box(cur_val),box_node_size); -@y - begin if type(p)=dir_node then - begin delete_glue_ref(space_ptr(p)); - delete_glue_ref(xspace_ptr(p)); - free_node(p,box_node_size); -@z -@x [47.1110] - link(tail):=list_ptr(p); box(cur_val):=null; -@y - link(tail):=list_ptr(p); change_box(null); -@z - -@x [48.1145] - pop_nest; w:=-max_dimen; - end - { |disp_node|-only paragraphs are ignored } -@y - @ - end - { |disp_node|-only paragraphs are ignored } -@z - -@x [48.1145] -else begin adjust_hlist(head,true); line_break(display_widow_penalty);@/ -@y -else begin adjust_hlist(head,true); line_break(true);@/ -@z - -@x [49.1247] -if box(b)<>null then - begin q:=box(b); p:=link(q); -@y -if b<>null then - begin q:=b; p:=link(q); -@z -@x [49.1247] - begin p:=link(box(b)); link(box(b)):=null; -@y - begin p:=link(b); link(b):=null; -@z -@x [49.1247] - link(q):=p; link(box(b)):=q; -@y - link(q):=p; link(b):=q; -@z - -@x [49.1291] -@d show_mode=4 { \.{\\showmode} } -@y -@d show_mode=7 { \.{\\showmode} } -@z - diff --git a/source/texk/web2c/eptexdir/fam256.ch b/source/texk/web2c/eptexdir/fam256.ch deleted file mode 100644 index 583c5b8d2..000000000 --- a/source/texk/web2c/eptexdir/fam256.ch +++ /dev/null @@ -1,1537 +0,0 @@ -% fam256.ch -% (C) 2009--2017 by Hironori Kitagawa. -% -% This patch is derived from om16bit.ch and omfi.ch (both in Omega). -% (Omega is copyright by John Plaice and Yannis Haralambous.) -% -%----------------------------------------------- -@x -@d hyph_prime=607 {another prime for hashing \.{\\hyphenation} exceptions; - if you change this, you should also change |iinf_hyphen_size|.} -@y -@d hyph_prime=607 {another prime for hashing \.{\\hyphenation} exceptions; - if you change this, you should also change |iinf_hyphen_size|.} -@d text_size=0 {size code for the largest size in a family} -@d script_size=256 {size code for the medium size in a family} -@d script_script_size=512 {size code for the smallest size in a family} -@z -%----------------------------------------------- -@x -@d not_found4=49 {like |not_found|, when there's more than four} -@y -@d not_found4=49 {like |not_found|, when there's more than four} -@d not_found5=50 {like |not_found|, when there's more than five} -@z -%----------------------------------------------- -@x -specifies the order of infinity to which glue setting applies (|normal|, -|fil|, |fill|, or |filll|). The |subtype| field is not used in \TeX. -@y -specifies the order of infinity to which glue setting applies (|normal|, -|sfi|, |fil|, |fill|, or |filll|). The |subtype| field is not used in \TeX. -@z -%----------------------------------------------- -@x -orders of infinity (|normal|, |fil|, |fill|, or |filll|) -@y -orders of infinity (|normal|, |sfi|, |fil|, |fill|, or |filll|) -@z -%----------------------------------------------- -@x -@d fil=1 {first-order infinity} -@d fill=2 {second-order infinity} -@d filll=3 {third-order infinity} -@y -@d sfi=1 {first-order infinity} -@d fil=2 {second-order infinity} -@d fill=3 {third-order infinity} -@d filll=4 {fourth-order infinity} -@z -%----------------------------------------------- -@x -@!glue_ord=normal..filll; {infinity to the 0, 1, 2, or 3 power} -@y -@!glue_ord=normal..filll; {infinity to the 0, 1, 2, 3, or 4 power} -@z -%----------------------------------------------- -@x -@d fil_glue==zero_glue+glue_spec_size {\.{0pt plus 1fil minus 0pt}} -@y -@d sfi_glue==zero_glue+glue_spec_size {\.{0pt plus 1fi minus 0pt}} -@d fil_glue==sfi_glue+glue_spec_size {\.{0pt plus 1fil minus 0pt}} -@z -%----------------------------------------------- -@x -stretch(fil_glue):=unity; stretch_order(fil_glue):=fil;@/ -stretch(fill_glue):=unity; stretch_order(fill_glue):=fill;@/ -@y -stretch(sfi_glue):=unity; stretch_order(sfi_glue):=sfi;@/ -stretch(fil_glue):=unity; stretch_order(fil_glue):=fil;@/ -stretch(fill_glue):=unity; stretch_order(fill_glue):=fill;@/ -@z -%----------------------------------------------- -@x - begin print("fil"); - while order>fil do -@y - begin print("fi"); - while order>sfi do -@z -%----------------------------------------------- -@x -@d last_item=math_given+1 {most recent item ( \.{\\lastpenalty}, -@y -@d omath_given=math_given+1 {math code defined by \.{\\omathchardef}} -@d last_item=omath_given+1 {most recent item ( \.{\\lastpenalty}, -@z -%----------------------------------------------- -@x -@d math_font_base=cur_font_loc+1 {table of 48 math font numbers} -@d cur_jfont_loc=math_font_base+48 -@y -@d math_font_base=cur_font_loc+1 {table of 768 math font numbers} -@d cur_jfont_loc=math_font_base+768 -@z -%----------------------------------------------- -@x -@d var_code==@'70000 {math code meaning ``use the current family''} -@y -@d var_code==@"70000 {math code meaning ``use the current family''} -@z -%----------------------------------------------- -@x -for k:=math_font_base to math_font_base+47 do eqtb[k]:=eqtb[cur_font_loc]; -@y -for k:=math_font_base to math_font_base+767 do eqtb[k]:=eqtb[cur_font_loc]; -@z -%----------------------------------------------- -@x -begin if n=cur_font_loc then print("current font") -else if n -@y -primitive("delimiter",delim_num,0);@/ -@!@:delimiter_}{\.{\\delimiter} primitive@> -primitive("odelimiter",delim_num,1);@/ -@!@:delimiter_}{\.{\\odelimiter} primitive@> -@z -%----------------------------------------------- -@x -primitive("mathaccent",math_accent,0);@/ -@!@:math_accent_}{\.{\\mathaccent} primitive@> -primitive("mathchar",math_char_num,0);@/ -@!@:math_char_}{\.{\\mathchar} primitive@> -@y -primitive("mathaccent",math_accent,0);@/ -@!@:math_accent_}{\.{\\mathaccent} primitive@> -primitive("mathchar",math_char_num,0);@/ -@!@:math_char_}{\.{\\mathchar} primitive@> -primitive("omathaccent",math_accent,1);@/ -@!@:math_accent_}{\.{\\omathaccent} primitive@> -primitive("omathchar",math_char_num,1);@/ -@!@:math_char_}{\.{\\omathchar} primitive@> -@z -%----------------------------------------------- -@x -primitive("radical",radical,0);@/ -@!@:radical_}{\.{\\radical} primitive@> -@y -primitive("radical",radical,0);@/ -@!@:radical_}{\.{\\radical} primitive@> -primitive("oradical",radical,1);@/ -@!@:radical_}{\.{\\oradical} primitive@> -@z -%----------------------------------------------- -@x -delim_num: print_esc("delimiter"); -@y -delim_num: if chr_code=0 then print_esc("delimiter") - else print_esc("odelimiter"); -@z -@x -math_accent: print_esc("mathaccent"); -math_char_num: print_esc("mathchar"); -@y -math_accent: if chr_code=0 then print_esc("mathaccent") - else print_esc("omathaccent"); -math_char_num: if chr_code=0 then print_esc("mathchar") - else print_esc("omathchar"); -@z -@x -radical: print_esc("radical"); -@y -radical: if chr_code=0 then print_esc("radical") - else print_esc("oradical"); -@z -%----------------------------------------------- -@x -@p procedure eq_word_define(@!p:pointer;@!w:integer); -label exit; -begin if eTeX_ex and(eqtb[p].int=w) then - begin assign_trace(p,"reassigning")@;@/ - return; - end; -assign_trace(p,"changing")@;@/ -if xeq_level[p]<>cur_level then - begin eq_save(p,xeq_level[p]); xeq_level[p]:=cur_level; - end; -eqtb[p].int:=w; -assign_trace(p,"into")@;@/ -exit:end; -@y -@p procedure eq_word_define(@!p:pointer;@!w:integer); -label exit; -begin if eTeX_ex and(eqtb[p].int=w) then - begin assign_trace(p,"reassigning")@;@/ - return; - end; -assign_trace(p,"changing")@;@/ -if xeq_level[p]<>cur_level then - begin eq_save(p,xeq_level[p]); xeq_level[p]:=cur_level; - end; -eqtb[p].int:=w; -assign_trace(p,"into")@;@/ -exit:end; -@# -procedure del_eq_word_define(@!p:pointer;@!w,wone:integer); -label exit; -begin if eTeX_ex and(eqtb[p].int=w)and(getintone(eqtb[p])=wone) then - begin assign_trace(p,"reassigning")@;@/ - return; - end; -assign_trace(p,"changing")@;@/ -if xeq_level[p]<>cur_level then - begin eq_save(p,xeq_level[p]); xeq_level[p]:=cur_level; - end; -eqtb[p].int:=w; setintone(eqtb[p],wone); -assign_trace(p,"into")@;@/ -exit:end; -@z -%----------------------------------------------- -@x -procedure geq_word_define(@!p:pointer;@!w:integer); {global |eq_word_define|} -begin assign_trace(p,"globally changing")@;@/ -begin eqtb[p].int:=w; xeq_level[p]:=level_one; -end; -assign_trace(p,"into")@;@/ -end; -@y -procedure geq_word_define(@!p:pointer;@!w:integer); {global |eq_word_define|} -begin assign_trace(p,"globally changing")@;@/ -begin eqtb[p].int:=w; xeq_level[p]:=level_one; -end; -assign_trace(p,"into")@;@/ -end; -@# -procedure del_geq_word_define(@!p:pointer;@!w,wone:integer); - {global |del_eq_word_define|} -begin assign_trace(p,"globally changing")@;@/ -begin eqtb[p].int:=w; setintone(eqtb[p],wone); xeq_level[p]:=level_one; -end; -assign_trace(p,"into")@;@/ -end; -@z -%----------------------------------------------- -@x -@d tok_val=5 {token lists} - -@= -@!cur_val:integer; {value returned by numeric scanners} -@y -@d tok_val=5 {token lists} - -@= -@!cur_val:integer; {value returned by numeric scanners} -@!cur_val1:integer; -@z -%----------------------------------------------- -@x -char_given,math_given: scanned_result(cur_chr)(int_val); -@y -omath_given, -char_given,math_given: scanned_result(cur_chr)(int_val); -@z -%----------------------------------------------- -@x -@ @= -begin -if m=math_code_base then - begin scan_ascii_num; - scanned_result(ho(math_code(cur_val)))(int_val); end -@y -@ @= -begin -if m=math_code_base then begin - scan_ascii_num; cur_val1:=ho(math_code(cur_val)); - if ((cur_val1 div @"10000)>8) or - (((cur_val1 mod @"10000) div @"100)>15) then - begin print_err("Extended mathchar used as mathchar"); -@.Bad mathchar@> - help2("A mathchar number must be between 0 and ""7FFF.")@/ - ("I changed this one to zero."); int_error(cur_val1); - scanned_result(0)(int_val) - end; - cur_val1:=(cur_val1 div @"10000)*@"1000+cur_val1 mod @"1000; - scanned_result(cur_val1)(int_val); - end -else if m=(math_code_base+128) then begin - scan_ascii_num; cur_val1:=ho(math_code(cur_val)); - cur_val:=(cur_val1 div @"10000) * @"1000000 - +((cur_val1 div @"100) mod @"100) * @"10000 - +(cur_val1 mod @"100); - scanned_result(cur_val)(int_val); - end -else if m=del_code_base then begin - scan_ascii_num; cur_val1:=del_code(cur_val); cur_val:=del_code1(cur_val); - if ((cur_val1 div @"100) mod @"100 >= 16) or (cur_val>=@"1000) then - begin print_err("Extended delimiter code used as delcode"); -@.Bad delimiter code@> - help2("A numeric delimiter code must be between 0 and 2^{27}-1.")@/ - ("I changed this one to zero."); error; - scanned_result(0)(int_val); - end - else if cur_val1<0 then - scanned_result(cur_val)(int_val) - else - scanned_result(cur_val1*@"1000+cur_val)(int_val); - end -else if m=(del_code_base+128) then begin - { Aleph seems \.{\\odelcode} always returns $-1$.} - scan_ascii_num; scanned_result(-1)(int_val); - end -@z -%----------------------------------------------- -@x -procedure scan_four_bit_int; -begin scan_int; -if (cur_val<0)or(cur_val>15) then - begin print_err("Bad number"); -@.Bad number@> - help2("Since I expected to read a number between 0 and 15,")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -end; -@y -procedure scan_four_bit_int; -begin scan_int; -if (cur_val<0)or(cur_val>15) then - begin print_err("Bad number"); -@.Bad number@> - help2("Since I expected to read a number between 0 and 15,")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -end; -@# -procedure scan_big_four_bit_int; -begin scan_int; -if (cur_val<0)or(cur_val>255) then - begin print_err("Bad number"); -@.Bad register code@> - help2("Since I expected to read a number between 0 and 255,")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -end; -@z -%----------------------------------------------- -@x -procedure scan_fifteen_bit_int; -begin scan_int; -if (cur_val<0)or(cur_val>@'77777) then - begin print_err("Bad mathchar"); -@.Bad mathchar@> - help2("A mathchar number must be between 0 and 32767.")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -end; -@y -procedure scan_fifteen_bit_int; -begin scan_int; -if (cur_val<0)or(cur_val>@'77777) then - begin print_err("Bad mathchar"); -@.Bad mathchar@> - help2("A mathchar number must be between 0 and 32767.")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -cur_val:=((cur_val div @"1000) * @"10000)+(cur_val mod @"1000); -end; -@# -procedure scan_real_fifteen_bit_int; -begin scan_int; -if (cur_val<0)or(cur_val>@'77777) then - begin print_err("Bad mathchar"); -@.Bad mathchar@> - help2("A mathchar number must be between 0 and 32767.")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -end; -@# -procedure scan_big_fifteen_bit_int; -begin scan_int; -if (cur_val<0)or(cur_val>@"7FFFFFF) then - begin print_err("Bad extended mathchar"); -@.Bad mathchar@> - help2("An extended mathchar number must be between 0 and ""7FFFFFF.")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -{ e-pTeX doesn't support 65536 characters for math font. } -cur_val:=((cur_val div @"10000) * @"100)+(cur_val mod @"100); -end; -@# -procedure scan_omega_fifteen_bit_int; -begin scan_int; -if (cur_val<0)or(cur_val>@"7FFFFFF) then - begin print_err("Bad extended mathchar"); -@.Bad mathchar@> - help2("An extended mathchar number must be between 0 and ""7FFFFFF.")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -end; -@z -%----------------------------------------------- -@x -procedure scan_twenty_seven_bit_int; -begin scan_int; -if (cur_val<0)or(cur_val>@'777777777) then - begin print_err("Bad delimiter code"); -@.Bad delimiter code@> - help2("A numeric delimiter code must be between 0 and 2^{27}-1.")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -end; -@y -procedure scan_twenty_seven_bit_int; -begin scan_int; -if (cur_val<0)or(cur_val>@'777777777) then - begin print_err("Bad delimiter code"); -@.Bad delimiter code@> - help2("A numeric delimiter code must be between 0 and 2^{27}-1.")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -cur_val1 := cur_val mod @"1000; cur_val := cur_val div @"1000; -cur_val := ((cur_val div @"1000) * @"10000) + (cur_val mod @"1000); -end; -@# -procedure scan_fifty_one_bit_int; -var iiii:integer; -begin scan_int; -if (cur_val<0)or(cur_val>@'777777777) then - begin print_err("Bad delimiter code"); -@.Bad delimiter code@> - help2("A numeric delimiter (first part) must be between 0 and 2^{27}-1.") - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -iiii:=((cur_val div @"10000) * @"100) + (cur_val mod @"100); -scan_int; -if (cur_val<0)or(cur_val>@"FFFFFF) then - begin print_err("Bad delimiter code"); -@.Bad delimiter code@> -help2("A numeric delimiter (second part) must be between 0 and 2^{24}-1.")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -{ e-pTeX doesn't support 65536 characters for math font. } -cur_val1:=((cur_val div @"10000) * @"100) + (cur_val mod @"100); -cur_val:=iiii; -end; -@z -%----------------------------------------------- -@x -@= -if scan_keyword("fil") then -@.fil@> - begin cur_order:=fil; -@y -@= -if scan_keyword("fi") then -@.fil@> - begin cur_order:=sfi; -@z -%----------------------------------------------- -@x -else if cur_cmd=def_family then - begin m:=cur_chr; scan_four_bit_int; f:=equiv(m+cur_val); -@y -else if cur_cmd=def_family then - begin m:=cur_chr; scan_big_four_bit_int; f:=equiv(m+cur_val); -@z -%----------------------------------------------- -@x -total_stretch[normal]:=0; total_shrink[normal]:=0; -@y -total_stretch[normal]:=0; total_shrink[normal]:=0; -total_stretch[sfi]:=0; total_shrink[sfi]:=0; -@z -%----------------------------------------------- -@x -else if total_stretch[fil]<>0 then o:=fil -@y -else if total_stretch[fil]<>0 then o:=fil -else if total_stretch[sfi]<>0 then o:=sfi -@z -%----------------------------------------------- -@x -else if total_shrink[fil]<>0 then o:=fil -@y -else if total_shrink[fil]<>0 then o:=fil -else if total_shrink[sfi]<>0 then o:=sfi -@z -%----------------------------------------------- -@x -\yskip\hang|math_type(q)=math_char| means that |fam(q)| refers to one of -the sixteen font families, and |character(q)| is the number of a character -@y -\yskip\hang|math_type(q)=math_char| means that |fam(q)| refers to one of -the 256 font families, and |character(q)| is the number of a character -@z -%----------------------------------------------- -@x -procedure print_fam_and_char(@!p:pointer;@!t:small_number); -@y -procedure print_fam_and_char(@!p:pointer;@!t:integer); -@z -%----------------------------------------------- -@x -other font information. A size code, which is a multiple of 16, is added to a -family number to get an index into the table of internal font numbers -for each combination of family and size. (Be alert: Size codes get -larger as the type gets smaller.) - -@d text_size=0 {size code for the largest size in a family} -@d script_size=16 {size code for the medium size in a family} -@d script_script_size=32 {size code for the smallest size in a family} -@y -other font information. A size code, which is a multiple of 256, is added to a -family number to get an index into the table of internal font numbers -for each combination of family and size. (Be alert: Size codes get -larger as the type gets smaller.) -@z -%----------------------------------------------- -@x -else cur_size:=16*((cur_style-text_style) div 2); -@y -else cur_size:=script_size*((cur_style-text_style) div 2); -@z -%----------------------------------------------- -@x -function var_delimiter(@!d:pointer;@!s:small_number;@!v:scaled):pointer; -@y -function var_delimiter(@!d:pointer;@!s:integer;@!v:scaled):pointer; -@z -%----------------------------------------------- -@x -@!hd: eight_bits; {height-depth byte} -@!r: four_quarters; {extensible pieces} -@!z: small_number; {runs through font family members} -@y -@!hd: eight_bits; {height-depth byte} -@!r: four_quarters; {extensible pieces} -@!z: integer; {runs through font family members} -@z -%----------------------------------------------- -@x - begin z:=z+s+16; - repeat z:=z-16; g:=fam_fnt(z); -@y - begin z:=z+s+script_size; - repeat z:=z-script_size; g:=fam_fnt(z); -@z -%----------------------------------------------- -@x - until z<16; -@y - until z0)or(cur_active_width[4]<>0)or@| - (cur_active_width[5]<>0) then -@y -if (cur_active_width[3]<>0)or(cur_active_width[4]<>0)or@| - (cur_active_width[5]<>0)or(cur_active_width[6]<>0) then -@z -%----------------------------------------------- -@x -@ Shrinkability is never infinite in a paragraph; -we can shrink the line from |r| to |cur_p| by at most |cur_active_width[6]|. - -@= -begin if -shortfall>cur_active_width[6] then b:=inf_bad+1 -else b:=badness(-shortfall,cur_active_width[6]); -@y -@ Shrinkability is never infinite in a paragraph; -we can shrink the line from |r| to |cur_p| by at most |cur_active_width[7]|. - -@= -begin if -shortfall>cur_active_width[7] then b:=inf_bad+1 -else b:=badness(-shortfall,cur_active_width[7]); -@z -%----------------------------------------------- -@x - active_width[6]:=active_width[6]+shrink(cur_kanji_skip); -@y - active_width[7]:=active_width[7]+shrink(cur_kanji_skip); -@z -%----------------------------------------------- -@x -active_width[6]:=active_width[6]+shrink(q) -@y -active_width[7]:=active_width[7]+shrink(q) -@z -%----------------------------------------------- -@x - if (active_height[3]<>0) or (active_height[4]<>0) or - (active_height[5]<>0) then b:=0 - else b:=badness(h-cur_height,active_height[2]) -else if cur_height-h>active_height[6] then b:=awful_bad -else b:=badness(cur_height-h,active_height[6]) -@y - if (active_height[3]<>0) or (active_height[4]<>0) or - (active_height[5]<>0) or (active_height[6]<>0) then b:=0 - else b:=badness(h-cur_height,active_height[2]) -else if cur_height-h>active_height[7] then b:=awful_bad -else b:=badness(cur_height-h,active_height[7]) -@z -%----------------------------------------------- -@x - active_height[6]:=active_height[6]+shrink(q); -@y - active_height[7]:=active_height[7]+shrink(q); -@z -%----------------------------------------------- -@x -on the current page. This array contains six |scaled| numbers, like the -@y -on the current page. This array contains seven |scaled| numbers, like the -@z -%----------------------------------------------- -@x -@d page_shrink==page_so_far[6] {shrinkability of the current page} -@d page_depth==page_so_far[7] {depth of the current page} -@y -@d page_shrink==page_so_far[7] {shrinkability of the current page} -@d page_depth==page_so_far[8] {depth of the current page} -@z -%----------------------------------------------- -@x -@= -@!page_so_far:array [0..7] of scaled; {height and glue of the current page} -@y -@= -@!page_so_far:array [0..8] of scaled; {height and glue of the current page} -@z -%----------------------------------------------- -@x -primitive("pagefilstretch",set_page_dimen,3); -@!@:page_fil_stretch_}{\.{\\pagefilstretch} primitive@> -primitive("pagefillstretch",set_page_dimen,4); -@!@:page_fill_stretch_}{\.{\\pagefillstretch} primitive@> -primitive("pagefilllstretch",set_page_dimen,5); -@!@:page_filll_stretch_}{\.{\\pagefilllstretch} primitive@> -primitive("pageshrink",set_page_dimen,6); -@!@:page_shrink_}{\.{\\pageshrink} primitive@> -primitive("pagedepth",set_page_dimen,7); -@!@:page_depth_}{\.{\\pagedepth} primitive@> -@y -primitive("pagefistretch",set_page_dimen,3); -@!@:page_fi_stretch_}{\.{\\pagefistretch} primitive@> -primitive("pagefilstretch",set_page_dimen,4); -@!@:page_fil_stretch_}{\.{\\pagefilstretch} primitive@> -primitive("pagefillstretch",set_page_dimen,5); -@!@:page_fill_stretch_}{\.{\\pagefillstretch} primitive@> -primitive("pagefilllstretch",set_page_dimen,6); -@!@:page_filll_stretch_}{\.{\\pagefilllstretch} primitive@> -primitive("pageshrink",set_page_dimen,7); -@!@:page_shrink_}{\.{\\pageshrink} primitive@> -primitive("pagedepth",set_page_dimen,8); -@!@:page_depth_}{\.{\\pagedepth} primitive@> -@z -%----------------------------------------------- -@x -3: print_esc("pagefilstretch"); -4: print_esc("pagefillstretch"); -5: print_esc("pagefilllstretch"); -6: print_esc("pageshrink"); -@y -3: print_esc("pagefistretch"); -4: print_esc("pagefilstretch"); -5: print_esc("pagefillstretch"); -6: print_esc("pagefilllstretch"); -7: print_esc("pageshrink"); -@z -%----------------------------------------------- -@x -print_plus(3)("fil"); -print_plus(4)("fill"); -print_plus(5)("filll"); -@y -print_plus(3)("fi"); -print_plus(4)("fil"); -print_plus(5)("fill"); -print_plus(6)("filll"); -@z -%----------------------------------------------- -@x - if (page_so_far[3]<>0) or (page_so_far[4]<>0) or@| - (page_so_far[5]<>0) then b:=0 -@y - if (page_so_far[3]<>0) or (page_so_far[4]<>0) or@| - (page_so_far[5]<>0) or (page_so_far[6]<>0) then b:=0 -@z -%----------------------------------------------- -@x -non_math(math_given), non_math(math_comp), non_math(delim_num), -@y -non_math(math_given), non_math(omath_given), -non_math(math_comp), non_math(delim_num), -@z -%----------------------------------------------- -@x -@d fil_code=0 {identifies \.{\\hfil} and \.{\\vfil}} -@d fill_code=1 {identifies \.{\\hfill} and \.{\\vfill}} -@d ss_code=2 {identifies \.{\\hss} and \.{\\vss}} -@d fil_neg_code=3 {identifies \.{\\hfilneg} and \.{\\vfilneg}} -@d skip_code=4 {identifies \.{\\hskip} and \.{\\vskip}} -@d mskip_code=5 {identifies \.{\\mskip}} -@y -@d sfi_code=0 {identifies \.{\\hfi} and \.{\\vfi}} -@d fil_code=1 {identifies \.{\\hfil} and \.{\\vfil}} -@d fill_code=2 {identifies \.{\\hfill} and \.{\\vfill}} -@d ss_code=3 {identifies \.{\\hss} and \.{\\vss}} -@d fil_neg_code=4 {identifies \.{\\hfilneg} and \.{\\vfilneg}} -@d skip_code=5 {identifies \.{\\hskip} and \.{\\vskip}} -@d mskip_code=6 {identifies \.{\\mskip}} -@z -%----------------------------------------------- -@x -primitive("hfil",hskip,fil_code); -@!@:hfil_}{\.{\\hfil} primitive@> -@y -primitive("hfi",hskip,sfi_code); -@!@:hfi_}{\.{\\hfi} primitive@> -primitive("hfil",hskip,fil_code); -@!@:hfil_}{\.{\\hfil} primitive@> -@z -%----------------------------------------------- -@x -primitive("vfil",vskip,fil_code); -@!@:vfil_}{\.{\\vfil} primitive@> -@y -primitive("vfi",vskip,sfi_code); -@!@:vfi_}{\.{\\vfi} primitive@> -primitive("vfil",vskip,fil_code); -@!@:vfil_}{\.{\\vfil} primitive@> -@z -%----------------------------------------------- -@x -hskip: case chr_code of - skip_code:print_esc("hskip"); -@y -hskip: case chr_code of - skip_code:print_esc("hskip"); - sfi_code:print_esc("hfi"); -@z -%----------------------------------------------- -@x -vskip: case chr_code of - skip_code:print_esc("vskip"); -@y -vskip: case chr_code of - skip_code:print_esc("vskip"); - sfi_code:print_esc("vfi"); -@z -%----------------------------------------------- -@x -begin s:=cur_chr; -case s of -fil_code: cur_val:=fil_glue; -@y -begin s:=cur_chr; -case s of -sfi_code: cur_val:=sfi_glue; -fil_code: cur_val:=fil_glue; -@z -%----------------------------------------------- -@x -|global_box_flag-1| represent `\.{\\setbox0}' through `\.{\\setbox32767}'; -codes |global_box_flag| through |ship_out_flag-1| represent -`\.{\\global\\setbox0}' through `\.{\\global\\setbox32767}'; -@y -|global_box_flag-1| represent `\.{\\setbox0}' through `\.{\\setbox65535}'; -codes |global_box_flag| through |ship_out_flag-1| represent -`\.{\\global\\setbox0}' through `\.{\\global\\setbox65535}'; -@z -%----------------------------------------------- -@x -@d box_flag==@'10000000000 {context code for `\.{\\setbox0}'} -@d global_box_flag==@'10000100000 {context code for `\.{\\global\\setbox0}'} -@d ship_out_flag==@'10000200000 {context code for `\.{\\shipout}'} -@d leader_flag==@'10000200001 {context code for `\.{\\leaders}'} -@y -@d box_flag==@"40000000 {context code for `\.{\\setbox0}'} -@d global_box_flag==@"40010000 {context code for `\.{\\global\\setbox0}'} -@d ship_out_flag==@"40020000 {context code for `\.{\\shipout}'} -@d leader_flag==@"40020001 {context code for `\.{\\leaders}'} -@z -%----------------------------------------------- -@x -@d fam_in_range==((cur_fam>=0)and(cur_fam<16)) -@y -@d fam_in_range==((cur_fam>=0)and(cur_fam=var_code)and(fam_in_range) then fam(p):=cur_fam - else fam(p):=(c div 256) mod 16; -@y - if (c>=var_code)and(fam_in_range) then fam(p):=cur_fam - else fam(p):=(c div 256) mod 256; -@z -%----------------------------------------------- -@x -mmode+math_char_num: begin scan_fifteen_bit_int; set_math_char(cur_val); - end; -mmode+math_given: set_math_char(cur_chr); -mmode+delim_num: begin scan_twenty_seven_bit_int; - set_math_char(cur_val div @'10000); -@y -mmode+math_char_num: begin - if cur_chr=0 then scan_fifteen_bit_int - else scan_big_fifteen_bit_int; - set_math_char(cur_val); - end; -mmode+math_given: begin - set_math_char(((cur_chr div @"1000) * @"10000)+(cur_chr mod @"1000)); - end; -mmode+omath_given: begin - set_math_char(((cur_chr div @"10000) * @"100)+(cur_chr mod @"100)); - end; -mmode+delim_num: begin - if cur_chr=0 then scan_twenty_seven_bit_int - else scan_fifty_one_bit_int; - set_math_char(cur_val); {character code of left delimiter} -@z -%----------------------------------------------- -@x -procedure set_math_char(@!c:integer); -var p:pointer; {the new noad} -begin if c>=@'100000 then - @ -else begin p:=new_noad; math_type(nucleus(p)):=math_char; - character(nucleus(p)):=qi(c mod 256); - fam(nucleus(p)):=(c div 256) mod 16; - if c>=var_code then - begin if fam_in_range then fam(nucleus(p)):=cur_fam; - type(p):=ord_noad; - end - else type(p):=ord_noad+(c div @'10000); - link(tail):=p; tail:=p; - if font_dir[fam_fnt(fam(nucleus(p))+cur_size)]<>dir_default then begin -@y -procedure set_math_char(@!c:integer); -var p:pointer; {the new noad} -begin if c>=@"80000 then - @ -else begin p:=new_noad; math_type(nucleus(p)):=math_char; - character(nucleus(p)):=qi(c mod 256); - fam(nucleus(p)):=(c div 256) mod 256; - if c>=var_code then - begin if fam_in_range then fam(nucleus(p)):=cur_fam; - type(p):=ord_noad; - end - else type(p):=ord_noad+(c div @"10000); - link(tail):=p; tail:=p; - if font_dir[fam_fnt(fam(nucleus(p))+cur_size)]<>dir_default then begin -@z -%----------------------------------------------- -@x -@= -procedure scan_delimiter(@!p:pointer;@!r:boolean); -begin if r then scan_twenty_seven_bit_int -else begin @; - case cur_cmd of - letter,other_char: cur_val:=del_code(cur_chr); - delim_num: scan_twenty_seven_bit_int; - othercases cur_val:=-1 - endcases; - end; -if cur_val<0 then @; -small_fam(p):=(cur_val div @'4000000) mod 16; -small_char(p):=qi((cur_val div @'10000) mod 256); -large_fam(p):=(cur_val div 256) mod 16; -large_char(p):=qi(cur_val mod 256); -end; -@y -@= -procedure scan_delimiter(@!p:pointer;@!r:boolean); -begin if r=1 then scan_twenty_seven_bit_int -else if r=2 then scan_fifty_one_bit_int -else begin @; - case cur_cmd of - letter,other_char: begin - cur_val:=del_code(cur_chr); cur_val1:=del_code1(cur_chr); - end; - delim_num: if cur_chr=0 then scan_twenty_seven_bit_int - else scan_fifty_one_bit_int; - othercases begin cur_val:=-1; cur_val1:=-1; end; - endcases; - end; -if cur_val<0 then begin @; - cur_val1:=0; - end; -small_fam(p):=(cur_val div @"100) mod @"100; -small_char(p):=qi(cur_val mod @"100); -large_fam(p):=(cur_val1 div @"100) mod @"100; -large_char(p):=qi(cur_val1 mod @"100); -end; -@z -%----------------------------------------------- -@x -scan_delimiter(left_delimiter(tail),true); -@y -scan_delimiter(left_delimiter(tail),cur_chr+1); -@z -%----------------------------------------------- -@x -scan_fifteen_bit_int; -character(accent_chr(tail)):=qi(cur_val mod 256); -if (cur_val>=var_code)and fam_in_range then fam(accent_chr(tail)):=cur_fam -else fam(accent_chr(tail)):=(cur_val div 256) mod 16; -@y -if cur_chr=0 then scan_fifteen_bit_int -else scan_big_fifteen_bit_int; -character(accent_chr(tail)):=qi(cur_val mod 256); -if (cur_val>=var_code)and fam_in_range then fam(accent_chr(tail)):=cur_fam -else fam(accent_chr(tail)):=(cur_val div 256) mod 256; -@z -%----------------------------------------------- -@x -begin if (e<>0)and((w-total_shrink[normal]+q<=z)or@| - (total_shrink[fil]<>0)or(total_shrink[fill]<>0)or - (total_shrink[filll]<>0)) then -@y -begin if (e<>0)and((w-total_shrink[normal]+q<=z)or@| - (total_shrink[sfi]<>0)or(total_shrink[fil]<>0)or - (total_shrink[fill]<>0)or(total_shrink[filll]<>0)) then -@z -%----------------------------------------------- -@x -@d word_define(#)==if global then geq_word_define(#)@+else eq_word_define(#) -@y -@d word_define(#)==if global then geq_word_define(#)@+else eq_word_define(#) -@d del_word_define(#)==if global - then del_geq_word_define(#)@+else del_eq_word_define(#) -@z -%----------------------------------------------- -@x -@d count_def_code=2 {|shorthand_def| for \.{\\countdef}} -@d dimen_def_code=3 {|shorthand_def| for \.{\\dimendef}} -@d skip_def_code=4 {|shorthand_def| for \.{\\skipdef}} -@d mu_skip_def_code=5 {|shorthand_def| for \.{\\muskipdef}} -@d toks_def_code=6 {|shorthand_def| for \.{\\toksdef}} -@d char_sub_def_code=7 {|shorthand_def| for \.{\\charsubdef}} -@y -@d omath_char_def_code=2 {|shorthand_def| for \.{\\omathchardef}} -@d count_def_code=3 {|shorthand_def| for \.{\\countdef}} -@d dimen_def_code=4 {|shorthand_def| for \.{\\dimendef}} -@d skip_def_code=5 {|shorthand_def| for \.{\\skipdef}} -@d mu_skip_def_code=6 {|shorthand_def| for \.{\\muskipdef}} -@d toks_def_code=7 {|shorthand_def| for \.{\\toksdef}} -@d char_sub_def_code=8 {|shorthand_def| for \.{\\charsubdef}} -@z -%----------------------------------------------- -@x -primitive("mathchardef",shorthand_def,math_char_def_code);@/ -@!@:math_char_def_}{\.{\\mathchardef} primitive@> -@y -primitive("mathchardef",shorthand_def,math_char_def_code);@/ -@!@:math_char_def_}{\.{\\mathchardef} primitive@> -primitive("omathchardef",shorthand_def,omath_char_def_code);@/ -@!@:math_char_def_}{\.{\\omathchardef} primitive@> -@z -%----------------------------------------------- -@x - math_char_def_code: print_esc("mathchardef"); -@y - math_char_def_code: print_esc("mathchardef"); - omath_char_def_code: print_esc("omathchardef"); -@z -%----------------------------------------------- -@x -math_given: begin print_esc("mathchar"); print_hex(chr_code); - end; -@y -math_given: begin print_esc("mathchar"); print_hex(chr_code); - end; -omath_given: begin print_esc("omathchar"); print_hex(chr_code); - end; -@z -%----------------------------------------------- -@x - math_char_def_code: begin scan_fifteen_bit_int; define(p,math_given,cur_val); -@y - math_char_def_code: begin scan_real_fifteen_bit_int; - define(p,math_given,cur_val); - end; - omath_char_def_code: begin scan_omega_fifteen_bit_int; - define(p,omath_given,cur_val); -@z -%----------------------------------------------- -@x -primitive("mathcode",def_code,math_code_base); -@!@:math_code_}{\.{\\mathcode} primitive@> -@y -primitive("mathcode",def_code,math_code_base); -@!@:math_code_}{\.{\\mathcode} primitive@> -primitive("omathcode",def_code,math_code_base+128); -@!@:math_code_}{\.{\\omathcode} primitive@> -@z -%----------------------------------------------- -@x -primitive("delcode",def_code,del_code_base); -@!@:del_code_}{\.{\\delcode} primitive@> -@y -primitive("delcode",def_code,del_code_base); -@!@:del_code_}{\.{\\delcode} primitive@> -primitive("odelcode",def_code,del_code_base+128); -@!@:del_code_}{\.{\\odelcode} primitive@> -@z -%----------------------------------------------- -@x - else if chr_code=lc_code_base then print_esc("lccode") - else if chr_code=uc_code_base then print_esc("uccode") - else if chr_code=sf_code_base then print_esc("sfcode") - else print_esc("delcode"); -@y - else if chr_code=math_code_base+128 then print_esc("omathcode") - else if chr_code=lc_code_base then print_esc("lccode") - else if chr_code=uc_code_base then print_esc("uccode") - else if chr_code=sf_code_base then print_esc("sfcode") - else if chr_code=del_code_base then print_esc("delcode") - else print_esc("odelcode"); -@z -%----------------------------------------------- -@x -@= -def_code: begin - @; - @; - p:=cur_chr; - if p=kcat_code_base then - begin scan_char_num; p:=p+kcatcodekey(cur_val) end - else begin scan_ascii_num; p:=p+cur_val; end; - scan_optional_equals; scan_int; - if ((cur_valn) then - begin print_err("Invalid code ("); print_int(cur_val); -@.Invalid code@> - if p= -def_code: begin - if cur_chr=(del_code_base+128) then begin - p:=cur_chr-128; scan_ascii_num; p:=p+cur_val; scan_optional_equals; - scan_int; cur_val1:=cur_val; scan_int; {backwards} - if (cur_val1>@"FFFFFF) or (cur_val>@"FFFFFF) then - begin print_err("Invalid code ("); print_int(cur_val1); print(" "); - print_int(cur_val); - print("), should be at most ""FFFFFF ""FFFFFF"); - help1("I'm going to use 0 instead of that illegal code value.");@/ - error; cur_val1:=0; cur_val:=0; - end; - cur_val1:=(cur_val1 div @"10000)*@"100+(cur_val1 mod @"100); - cur_val:=(cur_val div @"10000)*@"100+(cur_val mod @"100); - del_word_define(p,cur_val1,cur_val); - end - else begin - @; - @; - p:=cur_chr; cur_val1:=p; - if p=kcat_code_base then begin scan_char_num; p:=p+kcatcodekey(cur_val) end - else begin scan_ascii_num; p:=p+cur_val; end; - scan_optional_equals; scan_int; - if ((cur_valn) then - begin print_err("Invalid code ("); print_int(cur_val); -@.Invalid code@> - if p=0 then begin - cur_val1:=cur_val div @"1000; - cur_val1:=(cur_val1 div @"1000)*@"10000 + cur_val1 mod @"1000; - cur_val:=cur_val mod @"1000; - del_word_define(p,cur_val1,cur_val); end - else - del_word_define(p, -1, cur_val); - end - else define(p,data,cur_val); - end; - end; -@z -%----------------------------------------------- -@x -else if cur_chr=kcat_code_base then n:=max_char_code -else if cur_chr=math_code_base then n:=@'100000 -@y -else if cur_chr=kcat_code_base then n:=max_char_code -else if cur_chr=math_code_base then n:=@"8000 -else if cur_chr=(math_code_base+128) then n:=@"8000000 -@z -%----------------------------------------------- -@x -def_family: begin p:=cur_chr; scan_four_bit_int; p:=p+cur_val; -@y -def_family: begin p:=cur_chr; scan_big_four_bit_int; p:=p+cur_val; -@z -%----------------------------------------------- -@x -@ @= -repeat j:=k; -while jeqtb[j+1].int then goto done2; -@y -@ @= -repeat j:=k; -while jeqtb[j+1].int)or@| - (getintone(eqtb[j])<>getintone(eqtb[j+1])) then goto done2; -@z -%----------------------------------------------- -@x - else cur_val:=shrink_order(q); -@y - else cur_val:=shrink_order(q); - if cur_val>normal then cur_val:=cur_val-1; {compatible to \eTeX} -@z -%----------------------------------------------- -@x FAM256 65536 Registers -@ \eTeX\ (in extended mode) supports 32768 (i.e., $2^{15}$) count, -@y -@ \epTeX\ (in extended mode) supports 65536 (i.e., $2^{16}$) count, -@z -%----------------------------------------------- -@x -Similarly there are 32768 mark classes; the command \.{\\marks}|n| -creates a mark node for a given mark class |0<=n<=32767| (where -@y -Similarly there are 65536 mark classes; the command \.{\\marks}|n| -creates a mark node for a given mark class |0<=n<=65535| (where -@z -%----------------------------------------------- -@x -not exceed 255 in compatibility mode resp.\ 32767 in extended mode. -@y -not exceed 255 in compatibility mode resp.\ 65535 in extended mode. -@z -%----------------------------------------------- -@x -max_reg_num:=32767; -max_reg_help_line:="A register number must be between 0 and 32767."; -@y -max_reg_num:=65535; -max_reg_help_line:="A register number must be between 0 and 65535."; -@z -%----------------------------------------------- -@x -sparse array of the up to 32512 additional registers of each kind and -one for the sparse array of the up to 32767 additional mark classes. -The root of each such tree, if it exists, is an index node containing 16 -pointers to subtrees for 4096 consecutive array elements. Similar index -nodes are the starting points for all nonempty subtrees for 4096, 256, -and 16 consecutive array elements. These four levels of index nodes are -followed by a fifth level with nodes for the individual array elements. -@y -sparse array of the up to 65280 additional registers of each kind and -one for the sparse array of the up to 65535 additional mark classes. -The root of each such tree, if it exists, is an index node containing 16 -pointers to subtrees for 65536 consecutive array elements. Similar index -nodes are the starting points for all nonempty subtrees for 65536, 4096, -256, and 16 consecutive array elements. These five levels of index nodes -are followed by a sixth level with nodes for the individual array elements. -@z -%----------------------------------------------- -@x -@d hex_dig1(#)==# div 4096 {the fourth lowest hexadecimal digit} -@d hex_dig2(#)==(# div 256) mod 16 {the third lowest hexadecimal digit} -@d hex_dig3(#)==(# div 16) mod 16 {the second lowest hexadecimal digit} -@d hex_dig4(#)==# mod 16 {the lowest hexadecimal digit} -@y -@d hex_dig1(#)==# div 65536 {the fifth lowest hexadecimal digit} -@d hex_dig2(#)==(# div 4096) mod 16 {the fourth lowest hexadecimal digit} -@d hex_dig3(#)==(# div 256) mod 16 {the third lowest hexadecimal digit} -@d hex_dig4(#)==(# div 16) mod 16 {the second lowest hexadecimal digit} -@d hex_dig5(#)==# mod 16 {the lowest hexadecimal digit} -@z -%----------------------------------------------- -@x -procedure find_sa_element(@!t:small_number;@!n:halfword;@!w:boolean); - {sets |cur_val| to sparse array element location or |null|} -label not_found,not_found1,not_found2,not_found3,not_found4,exit; -var q:pointer; {for list manipulations} -@!i:small_number; {a four bit index} -begin cur_ptr:=sa_root[t]; -if_cur_ptr_is_null_then_return_or_goto(not_found);@/ -q:=cur_ptr; i:=hex_dig1(n); get_sa_ptr; -if_cur_ptr_is_null_then_return_or_goto(not_found1);@/ -q:=cur_ptr; i:=hex_dig2(n); get_sa_ptr; -if_cur_ptr_is_null_then_return_or_goto(not_found2);@/ -q:=cur_ptr; i:=hex_dig3(n); get_sa_ptr; -if_cur_ptr_is_null_then_return_or_goto(not_found3);@/ -q:=cur_ptr; i:=hex_dig4(n); get_sa_ptr; -if (cur_ptr=null)and w then goto not_found4; -return; -not_found: new_index(t,null); {create first level index node} -sa_root[t]:=cur_ptr; q:=cur_ptr; i:=hex_dig1(n); -not_found1: new_index(i,q); {create second level index node} -add_sa_ptr; q:=cur_ptr; i:=hex_dig2(n); -not_found2: new_index(i,q); {create third level index node} -add_sa_ptr; q:=cur_ptr; i:=hex_dig3(n); -not_found3: new_index(i,q); {create fourth level index node} -add_sa_ptr; q:=cur_ptr; i:=hex_dig4(n); -not_found4: @; -link(cur_ptr):=q; add_sa_ptr; -exit:end; -@y -procedure find_sa_element(@!t:small_number;@!n:halfword;@!w:boolean); - {sets |cur_val| to sparse array element location or |null|} -label not_found,not_found1,not_found2,not_found3,not_found4,not_found5,exit; -var q:pointer; {for list manipulations} -@!i:small_number; {a four bit index} -begin cur_ptr:=sa_root[t]; -if_cur_ptr_is_null_then_return_or_goto(not_found);@/ -q:=cur_ptr; i:=hex_dig1(n); get_sa_ptr; -if_cur_ptr_is_null_then_return_or_goto(not_found1);@/ -q:=cur_ptr; i:=hex_dig2(n); get_sa_ptr; -if_cur_ptr_is_null_then_return_or_goto(not_found2);@/ -q:=cur_ptr; i:=hex_dig3(n); get_sa_ptr; -if_cur_ptr_is_null_then_return_or_goto(not_found3);@/ -q:=cur_ptr; i:=hex_dig4(n); get_sa_ptr; -if_cur_ptr_is_null_then_return_or_goto(not_found4);@/ -q:=cur_ptr; i:=hex_dig5(n); get_sa_ptr; -if (cur_ptr=null)and w then goto not_found5; -return; -not_found: new_index(t,null); {create first level index node} -sa_root[t]:=cur_ptr; q:=cur_ptr; i:=hex_dig1(n); -not_found1: new_index(i,q); {create second level index node} -add_sa_ptr; q:=cur_ptr; i:=hex_dig2(n); -not_found2: new_index(i,q); {create third level index node} -add_sa_ptr; q:=cur_ptr; i:=hex_dig3(n); -not_found3: new_index(i,q); {create fourth level index node} -add_sa_ptr; q:=cur_ptr; i:=hex_dig4(n); -not_found4: new_index(i,q); {create fifth level index node} -add_sa_ptr; q:=cur_ptr; i:=hex_dig5(n); -not_found5: @; -link(cur_ptr):=q; add_sa_ptr; -exit:end; -@z -%----------------------------------------------- -@x -repeat i:=hex_dig4(sa_index(q)); p:=q; q:=link(p); free_node(p,s); -@y -repeat i:=hex_dig5(sa_index(q)); p:=q; q:=link(p); free_node(p,s); -@z -%----------------------------------------------- -@x -else begin n:=hex_dig4(sa_index(q)); q:=link(q); n:=n+16*sa_index(q); - q:=link(q); n:=n+256*(sa_index(q)+16*sa_index(link(q))); -@y -else begin n:=hex_dig5(sa_index(q)); q:=link(q); n:=n+16*sa_index(q); - q:=link(q); n:=n+256*(sa_index(q)+16*sa_index(link(q))); - q:=link(link(q)); n:=n+65536*sa_index(q); -@z -%----------------------------------------------- -@x -begin if l<4 then {|q| is an index node} -@y -begin if l<5 then {|q| is an index node} -@z -%----------------------------------------------- -@x -@!fill_width:array[0..2] of scaled; {infinite stretch components of -@y -@!fill_width:array[0..3] of scaled; {infinite stretch components of -@z -%----------------------------------------------- -@x - if (background[3]=0)and(background[4]=0)and(background[5]=0) then - begin do_last_line_fit:=true; - active_node_size:=active_node_size_extended; - fill_width[0]:=0; fill_width[1]:=0; fill_width[2]:=0; -@y - if (background[3]=0)and(background[4]=0)and@| - (background[5]=0)and(background[6]=0) then - begin do_last_line_fit:=true; - active_node_size:=active_node_size_extended; - fill_width[0]:=0; fill_width[1]:=0; fill_width[2]:=0; fill_width[3]:=0; -@z -%----------------------------------------------- -@x -if (cur_active_width[3]<>fill_width[0])or@| - (cur_active_width[4]<>fill_width[1])or@| - (cur_active_width[5]<>fill_width[2]) then goto not_found; - {infinite stretch of this line not entirely due to |par_fill_skip|} -if active_short(r)>0 then g:=cur_active_width[2] -else g:=cur_active_width[6]; -@y -if (cur_active_width[3]<>fill_width[0])or@| - (cur_active_width[4]<>fill_width[1])or@| - (cur_active_width[5]<>fill_width[2])or@| - (cur_active_width[6]<>fill_width[3]) then goto not_found; - {infinite stretch of this line not entirely due to |par_fill_skip|} -if active_short(r)>0 then g:=cur_active_width[2] -else g:=cur_active_width[7]; -@z -%--------------------------------------- -@x -begin if -g>cur_active_width[6] then g:=-cur_active_width[6]; -b:=badness(-g,cur_active_width[6]); -@y -begin if -g>cur_active_width[7] then g:=-cur_active_width[7]; -b:=badness(-g,cur_active_width[7]); -@z -%----------------------------------------------- -@x -if shortfall>0 then g:=cur_active_width[2] -else if shortfall<0 then g:=cur_active_width[6] -@y -if shortfall>0 then g:=cur_active_width[2] -else if shortfall<0 then g:=cur_active_width[7] -@z diff --git a/source/texk/web2c/eptexdir/pdfprimitive.test b/source/texk/web2c/eptexdir/pdfprimitive.test deleted file mode 100755 index 2d23793fa..000000000 --- a/source/texk/web2c/eptexdir/pdfprimitive.test +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh -vx -# $Id$ -# Copyright 2017-2018 Karl Berry # -# Copyright 2015 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. - -BinDir=${BinDir:-.} -ExeExt=${ExeExt:-} -_eptex=$BinDir/eptex$ExeExt - -LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE - -TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF -TEXINPUTS=.; export TEXINPUTS - -FILE=pdfprimitive-eptex - -# get same filename in log -rm -f $FILE.* -$LN_S $srcdir/eptexdir/tests/pdfprimitive-test.tex $FILE.tex - -$_eptex -ini -etex $FILE && exit 1 - -sed 1d $FILE.log >$FILE.out - -diff $srcdir/eptexdir/tests/$FILE.log $FILE.out || exit 1 - diff --git a/source/texk/web2c/eptexdir/pdfutils.ch b/source/texk/web2c/eptexdir/pdfutils.ch deleted file mode 100644 index 73dfb8e3f..000000000 --- a/source/texk/web2c/eptexdir/pdfutils.ch +++ /dev/null @@ -1,2150 +0,0 @@ -%% Support for some primitives defined in pdfTeX -%% -%% \pdfstrcmp: need for LaTeX3 -%% In comparison, Japanese characters will be always encoded in UTF-8. -%% -%% \pdffilemoddate and co.: for standalone package -%% (\pdfcreationdate, \pdffilemoddate, \pdffilesize) -%% -%% \pdfsavepos and co. -%% (\pdfsavepos, \pdfpage{width,height}, \pdflast{x,y}pos) -%% -%% \pdffiledump: for bmpsize package by Heiko Oberdiek -%% -%% \pdfshellescape: by doraTeX's request -%% -%% \pdfmdfivesum: by Akira's request -%% As \pdfstrcmp, Japanese characters will be always encoded in UTF-8 in -%% \pdfmdfivesum {...}. (no conversion for \pdfmdfivesum file ) -%% -%% \pdfprimitive and \ifpdfprimitive: for LaTeX3 (2015/07/15) -%% -%% \pdfuniformdeviate and co.: -%% (\pdfnormaldeviate, \pdfrandomseed, \pdfsetrandomseed) -%% -%% \pdfelapsedtime and \pdfresettimer -%% -%% \expanded -%% -%% \ifincsname -%% -%% \Uchar, \Ucharcat -%% -%% \vadjust pre (2021-07-01) - -@x -@* \[8] Packed data. -@y -@* \[7b] Random numbers. - -\font\tenlogo=logo10 % font used for the METAFONT logo -\def\MP{{\tenlogo META}\-{\tenlogo POST}} -\def\pdfTeX{pdf\TeX} - -This section is (almost) straight from MetaPost. I had to change -the types (use |integer| instead of |fraction|), but that should -not have any influence on the actual calculations (the original -comments refer to quantities like |fraction_four| ($2^{30}$), and -that is the same as the numeric representation of |maxdimen|). - -I've copied the low-level variables and routines that are needed, but -only those (e.g. |m_log|), not the accompanying ones like |m_exp|. Most -of the following low-level numeric routines are only needed within the -calculation of |norm_rand|. I've been forced to rename |make_fraction| -to |make_frac| because TeX already has a routine by that name with -a wholly different function (it creates a |fraction_noad| for math -typesetting) -- Taco - -And now let's complete our collection of numeric utility routines -by considering random number generation. -\MP\ generates pseudo-random numbers with the additive scheme recommended -in Section 3.6 of {\sl The Art of Computer Programming}; however, the -results are random fractions between 0 and |fraction_one-1|, inclusive. - -There's an auxiliary array |randoms| that contains 55 pseudo-random -fractions. Using the recurrence $x_n=(x_{n-55}-x_{n-31})\bmod 2^{28}$, -we generate batches of 55 new $x_n$'s at a time by calling |new_randoms|. -The global variable |j_random| tells which element has most recently -been consumed. - -@= -@!randoms:array[0..54] of integer; {the last 55 random values generated} -@!j_random:0..54; {the number of unused |randoms|} -@!random_seed:scaled; {the default random seed} - -@ A small bit of metafont is needed. - -@d fraction_half==@'1000000000 {$2^{27}$, represents 0.50000000} -@d fraction_one==@'2000000000 {$2^{28}$, represents 1.00000000} -@d fraction_four==@'10000000000 {$2^{30}$, represents 4.00000000} -@d el_gordo == @'17777777777 {$2^{31}-1$, the largest value that \MP\ likes} -@d halfp(#)==(#) div 2 -@d double(#) == #:=#+# {multiply a variable by two} - -@ The |make_frac| routine produces the |fraction| equivalent of -|p/q|, given integers |p| and~|q|; it computes the integer -$f=\lfloor2^{28}p/q+{1\over2}\rfloor$, when $p$ and $q$ are -positive. If |p| and |q| are both of the same scaled type |t|, -the ``type relation'' |make_frac(t,t)=fraction| is valid; -and it's also possible to use the subroutine ``backwards,'' using -the relation |make_frac(t,fraction)=t| between scaled types. - -If the result would have magnitude $2^{31}$ or more, |make_frac| -sets |arith_error:=true|. Most of \MP's internal computations have -been designed to avoid this sort of error. - -If this subroutine were programmed in assembly language on a typical -machine, we could simply compute |(@t$2^{28}$@>*p)div q|, since a -double-precision product can often be input to a fixed-point division -instruction. But when we are restricted to \PASCAL\ arithmetic it -is necessary either to resort to multiple-precision maneuvering -or to use a simple but slow iteration. The multiple-precision technique -would be about three times faster than the code adopted here, but it -would be comparatively long and tricky, involving about sixteen -additional multiplications and divisions. - -This operation is part of \MP's ``inner loop''; indeed, it will -consume nearly 10\pct! of the running time (exclusive of input and output) -if the code below is left unchanged. A machine-dependent recoding -will therefore make \MP\ run faster. The present implementation -is highly portable, but slow; it avoids multiplication and division -except in the initial stage. System wizards should be careful to -replace it with a routine that is guaranteed to produce identical -results in all cases. -@^system dependencies@> - -As noted below, a few more routines should also be replaced by machine-dependent -code, for efficiency. But when a procedure is not part of the ``inner loop,'' -such changes aren't advisable; simplicity and robustness are -preferable to trickery, unless the cost is too high. -@^inner loop@> - -@p function make_frac(@!p,@!q:integer):integer; -var @!f:integer; {the fraction bits, with a leading 1 bit} -@!n:integer; {the integer part of $\vert p/q\vert$} -@!negative:boolean; {should the result be negated?} -@!be_careful:integer; {disables certain compiler optimizations} -begin if p>=0 then negative:=false -else begin negate(p); negative:=true; - end; -if q<=0 then - begin debug if q=0 then confusion("/");@;@+gubed@;@/ -@:this can't happen /}{\quad \./@> - negate(q); negative:=not negative; - end; -n:=p div q; p:=p mod q; -if n>=8 then - begin arith_error:=true; - if negative then make_frac:=-el_gordo@+else make_frac:=el_gordo; - end -else begin n:=(n-1)*fraction_one; - @; - if negative then make_frac:=-(f+n)@+else make_frac:=f+n; - end; -end; - -@ The |repeat| loop here preserves the following invariant relations -between |f|, |p|, and~|q|: -(i)~|0<=p - -@= -f:=1; -repeat be_careful:=p-q; p:=be_careful+p; -if p>=0 then f:=f+f+1 -else begin double(f); p:=p+q; - end; -until f>=fraction_one; -be_careful:=p-q; -if be_careful+p>=0 then incr(f) - -@ - -@p function take_frac(@!q:integer;@!f:integer):integer; -var @!p:integer; {the fraction so far} -@!negative:boolean; {should the result be negated?} -@!n:integer; {additional multiple of $q$} -@!be_careful:integer; {disables certain compiler optimizations} -begin @=0| and |q>0|@>; -if f; -be_careful:=n-el_gordo; -if be_careful+p>0 then - begin arith_error:=true; n:=el_gordo-p; - end; -if negative then take_frac:=-(n+p) -else take_frac:=n+p; -end; - -@ @=0| and |q>0|@>= -if f>=0 then negative:=false -else begin negate(f); negative:=true; - end; -if q<0 then - begin negate(q); negative:=not negative; - end; - -@ The invariant relations in this case are (i)~$\lfloor(qf+p)/2^k\rfloor -=\lfloor qf_0/2^{28}+{1\over2}\rfloor$, where $k$ is an integer and -$f_0$ is the original value of~$f$; (ii)~$2^k\L f<2^{k+1}$. -@^inner loop@> - -@= -p:=fraction_half; {that's $2^{27}$; the invariants hold now with $k=28$} -if q= -@!two_to_the:array[0..30] of integer; {powers of two} -@!spec_log:array[1..28] of integer; {special logarithms} - - -@ @= -two_to_the[0]:=1; -for k:=1 to 30 do two_to_the[k]:=2*two_to_the[k-1]; -spec_log[1]:=93032640; -spec_log[2]:=38612034; -spec_log[3]:=17922280; -spec_log[4]:=8662214; -spec_log[5]:=4261238; -spec_log[6]:=2113709; -spec_log[7]:=1052693; -spec_log[8]:=525315; -spec_log[9]:=262400; -spec_log[10]:=131136; -spec_log[11]:=65552; -spec_log[12]:=32772; -spec_log[13]:=16385; -for k:=14 to 27 do spec_log[k]:=two_to_the[27-k]; -spec_log[28]:=1; - -@ - -@p function m_log(@!x:integer):integer; -var @!y,@!z:integer; {auxiliary registers} -@!k:integer; {iteration counter} -begin if x<=0 then @ -else begin y:=1302456956+4-100; {$14\times2^{27}\ln2\approx1302456956.421063$} - z:=27595+6553600; {and $2^{16}\times .421063\approx 27595$} - while xfraction_four+4 do - @; - m_log:=y div 8; - end; -end; - -@ @= -begin z:=((x-1) div two_to_the[k])+1; {$z=\lceil x/2^k\rceil$} -while x= -begin print_err("Logarithm of "); -@.Logarithm...replaced by 0@> -print_scaled(x); print(" has been replaced by 0"); -help2("Since I don't take logs of non-positive numbers,")@/ - ("I'm zeroing this one. Proceed, with fingers crossed."); -error; m_log:=0; -end - -@ The following somewhat different subroutine tests rigorously if $ab$ is -greater than, equal to, or less than~$cd$, -given integers $(a,b,c,d)$. In most cases a quick decision is reached. -The result is $+1$, 0, or~$-1$ in the three respective cases. - -@d return_sign(#)==begin ab_vs_cd:=#; return; - end - -@p function ab_vs_cd(@!a,b,c,d:integer):integer; -label exit; -var @!q,@!r:integer; {temporary registers} -begin @=0|, |b,d>0|@>; -loop@+ begin q := a div d; r := c div b; - if q<>r then - if q>r then return_sign(1)@+else return_sign(-1); - q := a mod d; r := c mod b; - if r=0 then - if q=0 then return_sign(0)@+else return_sign(1); - if q=0 then return_sign(-1); - a:=b; b:=q; c:=d; d:=r; - end; {now |a>d>0| and |c>b>0|} -exit:end; - -@ @= -if a<0 then - begin negate(a); negate(b); - end; -if c<0 then - begin negate(c); negate(d); - end; -if d<=0 then - begin if b>=0 then - if ((a=0)or(b=0))and((c=0)or(d=0)) then return_sign(0) - else return_sign(1); - if d=0 then - if a=0 then return_sign(0)@+else return_sign(-1); - q:=a; a:=c; c:=q; q:=-b; b:=-d; d:=q; - end -else if b<=0 then - begin if b<0 then if a>0 then return_sign(-1); - if c=0 then return_sign(0) else return_sign(-1); - end - -@ To consume a random integer, the program below will say `|next_random|' -and then it will fetch |randoms[j_random]|. - -@d next_random==if j_random=0 then new_randoms - else decr(j_random) - -@p procedure new_randoms; -var @!k:0..54; {index into |randoms|} -@!x:integer; {accumulator} -begin for k:=0 to 23 do - begin x:=randoms[k]-randoms[k+31]; - if x<0 then x:=x+fraction_one; - randoms[k]:=x; - end; -for k:=24 to 54 do - begin x:=randoms[k]-randoms[k-24]; - if x<0 then x:=x+fraction_one; - randoms[k]:=x; - end; -j_random:=54; -end; - -@ To initialize the |randoms| table, we call the following routine. - -@p procedure init_randoms(@!seed:integer); -var @!j,@!jj,@!k:integer; {more or less random integers} -@!i:0..54; {index into |randoms|} -begin j:=abs(seed); -while j>=fraction_one do j:=halfp(j); -k:=1; -for i:=0 to 54 do - begin jj:=k; k:=j-k; j:=jj; - if k<0 then k:=k+fraction_one; - randoms[(i*21)mod 55]:=j; - end; -new_randoms; new_randoms; new_randoms; {``warm up'' the array} -end; - -@ To produce a uniform random number in the range |0<=u=u>x| -or |0=u=x|, given a |scaled| value~|x|, we proceed as shown here. - -Note that the call of |take_frac| will produce the values 0 and~|x| -with about half the probability that it will produce any other particular -values between 0 and~|x|, because it rounds its answers. - -@p function unif_rand(@!x:integer):integer; -var @!y:integer; {trial value} -begin next_random; y:=take_frac(abs(x),randoms[j_random]); -if y=abs(x) then unif_rand:=0 -else if x>0 then unif_rand:=y -else unif_rand:=-y; -end; - -@ Finally, a normal deviate with mean zero and unit standard deviation -can readily be obtained with the ratio method (Algorithm 3.4.1R in -{\sl The Art of Computer Programming\/}). - -@p function norm_rand:integer; -var @!x,@!u,@!l:integer; {what the book would call $2^{16}X$, $2^{28}U$, - and $-2^{24}\ln U$} -begin repeat - repeat next_random; - x:=take_frac(112429,randoms[j_random]-fraction_half); - {$2^{16}\sqrt{8/e}\approx 112428.82793$} - next_random; u:=randoms[j_random]; - until abs(x)=0; -norm_rand:=x; -end; -@* \[8] Packed data. -@z - -% [10] \vadjust pre -@x -@d adjust_ptr(#)==mem[#+1].int - {vertical list to be moved out of horizontal list} -@y -@d adjust_pre == subtype {<>0 => pre-adjustment} -@#{|append_list| is used to append a list to |tail|} -@d append_list(#) == begin link(tail) := link(#); append_list_end -@d append_list_end(#) == tail := #; end - -@d adjust_ptr(#)==mem[#+1].int - {vertical list to be moved out of horizontal list} -@z - -% [11] \vadjust pre -@x -@d hi_mem_stat_min==mem_top-13 {smallest statically allocated word in - the one-word |mem|} -@d hi_mem_stat_usage=14 {the number of one-word nodes always present} -@y -@d pre_adjust_head==mem_top-14 {head of pre-adjustment list returned by |hpack|} -@d hi_mem_stat_min==mem_top-14 {smallest statically allocated word in - the one-word |mem|} -@d hi_mem_stat_usage=15 {the number of one-word nodes always present} -@z - -@x -@* \[12] Displaying boxes. -@y -@@; - -@* \[12] Displaying boxes. -@z - -% [12] \vadjust pre -@x -@ @= -begin print_esc("vadjust"); node_list_display(adjust_ptr(p)); {recursive call} -end -@y -@ @= -begin print_esc("vadjust"); if adjust_pre(p) <> 0 then print(" pre "); -node_list_display(adjust_ptr(p)); {recursive call} -end -@z - -@x \[if]pdfprimitive -@d frozen_special=frozen_control_sequence+10 - {permanent `\.{\\special}'} -@d frozen_null_font=frozen_control_sequence+11 - {permanent `\.{\\nullfont}'} -@y -@d frozen_special=frozen_control_sequence+10 - {permanent `\.{\\special}'} -@d frozen_primitive=frozen_control_sequence+11 - {permanent `\.{\\pdfprimitive}'} -@d prim_eqtb_base=frozen_primitive+1 -@d prim_size=2100 {maximum number of primitives } -@d frozen_null_font=prim_eqtb_base+prim_size+1 - {permanent `\.{\\nullfont}'} -@z - -@x -@d dimen_pars=23 {total number of dimension parameters} -@y -@d pdf_page_width_code=23 {page width} -@d pdf_page_height_code=24 {page height} -@d dimen_pars=25 {total number of dimension parameters} -@z - -@x \pdfpage{width,height} -@d emergency_stretch==dimen_par(emergency_stretch_code) -@y -@d emergency_stretch==dimen_par(emergency_stretch_code) -@d pdf_page_width==dimen_par(pdf_page_width_code) -@d pdf_page_height==dimen_par(pdf_page_height_code) -@z - -@x \pdfpage{width,height} -emergency_stretch_code:print_esc("emergencystretch"); -@y -emergency_stretch_code:print_esc("emergencystretch"); -pdf_page_width_code: print_esc("pdfpagewidth"); -pdf_page_height_code: print_esc("pdfpageheight"); -@z - -@x \[if]pdfprimitive -@!cs_count:integer; {total number of known identifiers} -@y -@!cs_count:integer; {total number of known identifiers} - -@ Primitive support needs a few extra variables and definitions - -@d prim_prime=1777 {about 85\pct! of |primitive_size|} -@d prim_base=1 -@d prim_next(#) == prim[#].lh {link for coalesced lists} -@d prim_text(#) == prim[#].rh {string number for control sequence name, plus one} -@d prim_is_full == (prim_used=prim_base) {test if all positions are occupied} -@d prim_eq_level_field(#)==#.hh.b1 -@d prim_eq_type_field(#)==#.hh.b0 -@d prim_equiv_field(#)==#.hh.rh -@d prim_eq_level(#)==prim_eq_level_field(eqtb[prim_eqtb_base+#]) {level of definition} -@d prim_eq_type(#)==prim_eq_type_field(eqtb[prim_eqtb_base+#]) {command code for equivalent} -@d prim_equiv(#)==prim_equiv_field(eqtb[prim_eqtb_base+#]) {equivalent value} -@d undefined_primitive=0 -@d biggest_char=255 { 65535 in XeTeX } - -@= -@!prim: array [0..prim_size] of two_halves; {the primitives table} -@!prim_used:pointer; {allocation pointer for |prim|} -@z - -@x \[if]pdfprimitive -@ @= -no_new_control_sequence:=true; {new identifiers are usually forbidden} -@y -@ @= -no_new_control_sequence:=true; {new identifiers are usually forbidden} -prim_next(0):=0; prim_text(0):=0; -for k:=1 to prim_size do prim[k]:=prim[0]; -@z - -@x \[if]pdfprimitive -text(frozen_dont_expand):="notexpanded:"; -@.notexpanded:@> -@y -prim_used:=prim_size; {nothing is used} -text(frozen_dont_expand):="notexpanded:"; -@.notexpanded:@> -eq_type(frozen_primitive):=ignore_spaces; -equiv(frozen_primitive):=1; -eq_level(frozen_primitive):=level_one; -text(frozen_primitive):="pdfprimitive"; -@z - -@x \[if]pdfprimitive -@ Single-character control sequences do not need to be looked up in a hash -table, since we can use the character code itself as a direct address. -@y -@ Here is the subroutine that searches the primitive table for an identifier - -@p function prim_lookup(@!s:str_number):pointer; {search the primitives table} -label found; {go here if you found it} -var h:integer; {hash code} -@!p:pointer; {index in |hash| array} -@!k:pointer; {index in string pool} -@!j,@!l:integer; -begin -if s<=biggest_char then begin - if s<0 then begin p:=undefined_primitive; goto found; end - else p:=(s mod prim_prime)+prim_base; {we start searching here} - l:=1 - end -else begin - j:=str_start[s]; - if s = str_ptr then l := cur_length else l := length(s); - @; - p:=h+prim_base; {we start searching here; note that |0<=h1+biggest_char then { |p| points a multi-letter primitive } - begin if length(prim_text(p)-1)=l then - if str_eq_str(prim_text(p)-1,s) then goto found; - end - else if prim_text(p)=1+s then goto found; { |p| points a single-letter primitive } - if prim_next(p)=0 then - begin if no_new_control_sequence then - p:=undefined_primitive - else @; - goto found; - end; - p:=prim_next(p); - end; -found: prim_lookup:=p; -end; - -@ @= -begin if prim_text(p)>0 then - begin repeat if prim_is_full then overflow("primitive size",prim_size); -@:TeX capacity exceeded primitive size}{\quad primitive size@> - decr(prim_used); - until prim_text(prim_used)=0; {search for an empty location in |prim|} - prim_next(p):=prim_used; p:=prim_used; - end; -prim_text(p):=s+1; -end - -@ The value of |prim_prime| should be roughly 85\pct! of -|prim_size|, and it should be a prime number. - -@= -h:=str_pool[j]; -for k:=j+1 to j+l-1 do - begin h:=h+h+str_pool[k]; - while h>=prim_prime do h:=h-prim_prime; - end - -@ Single-character control sequences do not need to be looked up in a hash -table, since we can use the character code itself as a direct address. -@z - -@x print_cs: \pdfprimitive -else begin l:=text(p); -@y -else begin - if (p>=prim_eqtb_base)and(p=prim_eqtb_base)and(p= -@y -@ @= -@!is_in_csname: boolean; - -@ @= -is_in_csname := false; - -@ @= -@z - -@x -no_expand:@; -@y -no_expand: if cur_chr=0 then @ - else @; -@z - -@x -@= -begin save_scanner_status:=scanner_status; scanner_status:=normal; -get_token; scanner_status:=save_scanner_status; t:=cur_tok; -back_input; {now |start| and |loc| point to the backed-up token |t|} -if (t>=cs_token_flag)and(t<>end_write_token) then - begin p:=get_avail; info(p):=cs_token_flag+frozen_dont_expand; - link(p):=loc; start:=p; loc:=p; - end; -end -@y -@= -begin save_scanner_status:=scanner_status; scanner_status:=normal; -get_token; scanner_status:=save_scanner_status; t:=cur_tok; -back_input; {now |start| and |loc| point to the backed-up token |t|} -if (t>=cs_token_flag)and(t<>end_write_token) then - begin p:=get_avail; info(p):=cs_token_flag+frozen_dont_expand; - link(p):=loc; start:=p; loc:=p; - end; -end - -@ The \.{\\pdfprimitive} handling. If the primitive meaning of the next -token is an expandable command, it suffices to replace the current -token with the primitive one and restart |expand|/ - -Otherwise, the token we just read has to be pushed back, as well -as a token matching the internal form of \.{\\pdfprimitive}, that is -sneaked in as an alternate form of |ignore_spaces|. -@!@:pdfprimitive_}{\.{\\pdfprimitive} primitive (internalized)@> - -Simply pushing back a token that matches the correct internal command -does not work, because approach would not survive roundtripping to a -temporary file. - -@= -begin save_scanner_status := scanner_status; scanner_status:=normal; -get_token; scanner_status:=save_scanner_status; -if cur_cs < hash_base then - cur_cs := prim_lookup(cur_cs-single_base) -else - cur_cs := prim_lookup(text(cur_cs)); -if cur_cs<>undefined_primitive then begin - t := prim_eq_type(cur_cs); - if t>max_command then begin - cur_cmd := t; - cur_chr := prim_equiv(cur_cs); - cur_tok := (cur_cmd*@'400)+cur_chr; - cur_cs := 0; - goto reswitch; - end - else begin - back_input; { now |loc| and |start| point to a one-item list } - p:=get_avail; info(p):=cs_token_flag+frozen_primitive; - link(p):=loc; loc:=p; start:=p; - end; - end; -end - -@ This block deals with unexpandable \.{\\primitive} appearing at a spot where -an integer or an internal values should have been found. It fetches the -next token then resets |cur_cmd|, |cur_cs|, and |cur_tok|, based on the -primitive value of that token. No expansion takes place, because the -next token may be all sorts of things. This could trigger further -expansion creating new errors. - -@= -begin -get_token; -if cur_cs < hash_base then - cur_cs := prim_lookup(cur_cs-single_base) -else - cur_cs := prim_lookup(text(cur_cs)); -if cur_cs<>undefined_primitive then begin - cur_cmd := prim_eq_type(cur_cs); - cur_chr := prim_equiv(cur_cs); - cur_cs := prim_eqtb_base+cur_cs; - cur_tok := cs_token_flag+cur_cs; - end -else begin - cur_cmd := relax; - cur_chr := 0; - cur_tok := cs_token_flag+frozen_relax; - cur_cs := frozen_relax; - end; -goto restart; -end -@z - -@x -begin r:=get_avail; p:=r; {head of the list of characters} -repeat get_x_token; -@y -begin r:=get_avail; p:=r; {head of the list of characters} -b := is_in_csname; is_in_csname := true; -repeat get_x_token; -@z - -@x -@; -@y -is_in_csname := b; -@; -@z - -@x scan_keyword -@!k:pool_pointer; {index into |str_pool|} -begin p:=backup_head; link(p):=null; k:=str_start[s]; -@y -@!k:pool_pointer; {index into |str_pool|} -@!save_cur_cs:pointer; {to save |cur_cs|} -begin p:=backup_head; link(p):=null; k:=str_start[s]; -save_cur_cs:=cur_cs; -@z - -@x scan_keyword - scan_keyword:=false; return; -@y - cur_cs:=save_cur_cs; - scan_keyword:=false; return; -@z - -@x \[if]pdfprimitive : scan_something_internal -procedure scan_something_internal(@!level:small_number;@!negative:boolean); - {fetch an internal parameter} -label exit; -@y -procedure scan_something_internal(@!level:small_number;@!negative:boolean); - {fetch an internal parameter} -label exit, restart; -@z - -@x \[if]pdfprimitive : scan_something_internal -begin m:=cur_chr; -@y -begin restart: m:=cur_chr; -@z - -@x \[if]pdfprimitive : scan_something_internal -last_item: @; -@y -last_item: @; -ignore_spaces: {trap unexpandable primitives} - if cur_chr=1 then @; -@z - -@x -@d ptex_minor_version_code=eptex_version_code+1 {code for \.{\\ptexminorversion}} -@y -@d ptex_minor_version_code=eptex_version_code+1 {code for \.{\\ptexminorversion}} -@d pdf_last_x_pos_code=ptex_minor_version_code+1 {code for \.{\\pdflastxpos}} -@d pdf_last_y_pos_code=pdf_last_x_pos_code+1 {code for \.{\\pdflastypos}} -@d pdf_shell_escape_code=pdf_last_y_pos_code+1 {code for \.{\\pdflastypos}} -@d elapsed_time_code=pdf_shell_escape_code+1 {code for \.{\\pdfelapsedtime}} -@d random_seed_code=elapsed_time_code+1 {code for \.{\\pdfrandomseed}} -@z - -@x -@d eTeX_int=ptex_minor_version_code+1 {first of \eTeX\ codes for integers} -@y -@d eTeX_int=random_seed_code+1 {first of \eTeX\ codes for integers} -@z - -@x \[if]pdfprimitive: scan_int -@p procedure scan_int; {sets |cur_val| to an integer} -label done; -@y -@p procedure scan_int; {sets |cur_val| to an integer} -label done, restart; -@z - -@x \[if]pdfprimitive: scan_int -if cur_tok=alpha_token then @ -@y -restart: -if cur_tok=alpha_token then @ -else if cur_tok=cs_token_flag+frozen_primitive then - @ -@z - -@x \Ucharcat: str_toks_cat -function str_toks(@!b:pool_pointer):pointer; -@y -function str_toks_cat(@!b:pool_pointer;@!cat:small_number):pointer; -@z - -@x \Ucharcat: str_toks_cat - else if t=" " then t:=space_token - else t:=other_token+t; -@y - else if (t=" ")and(cat=0) then t:=space_token - else if (cat=0)or(cat>=kanji) then t:=other_token+t - else if cat=active_char then t:= cs_token_flag + active_base + t - else t:=left_brace_token*cat+t; -@z - -@x \Ucharcat: str_toks_cat -pool_ptr:=b; str_toks:=p; -end; -@y -pool_ptr:=b; str_toks_cat:=p; -end; - -function str_toks(@!b:pool_pointer):pointer; -begin str_toks:=str_toks_cat(b,0); end; -@z - -@x -@d etex_convert_codes=etex_convert_base+1 {end of \eTeX's command codes} -@d job_name_code=etex_convert_codes {command code for \.{\\jobname}} -@y -@d etex_convert_codes=etex_convert_base+1 {end of \eTeX's command codes} -@d expanded_code = etex_convert_codes {command code for \.{\\expanded}} -@d pdf_first_expand_code = expanded_code + 1 {base for \pdfTeX-like command codes} -@d pdf_strcmp_code = pdf_first_expand_code+0 {command code for \.{\\pdfstrcmp}} -@d pdf_creation_date_code = pdf_first_expand_code+1 {command code for \.{\\pdfcreationdate}} -@d pdf_file_mod_date_code = pdf_first_expand_code+2 {command code for \.{\\pdffilemoddate}} -@d pdf_file_size_code = pdf_first_expand_code+3 {command code for \.{\\pdffilesize}} -@d pdf_mdfive_sum_code = pdf_first_expand_code+4 {command code for \.{\\pdfmdfivesum}} -@d pdf_file_dump_code = pdf_first_expand_code+5 {command code for \.{\\pdffiledump}} -@d uniform_deviate_code = pdf_first_expand_code+6 {command code for \.{\\pdfuniformdeviate}} -@d normal_deviate_code = pdf_first_expand_code+7 {command code for \.{\\pdfnormaldeviate}} -@d pdf_convert_codes = pdf_first_expand_code+8 {end of \pdfTeX-like command codes} -@d Uchar_convert_code = pdf_convert_codes {command code for \.{\\Uchar}} -@d Ucharcat_convert_code = pdf_convert_codes+1 {command code for \.{\\Ucharcat}} -@d eptex_convert_codes = pdf_convert_codes+2 {end of \epTeX's command codes} -@d job_name_code=eptex_convert_codes {command code for \.{\\jobname}} -@z - -@x -primitive("jobname",convert,job_name_code);@/ -@y -@# -primitive("expanded",convert,expanded_code);@/ -@!@:expanded_}{\.{\\expanded} primitive@> -@# -primitive("jobname",convert,job_name_code);@/ -@z - -@x - eTeX_revision_code: print_esc("eTeXrevision"); -@y - eTeX_revision_code: print_esc("eTeXrevision"); - expanded_code: print_esc("expanded"); - pdf_strcmp_code: print_esc("pdfstrcmp"); - pdf_creation_date_code: print_esc("pdfcreationdate"); - pdf_file_mod_date_code: print_esc("pdffilemoddate"); - pdf_file_size_code: print_esc("pdffilesize"); - pdf_mdfive_sum_code: print_esc("pdfmdfivesum"); - pdf_file_dump_code: print_esc("pdffiledump"); - uniform_deviate_code: print_esc("pdfuniformdeviate"); - normal_deviate_code: print_esc("pdfnormaldeviate"); - Uchar_convert_code: print_esc("Uchar"); - Ucharcat_convert_code: print_esc("Ucharcat"); -@z - -@x -@p procedure conv_toks; -@y - -The extra temp string |u| is needed because |pdf_scan_ext_toks| incorporates -any pending string in its output. In order to save such a pending string, -we have to create a temporary string that is destroyed immediately after. - -@d save_cur_string==if str_start[str_ptr]0 then decr(str_ptr) - -@ Not all catcode values are allowed by \.{\\Ucharcat}: -@d illegal_Ucharcat_ascii_catcode(#)==(#active_char)or(#=out_param)or(#=ignore) -@d illegal_Ucharcat_wchar_catcode(#)==(#other_kchar) - -@p procedure conv_toks; -@z - -@x -@!save_scanner_status:small_number; {|scanner_status| upon entry} -@y -@!save_scanner_status:small_number; {|scanner_status| upon entry} -@!save_def_ref: pointer; {|def_ref| upon entry, important if inside `\.{\\message}'} -@!save_warning_index: pointer; -@!bool: boolean; {temp boolean} -@!u: str_number; {saved current string string} -@!s: str_number; {first temp string} -@!i: integer; -@!j: integer; -@!cat:small_number; {desired catcode, or 0 for automatic |spacer|/|other_char| selection} -@z - -@x -begin c:=cur_chr; @; -@y -begin cat:=0; c:=cur_chr; @; -u:=0; { will become non-nil if a string is already being built} -@z - -@x -selector:=old_setting; link(garbage):=str_toks(b); ins_list(link(temp_head)); -@y -selector:=old_setting; link(garbage):=str_toks_cat(b,cat); ins_list(link(temp_head)); -@z - -@x -eTeX_revision_code: do_nothing; -@y -eTeX_revision_code: do_nothing; -expanded_code: - begin - save_scanner_status := scanner_status; - save_warning_index := warning_index; - save_def_ref := def_ref; - save_cur_string; - scan_pdf_ext_toks; - warning_index := save_warning_index; - scanner_status := save_scanner_status; - ins_list(link(def_ref)); - free_avail(def_ref); - def_ref := save_def_ref; - restore_cur_string; - return; - end; -pdf_strcmp_code: - begin - save_scanner_status := scanner_status; - save_warning_index := warning_index; - save_def_ref := def_ref; - save_cur_string; - compare_strings; - def_ref := save_def_ref; - warning_index := save_warning_index; - scanner_status := save_scanner_status; - restore_cur_string; - end; -pdf_creation_date_code: - begin - b := pool_ptr; - getcreationdate; - link(garbage) := str_toks(b); - ins_list(link(temp_head)); - return; - end; -pdf_file_mod_date_code: - begin - save_scanner_status := scanner_status; - save_warning_index := warning_index; - save_def_ref := def_ref; - save_cur_string; - scan_pdf_ext_toks; - s := tokens_to_string(def_ref); - delete_token_ref(def_ref); - def_ref := save_def_ref; - warning_index := save_warning_index; - scanner_status := save_scanner_status; - b := pool_ptr; - getfilemoddate(s); - link(garbage) := str_toks(b); - flush_str(s); - ins_list(link(temp_head)); - restore_cur_string; - return; - end; -pdf_file_size_code: - begin - save_scanner_status := scanner_status; - save_warning_index := warning_index; - save_def_ref := def_ref; - save_cur_string; - scan_pdf_ext_toks; - s := tokens_to_string(def_ref); - delete_token_ref(def_ref); - def_ref := save_def_ref; - warning_index := save_warning_index; - scanner_status := save_scanner_status; - b := pool_ptr; - getfilesize(s); - link(garbage) := str_toks(b); - flush_str(s); - ins_list(link(temp_head)); - restore_cur_string; - return; - end; -pdf_mdfive_sum_code: - begin - save_scanner_status := scanner_status; - save_warning_index := warning_index; - save_def_ref := def_ref; - save_cur_string; - bool := scan_keyword("file"); - scan_pdf_ext_toks; - if bool then s := tokens_to_string(def_ref) - else begin - isprint_utf8:=true; s := tokens_to_string(def_ref); isprint_utf8:=false; - end; - delete_token_ref(def_ref); - def_ref := save_def_ref; - warning_index := save_warning_index; - scanner_status := save_scanner_status; - b := pool_ptr; - getmd5sum(s, bool); - link(garbage) := str_toks(b); - flush_str(s); - ins_list(link(temp_head)); - restore_cur_string; - return; - end; -pdf_file_dump_code: - begin - save_scanner_status := scanner_status; - save_warning_index := warning_index; - save_def_ref := def_ref; - save_cur_string; - {scan offset} - cur_val := 0; - if (scan_keyword("offset")) then begin - scan_int; - if (cur_val < 0) then begin - print_err("Bad file offset"); -@.Bad file offset@> - help2("A file offset must be between 0 and 2^{31}-1,")@/ - ("I changed this one to zero."); - int_error(cur_val); - cur_val := 0; - end; - end; - i := cur_val; - {scan length} - cur_val := 0; - if (scan_keyword("length")) then begin - scan_int; - if (cur_val < 0) then begin - print_err("Bad dump length"); -@.Bad dump length@> - help2("A dump length must be between 0 and 2^{31}-1,")@/ - ("I changed this one to zero."); - int_error(cur_val); - cur_val := 0; - end; - end; - j := cur_val; - {scan file name} - scan_pdf_ext_toks; - s := tokens_to_string(def_ref); - delete_token_ref(def_ref); - def_ref := save_def_ref; - warning_index := save_warning_index; - scanner_status := save_scanner_status; - b := pool_ptr; - getfiledump(s, i, j); - link(garbage) := str_toks(b); - flush_str(s); - ins_list(link(temp_head)); - restore_cur_string; - return; - end; -uniform_deviate_code: scan_int; -normal_deviate_code: do_nothing; -Uchar_convert_code: scan_char_num; -Ucharcat_convert_code: - begin - scan_ascii_num; - i:=cur_val; - scan_int; - if illegal_Ucharcat_ascii_catcode(cur_val) then - begin print_err("Invalid code ("); print_int(cur_val); -@.Invalid code@> - print("), should be in the ranges 1..4, 6..8, 10..13"); - help1("I'm going to use 12 instead of that illegal code value.");@/ - error; cat:=12; - end else cat:=cur_val; - cur_val:=i; - end; -@z - -@x -eTeX_revision_code: print(eTeX_revision); -@y -eTeX_revision_code: print(eTeX_revision); -pdf_strcmp_code: print_int(cur_val); -uniform_deviate_code: print_int(unif_rand(cur_val)); -normal_deviate_code: print_int(norm_rand); -Uchar_convert_code: -if is_char_ascii(cur_val) then print_char(cur_val) else print_kanji(cur_val); -Ucharcat_convert_code: -if cat"; {relation to be evaluated} -@y -var b:boolean; {is the condition true?} -@!e:boolean; {keep track of nested csnames} -@!r:"<"..">"; {relation to be evaluated} -@z - -@x \[if]pdfprimitive -if_void_code, if_hbox_code, if_vbox_code: @; -@y -if_void_code, if_hbox_code, if_vbox_code: @; -if_pdfprimitive_code: begin - save_scanner_status:=scanner_status; - scanner_status:=normal; - get_next; - scanner_status:=save_scanner_status; - if cur_cs < hash_base then - m := prim_lookup(cur_cs-single_base) - else - m := prim_lookup(text(cur_cs)); - b :=((cur_cmd<>undefined_cs) and - (m<>undefined_primitive) and - (cur_cmd=prim_eq_type(m)) and - (cur_chr=prim_equiv(m))); - end; -@z - -@x -@ @= -@y -@ @= -@; -@z - -% [33] \vadjust pre -@x -if adjust_tail<>null then link(adjust_tail):=null; -@y -if adjust_tail<>null then link(adjust_tail):=null; -if pre_adjust_tail<>null then link(pre_adjust_tail):=null; -@z - -% [33] \vadjust pre -@x - ins_node,mark_node,adjust_node: if adjust_tail<>null then -@y - ins_node,mark_node,adjust_node: if (adjust_tail<>null) or (pre_adjust_tail<> null) then -@z - -% [33] \vadjust pre -@x -to make a deletion. -@^inner loop@> -@y -to make a deletion. -@^inner loop@> - -@= -@!pre_adjust_tail: pointer; - -@ @= -pre_adjust_tail := null; - -@ Materials in \.{\\vadjust} used with \.{pre} keyword will be appended to -|pre_adjust_tail| instead of |adjust_tail|. - -@d update_adjust_list(#) == begin - if # = null then - confusion("pre vadjust"); - link(#) := adjust_ptr(p); - while link(#) <> null do - # := link(#); -end -@z - -% [33] \vadjust pre -@x -@= -begin while link(q)<>p do q:=link(q); -if type(p)=adjust_node then - begin link(adjust_tail):=adjust_ptr(p); - while link(adjust_tail)<>null do adjust_tail:=link(adjust_tail); - p:=link(p); free_node(link(q),small_node_size); - end -else begin link(adjust_tail):=p; adjust_tail:=p; p:=link(p); - end; -link(q):=p; p:=q; -@y -@= -begin while link(q)<>p do q:=link(q); - if type(p) = adjust_node then begin - if adjust_pre(p) <> 0 then - update_adjust_list(pre_adjust_tail) - else - update_adjust_list(adjust_tail); - p := link(p); free_node(link(q), small_node_size); - end -else begin link(adjust_tail):=p; adjust_tail:=p; p:=link(p); - end; -link(q):=p; p:=q; -@z - -% [37] \vadjust pre -@x -@d align_stack_node_size=5 {number of |mem| words to save alignment states} -@y -@d align_stack_node_size=6 {number of |mem| words to save alignment states} -@z - -% [37] \vadjust pre -@x -@!cur_head,@!cur_tail:pointer; {adjustment list pointers} -@y -@!cur_head,@!cur_tail:pointer; {adjustment list pointers} -@!cur_pre_head,@!cur_pre_tail:pointer; {pre-adjustment list pointers} -@z - -% [37] \vadjust pre -@x -cur_head:=null; cur_tail:=null; -@y -cur_head:=null; cur_tail:=null; -cur_pre_head:=null; cur_pre_tail:=null; -@z - -% [37] procedure |push_alignment|: \vadjust pre -@x -info(p+4):=cur_head; link(p+4):=cur_tail; -align_ptr:=p; -cur_head:=get_avail; -@y -info(p+4):=cur_head; link(p+4):=cur_tail; -info(p+5):=cur_pre_head; link(p+5):=cur_pre_tail; -align_ptr:=p; -cur_head:=get_avail; -cur_pre_head:=get_avail; -@z - -% [37] procedure |pop_alignment|: \vadjust pre -@x -begin free_avail(cur_head); -p:=align_ptr; -cur_tail:=link(p+4); cur_head:=info(p+4); -@y -begin free_avail(cur_head); -free_avail(cur_pre_head); -p:=align_ptr; -cur_tail:=link(p+4); cur_head:=info(p+4); -cur_pre_tail:=link(p+5); cur_pre_head:=info(p+5); -@z - -% [37] \vadjust pre -@x -cur_align:=link(preamble); cur_tail:=cur_head; init_span(cur_align); -@y -cur_align:=link(preamble); cur_tail:=cur_head; cur_pre_tail:=cur_pre_head; -init_span(cur_align); -@z - -% [37] \vadjust pre + pTeX -@x - begin adjust_tail:=cur_tail; adjust_hlist(head,false); -@y - begin adjust_tail:=cur_tail; pre_adjust_tail:=cur_pre_tail; - adjust_hlist(head,false); -@z - -% [37] \vadjust pre -@x - cur_tail:=adjust_tail; adjust_tail:=null; -@y - cur_tail:=adjust_tail; adjust_tail:=null; - cur_pre_tail:=pre_adjust_tail; pre_adjust_tail:=null; -@z - -% [37] \vadjust pre -@x - pop_nest; append_to_vlist(p); - if cur_head<>cur_tail then - begin link(tail):=link(cur_head); tail:=cur_tail; - end; -@y - pop_nest; - if cur_pre_head <> cur_pre_tail then - append_list(cur_pre_head)(cur_pre_tail); - append_to_vlist(p); - if cur_head <> cur_tail then - append_list(cur_head)(cur_tail); -@z - -% [39] \vadjust pre -@x -@ @= -append_to_vlist(just_box); -if adjust_head<>adjust_tail then - begin link(tail):=link(adjust_head); tail:=adjust_tail; - end; -adjust_tail:=null -@y -@ @= -if pre_adjust_head <> pre_adjust_tail then - append_list(pre_adjust_head)(pre_adjust_tail); -pre_adjust_tail := null; -append_to_vlist(just_box); -if adjust_head <> adjust_tail then - append_list(adjust_head)(adjust_tail); -adjust_tail := null -@z - -% [39] \vadjust pre -@x -adjust_tail:=adjust_head; just_box:=hpack(q,cur_width,exactly); -@y -adjust_tail:=adjust_head; -pre_adjust_tail := pre_adjust_head; -just_box:=hpack(q,cur_width,exactly); -@z - -@x \[if]pdfprimitive: main_loop -any_mode(ignore_spaces): begin @; - goto reswitch; - end; -@y -any_mode(ignore_spaces): begin - if cur_chr = 0 then begin - @; - goto reswitch; - end - else begin - t:=scanner_status; - scanner_status:=normal; - get_next; - scanner_status:=t; - if cur_cs < hash_base then - cur_cs := prim_lookup(cur_cs-single_base) - else - cur_cs := prim_lookup(text(cur_cs)); - if cur_cs<>undefined_primitive then begin - cur_cmd := prim_eq_type(cur_cs); - cur_chr := prim_equiv(cur_cs); - cur_tok := cs_token_flag+prim_eqtb_base+cur_cs; - goto reswitch; - end; - end; - end; -@z - -% [47] \vadjust pre -@x - if abs(mode)=vmode then - begin append_to_vlist(cur_box); - if adjust_tail<>null then - begin if adjust_head<>adjust_tail then - begin link(tail):=link(adjust_head); tail:=adjust_tail; - end; - adjust_tail:=null; - end; - if mode>0 then build_page; - end -@y - if abs(mode)=vmode then - begin - if pre_adjust_tail <> null then begin - if pre_adjust_head <> pre_adjust_tail then - append_list(pre_adjust_head)(pre_adjust_tail); - pre_adjust_tail := null; - end; - append_to_vlist(cur_box); - if adjust_tail <> null then begin - if adjust_head <> adjust_tail then - append_list(adjust_head)(adjust_tail); - adjust_tail := null; - end; - if mode>0 then build_page; - end -@z - -% [47] \vadjust pre + pTeX -@x -adjusted_hbox_group: begin adjust_hlist(head,false); - adjust_tail:=adjust_head; package(0); -@y -adjusted_hbox_group: begin adjust_hlist(head,false); - adjust_tail:=adjust_head; - pre_adjust_tail:=pre_adjust_head; package(0); -@z - -% [47] \vadjust pre -@x -saved(0):=cur_val; incr(save_ptr); -@y -saved(0) := cur_val; -if (cur_cmd = vadjust) and scan_keyword("pre") then - saved(1) := 1 -else - saved(1) := 0; -save_ptr := save_ptr + 2; -@z - -% [47] \vadjust pre -@x - d:=split_max_depth; f:=floating_penalty; unsave; decr(save_ptr); -@y - d:=split_max_depth; f:=floating_penalty; unsave; save_ptr := save_ptr - 2; -@z - -% [47] \vadjust pre + pTeX -@x - r:=get_node(small_node_size); type(r):=adjust_node;@/ - subtype(r):=0; {the |subtype| is not used} - adjust_ptr(r):=list_ptr(p); delete_glue_ref(q); -@y - r:=get_node(small_node_size); type(r):=adjust_node;@/ - adjust_pre(r) := saved(1); {the |subtype| is used for |adjust_pre|} - adjust_ptr(r):=list_ptr(p); delete_glue_ref(q); -@z - -% [48] \vadjust pre -@x -@!t:pointer; {tail of adjustment list} -@y -@!t:pointer; {tail of adjustment list} -@!pre_t:pointer; {tail of pre-adjustment list} -@z - -% [48] \vadjust pre -@x -adjust_tail:=adjust_head; b:=hpack(p,natural); p:=list_ptr(b); -t:=adjust_tail; adjust_tail:=null;@/ -@y -adjust_tail:=adjust_head; pre_adjust_tail:=pre_adjust_head; -b:=hpack(p,natural); p:=list_ptr(b); -t:=adjust_tail; adjust_tail:=null;@/ -pre_t:=pre_adjust_tail; pre_adjust_tail:=null;@/ -@z - -% [48] \vadjust pre -@x -if t<>adjust_head then {migrating material comes after equation number} - begin link(tail):=link(adjust_head); tail:=t; - end; -@y -if t<>adjust_head then {migrating material comes after equation number} - begin link(tail):=link(adjust_head); tail:=t; - end; -if pre_t<>pre_adjust_head then - begin link(tail):=link(pre_adjust_head); tail:=pre_t; - end; -@z - -@x \[if]pdfprimitive: dump prim table -@= -@y -@= -for p:=0 to prim_size do dump_hh(prim[p]); -@z - -@x \[if]pdfprimitive: undump prim table -@ @= -@y -@ @= -for p:=0 to prim_size do undump_hh(prim[p]); -@z - -@x -fix_date_and_time;@/ -@y -fix_date_and_time;@/ -isprint_utf8:=false; -random_seed:=(microseconds*1000)+(epochseconds mod 1000000);@/ -init_randoms(random_seed);@/ -@z - -@x -@d language_node=4 {|subtype| in whatsits that change the current language} -@y -@d latespecial_node=4 {|subtype| in whatsits that represent \.{\\special} things} -@d language_node=5 {|subtype| in whatsits that change the current language} -@z - -@x -@d immediate_code=4 {command modifier for \.{\\immediate}} -@d set_language_code=5 {command modifier for \.{\\setlanguage}} -@d epTeX_input_encoding_code=6 {command modifier for \.{\\epTeXinputencoding}} -@y -@d immediate_code=5 {command modifier for \.{\\immediate}} -@d set_language_code=6 {command modifier for \.{\\setlanguage}} -@d epTeX_input_encoding_code=7 {command modifier for \.{\\epTeXinputencoding}} -@d pdf_save_pos_node=epTeX_input_encoding_code+1 -@d set_random_seed_code=pdf_save_pos_node+1 -@d reset_timer_code=set_random_seed_code+1 -@z - -@x - set_language_code:print_esc("setlanguage"); -@y - set_language_code:print_esc("setlanguage"); - pdf_save_pos_node: print_esc("pdfsavepos"); - set_random_seed_code: print_esc("pdfsetrandomseed"); - reset_timer_code: print_esc("pdfresettimer"); -@z - -@x -set_language_code:@; -@y -set_language_code:@; -pdf_save_pos_node: @; -set_random_seed_code: @; -reset_timer_code: @; -@z - -@x -@= -begin new_whatsit(special_node,write_node_size); write_stream(tail):=null; -p:=scan_toks(false,true); write_tokens(tail):=def_ref; -inhibit_glue_flag:=false; -end -@y -@= -begin if scan_keyword("shipout") then -begin new_whatsit(latespecial_node,write_node_size); write_stream(tail):=null; -p:=scan_toks(false,false); write_tokens(tail):=def_ref; -end else -begin new_whatsit(special_node,write_node_size); write_stream(tail):=null; -p:=scan_toks(false,true); write_tokens(tail):=def_ref; -end; -inhibit_glue_flag:=false; -end -@z - -@x -special_node:begin print_esc("special"); - print_mark(write_tokens(p)); - end; -@y -special_node:begin print_esc("special"); - print_mark(write_tokens(p)); - end; -latespecial_node:begin print_esc("special"); print(" shipout"); - print_mark(write_tokens(p)); - end; -@z - -@x \pdfsavepos - print_int(what_lhm(p)); print_char(","); - print_int(what_rhm(p)); print_char(")"); - end; -@y - print_int(what_lhm(p)); print_char(","); - print_int(what_rhm(p)); print_char(")"); - end; -pdf_save_pos_node: print_esc("pdfsavepos"); -set_random_seed_code: print_esc("pdfsetrandomseed"); -reset_timer_code: print_esc("pdfresettimer"); -@z - -@x -write_node,special_node: begin r:=get_node(write_node_size); -@y -write_node,special_node,latespecial_node: begin r:=get_node(write_node_size); -@z - -@x \pdfsavepos -close_node,language_node: begin r:=get_node(small_node_size); - words:=small_node_size; - end; -@y -close_node,language_node: begin r:=get_node(small_node_size); - words:=small_node_size; - end; -pdf_save_pos_node: - r := get_node(small_node_size); -@z - -@x -write_node,special_node: begin delete_token_ref(write_tokens(p)); -@y -write_node,special_node,latespecial_node: begin delete_token_ref(write_tokens(p)); -@z - -@x \pdfsavepos -close_node,language_node: free_node(p,small_node_size); -@y -close_node,language_node: free_node(p,small_node_size); -pdf_save_pos_node: free_node(p, small_node_size); -@z - -@x -procedure special_out(@!p:pointer); -var old_setting:0..max_selector; {holds print |selector|} -@!k:pool_pointer; {index into |str_pool|} -begin synch_h; synch_v;@/ -old_setting:=selector; selector:=new_string; -show_token_list(link(write_tokens(p)),null,pool_size-pool_ptr); -@y -procedure special_out(@!p:pointer); -label done; -var old_setting:0..max_selector; {holds print |selector|} -@!h:halfword; -@!k:pool_pointer; {index into |str_pool|} -@!q,@!r:pointer; {temporary variables for list manipulation} -@!old_mode:integer; {saved |mode|} -@!s,@!t,@!cw, @!num, @!denom: scaled; -@!bl: boolean; -@!i: small_number; -begin synch_h; synch_v;@/ -old_setting:=selector; -if subtype(p)=latespecial_node then - begin @; - h:=def_ref; - end -else h:=write_tokens(p); -selector:=new_string; -show_token_list(link(h),null,pool_size-pool_ptr); -@z - -@x -pool_ptr:=str_start[str_ptr]; {erase the string} -@y -if read_papersize_special>0 then - @; -done: pool_ptr:=str_start[str_ptr]; {erase the string} -if subtype(p)=latespecial_node then - flush_list(def_ref); -@z - -@x -special_node:special_out(p); -language_node:do_nothing; -@y -special_node,latespecial_node:special_out(p); -language_node:do_nothing; -pdf_save_pos_node: - @; -@z - -@x -primitive("eTeXrevision",convert,eTeX_revision_code);@/ -@!@:eTeX_revision_}{\.{\\eTeXrevision} primitive@> -@y -primitive("eTeXrevision",convert,eTeX_revision_code);@/ -@!@:eTeX_revision_}{\.{\\eTeXrevision} primitive@> -primitive("pdfprimitive",no_expand,1);@/ -@!@:pdfprimitive_}{\.{\\pdfprimitive} primitive@> -primitive("pdfstrcmp",convert,pdf_strcmp_code);@/ -@!@:pdf_strcmp_}{\.{\\pdfstrcmp} primitive@> -primitive("pdfcreationdate",convert,pdf_creation_date_code);@/ -@!@:pdf_creation_date_}{\.{\\pdfcreationdate} primitive@> -primitive("pdffilemoddate",convert,pdf_file_mod_date_code);@/ -@!@:pdf_file_mod_date_}{\.{\\pdffilemoddate} primitive@> -primitive("pdffilesize",convert,pdf_file_size_code);@/ -@!@:pdf_file_size_}{\.{\\pdffilesize} primitive@> -primitive("pdfmdfivesum",convert,pdf_mdfive_sum_code);@/ -@!@:pdf_mdfive_sum_}{\.{\\pdfmdfivesum} primitive@> -primitive("pdffiledump",convert,pdf_file_dump_code);@/ -@!@:pdf_file_dump_}{\.{\\pdffiledump} primitive@> -primitive("pdfsavepos",extension,pdf_save_pos_node);@/ -@!@:pdf_save_pos_}{\.{\\pdfsavepos} primitive@> -primitive("pdfpagewidth",assign_dimen,dimen_base+pdf_page_width_code);@/ -@!@:pdf_page_width_}{\.{\\pdfpagewidth} primitive@> -primitive("pdfpageheight",assign_dimen,dimen_base+pdf_page_height_code);@/ -@!@:pdf_page_height_}{\.{\\pdfpageheight} primitive@> -primitive("pdflastxpos",last_item,pdf_last_x_pos_code);@/ -@!@:pdf_last_x_pos_}{\.{\\pdflastxpos} primitive@> -primitive("pdflastypos",last_item,pdf_last_y_pos_code);@/ -@!@:pdf_last_y_pos_}{\.{\\pdflastypos} primitive@> -primitive("pdfshellescape",last_item,pdf_shell_escape_code); -@!@:pdf_shell_escape_}{\.{\\pdfshellescape} primitive@> -primitive("ifpdfprimitive",if_test,if_pdfprimitive_code); -@!@:if_pdfprimitive_}{\.{\\ifpdfprimitive} primitive@> -primitive("pdfuniformdeviate",convert,uniform_deviate_code);@/ -@!@:uniform_deviate_}{\.{\\pdfuniformdeviate} primitive@> -primitive("pdfnormaldeviate",convert,normal_deviate_code);@/ -@!@:normal_deviate_}{\.{\\pdfnormaldeviate} primitive@> -primitive("pdfrandomseed",last_item,random_seed_code); -@!@:random_seed_}{\.{\\pdfrandomseed} primitive@> -primitive("pdfsetrandomseed",extension,set_random_seed_code);@/ -@!@:set_random_seed_code}{\.{\\pdfsetrandomseed} primitive@> -primitive("pdfelapsedtime",last_item,elapsed_time_code); -@!@:elapsed_time_}{\.{\\pdfelapsedtime} primitive@> -primitive("pdfresettimer",extension,reset_timer_code);@/ -@!@:reset_timer_}{\.{\\pdfresettimer} primitive@> -primitive("Uchar",convert,Uchar_convert_code);@/ -@!@:Uchar_}{\.{\\Uchar} primitive@> -primitive("Ucharcat",convert,Ucharcat_convert_code);@/ -@!@:Ucharcat_}{\.{\\Ucharcat} primitive@> -@z - -@x -eTeX_version_code: print_esc("eTeXversion"); -@y -eTeX_version_code: print_esc("eTeXversion"); -pdf_last_x_pos_code: print_esc("pdflastxpos"); -pdf_last_y_pos_code: print_esc("pdflastypos"); -elapsed_time_code: print_esc("pdfelapsedtime"); -pdf_shell_escape_code: print_esc("pdfshellescape"); -random_seed_code: print_esc("pdfrandomseed"); -@z - -@x -eTeX_version_code: cur_val:=eTeX_version; -@y -eTeX_version_code: cur_val:=eTeX_version; -pdf_last_x_pos_code: cur_val := pdf_last_x_pos; -pdf_last_y_pos_code: cur_val := pdf_last_y_pos; -pdf_shell_escape_code: - begin - if shellenabledp then begin - if restrictedshell then cur_val :=2 - else cur_val := 1; - end - else cur_val := 0; - end; -elapsed_time_code: cur_val := get_microinterval; -random_seed_code: cur_val := random_seed; -@z - -@x -primitive("iffontchar",if_test,if_font_char_code); -@!@:if_font_char_}{\.{\\iffontchar} primitive@> -@y -primitive("iffontchar",if_test,if_font_char_code); -@!@:if_font_char_}{\.{\\iffontchar} primitive@> -primitive("ifincsname",if_test,if_in_csname_code); -@!@:if_in_csname_}{\.{\\ifincsname} primitive@> -@z - -@x -if_font_char_code:print_esc("iffontchar"); -@y -if_font_char_code:print_esc("iffontchar"); -if_in_csname_code:print_esc("ifincsname"); -@z - -@x -if_cs_code:begin n:=get_avail; p:=n; {head of the list of characters} - repeat get_x_token; -@y -if_cs_code:begin n:=get_avail; p:=n; {head of the list of characters} - e := is_in_csname; is_in_csname := true; - repeat get_x_token; -@z - -@x - b:=(eq_type(cur_cs)<>undefined_cs); -@y - b:=(eq_type(cur_cs)<>undefined_cs); - is_in_csname := e; -@z - -@x -if_font_char_code:begin scan_font_ident; n:=cur_val; -@y -if_in_csname_code: b := is_in_csname; -if_font_char_code:begin scan_font_ident; n:=cur_val; -@z - -@x -procedure print_kanji(@!s:KANJI_code); {prints a single character} -begin -if s>@"FF then - begin print_char(@"100+Hi(s)); print_char(@"100+Lo(s)); - end else print_char(s); -end; -@y -procedure print_kanji(@!s:integer); {prints a single character} -begin -if s>@"FF then begin - if isprint_utf8 then begin - s:=UCStoUTF8(toUCS(s)); - if BYTE1(s)<>0 then print_char(@"100+BYTE1(s)); - if BYTE2(s)<>0 then print_char(@"100+BYTE2(s)); - if BYTE3(s)<>0 then print_char(@"100+BYTE3(s)); - print_char(@"100+BYTE4(s)); - end - else begin print_char(@"100+Hi(s)); print_char(@"100+Lo(s)); end; -end -else print_char(s); -end; - - -@z - -@x -@* \[54] System-dependent changes. -@y -@* \[54/pdf\TeX] System-dependent changes for {\tt\char"5Cpdfstrcmp}. -@d call_func(#) == begin if # <> 0 then do_nothing end -@d flushable(#) == (# = str_ptr - 1) - -@= -@!isprint_utf8: boolean; -@!epochseconds: integer; -@!microseconds: integer; - -@ -@d max_integer == @"7FFFFFFF {$2^{31}-1$} - -@= -procedure pdf_error(t, p: str_number); -begin - normalize_selector; - print_err("pdfTeX error"); - if t <> 0 then begin - print(" ("); - print(t); - print(")"); - end; - print(": "); print(p); - succumb; -end; - -function get_microinterval:integer; -var s,@!m:integer; {seconds and microseconds} -begin - seconds_and_micros(s,m); - if (s-epochseconds)>32767 then - get_microinterval := max_integer - else if (microseconds>m) then - get_microinterval := ((s-1-epochseconds)*65536)+ (((m+1000000-microseconds)/100)*65536)/10000 - else - get_microinterval := ((s-epochseconds)*65536) + (((m-microseconds)/100)*65536)/10000; -end; - -@ @= - -procedure compare_strings; {to implement \.{\\pdfstrcmp}} -label done; -var s1, s2: str_number; - i1, i2, j1, j2: pool_pointer; - c1, c2: integer; - save_cur_cs: pointer; -begin - save_cur_cs:=cur_cs; call_func(scan_toks(false, true)); - isprint_utf8:=true; s1 := tokens_to_string(def_ref); isprint_utf8:=false; - delete_token_ref(def_ref); - cur_cs:=save_cur_cs; call_func(scan_toks(false, true)); - isprint_utf8:=true; s2 := tokens_to_string(def_ref); isprint_utf8:=false; - delete_token_ref(def_ref); - i1 := str_start[s1]; - j1 := str_start[s1 + 1]; - i2 := str_start[s2]; - j2 := str_start[s2 + 1]; - while (i1 < j1) and (i2 < j2) do begin - if str_pool[i1]>=@"100 then c1:=str_pool[i1]-@"100 else c1:=str_pool[i1]; - if str_pool[i2]>=@"100 then c2:=str_pool[i2]-@"100 else c2:=str_pool[i2]; - if c1c2 then begin cur_val := 1; goto done; end; - incr(i1); - incr(i2); - end; - if (i1 = j1) and (i2 = j2) then - cur_val := 0 - else if i1 < j1 then - cur_val := 1 - else - cur_val := -1; -done: - flush_str(s2); - flush_str(s1); - cur_val_level := int_val; -end; - -@ Next, we implement \.{\\pdfsavepos} and related primitives. - -@= -@!cur_page_width: scaled; {"physical" width of page being shipped} -@!cur_page_height: scaled; {"physical" height of page being shipped} -@!pdf_last_x_pos: integer; -@!pdf_last_y_pos: integer; - -@ @= -begin - new_whatsit(pdf_save_pos_node, small_node_size); - inhibit_glue_flag:=false; -end - -@ @= -begin - case dvi_dir of - dir_yoko: begin pdf_last_x_pos := cur_h; pdf_last_y_pos := cur_v; end; - dir_tate: begin pdf_last_x_pos := -cur_v; pdf_last_y_pos := cur_h; end; - dir_dtou: begin pdf_last_x_pos := cur_v; pdf_last_y_pos := -cur_h; end; - endcases; - pdf_last_x_pos := pdf_last_x_pos + 4736286; - pdf_last_y_pos := cur_page_height - pdf_last_y_pos - 4736286; - {4736286 = 1in, the funny DVI origin offset} -end - -@ @= - if pdf_page_height <> 0 then - cur_page_height := pdf_page_height - else if (box_dir(p)=dir_tate)or(box_dir(p)=dir_dtou) then - cur_page_height := width(p) + 2*v_offset + 2*4736286 - else - cur_page_height := height(p) + depth(p) + 2*v_offset + 2*4736286; - {4736286 = 1in, the funny DVI origin offset} - if pdf_page_width <> 0 then - cur_page_width := pdf_page_width - else if (box_dir(p)=dir_tate)or(box_dir(p)=dir_dtou) then - cur_page_width := height(p) + depth(p) + 2*h_offset + 2*4736286 - else - cur_page_width := width(p) + 2*h_offset + 2*4736286 - {4736286 = 1in, the funny DVI origin offset} - - -@ Of course \epTeX\ can produce a \.{DVI} file only, not a PDF file. -A \.{DVI} file does not have the information of the page height, -which is needed to implement \.{\\pdflastypos} correctly. -To keep the information of the page height, I (H.~Kitagawa) -adopted \.{\\pdfpageheight} primitive from pdf\TeX. - -In \pTeX (and \hbox{\epTeX}), the papersize special -\.{\\special\{papersize=\,\\}} is commonly used -for specifying page width/height. -If \.{\\readpapersizespecial} is greater than~0, the papersize special also -changes the value of \.{\\pdfpagewidth} and \.{\\pdfpageheight}. -This process is done in the following routine. - -{\def\<#1>{\langle\hbox{#1\/}\rangle} -In present implementation, the papersize special $\$, -which can be interpreted by this routine, is defined as follows. -$$\eqalign{% - \ &\longrightarrow \.{papersize=}\\.{,}\\cr - \ &\longrightarrow \ - \\\cr - \ &\longrightarrow \.{.} \mid \\ \mid - \\\cr -}$$} -Note that any space, ``\.{,}'' as a decimal separator, minus~symbol -are neither permitted. - -@d ifps(#)==@+if k+(#)>pool_ptr then goto done @+ else @+ if -@d sop(#)==so(str_pool[#]) -@f ifps==if - -@= -begin k:=str_start[str_ptr];@/ -ifps(10) @, - (sop(k+0)<>'p')or(sop(k+1)<>'a')or(sop(k+2)<>'p')or - (sop(k+3)<>'e')@|or(sop(k+4)<>'r')or(sop(k+5)<>'s')or - (sop(k+6)<>'i')or(sop(k+7)<>'z')@|or(sop(k+8)<>'e')or - (sop(k+9)<>'=') then goto done; -k:=k+10; -@; -ifps(1) @, sop(k)=',' then begin - incr(k); cw:=s; - @; - if pool_ptr>k then goto done; - geq_word_define(dimen_base+pdf_page_width_code,cw); - geq_word_define(dimen_base+pdf_page_height_code,s);@| - cur_page_height := s; cur_page_width := cw; -end; -end; - -@ - -@d if_ps_unit(#)==if bl then @+ begin @+ ifps(2) sop(k)=(#) @, if_ps_unit_two -@d if_ps_unit_two(#)==and (sop(k+1)=(#)) then begin bl:=false; k:=k+2; if_ps_unit_end -@d if_ps_unit_end(#)==# @+ end @+ end; - -@d do_ps_conversion(#)==num:=#; do_ps_conversion_end -@d do_ps_conversion_end(#)== - s:=xn_over_d(s,num,#); s:=s*unity+((num*t+@'200000*remainder) div #) - -@= -s:=0; t:=0; bl:=true; -while (k='0')and (sop(k)<='9') then begin s:=10*s+sop(k)-'0'; incr(k); @+end - else bl:=false; -ifps(1) sop(k)='.' then - begin incr(k); bl:=true; i:=0; dig[0]:=0; - while (k='0')and (sop(k)<='9') then - begin if i<17 then begin dig[i]:=sop(k)-'0'; incr(i); @+end; - incr(k); end - else bl:=false; - end; - t:=round_decimals(i); - end; -if k+4>pool_ptr then - if (sop(k)='t')and(sop(k+1)='r')and(sop(k+2)='u')and(sop(k+3)='e') then - k:=k+4; -if mag<>1000 then - begin s:=xn_over_d(s,1000,mag); - t:=(1000*t+@'200000*remainder) div mag; - s:=s+(t div @'200000); t:=t mod @'200000; -end; -bl:=true;@/ -if_ps_unit('p')('t')(s:=s*unity+t)@/ -if_ps_unit('i')('n')(do_ps_conversion(7227)(100))@/ -if_ps_unit('p')('c')(do_ps_conversion(12)(1))@/ -if_ps_unit('c')('m')(do_ps_conversion(7227)(254))@/ -if_ps_unit('m')('m')(do_ps_conversion(7227)(2540))@/ -if_ps_unit('b')('p')(do_ps_conversion(7227)(7200))@/ -if_ps_unit('d')('d')(do_ps_conversion(1238)(1157))@/ -if_ps_unit('c')('c')(do_ps_conversion(14856)(1157))@/ -if_ps_unit('s')('p')(do_nothing) - -@ Finally, we declare some routine needed for \.{\\pdffilemoddate}. - -@= -@!isprint_utf8: boolean; -@!last_tokens_string: str_number; {the number of the most recently string -created by |tokens_to_string|} - -@ @= -procedure scan_pdf_ext_toks; -begin - call_func(scan_toks(false, true)); {like \.{\\special}} -end; - -@ @= -function tokens_to_string(p: pointer): str_number; {return a string from tokens -list} -begin - if selector = new_string then - pdf_error("tokens", "tokens_to_string() called while selector = new_string"); - old_setting:=selector; selector:=new_string; - show_token_list(link(p),null,pool_size-pool_ptr); - selector:=old_setting; - last_tokens_string := make_string; - tokens_to_string := last_tokens_string; -end; -procedure flush_str(s: str_number); {flush a string if possible} -begin - if flushable(s) then - flush_string; -end; - -@ @= - seconds_and_micros(epochseconds,microseconds); - init_start_time; - -@ Negative random seed values are silently converted to positive ones - -@= -begin - scan_int; - if cur_val<0 then negate(cur_val); - random_seed := cur_val; - init_randoms(random_seed); -end - -@ @= -begin - seconds_and_micros(epochseconds,microseconds); -end - -@* \[54] System-dependent changes. -@z diff --git a/source/texk/web2c/eptexdir/suppresserrors.ch b/source/texk/web2c/eptexdir/suppresserrors.ch deleted file mode 100644 index 07049dd35..000000000 --- a/source/texk/web2c/eptexdir/suppresserrors.ch +++ /dev/null @@ -1,138 +0,0 @@ -%% suppresserrors.ch: support ``suppressing errors'' primitives in LuaTeX -%% -%% \suppresslongerror done -%% \suppressoutererror done -%% \suppressmathparerror done -%% The followings are not implemented to e-(u)pTeX: -%% % \suppressifcsnameerror -%% % \suppressfontnotfounderror -> we have an error from mktextfm etc. anyway -%% % \suppressprimitiveerror -> e-(u)pTeX does not produce errors in \pdfprimitive - -@x -@d eTeX_state_code=etex_int_base+10 {\eTeX\ state variables} -@y -@d suppress_long_error_code=etex_int_base+10 -@d suppress_outer_error_code=etex_int_base+11 -@d suppress_mathpar_error_code=etex_int_base+12 -@d eTeX_state_code=etex_int_base+13 {\eTeX\ state variables} -@z - -@x -@d read_papersize_special==int_par(read_papersize_special_code) -@y -@d read_papersize_special==int_par(read_papersize_special_code) -@d suppress_long_error==int_par(suppress_long_error_code) -@d suppress_outer_error==int_par(suppress_outer_error_code) -@d suppress_mathpar_error==int_par(suppress_mathpar_error_code) -@z - -@x {Perhaps this change hunk is not needed} -@p procedure check_outer_validity; -var p:pointer; {points to inserted token list} -@!q:pointer; {auxiliary pointer} -begin if scanner_status<>normal then -@y -@p procedure check_outer_validity; -var p:pointer; {points to inserted token list} -@!q:pointer; {auxiliary pointer} -begin if suppress_outer_error=0 then if scanner_status<>normal then -@z - -@x @ -if cur_cmd>=outer_call then check_outer_validity; -@y -if (suppress_outer_error=0)and(cur_cmd>=outer_call) then check_outer_validity; -@z - -@x @ -if cur_cmd>=outer_call then check_outer_validity; -@y -if (suppress_outer_error=0)and(cur_cmd>=outer_call) then check_outer_validity; -@z - -@x @ -if cur_cmd>=outer_call then check_outer_validity; -@y -if (suppress_outer_error=0)and(cur_cmd>=outer_call) then check_outer_validity; -@z - -@x @ - if cur_cmd=dont_expand then - @ - else check_outer_validity; -@y - if cur_cmd=dont_expand then - @ - else if suppress_outer_error=0 then check_outer_validity; -@z - -@x @ - end_file_reading; {resume previous level} - check_outer_validity; goto restart; -@y - end_file_reading; {resume previous level} - if suppress_outer_error=0 then check_outer_validity; goto restart; -@z - -@x -if cur_tok=par_token then if long_state<>long_call then - @; -@y -if cur_tok=par_token then if long_state<>long_call then - if suppress_long_error=0 then @; -@z - -@x - if cur_tok=par_token then if long_state<>long_call then - @; -@y - if cur_tok=par_token then if long_state<>long_call then - if suppress_long_error=0 then @; -@z - -@x -@: insert_dollar_sign; -@y -@: insert_dollar_sign; -mmode+par_end: if suppress_mathpar_error=0 then insert_dollar_sign; -@z - -@x -mmode+endv, mmode+par_end, mmode+stop, mmode+vskip, mmode+un_vbox, -mmode+valign, mmode+hrule -@y -mmode+endv, mmode+stop, mmode+vskip, mmode+un_vbox, -mmode+valign, mmode+hrule -@z - -@x after_math -@= -begin get_x_token; -@y -@= -begin repeat get_x_token; -until (suppress_mathpar_error=0)or(cur_cmd<>par_end); -@z - -@x -primitive("readpapersizespecial",assign_int,int_base+read_papersize_special_code);@/ -@!@:read_papersize_special_}{\.{\\readpapersizespecial} primitive@> -@y -primitive("readpapersizespecial",assign_int,int_base+read_papersize_special_code);@/ -@!@:read_papersize_special_}{\.{\\readpapersizespecial} primitive@> -primitive("suppresslongerror",assign_int,int_base+suppress_long_error_code);@/ -@!@:suppress_long_error_}{\.{\\suppresslongerror} primitive@> -primitive("suppressoutererror",assign_int,int_base+suppress_outer_error_code);@/ -@!@:suppress_outer_error_}{\.{\\suppressoutererror} primitive@> -primitive("suppressmathparerror",assign_int,int_base+suppress_mathpar_error_code);@/ -@!@:suppress_mathpar_error_}{\.{\\suppressmathparerror} primitive@> -@z - -@x -read_papersize_special_code:print_esc("readpapersizespecial"); -@y -read_papersize_special_code:print_esc("readpapersizespecial"); -suppress_long_error_code: print_esc("suppresslongerror"); -suppress_outer_error_code: print_esc("suppressoutererror"); -suppress_mathpar_error_code: print_esc("suppressmathparerror"); -@z diff --git a/source/texk/web2c/eptexdir/tests/pdfprimitive-eptex.log b/source/texk/web2c/eptexdir/tests/pdfprimitive-eptex.log deleted file mode 100644 index 81688a1f8..000000000 --- a/source/texk/web2c/eptexdir/tests/pdfprimitive-eptex.log +++ /dev/null @@ -1,57 +0,0 @@ -entering extended mode - restricted \write18 enabled. - %&-line parsing enabled. -**pdfprimitive-eptex -(./pdfprimitive-eptex.tex -RELAX macro:->\message {RELAX} FUGA F T F F F -> \pdfstrcmp=\pdfstrcmp. -l.28 \show\pdfstrcmp - % ==> \pdfstrcmp - -T T -! Undefined control sequence. -l.35 \setbox0=\vbox{\pdfprimitive\ \undefined - } -The control sequence at the end of the top line -of your error message was never \def'ed. If you have -misspelled it (e.g., `\hobx'), type `I' and the correct -spelling (e.g., `I\hbox'). Otherwise just continue, -and I'll forget about whatever was undefined. - -! Undefined control sequence. -l.37 \setbox0=\vbox{\pdfprimitive\vrule\undefined - } -The control sequence at the end of the top line -of your error message was never \def'ed. If you have -misspelled it (e.g., `\hobx'), type `I' and the correct -spelling (e.g., `I\hbox'). Otherwise just continue, -and I'll forget about whatever was undefined. - - -Overfull \hbox (0.4pt too wide) in paragraph at lines 37--37 -[]| - -\hbox(0.0+0.0)x0.0 [] - -<1> -! Missing number, treated as zero. - - \- -l.43 \count42=\pdfprimitive\- - 2\A -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) - -<0> -! Missing number, treated as zero. - - \vrule -l.44 \count42=\pdfprimitive\vrule - 3\A -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) - -<0> ) -No pages of output. diff --git a/source/texk/web2c/eptexdir/tests/pdfprimitive-test.tex b/source/texk/web2c/eptexdir/tests/pdfprimitive-test.tex deleted file mode 100644 index 2f7211d26..000000000 --- a/source/texk/web2c/eptexdir/tests/pdfprimitive-test.tex +++ /dev/null @@ -1,47 +0,0 @@ -%#!euptex pdfprimitive-test.tex -\catcode`\{=1\catcode`\}=2 -\scrollmode -\catcode`\Q=14 -\ifdefined\pdfprimitive\else\catcode`\Q=11 \fi - -Q\let\pdfprimitive\primitive\let\ifpdfprimitive\ifprimitive -\catcode`\Q=11 - -\def\relax{\message{RELAX}} -\def\fuga{\message{FUGA}} -\let\input=\halign - -\relax % ==> RELAX -\pdfprimitive\relax % ==> (no output) -\message{\meaning\relax} % ==> macro:->\message {RELAX} - -\fuga % ==> FUGA -\pdfprimitive\fuga % ==> ``! Missing primitive name.'' error - -\ifpdfprimitive\relax\message{T}\else\message{F}\fi % ==> F (macro) -\ifpdfprimitive\par\message{T}\else\message{F}\fi % ==> T -\ifpdfprimitive\input\message{T}\else\message{F}\fi % ==> F - % (This \input is not ``primitive \input''.) -\ifpdfprimitive\hoge\message{T}\else\message{F}\fi % ==> F (undefined) -\ifpdfprimitive\fuga\message{T}\else\message{F}\fi % ==> F (macro) - -\show\pdfstrcmp % ==> \pdfstrcmp - -% fix for overwriting entries (170924) -\ifpdfprimitive\ \message{T}\else\message{F}\fi % ==> T -\ifpdfprimitive\vrule\message{T}\else\message{F}\fi % ==> T - -% fix for back_input in vertical mode (170924) -\setbox0=\vbox{\pdfprimitive\ \undefined} -% ==> ``! Undefined control sequence.'' error -\setbox0=\vbox{\pdfprimitive\vrule\undefined} -% ==> ``! Undefined control sequence.'' error - -\setbox0=\hbox{% - \def\A{\message{<\the\count42>}\ignorespaces} - \count42=\pdfprimitive\X 1\A - \count42=\pdfprimitive\- 2\A - \count42=\pdfprimitive\vrule 3\A -} - -\end diff --git a/source/texk/web2c/eptexdir/wcfname.test b/source/texk/web2c/eptexdir/wcfname.test deleted file mode 100755 index 628ec54cd..000000000 --- a/source/texk/web2c/eptexdir/wcfname.test +++ /dev/null @@ -1,131 +0,0 @@ -#! /bin/sh -vx -# -# Copyright 2022-2023 Japanese TeX Development Community -# You may freely use, modify and/or distribute this file. - -engine=eptex -testdir=eptests - -KpsDir=${KpsDir:-../kpathsea} -BinDir=${BinDir:-.} -ExeExt=${ExeExt:-} -_kpsewhich=$KpsDir/kpsewhich$ExeExt -_tex=$BinDir/$engine$ExeExt - -test -d $testdir || mkdir -p $testdir -rm -f $testdir/fn*.log $testdir/fn*.txt $testdir/fn*-tmp*.tex - -rc=0; err1=; err2=; err3=; err4= - -TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF -TEXINPUTS="$testdir;."; export TEXINPUTS - -$_kpsewhich -var-value=TEXMFCNF -$_kpsewhich -progname=$engine -var-value=TEXINPUTS -$_kpsewhich -progname=$engine -var-value=command_line_encoding -$_kpsewhich -progname=$engine -var-value=guess_input_kanji_encoding - -for loc in C.UTF-8 C.utf8 en_US.UTF-8 en_US.utf8 ja_JP.UTF-8 ja_JP.utf8; do - locale -a | grep "^$loc\$" - ret=$? - # For Slackware linux, we need to replace from utf8 to UTF-8 - if [ -f /etc/slackware-version ]; then - loc=`echo $loc | sed -e "s/utf8/UTF-8/"` - fi - if [ $ret = 0 ]; then - LC_ALL=$loc; LANGUAGE=$loc; export LC_ALL LANGUAGE - break - fi -done -if [ $ret != 0 ]; then - # linux musl fails to run `locale -a` but seems to have C.UTF-8 - loc=C.UTF-8 - LC_ALL=$loc; LANGUAGE=$loc; export LC_ALL LANGUAGE -fi - -if [ "$COMSPEC" != "" ] || [ "$ExeExt" = ".exe" ]; then - echo "*** We guess OS is Windows." - MyOS=Windows - try_ienc="sjis" -else - echo "*** We guess OS is not Windows." - MyOS=nonWindows - try_ienc="euc sjis" -fi -if [ "$ExeExt" = ".exe" ]; then - opt_win=-windows -else - opt_win= -fi - -perl -s $srcdir/tests/fn-generate.perl $opt_win -randgen=pdfuniformdeviate $testdir -pret=$? -if [ $pret != 0 ] && [ $pret != 239 ]; then - exit 77 -fi - -# pTeX internal encoding -fenc="utf8" -for ienc in $try_ienc; do -for doc in fn-$fenc fnã•ã–æ³¢-$fenc; do - - echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc - job=$doc-$ienc-ep - $_kpsewhich -progname=$engine $doc.tex || rc=10 - $_kpsewhich -progname=$engine fn±×÷§¶-utf8.tex || rc=11 - rm -f $testdir/$doc-tmp.tex $testdir/$doc-$ienc.txt $testdir/$doc-$ienc.log - $_tex -ini -interaction nonstopmode -jobname=$job -kanji=$fenc --kanji-internal=$ienc --shell-escape -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \ - { rc=1 ; err1=$err1" $fenc:$ienc:$doc" ; } - $_kpsewhich -progname=$engine $doc-tmp.tex || rc=12 - mv $job.txt $job.log $testdir/ || rc=14 - mv $job.fls $testdir/ || : echo "FIXME" # check *.fls - diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ - { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; } - rm -f $testdir/fn±×÷§¶-utf8-tmp.tex - -done -done - -if [ $pret = 239 ]; then - echo "*** skip tests for Shift_JIS & EUC-JP." - exit 0 -fi - - -# pTeX, regacy encoding -for fenc in sjis euc; do -for doc in fnã•ã–æ³¢-$fenc; do - - ienc=$fenc - if [ $MyOS = Windows ]; then - ienc="sjis" - else - if [ $fenc != sjis ]; then ienc="euc"; fi - fi - - echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc - job=$doc-$ienc-ep - $_kpsewhich -progname=$engine $doc.tex || rc=20 - $_kpsewhich -progname=$engine fn±×÷§¶-utf8.tex || rc=21 - rm -f $testdir/$doc-tmp.tex $testdir/$job.txt $testdir/$job.log - $_tex -ini -interaction nonstopmode -jobname=$job -kanji=$fenc --kanji-internal=$ienc --shell-escape -etex --recorder $doc.tex >$testdir/$doc-$fenc-$ienc-term.log || \ - { rc=3 ; err3=$err3" $fenc:$ienc:$doc" ; } - $_kpsewhich -progname=$engine $doc-tmp.tex || rc=22 - mv $job.txt $job.log $testdir/ || rc=24 - mv $job.fls $testdir/ || : echo "FIXME" # check *.fls - diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \ - { rc=4 ; err4=$err4" $fenc:$ienc:$doc" ; } - -done -done - - -if [ $rc -gt 0 ]; then - if [ -n "$err1" ]; then echo ERROR1 $err1; fi - if [ -n "$err2" ]; then echo ERROR2 $err2; fi - if [ -n "$err3" ]; then echo ERROR3 $err3; fi - if [ -n "$err4" ]; then echo ERROR4 $err4; fi -else - echo PASS -fi -exit $rc diff --git a/source/texk/web2c/etexdir/ChangeLog b/source/texk/web2c/etexdir/ChangeLog index d142e6c67..16713e069 100644 --- a/source/texk/web2c/etexdir/ChangeLog +++ b/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,8 @@ +2024-04-14 TANAKA Takuji + + * etriptest.test: + Filter Web2C year/dev in banner. + 2024-03-10 Karl Berry * TL'24 release. diff --git a/source/texk/web2c/etexdir/etriptest.test b/source/texk/web2c/etexdir/etriptest.test index 5b8807003..34e7ed02a 100755 --- a/source/texk/web2c/etexdir/etriptest.test +++ b/source/texk/web2c/etexdir/etriptest.test @@ -29,7 +29,7 @@ cat >filter <<-\_EOF s,^(trip\.tex ##,**(./trip.tex ##, s,^## (\./trip\.tex,**(./trip.tex ##, s/ (TeX Live 20[^)]*)// - s/ (Web2C 202[3-9])// + s/ (Web2C 202[3-9][^)]*)// s/(preloaded format=.*tex)/(INITEX)/ s/format=trip [^)][^)]*)/format=trip)/ s/) [0-9A-Z: ]*$/)/ diff --git a/source/texk/web2c/euptexdir/ChangeLog b/source/texk/web2c/euptexdir/ChangeLog index 181edf616..4d074d004 100644 --- a/source/texk/web2c/euptexdir/ChangeLog +++ b/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,19 @@ +2024-04-14 TANAKA Takuji + + * epTeX_doc/{{README,Changes}.txt,ChangeLog,eptex-base.ch}, + tests/{{fontchar,pdforigin}.{sh,tex},{lastnodefont, + lastnodesubtype_math,pdfpagewidth,pdfsavepos, + printkanji-eptex,suppress_errors,uchar,zero_search}.tex}, + euptrip/eptrip.{tex,log}, unbalanced-braces-eptex.ch: + Move from ../eptexdir/*. + * am/euptex.am, euptexextra.h, e{,u}ptriptest.test, + pdfprimitive.test: Remove eptex and eptexdir. + We already use alias of e-upTeX (euptex) + and will never build e-pTeX binary (eptex). + https://github.com/texjporg/tex-jp-build/issues/32 + * e{,u}ptriptest.test: + Filter Web2C year/dev in banner. + 2024-03-10 Karl Berry * TL'24 release. diff --git a/source/texk/web2c/euptexdir/am/euptex.am b/source/texk/web2c/euptexdir/am/euptex.am index a4d83023a..9c4ced1d3 100644 --- a/source/texk/web2c/euptexdir/am/euptex.am +++ b/source/texk/web2c/euptexdir/am/euptex.am @@ -12,12 +12,10 @@ bin_PROGRAMS += euptex if !UPTEX bin_links += euptex$(EXEEXT):uptex endif !UPTEX -if !EPTEX bin_links += euptex$(EXEEXT):eptex if !PTEX bin_links += euptex$(EXEEXT):ptex endif !PTEX -endif !EPTEX endif EUPTEX EXTRA_PROGRAMS += euptex @@ -83,7 +81,7 @@ euptex_ch_srcs = \ euptexdir/pdfutils.ch \ euptexdir/pdfstrcmp-eup-post.ch \ euptexdir/suppresserrors.ch \ - eptexdir/unbalanced-braces-eptex.ch \ + euptexdir/unbalanced-braces-eptex.ch \ euptexdir/char-warning-eptex.ch \ tex-binpool.ch diff --git a/source/texk/web2c/eptexdir/ChangeLog b/source/texk/web2c/euptexdir/epTeX_doc/ChangeLog similarity index 100% rename from source/texk/web2c/eptexdir/ChangeLog rename to source/texk/web2c/euptexdir/epTeX_doc/ChangeLog diff --git a/source/texk/web2c/eptexdir/Changes.txt b/source/texk/web2c/euptexdir/epTeX_doc/Changes.txt similarity index 100% rename from source/texk/web2c/eptexdir/Changes.txt rename to source/texk/web2c/euptexdir/epTeX_doc/Changes.txt diff --git a/source/texk/web2c/eptexdir/README.txt b/source/texk/web2c/euptexdir/epTeX_doc/README.txt similarity index 100% rename from source/texk/web2c/eptexdir/README.txt rename to source/texk/web2c/euptexdir/epTeX_doc/README.txt diff --git a/source/texk/web2c/eptexdir/eptex-base.ch b/source/texk/web2c/euptexdir/epTeX_doc/eptex-base.ch similarity index 100% rename from source/texk/web2c/eptexdir/eptex-base.ch rename to source/texk/web2c/euptexdir/epTeX_doc/eptex-base.ch diff --git a/source/texk/web2c/euptexdir/eptriptest.test b/source/texk/web2c/euptexdir/eptriptest.test index a3416f092..3dc387cf9 100755 --- a/source/texk/web2c/euptexdir/eptriptest.test +++ b/source/texk/web2c/euptexdir/eptriptest.test @@ -17,9 +17,9 @@ LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE testdir=$abs_srcdir/triptrap etestdir=$abs_srcdir/etexdir/etrip -eptestdir=$abs_srcdir/eptexdir/eptrip +euptestdir=$abs_srcdir/euptexdir/euptrip -TEXMFCNF=$eptestdir; export TEXMFCNF +TEXMFCNF=$euptestdir; export TEXMFCNF rm -rf eupptripdir mkdir eupptripdir @@ -33,7 +33,7 @@ cat >filter <<-\_EOF s,^(trip\.tex ##,**(./trip.tex ##, s,^## (\./trip\.tex,**(./trip.tex ##, s/ (TeX Live 20[^)]*)// - s/ (Web2C 202[3-9])// + s/ (Web2C 202[3-9][^)]*)// s/(preloaded format=.*tex)/(INITEX)/ s/format=trip [^)][^)]*)/format=trip)/ s/) [0-9A-Z: ]*$/)/ @@ -80,7 +80,7 @@ cat >filter1 <<-\_EOF dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" echo ">>> Running e-TRIP test for e-upTeX-euc." >&2 -echo ">>> See $eptestdir/eptrip.diffs for example of acceptable diffs." >&2 +echo ">>> See $euptestdir/eptrip.diffs for example of acceptable diffs." >&2 # pTeX outputs direction of boxes. P_SED1='s/, yoko direction//;s/yoko direction, //' @@ -182,7 +182,7 @@ $_tftopl ./etrip.tfm etrip.pl || exit 1 diff $etestdir/etrip.pl etrip.pl || is_OK=false # get same filename in log -$LN_S $eptestdir/eptrip.tex etrip.tex +$LN_S $euptestdir/eptrip.tex etrip.tex $_euptex --kanji-internal=euc --progname=epinitex --ini <$etestdir/etrip2.in >eptripin.fot if test ! -s etrip.fmt; then @@ -199,7 +199,7 @@ sed "$P_SED1;$P_SED2" etrip.log > eptrip.log # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $eptestdir/eptrip.log eptrip.log +$DIFF $DIFFFLAGS $euptestdir/eptrip.log eptrip.log mv etrip.out eptrip.out diff $etestdir/etrip.out eptrip.out diff --git a/source/texk/web2c/euptexdir/euptexextra.h b/source/texk/web2c/euptexdir/euptexextra.h index b448b3d82..99a42d28a 100644 --- a/source/texk/web2c/euptexdir/euptexextra.h +++ b/source/texk/web2c/euptexdir/euptexextra.h @@ -3,7 +3,7 @@ This is included by e-upTeX, from euptexextra.c */ -#include /* for EPTEX_VERSION */ +#include /* for EPTEX_VERSION */ #include /* for ETEX_VERSION */ #include /* for PTEX_VERSION */ #include /* for UPTEX_VERSION */ diff --git a/source/texk/web2c/eptexdir/eptrip/eptrip.log b/source/texk/web2c/euptexdir/euptrip/eptrip.log similarity index 100% rename from source/texk/web2c/eptexdir/eptrip/eptrip.log rename to source/texk/web2c/euptexdir/euptrip/eptrip.log diff --git a/source/texk/web2c/eptexdir/eptrip/eptrip.tex b/source/texk/web2c/euptexdir/euptrip/eptrip.tex similarity index 100% rename from source/texk/web2c/eptexdir/eptrip/eptrip.tex rename to source/texk/web2c/euptexdir/euptrip/eptrip.tex diff --git a/source/texk/web2c/euptexdir/euptriptest.test b/source/texk/web2c/euptexdir/euptriptest.test index d6a1239de..279b801aa 100755 --- a/source/texk/web2c/euptexdir/euptriptest.test +++ b/source/texk/web2c/euptexdir/euptriptest.test @@ -17,7 +17,6 @@ LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE testdir=$abs_srcdir/triptrap etestdir=$abs_srcdir/etexdir/etrip -eptestdir=$abs_srcdir/eptexdir/eptrip euptestdir=$abs_srcdir/euptexdir/euptrip TEXMFCNF=$euptestdir; export TEXMFCNF @@ -34,7 +33,7 @@ cat >filter <<-\_EOF s,^(trip\.tex ##,**(./trip.tex ##, s,^## (\./trip\.tex,**(./trip.tex ##, s/ (TeX Live 20[^)]*)// - s/ (Web2C 202[3-9])// + s/ (Web2C 202[3-9][^)]*)// s/(preloaded format=.*tex)/(INITEX)/ s/format=trip [^)][^)]*)/format=trip)/ s/) [0-9A-Z: ]*$/)/ @@ -183,7 +182,7 @@ $_tftopl ./etrip.tfm etrip.pl || exit 1 diff $etestdir/etrip.pl etrip.pl || is_OK=false # get same filename in log -$LN_S $eptestdir/eptrip.tex etrip.tex +$LN_S $euptestdir/eptrip.tex etrip.tex $_euptex --progname=eupinitex --ini <$etestdir/etrip2.in >euptripin.fot if test ! -s etrip.fmt; then @@ -200,7 +199,7 @@ sed "$P_SED1;$P_SED2" etrip.log > euptrip.log # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $eptestdir/eptrip.log euptrip.log +$DIFF $DIFFFLAGS $euptestdir/eptrip.log euptrip.log mv etrip.out euptrip.out diff $etestdir/etrip.out euptrip.out diff --git a/source/texk/web2c/euptexdir/pdfprimitive.test b/source/texk/web2c/euptexdir/pdfprimitive.test index 0f3ee9808..8a8f92ab8 100755 --- a/source/texk/web2c/euptexdir/pdfprimitive.test +++ b/source/texk/web2c/euptexdir/pdfprimitive.test @@ -17,7 +17,7 @@ FILE=pdfprimitive-euptex # get same filename in log rm -f $FILE.* -$LN_S $srcdir/eptexdir/tests/pdfprimitive-test.tex $FILE.tex +$LN_S $srcdir/euptexdir/tests/pdfprimitive-test.tex $FILE.tex $_euptex -ini -etex $FILE && exit 1 diff --git a/source/texk/web2c/eptexdir/tests/fontchar.sh b/source/texk/web2c/euptexdir/tests/fontchar.sh similarity index 100% rename from source/texk/web2c/eptexdir/tests/fontchar.sh rename to source/texk/web2c/euptexdir/tests/fontchar.sh diff --git a/source/texk/web2c/eptexdir/tests/fontchar.tex b/source/texk/web2c/euptexdir/tests/fontchar.tex similarity index 100% rename from source/texk/web2c/eptexdir/tests/fontchar.tex rename to source/texk/web2c/euptexdir/tests/fontchar.tex diff --git a/source/texk/web2c/eptexdir/tests/lastnodefont.tex b/source/texk/web2c/euptexdir/tests/lastnodefont.tex similarity index 100% rename from source/texk/web2c/eptexdir/tests/lastnodefont.tex rename to source/texk/web2c/euptexdir/tests/lastnodefont.tex diff --git a/source/texk/web2c/eptexdir/tests/lastnodesubtype_math.tex b/source/texk/web2c/euptexdir/tests/lastnodesubtype_math.tex similarity index 100% rename from source/texk/web2c/eptexdir/tests/lastnodesubtype_math.tex rename to source/texk/web2c/euptexdir/tests/lastnodesubtype_math.tex diff --git a/source/texk/web2c/eptexdir/tests/pdforigin.sh b/source/texk/web2c/euptexdir/tests/pdforigin.sh similarity index 100% rename from source/texk/web2c/eptexdir/tests/pdforigin.sh rename to source/texk/web2c/euptexdir/tests/pdforigin.sh diff --git a/source/texk/web2c/eptexdir/tests/pdforigin.tex b/source/texk/web2c/euptexdir/tests/pdforigin.tex similarity index 100% rename from source/texk/web2c/eptexdir/tests/pdforigin.tex rename to source/texk/web2c/euptexdir/tests/pdforigin.tex diff --git a/source/texk/web2c/eptexdir/tests/pdfpagewidth.tex b/source/texk/web2c/euptexdir/tests/pdfpagewidth.tex similarity index 100% rename from source/texk/web2c/eptexdir/tests/pdfpagewidth.tex rename to source/texk/web2c/euptexdir/tests/pdfpagewidth.tex diff --git a/source/texk/web2c/eptexdir/tests/pdfsavepos.tex b/source/texk/web2c/euptexdir/tests/pdfsavepos.tex similarity index 100% rename from source/texk/web2c/eptexdir/tests/pdfsavepos.tex rename to source/texk/web2c/euptexdir/tests/pdfsavepos.tex diff --git a/source/texk/web2c/eptexdir/tests/printkanji-eptex.tex b/source/texk/web2c/euptexdir/tests/printkanji-eptex.tex similarity index 100% rename from source/texk/web2c/eptexdir/tests/printkanji-eptex.tex rename to source/texk/web2c/euptexdir/tests/printkanji-eptex.tex diff --git a/source/texk/web2c/eptexdir/tests/suppress_errors.tex b/source/texk/web2c/euptexdir/tests/suppress_errors.tex similarity index 100% rename from source/texk/web2c/eptexdir/tests/suppress_errors.tex rename to source/texk/web2c/euptexdir/tests/suppress_errors.tex diff --git a/source/texk/web2c/eptexdir/tests/uchar.tex b/source/texk/web2c/euptexdir/tests/uchar.tex similarity index 100% rename from source/texk/web2c/eptexdir/tests/uchar.tex rename to source/texk/web2c/euptexdir/tests/uchar.tex diff --git a/source/texk/web2c/eptexdir/tests/zero_search.tex b/source/texk/web2c/euptexdir/tests/zero_search.tex similarity index 100% rename from source/texk/web2c/eptexdir/tests/zero_search.tex rename to source/texk/web2c/euptexdir/tests/zero_search.tex diff --git a/source/texk/web2c/eptexdir/unbalanced-braces-eptex.ch b/source/texk/web2c/euptexdir/unbalanced-braces-eptex.ch similarity index 100% rename from source/texk/web2c/eptexdir/unbalanced-braces-eptex.ch rename to source/texk/web2c/euptexdir/unbalanced-braces-eptex.ch diff --git a/source/texk/web2c/lib/ChangeLog b/source/texk/web2c/lib/ChangeLog index 650f2a7da..0d7a53e8c 100644 --- a/source/texk/web2c/lib/ChangeLog +++ b/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,7 @@ +2024-04-14 TANAKA Takuji + + * Makefile.am: Remove eptex. + 2024-01-01 Akira Kakuto * printversion.c: Update copyright year. diff --git a/source/texk/web2c/lib/Makefile.am b/source/texk/web2c/lib/Makefile.am index cc0f5c789..0c0a77507 100644 --- a/source/texk/web2c/lib/Makefile.am +++ b/source/texk/web2c/lib/Makefile.am @@ -10,9 +10,9 @@ AM_CFLAGS = $(WARNING_CFLAGS) @KPATHSEA_RULE@ noinst_LIBRARIES = lib.a -if EPTEX +if EUPTEX noinst_LIBRARIES += libp.a -endif EPTEX +endif EUPTEX EXTRA_LIBRARIES = libp.a ## We don't compile `texmfmp.c'; this file is included from 'texextra.c' diff --git a/source/texk/web2c/lib/Makefile.in b/source/texk/web2c/lib/Makefile.in index 2ae2727f2..435bdd73a 100644 --- a/source/texk/web2c/lib/Makefile.in +++ b/source/texk/web2c/lib/Makefile.in @@ -88,7 +88,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@EPTEX_TRUE@am__append_1 = libp.a +@EUPTEX_TRUE@am__append_1 = libp.a subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ diff --git a/source/texk/web2c/man/ChangeLog b/source/texk/web2c/man/ChangeLog index c50132b0a..f82821f18 100644 --- a/source/texk/web2c/man/ChangeLog +++ b/source/texk/web2c/man/ChangeLog @@ -1,3 +1,7 @@ +2024-04-14 TANAKA Takuji + + * Makefile.am: Remove eptex. + 2024-03-13 Andreas Scherer * weave.man, diff --git a/source/texk/web2c/man/Makefile.am b/source/texk/web2c/man/Makefile.am index 6be2c9cd1..091d58bcb 100644 --- a/source/texk/web2c/man/Makefile.am +++ b/source/texk/web2c/man/Makefile.am @@ -55,14 +55,14 @@ endif PDFTEX pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man EXTRA_DIST += $(pdftex_man_sources) -if EPTEX +if EUPTEX man_sources += ptex.man man1_links += ptex:eptex ptex:euptex ptex:uptex man_sources += ppltotf.man ptftopl.man man1_links += ppltotf:uppltotf ptftopl:uptftopl man_sources += pbibtex.man man1_links += pbibtex:upbibtex -endif EPTEX +endif EUPTEX EXTRA_DIST += ptex.man ppltotf.man ptftopl.man pbibtex.man if LUATEX diff --git a/source/texk/web2c/man/Makefile.in b/source/texk/web2c/man/Makefile.in index ed8f6da10..7bfb6cfa2 100644 --- a/source/texk/web2c/man/Makefile.in +++ b/source/texk/web2c/man/Makefile.in @@ -98,10 +98,11 @@ host_triplet = @host@ @ETEX_TRUE@am__append_9 = etex.man @PDFTEX_TRUE@am__append_10 = $(pdftex_man_sources) @PDFTEX_TRUE@am__append_11 = pdftex:pdflatex -@EPTEX_TRUE@am__append_12 = ptex.man ppltotf.man ptftopl.man \ -@EPTEX_TRUE@ pbibtex.man -@EPTEX_TRUE@am__append_13 = ptex:eptex ptex:euptex ptex:uptex \ -@EPTEX_TRUE@ ppltotf:uppltotf ptftopl:uptftopl pbibtex:upbibtex +@EUPTEX_TRUE@am__append_12 = ptex.man ppltotf.man ptftopl.man \ +@EUPTEX_TRUE@ pbibtex.man +@EUPTEX_TRUE@am__append_13 = ptex:eptex ptex:euptex ptex:uptex \ +@EUPTEX_TRUE@ ppltotf:uppltotf ptftopl:uptftopl \ +@EUPTEX_TRUE@ pbibtex:upbibtex @LUATEX_TRUE@am__append_14 = luatex.man @LUATEX_TRUE@am__append_15 = luatex:texlua luatex:texluac \ @LUATEX_TRUE@ luatex:luahbtex luatex:luajittex \ diff --git a/source/texk/web2c/mftraptest.test b/source/texk/web2c/mftraptest.test index 5390e9f68..17a237a4f 100755 --- a/source/texk/web2c/mftraptest.test +++ b/source/texk/web2c/mftraptest.test @@ -36,7 +36,7 @@ cat >filter <<-\_EOF s,^\*\*(trap\.mf,** \&trap trap \ (trap.mf, s/ (TeX Live 20[^)]*)// - s/ (Web2C 202[3-9])// + s/ (Web2C 202[3-9][^)]*)// s/base=trap [^)][^)]*)/base=trap)/ s/) [0-9A-Z: ]*$/)/ s/usage [1-9][0-9&]* ([1-9][0-9&]* still/usage XX\&XX (YYY\&YYYYY still/ diff --git a/source/texk/web2c/ptexdir/ChangeLog b/source/texk/web2c/ptexdir/ChangeLog index 59244a177..73a3fbe1c 100644 --- a/source/texk/web2c/ptexdir/ChangeLog +++ b/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,8 @@ +2024-04-14 TANAKA Takuji + + * ptriptest.test: + Filter Web2C year/dev in banner. + 2024-03-10 Karl Berry * TL'24 release. diff --git a/source/texk/web2c/ptexdir/ptriptest.test b/source/texk/web2c/ptexdir/ptriptest.test index 330e5d438..694436956 100755 --- a/source/texk/web2c/ptexdir/ptriptest.test +++ b/source/texk/web2c/ptexdir/ptriptest.test @@ -29,7 +29,7 @@ cat >filter <<-\_EOF s,^\*\*(\./trip\.tex ##,** \&trip trip \ (trip.tex ##, s/ (TeX Live 20[^)]*)// - s/ (Web2C 202[3-9])// + s/ (Web2C 202[3-9][^)]*)// s/(preloaded format=.*tex)/(INITEX)/ s/format=trip [^)][^)]*)/format=trip)/ s/) [0-9A-Z: ]*$/)/ diff --git a/source/texk/web2c/synctexdir/ChangeLog b/source/texk/web2c/synctexdir/ChangeLog index 5eb225b86..858b6b1ca 100644 --- a/source/texk/web2c/synctexdir/ChangeLog +++ b/source/texk/web2c/synctexdir/ChangeLog @@ -1,3 +1,7 @@ +2024-04-14 TANAKA Takuji + + * am/synctex.am: Remove eptex. + 2024-03-10 Karl Berry * TL'24 release. diff --git a/source/texk/web2c/synctexdir/am/synctex.am b/source/texk/web2c/synctexdir/am/synctex.am index fa223285e..e9aed9630 100644 --- a/source/texk/web2c/synctexdir/am/synctex.am +++ b/source/texk/web2c/synctexdir/am/synctex.am @@ -151,43 +151,6 @@ EXTRA_DIST += \ synctexdir/synctex-e-mem.ch1 \ synctexdir/synctex-e-rec.ch0 -## SyncTeX infrastructure: e-pTeX - -if EPTEX_SYNCTEX - -eptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) - -eptex_LDADD += $(ZLIB_LIBS) -eptex_prereq += $(ZLIB_DEPEND) - -eptex_ch_synctex = \ - synctexdir/synctex-def.ch0 \ - synctexdir/synctex-ep-mem.ch0 \ - synctexdir/synctex-mem.ch0 \ - synctexdir/synctex-e-mem.ch0 \ - synctexdir/synctex-ep-mem.ch1 \ - synctexdir/synctex-p-rec.ch0 \ - synctexdir/synctex-rec.ch0 \ - synctexdir/synctex-rec.ch1 \ - synctexdir/synctex-ep-rec.ch0 \ - synctexdir/synctex-e-rec.ch0 \ - synctexdir/synctex-p-rec.ch1 - -dist_eptex_SOURCES += \ - synctexdir/synctex.c \ - synctexdir/synctex.h \ - synctexdir/synctex-common.h \ - synctexdir/synctex-eptex.h - -eptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\" - -endif EPTEX_SYNCTEX - -EXTRA_DIST += \ - synctexdir/synctex-ep-mem.ch0 \ - synctexdir/synctex-ep-mem.ch1 \ - synctexdir/synctex-ep-rec.ch0 - ## SyncTeX infrastructure: e-upTeX if EUPTEX_SYNCTEX diff --git a/source/texk/web2c/triptest.test b/source/texk/web2c/triptest.test index b49dd54ec..674e5c85f 100755 --- a/source/texk/web2c/triptest.test +++ b/source/texk/web2c/triptest.test @@ -28,7 +28,7 @@ cat >filter <<-\_EOF s,^\*\*(\./trip\.tex ##,** \&trip trip \ (trip.tex ##, s/ (TeX Live 20[^)]*)// - s/ (Web2C 202[3-9])// + s/ (Web2C 202[3-9][^)]*)// s/(preloaded format=tex)/(INITEX)/ s/format=trip [^)][^)]*)/format=trip)/ s/) [0-9A-Z: ]*$/)/ diff --git a/source/texk/web2c/uptexdir/ChangeLog b/source/texk/web2c/uptexdir/ChangeLog index 8c18b4cc3..7f40079d6 100644 --- a/source/texk/web2c/uptexdir/ChangeLog +++ b/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,8 @@ +2024-04-14 TANAKA Takuji + + * {,u}ptriptest.test: + Filter Web2C year/dev in banner. + 2024-03-10 Karl Berry * TL'24 release. diff --git a/source/texk/web2c/uptexdir/ptriptest.test b/source/texk/web2c/uptexdir/ptriptest.test index 37d1bd5d2..325cdef1c 100755 --- a/source/texk/web2c/uptexdir/ptriptest.test +++ b/source/texk/web2c/uptexdir/ptriptest.test @@ -29,7 +29,7 @@ cat >filter <<-\_EOF s,^\*\*(\./trip\.tex ##,** \&trip trip \ (trip.tex ##, s/ (TeX Live 20[^)]*)// - s/ (Web2C 202[3-9])// + s/ (Web2C 202[3-9][^)]*)// s/(preloaded format=.*tex)/(INITEX)/ s/format=trip [^)][^)]*)/format=trip)/ s/) [0-9A-Z: ]*$/)/ diff --git a/source/texk/web2c/uptexdir/uptriptest.test b/source/texk/web2c/uptexdir/uptriptest.test index 0b2af3855..1fe56c563 100755 --- a/source/texk/web2c/uptexdir/uptriptest.test +++ b/source/texk/web2c/uptexdir/uptriptest.test @@ -29,7 +29,7 @@ cat >filter <<-\_EOF s,^\*\*(\./trip\.tex ##,** \&trip trip \ (trip.tex ##, s/ (TeX Live 20[^)]*)// - s/ (Web2C 202[3-9])// + s/ (Web2C 202[3-9][^)]*)// s/(preloaded format=.*tex)/(INITEX)/ s/format=trip [^)][^)]*)/format=trip)/ s/) [0-9A-Z: ]*$/)/ From 25d35fb88685861272af5f20ece7da64ba0150f4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 17 Apr 2024 19:39:10 +0000 Subject: [PATCH 4/8] texfot (17apr24) git-svn-id: svn://tug.org/texlive/trunk/Build@70969 c570f23f-e606-0410-a88d-b1316a301751 From 5c3f96c0da537f36043bfeb54bc228b66bb290ba Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Apr 2024 22:14:36 +0000 Subject: [PATCH 5/8] avoid using -fvisibility-inlines-hidden with C git-svn-id: svn://tug.org/texlive/trunk/Build@70984 c570f23f-e606-0410-a88d-b1316a301751 --- source/doc/ChangeLog | 6 ++++++ source/doc/tlbuild.texi | 11 +++++++---- source/m4/ChangeLog | 6 ++++++ source/m4/kpse-visibility.m4 | 17 ++++++++++++++--- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/source/doc/ChangeLog b/source/doc/ChangeLog index 11b9a4ee4..7ff403383 100644 --- a/source/doc/ChangeLog +++ b/source/doc/ChangeLog @@ -1,3 +1,9 @@ +2024-04-18 Karl Berry + + * tlbuild.texi (Macros for compilers): mention that + -fvisibility-inlines-hidden is not for C, + and index -fvisibility... options. + 2023-12-23 Karl Berry * build-tools: autoconf 2.72 and (belatedly) makeinfo 7.1 diff --git a/source/doc/tlbuild.texi b/source/doc/tlbuild.texi index 776c309e6..a889b42b4 100644 --- a/source/doc/tlbuild.texi +++ b/source/doc/tlbuild.texi @@ -2,7 +2,7 @@ @setfilename tlbuild.info @set version 2024 -@set month-year March 2024 +@set month-year April 2024 @set mytitle Building @TeX{} Live (@value{version}) @settitle @value{mytitle} @@ -1233,11 +1233,14 @@ This macro caches its results in the @code{kpse_cv_warning_cflags}, @end defmac @defmac KPSE_COMPILER_VISIBILITY +@vindex -fvisibility=hidden +@vindex -fvisibility-inlines-hidden When using the C or C++ compiler, try to set @code{VISIBILITY_C[XX]FLAGS} to flags to hide external symbols. Call -@code{AC_SUBST} for this variable. At present this only tests for -the compiler option @code{-fvisibility=hidden}, but could be -extended if necessary. +@code{AC_SUBST} for this variable. This tests for the compiler option +@code{-fvisibility=hidden} and, except for C, +@code{-fvisibility-inlines-hidden}. Reports or patches for additional +tests are welcome. @vindex kpse_cv_visibility_c[xx]flags This macro caches its results in the @code{kpse_cv_visibility_cflags} diff --git a/source/m4/ChangeLog b/source/m4/ChangeLog index c539ea411..e8251fb4e 100644 --- a/source/m4/ChangeLog +++ b/source/m4/ChangeLog @@ -1,3 +1,9 @@ +2024-04-18 Karl Berry + + * kpse-visibility.m4 (_KPSE_VISIBILITY_FLAGS): avoid testing or + including -fvisibility-inlines-hidden for C. From Luigi, mail of + 12 Apr 2024 06:26:23. + 2024-02-01 Luigi Scarso * kpse-pkgs.m4 (kpse_libs_pkgs): add mpfi (new subdir). diff --git a/source/m4/kpse-visibility.m4 b/source/m4/kpse-visibility.m4 index 5bdb8b93a..04955ea27 100644 --- a/source/m4/kpse-visibility.m4 +++ b/source/m4/kpse-visibility.m4 @@ -1,6 +1,6 @@ # $Id$ # Public macros for the TeX Live (TL) tree. -# Copyright 2017-2018 Karl Berry +# Copyright 2017-2024 Karl Berry # Copyright 2013-2014 Peter Breitenlohner # # This file is free software; the copyright holder @@ -62,8 +62,19 @@ kpse_save_flags=$AS_TR_CPP($2) AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include extern void foo(void); void foo(void){printf("foo\n");}]])]) -# FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do +# Maybe other compiler need other tests; patches needed. +# +# The idea, maybe, is to use both flags when they are supported, but +# old C++ compilers, as well as C, don't support +# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too? +# +for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \ + "-fvisibility=hidden"; do + if test x"$1" = xC \ + && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then + # C does not support this additional flag; just skip the test. + continue + fi AS_TR_CPP($2)="$kpse_save_flags -Werror $kpse_flag" AC_COMPILE_IFELSE([], [kpse_cv_visibility_$2=$kpse_flag; break]) done From e6051cd45d1065876401cdf87ae602555c8f57d5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Apr 2024 22:38:18 +0000 Subject: [PATCH 6/8] AC_USE_SYSTEM_EXTENSIONS if compiling luatex, required for socket support git-svn-id: svn://tug.org/texlive/trunk/Build@70985 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/ChangeLog | 7 +++++++ source/texk/web2c/configure.ac | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog index e4cff42c9..35f9de311 100644 --- a/source/texk/web2c/ChangeLog +++ b/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2024-04-18 Karl Berry + + * configure.ac (AC_USE_SYSTEM_EXTENSIONS) [enable_luatex]: call this. + From the Makefile of busytex, via Luigi mail to karl + of 12 Apr 2024 06:26:23: + "For example `gethostbyaddr()` requires `_GNU_SOURCE` or similar". + 2024-04-14 TANAKA Takuji * ac/web2c.ac (eptex), Makefile.am, diff --git a/source/texk/web2c/configure.ac b/source/texk/web2c/configure.ac index 014da32b7..19f05bdd6 100644 --- a/source/texk/web2c/configure.ac +++ b/source/texk/web2c/configure.ac @@ -33,6 +33,16 @@ AC_CONFIG_MACRO_DIRS([../../m4 m4]) WEB2CVERSION=tex_live_version() AC_SUBST([WEB2CVERSION]) +# LuaTeX requires system extensions for socket support. +# Must be at the very beginning. +# SyncTeX and plenty of others unconditionally define GNU_SOURCE, +# so it probably wouldn't hurt to always use system extensions, +# but maybe it is cleaner not to, in the case of cut-down sources. +if test "x$enable_luatex" = xyes; then + AC_MSG_NOTICE([using system extensions, since LuaTeX is enabled]) + AC_USE_SYSTEM_EXTENSIONS +fi + KPSE_COMMON([web2c programs]) AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes]) @@ -46,7 +56,7 @@ KPSE_LT_HACK KPSE_WEB2C_PREPARE m4_include([ac/web2c.ac]) -# XeTeX now requires C++11 because ICU does :(. +# XeTeX requires C++11 because ICU does :(. if test "x$enable_xetex" = xyes; then AC_MSG_NOTICE([checking for C++11, since XeTeX is enabled]) AX_CXX_COMPILE_STDCXX([11]) @@ -283,7 +293,7 @@ AC_CHECK_SIZEOF([off_t], , AC_INCLUDES_DEFAULT [#include ]) if test "x$with_system_kpathsea" = xyes; then -dnl Although quite unusual, it is possible to build Web2C (TeX & Co) +dnl It is possible to build Web2C (TeX & Co) dnl using installed (system) kpathsea headers and library. dnl In that case we need the location of . list="/usr/include /usr/local/include `echo $KPATHSEA_INCLUDES | sed 's/-I//g'`" From 7dcecd13b3f0aa2273ba682df29c596c3b50821b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Apr 2024 22:38:26 +0000 Subject: [PATCH 7/8] reautoconf git-svn-id: svn://tug.org/texlive/trunk/Build@70986 c570f23f-e606-0410-a88d-b1316a301751 --- source/configure | 26 - source/libs/cairo/configure | 15 +- source/libs/configure | 26 - source/libs/gmp/configure | 15 +- source/libs/libpng/configure | 15 +- source/libs/mpfi/configure | 15 +- source/libs/mpfr/configure | 15 +- source/libs/pixman/configure | 15 +- source/libs/zlib/configure | 15 +- source/texk/configure | 26 - source/texk/dvipdfm-x/configure | 22 +- source/texk/web2c/c-auto.in | 98 ++ source/texk/web2c/configure | 2000 +++++++++++++++++-------------- source/utils/configure | 26 - 14 files changed, 1280 insertions(+), 1049 deletions(-) diff --git a/source/configure b/source/configure index 95b162789..596d7e726 100755 --- a/source/configure +++ b/source/configure @@ -840,8 +840,6 @@ enable_etex enable_etex_synctex enable_ptex enable_ptex_synctex -enable_eptex -enable_eptex_synctex enable_uptex enable_uptex_synctex enable_euptex @@ -1665,8 +1663,6 @@ Optional Features: --disable-etex-synctex build e-TeX without SyncTeX support --enable-ptex compile and install pTeX --disable-ptex-synctex build pTeX without SyncTeX support - --enable-eptex compile and install e-pTeX - --disable-eptex-synctex build e-pTeX without SyncTeX support --enable-uptex compile and install upTeX --disable-uptex-synctex build upTeX without SyncTeX support --disable-euptex do not compile and install e-upTeX @@ -5502,28 +5498,6 @@ test "x$enable_web2c:$enable_ptex" = xyes:yes && { need_ptexenc=yes need_zlib=yes } -# Check whether --enable-eptex was given. -if test ${enable_eptex+y} -then : - enableval=$enable_eptex; -fi -case $enable_eptex in #( - yes | no) : - ;; #( - *) : - enable_eptex=no ;; -esac - -# Check whether --enable-eptex-synctex was given. -if test ${enable_eptex_synctex+y} -then : - enableval=$enable_eptex_synctex; -fi - -test "x$enable_web2c:$enable_eptex" = xyes:yes && { - need_ptexenc=yes - need_zlib=yes -} # Check whether --enable-uptex was given. if test ${enable_uptex+y} then : diff --git a/source/libs/cairo/configure b/source/libs/cairo/configure index 5f018773e..b7fa5e5b1 100755 --- a/source/libs/cairo/configure +++ b/source/libs/cairo/configure @@ -6447,8 +6447,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext extern void foo(void); void foo(void){printf("foo\n");} _ACEOF -# FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do +# Maybe other compiler need other tests; patches needed. +# +# The idea, maybe, is to use both flags when they are supported, but +# old C++ compilers, as well as C, don't support +# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too? +# +for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \ + "-fvisibility=hidden"; do + if test x"C" = xC \ + && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then + # C does not support this additional flag; just skip the test. + continue + fi CFLAGS="$kpse_save_flags -Werror $kpse_flag" if ac_fn_c_try_compile "$LINENO" then : diff --git a/source/libs/configure b/source/libs/configure index 48b8eabff..68aea89ae 100755 --- a/source/libs/configure +++ b/source/libs/configure @@ -751,8 +751,6 @@ enable_etex enable_etex_synctex enable_ptex enable_ptex_synctex -enable_eptex -enable_eptex_synctex enable_uptex enable_uptex_synctex enable_euptex @@ -1553,8 +1551,6 @@ Optional Features: --disable-etex-synctex build e-TeX without SyncTeX support --enable-ptex compile and install pTeX --disable-ptex-synctex build pTeX without SyncTeX support - --enable-eptex compile and install e-pTeX - --disable-eptex-synctex build e-pTeX without SyncTeX support --enable-uptex compile and install upTeX --disable-uptex-synctex build upTeX without SyncTeX support --disable-euptex do not compile and install e-upTeX @@ -4550,28 +4546,6 @@ test "x$enable_web2c:$enable_ptex" = xyes:yes && { need_ptexenc=yes need_zlib=yes } -# Check whether --enable-eptex was given. -if test ${enable_eptex+y} -then : - enableval=$enable_eptex; -fi -case $enable_eptex in #( - yes | no) : - ;; #( - *) : - enable_eptex=no ;; -esac - -# Check whether --enable-eptex-synctex was given. -if test ${enable_eptex_synctex+y} -then : - enableval=$enable_eptex_synctex; -fi - -test "x$enable_web2c:$enable_eptex" = xyes:yes && { - need_ptexenc=yes - need_zlib=yes -} # Check whether --enable-uptex was given. if test ${enable_uptex+y} then : diff --git a/source/libs/gmp/configure b/source/libs/gmp/configure index f82009c98..861cad486 100755 --- a/source/libs/gmp/configure +++ b/source/libs/gmp/configure @@ -5912,8 +5912,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext extern void foo(void); void foo(void){printf("foo\n");} _ACEOF -# FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do +# Maybe other compiler need other tests; patches needed. +# +# The idea, maybe, is to use both flags when they are supported, but +# old C++ compilers, as well as C, don't support +# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too? +# +for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \ + "-fvisibility=hidden"; do + if test x"C" = xC \ + && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then + # C does not support this additional flag; just skip the test. + continue + fi CFLAGS="$kpse_save_flags -Werror $kpse_flag" if ac_fn_c_try_compile "$LINENO" then : diff --git a/source/libs/libpng/configure b/source/libs/libpng/configure index cde914141..30fb8e637 100755 --- a/source/libs/libpng/configure +++ b/source/libs/libpng/configure @@ -6169,8 +6169,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext extern void foo(void); void foo(void){printf("foo\n");} _ACEOF -# FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do +# Maybe other compiler need other tests; patches needed. +# +# The idea, maybe, is to use both flags when they are supported, but +# old C++ compilers, as well as C, don't support +# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too? +# +for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \ + "-fvisibility=hidden"; do + if test x"C" = xC \ + && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then + # C does not support this additional flag; just skip the test. + continue + fi CFLAGS="$kpse_save_flags -Werror $kpse_flag" if ac_fn_c_try_compile "$LINENO" then : diff --git a/source/libs/mpfi/configure b/source/libs/mpfi/configure index 03b687185..4855156c1 100755 --- a/source/libs/mpfi/configure +++ b/source/libs/mpfi/configure @@ -5689,8 +5689,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext extern void foo(void); void foo(void){printf("foo\n");} _ACEOF -# FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do +# Maybe other compiler need other tests; patches needed. +# +# The idea, maybe, is to use both flags when they are supported, but +# old C++ compilers, as well as C, don't support +# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too? +# +for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \ + "-fvisibility=hidden"; do + if test x"C" = xC \ + && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then + # C does not support this additional flag; just skip the test. + continue + fi CFLAGS="$kpse_save_flags -Werror $kpse_flag" if ac_fn_c_try_compile "$LINENO" then : diff --git a/source/libs/mpfr/configure b/source/libs/mpfr/configure index 4ea91bc29..e40002f47 100755 --- a/source/libs/mpfr/configure +++ b/source/libs/mpfr/configure @@ -5779,8 +5779,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext extern void foo(void); void foo(void){printf("foo\n");} _ACEOF -# FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do +# Maybe other compiler need other tests; patches needed. +# +# The idea, maybe, is to use both flags when they are supported, but +# old C++ compilers, as well as C, don't support +# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too? +# +for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \ + "-fvisibility=hidden"; do + if test x"C" = xC \ + && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then + # C does not support this additional flag; just skip the test. + continue + fi CFLAGS="$kpse_save_flags -Werror $kpse_flag" if ac_fn_c_try_compile "$LINENO" then : diff --git a/source/libs/pixman/configure b/source/libs/pixman/configure index 705835c9e..2270ba857 100755 --- a/source/libs/pixman/configure +++ b/source/libs/pixman/configure @@ -6218,8 +6218,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext extern void foo(void); void foo(void){printf("foo\n");} _ACEOF -# FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do +# Maybe other compiler need other tests; patches needed. +# +# The idea, maybe, is to use both flags when they are supported, but +# old C++ compilers, as well as C, don't support +# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too? +# +for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \ + "-fvisibility=hidden"; do + if test x"C" = xC \ + && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then + # C does not support this additional flag; just skip the test. + continue + fi CFLAGS="$kpse_save_flags -Werror $kpse_flag" if ac_fn_c_try_compile "$LINENO" then : diff --git a/source/libs/zlib/configure b/source/libs/zlib/configure index 17e9e36c3..6492ecf52 100755 --- a/source/libs/zlib/configure +++ b/source/libs/zlib/configure @@ -5869,8 +5869,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext extern void foo(void); void foo(void){printf("foo\n");} _ACEOF -# FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do +# Maybe other compiler need other tests; patches needed. +# +# The idea, maybe, is to use both flags when they are supported, but +# old C++ compilers, as well as C, don't support +# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too? +# +for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \ + "-fvisibility=hidden"; do + if test x"C" = xC \ + && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then + # C does not support this additional flag; just skip the test. + continue + fi CFLAGS="$kpse_save_flags -Werror $kpse_flag" if ac_fn_c_try_compile "$LINENO" then : diff --git a/source/texk/configure b/source/texk/configure index f53ed1984..7c06943a2 100755 --- a/source/texk/configure +++ b/source/texk/configure @@ -751,8 +751,6 @@ enable_etex enable_etex_synctex enable_ptex enable_ptex_synctex -enable_eptex -enable_eptex_synctex enable_uptex enable_uptex_synctex enable_euptex @@ -1553,8 +1551,6 @@ Optional Features: --disable-etex-synctex build e-TeX without SyncTeX support --enable-ptex compile and install pTeX --disable-ptex-synctex build pTeX without SyncTeX support - --enable-eptex compile and install e-pTeX - --disable-eptex-synctex build e-pTeX without SyncTeX support --enable-uptex compile and install upTeX --disable-uptex-synctex build upTeX without SyncTeX support --disable-euptex do not compile and install e-upTeX @@ -4550,28 +4546,6 @@ test "x$enable_web2c:$enable_ptex" = xyes:yes && { need_ptexenc=yes need_zlib=yes } -# Check whether --enable-eptex was given. -if test ${enable_eptex+y} -then : - enableval=$enable_eptex; -fi -case $enable_eptex in #( - yes | no) : - ;; #( - *) : - enable_eptex=no ;; -esac - -# Check whether --enable-eptex-synctex was given. -if test ${enable_eptex_synctex+y} -then : - enableval=$enable_eptex_synctex; -fi - -test "x$enable_web2c:$enable_eptex" = xyes:yes && { - need_ptexenc=yes - need_zlib=yes -} # Check whether --enable-uptex was given. if test ${enable_uptex+y} then : diff --git a/source/texk/dvipdfm-x/configure b/source/texk/dvipdfm-x/configure index df72ebd14..1982b3e84 100755 --- a/source/texk/dvipdfm-x/configure +++ b/source/texk/dvipdfm-x/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for dvipdfm-x (TeX Live) 20240407. +# Generated by GNU Autoconf 2.72 for dvipdfm-x (TeX Live) 20240305. # # Report bugs to . # @@ -614,8 +614,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dvipdfm-x (TeX Live)' PACKAGE_TARNAME='dvipdfm-x--tex-live-' -PACKAGE_VERSION='20240407' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20240407' +PACKAGE_VERSION='20240305' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20240305' PACKAGE_BUGREPORT='dvipdfmx@tug.org' PACKAGE_URL='' @@ -1383,7 +1383,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures dvipdfm-x (TeX Live) 20240407 to adapt to many kinds of systems. +'configure' configures dvipdfm-x (TeX Live) 20240305 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1455,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20240407:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20240305:";; esac cat <<\_ACEOF @@ -1586,7 +1586,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dvipdfm-x (TeX Live) configure 20240407 +dvipdfm-x (TeX Live) configure 20240305 generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -2367,7 +2367,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dvipdfm-x (TeX Live) $as_me 20240407, which was +It was created by dvipdfm-x (TeX Live) $as_me 20240305, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -8928,7 +8928,7 @@ fi # Define the identity of the package. PACKAGE='dvipdfm-x--tex-live-' - VERSION='20240407' + VERSION='20240305' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15995,7 +15995,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dvipdfm-x (TeX Live) config.lt 20240407 +dvipdfm-x (TeX Live) config.lt 20240305 configured by $0, generated by GNU Autoconf 2.72. Copyright (C) 2011 Free Software Foundation, Inc. @@ -17938,7 +17938,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dvipdfm-x (TeX Live) $as_me 20240407, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20240305, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18010,7 +18010,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -dvipdfm-x (TeX Live) config.status 20240407 +dvipdfm-x (TeX Live) config.status 20240305 configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/source/texk/web2c/c-auto.in b/source/texk/web2c/c-auto.in index ca87ac689..e0c3dbd61 100644 --- a/source/texk/web2c/c-auto.in +++ b/source/texk/web2c/c-auto.in @@ -133,6 +133,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkdtemp' function. */ #undef HAVE_MKDTEMP @@ -231,6 +234,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to 1 if the system has the type '_Bool'. */ #undef HAVE__BOOL @@ -306,6 +312,98 @@ /* metafont: Define to include Uniterm window support. */ #undef UNITERMWIN +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/texk/web2c/configure b/source/texk/web2c/configure index daee6c4e0..caa82e5f0 100755 --- a/source/texk/web2c/configure +++ b/source/texk/web2c/configure @@ -912,22 +912,6 @@ AS ac_ct_AR AR WARNING_CFLAGS -am__fastdepCC_FALSE -am__fastdepCC_TRUE -CCDEPMODE -am__nodep -AMDEPBACKSLASH -AMDEP_FALSE -AMDEP_TRUE -am__include -DEPDIR -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -938,6 +922,15 @@ AM_V CSCOPE ETAGS CTAGS +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__include +DEPDIR am__untar am__tar AMTAR @@ -961,6 +954,13 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC WEB2CVERSION target_alias host_alias @@ -1005,9 +1005,9 @@ am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_dependency_tracking enable_silent_rules enable_maintainer_mode -enable_dependency_tracking enable_compiler_warnings enable_shared enable_static @@ -1747,15 +1747,15 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-silent-rules less verbose build output (undo: "make V=1") --disable-silent-rules verbose build output (undo: "make V=0") --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-dependency-tracking - do not reject slow dependency extractors - --disable-dependency-tracking - speeds up one-time build --enable-compiler-warnings=[no|min|yes|max|all] Turn on compiler warnings [default: yes if maintainer-mode, min otherwise] @@ -2022,6 +2022,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -2070,41 +2105,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -3261,6 +3261,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -3586,7 +3587,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -3595,6 +3595,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Test code for whether the C++ compiler supports C++98 (global declarations) ac_cxx_conftest_cxx98_globals=' // Does the compiler advertise C++98 conformance? @@ -3813,7 +3815,7 @@ main (int argc, char **argv) # Auxiliary files required by this configure script. -ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" +ac_aux_files="config.guess config.sub ltmain.sh ar-lib missing install-sh compile" # Locations in which to look for auxiliary files. ac_aux_dir_candidates="${srcdir}/../../build-aux" @@ -3987,32 +3989,46 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu WEB2CVERSION=2025/dev -am__api_version='1.16' +# LuaTeX requires system extensions for socket support. +# Must be at the very beginning. +# SyncTeX and plenty of others unconditionally define GNU_SOURCE, +# so it probably wouldn't hurt to always use system extensions, +# but maybe it is cleaner not to, in the case of cut-down sources. +if test "x$enable_luatex" = xyes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using system extensions, since LuaTeX is enabled" >&5 +printf "%s\n" "$as_me: using system extensions, since LuaTeX is enabled" >&6;} - # Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -printf %s "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test ${ac_cv_path_install+y} + + + + + + + + +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 else case e in #( - e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + e) if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS @@ -4021,194 +4037,42 @@ do */) ;; *) as_dir=$as_dir/ ;; esac - # Account for fact that we put trailing slashes in our PATH walk. -case $as_dir in #(( - ./ | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done IFS=$as_save_IFS -rm -rf conftest.one conftest.two conftest.dir - ;; +fi ;; esac fi - if test ${ac_cv_path_install+y}; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -printf "%s\n" "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -printf %s "checking whether build environment is sane... " >&6; } -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; -esac -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken - alias in your environment" "$LINENO" 5 - fi - if test "$2" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$2" = conftest.file - ) -then - # Ok. - : -else - as_fn_error $? "newly created file is older than distributed files! -Check your system clock" "$LINENO" 5 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi - -rm -f conftest.file - -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. -# By default was 's,x,x', remove it if useless. -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` - - -# Expand $ac_aux_dir to an absolute path. -am_aux_dir=`cd "$ac_aux_dir" && pwd` - - - if test x"${MISSING+set}" != xset; then - MISSING="\${SHELL} '$am_aux_dir/missing'" fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} -fi - -if test x"${install_sh+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi - -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_STRIP+y} +if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 else case e in #( - e) if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + e) if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -4221,7 +4085,7 @@ do esac for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" + ac_cv_prog_ac_ct_CC="gcc" printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4232,29 +4096,42 @@ IFS=$as_save_IFS fi ;; esac fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -printf "%s\n" "$STRIP" >&6; } +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } fi - + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_STRIP+y} +if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 else case e in #( - e) if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + e) if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -4267,7 +4144,7 @@ do esac for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" + ac_cv_prog_CC="${ac_tool_prefix}cc" printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4278,93 +4155,31 @@ IFS=$as_save_IFS fi ;; esac fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -printf "%s\n" "$ac_ct_STRIP" >&6; } +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } fi - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 -printf %s "checking for a race-free mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if test ${ac_cv_path_mkdir+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue - case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir ('*'coreutils) '* | \ - *'BusyBox '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext - break 3;; - esac - done - done - done -IFS=$as_save_IFS - ;; -esac -fi - test -d ./--version && rmdir ./--version - if test ${ac_cv_path_mkdir+y}; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use plain mkdir -p, - # in the hope it doesn't have the bugs of ancient mkdir. - MKDIR_P='mkdir -p' fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -printf "%s\n" "$MKDIR_P" >&6; } - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AWK+y} +if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 else case e in #( - e) if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. + e) if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else + ac_prog_rejected=no as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do @@ -4376,7 +4191,11 @@ do esac for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4384,187 +4203,38 @@ done done IFS=$as_save_IFS +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + fi +fi fi ;; esac fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -printf "%s\n" "$AWK" >&6; } +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } fi - test -n "$AWK" && break -done - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval test \${ac_cv_prog_make_${ac_make}_set+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make ;; -esac -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - SET_MAKE= -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -# Check whether --enable-silent-rules was given. -if test ${enable_silent_rules+y} -then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in # ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=1;; -esac -am_make=${MAKE-make} -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -printf %s "checking whether $am_make supports nested variables... " >&6; } -if test ${am_cv_make_support_nested_variables+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) if printf "%s\n" 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi ;; -esac -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AM_BACKSLASH='\' - - - - - - - - - - -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 -printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; } -cat > confinc.mk << 'END' -am__doit: - @echo this is the am__doit target >confinc.out -.PHONY: am__doit -END -am__include="#" -am__quote= -# BSD make does it like this. -echo '.include "confinc.mk" # ignored' > confmf.BSD -# Other make implementations (GNU, Solaris 10, AIX) do it like this. -echo 'include confinc.mk # ignored' > confmf.GNU -_am_result=no -for s in GNU BSD; do - { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 - (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - case $?:`cat confinc.out 2>/dev/null` in #( - '0:this is the am__doit target') : - case $s in #( - BSD) : - am__include='.include' am__quote='"' ;; #( - *) : - am__include='include' am__quote='' ;; -esac ;; #( - *) : - ;; -esac - if test "$am__include" != "#"; then - _am_result="yes ($s style)" - break - fi -done -rm -f confinc.* confmf.* -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 -printf "%s\n" "${_am_result}" >&6; } - -# Check whether --enable-dependency-tracking was given. -if test ${enable_dependency_tracking+y} -then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} @@ -4585,7 +4255,7 @@ do esac for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4606,11 +4276,15 @@ printf "%s\n" "no" >&6; } fi + test -n "$CC" && break + done fi -if test -z "$ac_cv_prog_CC"; then +if test -z "$CC"; then ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} @@ -4631,7 +4305,7 @@ do esac for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" + ac_cv_prog_ac_ct_CC="$ac_prog" printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4651,6 +4325,10 @@ else printf "%s\n" "no" >&6; } fi + + test -n "$ac_ct_CC" && break +done + if test "x$ac_ct_CC" = x; then CC="" else @@ -4662,14 +4340,13 @@ ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi -else - CC="$ac_cv_prog_CC" fi +fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} @@ -4690,7 +4367,7 @@ do esac for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" + ac_cv_prog_CC="${ac_tool_prefix}clang" printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4711,21 +4388,20 @@ printf "%s\n" "no" >&6; } fi - fi fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} +if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 else case e in #( - e) if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. + e) if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_prog_rejected=no as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do @@ -4737,11 +4413,7 @@ do esac for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" + ac_cv_prog_ac_ct_CC="clang" printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4749,250 +4421,32 @@ done done IFS=$as_save_IFS -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" - fi -fi fi ;; esac fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi ;; -esac -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi ;; -esac -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. -set dummy ${ac_tool_prefix}clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi ;; -esac -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "clang", so it can be a program name with args. -set dummy clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi ;; -esac -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi fi @@ -5635,136 +5089,741 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -depcc="$CC" am_compiler_list= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -printf %s "checking dependency style of $depcc... " >&6; } -if test ${am_cv_CC_dependencies_compiler_type+y} +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} then : printf %s "(cached) " >&6 else case e in #( - e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + +fi + +am__api_version='1.16' + + + # Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + ;; +esac +fi + if test ${ac_cv_path_install+y}; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +printf %s "checking whether build environment is sane... " >&6; } +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was 's,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` + + + if test x"${MISSING+set}" != xset; then + MISSING="\${SHELL} '$am_aux_dir/missing'" +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac +else + STRIP="$ac_cv_prog_STRIP" +fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + *'BusyBox '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext + break 3;; + esac + done + done done +IFS=$as_save_IFS + ;; +esac +fi - cd .. - rm -rf conftest.dir + test -d ./--version && rmdir ./--version + if test ${ac_cv_path_mkdir+y}; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use plain mkdir -p, + # in the hope it doesn't have the bugs of ancient mkdir. + MKDIR_P='mkdir -p' + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. else - am_cv_CC_dependencies_compiler_type=none +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac fi - ;; +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make ;; +esac +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + SET_MAKE= +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' +am__doit: + @echo this is the am__doit target >confinc.out +.PHONY: am__doit +END +am__include="#" +am__quote= +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : + ;; esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +printf "%s\n" "${_am_result}" >&6; } + +# Check whether --enable-dependency-tracking was given. +if test ${enable_dependency_tracking+y} +then : + enableval=$enable_dependency_tracking; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= + AMDEP_TRUE='#' + AMDEP_FALSE= fi +# Check whether --enable-silent-rules was given. +if test ${enable_silent_rules+y} +then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if printf "%s\n" 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} @@ -9625,35 +9684,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -9816,6 +9846,136 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +depcc="$CC" am_compiler_list= + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + # Variables for tags utilities; see am/tags.am if test -z "$CTAGS"; then CTAGS=ctags @@ -20675,7 +20835,7 @@ fi -# XeTeX now requires C++11 because ICU does :(. +# XeTeX requires C++11 because ICU does :(. if test "x$enable_xetex" = xyes; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++11, since XeTeX is enabled" >&5 printf "%s\n" "$as_me: checking for C++11, since XeTeX is enabled" >&6;} @@ -29120,6 +29280,14 @@ printf %s "checking that generated files are newer than configure... " >&6; } fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 printf "%s\n" "done" >&6; } +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -29132,14 +29300,6 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error $? "conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi # Check whether --enable-year2038 was given. if test ${enable_year2038+y} then : diff --git a/source/utils/configure b/source/utils/configure index ca6a9a541..aa3a824aa 100755 --- a/source/utils/configure +++ b/source/utils/configure @@ -751,8 +751,6 @@ enable_etex enable_etex_synctex enable_ptex enable_ptex_synctex -enable_eptex -enable_eptex_synctex enable_uptex enable_uptex_synctex enable_euptex @@ -1553,8 +1551,6 @@ Optional Features: --disable-etex-synctex build e-TeX without SyncTeX support --enable-ptex compile and install pTeX --disable-ptex-synctex build pTeX without SyncTeX support - --enable-eptex compile and install e-pTeX - --disable-eptex-synctex build e-pTeX without SyncTeX support --enable-uptex compile and install upTeX --disable-uptex-synctex build upTeX without SyncTeX support --disable-euptex do not compile and install e-upTeX @@ -4550,28 +4546,6 @@ test "x$enable_web2c:$enable_ptex" = xyes:yes && { need_ptexenc=yes need_zlib=yes } -# Check whether --enable-eptex was given. -if test ${enable_eptex+y} -then : - enableval=$enable_eptex; -fi -case $enable_eptex in #( - yes | no) : - ;; #( - *) : - enable_eptex=no ;; -esac - -# Check whether --enable-eptex-synctex was given. -if test ${enable_eptex_synctex+y} -then : - enableval=$enable_eptex_synctex; -fi - -test "x$enable_web2c:$enable_eptex" = xyes:yes && { - need_ptexenc=yes - need_zlib=yes -} # Check whether --enable-uptex was given. if test ${enable_uptex+y} then : From a4a4ef50359beaeddc000dd1a3f4535f7925df4c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Apr 2024 22:44:32 +0000 Subject: [PATCH 8/8] interword spaces on overfull lines can be smaller than space-space_shrink, so increase tolerance by 1pt git-svn-id: svn://tug.org/texlive/trunk/Build@70987 c570f23f-e606-0410-a88d-b1316a301751