texlive[61575] make tangle-sh, ctangleboot-sh, and make report what
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 11 23:47:10 CET 2022
Revision: 61575
http://tug.org/svn/texlive?view=revision&revision=61575
Author: karl
Date: 2022-01-11 23:47:10 +0100 (Tue, 11 Jan 2022)
Log Message:
-----------
make tangle-sh, ctangleboot-sh, and make report what they do
Modified Paths:
--------------
trunk/Build/source/doc/ChangeLog
trunk/Build/source/doc/tlbuild.info
trunk/Build/source/doc/tlbuild.texi
trunk/Build/source/texk/web2c/ChangeLog
trunk/Build/source/texk/web2c/Makefile.am
trunk/Build/source/texk/web2c/Makefile.in
trunk/Build/source/texk/web2c/alephdir/ChangeLog
trunk/Build/source/texk/web2c/alephdir/am/aleph.am
trunk/Build/source/texk/web2c/am/bootstrap.am
trunk/Build/source/texk/web2c/am/texmf.am
trunk/Build/source/texk/web2c/am/web.am
trunk/Build/source/texk/web2c/ctangleboot-sh.in
trunk/Build/source/texk/web2c/eptexdir/ChangeLog
trunk/Build/source/texk/web2c/eptexdir/am/eptex.am
trunk/Build/source/texk/web2c/etexdir/ChangeLog
trunk/Build/source/texk/web2c/etexdir/am/etex.am
trunk/Build/source/texk/web2c/euptexdir/ChangeLog
trunk/Build/source/texk/web2c/euptexdir/am/euptex.am
trunk/Build/source/texk/web2c/help.h
trunk/Build/source/texk/web2c/hitexdir/ChangeLog
trunk/Build/source/texk/web2c/hitexdir/am/hitex.am
trunk/Build/source/texk/web2c/man/ChangeLog
trunk/Build/source/texk/web2c/man/Makefile.am
trunk/Build/source/texk/web2c/mfluadir/ChangeLog
trunk/Build/source/texk/web2c/mfluadir/am/mflua.am
trunk/Build/source/texk/web2c/mfluajitdir/ChangeLog
trunk/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
trunk/Build/source/texk/web2c/mplibdir/ChangeLog
trunk/Build/source/texk/web2c/mplibdir/am/libmplib.am
trunk/Build/source/texk/web2c/mplibdir/am/mplib.am
trunk/Build/source/texk/web2c/omegaware/ChangeLog
trunk/Build/source/texk/web2c/omegaware/am/omegaware.am
trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
trunk/Build/source/texk/web2c/pdftexdir/am/pdftex.am
trunk/Build/source/texk/web2c/pmpostdir/ChangeLog
trunk/Build/source/texk/web2c/pmpostdir/am/pmpost.am
trunk/Build/source/texk/web2c/ptexdir/ChangeLog
trunk/Build/source/texk/web2c/ptexdir/am/ptex.am
trunk/Build/source/texk/web2c/tangle-sh.in
trunk/Build/source/texk/web2c/uptexdir/ChangeLog
trunk/Build/source/texk/web2c/uptexdir/am/uptex.am
trunk/Build/source/texk/web2c/xetexdir/ChangeLog
trunk/Build/source/texk/web2c/xetexdir/am/xetex.am
Removed Paths:
-------------
trunk/Build/source/texk/web2c/hitexdir/hilexer.l
trunk/Build/source/texk/web2c/hitexdir/hiparser.y
Property Changed:
----------------
trunk/Build/source/texk/web2c/Makefile.am
trunk/Build/source/texk/web2c/alephdir/am/aleph.am
trunk/Build/source/texk/web2c/am/bootstrap.am
trunk/Build/source/texk/web2c/ctangleboot-sh.in
trunk/Build/source/texk/web2c/mfluadir/am/mflua.am
trunk/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
trunk/Build/source/texk/web2c/mplibdir/am/libmplib.am
trunk/Build/source/texk/web2c/mplibdir/am/mplib.am
trunk/Build/source/texk/web2c/omegaware/am/omegaware.am
trunk/Build/source/texk/web2c/pmpostdir/am/pmpost.am
trunk/Build/source/texk/web2c/tangle-sh.in
trunk/Build/source/texk/web2c/xetexdir/am/xetex.am
Modified: trunk/Build/source/doc/ChangeLog
===================================================================
--- trunk/Build/source/doc/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/doc/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,8 @@
+2022-01-11 Karl Berry <karl at freefriends.org>
+
+ * tlbuild.texi (Prerequisites): mention use of GNU make $@ feature
+ wrt tangle-sh[.in], etc.
+
2021-07-06 Karl Berry <karl at tug.org>
* tlbuild.texi (Build one package, Build one engine): more
Modified: trunk/Build/source/doc/tlbuild.info
===================================================================
(Binary files differ)
Modified: trunk/Build/source/doc/tlbuild.texi
===================================================================
--- trunk/Build/source/doc/tlbuild.texi 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/doc/tlbuild.texi 2022-01-11 22:47:10 UTC (rev 61575)
@@ -2,7 +2,7 @@
@setfilename tlbuild.info
@set version 2021
- at set month-year September 2021
+ at set month-year January 2022
@set mytitle Building @TeX{} Live (@value{version})
@settitle @value{mytitle}
@@ -15,7 +15,7 @@
This file documents the @TL{} build system and more.
@noindent
-Copyright @copyright{} 2016--2021 Karl Berry.@*
+Copyright @copyright{} 2016--2022 Karl Berry.@*
Copyright @copyright{} 2013--2015 Karl Berry & Peter Breitenlohner.
Permission is granted to make and distribute verbatim copies of this
@@ -220,16 +220,22 @@
@cindex compilers, C and C++11
Overall, building the @TL{} programs, when using all libraries from
the TL source tree, requires C and C++11 compilers and GNU
- at code{make}. If @code{make} from your @code{PATH} is not GNU make,
+ at code{make}. If @code{make} from your @code{PATH} is not GNU @code{make,}
you can set the @code{MAKE} environment variable to whatever is necessary.
@cindex GNU @code{make}, required
@cindex @code{gmake}, required
@cindex FreeType
+ at cindex @code{$@@} target in normal @code{make} rules
GNU @code{make} is required only because of some third-party
-libraries, notably FreeType; all the TL-maintained directories (and
-Automake/Autoconf output in general) work with any reasonable
- at code{make}.
+libraries, notably FreeType; Automake/Autoconf output in general, and
+the TL-maintained directories, work with any reasonable
+ at code{make}. at footnote{There is one exception in TL: the
+ at code{tangle-sh} and related rules use @code{$@@} to mean the target
+name, a feature not present in all @code{make}s. This could be
+alleviated by some laborious editing, but since there's no way to
+avoid GNU @code{make} for the entire tree, it does not seem worth the
+trouble.}
@cindex C++11, required
A C++11 compiler is similarly required because of the third-party
Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,24 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * tangle-sh.in,
+ * ctangleboot-sh.in: be more verbose if AM_V_P.
+ https://tug.org/pipermail/tlbuild/2022q1/005001.html
+ Mention the Automake manual section which is the source for
+ the approach taken:
+ https://gnu.org/s/automake/manual/html_node/Multiple-Outputs.html
+
+ * am/bootstrap.am: do not silence {,c}tangle{,boot}.
+ (common_ctangle): change to variable from common-ctangle target,
+ to avoid endless remakes due to (I think) conflict with
+ common-ctangle stamp file created by ctangleboot-sh[.in].
+ (tangle.web): replace ancient message about web.tar.gz.
+
+ * am/texmf.am: do not silence tangle-sh.
+
+ * Makefile.am,
+ * help.h,
+ * am/web.am: copyright 2022.
+
2022-01-09 Andreas Scherer <https://ascherer.github.io>
* help.h,
@@ -5,7 +26,7 @@
2022-01-07 Karl Berry <karl at freefriends.org>
- * (MFTHELP): consistent argument names. Report from
+ * help.h (MFTHELP): consistent argument names. Report from
Laurence Finston, tex-k 22 Dec 2021 12:38:36.
2022-01-06 Andreas Scherer <https://ascherer.github.io>
Modified: trunk/Build/source/texk/web2c/Makefile.am
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/Makefile.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,7 +1,7 @@
## $Id$
## Makefile.am for the TeX Live subdirectory texk/web2c/.
##
-## Copyright 2017-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2017-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
##
Property changes on: trunk/Build/source/texk/web2c/Makefile.am
___________________________________________________________________
Modified: svn:keywords
## -1 +1 ##
-Date Author Id
\ No newline at end of property
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/Makefile.in 2022-01-11 22:47:10 UTC (rev 61575)
@@ -112,8 +112,7 @@
mfluajit$(EXEEXT) mfluajit-nowin$(EXEEXT) mpost$(EXEEXT) \
pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) \
$(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) \
- euptex$(EXEEXT) hitex$(EXEEXT) hishrink$(EXEEXT) \
- histretch$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+ euptex$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
pdftosrc$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) \
luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
$(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
@@ -135,17 +134,17 @@
$(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) \
- $(am__EXEEXT_43)
-TESTS = tangle.test $(am__EXEEXT_46) ctiedir/ctie.test \
+ $(am__EXEEXT_43) $(am__EXEEXT_44)
+TESTS = tangle.test $(am__EXEEXT_47) ctiedir/ctie.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_63) $(am__append_66) \
$(am__append_68) $(am__append_73) $(am__append_76) \
- $(am__append_78) $(am__append_82) $(am__append_85) \
- $(am__append_106) $(am__append_107) $(am__append_108) \
- $(am__append_109) $(am__append_117) $(am__append_119) \
- $(am__append_121) $(am__append_156) libmd5/md5.test
+ $(am__append_78) $(am__append_83) $(am__append_86) \
+ $(am__append_107) $(am__append_108) $(am__append_109) \
+ $(am__append_110) $(am__append_118) $(am__append_120) \
+ $(am__append_122) $(am__append_157) libmd5/md5.test
@WEB_TRUE at am__append_1 = $(web_programs)
@WEB_TRUE at am__append_2 = $(web_tests)
@TEX_TRUE at am__append_3 = tex
@@ -231,46 +230,47 @@
@EUPTEX_TRUE at am__append_79 = euptrip.diffs
@EUPTEX_TRUE at am__append_80 = euptrip-clean
@HITEX_TRUE at am__append_81 = hitex hishrink histretch
- at HITEX_TRUE@am__append_82 = $(hitex_tests)
- at MINGW32_TRUE@am__append_83 = \
+ at HITEX_TRUE@am__append_82 = himktables
+ at HITEX_TRUE@am__append_83 = $(hitex_tests)
+ at MINGW32_TRUE@am__append_84 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
- at PDFTEX_TRUE@am__append_84 = pdftex ttf2afm pdftosrc
- at PDFTEX_TRUE@am__append_85 = $(pdftex_tests) $(ttf2afm_tests) \
+ at PDFTEX_TRUE@am__append_85 = pdftex ttf2afm pdftosrc
+ at PDFTEX_TRUE@am__append_86 = $(pdftex_tests) $(ttf2afm_tests) \
@PDFTEX_TRUE@ $(pdftosrc_tests)
- at LUATEX_TRUE@am__append_86 = luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_87 = call_luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_88 = install-luatex-links
- at LUATEX_TRUE@@WIN32_TRUE at am__append_89 = uninstall-luatex-links
- at LUATEX_TRUE@@WIN32_FALSE at am__append_90 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
- at LUAHBTEX_TRUE@am__append_91 = luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_92 = call_luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_93 = install-luahbtex-links
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_94 = uninstall-luahbtex-links
+ at LUATEX_TRUE@am__append_87 = luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_88 = call_luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_89 = install-luatex-links
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_90 = uninstall-luatex-links
+ at LUATEX_TRUE@@WIN32_FALSE at am__append_91 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+ at LUAHBTEX_TRUE@am__append_92 = luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_93 = call_luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_94 = install-luahbtex-links
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_95 = uninstall-luahbtex-links
# keep texlua[c] as links to luatex unless luatex is not installed.
- at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_95 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
- at LUAJITTEX_TRUE@am__append_96 = luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_97 = call_luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_98 = install-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_99 = uninstall-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_100 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
- at LUAJITHBTEX_TRUE@am__append_101 = luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_102 = call_luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_103 = install-luajithbtex-links
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_104 = uninstall-luajithbtex-links
+ at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_96 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
+ at LUAJITTEX_TRUE@am__append_97 = luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_98 = call_luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_99 = install-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_100 = uninstall-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_101 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+ at LUAJITHBTEX_TRUE@am__append_102 = luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_103 = call_luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_104 = install-luajithbtex-links
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_105 = uninstall-luajithbtex-links
# keep texluajit[c] as links to luajittex unless luajittex is not installed.
- at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_105 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
- at LUATEX_TRUE@am__append_106 = $(luatex_tests)
- at LUAHBTEX_TRUE@am__append_107 = $(luahbtex_tests)
- at LUAJITTEX_TRUE@am__append_108 = $(luajittex_tests)
- at LUAJITHBTEX_TRUE@am__append_109 = $(luajithbtex_tests)
- at XETEX_TRUE@am__append_110 = xetex
- at XETEX_MACOSX_TRUE@am__append_111 = -DXETEX_MAC
- at XETEX_MACOSX_TRUE@am__append_112 = -std=c++11
- at XETEX_MACOSX_FALSE@am__append_113 = $(FONTCONFIG_INCLUDES)
- at XETEX_MACOSX_FALSE@am__append_114 = $(FONTCONFIG_LIBS)
- at XETEX_MACOSX_TRUE@am__append_115 = \
+ at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_106 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
+ at LUATEX_TRUE@am__append_107 = $(luatex_tests)
+ at LUAHBTEX_TRUE@am__append_108 = $(luahbtex_tests)
+ at LUAJITTEX_TRUE@am__append_109 = $(luajittex_tests)
+ at LUAJITHBTEX_TRUE@am__append_110 = $(luajithbtex_tests)
+ at XETEX_TRUE@am__append_111 = xetex
+ at XETEX_MACOSX_TRUE@am__append_112 = -DXETEX_MAC
+ at XETEX_MACOSX_TRUE@am__append_113 = -std=c++11
+ at XETEX_MACOSX_FALSE@am__append_114 = $(FONTCONFIG_INCLUDES)
+ at XETEX_MACOSX_FALSE@am__append_115 = $(FONTCONFIG_LIBS)
+ at XETEX_MACOSX_TRUE@am__append_116 = \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.mm \
@@ -277,106 +277,106 @@
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
- at XETEX_MACOSX_FALSE@am__append_116 = \
+ at XETEX_MACOSX_FALSE@am__append_117 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h
- at XETEX_TRUE@am__append_117 = $(xetex_tests)
- at OTANGLE_TRUE@am__append_118 = $(omegaware_programs)
- at OTANGLE_TRUE@am__append_119 = $(OTANGLE_tests) $(OMFONTS_tests)
- at ALEPH_TRUE@am__append_120 = aleph
- at ALEPH_TRUE@am__append_121 = $(aleph_tests)
- at SYNCTEX_TRUE@am__append_122 = synctex
- at SYNCTEX_TRUE@am__append_123 = $(LTLIBSYNCTEX)
- at SYNCTEX_TRUE@am__append_124 = $(LIBSYNCTEX)
- at MINGW32_TRUE@am__append_125 = $(KPATHSEA_INCLUDES)
- at MINGW32_TRUE@am__append_126 = -lshlwapi $(KPATHSEA_LIBS)
- at MINGW32_TRUE@am__append_127 = -lshlwapi
- at TEX_SYNCTEX_TRUE@am__append_128 = -I$(srcdir)/synctexdir \
+ at XETEX_TRUE@am__append_118 = $(xetex_tests)
+ at OTANGLE_TRUE@am__append_119 = $(omegaware_programs)
+ at OTANGLE_TRUE@am__append_120 = $(OTANGLE_tests) $(OMFONTS_tests)
+ at ALEPH_TRUE@am__append_121 = aleph
+ at ALEPH_TRUE@am__append_122 = $(aleph_tests)
+ at SYNCTEX_TRUE@am__append_123 = synctex
+ at SYNCTEX_TRUE@am__append_124 = $(LTLIBSYNCTEX)
+ at SYNCTEX_TRUE@am__append_125 = $(LIBSYNCTEX)
+ at MINGW32_TRUE@am__append_126 = $(KPATHSEA_INCLUDES)
+ at MINGW32_TRUE@am__append_127 = -lshlwapi $(KPATHSEA_LIBS)
+ at MINGW32_TRUE@am__append_128 = -lshlwapi
+ at TEX_SYNCTEX_TRUE@am__append_129 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
- at TEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_LIBS)
- at TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_DEPEND)
- at TEX_SYNCTEX_TRUE@am__append_131 = \
+ at TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_LIBS)
+ at TEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_DEPEND)
+ at TEX_SYNCTEX_TRUE@am__append_132 = \
@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
- at ETEX_SYNCTEX_TRUE@am__append_132 = -I$(srcdir)/synctexdir \
+ at ETEX_SYNCTEX_TRUE@am__append_133 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
- at ETEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_LIBS)
- at ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_DEPEND)
- at ETEX_SYNCTEX_TRUE@am__append_135 = \
+ at ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_LIBS)
+ at ETEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_DEPEND)
+ at ETEX_SYNCTEX_TRUE@am__append_136 = \
@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
- at PTEX_SYNCTEX_TRUE@am__append_136 = -I$(srcdir)/synctexdir \
+ at PTEX_SYNCTEX_TRUE@am__append_137 = -I$(srcdir)/synctexdir \
@PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
- at PTEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_LIBS)
- at PTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_DEPEND)
- at PTEX_SYNCTEX_TRUE@am__append_139 = \
+ at PTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_LIBS)
+ at PTEX_SYNCTEX_TRUE@am__append_139 = $(ZLIB_DEPEND)
+ at PTEX_SYNCTEX_TRUE@am__append_140 = \
@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
- at UPTEX_SYNCTEX_TRUE@am__append_140 = -I$(srcdir)/synctexdir \
+ at UPTEX_SYNCTEX_TRUE@am__append_141 = -I$(srcdir)/synctexdir \
@UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
- at UPTEX_SYNCTEX_TRUE@am__append_141 = $(ZLIB_LIBS)
- at UPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_DEPEND)
- at UPTEX_SYNCTEX_TRUE@am__append_143 = \
+ at UPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_LIBS)
+ at UPTEX_SYNCTEX_TRUE@am__append_143 = $(ZLIB_DEPEND)
+ at UPTEX_SYNCTEX_TRUE@am__append_144 = \
@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
- at EPTEX_SYNCTEX_TRUE@am__append_144 = -I$(srcdir)/synctexdir \
+ at EPTEX_SYNCTEX_TRUE@am__append_145 = -I$(srcdir)/synctexdir \
@EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
- at EPTEX_SYNCTEX_TRUE@am__append_145 = $(ZLIB_LIBS)
- at EPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_DEPEND)
- at EPTEX_SYNCTEX_TRUE@am__append_147 = \
+ at EPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_LIBS)
+ at EPTEX_SYNCTEX_TRUE@am__append_147 = $(ZLIB_DEPEND)
+ at EPTEX_SYNCTEX_TRUE@am__append_148 = \
@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
- at EUPTEX_SYNCTEX_TRUE@am__append_148 = -I$(srcdir)/synctexdir \
+ at EUPTEX_SYNCTEX_TRUE@am__append_149 = -I$(srcdir)/synctexdir \
@EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
- at EUPTEX_SYNCTEX_TRUE@am__append_149 = $(ZLIB_LIBS)
- at EUPTEX_SYNCTEX_TRUE@am__append_150 = $(ZLIB_DEPEND)
- at EUPTEX_SYNCTEX_TRUE@am__append_151 = \
+ at EUPTEX_SYNCTEX_TRUE@am__append_150 = $(ZLIB_LIBS)
+ at EUPTEX_SYNCTEX_TRUE@am__append_151 = $(ZLIB_DEPEND)
+ at EUPTEX_SYNCTEX_TRUE@am__append_152 = \
@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
- at PDFTEX_SYNCTEX_TRUE@am__append_152 = -I$(srcdir)/synctexdir \
+ at PDFTEX_SYNCTEX_TRUE@am__append_153 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
- at PDFTEX_SYNCTEX_TRUE@am__append_153 = \
+ at PDFTEX_SYNCTEX_TRUE@am__append_154 = \
@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
- at XETEX_SYNCTEX_TRUE@am__append_154 = -I$(srcdir)/synctexdir \
+ at XETEX_SYNCTEX_TRUE@am__append_155 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
- at XETEX_SYNCTEX_TRUE@am__append_155 = \
+ at XETEX_SYNCTEX_TRUE@am__append_156 = \
@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
- at SYNCTEX_TRUE@am__append_156 = $(synctex_tests)
+ at SYNCTEX_TRUE@am__append_157 = $(synctex_tests)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -488,10 +488,11 @@
@MP_TRUE@@WIN32_TRUE at am__EXEEXT_37 = call_mpost$(EXEEXT)
@PMP_TRUE@@WIN32_TRUE at am__EXEEXT_38 = call_pmpost$(EXEEXT)
@UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_upmpost$(EXEEXT)
- at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_40 = call_luatex$(EXEEXT)
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_41 = call_luahbtex$(EXEEXT)
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_42 = call_luajittex$(EXEEXT)
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_43 = \
+ at HITEX_TRUE@am__EXEEXT_40 = himktables$(EXEEXT)
+ at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_41 = call_luatex$(EXEEXT)
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_42 = call_luahbtex$(EXEEXT)
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_43 = call_luajittex$(EXEEXT)
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_44 = \
@LUAJITHBTEX_TRUE@@WIN32_TRUE@ call_luajithbtex$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -1391,6 +1392,10 @@
gftype_OBJECTS = $(nodist_gftype_OBJECTS)
gftype_LDADD = $(LDADD)
gftype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+himktables_SOURCES = himktables.c
+himktables_OBJECTS = himktables.$(OBJEXT)
+himktables_LDADD = $(LDADD)
+himktables_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
nodist_hishrink_OBJECTS = hishrink-hitables.$(OBJEXT) \
hitexdir/hishrink-hilexer.$(OBJEXT) \
hitexdir/hishrink-hiparser.$(OBJEXT) \
@@ -1776,7 +1781,8 @@
./$(DEPDIR)/euptex-euptex-pool.Po \
./$(DEPDIR)/euptex-euptex0.Po ./$(DEPDIR)/euptex-euptexini.Po \
./$(DEPDIR)/gftodvi.Po ./$(DEPDIR)/gftopk.Po \
- ./$(DEPDIR)/gftype.Po ./$(DEPDIR)/hishrink-hishrink.Po \
+ ./$(DEPDIR)/gftype.Po ./$(DEPDIR)/himktables.Po \
+ ./$(DEPDIR)/hishrink-hishrink.Po \
./$(DEPDIR)/hishrink-hitables.Po \
./$(DEPDIR)/histretch-histretch.Po \
./$(DEPDIR)/histretch-hitables.Po ./$(DEPDIR)/hitex-hiput.Po \
@@ -2528,7 +2534,7 @@
$(dist_etex_SOURCES) $(nodist_etex_SOURCES) \
$(dist_euptex_SOURCES) $(nodist_euptex_SOURCES) \
$(gftodvi_SOURCES) $(nodist_gftodvi_SOURCES) \
- $(nodist_gftopk_SOURCES) $(nodist_gftype_SOURCES) \
+ $(nodist_gftopk_SOURCES) $(nodist_gftype_SOURCES) himktables.c \
$(nodist_hishrink_SOURCES) $(nodist_histretch_SOURCES) \
$(nodist_hitex_SOURCES) $(nodist_initex_SOURCES) \
$(nodist_luahbtex_SOURCES) $(nodist_EXTRA_luahbtex_SOURCES) \
@@ -2577,11 +2583,11 @@
$(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) $(md5main_SOURCES) $(dist_mf_SOURCES) \
- $(dist_mf_nowin_SOURCES) $(dist_mflua_SOURCES) \
- $(dist_mfluajit_SOURCES) $(pbibtex_SOURCES) \
- $(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \
- $(pdvitype_SOURCES) $(ppltotf_SOURCES) \
+ $(gftodvi_SOURCES) himktables.c $(md5main_SOURCES) \
+ $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
+ $(dist_mflua_SOURCES) $(dist_mfluajit_SOURCES) \
+ $(pbibtex_SOURCES) $(am__dist_pdftex_SOURCES_DIST) \
+ $(pdftosrc_SOURCES) $(pdvitype_SOURCES) $(ppltotf_SOURCES) \
$(am__dist_ptex_SOURCES_DIST) $(ptftopl_SOURCES) \
$(synctex_SOURCES) $(am__dist_tex_SOURCES_DIST) \
$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
@@ -2793,14 +2799,14 @@
bases=`echo $$bases`
AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_44 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_45 = 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_45 = $(am__EXEEXT_44) tests/bibtex-openout-test.pl \
+am__EXEEXT_46 = $(am__EXEEXT_45) tests/bibtex-openout-test.pl \
tests/bibtex-longline-test.pl tests/bibtex-mem.test \
tests/bibtex-bigauth.test tests/bibtex-auxinclude.test
- at WEB_TRUE@am__EXEEXT_46 = $(am__EXEEXT_45)
+ at WEB_TRUE@am__EXEEXT_47 = $(am__EXEEXT_46)
TEST_SUITE_LOG = test-suite.log
am__test_logs1 = $(TESTS:=.log)
am__test_logs2 = $(am__test_logs1:@EXEEXT at .log=.log)
@@ -3024,7 +3030,7 @@
NMEDIT = @NMEDIT@
OBJCXX = @OBJCXX@
OBJCXXDEPMODE = @OBJCXXDEPMODE@
-OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_112)
+OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_113)
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTANGLE = @OTANGLE@
@@ -3166,8 +3172,8 @@
libluajithbtexspecific.a libluaffi.a libluaharfbuzz.a \
libluajitharfbuzz.a libxetex.a libsynctex.a libmd5.a
EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_124)
-lib_LTLIBRARIES = $(am__append_123)
+lib_LIBRARIES = $(am__append_125)
+lib_LTLIBRARIES = $(am__append_124)
dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
nodist_man_MANS =
TEST_EXTENSIONS = .pl .test
@@ -3655,16 +3661,16 @@
$(am__append_79)
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_90) \
- $(am__append_95) $(am__append_100) $(am__append_105)
+ $(am__append_49) $(am__append_54) $(am__append_91) \
+ $(am__append_96) $(am__append_101) $(am__append_106)
install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
$(am__append_39) $(am__append_47) $(am__append_52) \
- $(am__append_88) $(am__append_93) $(am__append_98) \
- $(am__append_103)
+ $(am__append_89) $(am__append_94) $(am__append_99) \
+ $(am__append_104)
uninstall_exe_links = $(am__append_13) $(am__append_23) \
$(am__append_32) $(am__append_40) $(am__append_48) \
- $(am__append_53) $(am__append_89) $(am__append_94) \
- $(am__append_99) $(am__append_104)
+ $(am__append_53) $(am__append_90) $(am__append_95) \
+ $(am__append_100) $(am__append_105)
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 \
@@ -3797,9 +3803,12 @@
nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
tangleboot_DEPENDENCIES = $(default_dependencies)
nodist_ctangle_SOURCES = ctangle.c cweb.c
+#
# ctangle.c and cweb.c are special cases, since they are needed to compile
# themselves. We depend on ctangleboot, even though we might not use it.
ctangleboot = AM_V_P=$(AM_V_P) $(SHELL) ./ctangleboot-sh $@
+#
+common_ctangle = ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh
nodist_ctangleboot_SOURCES = ctangleboot.c cwebboot.c
ctangleboot_DEPENDENCIES = $(default_dependencies)
web_programs = bibtex dvicopy dvitype gftodvi gftopk gftype mft \
@@ -3837,18 +3846,18 @@
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
nodist_initex_SOURCES = callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_128)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_129)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_129)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_130)
# 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_131)
+dist_tex_SOURCES = texextra.c $(am__append_132)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_130)
+tex_prereq = texd.h $(am__append_131)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -4269,10 +4278,12 @@
pmp_ctangle = $(ctangle_silent)CWEBINPUTS=.:$(srcdir)/pmpostdir $(ctangle)
# Creating several files: need stamp file and two rules with identical recipes
pmp_ctangle_sh = CWEBINPUTS=.:$(srcdir)/pmpostdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(CTANGLE)
-nodist_pmpost_SOURCES = $(pmp_c_h) $(pmpmath_c_h) $(pmpmathbinary_c_h) $(pmpmathdecimal_c_h) \
+nodist_pmpost_SOURCES = $(pmp_c_h) $(pmpmath_c_h) $(pmpmathbinary_c_h) \
+ $(pmpmathdecimal_c_h) \
$(pmpmathdouble_c_h) pmpost.c $(pmpstrings_c_h) $(pmpxout_c_h) \
$(ppngout_c_h) $(ppsout_c_h) $(psvgout_c_h) ptfmin.c
+#
pmp_c_h = pmp.c pmplib.h pmpmp.h
pmpmath_c_h = pmpmath.c pmpmath.h
pmpmathbinary_c_h = pmpmathbinary.c pmpmathbinary.h
@@ -4324,10 +4335,10 @@
mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_132)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_133)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_133)
+etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_134)
etex_DEPENDENCIES = $(ZLIB_DEPEND)
# e-TeX C sources
@@ -4334,11 +4345,11 @@
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_135)
+ etexdir/etex_version.h $(am__append_136)
# 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_134)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_135)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -4367,10 +4378,10 @@
pproglib = lib/libp.a
libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h ptexdir/kanji_dump.c
libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_136)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_137)
# With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_137)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_138)
ptex_DEPENDENCIES = $(ptex_dependencies)
# pTeX C sources
@@ -4377,10 +4388,10 @@
ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
- ptexdir/ptex_version.h $(am__append_139)
+ ptexdir/ptex_version.h $(am__append_140)
# 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_138)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_139)
ptex_web_srcs = \
tex.web \
tex.ch \
@@ -4424,11 +4435,11 @@
ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test \
ptexdir/skipjfmp.test
eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
- $(ZLIB_INCLUDES) $(am__append_144)
+ $(ZLIB_INCLUDES) $(am__append_145)
# 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_145)
+ $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_146)
eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
# e-pTeX C sources
@@ -4435,11 +4446,11 @@
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_147)
+ eptexdir/eptex_version.h $(am__append_148)
# 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_146)
+ eptexdir/eptex_version.h $(am__append_147)
eptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4475,10 +4486,10 @@
upweb_programs = upbibtex updvitype uppltotf uptftopl
libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_140)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_141)
# With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_141)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_142)
uptex_DEPENDENCIES = $(uptex_dependencies)
# upTeX C sources
@@ -4485,11 +4496,11 @@
uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
- uptexdir/uptex_version.h $(am__append_143)
+ uptexdir/uptex_version.h $(am__append_144)
# We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
uptex_prereq = uptexd.h ptexdir/ptex_version.h \
- uptexdir/uptex_version.h $(am__append_142)
+ uptexdir/uptex_version.h $(am__append_143)
uptex_web_srcs = \
tex.web \
tex.ch \
@@ -4537,11 +4548,11 @@
uptexdir/gkhuge.test
euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
- -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_148)
+ -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_149)
# 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_149)
+ $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_150)
euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
# e-upTeX C sources
@@ -4548,12 +4559,12 @@
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_151)
+ $(am__append_152)
# 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 \
ptexdir/ptex_version.h eptexdir/eptex_version.h \
- uptexdir/uptex_version.h $(am__append_150)
+ uptexdir/uptex_version.h $(am__append_151)
euptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4608,12 +4619,18 @@
# HiTeX C/yacc/lex sources generated using ctangle.
# For each cweb (.w) source file, list the files generated.
-hiformat_c_h_l_y = hibasetypes.h hierror.h hiformat.h \
+hiformat_c_h_l_y = \
+ hibasetypes.h \
+ hierror.h \
+ hiformat.c hiformat.h \
+ higet.c higet.h \
+ hilexer.l \
himktables.c \
+ hiparser.y \
hiput.c hiput.h \
- higet.c higet.h \
- hilexer.l hiparser.y \
- hishrink.c histretch.c
+ hishrink.c \
+ hiskip.c \
+ histretch.c
hitex_c = hitex.c
@@ -4651,7 +4668,7 @@
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_83)
+ $(am__append_84)
@MINGW32_TRUE at REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
@@ -4667,7 +4684,7 @@
# 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_152)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_153)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -4680,7 +4697,7 @@
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_153)
+ $(am__append_154)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -5356,18 +5373,18 @@
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_111) \
- $(am__append_113)
+ $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_112) \
+ $(am__append_114)
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_114)
+ $(am__append_115)
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 at xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_154)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_155)
xetex_CFLAGS = $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -5376,7 +5393,7 @@
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_155)
+ $(am__append_156)
xetex_ch_srcs = \
xetexdir/xetex.web \
xetexdir/tex.ch0 \
@@ -5408,7 +5425,7 @@
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_115) $(am__append_116)
+ xetexdir/image/pngimage.h $(am__append_116) $(am__append_117)
# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -5512,13 +5529,13 @@
synctex_SOURCES = \
synctexdir/synctex_main.c
-synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_125)
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_126)
+synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_126)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_127)
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_127)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_128)
libsynctex_la_SOURCES = \
synctexdir/synctex_parser.c \
synctexdir/synctex_parser_local.h \
@@ -8065,6 +8082,10 @@
gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
@rm -f gftype$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS)
+
+himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
+ @rm -f himktables$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS)
hitexdir/$(am__dirstamp):
@$(MKDIR_P) hitexdir
@: > hitexdir/$(am__dirstamp)
@@ -8473,6 +8494,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftodvi.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftopk.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftype.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/himktables.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hishrink-hishrink.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hishrink-hitables.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/histretch-histretch.Po at am__quote@ # am--include-marker
@@ -19825,6 +19847,7 @@
-rm -f ./$(DEPDIR)/gftodvi.Po
-rm -f ./$(DEPDIR)/gftopk.Po
-rm -f ./$(DEPDIR)/gftype.Po
+ -rm -f ./$(DEPDIR)/himktables.Po
-rm -f ./$(DEPDIR)/hishrink-hishrink.Po
-rm -f ./$(DEPDIR)/hishrink-hitables.Po
-rm -f ./$(DEPDIR)/histretch-histretch.Po
@@ -20606,6 +20629,7 @@
-rm -f ./$(DEPDIR)/gftodvi.Po
-rm -f ./$(DEPDIR)/gftopk.Po
-rm -f ./$(DEPDIR)/gftype.Po
+ -rm -f ./$(DEPDIR)/himktables.Po
-rm -f ./$(DEPDIR)/hishrink-hishrink.Po
-rm -f ./$(DEPDIR)/hishrink-hitables.Po
-rm -f ./$(DEPDIR)/histretch-histretch.Po
@@ -21402,9 +21426,9 @@
.PRECIOUS: %.ch %.p %.c
tangle.c tangle.h: tangle-web2c
- @$(web2c) tangle
+ $(web2c) tangle
tangle-web2c: tangle.p $(web2c_depend)
- @$(web2c) tangle
+ $(web2c) tangle
# tangle.p is a special case, since it is needed to compile itself. We
# convert and compile the (distributed) tangleboot.pin to make a tangle
# which we use to make the other programs. We depend on tangleboot, even
@@ -21411,7 +21435,7 @@
# though we might not use it.
tangle.p: tangleboot$(EXEEXT) tangle.web tangle.ch
$(tangleboot) tangle tangle
- @cmp -s tangle.p $(srcdir)/tangleboot.pin || { \
+ cmp -s tangle.p $(srcdir)/tangleboot.pin || { \
if $(AM_V_P); then \
echo "Updating tangle.p => $(srcdir)/tangleboot.pin"; \
else \
@@ -21418,28 +21442,22 @@
echo " UPD " tangleboot.pin; \
fi; cp -f tangle.p $(srcdir)/tangleboot.pin; }
tangle.web:
- @echo "You seem to be missing tangle.web, perhaps because you" >&2
- @echo "didn't retrieve web.tar.gz, only web2c.tar.gz." >&2
- @echo "You need both." >&2
- @echo >&2
- @echo "web.tar.gz should be available from the" >&2
- @echo "same place that you got web2c.tar.gz." >&2
- @echo "In any case, you can get it from" >&2
- @echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2
+ @echo "You seem to be missing tangle.web, goodbye." >&2
false
tangleboot.c tangleboot.h: tangleboot-web2c
- @$(web2c) tangleboot
+ $(web2c) tangleboot
tangleboot-web2c: tangleboot.p $(web2c_depend)
- @$(web2c) tangleboot
+ $(web2c) tangleboot
# tangleboot.pin is in the distribution
.pin.p:
$(cp_silent)cp -f $< $@
$(tangleboot_OBJECTS): $(tangleboot_DEPENDENCIES)
-ctangle.c: common-ctangle cwebdir/ctangle.w cwebdir/ctang-w2c.ch
- @$(ctangleboot) ctangle ctang-w2c
-cweb.c: common-ctangle cwebdir/common.w cwebdir/comm-w2c.ch
- @$(ctangleboot) common comm-w2c cweb.c
-common-ctangle: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh
+#
+ctangle.c: $(common_ctangle) cwebdir/ctangle.w cwebdir/ctang-w2c.ch
+ $(ctangleboot) ctangle ctang-w2c.ch
+#
+cweb.c: $(common_ctangle) cwebdir/common.w cwebdir/comm-w2c.ch
+ $(ctangleboot) common comm-w2c.ch cweb.c
$(ctangleboot_OBJECTS): $(ctangleboot_DEPENDENCIES)
# ctangleboot.cin and cwebboot.cin are in the distribution
.cin.c:
@@ -21447,6 +21465,8 @@
.hin.h:
$(cp_silent)cp -f $< $@
tangle.log: tangle$(EXEEXT)
+
+# (end of bootstrap.am)
bibtex.c bibtex.h: bibtex-web2c
@$(web2c) bibtex
bibtex-web2c: bibtex.p $(web2c_depend) web2c/cvtbib.sed
@@ -21601,9 +21621,9 @@
# Tangling TeX
tex.p tex.pool: tex-tangle
- @$(texmf_tangle) tex tex-final
+ $(texmf_tangle) tex tex-final
tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch tangle-sh
- @$(texmf_tangle) tex tex-final
+ $(texmf_tangle) tex tex-final
# Generate tex-final.ch
tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
@@ -21643,9 +21663,9 @@
# Tangling Metafont
mf.p mf.pool: mf-tangle
- @$(texmf_tangle) mf mf-final
+ $(texmf_tangle) mf mf-final
mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch tangle-sh
- @$(texmf_tangle) mf mf-final
+ $(texmf_tangle) mf mf-final
# Generate mf-final.ch
mf-final.ch: tie$(EXEEXT) $(mf_ch_src)
@@ -21658,6 +21678,8 @@
trap-clean:
rm -rf trapdir
+# (end of texmf.am)
+
.PHONY: install-mflua-links uninstall-mflua-links
@WIN32_TRUE at install-mflua-links: call_mflua$(EXEEXT)
@MFLUAN_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_mflua$(EXEEXT) $(DESTDIR)$(bindir)/mflua-nowin$(EXEEXT)
@@ -21680,9 +21702,9 @@
# Tangling MFLua
mflua.p mflua.pool: mflua-tangle
- @$(texmf_tangle) mflua mflua
+ $(texmf_tangle) mflua mflua
mflua-tangle: tangle$(EXEEXT) mflua.web mflua.ch tangle-sh
- @$(texmf_tangle) mflua mflua
+ $(texmf_tangle) mflua mflua
# Extract mflua version
$(srcdir)/mfluadir/mflua_version.h: @MAINTAINER_MODE_TRUE@ mfluadir/mf-lua.ch
@@ -21704,6 +21726,8 @@
mfluatrap-clean:
rm -rf mfluatrapdir
+# (end of mflua.am)
+
#libmfluaotfcc_a_DEPENDENCIES = $(ZLIB_DEPEND)
#libmfluajitotfcc_a_DEPENDENCIES = $(ZLIB_DEPEND)
@@ -21736,9 +21760,9 @@
# Tangling MFLuaJIT
mfluajit.p mfluajit.pool: mfluajit-tangle
- @$(texmf_tangle) mfluajit mfluajit
+ $(texmf_tangle) mfluajit mfluajit
mfluajit-tangle: tangle$(EXEEXT) mfluajit.web mfluajit.ch tangle-sh
- @$(texmf_tangle) mfluajit mfluajit
+ $(texmf_tangle) mfluajit mfluajit
# Generate mfluajit.web
mfluajit.web: tie$(EXEEXT) $(mfluajit_web_srcs)
@@ -21755,6 +21779,8 @@
mfluajittrap-clean:
rm -rf mfluajittrapdir
+# (end of mfluajit.am)
+
.PHONY: install-mpost-links uninstall-mpost-links
@WIN32_TRUE at install-mpost-links: call_mpost$(EXEEXT)
@WIN32_TRUE@ $(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/dvitomp$(EXEEXT)
@@ -21767,9 +21793,9 @@
$(mp_ctangle) mpost.w
$(mpxout_c_h): mpxout-tangle
- @$(mp_ctangle_sh) mpxout
+ $(mp_ctangle_sh) mpxout
mpxout-tangle: ctangle$(EXEEXT) mplibdir/mpxout.w tangle-sh
- @$(mp_ctangle_sh) mpxout
+ $(mp_ctangle_sh) mpxout
#$(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a $(LIBPNG_DEPEND)
$(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplibcore.a libmplibextramath.a libmplibbackends.a $(LIBPNG_DEPEND)
@@ -21781,6 +21807,8 @@
mptrap-clean:
rm -rf mptrapdir
+# (end of mplib.am)
+
.PHONY: install-pmpost-links install-upmpost-links uninstall-pmpost-links uninstall-upmpost-links
@WIN32_TRUE at install-pmpost-links: call_pmpost$(EXEEXT)
@WIN32_TRUE@ $(INSTALL_PROGRAM) call_pmpost$(EXEEXT) $(DESTDIR)$(bindir)/pdvitomp$(EXEEXT)
@@ -21838,24 +21866,24 @@
# Creating several files: need stamp file and two rules with identical recipes
$(pmp_c_h): pmp-tangle
- @$(pmp_ctangle_sh) pmp pmp
+ $(pmp_ctangle_sh) pmp pmp
pmp-tangle: ctangle$(EXEEXT) pmp.w pmpostdir/pmp.ch tangle-sh
- @$(pmp_ctangle_sh) pmp pmp
+ $(pmp_ctangle_sh) pmp pmp
$(pmpxout_c_h): pmpxout-tangle
- @$(pmp_ctangle_sh) pmpxout pmpxout
+ $(pmp_ctangle_sh) pmpxout pmpxout
pmpxout-tangle: ctangle$(EXEEXT) pmpxout.w pmpostdir/pmpxout.ch tangle-sh
- @$(pmp_ctangle_sh) pmpxout pmpxout
+ $(pmp_ctangle_sh) pmpxout pmpxout
$(ppsout_c_h): ppsout-tangle
- @$(pmp_ctangle_sh) ppsout ppsout
+ $(pmp_ctangle_sh) ppsout ppsout
ppsout-tangle: ctangle$(EXEEXT) ppsout.w pmpostdir/ppsout.ch tangle-sh
- @$(pmp_ctangle_sh) ppsout ppsout
+ $(pmp_ctangle_sh) ppsout ppsout
$(psvgout_c_h): psvgout-tangle
- @$(pmp_ctangle_sh) psvgout psvgout
+ $(pmp_ctangle_sh) psvgout psvgout
psvgout-tangle: ctangle$(EXEEXT) psvgout.w pmpostdir/psvgout.ch tangle-sh
- @$(pmp_ctangle_sh) psvgout psvgout
+ $(pmp_ctangle_sh) psvgout psvgout
$(pmpost_OBJECTS) $(upmpost_OBJECTS): $(nodist_pmpost_SOURCES) $(PTEXENC_DEPEND) \
$(LIBPNG_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
@@ -21862,6 +21890,8 @@
pmpostdir/pmpost.log pmpostdir/pmpsamp.log: pmpost$(EXEEXT)
pmpostdir/upmpost.log pmpostdir/upmpsamp.log: upmpost$(EXEEXT)
+# (end of pmpost.am)
+
# Creating one file: just one rule
tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w
$(mp_ctangle) tfmin.w
@@ -21868,49 +21898,49 @@
# Creating several files: need stamp file and two rules with identical recipes
$(mp_c_h): mp-tangle
- @$(mp_ctangle_sh) mp
+ $(mp_ctangle_sh) mp
mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh
- @$(mp_ctangle_sh) mp
+ $(mp_ctangle_sh) mp
$(mpmath_c_h): mpmath-tangle mp-tangle
- @$(mp_ctangle_sh) mpmath
+ $(mp_ctangle_sh) mpmath
mpmath-tangle: ctangle$(EXEEXT) mplibdir/mpmath.w tangle-sh
- @$(mp_ctangle_sh) mpmath
+ $(mp_ctangle_sh) mpmath
$(mpmathbinary_c_h): mpmathbinary-tangle mp-tangle
- @$(mp_ctangle_sh) mpmathbinary
+ $(mp_ctangle_sh) mpmathbinary
mpmathbinary-tangle: ctangle$(EXEEXT) mplibdir/mpmathbinary.w tangle-sh
- @$(mp_ctangle_sh) mpmathbinary
+ $(mp_ctangle_sh) mpmathbinary
$(mpmathdecimal_c_h): mpmathdecimal-tangle mp-tangle
- @$(mp_ctangle_sh) mpmathdecimal
+ $(mp_ctangle_sh) mpmathdecimal
mpmathdecimal-tangle: ctangle$(EXEEXT) mplibdir/mpmathdecimal.w tangle-sh
- @$(mp_ctangle_sh) mpmathdecimal
+ $(mp_ctangle_sh) mpmathdecimal
$(mpmathdouble_c_h): mpmathdouble-tangle mp-tangle
- @$(mp_ctangle_sh) mpmathdouble
+ $(mp_ctangle_sh) mpmathdouble
mpmathdouble-tangle: ctangle$(EXEEXT) mplibdir/mpmathdouble.w tangle-sh
- @$(mp_ctangle_sh) mpmathdouble
+ $(mp_ctangle_sh) mpmathdouble
$(mpstrings_c_h): mpstrings-tangle
- @$(mp_ctangle_sh) mpstrings
+ $(mp_ctangle_sh) mpstrings
mpstrings-tangle: ctangle$(EXEEXT) mplibdir/mpstrings.w tangle-sh
- @$(mp_ctangle_sh) mpstrings
+ $(mp_ctangle_sh) mpstrings
$(pngout_c_h): pngout-tangle
- @$(mp_ctangle_sh) pngout
+ $(mp_ctangle_sh) pngout
pngout-tangle: ctangle$(EXEEXT) mplibdir/pngout.w tangle-sh
- @$(mp_ctangle_sh) pngout
+ $(mp_ctangle_sh) pngout
$(psout_c_h): psout-tangle
- @$(mp_ctangle_sh) psout
+ $(mp_ctangle_sh) psout
psout-tangle: ctangle$(EXEEXT) mplibdir/psout.w tangle-sh
- @$(mp_ctangle_sh) psout
+ $(mp_ctangle_sh) psout
$(svgout_c_h): svgout-tangle
- @$(mp_ctangle_sh) svgout
+ $(mp_ctangle_sh) svgout
svgout-tangle: ctangle$(EXEEXT) mplibdir/svgout.w tangle-sh
- @$(mp_ctangle_sh) svgout
+ $(mp_ctangle_sh) svgout
$(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h)
@@ -21917,6 +21947,8 @@
$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
$(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND)
$(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+
+# (end of libmplib.am)
$(etex_OBJECTS): $(etex_prereq)
$(etex_c_h): etex-web2c
@@ -21929,9 +21961,9 @@
# Tangling e-TeX
etex.p etex.pool: etex-tangle
- @$(texmf_tangle) etex etex
+ $(texmf_tangle) etex etex
etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh
- @$(texmf_tangle) etex etex
+ $(texmf_tangle) etex etex
# Extract etex version
$(srcdir)/etexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ etexdir/etex.ch
@@ -21952,6 +21984,8 @@
.PHONY: etrip-clean
etrip-clean:
rm -rf etripdir
+
+# (end of etex.am)
# Rebuild $(pproglib)
$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
cd lib && $(MAKE) $(AM_MAKEFLAGS) libp.a
@@ -21967,9 +22001,9 @@
# Tangling pTeX
ptex.p ptex.pool: ptex-tangle
- @$(texmf_tangle) ptex ptex
+ $(texmf_tangle) ptex ptex
ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
- @$(texmf_tangle) ptex ptex
+ $(texmf_tangle) ptex ptex
# Extract ptex version
$(srcdir)/ptexdir/ptex_version.h: @MAINTAINER_MODE_TRUE@ ptexdir/ptex-base.ch
@@ -22029,6 +22063,8 @@
.PHONY: ptrip-clean
ptrip-clean:
rm -rf ptripdir
+
+# (end of ptex.am)
$(eptex_OBJECTS): $(eptex_prereq)
$(eptex_c_h): eptex-web2c
@@ -22041,9 +22077,9 @@
# Tangling e-pTeX
eptex.p eptex.pool: eptex-tangle
- @$(texmf_tangle) eptex eptex
+ $(texmf_tangle) eptex eptex
eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh
- @$(texmf_tangle) eptex eptex
+ $(texmf_tangle) eptex eptex
# Extract eptex version
$(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech
@@ -22065,6 +22101,8 @@
.PHONY: eptrip-clean
eptrip-clean:
rm -rf eptripdir
+
+# (end of eptex.am)
$(uptex_OBJECTS): $(uptex_prereq)
$(uptex_c_h): uptex-web2c
@@ -22077,9 +22115,9 @@
# Tangling upTeX
uptex.p uptex.pool: uptex-tangle
- @$(texmf_tangle) uptex uptex
+ $(texmf_tangle) uptex uptex
uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh
- @$(texmf_tangle) uptex uptex
+ $(texmf_tangle) uptex uptex
# Extract uptex version
$(srcdir)/uptexdir/uptex_version.h: @MAINTAINER_MODE_TRUE@ uptexdir/uptex-m.ch
@@ -22140,6 +22178,8 @@
.PHONY: uptrip-clean
uptrip-clean:
rm -rf uptripdir
+
+# (end of uptex.am)
$(euptex_OBJECTS): $(euptex_prereq)
$(euptex_c_h): euptex-web2c
@@ -22152,9 +22192,9 @@
# Tangling e-upTeX
euptex.p euptex.pool: euptex-tangle
- @$(texmf_tangle) euptex euptex
+ $(texmf_tangle) euptex euptex
euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh
- @$(texmf_tangle) euptex euptex
+ $(texmf_tangle) euptex euptex
# Generate euptex.web
euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
@@ -22172,6 +22212,8 @@
euptrip-clean:
rm -rf euptripdir
+# (end of euptex.am)
+
# convenience target to build all the programs here.
hiall: hitex hishrink histretch
@@ -22206,13 +22248,13 @@
$(libpdftex_a_OBJECTS): pdftexd.h $(XPDF_DEPEND) $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
$(pdftex_OBJECTS): $(pdftex_prereq)
$(pdftex_c_h): pdftex-web2c
- @$(web2c) pdftex
+ $(web2c) pdftex
pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
- @$(web2c) pdftex
+ $(web2c) pdftex
pdftex.p pdftex.pool: pdftex-tangle
- @$(pdf_tangle) pdftex pdftex-final
+ $(pdf_tangle) pdftex pdftex-final
pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex-final.ch tangle-sh
- @$(pdf_tangle) pdftex pdftex-final
+ $(pdf_tangle) pdftex pdftex-final
pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
$(makecpool) pdftex >$@ || rm -f $@
@@ -22239,6 +22281,8 @@
pdftexdir/wprob.log pdftexdir/pdftex.log \
pdftexdir/pdfimage.log pdftexdir/expanded.log \
pdftexdir/tests/cnfline.log pdftexdir/tests/partoken.log: pdftex$(EXEEXT)
+
+# (end of pdftex.am)
pdftexdir/ttf2afm.log: ttf2afm$(EXEEXT)
$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND)
@@ -22363,9 +22407,9 @@
$(makecpool) xetex >$@ || rm -f $@
xetex.p xetex.pool: xetex-tangle
- @$(xe_tangle) xetex xetex-final
+ $(xe_tangle) xetex xetex-final
xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex-final.ch tangle-sh
- @$(xe_tangle) xetex xetex-final
+ $(xe_tangle) xetex xetex-final
# Extract etex version
$(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
@@ -22380,6 +22424,8 @@
$(tie_c) $(xetex_ch_srcs)
$(libxetex_a_OBJECTS): $(libxetex_prereq)
xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log: xetex$(EXEEXT)
+
+# (end of xetex.am)
odvicopy.c odvicopy.h: odvicopy-web2c
@$(web2c) odvicopy
odvicopy-web2c: odvicopy.p $(web2c_depend)
@@ -22409,9 +22455,9 @@
opl2ofm.web: tie$(EXEEXT) omegaware/opl2ofm.web omegaware/opl2ofm.up
$(tie_m) omegaware/opl2ofm.web omegaware/opl2ofm.up
otangle.c otangle.h: otangle-web2c
- @$(web2c) otangle
+ $(web2c) otangle
otangle-web2c: otangle.p $(web2c_depend)
- @$(web2c) otangle
+ $(web2c) otangle
otangle.p: tangle$(EXEEXT) $(otangle_sources)
$(tangle_silent)$(ow_tangle) otangle otangle
ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c
@@ -22444,6 +22490,8 @@
omegaware/odvitype.log: odvitype$(EXEEXT)
omegaware/otangle.log: otangle$(EXEEXT)
+# (end of omegaware.am)
+
# We must create alephd.h before building the aleph_OBJECTS.
$(aleph_OBJECTS): alephd.h
@@ -22456,9 +22504,9 @@
# Tangling Aleph
aleph.p aleph.pool: aleph-tangle
- @$(al_tangle) aleph aleph
+ $(al_tangle) aleph aleph
aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch tangle-sh
- @$(al_tangle) aleph aleph
+ $(al_tangle) aleph aleph
aleph.web: tie$(EXEEXT) $(aleph_web_srcs)
$(tie_m) $(aleph_web_srcs)
aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
@@ -22465,6 +22513,8 @@
$(tie_c) aleph.web $(aleph_ch_srcs)
alephdir/aleph.log: aleph$(EXEEXT)
+# (end of aleph.am)
+
$(synctex_OBJECTS): $(libsynctex)
$(libsynctex_la_OBJECTS): $(ZLIB_DEPEND)
Modified: trunk/Build/source/texk/web2c/alephdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/alephdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/alephdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/aleph.am: do not silence tangle-sh.
+
2021-07-19 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
* com16bit.ch: Sync with tex.ch to initialize limit.
Modified: trunk/Build/source/texk/web2c/alephdir/am/aleph.am
===================================================================
--- trunk/Build/source/texk/web2c/alephdir/am/aleph.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/alephdir/am/aleph.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,6 +1,8 @@
+## $Id$
## texk/web2c/alephdir/am/aleph.am: Makefile fragment for Aleph.
##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
## Aleph
@@ -39,9 +41,9 @@
# Tangling Aleph
aleph.p aleph.pool: aleph-tangle
- @$(al_tangle) aleph aleph
+ $(al_tangle) aleph aleph
aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch tangle-sh
- @$(al_tangle) aleph aleph
+ $(al_tangle) aleph aleph
# Generate aleph.web
aleph_web_srcs = \
@@ -110,3 +112,4 @@
TESTS += $(aleph_tests)
endif ALEPH
+# (end of aleph.am)
Property changes on: trunk/Build/source/texk/web2c/alephdir/am/aleph.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/am/bootstrap.am
===================================================================
--- trunk/Build/source/texk/web2c/am/bootstrap.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/am/bootstrap.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,6 +1,8 @@
+## $Id$
## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle.
##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
cp_silent = $(cp_silent_ at AM_V@)
@@ -13,9 +15,9 @@
bin_PROGRAMS += tangle
nodist_tangle_SOURCES = tangle.c tangle.h
tangle.c tangle.h: tangle-web2c
- @$(web2c) tangle
+ $(web2c) tangle
tangle-web2c: tangle.p $(web2c_depend)
- @$(web2c) tangle
+ $(web2c) tangle
# tangle.p is a special case, since it is needed to compile itself. We
# convert and compile the (distributed) tangleboot.pin to make a tangle
# which we use to make the other programs. We depend on tangleboot, even
@@ -22,7 +24,7 @@
# though we might not use it.
tangle.p: tangleboot$(EXEEXT) tangle.web tangle.ch
$(tangleboot) tangle tangle
- @cmp -s tangle.p $(srcdir)/tangleboot.pin || { \
+ cmp -s tangle.p $(srcdir)/tangleboot.pin || { \
if $(AM_V_P); then \
echo "Updating tangle.p => $(srcdir)/tangleboot.pin"; \
else \
@@ -29,14 +31,7 @@
echo " UPD " tangleboot.pin; \
fi; cp -f tangle.p $(srcdir)/tangleboot.pin; }
tangle.web:
- @echo "You seem to be missing tangle.web, perhaps because you" >&2
- @echo "didn't retrieve web.tar.gz, only web2c.tar.gz." >&2
- @echo "You need both." >&2
- @echo >&2
- @echo "web.tar.gz should be available from the" >&2
- @echo "same place that you got web2c.tar.gz." >&2
- @echo "In any case, you can get it from" >&2
- @echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2
+ @echo "You seem to be missing tangle.web, goodbye." >&2
false
EXTRA_DIST += tangle.web tangle.ch
DISTCLEANFILES += tangle.c tangle.h tangle.p tangle-web2c
@@ -44,9 +39,9 @@
noinst_PROGRAMS += tangleboot
nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
tangleboot.c tangleboot.h: tangleboot-web2c
- @$(web2c) tangleboot
+ $(web2c) tangleboot
tangleboot-web2c: tangleboot.p $(web2c_depend)
- @$(web2c) tangleboot
+ $(web2c) tangleboot
# tangleboot.pin is in the distribution
.pin.p:
$(cp_silent)cp -f $< $@
@@ -59,14 +54,19 @@
# to create an up-to-date ctangleboot.cin and cwebboot.cin as well.
bin_PROGRAMS += ctangle
nodist_ctangle_SOURCES = ctangle.c cweb.c
+#
# ctangle.c and cweb.c are special cases, since they are needed to compile
# themselves. We depend on ctangleboot, even though we might not use it.
ctangleboot = AM_V_P=$(AM_V_P) $(SHELL) ./ctangleboot-sh $@
-ctangle.c: common-ctangle cwebdir/ctangle.w cwebdir/ctang-w2c.ch
- @$(ctangleboot) ctangle ctang-w2c
-cweb.c: common-ctangle cwebdir/common.w cwebdir/comm-w2c.ch
- @$(ctangleboot) common comm-w2c cweb.c
-common-ctangle: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh
+#
+ctangle.c: $(common_ctangle) cwebdir/ctangle.w cwebdir/ctang-w2c.ch
+ $(ctangleboot) ctangle ctang-w2c.ch
+#
+cweb.c: $(common_ctangle) cwebdir/common.w cwebdir/comm-w2c.ch
+ $(ctangleboot) common comm-w2c.ch cweb.c
+#
+common_ctangle = ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh
+
EXTRA_DIST += cwebdir
NEVER_DIST += cwebdir/cweave.log cwebdir/cweave.trs
NEVER_DIST += cwebdir/ctwill.log cwebdir/ctwill.trs
@@ -97,3 +97,4 @@
DISTCLEANFILES += cftest.p
+# (end of bootstrap.am)
Property changes on: trunk/Build/source/texk/web2c/am/bootstrap.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/am/texmf.am
===================================================================
--- trunk/Build/source/texk/web2c/am/texmf.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/am/texmf.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,7 +1,7 @@
## $Id$
## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF.
##
-## Copyright 2015-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -54,9 +54,9 @@
# Tangling TeX
tex.p tex.pool: tex-tangle
- @$(texmf_tangle) tex tex-final
+ $(texmf_tangle) tex tex-final
tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch tangle-sh
- @$(texmf_tangle) tex tex-final
+ $(texmf_tangle) tex tex-final
# Generate tex-final.ch
tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
@@ -186,9 +186,9 @@
# Tangling Metafont
mf.p mf.pool: mf-tangle
- @$(texmf_tangle) mf mf-final
+ $(texmf_tangle) mf mf-final
mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch tangle-sh
- @$(texmf_tangle) mf mf-final
+ $(texmf_tangle) mf mf-final
# Generate mf-final.ch
mf-final.ch: tie$(EXEEXT) $(mf_ch_src)
@@ -273,3 +273,4 @@
triptrap/writeo \
triptrap/writeo.2
+# (end of texmf.am)
Modified: trunk/Build/source/texk/web2c/am/web.am
===================================================================
--- trunk/Build/source/texk/web2c/am/web.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/am/web.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -2,7 +2,7 @@
## texk/web2c/am/web.am: Makefile fragment for the standard web programs --
## except tangle.
##
-## Copyright 2018-2019 Karl Berry <tex-live at tug.org>
+## Copyright 2018-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
Modified: trunk/Build/source/texk/web2c/ctangleboot-sh.in
===================================================================
--- trunk/Build/source/texk/web2c/ctangleboot-sh.in 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/ctangleboot-sh.in 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,20 +1,24 @@
#! @SHELL@
-# ctangleboot-sh: shell script to invoke ctangleboot and if required
-# update c{tangle,web}boot.[ch]in from c{tangle,web}.[ch].
-# For details see tangle-sh.
+# $Id$
+# ctangleboot-sh: shell script to invoke ctangleboot and, if required,
+# update c{tangle,web}boot.[ch]in from c{tangle,web}.[ch].
+# For details see tangle-sh[.in].
#
-# Copyright (C) 2009-2012 Peter Breitenlohner <tex-live at tug.org>
+# Copyright 2015-2022 Karl Berry <tex-live at tug.org>
+# Copyright 2009-2012 Peter Breitenlohner <tex-live at tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
#
+prg=`basename $0`
target=$1; shift
base=$1
case $base in
common) file=cweb; exts=c;;
ctangle) file=ctangle; exts=c;;
- *) echo "Usage: $0 TARGET {common|ctangle} [CHANGEFILE]" >&2; exit 1;;
+ *) echo "Usage: $0 TARGET common|ctangle [CHANGEFILE] [OUTFILE]" >&2
+ exit 1;;
esac
TEXMFCNF=@srcdir@/../kpathsea; export TEXMFCNF
@@ -23,12 +27,16 @@
do_ctangleboot () {
echo timestamp >$stamp.tmp
if $AM_V_P; then
- echo "@CTANGLEBOOT@ $@"
+ echo "$prg: @CTANGLEBOOT@ $@"
@CTANGLEBOOT@ "$@" || exit 1
+ test -s $file.$exts \
+ || { echo "$prg: $file.$exts empty." >&2; rm -f $file.$exts; exit 1; }
else
echo " CTANGLE " $base
@CTANGLEBOOT@ "$@" >$base.out 2>&1; rc=$?
- test $rc -eq 0 || { cat $base.out; exit $rc; }
+ # succeed and generate nonempty file
+ (test $rc -eq 0 && test -s $file.$exts) \
+ || { cat $base.out; rm -f $file.$exts exit $rc; }
rm -f $base.out
fi
mv -f $stamp.tmp $stamp
@@ -42,8 +50,14 @@
do_ctangleboot "$@"
;;
*)
- # Recover from removal of $target
- test -f $target && exit 0
+ # Recover from removal of $target if necessary.
+ if test -f $target; then
+ $AM_V_P && echo "$prg: checking for $target ... ok"
+ exit 0
+ else
+ $AM_V_P && echo "$prg: recovering $target"
+ fi
+ #
trap "rm -rf $stamp $stamp.lock" 1 2 13 15
if mkdir $stamp.lock 2>/dev/null; then
# Code executed by the first process.
Property changes on: trunk/Build/source/texk/web2c/ctangleboot-sh.in
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/eptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/eptexdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/eptex.am: do not silence tangle-sh.
+
2021-12-07 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
* suppresserrors.ch, tests/suppress_errors.tex: New files
Modified: trunk/Build/source/texk/web2c/eptexdir/am/eptex.am
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/am/eptex.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/eptexdir/am/eptex.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,7 +1,7 @@
## $Id$
## texk/web2c/eptexdir/am/eptex.am: Makefile fragment for e-pTeX.
##
-## Copyright 2015-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
## Copyright 2011-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -37,9 +37,9 @@
# Tangling e-pTeX
eptex.p eptex.pool: eptex-tangle
- @$(texmf_tangle) eptex eptex
+ $(texmf_tangle) eptex eptex
eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh
- @$(texmf_tangle) eptex eptex
+ $(texmf_tangle) eptex eptex
# Extract eptex version
$(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech
@@ -123,3 +123,4 @@
eptexdir/tests/pdfprimitive-eptex.log
DISTCLEANFILES += pdfprimitive-eptex.*
+# (end of eptex.am)
Modified: trunk/Build/source/texk/web2c/etexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/etexdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/etexdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/etex.am: do not silence tangle-sh.
+
2021-03-23 Karl Berry <karl at tug.org>
* TL'21.
Modified: trunk/Build/source/texk/web2c/etexdir/am/etex.am
===================================================================
--- trunk/Build/source/texk/web2c/etexdir/am/etex.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/etexdir/am/etex.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,7 +1,7 @@
## $Id$
## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX.
##
-## Copyright 2015-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -38,9 +38,9 @@
# Tangling e-TeX
etex.p etex.pool: etex-tangle
- @$(texmf_tangle) etex etex
+ $(texmf_tangle) etex etex
etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh
- @$(texmf_tangle) etex etex
+ $(texmf_tangle) etex etex
# Extract etex version
$(srcdir)/etexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ etexdir/etex.ch
@@ -121,3 +121,4 @@
etexdir/etrip/texmf.cnf \
etexdir/etrip/trip2.in
+# (end of etex.am)
Modified: trunk/Build/source/texk/web2c/euptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/euptexdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/euptex.am: do not silence tangle-sh.
+
2021-12-07 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
* am/euptex.am: Add suppresserrors.ch.
Modified: trunk/Build/source/texk/web2c/euptexdir/am/euptex.am
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/am/euptex.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/euptexdir/am/euptex.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,7 +1,7 @@
## $Id$
## texk/web2c/euptexdir/am/euptex.am: Makefile fragment for e-upTeX.
##
-## Copyright 2015-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
## Copyright 2011-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -38,9 +38,9 @@
# Tangling e-upTeX
euptex.p euptex.pool: euptex-tangle
- @$(texmf_tangle) euptex euptex
+ $(texmf_tangle) euptex euptex
euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh
- @$(texmf_tangle) euptex euptex
+ $(texmf_tangle) euptex euptex
# Generate euptex.web
euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
@@ -124,3 +124,4 @@
euptexdir/tests/pdfprimitive-euptex.log
DISTCLEANFILES += pdfprimitive-euptex.*
+# (end of euptex.am)
Modified: trunk/Build/source/texk/web2c/help.h
===================================================================
--- trunk/Build/source/texk/web2c/help.h 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/help.h 2022-01-11 22:47:10 UTC (rev 61575)
@@ -10,7 +10,7 @@
thing, the messages have a lot in common, so it's nice to have them
in one place.)
-Copyright 1995, 1996, 2009, 2011-2019 Karl Berry.
+Copyright 1995, 1996, 2009, 2011-2022 Karl Berry.
Copyright 2008 Taco Hoekwater.
Copyright 2001, 2003, 2004 Olaf Weber.
Modified: trunk/Build/source/texk/web2c/hitexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/hitexdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,14 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/hitex.am: do not silence tangle-sh.
+ (noinst_PROGRAMS): += himktables, so we get Automake's rules
+ to build it instead of whatever is predefined in make.
+ (EXTRA_PROGRAMS): delete, not needed since all listed in bin_PROGRAMS.
+ (hiformat_c_h_l_y): update.
+ * hilexer.l,
+ * hiparser.y: remove these derived files. We check in the
+ .c and .h files instead.
+
2021-12-17 Luigi Scarso <luigi.scarso at gmail.com>
* am/hitex.am (hitables.c): need $(EXEEXT) to execute himktables.
Modified: trunk/Build/source/texk/web2c/hitexdir/am/hitex.am
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/am/hitex.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/hitexdir/am/hitex.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,13 +1,13 @@
## $Id$
## texk/web2c/hitexdir/am/hitex.am: Makefile fragment for HiTeX
##
-## Copyright 2021 Martin Ruckert <ruckert at cs.hm.edu>
+## Copyright 2021-2022 Martin Ruckert <ruckert at cs.hm.edu>
## You may freely use, modify and/or distribute this file.
if HITEX
bin_PROGRAMS += hitex hishrink histretch
+noinst_PROGRAMS += himktables
endif HITEX
-EXTRA_PROGRAMS += hitex hishrink histretch
# convenience target to build all the programs here.
hiall: hitex hishrink histretch
@@ -40,12 +40,18 @@
# HiTeX C/yacc/lex sources generated using ctangle.
# For each cweb (.w) source file, list the files generated.
-hiformat_c_h_l_y = hibasetypes.h hierror.h hiformat.h \
+hiformat_c_h_l_y = \
+ hibasetypes.h \
+ hierror.h \
+ hiformat.c hiformat.h \
+ higet.c higet.h \
+ hilexer.l \
himktables.c \
+ hiparser.y \
hiput.c hiput.h \
- higet.c higet.h \
- hilexer.l hiparser.y \
- hishrink.c histretch.c
+ hishrink.c \
+ hiskip.c \
+ histretch.c
hitex_c = hitex.c
$(hiformat_c_h_l_y): hiformat-tangle
Deleted: trunk/Build/source/texk/web2c/hitexdir/hilexer.l
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/hilexer.l 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/hitexdir/hilexer.l 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,353 +0,0 @@
- /*511:*/
-%{
- #line 10273 "format.w"
-
-#include "hibasetypes.h"
-#include "hierror.h"
-#include "hiformat.h"
-#include "hiput.h"
-
- /*425:*/
-#ifdef DEBUG
-#define YYDEBUG 1
-extern int yydebug;
-#else
-#define YYDEBUG 0
-#endif
- /*:425*/
-#include "hiparser.h"
-
- /*22:*/
-#define SCAN_UDEC(S) yylval.u= strtoul(S,NULL,10)
- /*:22*/ /*25:*/
-#define SCAN_HEX(S) yylval.u= strtoul(S,NULL,16)
- /*:25*/ /*28:*/
-#define SCAN_DEC(S) yylval.i= strtol(S,NULL,10)
- /*:28*/ /*31:*/
-#define MAX_STR (1<<10)
-static char str_buffer[MAX_STR];
-static int str_length;
-#define STR_START (str_length= 0)
-#define STR_PUT(C) (str_buffer[str_length++]= (C))
-#define STR_ADD(C) STR_PUT(C);RNG("String length",str_length,0,MAX_STR-1)
-#define STR_END str_buffer[str_length]= 0
-#define SCAN_STR yylval.s= str_buffer
- /*:31*/ /*40:*/
-#define SCAN_UTF8_1(S) yylval.u= ((S)[0]&0x7F)
- /*:40*/ /*42:*/
-#define SCAN_UTF8_2(S) yylval.u= (((S)[0]&0x1F)<<6)+((S)[1]&0x3F)
- /*:42*/ /*44:*/
-#define SCAN_UTF8_3(S) yylval.u= (((S)[0]&0x0F)<<12)+(((S)[1]&0x3F)<<6)+((S)[2]&0x3F)
- /*:44*/ /*46:*/
-#define SCAN_UTF8_4(S) yylval.u= (((S)[0]&0x03)<<18)+(((S)[1]&0x3F)<<12)+(((S)[2]&0x3F)<<6)+((S)[3]&0x3F)
- /*:46*/ /*57:*/
-#define SCAN_DECFLOAT yylval.f= atof(yytext)
- /*:57*/ /*60:*/
-#define SCAN_HEXFLOAT yylval.f= xtof(yytext)
- /*:60*/ /*152:*/
-#define SCAN_REF(K) yylval.rf.k= K; yylval.rf.n= atoi(yytext+2)
-static int scan_level= 0;
-#define SCAN_START yy_push_state(INITIAL);if (1==scan_level++) hpos0= hpos;
-#define SCAN_END if (scan_level--) yy_pop_state(); else QUIT("Too many '>' in line %d",yylineno)
-#define SCAN_TXT_START BEGIN(TXT)
-#define SCAN_TXT_END BEGIN(INITIAL)
- /*:152*/
- /*61:*/
-
-float64_t xtof(char*x)
-{
- #line 1369 "format.w"
- int sign,digits,exp;
- uint64_t mantissa= 0;
- DBG(DBGFLOAT,"converting %s:\n",x);
- /*62:*/
- if(*x=='-'){sign= -1;x++;}
- else if(*x=='+'){sign= +1;x++;}
- else sign= +1;
- DBG(DBGFLOAT,"\tsign=%d\n",sign);
- /*:62*/
- x= x+2;
- /*63:*/
- digits= 0;
- while(*x=='0')x++;
- while(*x!='.')
- {mantissa= mantissa<<4;
- if(*x<'A')mantissa= mantissa+*x-'0';
- else mantissa= mantissa+*x-'A'+10;
- x++;
- digits++;
- }
- x++;
- exp= 0;
- while(*x!=0&&*x!='x')
- {mantissa= mantissa<<4;
- exp= exp-4;
- if(*x<'A')mantissa= mantissa+*x-'0';
- else mantissa= mantissa+*x-'A'+10;
- x++;
- digits++;
- }
- DBG(DBGFLOAT,"\tdigits=%d mantissa=0x%"PRIx64", exp=%d\n",digits,mantissa,exp);
- /*:63*/
- /*64:*/
- if(mantissa==0)return 0.0;
- {int s;
- s= digits-DBL_M_BITS/4;
- if(s>1)
- mantissa= mantissa>>(4*(s-1));
- else if(s<1)
- mantissa= mantissa<<(4*(1-s));
- exp= exp+4*(digits-1);
- DBG(DBGFLOAT,"\tdigits=%d mantissa=0x%"PRIx64", exp=%d\n",digits,mantissa,exp);
- while((mantissa>>DBL_M_BITS)>1){mantissa= mantissa>>1;exp++;}
- DBG(DBGFLOAT,"\tdigits=%d mantissa=0x%"PRIx64", exp=%d\n",digits,mantissa,exp);
- mantissa= mantissa&~((uint64_t)1<<DBL_M_BITS);
- DBG(DBGFLOAT,"\tdigits=%d mantissa=0x%"PRIx64", exp=%d\n",digits,mantissa,exp);
- }
- /*:64*/
- /*65:*/
- if(*x=='x')
- {int s;
- x++;
- if(*x=='-'){s= -1;x++;}
- else if(*x=='+'){s= +1;x++;}
- else s= +1;
- DBG(DBGFLOAT,"\texpsign=%d\n",s);
- DBG(DBGFLOAT,"\texp=%d\n",exp);
- while(*x!=0)
- {if(*x<'A')exp= exp+4*s*(*x-'0');
- else exp= exp+4*s*(*x-'A'+10);
- x++;
- DBG(DBGFLOAT,"\texp=%d\n",exp);
- }
- }
- RNG("Floating point exponent",exp,-DBL_EXCESS,DBL_EXCESS);
- /*:65*/
- /*66:*/
- {union{float64_t d;uint64_t bits;}u;
- if(sign<0)sign= 1;else sign= 0;
- exp= exp+DBL_EXCESS;
- u.bits= ((uint64_t)sign<<63)
- |((uint64_t)exp<<DBL_M_BITS) |mantissa;
- DBG(DBGFLOAT," return %f\n",u.d);
- return u.d;
- }
- /*:66*/
- }
- /*:61*/
-int yywrap(void){
- #line 10284 "format.w"
- return 1;}
-#ifdef _MSC_VER
-#pragma warning( disable : 4267)
-#endif
-
-%}
-
-%option yylineno batch stack
-%option debug
-%option nounistd nounput noinput noyy_top_state
-
- /*23:*/
-HEX [0-9A-F]
- /*:23*/ /*32:*/
-%x STR
- /*:32*/ /*39:*/
-UTF8_1 [\x00-\x7F]
- /*:39*/ /*41:*/
-UTF8_2 [\xC0-\xDF][\x80-\xBF]
- /*:41*/ /*43:*/
-UTF8_3 [\xE0-\xEF][\x80-\xBF][\x80-\xBF]
- /*:43*/ /*45:*/
-UTF8_4 [\xF0-\xF7][\x80-\xBF][\x80-\xBF][\x80-\xBF]
- /*:45*/ /*149:*/
-%x TXT
- /*:149*/
-
-%%
-
- /*3:*/
-"<" SCAN_START;return START;
-">" SCAN_END;return END;
-glyph return GLYPH;
-0|[1-9][0-9]* SCAN_UDEC(yytext);return UNSIGNED;
-\*(0|[1-9][0-9]*) SCAN_UDEC(yytext+1);return REFERENCE;
-[[:space:]] ;
-\([^()\n]*[)\n] ;
- /*:3*/ /*24:*/
-0x{HEX}+ SCAN_HEX(yytext+2);return UNSIGNED;
- /*:24*/ /*27:*/
-[+-](0|[1-9][0-9]*) SCAN_DEC(yytext);return SIGNED;
- /*:27*/ /*34:*/
-' STR_START;BEGIN(STR);
-<STR>{
-' STR_END;SCAN_STR;BEGIN(INITIAL);return STRING;
-'' STR_ADD('\'');
-[\x20-\x7E] STR_ADD(yytext[0]);
-. RNG("String character",yytext[0],0x20,0x7E);
-\n QUIT("Unterminated String in line %d",yylineno);
-}
-
-
- /*:34*/ /*48:*/
-''' STR_START;STR_PUT('\'');BEGIN(STR);
-'''' SCAN_UTF8_1(yytext+1);return CHARCODE;
-'[\x20-\x7E]'' STR_START;STR_PUT(yytext[1]);STR_PUT('\'');BEGIN(STR);
-''''' STR_START;STR_PUT('\'');STR_PUT('\'');BEGIN(STR);
-'{UTF8_1}' SCAN_UTF8_1(yytext+1);return CHARCODE;
-'{UTF8_2}' SCAN_UTF8_2(yytext+1);return CHARCODE;
-'{UTF8_3}' SCAN_UTF8_3(yytext+1);return CHARCODE;
-'{UTF8_4}' SCAN_UTF8_4(yytext+1);return CHARCODE;
- /*:48*/ /*55:*/
-[+-]?[0-9]+\.[0-9]+(e[+-]?[0-9])? SCAN_DECFLOAT;return FPNUM;
- /*:55*/ /*59:*/
-[+-]?0x{HEX}+\.{HEX}+(x[+-]?{HEX}+)? SCAN_HEXFLOAT;return FPNUM;
- /*:59*/ /*80:*/
-dimen return DIMEN;
-pt return PT;
-mm return MM;
-in return INCH;
- /*:80*/ /*88:*/
-xdimen return XDIMEN;
-h return H;
-v return V;
- /*:88*/ /*99:*/
-fil return FIL;
-fill return FILL;
-filll return FILLL;
- /*:99*/ /*103:*/
-penalty return PENALTY;
-int return INTEGER;
- /*:103*/ /*109:*/
-language return LANGUAGE;
- /*:109*/ /*115:*/
-rule return RULE;
-"|" return RUNNING;
-"_" return RUNNING;
- /*:115*/ /*124:*/
-kern return KERN;
-! return EXPLICIT;
- /*:124*/ /*133:*/
-glue return GLUE;
-plus return PLUS;
-minus return MINUS;
- /*:133*/ /*151:*/
-\" SCAN_TXT_START;return TXT_START;
-
-<TXT>{
-\" SCAN_TXT_END;return TXT_END;
-
-"<" SCAN_START;return START;
-">" QUIT("> not allowed in text mode");
-
-\\\\ yylval.u= '\\';return TXT_CC;
-\\\" yylval.u= '"';return TXT_CC;
-\\"<" yylval.u= '<';return TXT_CC;
-\\">" yylval.u= '>';return TXT_CC;
-\\" " yylval.u= ' ';return TXT_CC;
-\\"-" yylval.u= '-';return TXT_CC;
-\\"@" return TXT_IGNORE;
-
-[ \t\r]*(\n[ \t\r]*)+ return TXT_FONT_GLUE;
-\\[ \t\r]*\n[ \t\r]* ;
-
-\\[0-7] yylval.u= yytext[1]-'0';return TXT_FONT;
-
-\\F[0-9]+\\ SCAN_REF(font_kind);return TXT_GLOBAL;
-\\P[0-9]+\\ SCAN_REF(penalty_kind);return TXT_GLOBAL;
-\\K[0-9]+\\ SCAN_REF(kern_kind);return TXT_GLOBAL;
-\\L[0-9]+\\ SCAN_REF(ligature_kind);return TXT_GLOBAL;
-\\D[0-9]+\\ SCAN_REF(disc_kind);return TXT_GLOBAL;
-\\G[0-9]+\\ SCAN_REF(glue_kind);return TXT_GLOBAL;
-\\S[0-9]+\\ SCAN_REF(language_kind);return TXT_GLOBAL;
-\\R[0-9]+\\ SCAN_REF(rule_kind);return TXT_GLOBAL;
-\\I[0-9]+\\ SCAN_REF(image_kind);return TXT_GLOBAL;
-
-
-\\C[0-9]+\\ SCAN_UDEC(yytext+2);return TXT_CC;
-
-\\[a-l] yylval.u= yytext[1]-'a';return TXT_LOCAL;
-" " return TXT_FONT_GLUE;
-"-" return TXT_FONT_HYPHEN;
-
-{UTF8_1} SCAN_UTF8_1(yytext);return TXT_CC;
-{UTF8_2} SCAN_UTF8_2(yytext);return TXT_CC;
-{UTF8_3} SCAN_UTF8_3(yytext);return TXT_CC;
-{UTF8_4} SCAN_UTF8_4(yytext);return TXT_CC;
-}
- /*:151*/ /*162:*/
-hbox return HBOX;
-vbox return VBOX;
-shifted return SHIFTED;
- /*:162*/ /*170:*/
-hpack return HPACK;
-hset return HSET;
-vpack return VPACK;
-vset return VSET;
-add return ADD;
-to return TO;
-depth return DEPTH;
- /*:170*/ /*175:*/
-leaders return LEADERS;
-align return ALIGN;
-center return CENTER;
-expand return EXPAND;
- /*:175*/ /*182:*/
-baseline return BASELINE;
- /*:182*/ /*189:*/
-ligature return LIGATURE;
- /*:189*/ /*197:*/
-disc return DISC;
- /*:197*/ /*205:*/
-par return PAR;
- /*:205*/ /*210:*/
-math return MATH;
- /*:210*/ /*215:*/
-on return ON;
-off return OFF;
- /*:215*/ /*219:*/
-adjust return ADJUST;
- /*:219*/ /*223:*/
-table return TABLE;
-item return ITEM;
-row return ITEM;
-column return ITEM;
- /*:223*/ /*230:*/
-image return IMAGE;
- /*:230*/ /*247:*/
-label return LABEL;
-bot return BOT;
-mid return MID;
- /*:247*/ /*261:*/
-link return LINK;
- /*:261*/ /*271:*/
-outline return OUTLINE;
- /*:271*/ /*278:*/
-stream if(section_no==1)return STREAMDEF;else return STREAM;
-first return FIRST;
-last return LAST;
-top return TOP;
-\* return NOREFERENCE;
- /*:278*/ /*288:*/
-page return PAGE;
- /*:288*/ /*296:*/
-range return RANGE;
- /*:296*/ /*323:*/
-directory return DIRECTORY;
-section return SECTION;
- /*:323*/ /*344:*/
-definitions return DEFINITIONS;
- /*:344*/ /*352:*/
-max return MAX;
- /*:352*/ /*367:*/
-param return PARAM;
- /*:367*/ /*376:*/
-font return FONT;
- /*:376*/ /*404:*/
-content return CONTENT;
- /*:404*/
-[a-z]+ QUIT("Unexpected keyword '%s' in line %d",yytext,yylineno);
-. QUIT("Unexpected character '%c' (0x%02X) in line %d",yytext[0]>' '?yytext[0]:' ',yytext[0],yylineno);
-
-%%
- /*:511*/
Deleted: trunk/Build/source/texk/web2c/hitexdir/hiparser.y
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/hiparser.y 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/hitexdir/hiparser.y 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,1111 +0,0 @@
- /*512:*/
-%{
- #line 10314 "format.w"
-
-#include "hibasetypes.h"
-#include <string.h>
-#include <math.h>
-#include "hierror.h"
-#include "hiformat.h"
-#include "hiput.h"
-extern char**hfont_name;
-
- /*358:*/
-uint32_t definition_bits[0x100/32][32]= {
- #line 7627 "format.w"
- {0}};
-
-#define SET_DBIT(N,K) ((N)>0xFF?1:(definition_bits[N/32][K] |= (1<<((N)&(32-1)))))
-#define GET_DBIT(N,K) ((N)>0xFF?1:((definition_bits[N/32][K]>>((N)&(32-1)))&1))
-#define DEF(D,K,N) (D).k= K; (D).n= (N);SET_DBIT((D).n,(D).k);\
- DBG(DBGDEF,"Defining %s %d\n",definition_name[(D).k],(D).n);\
- RNG("Definition",(D).n,max_fixed[(D).k]+1,max_ref[(D).k]);
-#define REF(K,N) REF_RNG(K,N);if(!GET_DBIT(N,K)) \
- QUIT("Reference %d to %s before definition",(N),definition_name[K])
- /*:358*/ /*362:*/
-#define DEF_REF(D,K,M,N) DEF(D,K,M);\
-if ((M)>max_default[K]) QUIT("Defining non default reference %d for %s",M,definition_name[K]); \
-if ((N)>max_fixed[K]) QUIT("Defining reference %d for %s by non fixed reference %d",M,definition_name[K],N);
- /*:362*/
-
-extern void hset_entry(entry_t*e,uint16_t i,uint32_t size,
-uint32_t xsize,char*file_name);
-
- /*425:*/
-#ifdef DEBUG
-#define YYDEBUG 1
-extern int yydebug;
-#else
-#define YYDEBUG 0
-#endif
- /*:425*/
-extern int yylex(void);
-
- /*354:*/
-void hset_max(kind_t k,int n)
-{
- #line 7470 "format.w"
- DBG(DBGDEF,"Setting max %s to %d\n",definition_name[k],n);
- RNG("Maximum",n,max_fixed[k]+1,MAX_REF(k));
- if(n>max_ref[k])
- max_ref[k]= n;
- }
- /*:354*/ /*365:*/
-void check_param_def(ref_t*df)
-{
- #line 7776 "format.w"
- if(df->k!=int_kind&&df->k!=dimen_kind&&df->k!=glue_kind)
- QUIT("Kind %s not allowed in parameter list",definition_name[df->k]);
- if(df->n<=max_fixed[df->k]||max_default[df->k]<df->n)
- QUIT("Parameter %d for %s not allowed in parameter list",df->n,definition_name[df->k]);
- }
- /*:365*/ /*424:*/
-extern int yylineno;
-int yyerror(const char*msg)
-{
- #line 8901 "format.w"
- QUIT(" in line %d %s",yylineno,msg);
- return 0;
- }
- /*:424*/
-
-
-%}
-
-
-
-
-
-%union {
- #line 10339 "format.w"
- uint32_t u; int32_t i; char *s; float64_t f; glyph_t c;
- dimen_t d;stretch_t st;xdimen_t xd;kern_t kt;
- rule_t r;glue_t g;image_t x;
- list_t l;box_t h;disc_t dc;lig_t lg;
- ref_t rf;info_t info;order_t o;bool b;
- }
-
-
-
-%error_verbose
-%start hint
-
- /*2:*/
-%token START "<"
-%token END ">"
-%token GLYPH "glyph"
-%token <u> UNSIGNED
-%token <u> REFERENCE
- /*:2*/ /*4:*/
-%type <u> start
-%type <c> glyph
- /*:4*/ /*26:*/
-%token <i> SIGNED
-%type <i> integer
- /*:26*/ /*33:*/
-%token <s> STRING
- /*:33*/ /*47:*/
-%token <u> CHARCODE
- /*:47*/ /*49:*/
-%type <s> string
- /*:49*/ /*54:*/
-%token <f> FPNUM
-%type <f> number
- /*:54*/ /*79:*/
-%token DIMEN "dimen"
-%token PT "pt"
-%token MM "mm"
-%token INCH "in"
-%type <d> dimension
- /*:79*/ /*87:*/
-%token XDIMEN "xdimen"
-%token H "h"
-%token V "v"
-%type <xd> xdimen
- /*:87*/ /*98:*/
-%token FIL "fil"
-%token FILL "fill"
-%token FILLL "filll"
-%type <st> stretch
-%type <o> order
- /*:98*/ /*102:*/
-%token PENALTY "penalty"
-%token INTEGER "int"
-%type <i> penalty
- /*:102*/ /*108:*/
-%token LANGUAGE "language"
- /*:108*/ /*114:*/
-%token RULE "rule"
-%token RUNNING "|"
-%type <d> rule_dimension
-%type <r> rule
- /*:114*/ /*123:*/
-%token KERN "kern"
-%token EXPLICIT "!"
-%type <b> explicit
-%type <kt> kern
- /*:123*/ /*132:*/
-%token GLUE "glue"
-%token PLUS "plus"
-%token MINUS "minus"
-%type <g> glue
-%type <b> glue_node
-%type <st> plus minus
- /*:132*/ /*141:*/
-%type <l> list
-%type <u> position content_list
- /*:141*/ /*150:*/
-%token TXT_START TXT_END TXT_IGNORE
-%token TXT_FONT_GLUE TXT_FONT_HYPHEN
-%token <u> TXT_FONT TXT_LOCAL
-%token <rf> TXT_GLOBAL
-%token <u> TXT_CC
-%type <u> text
- /*:150*/ /*161:*/
-%token HBOX "hbox"
-%token VBOX "vbox"
-%token SHIFTED "shifted"
-%type <info> box box_dimen box_shift box_glue_set
-
- /*:161*/ /*169:*/
-%token HPACK "hpack"
-%token HSET "hset"
-%token VPACK "vpack"
-%token VSET "vset"
-%token DEPTH "depth"
-%token ADD "add"
-%token TO "to"
-%type <info> xbox box_goal hpack vpack
- /*:169*/ /*174:*/
-%token LEADERS "leaders"
-%token ALIGN "align"
-%token CENTER "center"
-%token EXPAND "expand"
-%type <info> leaders
-%type <info> ltype
- /*:174*/ /*181:*/
-%token BASELINE "baseline"
-%type <info> baseline
- /*:181*/ /*188:*/
-%token LIGATURE "ligature"
-%type <u> lig_cc
-%type <lg> ligature
-%type <u> ref
- /*:188*/ /*196:*/
-%token DISC "disc"
-%type <dc> disc
-%type <u> replace_count
- /*:196*/ /*204:*/
-%token PAR "par"
-%type <info> par
- /*:204*/ /*209:*/
-%token MATH "math"
-%type <info> math
- /*:209*/ /*214:*/
-%token ON "on"
-%token OFF "off"
-%type <i> on_off
- /*:214*/ /*218:*/
-%token ADJUST "adjust"
- /*:218*/ /*222:*/
-%token TABLE "table"
-%token ITEM "item"
-%type <info> table span_count
- /*:222*/ /*229:*/
-%token IMAGE "image"
-%type <x> image image_dimen
- /*:229*/ /*246:*/
-%token LABEL "label"
-%token BOT "bot"
-%token MID "mid"
-%type <i> placement
- /*:246*/ /*260:*/
-%token LINK "link"
- /*:260*/ /*270:*/
-%token OUTLINE "outline"
- /*:270*/ /*277:*/
-%token STREAM "stream"
-%token STREAMDEF "stream (definition)"
-%token FIRST "first"
-%token LAST "last"
-%token TOP "top"
-%token NOREFERENCE "*"
-%type <info> stream_type
-%type <u> stream_ref
-%type <rf> stream_def_node
- /*:277*/ /*283:*/
-%type <info> stream
- /*:283*/ /*287:*/
-%token PAGE "page"
- /*:287*/ /*295:*/
-%token RANGE "range"
- /*:295*/ /*322:*/
-%token DIRECTORY "directory"
-%token SECTION "entry"
- /*:322*/ /*343:*/
-%token DEFINITIONS "definitions"
- /*:343*/ /*351:*/
-%token MAX "max"
- /*:351*/ /*360:*/
-
-%type <rf> def_node
- /*:360*/ /*366:*/
-%token PARAM "param"
-%type <u> def_list
-%type <l> parameters
- /*:366*/ /*375:*/
-%token FONT "font"
-%type <info> font font_head
- /*:375*/ /*403:*/
-%token CONTENT "content"
- /*:403*/
-%%
- /*5:*/
-glyph:UNSIGNED REFERENCE{
- #line 418 "format.w"
- $$.c= $1;REF(font_kind,$2);$$.f= $2;};
-content_node:start GLYPH glyph END{
- #line 419 "format.w"
- hput_tags($1,hput_glyph(&($3)));};
-start:START{
- #line 420 "format.w"
- HPUTNODE;$$= (uint32_t)(hpos++-hstart);}
- /*:5*/ /*29:*/
-integer:SIGNED |UNSIGNED{
- #line 941 "format.w"
- RNG("number",$1,0,0x7FFFFFFF);};
- /*:29*/ /*38:*/
-glyph:CHARCODE REFERENCE{
- #line 1082 "format.w"
- $$.c= $1;REF(font_kind,$2);$$.f= $2;};
- /*:38*/ /*50:*/
-string:STRING |CHARCODE{
- #line 1187 "format.w"
- static char s[2];
- RNG("String element",$1,0x20,0x7E);
- s[0]= $1;s[1]= 0;$$= s;};
- /*:50*/ /*58:*/
-number:UNSIGNED{
- #line 1339 "format.w"
- $$= (float64_t)$1;} |SIGNED{
- #line 1339 "format.w"
- $$= (float64_t)$1;} |FPNUM;
- /*:58*/ /*82:*/
-dimension:number PT{
- #line 1682 "format.w"
- $$= ROUND($1*ONE);RNG("Dimension",$$,-MAX_DIMEN,MAX_DIMEN);}
- |number INCH{
- #line 1683 "format.w"
- $$= ROUND($1*ONE*72.27);RNG("Dimension",$$,-MAX_DIMEN,MAX_DIMEN);}
- |number MM{
- #line 1684 "format.w"
- $$= ROUND($1*ONE*(72.27/25.4));RNG("Dimension",$$,-MAX_DIMEN,MAX_DIMEN);};
- /*:82*/ /*89:*/
-xdimen:dimension number H number V{
- #line 1762 "format.w"
- $$.w= $1;$$.h= $2;$$.v= $4;}
- |dimension number H{
- #line 1763 "format.w"
- $$.w= $1;$$.h= $2;$$.v= 0.0;}
- |dimension number V{
- #line 1764 "format.w"
- $$.w= $1;$$.h= 0.0;$$.v= $2;}
- |dimension{
- #line 1765 "format.w"
- $$.w= $1;$$.h= 0.0;$$.v= 0.0;};
-
-
-
-xdimen_node:start XDIMEN xdimen END{
- #line 1769 "format.w"
- hput_tags($1,hput_xdimen(&($3)));};
- /*:89*/ /*100:*/
-
-order:PT{
- #line 1947 "format.w"
- $$= normal_o;} |FIL{
- #line 1947 "format.w"
- $$= fil_o;} |FILL{
- #line 1947 "format.w"
- $$= fill_o;} |FILLL{
- #line 1947 "format.w"
- $$= filll_o;};
-
-stretch:number order{
- #line 1949 "format.w"
- $$.f= $1;$$.o= $2;};
- /*:100*/ /*104:*/
-penalty:integer{
- #line 2003 "format.w"
- RNG("Penalty",$1,-20000,+20000);$$= $1;};
-content_node:start PENALTY penalty END{
- #line 2004 "format.w"
- hput_tags($1,hput_int($3));};
- /*:104*/ /*116:*/
-rule_dimension:dimension |RUNNING{
- #line 2179 "format.w"
- $$= RUNNING_DIMEN;};
-rule:rule_dimension rule_dimension rule_dimension
-{
- #line 2181 "format.w"
- $$.h= $1;$$.d= $2;$$.w= $3;
- if($3==RUNNING_DIMEN&&($1==RUNNING_DIMEN||$2==RUNNING_DIMEN))
- QUIT("Incompatible running dimensions 0x%x 0x%x 0x%x",$1,$2,$3);};
-rule_node:start RULE rule END{
- #line 2184 "format.w"
- hput_tags($1,hput_rule(&($3)));};
-content_node:rule_node;
- /*:116*/ /*125:*/
-explicit:{
- #line 2292 "format.w"
- $$= false;} |EXPLICIT{
- #line 2292 "format.w"
- $$= true;};
-kern:explicit xdimen{
- #line 2293 "format.w"
- $$.x= $1;$$.d= $2;};
-content_node:start KERN kern END{
- #line 2294 "format.w"
- hput_tags($1,hput_kern(&($3)));}
- /*:125*/ /*134:*/
-plus:{
- #line 2504 "format.w"
- $$.f= 0.0;$$.o= 0;} |PLUS stretch{
- #line 2504 "format.w"
- $$= $2;};
-minus:{
- #line 2505 "format.w"
- $$.f= 0.0;$$.o= 0;} |MINUS stretch{
- #line 2505 "format.w"
- $$= $2;};
-glue:xdimen plus minus{
- #line 2506 "format.w"
- $$.w= $1;$$.p= $2;$$.m= $3;};
-content_node:start GLUE glue END{
- #line 2507 "format.w"
- if(ZERO_GLUE($3)){HPUT8(zero_skip_no);
- hput_tags($1,TAG(glue_kind,0));}else hput_tags($1,hput_glue(&($3)));};
-glue_node:start GLUE glue END
-{
- #line 2510 "format.w"
- if(ZERO_GLUE($3)){hpos--;$$= false;}
- else{hput_tags($1,hput_glue(&($3)));$$= true;}};
- /*:134*/ /*142:*/
-position:{
- #line 2786 "format.w"
- $$= hpos-hstart;};
-content_list:position
- |content_list content_node;
-estimate:{
- #line 2789 "format.w"
- hpos+= 2;}
- |UNSIGNED{
- #line 2790 "format.w"
- hpos+= hsize_bytes($1)+1;};
-list:start estimate content_list END
-{
- #line 2792 "format.w"
- $$.k= list_kind;$$.p= $3;$$.s= (hpos-hstart)-$3;
- hput_tags($1,hput_list($1+1,&($$)));};
- /*:142*/ /*153:*/
-list:TXT_START position
-{
- #line 3199 "format.w"
- hpos+= 4;}
-text TXT_END
-{
- #line 3201 "format.w"
- $$.k= text_kind;$$.p= $4;$$.s= (hpos-hstart)-$4;
- hput_tags($2,hput_list($2+1,&($$)));};
-text:position |text txt;
-
-txt:TXT_CC{
- #line 3205 "format.w"
- hput_txt_cc($1);}
- |TXT_FONT{
- #line 3206 "format.w"
- REF(font_kind,$1);hput_txt_font($1);}
- |TXT_GLOBAL{
- #line 3207 "format.w"
- REF($1.k,$1.n);hput_txt_global(&($1));}
- |TXT_LOCAL{
- #line 3208 "format.w"
- RNG("Font parameter",$1,0,11);hput_txt_local($1);}
- |TXT_FONT_GLUE{
- #line 3209 "format.w"
- HPUTX(1);HPUT8(txt_glue);}
- |TXT_FONT_HYPHEN{
- #line 3210 "format.w"
- HPUTX(1);HPUT8(txt_hyphen);}
- |TXT_IGNORE{
- #line 3211 "format.w"
- HPUTX(1);HPUT8(txt_ignore);}
- |{
- #line 3212 "format.w"
- HPUTX(1);HPUT8(txt_node);}content_node;
- /*:153*/ /*163:*/
-
-box_dimen:dimension dimension dimension
-{
- #line 3472 "format.w"
- $$= hput_box_dimen($1,$2,$3);};
-box_shift:{
- #line 3473 "format.w"
- $$= b000;}
- |SHIFTED dimension{
- #line 3474 "format.w"
- $$= hput_box_shift($2);};
-
-box_glue_set:{
- #line 3476 "format.w"
- $$= b000;}
- |PLUS stretch{
- #line 3477 "format.w"
- $$= hput_box_glue_set(+1,$2.f,$2.o);}
- |MINUS stretch{
- #line 3478 "format.w"
- $$= hput_box_glue_set(-1,$2.f,$2.o);};
-
-
-box:box_dimen box_shift box_glue_set list{
- #line 3481 "format.w"
- $$= $1 |$2 |$3;};
-
-hbox_node:start HBOX box END{
- #line 3483 "format.w"
- hput_tags($1,TAG(hbox_kind,$3));};
-vbox_node:start VBOX box END{
- #line 3484 "format.w"
- hput_tags($1,TAG(vbox_kind,$3));};
-content_node:hbox_node |vbox_node;
- /*:163*/ /*171:*/
-box_flex:plus minus{
- #line 3665 "format.w"
- hput_stretch(&($1));hput_stretch(&($2));};
-xbox:box_dimen box_shift box_flex xdimen_ref list{
- #line 3666 "format.w"
- $$= $1 |$2;}
- |box_dimen box_shift box_flex xdimen_node list{
- #line 3667 "format.w"
- $$= $1 |$2 |b100;};
-
-box_goal:TO xdimen_ref{
- #line 3669 "format.w"
- $$= b000;}
- |ADD xdimen_ref{
- #line 3670 "format.w"
- $$= b001;}
- |TO xdimen_node{
- #line 3671 "format.w"
- $$= b100;}
- |ADD xdimen_node{
- #line 3672 "format.w"
- $$= b101;};
-
-hpack:box_shift box_goal list{
- #line 3674 "format.w"
- $$= $2;};
-vpack:box_shift MAX DEPTH dimension{
- #line 3675 "format.w"
- HPUT32($4);}box_goal list{
- #line 3675 "format.w"
- $$= $1 |$6;};
-
-vxbox_node:start VSET xbox END{
- #line 3677 "format.w"
- hput_tags($1,TAG(vset_kind,$3));}
- |start VPACK vpack END{
- #line 3678 "format.w"
- hput_tags($1,TAG(vpack_kind,$3));};
-
-
-hxbox_node:start HSET xbox END{
- #line 3681 "format.w"
- hput_tags($1,TAG(hset_kind,$3));}
- |start HPACK hpack END{
- #line 3682 "format.w"
- hput_tags($1,TAG(hpack_kind,$3));};
-
-content_node:vxbox_node |hxbox_node;
- /*:171*/ /*176:*/
-ltype:{
- #line 3792 "format.w"
- $$= 1;} |ALIGN{
- #line 3792 "format.w"
- $$= 1;} |CENTER{
- #line 3792 "format.w"
- $$= 2;} |EXPAND{
- #line 3792 "format.w"
- $$= 3;};
-leaders:glue_node ltype rule_node{
- #line 3793 "format.w"
- if($1)$$= $2 |b100;else $$= $2;}
- |glue_node ltype hbox_node{
- #line 3794 "format.w"
- if($1)$$= $2 |b100;else $$= $2;}
- |glue_node ltype vbox_node{
- #line 3795 "format.w"
- if($1)$$= $2 |b100;else $$= $2;};
-content_node:start LEADERS leaders END{
- #line 3796 "format.w"
- hput_tags($1,TAG(leaders_kind,$3));}
- /*:176*/ /*183:*/
-baseline:dimension{
- #line 3902 "format.w"
- if($1!=0)HPUT32($1);}
-glue_node glue_node{
- #line 3903 "format.w"
- $$= b000;if($1!=0)$$ |= b001;
- if($3)$$ |= b100;
- if($4)$$ |= b010;
- };
-content_node:start BASELINE baseline END
-{
- #line 3908 "format.w"
- if($3==b000)HPUT8(0);hput_tags($1,TAG(baseline_kind,$3));};
- /*:183*/ /*190:*/
-cc_list: |cc_list TXT_CC{
- #line 3991 "format.w"
- hput_utf8($2);};
-lig_cc:UNSIGNED{
- #line 3992 "format.w"
- RNG("UTF-8 code",$1,0,0x1FFFFF);$$= hpos-hstart;hput_utf8($1);};
-lig_cc:CHARCODE{
- #line 3993 "format.w"
- $$= hpos-hstart;hput_utf8($1);};
-ref:REFERENCE{
- #line 3994 "format.w"
- HPUT8($1);$$= $1;};
-ligature:ref{
- #line 3995 "format.w"
- REF(font_kind,$1);}lig_cc TXT_START cc_list TXT_END
-{
- #line 3996 "format.w"
- $$.f= $1;$$.l.p= $3;$$.l.s= (hpos-hstart)-$3;
- RNG("Ligature size",$$.l.s,0,255);};
-content_node:start LIGATURE ligature END{
- #line 3998 "format.w"
- hput_tags($1,hput_ligature(&($3)));};
- /*:190*/ /*198:*/
-replace_count:explicit{
- #line 4108 "format.w"
- if($1){$$= 0x80;HPUT8(0x80);}else $$= 0x00;}
- |explicit UNSIGNED{
- #line 4109 "format.w"
- RNG("Replace count",$2,0,31);
- $$= ($2) |(($1)?0x80:0x00);if($$!=0)HPUT8($$);};
-disc:replace_count list list{
- #line 4111 "format.w"
- $$.r= $1;$$.p= $2;$$.q= $3;
- if($3.s==0){hpos= hpos-2;if($2.s==0)hpos= hpos-2;}}
- |replace_count list{
- #line 4113 "format.w"
- $$.r= $1;$$.p= $2;if($2.s==0)hpos= hpos-2;$$.q.s= 0;}
- |replace_count{
- #line 4114 "format.w"
- $$.r= $1;$$.p.s= 0;$$.q.s= 0;};
-
-
-disc_node:start DISC disc END
-{
- #line 4118 "format.w"
- hput_tags($1,hput_disc(&($3)));};
-
-content_node:disc_node;
- /*:198*/ /*206:*/
-par_dimen:xdimen{
- #line 4270 "format.w"
- hput_xdimen_node(&($1));};
-par:xdimen_ref param_ref list{
- #line 4271 "format.w"
- $$= b000;}
- |xdimen_ref empty_param_list non_empty_param_list list{
- #line 4272 "format.w"
- $$= b010;}
- |xdimen_ref empty_param_list list{
- #line 4273 "format.w"
- $$= b010;}
- |xdimen param_ref{
- #line 4274 "format.w"
- hput_xdimen_node(&($1));}list{
- #line 4274 "format.w"
- $$= b100;}
- |par_dimen empty_param_list non_empty_param_list list{
- #line 4275 "format.w"
- $$= b110;}
- |par_dimen empty_param_list list{
- #line 4276 "format.w"
- $$= b110;};
-
-content_node:start PAR par END{
- #line 4278 "format.w"
- hput_tags($1,TAG(par_kind,$3));};
- /*:206*/ /*211:*/
-math:param_ref list{
- #line 4344 "format.w"
- $$= b000;}
- |param_ref list hbox_node{
- #line 4345 "format.w"
- $$= b001;}
- |param_ref hbox_node list{
- #line 4346 "format.w"
- $$= b010;}
- |empty_param_list list{
- #line 4347 "format.w"
- $$= b100;}
- |empty_param_list list hbox_node{
- #line 4348 "format.w"
- $$= b101;}
- |empty_param_list hbox_node list{
- #line 4349 "format.w"
- $$= b110;}
- |empty_param_list non_empty_param_list list{
- #line 4350 "format.w"
- $$= b100;}
- |empty_param_list non_empty_param_list list hbox_node{
- #line 4351 "format.w"
- $$= b101;}
- |empty_param_list non_empty_param_list hbox_node list{
- #line 4352 "format.w"
- $$= b110;};
-
-content_node:start MATH math END{
- #line 4354 "format.w"
- hput_tags($1,TAG(math_kind,$3));};
- /*:211*/ /*216:*/
-on_off:ON{
- #line 4404 "format.w"
- $$= 1;} |OFF{
- #line 4404 "format.w"
- $$= 0;};
-math:on_off{
- #line 4405 "format.w"
- $$= b011 |($1<<2);};
- /*:216*/ /*220:*/
-content_node:start ADJUST list END{
- #line 4436 "format.w"
- hput_tags($1,TAG(adjust_kind,1));};
- /*:220*/ /*224:*/
-span_count:UNSIGNED{
- #line 4535 "format.w"
- $$= hput_span_count($1);};
-content_node:start ITEM content_node END{
- #line 4536 "format.w"
- hput_tags($1,TAG(item_kind,1));};
-content_node:start ITEM span_count content_node END{
- #line 4537 "format.w"
- hput_tags($1,TAG(item_kind,$3));};
-content_node:start ITEM list END{
- #line 4538 "format.w"
- hput_tags($1,TAG(item_kind,b000));};
-
-table:H box_goal list list{
- #line 4540 "format.w"
- $$= $2;};
-table:V box_goal list list{
- #line 4541 "format.w"
- $$= $2 |b010;};
-
-content_node:start TABLE table END{
- #line 4543 "format.w"
- hput_tags($1,TAG(table_kind,$3));};
- /*:224*/ /*231:*/
-image_dimen:dimension dimension{
- #line 4631 "format.w"
- $$.w= $1;$$.h= $2;} |{
- #line 4631 "format.w"
- $$.w= $$.h= 0;};
-image:UNSIGNED image_dimen plus minus{
- #line 4632 "format.w"
- $$.w= $2.w;$$.h= $2.h;$$.p= $3;$$.m= $4;RNG("Section number",$1,3,max_section_no);$$.n= $1;};
-content_node:start IMAGE image END{
- #line 4633 "format.w"
- hput_tags($1,hput_image(&($3)));}
- /*:231*/ /*241:*/
-max_value:OUTLINE UNSIGNED{
- #line 4870 "format.w"
- max_outline= $2;
- RNG("max outline",max_outline,0,0xFFFF);
- DBG(DBGDEF |DBGLABEL,"Setting max outline to %d\n",max_outline);
- };
- /*:241*/ /*248:*/
-placement:TOP{
- #line 4962 "format.w"
- $$= LABEL_TOP;} |BOT{
- #line 4962 "format.w"
- $$= LABEL_BOT;} |MID{
- #line 4962 "format.w"
- $$= LABEL_MID;} |{
- #line 4962 "format.w"
- $$= LABEL_MID;};
-content_node:START LABEL REFERENCE placement END
-{
- #line 4964 "format.w"
- hset_label($3,$4);}
- /*:248*/ /*262:*/
-content_node:start LINK REFERENCE on_off END
-{
- #line 5222 "format.w"
- hput_tags($1,hput_link($3,$4));};
- /*:262*/ /*272:*/
-def_node:START OUTLINE REFERENCE integer position list END{
- #line 5352 "format.w"
-
- static int outline_no= -1;
- $$.k= outline_kind;$$.n= $3;
- if($6.s==0)QUIT("Outline with empty title in line %d",yylineno);
- outline_no++;
- hset_outline(outline_no,$3,$4,$5);
- };
- /*:272*/ /*279:*/
-stream_link:ref{
- #line 5767 "format.w"
- REF_RNG(stream_kind,$1);} |NOREFERENCE{
- #line 5767 "format.w"
- HPUT8(255);};
-stream_split:stream_link stream_link UNSIGNED{
- #line 5768 "format.w"
- RNG("split ratio",$3,0,1000);HPUT16($3);};
-stream_info:xdimen_node UNSIGNED{
- #line 5769 "format.w"
- RNG("magnification factor",$2,0,1000);HPUT16($2);}stream_split;
-
-stream_type:stream_info{
- #line 5771 "format.w"
- $$= 0;} |FIRST{
- #line 5771 "format.w"
- $$= 1;} |LAST{
- #line 5771 "format.w"
- $$= 2;} |TOP{
- #line 5771 "format.w"
- $$= 3;};
-
-stream_def_node:start STREAMDEF ref stream_type
-list xdimen_node glue_node list glue_node END
-{
- #line 5775 "format.w"
- DEF($$,stream_kind,$3);hput_tags($1,TAG(stream_kind,$4 |b100));};
-
-stream_ins_node:start STREAMDEF ref END
-{
- #line 5778 "format.w"
- RNG("Stream insertion",$3,0,max_ref[stream_kind]);hput_tags($1,TAG(stream_kind,b100));};
-
-content_node:stream_def_node |stream_ins_node;
- /*:279*/ /*284:*/
-stream:empty_param_list list{
- #line 5873 "format.w"
- $$= b010;}
- |empty_param_list non_empty_param_list list{
- #line 5874 "format.w"
- $$= b010;}
- |param_ref list{
- #line 5875 "format.w"
- $$= b000;};
-content_node:start STREAM stream_ref stream END
-{
- #line 5877 "format.w"
- hput_tags($1,TAG(stream_kind,$4));};
- /*:284*/ /*289:*/
-page_priority:{
- #line 5980 "format.w"
- HPUT8(1);}
- |UNSIGNED{
- #line 5981 "format.w"
- RNG("page priority",$1,0,255);HPUT8($1);};
-
-stream_def_list: |stream_def_list stream_def_node;
-
-page:string{
- #line 5985 "format.w"
- hput_string($1);}page_priority glue_node dimension{
- #line 5985 "format.w"
- HPUT32($5);}
-xdimen_node xdimen_node
-list stream_def_list;
- /*:289*/ /*297:*/
-
-content_node:START RANGE REFERENCE ON END{
- #line 6097 "format.w"
- REF(page_kind,$3);hput_range($3,true);}
- |START RANGE REFERENCE OFF END{
- #line 6098 "format.w"
- REF(page_kind,$3);hput_range($3,false);};
- /*:297*/ /*308:*/
-hint:directory_section definition_section content_section;
- /*:308*/ /*324:*/
-directory_section:START DIRECTORY UNSIGNED{
- #line 6788 "format.w"
- new_directory($3+1);new_output_buffers();}entry_list END;
-entry_list: |entry_list entry;
-entry:START SECTION UNSIGNED string END
-{
- #line 6791 "format.w"
- RNG("Section number",$3,3,max_section_no);hset_entry(&(dir[$3]),$3,0,0,$4);};
- /*:324*/ /*345:*/
-definition_section:START DEFINITIONS{
- #line 7326 "format.w"
- hput_definitions_start();}
-max_definitions definition_list
-END{
- #line 7328 "format.w"
- hput_definitions_end();};
-definition_list: |definition_list def_node;
- /*:345*/ /*353:*/
-max_definitions:START MAX max_list END
-{
- #line 7444 "format.w"
- /*245:*/
- if(max_ref[label_kind]>=0)
- ALLOCATE(labels,max_ref[label_kind]+1,label_t);
- /*:245*/ /*266:*/
- if(max_outline>=0)
- ALLOCATE(outlines,max_outline+1,outline_t);
- /*:266*/ /*293:*/
- ALLOCATE(page_on,max_ref[page_kind]+1,int);
- ALLOCATE(range_pos,2*(max_ref[range_kind]+1),range_pos_t);
- /*:293*/ /*359:*/
- definition_bits[0][int_kind]= (1<<(MAX_INT_DEFAULT+1))-1;
- definition_bits[0][dimen_kind]= (1<<(MAX_DIMEN_DEFAULT+1))-1;
- definition_bits[0][xdimen_kind]= (1<<(MAX_XDIMEN_DEFAULT+1))-1;
- definition_bits[0][glue_kind]= (1<<(MAX_GLUE_DEFAULT+1))-1;
- definition_bits[0][baseline_kind]= (1<<(MAX_BASELINE_DEFAULT+1))-1;
- definition_bits[0][page_kind]= (1<<(MAX_PAGE_DEFAULT+1))-1;
- definition_bits[0][stream_kind]= (1<<(MAX_STREAM_DEFAULT+1))-1;
- definition_bits[0][range_kind]= (1<<(MAX_RANGE_DEFAULT+1))-1;
- /*:359*/ /*374:*/
- ALLOCATE(hfont_name,max_ref[font_kind]+1,char*);
- /*:374*/hput_max_definitions();};
-
-max_list: |max_list START max_value END;
-
-max_value:FONT UNSIGNED{
- #line 7448 "format.w"
- hset_max(font_kind,$2);}
- |INTEGER UNSIGNED{
- #line 7449 "format.w"
- hset_max(int_kind,$2);}
- |DIMEN UNSIGNED{
- #line 7450 "format.w"
- hset_max(dimen_kind,$2);}
- |LIGATURE UNSIGNED{
- #line 7451 "format.w"
- hset_max(ligature_kind,$2);}
- |DISC UNSIGNED{
- #line 7452 "format.w"
- hset_max(disc_kind,$2);}
- |GLUE UNSIGNED{
- #line 7453 "format.w"
- hset_max(glue_kind,$2);}
- |LANGUAGE UNSIGNED{
- #line 7454 "format.w"
- hset_max(language_kind,$2);}
- |RULE UNSIGNED{
- #line 7455 "format.w"
- hset_max(rule_kind,$2);}
- |IMAGE UNSIGNED{
- #line 7456 "format.w"
- hset_max(image_kind,$2);}
- |LEADERS UNSIGNED{
- #line 7457 "format.w"
- hset_max(leaders_kind,$2);}
- |BASELINE UNSIGNED{
- #line 7458 "format.w"
- hset_max(baseline_kind,$2);}
- |XDIMEN UNSIGNED{
- #line 7459 "format.w"
- hset_max(xdimen_kind,$2);}
- |PARAM UNSIGNED{
- #line 7460 "format.w"
- hset_max(param_kind,$2);}
- |STREAMDEF UNSIGNED{
- #line 7461 "format.w"
- hset_max(stream_kind,$2);}
- |PAGE UNSIGNED{
- #line 7462 "format.w"
- hset_max(page_kind,$2);}
- |RANGE UNSIGNED{
- #line 7463 "format.w"
- hset_max(range_kind,$2);}
- |LABEL UNSIGNED{
- #line 7464 "format.w"
- hset_max(label_kind,$2);};
-
- /*:353*/ /*361:*/
-def_node:
-start FONT ref font END{
- #line 7661 "format.w"
- DEF($$,font_kind,$3);hput_tags($1,$4);}
- |start INTEGER ref integer END{
- #line 7662 "format.w"
- DEF($$,int_kind,$3);hput_tags($1,hput_int($4));}
- |start DIMEN ref dimension END{
- #line 7663 "format.w"
- DEF($$,dimen_kind,$3);hput_tags($1,hput_dimen($4));}
- |start LANGUAGE ref string END{
- #line 7664 "format.w"
- DEF($$,language_kind,$3);hput_string($4);hput_tags($1,TAG(language_kind,0));}
- |start GLUE ref glue END{
- #line 7665 "format.w"
- DEF($$,glue_kind,$3);hput_tags($1,hput_glue(&($4)));}
- |start XDIMEN ref xdimen END{
- #line 7666 "format.w"
- DEF($$,xdimen_kind,$3);hput_tags($1,hput_xdimen(&($4)));}
- |start RULE ref rule END{
- #line 7667 "format.w"
- DEF($$,rule_kind,$3);hput_tags($1,hput_rule(&($4)));}
- |start LEADERS ref leaders END{
- #line 7668 "format.w"
- DEF($$,leaders_kind,$3);hput_tags($1,TAG(leaders_kind,$4));}
- |start BASELINE ref baseline END{
- #line 7669 "format.w"
- DEF($$,baseline_kind,$3);hput_tags($1,TAG(baseline_kind,$4));}
- |start LIGATURE ref ligature END{
- #line 7670 "format.w"
- DEF($$,ligature_kind,$3);hput_tags($1,hput_ligature(&($4)));}
- |start DISC ref disc END{
- #line 7671 "format.w"
- DEF($$,disc_kind,$3);hput_tags($1,hput_disc(&($4)));}
- |start IMAGE ref image END{
- #line 7672 "format.w"
- DEF($$,image_kind,$3);hput_tags($1,hput_image(&($4)));}
- |start PARAM ref parameters END{
- #line 7673 "format.w"
- DEF($$,param_kind,$3);hput_tags($1,hput_list($1+2,&($4)));}
- |start PAGE ref page END{
- #line 7674 "format.w"
- DEF($$,page_kind,$3);hput_tags($1,TAG(page_kind,0));};
- /*:361*/ /*363:*/
-def_node:
-start INTEGER ref ref END{
- #line 7693 "format.w"
- DEF_REF($$,int_kind,$3,$4);hput_tags($1,TAG(int_kind,0));}
- |start DIMEN ref ref END{
- #line 7694 "format.w"
- DEF_REF($$,dimen_kind,$3,$4);hput_tags($1,TAG(dimen_kind,0));}
- |start GLUE ref ref END{
- #line 7695 "format.w"
- DEF_REF($$,glue_kind,$3,$4);hput_tags($1,TAG(glue_kind,0));};
- /*:363*/ /*368:*/
-def_list:position
- |def_list def_node{
- #line 7809 "format.w"
- check_param_def(&($2));};
-parameters:estimate def_list{
- #line 7810 "format.w"
- $$.p= $2;$$.k= param_kind;$$.s= (hpos-hstart)-$2;};
- /*:368*/ /*369:*/
-empty_param_list:position{
- #line 7831 "format.w"
- HPUTX(2);hpos++;hput_tags($1,TAG(param_kind,1));};
-non_empty_param_list:start PARAM{
- #line 7832 "format.w"
- hpos= hpos-2;}parameters END
-{
- #line 7833 "format.w"
- hput_tags($1-2,hput_list($1-1,&($4)));};
- /*:369*/ /*377:*/
-
-font:font_head font_param_list;
-
-font_head:string dimension UNSIGNED UNSIGNED
-{
- #line 7975 "format.w"
- uint8_t f= $<u>0;SET_DBIT(f,font_kind);hfont_name[f]= strdup($1);$$= hput_font_head(f,hfont_name[f],$2,$3,$4);};
-
-font_param_list:glue_node disc_node |font_param_list font_param;
-
-font_param:
-start PENALTY fref penalty END{
- #line 7980 "format.w"
- hput_tags($1,hput_int($4));}
- |start KERN fref kern END{
- #line 7981 "format.w"
- hput_tags($1,hput_kern(&($4)));}
- |start LIGATURE fref ligature END{
- #line 7982 "format.w"
- hput_tags($1,hput_ligature(&($4)));}
- |start DISC fref disc END{
- #line 7983 "format.w"
- hput_tags($1,hput_disc(&($4)));}
- |start GLUE fref glue END{
- #line 7984 "format.w"
- hput_tags($1,hput_glue(&($4)));}
- |start LANGUAGE fref string END{
- #line 7985 "format.w"
- hput_string($4);hput_tags($1,TAG(language_kind,0));}
- |start RULE fref rule END{
- #line 7986 "format.w"
- hput_tags($1,hput_rule(&($4)));}
- |start IMAGE fref image END{
- #line 7987 "format.w"
- hput_tags($1,hput_image(&($4)));};
-
-fref:ref{
- #line 7989 "format.w"
- RNG("Font parameter",$1,0,MAX_FONT_PARAMS);};
- /*:377*/ /*380:*/
-xdimen_ref:ref{
- #line 8062 "format.w"
- REF(xdimen_kind,$1);};
-param_ref:ref{
- #line 8063 "format.w"
- REF(param_kind,$1);};
-stream_ref:ref{
- #line 8064 "format.w"
- REF_RNG(stream_kind,$1);};
-
-
-content_node:
-start PENALTY ref END{
- #line 8068 "format.w"
- REF(penalty_kind,$3);hput_tags($1,TAG(penalty_kind,0));}
- |start KERN explicit ref END
-{
- #line 8070 "format.w"
- REF(dimen_kind,$4);hput_tags($1,TAG(kern_kind,($3)?b100:b000));}
- |start KERN explicit XDIMEN ref END
-{
- #line 8072 "format.w"
- REF(xdimen_kind,$5);hput_tags($1,TAG(kern_kind,($3)?b101:b001));}
- |start GLUE ref END{
- #line 8073 "format.w"
- REF(glue_kind,$3);hput_tags($1,TAG(glue_kind,0));}
- |start LIGATURE ref END{
- #line 8074 "format.w"
- REF(ligature_kind,$3);hput_tags($1,TAG(ligature_kind,0));}
- |start DISC ref END{
- #line 8075 "format.w"
- REF(disc_kind,$3);hput_tags($1,TAG(disc_kind,0));}
- |start RULE ref END{
- #line 8076 "format.w"
- REF(rule_kind,$3);hput_tags($1,TAG(rule_kind,0));}
- |start IMAGE ref END{
- #line 8077 "format.w"
- REF(image_kind,$3);hput_tags($1,TAG(image_kind,0));}
- |start LEADERS ref END{
- #line 8078 "format.w"
- REF(leaders_kind,$3);hput_tags($1,TAG(leaders_kind,0));}
- |start BASELINE ref END{
- #line 8079 "format.w"
- REF(baseline_kind,$3);hput_tags($1,TAG(baseline_kind,0));}
- |start LANGUAGE REFERENCE END{
- #line 8080 "format.w"
- REF(language_kind,$3);hput_tags($1,hput_language($3));};
-
-glue_node:start GLUE ref END{
- #line 8082 "format.w"
- REF(glue_kind,$3);
- if($3==zero_skip_no){hpos= hpos-2;$$= false;}
- else{hput_tags($1,TAG(glue_kind,0));$$= true;}};
-
- /*:380*/ /*405:*/
-content_section:START CONTENT{
- #line 8513 "format.w"
- hput_content_start();}content_list END
-{
- #line 8514 "format.w"
- hput_content_end();hput_range_defs();hput_label_defs();};
- /*:405*/
-%%
- /*:512*/
Modified: trunk/Build/source/texk/web2c/man/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/man/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/man/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * Makefile.am: copyright 2022.
+
2022-01-09 Andreas Scherer <https://ascherer.github.io>
* twill.man,
Modified: trunk/Build/source/texk/web2c/man/Makefile.am
===================================================================
--- trunk/Build/source/texk/web2c/man/Makefile.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/man/Makefile.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,6 +1,7 @@
## $Id$
## Makefile.am for the TeX Live subdirectory texk/web2c/man/
-## Copyright 2015-2019 Karl Berry <tex-live at tug.org>
+##
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
##
Modified: trunk/Build/source/texk/web2c/mfluadir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/mfluadir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/mfluadir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/mflua.am: do not silence tangle-sh.
+
2021-03-15 Luigi Scarso <luigi.scarso at gmail.com>
* Code clean up (thanks to A. Kakuto)
Modified: trunk/Build/source/texk/web2c/mfluadir/am/mflua.am
===================================================================
--- trunk/Build/source/texk/web2c/mfluadir/am/mflua.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/mfluadir/am/mflua.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,6 +1,7 @@
+## $Id$
## texk/web2c/mfluadir/am/mflua.am: Makefile fragment for MFLua.
##
-## Copyright 2016 Karl Berry <tex-live at tug.org>
+## Copyright 2016-2022 Karl Berry <tex-live at tug.org>
## Copyright 2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -76,9 +77,9 @@
# Tangling MFLua
mflua.p mflua.pool: mflua-tangle
- @$(texmf_tangle) mflua mflua
+ $(texmf_tangle) mflua mflua
mflua-tangle: tangle$(EXEEXT) mflua.web mflua.ch tangle-sh
- @$(texmf_tangle) mflua mflua
+ $(texmf_tangle) mflua mflua
# Extract mflua version
$(srcdir)/mfluadir/mflua_version.h: @MAINTAINER_MODE_TRUE@ mfluadir/mf-lua.ch
@@ -136,3 +137,5 @@
mfluadir/mfluatrap/mflua_ttx_backend.lua \
mfluadir/mfluatrap/texmf.cnf \
mfluadir/mfluatrap/mfluatrap.diffs
+
+# (end of mflua.am)
Property changes on: trunk/Build/source/texk/web2c/mfluadir/am/mflua.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/mfluajitdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/mfluajitdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/mfluajitdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,8 +1,11 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/mfluajit.am: do not silence tangle-sh.
+
2017-04-16 Luigi Scarso <luigi.scarso at gmail.com>
* am/mfluajit.am: delete useless lua files
-
2016-04-05 Karl Berry <karl at tug.org>
* am/mflua.am: no need for inimfluajit.
Modified: trunk/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
===================================================================
--- trunk/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,6 +1,7 @@
+## $Id$
## texk/web2c/mfluajitdir/am/mfluajit.am: Makefile fragment for MFLuaJIT.
##
-## Copyright 2016 Karl Berry <tex-live at tug.org>
+## Copyright 2016-2022 Karl Berry <tex-live at tug.org>
## Copyright 2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -76,9 +77,9 @@
# Tangling MFLuaJIT
mfluajit.p mfluajit.pool: mfluajit-tangle
- @$(texmf_tangle) mfluajit mfluajit
+ $(texmf_tangle) mfluajit mfluajit
mfluajit-tangle: tangle$(EXEEXT) mfluajit.web mfluajit.ch tangle-sh
- @$(texmf_tangle) mfluajit mfluajit
+ $(texmf_tangle) mfluajit mfluajit
# Generate mfluajit.web
mfluajit.web: tie$(EXEEXT) $(mfluajit_web_srcs)
@@ -133,3 +134,5 @@
mfluadir/mfluatrap/mflua_ttx_backend.lua \
mfluadir/mfluatrap/texmf.cnf \
mfluadir/mfluatrap/mfluatrap.diffs
+
+# (end of mfluajit.am)
Property changes on: trunk/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/mplibdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/mplibdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,8 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/libmplib.am,
+ * am/mplib.am: do not silence tangle-sh.
+
2021-05-09 Luigi Scarso <luigi.scarso at gmail.com>
* Impose mp->stack_size < 1001 in @d push_input to avoid stack overflow
due infinite recursion of macro expansion (thanks to A. Kakuto).
Modified: trunk/Build/source/texk/web2c/mplibdir/am/libmplib.am
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/am/libmplib.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/mplibdir/am/libmplib.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,7 +1,8 @@
+## $Id$
## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib.
##
-## Copyright (C) 2015-2021 Luigi Scarso <tex-live at tug.org>
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2022 Luigi Scarso <tex-live at tug.org>
+## Copyright 2009-2014 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
## libmplib.a, used by MetaPost and luaTeX
@@ -38,49 +39,49 @@
# Creating several files: need stamp file and two rules with identical recipes
$(mp_c_h): mp-tangle
- @$(mp_ctangle_sh) mp
+ $(mp_ctangle_sh) mp
mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh
- @$(mp_ctangle_sh) mp
+ $(mp_ctangle_sh) mp
$(mpmath_c_h): mpmath-tangle mp-tangle
- @$(mp_ctangle_sh) mpmath
+ $(mp_ctangle_sh) mpmath
mpmath-tangle: ctangle$(EXEEXT) mplibdir/mpmath.w tangle-sh
- @$(mp_ctangle_sh) mpmath
+ $(mp_ctangle_sh) mpmath
$(mpmathbinary_c_h): mpmathbinary-tangle mp-tangle
- @$(mp_ctangle_sh) mpmathbinary
+ $(mp_ctangle_sh) mpmathbinary
mpmathbinary-tangle: ctangle$(EXEEXT) mplibdir/mpmathbinary.w tangle-sh
- @$(mp_ctangle_sh) mpmathbinary
+ $(mp_ctangle_sh) mpmathbinary
$(mpmathdecimal_c_h): mpmathdecimal-tangle mp-tangle
- @$(mp_ctangle_sh) mpmathdecimal
+ $(mp_ctangle_sh) mpmathdecimal
mpmathdecimal-tangle: ctangle$(EXEEXT) mplibdir/mpmathdecimal.w tangle-sh
- @$(mp_ctangle_sh) mpmathdecimal
+ $(mp_ctangle_sh) mpmathdecimal
$(mpmathdouble_c_h): mpmathdouble-tangle mp-tangle
- @$(mp_ctangle_sh) mpmathdouble
+ $(mp_ctangle_sh) mpmathdouble
mpmathdouble-tangle: ctangle$(EXEEXT) mplibdir/mpmathdouble.w tangle-sh
- @$(mp_ctangle_sh) mpmathdouble
+ $(mp_ctangle_sh) mpmathdouble
$(mpstrings_c_h): mpstrings-tangle
- @$(mp_ctangle_sh) mpstrings
+ $(mp_ctangle_sh) mpstrings
mpstrings-tangle: ctangle$(EXEEXT) mplibdir/mpstrings.w tangle-sh
- @$(mp_ctangle_sh) mpstrings
+ $(mp_ctangle_sh) mpstrings
$(pngout_c_h): pngout-tangle
- @$(mp_ctangle_sh) pngout
+ $(mp_ctangle_sh) pngout
pngout-tangle: ctangle$(EXEEXT) mplibdir/pngout.w tangle-sh
- @$(mp_ctangle_sh) pngout
+ $(mp_ctangle_sh) pngout
$(psout_c_h): psout-tangle
- @$(mp_ctangle_sh) psout
+ $(mp_ctangle_sh) psout
psout-tangle: ctangle$(EXEEXT) mplibdir/psout.w tangle-sh
- @$(mp_ctangle_sh) psout
+ $(mp_ctangle_sh) psout
$(svgout_c_h): svgout-tangle
- @$(mp_ctangle_sh) svgout
+ $(mp_ctangle_sh) svgout
svgout-tangle: ctangle$(EXEEXT) mplibdir/svgout.w tangle-sh
- @$(mp_ctangle_sh) svgout
+ $(mp_ctangle_sh) svgout
## libmplib CWeb sources
libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w mplibdir/pngout.w
@@ -101,3 +102,4 @@
mp-tangle mpmath-tangle mpmathdecimal-tangle mpmathdouble-tangle \
mpstrings-tangle psout-tangle svgout-tangle pngout-tangle
+# (end of libmplib.am)
Property changes on: trunk/Build/source/texk/web2c/mplibdir/am/libmplib.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/mplibdir/am/mplib.am
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/am/mplib.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/mplibdir/am/mplib.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,6 +1,7 @@
+## $Id$
## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost.
##
-## Copyright 2017-2021 Luigi Scarso <tex-live at tug.org>
+## Copyright 2017-2022 Luigi Scarso <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -52,9 +53,9 @@
$(mp_ctangle) mpost.w
$(mpxout_c_h): mpxout-tangle
- @$(mp_ctangle_sh) mpxout
+ $(mp_ctangle_sh) mpxout
mpxout-tangle: ctangle$(EXEEXT) mplibdir/mpxout.w tangle-sh
- @$(mp_ctangle_sh) mpxout
+ $(mp_ctangle_sh) mpxout
## MetaPost CWeb sources
mpost_web = mplibdir/mpost.w mplibdir/mpxout.w
@@ -90,3 +91,4 @@
mptrap-clean:
rm -rf mptrapdir
+# (end of mplib.am)
Property changes on: trunk/Build/source/texk/web2c/mplibdir/am/mplib.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/omegaware/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/omegaware/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/omegaware.am: do not silence tangle-sh.
+
2021-03-23 Karl Berry <karl at tug.org>
* TL'21.
Modified: trunk/Build/source/texk/web2c/omegaware/am/omegaware.am
===================================================================
--- trunk/Build/source/texk/web2c/omegaware/am/omegaware.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/omegaware/am/omegaware.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,6 +1,8 @@
+## $Id$
## texk/web2c/omegaware/am/omegaware.am: Makefile fragment for omegaware web programs.
##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
omegaware_programs = odvicopy odvitype otangle wofm2opl wopl2ofm wovf2ovp wovp2ovf
@@ -63,9 +65,9 @@
nodist_otangle_SOURCES = otangle.c otangle.h
otangle.c otangle.h: otangle-web2c
- @$(web2c) otangle
+ $(web2c) otangle
otangle-web2c: otangle.p $(web2c_depend)
- @$(web2c) otangle
+ $(web2c) otangle
EXTRA_DIST += $(otangle_sources)
otangle_sources = omegaware/otangle.web omegaware/otangle.ch
otangle.p: tangle$(EXEEXT) $(otangle_sources)
@@ -213,3 +215,4 @@
omegaware/tests/arabicr.pl omegaware/tests/arabic.ovp
DISTCLEANFILES += omegaware/tests/*yarabic*
+# (end of omegaware.am)
Property changes on: trunk/Build/source/texk/web2c/omegaware/am/omegaware.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/pdftexdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/pdftex.am: do not silence tangle-sh.
+
2021-11-07 Andreas Scherer <https://ascherer.github.io>
* pdftex.web: Use WEB meta-comment for stale code.
Modified: trunk/Build/source/texk/web2c/pdftexdir/am/pdftex.am
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/am/pdftex.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/pdftexdir/am/pdftex.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,7 +1,7 @@
## $Id$
## texk/web2c/pdftexdir/am/pdftex.am: Makefile fragment for pdfTeX.
##
-## Copyright 2016-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2016-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -43,13 +43,13 @@
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
pdftexdir/pdftex_version.h pdftexdir/etex_version.h
$(pdftex_c_h): pdftex-web2c
- @$(web2c) pdftex
+ $(web2c) pdftex
pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
- @$(web2c) pdftex
+ $(web2c) pdftex
pdftex.p pdftex.pool: pdftex-tangle
- @$(pdf_tangle) pdftex pdftex-final
+ $(pdf_tangle) pdftex pdftex-final
pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex-final.ch tangle-sh
- @$(pdf_tangle) pdftex pdftex-final
+ $(pdf_tangle) pdftex pdftex-final
pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
$(makecpool) pdftex >$@ || rm -f $@
@@ -137,3 +137,5 @@
## partoken.test
EXTRA_DIST += tests/partoken-ok.tex tests/partoken-xfail.tex
DISTCLEANFILES += partoken-ok.log partoken-xfail.log
+
+# (end of pdftex.am)
Modified: trunk/Build/source/texk/web2c/pmpostdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pmpostdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/pmpostdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/pmpost.am: do not silence tangle-sh.
+
2021-04-11 Akira Kakuto <kakuto at w32tex.org>
* pmp.ch: Sync with the version 2.01 mp.w.
Modified: trunk/Build/source/texk/web2c/pmpostdir/am/pmpost.am
===================================================================
--- trunk/Build/source/texk/web2c/pmpostdir/am/pmpost.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/pmpostdir/am/pmpost.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,6 +1,7 @@
+## $Id$
## texk/web2c/pmpostdir/am/pmpost.am: Makefile fragment for pMetaPost.
##
-## Copyright 2018 Karl Berry <tex-live at tug.org>
+## Copyright 2018-2022 Karl Berry <tex-live at tug.org>
## Copyright 2014-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -64,9 +65,11 @@
pmp_ctangle_sh = CWEBINPUTS=.:$(srcdir)/pmpostdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(CTANGLE)
## pMetaPost C sources
-nodist_pmpost_SOURCES = $(pmp_c_h) $(pmpmath_c_h) $(pmpmathbinary_c_h) $(pmpmathdecimal_c_h) \
+nodist_pmpost_SOURCES = $(pmp_c_h) $(pmpmath_c_h) $(pmpmathbinary_c_h) \
+ $(pmpmathdecimal_c_h) \
$(pmpmathdouble_c_h) pmpost.c $(pmpstrings_c_h) $(pmpxout_c_h) \
$(ppngout_c_h) $(ppsout_c_h) $(psvgout_c_h) ptfmin.c
+#
pmp_c_h = pmp.c pmplib.h pmpmp.h
pmpmath_c_h = pmpmath.c pmpmath.h
pmpmathbinary_c_h = pmpmathbinary.c pmpmathbinary.h
@@ -136,24 +139,24 @@
# Creating several files: need stamp file and two rules with identical recipes
$(pmp_c_h): pmp-tangle
- @$(pmp_ctangle_sh) pmp pmp
+ $(pmp_ctangle_sh) pmp pmp
pmp-tangle: ctangle$(EXEEXT) pmp.w pmpostdir/pmp.ch tangle-sh
- @$(pmp_ctangle_sh) pmp pmp
+ $(pmp_ctangle_sh) pmp pmp
$(pmpxout_c_h): pmpxout-tangle
- @$(pmp_ctangle_sh) pmpxout pmpxout
+ $(pmp_ctangle_sh) pmpxout pmpxout
pmpxout-tangle: ctangle$(EXEEXT) pmpxout.w pmpostdir/pmpxout.ch tangle-sh
- @$(pmp_ctangle_sh) pmpxout pmpxout
+ $(pmp_ctangle_sh) pmpxout pmpxout
$(ppsout_c_h): ppsout-tangle
- @$(pmp_ctangle_sh) ppsout ppsout
+ $(pmp_ctangle_sh) ppsout ppsout
ppsout-tangle: ctangle$(EXEEXT) ppsout.w pmpostdir/ppsout.ch tangle-sh
- @$(pmp_ctangle_sh) ppsout ppsout
+ $(pmp_ctangle_sh) ppsout ppsout
$(psvgout_c_h): psvgout-tangle
- @$(pmp_ctangle_sh) psvgout psvgout
+ $(pmp_ctangle_sh) psvgout psvgout
psvgout-tangle: ctangle$(EXEEXT) psvgout.w pmpostdir/psvgout.ch tangle-sh
- @$(pmp_ctangle_sh) psvgout psvgout
+ $(pmp_ctangle_sh) psvgout psvgout
## pMetaPost CWeb sources
pmpost_web = pmpostdir/pmp.ch pmpostdir/pmpost.ch pmpostdir/pmpxout.ch pmpostdir/ppsout.ch \
@@ -191,3 +194,4 @@
## pmpostdir/upmpsamp.test
DISTCLEANFILES += upmpsamp.*
+# (end of pmpost.am)
Property changes on: trunk/Build/source/texk/web2c/pmpostdir/am/pmpost.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/ptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/ptexdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/ptex.am: do not silence tangle-sh.
+
2021-07-01 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
* ptex-base.ch: Set subtype=0 for adjust_node.
Modified: trunk/Build/source/texk/web2c/ptexdir/am/ptex.am
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/am/ptex.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/ptexdir/am/ptex.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,7 +1,7 @@
## $Id$
## texk/web2c/ptexdir/am/ptex.am: Makefile fragment for pTeX.
##
-## Copyright 2015-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
## Copyright 2010-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -60,9 +60,9 @@
# Tangling pTeX
ptex.p ptex.pool: ptex-tangle
- @$(texmf_tangle) ptex ptex
+ $(texmf_tangle) ptex ptex
ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
- @$(texmf_tangle) ptex ptex
+ $(texmf_tangle) ptex ptex
# Extract ptex version
$(srcdir)/ptexdir/ptex_version.h: @MAINTAINER_MODE_TRUE@ ptexdir/ptex-base.ch
@@ -240,3 +240,5 @@
rm -rf ptripdir
DISTCLEANFILES += ptrip.diffs
+
+# (end of ptex.am)
Modified: trunk/Build/source/texk/web2c/tangle-sh.in
===================================================================
--- trunk/Build/source/texk/web2c/tangle-sh.in 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/tangle-sh.in 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,7 +1,9 @@
#! @SHELL@
-# tangle-sh: shell script to invoke tangle (or ctangle, etc).
+# $Id$
+# tangle-sh: shell script to invoke tangle, ctangle, otangle.
#
-# Copyright (C) 2009, 2012 Peter Breitenlohner <tex-live at tug.org>
+# Copyright 2015-2022 Karl Berry <tex-live at tug.org>
+# Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -8,18 +10,34 @@
# with or without modifications, as long as this notice is preserved.
#
# Tangle may create several files, e.g., tex.p and tex.pool from tex.web
-# and tex.ch. The naive rule
+# and tex.ch. The simple but naive rule
# tex.p tex.pool: tex.web tex.ch tangle$(EXEEXT)
# $(tangle) tex tex
-# could run 'tangle tex tex' twice in parallel and fail. To avoid this
-# and yet recover from removal of tex.p and/or tex.pool, we use an
-# auxiliary stamp file tex-tangle and the two rules
+# could run 'tangle tex tex' twice in parallel and thus fail.
+#
+# To avoid this and yet recover from removal of tex.p and/or tex.pool,
+# we use an auxiliary stamp file tex-tangle and the two identical rules:
# tex.p tex.pool: tex-tangle
+# # recover from deletion of target files:
# WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(TANGLE) tex tex
# tex-tangle: tex.web tex.ch tangle$(EXEEXT) tangle-sh
+# # normal build:
# WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(TANGLE) tex tex
-# Compare Automake manual (info Automake) 27.9: Multiple Outputs
#
+# Confusingly, both rules invoke this script (tangle-sh[.in]), but have
+# quite different purposes, as indicated above. As a result, make will
+# always run tangle-sh twice when a target needs to be rebuilt.
+#
+# The actual running of tangle happens in the second rule, when we are
+# making the stamp file. The first rule is to recover from deletion of
+# the derived files.
+#
+# This approach is in the Automake manual, Multiple Outputs node:
+# https://gnu.org/s/automake/manual/html_node/Multiple-Outputs.html
+#
+# By the way, the name of the stamp file (foo-tangle) is embedded both
+# in this script and in the various *.am files, so it can't be changed lightly.
+
TEXMFCNF=@srcdir@/../kpathsea; export TEXMFCNF
env="TEXMFCNF=$TEXMFCNF"
@@ -26,6 +44,7 @@
test "x$WEBINPUTS" = x || env="WEBINPUTS=$WEBINPUTS $env"
test "x$CWEBINPUTS" = x || env="CWEBINPUTS=$CWEBINPUTS $env"
+prg=`basename $0`
target=$1; shift
tangle=$1; shift
base=$1
@@ -33,13 +52,13 @@
do_tangle () {
echo timestamp >$stamp.tmp
if $AM_V_P; then
- echo "$env $tangle $@"
+ echo "$prg: $env $tangle $@"
$tangle "$@" || exit 1
else
case $base in
aleph | xetex) echo " OTANGLE " $base;;
- *tex | mf*) echo " TANGLE " $base;;
- *) echo " CTANGLE " $base;;
+ *tex | mf*) echo " TANGLE " $base;;
+ *) echo " CTANGLE " $base;;
esac
$tangle "$@" >$base.out 2>&1; rc=$?
test $rc -eq 0 || { cat $base.out; exit $rc; }
@@ -56,8 +75,14 @@
do_tangle "$@"
;;
*)
- # Recover from removal of $target
- test -f $target && exit 0
+ # Recover from removal of $target if necessary.
+ if test -f $target; then
+ $AM_V_P && echo "$prg: checking for $target ... ok"
+ exit 0
+ else
+ $AM_V_P && echo "$prg: recovering $target"
+ fi
+ #
trap "rm -rf $stamp $stamp.lock" 1 2 13 15
if mkdir $stamp.lock 2>/dev/null; then
# Code executed by the first process.
Property changes on: trunk/Build/source/texk/web2c/tangle-sh.in
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/uptex.am: do not silence tangle-sh.
+
2021-06-29 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
* uptex-m.ch: Adapt to pTeX p3.10.0.
Modified: trunk/Build/source/texk/web2c/uptexdir/am/uptex.am
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/am/uptex.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/uptexdir/am/uptex.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,7 +1,7 @@
## $Id$
## texk/web2c/uptexdir/am/uptex.am: Makefile fragment for upTeX.
##
-## Copyright 2016-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2016-2022 Karl Berry <tex-live at tug.org>
## Copyright 2011-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -53,9 +53,9 @@
# Tangling upTeX
uptex.p uptex.pool: uptex-tangle
- @$(texmf_tangle) uptex uptex
+ $(texmf_tangle) uptex uptex
uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh
- @$(texmf_tangle) uptex uptex
+ $(texmf_tangle) uptex uptex
# Extract uptex version
$(srcdir)/uptexdir/uptex_version.h: @MAINTAINER_MODE_TRUE@ uptexdir/uptex-m.ch
@@ -228,3 +228,4 @@
DISTCLEANFILES += uptrip.diffs
+# (end of uptex.am)
Modified: trunk/Build/source/texk/web2c/xetexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/ChangeLog 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/xetexdir/ChangeLog 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/xetex.am: do not silence tangle-sh.
+
2021-07-26 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
* xetex.web: Avoid an error
Modified: trunk/Build/source/texk/web2c/xetexdir/am/xetex.am
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/am/xetex.am 2022-01-11 22:24:15 UTC (rev 61574)
+++ trunk/Build/source/texk/web2c/xetexdir/am/xetex.am 2022-01-11 22:47:10 UTC (rev 61575)
@@ -1,7 +1,7 @@
## $Id$
## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX.
##
-## Copyright 2017-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2017-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -92,9 +92,9 @@
## Tangling XeTeX
xetex.p xetex.pool: xetex-tangle
- @$(xe_tangle) xetex xetex-final
+ $(xe_tangle) xetex xetex-final
xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex-final.ch tangle-sh
- @$(xe_tangle) xetex xetex-final
+ $(xe_tangle) xetex xetex-final
# Extract etex version
$(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
@@ -220,3 +220,5 @@
## xetex-filedump.test
EXTRA_DIST += xetexdir/tests/filedump.log xetexdir/tests/filedump.tex
DISTCLEANFILES += filedump.log filedump.out filedump.tex
+
+# (end of xetex.am)
Property changes on: trunk/Build/source/texk/web2c/xetexdir/am/xetex.am
___________________________________________________________________
Modified: svn:keywords
## -1 +1 ##
-Date Author Id
\ No newline at end of property
+Date Author Id Revision
\ No newline at end of property
More information about the tex-live-commits
mailing list.