From f3e40d2b2c211ff34d2f71c594710adf6a9c8ff9 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 8 Dec 2011 15:52:46 +0000 Subject: web2c: Consistency of `constants' git-svn-id: svn://tug.org/texlive/trunk@24797 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 4 + Build/source/texk/web2c/Makefile.in | 127 ++++++++++++++------------- Build/source/texk/web2c/alephdir/ChangeLog | 9 ++ Build/source/texk/web2c/alephdir/Makefile | 74 ---------------- Build/source/texk/web2c/alephdir/aleph.test | 9 ++ Build/source/texk/web2c/alephdir/am/aleph.am | 13 ++- Build/source/texk/web2c/alephdir/com16bit.ch | 7 +- Build/source/texk/web2c/alephdir/om16bit.ch | 12 ++- Build/source/texk/web2c/alephdir/omocp.ch | 2 +- Build/source/texk/web2c/lib/ChangeLog | 15 ++-- Build/source/texk/web2c/lib/setupvar.c | 2 +- Build/source/texk/web2c/ptexdir/ChangeLog | 4 + Build/source/texk/web2c/ptexdir/ptex-base.ch | 19 +++- Build/source/texk/web2c/tex.ch | 21 ++++- Build/source/texk/web2c/xetexdir/ChangeLog | 2 +- 15 files changed, 165 insertions(+), 155 deletions(-) delete mode 100644 Build/source/texk/web2c/alephdir/Makefile create mode 100755 Build/source/texk/web2c/alephdir/aleph.test (limited to 'Build/source') diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 2fcca44af6c..cbccf45eed3 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2011-12-08 Peter Breitenlohner + + * tex.ch: Consistency of `constants'. + 2011-10-18 Peter Breitenlohner * configure.ac [WIN32]: Add `-lgdi32' to POPPLER_LIBS. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 77733e8aaf3..2d093963695 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -61,7 +61,8 @@ TESTS = tangle.test $(am__EXEEXT_41) ctiedir/ctie.test \ $(am__append_34) $(am__append_38) $(am__append_40) \ $(am__append_46) $(am__append_50) $(am__append_52) \ $(am__append_57) $(am__append_64) $(am__append_79) \ - $(am__append_82) $(am__append_83) libmd5/md5.test + $(am__append_82) $(am__append_83) $(am__append_86) \ + libmd5/md5.test DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ @@ -210,85 +211,86 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ @OMFONTS_FALSE@@OTANGLE_TRUE@am__append_83 = $(OMFONTS_tests) @OTANGLE_TRUE@am__append_84 = pltotf tftopl @ALEPH_TRUE@am__append_85 = aleph -@TEX_SYNCTEX_TRUE@am__append_86 = -I$(srcdir)/synctexdir \ +@ALEPH_TRUE@am__append_86 = $(aleph_tests) +@TEX_SYNCTEX_TRUE@am__append_87 = -I$(srcdir)/synctexdir \ @TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\" -@TEX_SYNCTEX_TRUE@am__append_87 = $(ZLIB_LIBS) -@TEX_SYNCTEX_TRUE@am__append_88 = $(ZLIB_DEPEND) -@TEX_SYNCTEX_TRUE@am__append_89 = \ +@TEX_SYNCTEX_TRUE@am__append_88 = $(ZLIB_LIBS) +@TEX_SYNCTEX_TRUE@am__append_89 = $(ZLIB_DEPEND) +@TEX_SYNCTEX_TRUE@am__append_90 = \ @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_90 = -I$(srcdir)/synctexdir \ +@ETEX_SYNCTEX_TRUE@am__append_91 = -I$(srcdir)/synctexdir \ @ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\" -@ETEX_SYNCTEX_TRUE@am__append_91 = $(ZLIB_LIBS) -@ETEX_SYNCTEX_TRUE@am__append_92 = $(ZLIB_DEPEND) -@ETEX_SYNCTEX_TRUE@am__append_93 = \ +@ETEX_SYNCTEX_TRUE@am__append_92 = $(ZLIB_LIBS) +@ETEX_SYNCTEX_TRUE@am__append_93 = $(ZLIB_DEPEND) +@ETEX_SYNCTEX_TRUE@am__append_94 = \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h -@PTEX_SYNCTEX_TRUE@am__append_94 = -I$(srcdir)/synctexdir \ +@PTEX_SYNCTEX_TRUE@am__append_95 = -I$(srcdir)/synctexdir \ @PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\" -@PTEX_SYNCTEX_TRUE@am__append_95 = $(ZLIB_LIBS) -@PTEX_SYNCTEX_TRUE@am__append_96 = $(ZLIB_DEPEND) -@PTEX_SYNCTEX_TRUE@am__append_97 = \ +@PTEX_SYNCTEX_TRUE@am__append_96 = $(ZLIB_LIBS) +@PTEX_SYNCTEX_TRUE@am__append_97 = $(ZLIB_DEPEND) +@PTEX_SYNCTEX_TRUE@am__append_98 = \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex-ptex.h -@UPTEX_SYNCTEX_TRUE@am__append_98 = -I$(srcdir)/synctexdir \ +@UPTEX_SYNCTEX_TRUE@am__append_99 = -I$(srcdir)/synctexdir \ @UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\" -@UPTEX_SYNCTEX_TRUE@am__append_99 = $(ZLIB_LIBS) -@UPTEX_SYNCTEX_TRUE@am__append_100 = $(ZLIB_DEPEND) -@UPTEX_SYNCTEX_TRUE@am__append_101 = \ +@UPTEX_SYNCTEX_TRUE@am__append_100 = $(ZLIB_LIBS) +@UPTEX_SYNCTEX_TRUE@am__append_101 = $(ZLIB_DEPEND) +@UPTEX_SYNCTEX_TRUE@am__append_102 = \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-uptex.h -@EPTEX_SYNCTEX_TRUE@am__append_102 = -I$(srcdir)/synctexdir \ +@EPTEX_SYNCTEX_TRUE@am__append_103 = -I$(srcdir)/synctexdir \ @EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\" -@EPTEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_LIBS) -@EPTEX_SYNCTEX_TRUE@am__append_104 = $(ZLIB_DEPEND) -@EPTEX_SYNCTEX_TRUE@am__append_105 = \ +@EPTEX_SYNCTEX_TRUE@am__append_104 = $(ZLIB_LIBS) +@EPTEX_SYNCTEX_TRUE@am__append_105 = $(ZLIB_DEPEND) +@EPTEX_SYNCTEX_TRUE@am__append_106 = \ @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_106 = -I$(srcdir)/synctexdir \ +@EUPTEX_SYNCTEX_TRUE@am__append_107 = -I$(srcdir)/synctexdir \ @EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\" -@EUPTEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_LIBS) -@EUPTEX_SYNCTEX_TRUE@am__append_108 = $(ZLIB_DEPEND) -@EUPTEX_SYNCTEX_TRUE@am__append_109 = \ +@EUPTEX_SYNCTEX_TRUE@am__append_108 = $(ZLIB_LIBS) +@EUPTEX_SYNCTEX_TRUE@am__append_109 = $(ZLIB_DEPEND) +@EUPTEX_SYNCTEX_TRUE@am__append_110 = \ @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_110 = -I$(srcdir)/synctexdir \ +@PDFTEX_SYNCTEX_TRUE@am__append_111 = -I$(srcdir)/synctexdir \ @PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\" -@PDFTEX_SYNCTEX_TRUE@am__append_111 = \ +@PDFTEX_SYNCTEX_TRUE@am__append_112 = \ @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_112 = -I$(srcdir)/synctexdir \ +@XETEX_SYNCTEX_TRUE@am__append_113 = -I$(srcdir)/synctexdir \ @XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\" -@XETEX_SYNCTEX_TRUE@am__append_113 = \ +@XETEX_SYNCTEX_TRUE@am__append_114 = \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @@ -1562,10 +1564,9 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ omegaware/tests/Cherokee.pl omegaware/tests/OCherokee.ovp \ omegaware/tests/repeat.opl omegaware/tests/repeated.opl \ omegaware/tests/specialhex.ovp $(aleph_web_srcs) \ - $(aleph_ch_srcs) alephdir/ChangeLog alephdir/Makefile \ - alephdir/aleph.defines alephdir/aleph.version \ - synctexdir/ChangeLog synctexdir/README.txt \ - synctexdir/synctex_parser_readme.txt \ + $(aleph_ch_srcs) alephdir/ChangeLog alephdir/aleph.defines \ + alephdir/aleph.version $(aleph_tests) synctexdir/ChangeLog \ + synctexdir/README.txt synctexdir/synctex_parser_readme.txt \ synctexdir/synctex_parser_version.txt synctexdir/tests \ synctexdir/synctex-common.h synctexdir/synctex.c \ synctexdir/synctex.defines synctexdir/synctex.h \ @@ -1733,18 +1734,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C initex_CPPFLAGS = -DEXEPROG=\"tex.exe\" initex_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c initex_LDADD = -tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_86) +tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_87) # With --enable-ipc, TeX may need to link with -lsocket. -tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_87) +tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_88) # 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_89) +dist_tex_SOURCES = texextra.c $(am__append_90) # We must create texd.h before building the tex_OBJECTS. -tex_prereq = texd.h $(am__append_88) +tex_prereq = texd.h $(am__append_89) tex_ch_srcs = \ tex.web \ tex.ch \ @@ -1812,19 +1813,19 @@ psout_c_h = mppsout.h psout.c mplibps.h svgout_c_h = mplibsvg.h mpsvgout.h svgout.c libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \ mplibdir/mpmath.w mplibdir/tfmin.w -etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_90) +etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_91) # With --enable-ipc, e-TeX may need to link with -lsocket. -etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_91) +etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_92) # e-TeX C sources etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \ - $(am__append_93) + $(am__append_94) # 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_92) +etex_prereq = etexd.h etexdir/etex_version.h $(am__append_93) etex_web_srcs = \ tex.web \ etexdir/etex.ch @@ -1859,20 +1860,20 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \ pproglib = lib/libp.a libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h libkanji_a_CPPFLAGS = $(ptex_cppflags) -ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_94) +ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_95) # With --enable-ipc, pTeX may need to link with -lsocket. -ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_95) +ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_96) ptex_DEPENDENCIES = $(ptex_dependencies) # pTeX C sources ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexdir/ptex_version.h dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \ - $(am__append_97) + $(am__append_98) # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS. -ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_96) +ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_97) ptex_web_srcs = \ tex.web \ tex.ch @@ -1906,23 +1907,23 @@ ptftopl_DEPENDENCIES = $(ptex_dependencies) # e-pTeX Tests # eptex_tests = eptexdir/eptrip.test -eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_102) +eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_103) # With --enable-ipc, e-pTeX may need to link with -lsocket. eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) $(am__append_103) + $(ipc_socketlibs) $(am__append_104) eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) # e-pTeX C sources eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/eptex_version.h eptexdir/ptex_version.h dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \ - $(am__append_105) + $(am__append_106) # We must create eptexd.h and eptexdir/[ep]tex_version.h before building the eptex_OBJECTS. eptex_prereq = eptexd.h eptexdir/etex_version.h \ eptexdir/eptex_version.h eptexdir/ptex_version.h \ - $(am__append_104) + $(am__append_105) eptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -1958,21 +1959,21 @@ upweb_tests = \ libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c libukanji_a_CPPFLAGS = $(uptex_cppflags) -uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_98) +uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_99) # With --enable-ipc, upTeX may need to link with -lsocket. -uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_99) +uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_100) uptex_DEPENDENCIES = $(uptex_dependencies) # upTeX C sources uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c uptexdir/ptex_version.h uptexdir/uptex_version.h dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \ - $(am__append_101) + $(am__append_102) # We must create uptexd.h and uptexdir/*ptex_version.h before building the uptex_OBJECTS. uptex_prereq = uptexd.h uptexdir/ptex_version.h \ - uptexdir/uptex_version.h $(am__append_100) + uptexdir/uptex_version.h $(am__append_101) uptex_web_srcs = \ tex.web \ tex.ch @@ -2007,11 +2008,11 @@ uptftopl_DEPENDENCIES = $(uptex_dependencies) # e-upTeX Tests # euptex_tests = euptexdir/euptrip.test -euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_106) +euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_107) # With --enable-ipc, e-upTeX may need to link with -lsocket. euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) $(am__append_107) + $(ipc_socketlibs) $(am__append_108) euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) # e-upTeX C sources @@ -2020,12 +2021,12 @@ nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c euptexdir/etex_version.h \ euptexdir/eptex_version.h euptexdir/ptex_version.h euptexdir/uptex_version.h dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \ - $(am__append_109) + $(am__append_110) # We must create euptexd.h and euptexdir/*tex_version.h before building the euptex_OBJECTS. euptex_prereq = euptexd.h euptexdir/etex_version.h \ euptexdir/eptex_version.h euptexdir/ptex_version.h \ - euptexdir/uptex_version.h $(am__append_108) + euptexdir/uptex_version.h $(am__append_109) euptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -2062,7 +2063,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \ # Force Automake to use CXXLD for linking nodist_EXTRA_pdftex_SOURCES = dummy.cxx pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(SHELL) ./tangle-sh $@ $(TANGLE) -pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_110) +pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_111) pdftex_CXXFLAGS = $(WARNING_CXXFLAGS) # With --enable-ipc, pdfTeX may need to link with -lsocket. @@ -2076,7 +2077,7 @@ nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \ pdftexdir/etex_version.h pdftexdir/pdftex_version.h dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \ - $(am__append_111) + $(am__append_112) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -2532,7 +2533,7 @@ xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \ $(TECKIT_DEPEND) $(am__append_72) $(am__append_75) \ $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime -xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_112) +xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_113) xetex_CFLAGS = # $(WARNING_CFLAGS) xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) @@ -2544,7 +2545,7 @@ nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c \ xetexdir/etex_version.h xetexdir/xetex_version.h dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \ - $(am__append_113) + $(am__append_114) xetex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -2672,6 +2673,10 @@ aleph_ch_srcs = \ alephdir/comsrcspec.ch \ alephdir/ceostuff.ch + +# Aleph Tests +# +aleph_tests = alephdir/aleph.test synctex_SOURCES = \ synctexdir/synctex_main.c \ synctexdir/synctex_parser.c \ diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog index dd148a799b5..0d6acf17aab 100644 --- a/Build/source/texk/web2c/alephdir/ChangeLog +++ b/Build/source/texk/web2c/alephdir/ChangeLog @@ -1,3 +1,12 @@ +2011-12-08 Peter Breitenlohner + + * com16bit.ch, om16bit.ch: Consistency of `constants'. + * omocp.ch: Adjust to null, i.e., min_halfword <0. + + * aleph.test (new): Just testing 'aleph -version'. + * Makefile (removed): Unused. + * am/aleph.am: Adjusted. + 2011-09-30 Peter Breitenlohner * com16bit.ch.ch (print_file_line): Bug fix: avoid uninitialized diff --git a/Build/source/texk/web2c/alephdir/Makefile b/Build/source/texk/web2c/alephdir/Makefile deleted file mode 100644 index c04d858db9b..00000000000 --- a/Build/source/texk/web2c/alephdir/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# Files used to create an Aleph without e-TeX extensions -noaleph_files = \ - om16bit.ch \ - omstr.ch \ - omfont.ch \ - omchar.ch \ - omfi.ch \ - ompar.ch \ - omocp.ch \ - omfilter.ch \ - omtrans.ch \ - omdir.ch \ - -# Files to add e-TeX extensions to Aleph -aleph_build=rc1 - -aleph_files = \ - eobase.ch \ - eofmt.ch \ - eomem-$(aleph_build).ch \ - eo16bit-$(aleph_build).ch \ - eoext.ch \ - eoeqtb.ch \ - eofix.ch \ - eocprt.ch \ - eonewdir-$(aleph_build).ch \ - eover-$(aleph_build).ch \ - eopage-$(aleph_build).ch \ - eochar-$(aleph_build).ch - -new_tex = tex-new.web -old_tex = tex-old.web - -localdir = c:/texmf/miktex/bin/ -tie = $(localdir)tie.exe -tangle = $(localdir)tangle.exe -weave = $(localdir)weave.exe - -sourcedir = c:/sorci/miktex/miktex/ - -rm = rm -cp = cp - -all: aleph.p aleph.pdf - -etex.web: $(old_tex) etex.ch - $(tie) -m etex.web $(old_tex) etex.ch - -noaleph.web: $(new_tex) $(noaleph_files) - $(tie) -m noaleph.web $(new_tex) $(noaleph_files) - -aleph.web: noaleph.web $(aleph_files) - $(tie) -m aleph.web noaleph.web $(aleph_files) - $(cp) aleph.web aleph-$(aleph_build).web - -aleph.p aleph.pool: aleph.web - $(tangle) aleph.web nul.ch aleph.p aleph.pool - $(cp) aleph.pool aleph-$(aleph_build).pool - -aleph.tex: aleph.web - $(weave) aleph.web nul aleph.tex - -aleph.pdf: aleph.tex - pdftex aleph - $(cp) aleph.pdf aleph-$(aleph_build).pdf - -clean: - $(rm) -f noaleph.web - $(rm) -f aleph.web - $(rm) -f aleph.tex - $(rm) -f aleph.pdf - $(rm) -f aleph.log - $(rm) -f aleph.p - $(rm) -f aleph.pool diff --git a/Build/source/texk/web2c/alephdir/aleph.test b/Build/source/texk/web2c/alephdir/aleph.test new file mode 100755 index 00000000000..54b658c2657 --- /dev/null +++ b/Build/source/texk/web2c/alephdir/aleph.test @@ -0,0 +1,9 @@ +#! /bin/sh + +# Copyright (C) 2011 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +# Not really a test, just making sure the program executes. + +./aleph -version || exit 1 + diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am index 2f0e9528484..28649b0e814 100644 --- a/Build/source/texk/web2c/alephdir/am/aleph.am +++ b/Build/source/texk/web2c/alephdir/am/aleph.am @@ -1,6 +1,6 @@ ## texk/web2c/alephdir/am/aleph.am: Makefile fragment for Aleph. ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner +## Copyright (C) 2009-2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## Aleph @@ -94,7 +94,16 @@ DISTCLEANFILES += $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c \ EXTRA_DIST += \ alephdir/ChangeLog \ - alephdir/Makefile \ alephdir/aleph.defines \ alephdir/aleph.version +# Aleph Tests +# +aleph_tests = alephdir/aleph.test + +EXTRA_DIST += $(aleph_tests) + +if ALEPH +TESTS += $(aleph_tests) +endif ALEPH + diff --git a/Build/source/texk/web2c/alephdir/com16bit.ch b/Build/source/texk/web2c/alephdir/com16bit.ch index a519182f973..87ceac71690 100644 --- a/Build/source/texk/web2c/alephdir/com16bit.ch +++ b/Build/source/texk/web2c/alephdir/com16bit.ch @@ -786,7 +786,7 @@ been commented~out. @y @z -@x [8.112] l.2435 - Efficiency. +@x [8.112] l.2450 - Efficiency. macros are simplified in the obvious way when |min_quarterword=0|. @^inner loop@>@^system dependencies@> @@ -803,6 +803,11 @@ macros are simplified in the obvious way when |min_quarterword=0|. So they have been simplified here in the obvious way. @^inner loop@>@^system dependencies@> +The \.{WEB} source for \TeX\ defines |hi(#)==#+min_halfword| which can be +simplified when |min_halfword=0|. The Web2C implemetation of \Aleph\ can +use |hi(#)==#| together with |min_halfword<0| as long as |max_halfword| is +sufficiently large. + @d qi(#)==# {to put an |eight_bits| item into a quarterword} @d qo(#)==# {to take an |eight_bits| item from a quarterword} @d hi(#)==# {to put a sixteen-bit item into a halfword} diff --git a/Build/source/texk/web2c/alephdir/om16bit.ch b/Build/source/texk/web2c/alephdir/om16bit.ch index 9017f677d10..d07ec58a03a 100644 --- a/Build/source/texk/web2c/alephdir/om16bit.ch +++ b/Build/source/texk/web2c/alephdir/om16bit.ch @@ -177,7 +177,7 @@ if the subrange is `|-128..127|'. @d max_halfword==65535 {largest allowable value in a |halfword|} @y @d max_quarterword=@"FFFF {largest allowable value in a |quarterword|} -@d min_halfword=0 {smallest allowable value in a |halfword|} +@d min_halfword=-@"3FFFFFFF {smallest allowable value in a |halfword|} @d max_halfword=@"3FFFFFFF {largest allowable value in a |halfword|} @z %--------------------------------------- @@ -189,7 +189,15 @@ if (min_quarterword>0)or(max_quarterword<@"7FFF) then bad:=11; if (min_halfword>0)or(max_halfword<@"3FFFFFFF) then bad:=12; @z %--------------------------------------- -@x [8] m.111 l.2423 - Omega +@x [8.111] l.2435 - min_halfword and max_halfword +if (mem_min=max_halfword)or@| + (mem_bot-mem_min>max_halfword+1) then bad:=14; +@y +if (mem_bot-sup_main_memory=max_halfword) then bad:=14; +@z +%--------------------------------------- +@x [8] m.111 l.2438 - Omega if font_max>font_base+256 then bad:=16; @y if font_max>font_base+@"10000 then bad:=16; diff --git a/Build/source/texk/web2c/alephdir/omocp.ch b/Build/source/texk/web2c/alephdir/omocp.ch index 039903327fb..3150d5943a9 100644 --- a/Build/source/texk/web2c/alephdir/omocp.ch +++ b/Build/source/texk/web2c/alephdir/omocp.ch @@ -644,7 +644,7 @@ else begin while r <> 0 do begin p:=q; q:=r; r:=ocp_lstack_lnext(r); end; - ocp_lstack_lnext(p) := null; + ocp_lstack_lnext(p) := 0; end end; end; diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index 149b3660e15..286ad12a0a0 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,8 @@ +2011-12-06 Peter Breitenlohner + + * setupvar.c (setupboundvariable): Warning message: the bad + value can be from the environment or from texmf.cnf. + 2011-10-11 Peter Breitenlohner * texmfmp.c [WIN32]: Slightly reformulate Byte order marks. @@ -125,16 +130,16 @@ Avoid 'differ in signedness' warnings. texmfmp.c (input_line): Caat input_line2() arg2 to 'char *'. -2011-03-07 Peter Breitenlohner - - * setupvar.c (setupboundvariable): `program_invocation_name' has - been renamed into `kpse_invocation_name'. - 2011-03-10 Peter Breitenlohner * texmfmp.c (calledit): [__MINGW32__] Drop win32_system() and use system() as for all other systems. +2011-03-07 Peter Breitenlohner + + * setupvar.c (setupboundvariable): `program_invocation_name' has + been renamed into `kpse_invocation_name'. + 2010-06-10 Peter Breitenlohner Reorganize web2c headers. diff --git a/Build/source/texk/web2c/lib/setupvar.c b/Build/source/texk/web2c/lib/setupvar.c index a37b3f713a6..b44ddc7e71c 100644 --- a/Build/source/texk/web2c/lib/setupvar.c +++ b/Build/source/texk/web2c/lib/setupvar.c @@ -22,7 +22,7 @@ setupboundvariable (integer *var, const_string var_name, integer dflt) But negative numbers are always wrong. */ if (conf_val < 0 || (conf_val == 0 && dflt > 0)) { fprintf (stderr, - "%s: Bad value (%ld) in texmf.cnf for %s, keeping %ld.\n", + "%s: Bad value (%ld) in environment or texmf.cnf for %s, keeping %ld.\n", kpse_invocation_name, (long) conf_val, var_name, (long) dflt); } else { diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 19346044ab9..d93aa045c0d 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2011-12-08 Peter Breitenlohner + + * ptex-base.ch: Ensure that `hi(#)==#'. + 2011-11-25 Peter Breitenlohner * am/ptex.am (pdvitype_CPPFLAGS): Replace '-DDHEX_CHAR_CODE' by diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch index 74325111e22..569018c2946 100644 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch +++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch @@ -306,13 +306,26 @@ k:=first; while k < last do begin print_buffer(k) end; if last<>first then for k:=first to last-1 do print(buffer[k]); @z +@x [8.111] l.2436 - pTeX: check hi/ho + (mem_top+sup_main_memory>=max_halfword) then bad:=14; +@y + (mem_top+sup_main_memory>=max_halfword)or@| + (hi(0)<>0) then bad:=14; +@z + +@x [8.112] l.2450 - pTeX: hi/ho +sufficiently large. +@y +sufficiently large and this is required for p\TeX. +@z + @x [8.112] l.2588 - pTeX: @d ho(#)==# {to take a sixteen-bit item from a halfword} @y @d ho(#)==# {to take a sixteen-bit item from a halfword} -@d KANJI(#)==# {pTeX: to output an KANJI code into a halfword} -@d tokanji(#)==# {pTeX: to take an KANJI code into a halfword} -@d tonum(#)==# {pTeX: to put an KANJI code into a halfword} +@d KANJI(#)==# {pTeX: to output a KANJI code} +@d tokanji(#)==# {pTeX: to take a KANJI code from a halfword} +@d tonum(#)==# {pTeX: to put a KANJI code into a halfword} @z @x [10.135] l.2895 - pTeX: box_dir diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch index 7637ce1ad55..ef5e87212f7 100644 --- a/Build/source/texk/web2c/tex.ch +++ b/Build/source/texk/web2c/tex.ch @@ -936,8 +936,8 @@ noreturn procedure confusion(@!s:str_number); % [8.110] Make it easy to change constants. Do not increase % max_quarterword without changing the memoryword structure in `texmfmem.h'. -% If you set min_quarterword or min_halfword to a non-zero value, you have -% to remove the definitions of qi/qo, hi/ho in this change file! +% If you set min_quarterword to a non-zero value, you have to remove the +% definitions of qi/qo in this change file! @x [8.110] l.2405 - increase |max_halfword| @d min_quarterword=0 {smallest allowable value in a |quarterword|} @d max_quarterword=255 {largest allowable value in a |quarterword|} @@ -950,7 +950,15 @@ noreturn procedure confusion(@!s:str_number); @d max_halfword==@"FFFFFFF {largest allowable value in a |halfword|} @z -@x [8.111] l.2422 - max_font_max +@x [8.111] l.2435 - min_halfword and max_halfword +if (mem_min=max_halfword)or@| + (mem_bot-mem_min>max_halfword+1) then bad:=14; +@y +if (mem_bot-sup_main_memory=max_halfword) then bad:=14; +@z + +@x [8.111] l.2437 - max_font_max if (font_basemax_quarterword) then bad:=15; if font_max>font_base+256 then bad:=16; @y @@ -958,7 +966,7 @@ if (max_font_maxmax_halfword) then bad:=15; if font_max>font_base+max_font_max then bad:=16; @z -@x [8.112] l.2435 - Efficiency. +@x [8.112] l.2450 - Efficiency. macros are simplified in the obvious way when |min_quarterword=0|. @^inner loop@>@^system dependencies@> @@ -975,6 +983,11 @@ macros are simplified in the obvious way when |min_quarterword=0|. So they have been simplified here in the obvious way. @^inner loop@>@^system dependencies@> +The \.{WEB} source for \TeX\ defines |hi(#)==#+min_halfword| which can be +simplified when |min_halfword=0|. The Web2C implemetation of \TeX\ can use +|hi(#)==#| together with |min_halfword<0| as long as |max_halfword| is +sufficiently large. + @d qi(#)==# {to put an |eight_bits| item into a quarterword} @d qo(#)==# {to take an |eight_bits| item from a quarterword} @d hi(#)==# {to put a sixteen-bit item into a halfword} diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 046a2c5110d..fbe2536760d 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -70,7 +70,7 @@ 2010-09-28 Peter Breitenlohner * xetex.test (new): Just testing 'xetex -version'. - * xetexdir/am/xetex.am: Adjusted. + * am/xetex.am: Adjusted. 2010-06-10 Peter Breitenlohner -- cgit v1.2.3