diff options
| author | Karl Berry <karl@freefriends.org> | 2022-01-11 22:47:10 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2022-01-11 22:47:10 +0000 |
| commit | 4902f0bb638a2a0b2c74cb856c0d0985561f38c8 (patch) | |
| tree | a3005d1694f9e8d004e3a5c55abf32cbd7234780 | |
| parent | a348646a50088b57d1f9d21d7270d8fa3344b769 (diff) | |
make tangle-sh, ctangleboot-sh, and make report what they do
git-svn-id: svn://tug.org/texlive/trunk@61575 c570f23f-e606-0410-a88d-b1316a301751
45 files changed, 989 insertions, 2216 deletions
diff --git a/Build/source/doc/ChangeLog b/Build/source/doc/ChangeLog index 4653778dcd9..3432f8878c8 100644 --- a/Build/source/doc/ChangeLog +++ b/Build/source/doc/ChangeLog @@ -1,3 +1,8 @@ +2022-01-11 Karl Berry <karl@freefriends.org> + + * tlbuild.texi (Prerequisites): mention use of GNU make $@ feature + wrt tangle-sh[.in], etc. + 2021-07-06 Karl Berry <karl@tug.org> * tlbuild.texi (Build one package, Build one engine): more diff --git a/Build/source/doc/tlbuild.info b/Build/source/doc/tlbuild.info index ea002518bf2..77414ff945f 100644 --- a/Build/source/doc/tlbuild.info +++ b/Build/source/doc/tlbuild.info @@ -3,7 +3,7 @@ tlbuild.texi. This file documents the TeX Live build system and more. -Copyright (C) 2016-2021 Karl Berry. +Copyright (C) 2016-2022 Karl Berry. Copyright (C) 2013-2015 Karl Berry & Peter Breitenlohner. Permission is granted to make and distribute verbatim copies of this @@ -59,7 +59,7 @@ File: tlbuild.info, Node: Introduction, Next: Overview of build system, Prev: 1 Introduction ************** -This manual (dated September 2021) corresponds to the TeX Live 2021 +This manual (dated January 2022) corresponds to the TeX Live 2021 release. This manual is aimed at system installers and programmers, and @@ -160,12 +160,12 @@ File: tlbuild.info, Node: Prerequisites, Next: Building, Prev: Overview of bu Overall, building the TeX Live programs, when using all libraries from the TL source tree, requires C and C++11 compilers and GNU 'make'. If -'make' from your 'PATH' is not GNU make, you can set the 'MAKE' +'make' from your 'PATH' is not GNU 'make,' you can set the 'MAKE' environment variable to whatever is necessary. GNU '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 'make'. +notably FreeType; Automake/Autoconf output in general, and the +TL-maintained directories, work with any reasonable 'make'.(1) A C++11 compiler is similarly required because of the third-party library ICU; the program 'dvisvgm' also requires C++11. It is possible @@ -216,6 +216,14 @@ timestamps--notably, 'use-commit-times' must be set to 'yes' in your Subversion configuration (*note Build system tools::). Barring buggy commits, no infrastructure tools are needed to do a normal build. + ---------- Footnotes ---------- + + (1) There is one exception in TL: the 'tangle-sh' and related rules +use '$@' to mean the target name, a feature not present in all 'make's. +This could be alleviated by some laborious editing, but since there's no +way to avoid GNU 'make' for the entire tree, it does not seem worth the +trouble. + File: tlbuild.info, Node: Building, Next: Installing, Prev: Prerequisites, Up: Top @@ -5389,6 +5397,7 @@ Index * Menu: +* $@ target in normal make rules: Prerequisites. (line 11) * --bindir configure option: --prefix --bindir .... (line 6) * --bindir configure option <1>: --enable-multiplatform. @@ -5959,401 +5968,402 @@ Index Tag Table: Node: Top1208 Node: Introduction2118 -Node: Overview of build system3947 -Node: Prerequisites5998 -Node: Building8594 -Node: Build iteration9980 -Node: Build problems11021 -Node: Build in parallel11475 -Node: Build distribution12079 -Node: Build one package12727 -Node: Build one engine16501 -Node: Cross compilation18184 -Node: Cross configuring19464 -Node: Cross problems21141 -Node: Installing22803 -Node: Installation directories23823 -Node: Linked scripts25641 -Node: Distro builds27132 -Node: Layout and infrastructure29508 -Node: Build system tools30339 -Node: Top-level directories32556 -Node: Autoconf macros34792 -Node: General setup macros35554 -Node: Macros for programs36429 -Node: Macros for compilers37230 -Node: Macros for libraries38638 -Node: Macros for library and header flags39064 -Node: Macros for Windows40975 -Node: Library modules42562 -Node: png library43051 -Node: zlib library45399 -Node: freetype library45914 -Node: kpathsea library46610 -Node: Program modules47989 -Node: t1utils package48417 -Node: xindy package48962 -Node: xdvik package50078 -Node: asymptote51137 -Node: Extending TeX Live51633 -Node: Adding a new program module52440 -Node: Adding a new engine57203 -Node: Adding a new generic library module58988 -Node: Adding a new TeX-specific library module61209 -Node: Configure options61907 -Node: Global configure options63288 -Node: --disable-native-texlive-build63830 -Node: --prefix --bindir ...64792 -Node: --disable-largefile65332 -Node: --disable-missing65874 -Node: --enable-compiler-warnings=LEVEL66275 -Node: --enable-cxx-runtime-hack66931 -Node: --enable-maintainer-mode67351 -Node: --enable-multiplatform67880 -Node: --enable-shared68453 -Node: --enable-silent-rules68824 -Node: --without-ln-s69276 -Node: --without-x69623 -Node: Program-specific configure options69811 -Node: --enable-PROG --disable-PROG70454 -Node: --disable-all-pkgs70727 -Node: Configure options for texk/web2c71510 -Node: Configure options for texk/bibtex-x74048 -Node: Configure options for texk/dvipdfm-x74591 -Node: Configure options for texk/dvisvgm75367 -Node: Configure options for texk/texlive76248 -Node: Configure options for texk/xdvik76669 -Node: Configure options for utils/xindy77290 -Node: Library-specific configure options78180 -Node: Configure options for kpathsea79141 -Node: Variables for configure79845 -Node: Coding conventions81271 -Node: Declarations and definitions81986 -Node: Const84160 -Node: Continuous integration86024 -Node: Transfer from Subversion to Github86688 -Node: Automatic update of the Git mirror88850 -Node: CI testing on Travis-CI89432 -Node: Releases on Github90141 -Node: install-tl90581 -Node: install-tl NAME90950 -Node: install-tl SYNOPSIS91108 -Node: install-tl DESCRIPTION91366 -Node: install-tl REFERENCES92426 -Node: install-tl OPTIONS92950 -Ref: install-tl *-gui* [[=]_module_]93291 -Ref: install-tl text93499 -Ref: install-tl tcl (or "perltk" or "wizard" or "expert" or nothing)93684 -Ref: install-tl *-no-gui*94316 -Ref: install-tl *-lang* _llcode_94406 -Ref: install-tl *-repository* _url|path_95030 -Ref: install-tl *-select-repository*95919 -Ref: install-tl *-all-options*96337 -Ref: install-tl *-custom-bin* _path_96592 -Ref: install-tl *-debug-translation*97426 -Ref: install-tl *-force-platform* _platform_97702 -Ref: install-tl *-help*, *--help*, *-?*97946 -Ref: install-tl *-in-place*98359 -Ref: install-tl *-init-from-profile* _profile_file_98904 -Ref: install-tl *-logfile* _file_99173 -Ref: install-tl *-no-cls*99524 -Ref: install-tl *-no-persistent-downloads*99672 -Ref: install-tl *-persistent-downloads*99697 -Ref: install-tl *-no-verify-downloads*100315 -Ref: install-tl *-non-admin*100678 -Ref: install-tl *-portable*100771 -Ref: install-tl *-print-platform*100910 -Ref: install-tl *-profile* _profile_file_101108 -Ref: install-tl *-q*101329 -Ref: install-tl *-scheme* _scheme_101391 -Ref: install-tl *-v*101865 -Ref: install-tl *-version*, *--version*102020 -Node: install-tl PROFILES102154 -Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)105020 -Ref: install-tl instopt_adjustrepo (default 1)105096 -Ref: install-tl instopt_letter (default 0)105233 -Ref: install-tl instopt_portable (default 0)105324 -Ref: install-tl instopt_write18_restricted (default 1)105420 -Node: install-tl ENVIRONMENT VARIABLES106759 -Ref: install-tl TEXLIVE_DOWNLOADER107137 -Ref: install-tl TL_DOWNLOAD_PROGRAM107160 -Ref: install-tl TL_DOWNLOAD_ARGS107180 -Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK107384 -Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE107586 -Ref: install-tl TEXLIVE_INSTALL_NO_RESUME107695 -Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME107847 -Ref: install-tl TEXLIVE_INSTALL_PAPER107968 -Ref: install-tl TEXLIVE_INSTALL_PREFIX108114 -Ref: install-tl TEXLIVE_INSTALL_TEXDIR108140 -Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG108171 -Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR108199 -Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME108228 -Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL108258 -Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG108292 -Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR108323 -Ref: install-tl NOPERLDOC108694 -Node: install-tl AUTHORS AND COPYRIGHT108758 -Node: tlmgr109171 -Node: tlmgr NAME109656 -Node: tlmgr SYNOPSIS109788 -Node: tlmgr DESCRIPTION109978 -Node: tlmgr EXAMPLES111077 -Ref: tlmgr tlmgr option repository ctan111328 -Ref: tlmgr tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet111401 -Ref: tlmgr tlmgr update --list112006 -Ref: tlmgr tlmgr update --all112099 -Ref: tlmgr tlmgr info _what_112256 -Node: tlmgr OPTIONS112518 -Ref: tlmgr *--repository* _url|path_113038 -Ref: tlmgr /some/local/dir114224 -Ref: tlmgr file:/some/local/dir114253 -Ref: tlmgr ctan114326 -Ref: tlmgr https://mirror.ctan.org/systems/texlive/tlnet114380 -Ref: tlmgr http://server/path/to/tlnet114721 -Ref: tlmgr https://server/path/to/tlnet115102 -Ref: tlmgr ftp://server/path/to/tlnet115570 -Ref: tlmgr user@machine:/path/to/tlnet115702 -Ref: tlmgr scp://user@machine/path/to/tlnet115743 -Ref: tlmgr ssh://user@machine/path/to/tlnet115784 -Ref: tlmgr *--gui* [_action_]116177 -Ref: tlmgr *--gui-lang* _llcode_116990 -Ref: tlmgr *--command-logfile* _file_117731 -Ref: tlmgr *--debug-translation*117997 -Ref: tlmgr *--machine-readable*118200 -Ref: tlmgr *--no-execute-actions*118468 -Ref: tlmgr *--package-logfile* _file_118661 -Ref: tlmgr *--pause*118915 -Ref: tlmgr *--persistent-downloads*119070 -Ref: tlmgr *--no-persistent-downloads*119098 -Ref: tlmgr *--pin-file*119592 -Ref: tlmgr *--usermode*119810 -Ref: tlmgr *--usertree* _dir_119930 -Ref: tlmgr *--verify-repo=[none|main|all]*120056 -Node: tlmgr ACTIONS120955 -Node: tlmgr help121816 -Node: tlmgr version122293 -Node: tlmgr backup122556 -Ref: tlmgr *backup [_option_...] --all*122727 -Ref: tlmgr *backup [_option_...] _pkg_...*122760 -Ref: tlmgr *--backupdir* _directory_123826 -Ref: tlmgr *--all*124043 -Ref: tlmgr *--clean*[=_N_]124295 -Ref: tlmgr *--dry-run*124622 -Node: tlmgr candidates _pkg_124752 -Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]125107 -Ref: tlmgr *depends*125621 -Ref: tlmgr *executes*125963 -Ref: tlmgr *files*126078 -Ref: tlmgr *runfiles*126214 -Ref: tlmgr *texmfdbs*126351 -Ref: tlmgr - all items in TEXMFDBS have the !! prefix.126581 -Ref: tlmgr - all items in TEXMFBDS have an ls-R file (if they exist at all).126657 -Ref: tlmgr - all items in TEXMF with !! are listed in TEXMFDBS.126722 -Ref: tlmgr - all items in TEXMF with an ls-R file are listed in TEXMFDBS.126797 -Ref: tlmgr *--use-svn*126822 -Node: tlmgr conf126963 -Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*127251 -Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*127315 -Node: tlmgr dump-tlpdb [_option_...] [--json]129730 -Ref: tlmgr *--local*130163 -Ref: tlmgr *--remote*130202 -Ref: tlmgr *--json*130240 -Node: tlmgr generate130811 -Ref: tlmgr *generate [_option_...] language*131007 -Ref: tlmgr *generate [_option_...] language.dat*131046 -Ref: tlmgr *generate [_option_...] language.def*131085 -Ref: tlmgr *generate [_option_...] language.dat.lua*131128 -Ref: tlmgr *--dest* _output_file_133455 -Ref: tlmgr *--localcfg* _local_conf_file_134031 -Ref: tlmgr *--rebuild-sys*134154 -Node: tlmgr gui134969 -Node: tlmgr info135147 -Ref: tlmgr *info [_option_...] _pkg_...*135309 -Ref: tlmgr *info [_option_...] collections*135343 -Ref: tlmgr *info [_option_...] schemes*135373 -Ref: tlmgr *--list*136903 -Ref: tlmgr *--only-installed*137217 -Ref: tlmgr *--only-remote*137405 -Ref: tlmgr *--data item1,item2,...*137709 -Ref: tlmgr *--json* 1139072 -Node: tlmgr init-usertree139455 -Node: tlmgr install [_option_...] _pkg_...139836 -Ref: tlmgr *--dry-run* 1140344 -Ref: tlmgr *--file*140461 -Ref: tlmgr *--force*140683 -Ref: tlmgr *--no-depends*140903 -Ref: tlmgr *--no-depends-at-all*141062 -Ref: tlmgr *--reinstall*141462 -Ref: tlmgr *--with-doc*141840 -Ref: tlmgr *--with-src*141853 -Node: tlmgr key142581 -Ref: tlmgr *key list*142739 -Ref: tlmgr *key add _file_*142757 -Ref: tlmgr *key remove _keyid_*142779 -Node: tlmgr list143373 -Node: tlmgr option143535 -Ref: tlmgr *option [--json] [show]*143690 -Ref: tlmgr *option [--json] showall|help*143721 -Ref: tlmgr *option _key_ [_value_]*143747 -Node: tlmgr paper148326 -Ref: tlmgr *paper [a4|letter]*148475 -Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>148551 -Ref: tlmgr *paper --json*148566 -Node: tlmgr path149781 -Ref: tlmgr *path [--w32mode=user|admin] add*149942 -Ref: tlmgr *path [--w32mode=user|admin] remove*149979 -Node: tlmgr pinning151464 -Ref: tlmgr pinning show151705 -Ref: tlmgr pinning add _repo_ _pkgglob_...151778 -Ref: tlmgr pinning remove _repo_ _pkgglob_...151897 -Ref: tlmgr pinning remove _repo_ --all152050 -Node: tlmgr platform152104 -Ref: tlmgr *platform list|add|remove _platform_...*152290 -Ref: tlmgr *platform set _platform_*152317 -Ref: tlmgr *platform set auto*152338 -Ref: tlmgr *--dry-run* 2153215 -Node: tlmgr postaction153334 -Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*153564 -Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*153638 -Ref: tlmgr *--w32mode=[user|admin]*153953 -Ref: tlmgr *--fileassocmode=[1|2]*154369 -Ref: tlmgr *--all* 1154654 -Node: tlmgr print-platform154709 -Node: tlmgr print-platform-info155040 -Node: tlmgr remove [_option_...] _pkg_...155340 -Ref: tlmgr *--all* 2155824 -Ref: tlmgr *--backup*155934 -Ref: tlmgr *--backupdir* _directory_ 1155960 -Ref: tlmgr *--no-depends* 1156365 -Ref: tlmgr *--no-depends-at-all* 1156427 -Ref: tlmgr *--force* 1156530 -Ref: tlmgr *--dry-run* 3157003 -Node: tlmgr repository157339 -Ref: tlmgr *repository list*157527 -Ref: tlmgr *repository list _path|url|tag_*157561 -Ref: tlmgr *repository add _path_ [_tag_]*157594 -Ref: tlmgr *repository remove _path|tag_*157626 -Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*157680 -Ref: tlmgr *repository status*157701 -Ref: tlmgr The tag (which can be the same as the url);158928 -Node: tlmgr restore159406 -Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*159585 -Ref: tlmgr *restore [_option_...] --all*159615 -Ref: tlmgr *--all* 3160315 -Ref: tlmgr *--backupdir* _directory_ 2160529 -Ref: tlmgr *--dry-run* 4160710 -Ref: tlmgr *--force* 2160842 -Ref: tlmgr *--json* 2160888 -Node: tlmgr search161215 -Ref: tlmgr *search [_option_...] _what_*161379 -Ref: tlmgr *search [_option_...] --file _what_*161416 -Ref: tlmgr *search [_option_...] --all _what_*161452 -Ref: tlmgr *--file* 1161672 -Ref: tlmgr *--all* 4161734 -Ref: tlmgr *--global*161823 -Ref: tlmgr *--word*161950 -Node: tlmgr shell162265 -Ref: tlmgr protocol163000 -Ref: tlmgr help 1163064 -Ref: tlmgr version 1163117 -Ref: tlmgr quit, end, bye, byebye, EOF163185 -Ref: tlmgr restart163206 -Ref: tlmgr load [local|remote]163329 -Ref: tlmgr save163399 -Ref: tlmgr get [_var_] =item set [_var_ [_val_]]163522 -Node: tlmgr show164123 -Node: tlmgr uninstall164290 -Node: tlmgr update [_option_...] [_pkg_...]164520 -Ref: tlmgr *--all* 5164891 -Ref: tlmgr *--self*167070 -Ref: tlmgr *--dry-run* 5167834 -Ref: tlmgr *--list* [_pkg_]168011 -Ref: tlmgr *--exclude* _pkg_168700 -Ref: tlmgr *--no-auto-remove* [_pkg_...]169500 -Ref: tlmgr *--no-auto-install* [_pkg_...]169984 -Ref: tlmgr *--reinstall-forcibly-removed*170746 -Ref: tlmgr *--backup* 1171281 -Ref: tlmgr *--backupdir* _directory_ 3171307 -Ref: tlmgr *--no-depends* 2172473 -Ref: tlmgr *--no-depends-at-all* 2172676 -Ref: tlmgr *--force* 3172779 -Node: tlmgr CONFIGURATION FILE FOR TLMGR173770 -Ref: tlmgr auto-remove, value 0 or 1 (default 1), same as command-line option.174777 -Ref: tlmgr gui-expertmode, value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.174914 -Ref: tlmgr gui-lang _llcode_, with a language code value as with the command-line option.174996 -Ref: tlmgr no-checksums, value 0 or 1 (default 0, see below).175050 -Ref: tlmgr persistent-downloads, value 0 or 1 (default 1), same as command-line option.175130 -Ref: tlmgr require-verification, value 0 or 1 (default 0), same as command-line option.175210 -Ref: tlmgr tkfontscale, value any float. Controls the scaling of fonts in the Tk based frontends.175300 -Ref: tlmgr update-exclude, value: comma-separated list of packages (no space allowed). Same as the command line option --exclude for the action update.175448 -Ref: tlmgr verify-downloads, value 0 or 1 (default 1), same as command-line option.175524 -Ref: tlmgr allowed-actions _action1_ [,_action_,...] The value is a comma-separated list of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode).175793 -Node: tlmgr CRYPTOGRAPHIC VERIFICATION176881 -Node: tlmgr Configuration of GnuPG invocation179054 -Node: tlmgr USER MODE179692 -Node: tlmgr User mode install182538 -Node: tlmgr User mode backup, restore, remove, update183682 -Node: tlmgr User mode generate, option, paper184124 -Node: tlmgr MULTIPLE REPOSITORIES184500 -Node: tlmgr Pinning186229 -Node: tlmgr GUI FOR TLMGR188152 -Node: tlmgr Main display189801 -Node: tlmgr Display configuration area190053 -Ref: tlmgr Status190414 -Ref: tlmgr Category190578 -Ref: tlmgr Match190764 -Ref: tlmgr Selection190945 -Ref: tlmgr Display configuration buttons191149 -Node: tlmgr Package list area191332 -Ref: tlmgr a checkbox191916 -Ref: tlmgr package name192052 -Ref: tlmgr local revision (and version)192151 -Ref: tlmgr remote revision (and version)192526 -Ref: tlmgr short description192823 -Node: tlmgr Main display action buttons192868 -Ref: tlmgr Update all installed193134 -Ref: tlmgr Update193506 -Ref: tlmgr Install193556 -Ref: tlmgr Remove193742 -Ref: tlmgr Backup193920 -Node: tlmgr Menu bar194077 -Ref: tlmgr tlmgr menu194300 -Ref: tlmgr Options menu194608 -Ref: tlmgr Actions menu195691 -Ref: tlmgr Help menu196119 -Node: tlmgr GUI options196253 -Ref: tlmgr -background _color_196499 -Ref: tlmgr -font " _fontname_ _fontsize_ "196564 -Ref: tlmgr -foreground _color_196722 -Ref: tlmgr -geometry _geomspec_196774 -Ref: tlmgr -xrm _xresource_196966 -Node: tlmgr MACHINE-READABLE OUTPUT197235 -Node: tlmgr Machine-readable update and install output198045 -Ref: tlmgr location-url _location_199321 -Ref: tlmgr total-bytes _count_199537 -Ref: tlmgr _pkgname_199947 -Ref: tlmgr _status_200157 -Ref: tlmgr d200235 -Ref: tlmgr f200295 -Ref: tlmgr u200474 -Ref: tlmgr r200520 -Ref: tlmgr a200643 -Ref: tlmgr i200821 -Ref: tlmgr I200940 -Ref: tlmgr _localrev_201042 -Ref: tlmgr _serverrev_201149 -Ref: tlmgr _size_201261 -Ref: tlmgr _runtime_201430 -Ref: tlmgr _esttot_201500 -Node: tlmgr Machine-readable option output201533 -Node: tlmgr ENVIRONMENT VARIABLES202045 -Ref: tlmgr TEXLIVE_COMPRESSOR202556 -Ref: tlmgr TEXLIVE_DOWNLOADER203404 -Ref: tlmgr TL_DOWNLOAD_PROGRAM203427 -Ref: tlmgr TL_DOWNLOAD_ARGS203447 -Ref: tlmgr TEXLIVE_PREFER_OWN204473 -Node: tlmgr AUTHORS AND COPYRIGHT205297 -Node: Index205695 +Node: Overview of build system3945 +Node: Prerequisites5996 +Ref: Prerequisites-Footnote-18629 +Node: Building8927 +Node: Build iteration10313 +Node: Build problems11354 +Node: Build in parallel11808 +Node: Build distribution12412 +Node: Build one package13060 +Node: Build one engine16834 +Node: Cross compilation18517 +Node: Cross configuring19797 +Node: Cross problems21474 +Node: Installing23136 +Node: Installation directories24156 +Node: Linked scripts25974 +Node: Distro builds27465 +Node: Layout and infrastructure29841 +Node: Build system tools30672 +Node: Top-level directories32889 +Node: Autoconf macros35125 +Node: General setup macros35887 +Node: Macros for programs36762 +Node: Macros for compilers37563 +Node: Macros for libraries38971 +Node: Macros for library and header flags39397 +Node: Macros for Windows41308 +Node: Library modules42895 +Node: png library43384 +Node: zlib library45732 +Node: freetype library46247 +Node: kpathsea library46943 +Node: Program modules48322 +Node: t1utils package48750 +Node: xindy package49295 +Node: xdvik package50411 +Node: asymptote51470 +Node: Extending TeX Live51966 +Node: Adding a new program module52773 +Node: Adding a new engine57536 +Node: Adding a new generic library module59321 +Node: Adding a new TeX-specific library module61542 +Node: Configure options62240 +Node: Global configure options63621 +Node: --disable-native-texlive-build64163 +Node: --prefix --bindir ...65125 +Node: --disable-largefile65665 +Node: --disable-missing66207 +Node: --enable-compiler-warnings=LEVEL66608 +Node: --enable-cxx-runtime-hack67264 +Node: --enable-maintainer-mode67684 +Node: --enable-multiplatform68213 +Node: --enable-shared68786 +Node: --enable-silent-rules69157 +Node: --without-ln-s69609 +Node: --without-x69956 +Node: Program-specific configure options70144 +Node: --enable-PROG --disable-PROG70787 +Node: --disable-all-pkgs71060 +Node: Configure options for texk/web2c71843 +Node: Configure options for texk/bibtex-x74381 +Node: Configure options for texk/dvipdfm-x74924 +Node: Configure options for texk/dvisvgm75700 +Node: Configure options for texk/texlive76581 +Node: Configure options for texk/xdvik77002 +Node: Configure options for utils/xindy77623 +Node: Library-specific configure options78513 +Node: Configure options for kpathsea79474 +Node: Variables for configure80178 +Node: Coding conventions81604 +Node: Declarations and definitions82319 +Node: Const84493 +Node: Continuous integration86357 +Node: Transfer from Subversion to Github87021 +Node: Automatic update of the Git mirror89183 +Node: CI testing on Travis-CI89765 +Node: Releases on Github90474 +Node: install-tl90914 +Node: install-tl NAME91283 +Node: install-tl SYNOPSIS91441 +Node: install-tl DESCRIPTION91699 +Node: install-tl REFERENCES92759 +Node: install-tl OPTIONS93283 +Ref: install-tl *-gui* [[=]_module_]93624 +Ref: install-tl text93832 +Ref: install-tl tcl (or "perltk" or "wizard" or "expert" or nothing)94017 +Ref: install-tl *-no-gui*94649 +Ref: install-tl *-lang* _llcode_94739 +Ref: install-tl *-repository* _url|path_95363 +Ref: install-tl *-select-repository*96252 +Ref: install-tl *-all-options*96670 +Ref: install-tl *-custom-bin* _path_96925 +Ref: install-tl *-debug-translation*97759 +Ref: install-tl *-force-platform* _platform_98035 +Ref: install-tl *-help*, *--help*, *-?*98279 +Ref: install-tl *-in-place*98692 +Ref: install-tl *-init-from-profile* _profile_file_99237 +Ref: install-tl *-logfile* _file_99506 +Ref: install-tl *-no-cls*99857 +Ref: install-tl *-no-persistent-downloads*100005 +Ref: install-tl *-persistent-downloads*100030 +Ref: install-tl *-no-verify-downloads*100648 +Ref: install-tl *-non-admin*101011 +Ref: install-tl *-portable*101104 +Ref: install-tl *-print-platform*101243 +Ref: install-tl *-profile* _profile_file_101441 +Ref: install-tl *-q*101662 +Ref: install-tl *-scheme* _scheme_101724 +Ref: install-tl *-v*102198 +Ref: install-tl *-version*, *--version*102353 +Node: install-tl PROFILES102487 +Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)105353 +Ref: install-tl instopt_adjustrepo (default 1)105429 +Ref: install-tl instopt_letter (default 0)105566 +Ref: install-tl instopt_portable (default 0)105657 +Ref: install-tl instopt_write18_restricted (default 1)105753 +Node: install-tl ENVIRONMENT VARIABLES107092 +Ref: install-tl TEXLIVE_DOWNLOADER107470 +Ref: install-tl TL_DOWNLOAD_PROGRAM107493 +Ref: install-tl TL_DOWNLOAD_ARGS107513 +Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK107717 +Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE107919 +Ref: install-tl TEXLIVE_INSTALL_NO_RESUME108028 +Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME108180 +Ref: install-tl TEXLIVE_INSTALL_PAPER108301 +Ref: install-tl TEXLIVE_INSTALL_PREFIX108447 +Ref: install-tl TEXLIVE_INSTALL_TEXDIR108473 +Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG108504 +Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR108532 +Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME108561 +Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL108591 +Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG108625 +Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR108656 +Ref: install-tl NOPERLDOC109027 +Node: install-tl AUTHORS AND COPYRIGHT109091 +Node: tlmgr109504 +Node: tlmgr NAME109989 +Node: tlmgr SYNOPSIS110121 +Node: tlmgr DESCRIPTION110311 +Node: tlmgr EXAMPLES111410 +Ref: tlmgr tlmgr option repository ctan111661 +Ref: tlmgr tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet111734 +Ref: tlmgr tlmgr update --list112339 +Ref: tlmgr tlmgr update --all112432 +Ref: tlmgr tlmgr info _what_112589 +Node: tlmgr OPTIONS112851 +Ref: tlmgr *--repository* _url|path_113371 +Ref: tlmgr /some/local/dir114557 +Ref: tlmgr file:/some/local/dir114586 +Ref: tlmgr ctan114659 +Ref: tlmgr https://mirror.ctan.org/systems/texlive/tlnet114713 +Ref: tlmgr http://server/path/to/tlnet115054 +Ref: tlmgr https://server/path/to/tlnet115435 +Ref: tlmgr ftp://server/path/to/tlnet115903 +Ref: tlmgr user@machine:/path/to/tlnet116035 +Ref: tlmgr scp://user@machine/path/to/tlnet116076 +Ref: tlmgr ssh://user@machine/path/to/tlnet116117 +Ref: tlmgr *--gui* [_action_]116510 +Ref: tlmgr *--gui-lang* _llcode_117323 +Ref: tlmgr *--command-logfile* _file_118064 +Ref: tlmgr *--debug-translation*118330 +Ref: tlmgr *--machine-readable*118533 +Ref: tlmgr *--no-execute-actions*118801 +Ref: tlmgr *--package-logfile* _file_118994 +Ref: tlmgr *--pause*119248 +Ref: tlmgr *--persistent-downloads*119403 +Ref: tlmgr *--no-persistent-downloads*119431 +Ref: tlmgr *--pin-file*119925 +Ref: tlmgr *--usermode*120143 +Ref: tlmgr *--usertree* _dir_120263 +Ref: tlmgr *--verify-repo=[none|main|all]*120389 +Node: tlmgr ACTIONS121288 +Node: tlmgr help122149 +Node: tlmgr version122626 +Node: tlmgr backup122889 +Ref: tlmgr *backup [_option_...] --all*123060 +Ref: tlmgr *backup [_option_...] _pkg_...*123093 +Ref: tlmgr *--backupdir* _directory_124159 +Ref: tlmgr *--all*124376 +Ref: tlmgr *--clean*[=_N_]124628 +Ref: tlmgr *--dry-run*124955 +Node: tlmgr candidates _pkg_125085 +Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]125440 +Ref: tlmgr *depends*125954 +Ref: tlmgr *executes*126296 +Ref: tlmgr *files*126411 +Ref: tlmgr *runfiles*126547 +Ref: tlmgr *texmfdbs*126684 +Ref: tlmgr - all items in TEXMFDBS have the !! prefix.126914 +Ref: tlmgr - all items in TEXMFBDS have an ls-R file (if they exist at all).126990 +Ref: tlmgr - all items in TEXMF with !! are listed in TEXMFDBS.127055 +Ref: tlmgr - all items in TEXMF with an ls-R file are listed in TEXMFDBS.127130 +Ref: tlmgr *--use-svn*127155 +Node: tlmgr conf127296 +Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*127584 +Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*127648 +Node: tlmgr dump-tlpdb [_option_...] [--json]130063 +Ref: tlmgr *--local*130496 +Ref: tlmgr *--remote*130535 +Ref: tlmgr *--json*130573 +Node: tlmgr generate131144 +Ref: tlmgr *generate [_option_...] language*131340 +Ref: tlmgr *generate [_option_...] language.dat*131379 +Ref: tlmgr *generate [_option_...] language.def*131418 +Ref: tlmgr *generate [_option_...] language.dat.lua*131461 +Ref: tlmgr *--dest* _output_file_133788 +Ref: tlmgr *--localcfg* _local_conf_file_134364 +Ref: tlmgr *--rebuild-sys*134487 +Node: tlmgr gui135302 +Node: tlmgr info135480 +Ref: tlmgr *info [_option_...] _pkg_...*135642 +Ref: tlmgr *info [_option_...] collections*135676 +Ref: tlmgr *info [_option_...] schemes*135706 +Ref: tlmgr *--list*137236 +Ref: tlmgr *--only-installed*137550 +Ref: tlmgr *--only-remote*137738 +Ref: tlmgr *--data item1,item2,...*138042 +Ref: tlmgr *--json* 1139405 +Node: tlmgr init-usertree139788 +Node: tlmgr install [_option_...] _pkg_...140169 +Ref: tlmgr *--dry-run* 1140677 +Ref: tlmgr *--file*140794 +Ref: tlmgr *--force*141016 +Ref: tlmgr *--no-depends*141236 +Ref: tlmgr *--no-depends-at-all*141395 +Ref: tlmgr *--reinstall*141795 +Ref: tlmgr *--with-doc*142173 +Ref: tlmgr *--with-src*142186 +Node: tlmgr key142914 +Ref: tlmgr *key list*143072 +Ref: tlmgr *key add _file_*143090 +Ref: tlmgr *key remove _keyid_*143112 +Node: tlmgr list143706 +Node: tlmgr option143868 +Ref: tlmgr *option [--json] [show]*144023 +Ref: tlmgr *option [--json] showall|help*144054 +Ref: tlmgr *option _key_ [_value_]*144080 +Node: tlmgr paper148659 +Ref: tlmgr *paper [a4|letter]*148808 +Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>148884 +Ref: tlmgr *paper --json*148899 +Node: tlmgr path150114 +Ref: tlmgr *path [--w32mode=user|admin] add*150275 +Ref: tlmgr *path [--w32mode=user|admin] remove*150312 +Node: tlmgr pinning151797 +Ref: tlmgr pinning show152038 +Ref: tlmgr pinning add _repo_ _pkgglob_...152111 +Ref: tlmgr pinning remove _repo_ _pkgglob_...152230 +Ref: tlmgr pinning remove _repo_ --all152383 +Node: tlmgr platform152437 +Ref: tlmgr *platform list|add|remove _platform_...*152623 +Ref: tlmgr *platform set _platform_*152650 +Ref: tlmgr *platform set auto*152671 +Ref: tlmgr *--dry-run* 2153548 +Node: tlmgr postaction153667 +Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*153897 +Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*153971 +Ref: tlmgr *--w32mode=[user|admin]*154286 +Ref: tlmgr *--fileassocmode=[1|2]*154702 +Ref: tlmgr *--all* 1154987 +Node: tlmgr print-platform155042 +Node: tlmgr print-platform-info155373 +Node: tlmgr remove [_option_...] _pkg_...155673 +Ref: tlmgr *--all* 2156157 +Ref: tlmgr *--backup*156267 +Ref: tlmgr *--backupdir* _directory_ 1156293 +Ref: tlmgr *--no-depends* 1156698 +Ref: tlmgr *--no-depends-at-all* 1156760 +Ref: tlmgr *--force* 1156863 +Ref: tlmgr *--dry-run* 3157336 +Node: tlmgr repository157672 +Ref: tlmgr *repository list*157860 +Ref: tlmgr *repository list _path|url|tag_*157894 +Ref: tlmgr *repository add _path_ [_tag_]*157927 +Ref: tlmgr *repository remove _path|tag_*157959 +Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*158013 +Ref: tlmgr *repository status*158034 +Ref: tlmgr The tag (which can be the same as the url);159261 +Node: tlmgr restore159739 +Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*159918 +Ref: tlmgr *restore [_option_...] --all*159948 +Ref: tlmgr *--all* 3160648 +Ref: tlmgr *--backupdir* _directory_ 2160862 +Ref: tlmgr *--dry-run* 4161043 +Ref: tlmgr *--force* 2161175 +Ref: tlmgr *--json* 2161221 +Node: tlmgr search161548 +Ref: tlmgr *search [_option_...] _what_*161712 +Ref: tlmgr *search [_option_...] --file _what_*161749 +Ref: tlmgr *search [_option_...] --all _what_*161785 +Ref: tlmgr *--file* 1162005 +Ref: tlmgr *--all* 4162067 +Ref: tlmgr *--global*162156 +Ref: tlmgr *--word*162283 +Node: tlmgr shell162598 +Ref: tlmgr protocol163333 +Ref: tlmgr help 1163397 +Ref: tlmgr version 1163450 +Ref: tlmgr quit, end, bye, byebye, EOF163518 +Ref: tlmgr restart163539 +Ref: tlmgr load [local|remote]163662 +Ref: tlmgr save163732 +Ref: tlmgr get [_var_] =item set [_var_ [_val_]]163855 +Node: tlmgr show164456 +Node: tlmgr uninstall164623 +Node: tlmgr update [_option_...] [_pkg_...]164853 +Ref: tlmgr *--all* 5165224 +Ref: tlmgr *--self*167403 +Ref: tlmgr *--dry-run* 5168167 +Ref: tlmgr *--list* [_pkg_]168344 +Ref: tlmgr *--exclude* _pkg_169033 +Ref: tlmgr *--no-auto-remove* [_pkg_...]169833 +Ref: tlmgr *--no-auto-install* [_pkg_...]170317 +Ref: tlmgr *--reinstall-forcibly-removed*171079 +Ref: tlmgr *--backup* 1171614 +Ref: tlmgr *--backupdir* _directory_ 3171640 +Ref: tlmgr *--no-depends* 2172806 +Ref: tlmgr *--no-depends-at-all* 2173009 +Ref: tlmgr *--force* 3173112 +Node: tlmgr CONFIGURATION FILE FOR TLMGR174103 +Ref: tlmgr auto-remove, value 0 or 1 (default 1), same as command-line option.175110 +Ref: tlmgr gui-expertmode, value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.175247 +Ref: tlmgr gui-lang _llcode_, with a language code value as with the command-line option.175329 +Ref: tlmgr no-checksums, value 0 or 1 (default 0, see below).175383 +Ref: tlmgr persistent-downloads, value 0 or 1 (default 1), same as command-line option.175463 +Ref: tlmgr require-verification, value 0 or 1 (default 0), same as command-line option.175543 +Ref: tlmgr tkfontscale, value any float. Controls the scaling of fonts in the Tk based frontends.175633 +Ref: tlmgr update-exclude, value: comma-separated list of packages (no space allowed). Same as the command line option --exclude for the action update.175781 +Ref: tlmgr verify-downloads, value 0 or 1 (default 1), same as command-line option.175857 +Ref: tlmgr allowed-actions _action1_ [,_action_,...] The value is a comma-separated list of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode).176126 +Node: tlmgr CRYPTOGRAPHIC VERIFICATION177214 +Node: tlmgr Configuration of GnuPG invocation179387 +Node: tlmgr USER MODE180025 +Node: tlmgr User mode install182871 +Node: tlmgr User mode backup, restore, remove, update184015 +Node: tlmgr User mode generate, option, paper184457 +Node: tlmgr MULTIPLE REPOSITORIES184833 +Node: tlmgr Pinning186562 +Node: tlmgr GUI FOR TLMGR188485 +Node: tlmgr Main display190134 +Node: tlmgr Display configuration area190386 +Ref: tlmgr Status190747 +Ref: tlmgr Category190911 +Ref: tlmgr Match191097 +Ref: tlmgr Selection191278 +Ref: tlmgr Display configuration buttons191482 +Node: tlmgr Package list area191665 +Ref: tlmgr a checkbox192249 +Ref: tlmgr package name192385 +Ref: tlmgr local revision (and version)192484 +Ref: tlmgr remote revision (and version)192859 +Ref: tlmgr short description193156 +Node: tlmgr Main display action buttons193201 +Ref: tlmgr Update all installed193467 +Ref: tlmgr Update193839 +Ref: tlmgr Install193889 +Ref: tlmgr Remove194075 +Ref: tlmgr Backup194253 +Node: tlmgr Menu bar194410 +Ref: tlmgr tlmgr menu194633 +Ref: tlmgr Options menu194941 +Ref: tlmgr Actions menu196024 +Ref: tlmgr Help menu196452 +Node: tlmgr GUI options196586 +Ref: tlmgr -background _color_196832 +Ref: tlmgr -font " _fontname_ _fontsize_ "196897 +Ref: tlmgr -foreground _color_197055 +Ref: tlmgr -geometry _geomspec_197107 +Ref: tlmgr -xrm _xresource_197299 +Node: tlmgr MACHINE-READABLE OUTPUT197568 +Node: tlmgr Machine-readable update and install output198378 +Ref: tlmgr location-url _location_199654 +Ref: tlmgr total-bytes _count_199870 +Ref: tlmgr _pkgname_200280 +Ref: tlmgr _status_200490 +Ref: tlmgr d200568 +Ref: tlmgr f200628 +Ref: tlmgr u200807 +Ref: tlmgr r200853 +Ref: tlmgr a200976 +Ref: tlmgr i201154 +Ref: tlmgr I201273 +Ref: tlmgr _localrev_201375 +Ref: tlmgr _serverrev_201482 +Ref: tlmgr _size_201594 +Ref: tlmgr _runtime_201763 +Ref: tlmgr _esttot_201833 +Node: tlmgr Machine-readable option output201866 +Node: tlmgr ENVIRONMENT VARIABLES202378 +Ref: tlmgr TEXLIVE_COMPRESSOR202889 +Ref: tlmgr TEXLIVE_DOWNLOADER203737 +Ref: tlmgr TL_DOWNLOAD_PROGRAM203760 +Ref: tlmgr TL_DOWNLOAD_ARGS203780 +Ref: tlmgr TEXLIVE_PREFER_OWN204806 +Node: tlmgr AUTHORS AND COPYRIGHT205630 +Node: Index206028 End Tag Table diff --git a/Build/source/doc/tlbuild.texi b/Build/source/doc/tlbuild.texi index 5afbd68b925..aa623d3dd01 100644 --- a/Build/source/doc/tlbuild.texi +++ b/Build/source/doc/tlbuild.texi @@ -2,7 +2,7 @@ @setfilename tlbuild.info @set version 2021 -@set month-year September 2021 +@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 @@ efforts, neither task is easy.) @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 -@code{make}. If @code{make} from your @code{PATH} is not GNU make, +@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 +@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 -@code{make}. +libraries, notably FreeType; Automake/Autoconf output in general, and +the TL-maintained directories, work with any reasonable +@code{make}.@footnote{There is one exception in TL: the +@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 diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index c7df0c68127..daa75a421de 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,24 @@ +2022-01-10 Karl Berry <karl@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@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> diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 1d8f29f4d63..3c39de38ff2 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -1,7 +1,7 @@ ## $Id$ ## Makefile.am for the TeX Live subdirectory texk/web2c/. ## -## Copyright 2017-2021 Karl Berry <tex-live@tug.org> +## Copyright 2017-2022 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 8eabfcbc1fe..1c55873c5bc 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -112,8 +112,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \ 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 @@ noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ $(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@am__append_1 = $(web_programs) @WEB_TRUE@am__append_2 = $(web_tests) @TEX_TRUE@am__append_3 = tex @@ -231,152 +230,153 @@ TESTS = tangle.test $(am__EXEEXT_46) ctiedir/ctie.test \ @EUPTEX_TRUE@am__append_79 = euptrip.diffs @EUPTEX_TRUE@am__append_80 = euptrip-clean @HITEX_TRUE@am__append_81 = hitex hishrink histretch -@HITEX_TRUE@am__append_82 = $(hitex_tests) -@MINGW32_TRUE@am__append_83 = \ +@HITEX_TRUE@am__append_82 = himktables +@HITEX_TRUE@am__append_83 = $(hitex_tests) +@MINGW32_TRUE@am__append_84 = \ @MINGW32_TRUE@ pdftexdir/regex/regex.c \ @MINGW32_TRUE@ pdftexdir/regex/regex.h -@PDFTEX_TRUE@am__append_84 = pdftex ttf2afm pdftosrc -@PDFTEX_TRUE@am__append_85 = $(pdftex_tests) $(ttf2afm_tests) \ +@PDFTEX_TRUE@am__append_85 = pdftex ttf2afm pdftosrc +@PDFTEX_TRUE@am__append_86 = $(pdftex_tests) $(ttf2afm_tests) \ @PDFTEX_TRUE@ $(pdftosrc_tests) -@LUATEX_TRUE@am__append_86 = luatex -@LUATEX_TRUE@@WIN32_TRUE@am__append_87 = call_luatex -@LUATEX_TRUE@@WIN32_TRUE@am__append_88 = install-luatex-links -@LUATEX_TRUE@@WIN32_TRUE@am__append_89 = uninstall-luatex-links -@LUATEX_TRUE@@WIN32_FALSE@am__append_90 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac -@LUAHBTEX_TRUE@am__append_91 = luahbtex -@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_92 = call_luahbtex -@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_93 = install-luahbtex-links -@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_94 = uninstall-luahbtex-links +@LUATEX_TRUE@am__append_87 = luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_88 = call_luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_89 = install-luatex-links +@LUATEX_TRUE@@WIN32_TRUE@am__append_90 = uninstall-luatex-links +@LUATEX_TRUE@@WIN32_FALSE@am__append_91 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac +@LUAHBTEX_TRUE@am__append_92 = luahbtex +@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_93 = call_luahbtex +@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_94 = install-luahbtex-links +@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_95 = uninstall-luahbtex-links # keep texlua[c] as links to luatex unless luatex is not installed. -@LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE@am__append_95 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac -@LUAJITTEX_TRUE@am__append_96 = luajittex -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_97 = call_luajittex -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_98 = install-luajittex-links -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_99 = uninstall-luajittex-links -@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_100 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc -@LUAJITHBTEX_TRUE@am__append_101 = luajithbtex -@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_102 = call_luajithbtex -@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_103 = install-luajithbtex-links -@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_104 = uninstall-luajithbtex-links +@LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE@am__append_96 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac +@LUAJITTEX_TRUE@am__append_97 = luajittex +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_98 = call_luajittex +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_99 = install-luajittex-links +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_100 = uninstall-luajittex-links +@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_101 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc +@LUAJITHBTEX_TRUE@am__append_102 = luajithbtex +@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_103 = call_luajithbtex +@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_104 = install-luajithbtex-links +@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_105 = uninstall-luajithbtex-links # keep texluajit[c] as links to luajittex unless luajittex is not installed. -@LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE@am__append_105 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc -@LUATEX_TRUE@am__append_106 = $(luatex_tests) -@LUAHBTEX_TRUE@am__append_107 = $(luahbtex_tests) -@LUAJITTEX_TRUE@am__append_108 = $(luajittex_tests) -@LUAJITHBTEX_TRUE@am__append_109 = $(luajithbtex_tests) -@XETEX_TRUE@am__append_110 = xetex -@XETEX_MACOSX_TRUE@am__append_111 = -DXETEX_MAC -@XETEX_MACOSX_TRUE@am__append_112 = -std=c++11 -@XETEX_MACOSX_FALSE@am__append_113 = $(FONTCONFIG_INCLUDES) -@XETEX_MACOSX_FALSE@am__append_114 = $(FONTCONFIG_LIBS) -@XETEX_MACOSX_TRUE@am__append_115 = \ +@LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE@am__append_106 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc +@LUATEX_TRUE@am__append_107 = $(luatex_tests) +@LUAHBTEX_TRUE@am__append_108 = $(luahbtex_tests) +@LUAJITTEX_TRUE@am__append_109 = $(luajittex_tests) +@LUAJITHBTEX_TRUE@am__append_110 = $(luajithbtex_tests) +@XETEX_TRUE@am__append_111 = xetex +@XETEX_MACOSX_TRUE@am__append_112 = -DXETEX_MAC +@XETEX_MACOSX_TRUE@am__append_113 = -std=c++11 +@XETEX_MACOSX_FALSE@am__append_114 = $(FONTCONFIG_INCLUDES) +@XETEX_MACOSX_FALSE@am__append_115 = $(FONTCONFIG_LIBS) +@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 \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c -@XETEX_MACOSX_FALSE@am__append_116 = \ +@XETEX_MACOSX_FALSE@am__append_117 = \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h -@XETEX_TRUE@am__append_117 = $(xetex_tests) -@OTANGLE_TRUE@am__append_118 = $(omegaware_programs) -@OTANGLE_TRUE@am__append_119 = $(OTANGLE_tests) $(OMFONTS_tests) -@ALEPH_TRUE@am__append_120 = aleph -@ALEPH_TRUE@am__append_121 = $(aleph_tests) -@SYNCTEX_TRUE@am__append_122 = synctex -@SYNCTEX_TRUE@am__append_123 = $(LTLIBSYNCTEX) -@SYNCTEX_TRUE@am__append_124 = $(LIBSYNCTEX) -@MINGW32_TRUE@am__append_125 = $(KPATHSEA_INCLUDES) -@MINGW32_TRUE@am__append_126 = -lshlwapi $(KPATHSEA_LIBS) -@MINGW32_TRUE@am__append_127 = -lshlwapi -@TEX_SYNCTEX_TRUE@am__append_128 = -I$(srcdir)/synctexdir \ +@XETEX_TRUE@am__append_118 = $(xetex_tests) +@OTANGLE_TRUE@am__append_119 = $(omegaware_programs) +@OTANGLE_TRUE@am__append_120 = $(OTANGLE_tests) $(OMFONTS_tests) +@ALEPH_TRUE@am__append_121 = aleph +@ALEPH_TRUE@am__append_122 = $(aleph_tests) +@SYNCTEX_TRUE@am__append_123 = synctex +@SYNCTEX_TRUE@am__append_124 = $(LTLIBSYNCTEX) +@SYNCTEX_TRUE@am__append_125 = $(LIBSYNCTEX) +@MINGW32_TRUE@am__append_126 = $(KPATHSEA_INCLUDES) +@MINGW32_TRUE@am__append_127 = -lshlwapi $(KPATHSEA_LIBS) +@MINGW32_TRUE@am__append_128 = -lshlwapi +@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\" -@TEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_LIBS) -@TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_DEPEND) -@TEX_SYNCTEX_TRUE@am__append_131 = \ +@TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_LIBS) +@TEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_DEPEND) +@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 -@ETEX_SYNCTEX_TRUE@am__append_132 = -I$(srcdir)/synctexdir \ +@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\" -@ETEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_LIBS) -@ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_DEPEND) -@ETEX_SYNCTEX_TRUE@am__append_135 = \ +@ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_LIBS) +@ETEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_DEPEND) +@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 -@PTEX_SYNCTEX_TRUE@am__append_136 = -I$(srcdir)/synctexdir \ +@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\" -@PTEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_LIBS) -@PTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_DEPEND) -@PTEX_SYNCTEX_TRUE@am__append_139 = \ +@PTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_LIBS) +@PTEX_SYNCTEX_TRUE@am__append_139 = $(ZLIB_DEPEND) +@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 -@UPTEX_SYNCTEX_TRUE@am__append_140 = -I$(srcdir)/synctexdir \ +@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\" -@UPTEX_SYNCTEX_TRUE@am__append_141 = $(ZLIB_LIBS) -@UPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_DEPEND) -@UPTEX_SYNCTEX_TRUE@am__append_143 = \ +@UPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_LIBS) +@UPTEX_SYNCTEX_TRUE@am__append_143 = $(ZLIB_DEPEND) +@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 -@EPTEX_SYNCTEX_TRUE@am__append_144 = -I$(srcdir)/synctexdir \ +@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\" -@EPTEX_SYNCTEX_TRUE@am__append_145 = $(ZLIB_LIBS) -@EPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_DEPEND) -@EPTEX_SYNCTEX_TRUE@am__append_147 = \ +@EPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_LIBS) +@EPTEX_SYNCTEX_TRUE@am__append_147 = $(ZLIB_DEPEND) +@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 -@EUPTEX_SYNCTEX_TRUE@am__append_148 = -I$(srcdir)/synctexdir \ +@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\" -@EUPTEX_SYNCTEX_TRUE@am__append_149 = $(ZLIB_LIBS) -@EUPTEX_SYNCTEX_TRUE@am__append_150 = $(ZLIB_DEPEND) -@EUPTEX_SYNCTEX_TRUE@am__append_151 = \ +@EUPTEX_SYNCTEX_TRUE@am__append_150 = $(ZLIB_LIBS) +@EUPTEX_SYNCTEX_TRUE@am__append_151 = $(ZLIB_DEPEND) +@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 -@PDFTEX_SYNCTEX_TRUE@am__append_152 = -I$(srcdir)/synctexdir \ +@PDFTEX_SYNCTEX_TRUE@am__append_153 = -I$(srcdir)/synctexdir \ @PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\" -@PDFTEX_SYNCTEX_TRUE@am__append_153 = \ +@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 -@XETEX_SYNCTEX_TRUE@am__append_154 = -I$(srcdir)/synctexdir \ +@XETEX_SYNCTEX_TRUE@am__append_155 = -I$(srcdir)/synctexdir \ @XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\" -@XETEX_SYNCTEX_TRUE@am__append_155 = \ +@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 -@SYNCTEX_TRUE@am__append_156 = $(synctex_tests) +@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 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \ @MP_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_mpost$(EXEEXT) @PMP_TRUE@@WIN32_TRUE@am__EXEEXT_38 = call_pmpost$(EXEEXT) @UPMP_TRUE@@WIN32_TRUE@am__EXEEXT_39 = call_upmpost$(EXEEXT) -@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_40 = call_luatex$(EXEEXT) -@LUAHBTEX_TRUE@@WIN32_TRUE@am__EXEEXT_41 = call_luahbtex$(EXEEXT) -@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_42 = call_luajittex$(EXEEXT) -@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__EXEEXT_43 = \ +@HITEX_TRUE@am__EXEEXT_40 = himktables$(EXEEXT) +@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_41 = call_luatex$(EXEEXT) +@LUAHBTEX_TRUE@@WIN32_TRUE@am__EXEEXT_42 = call_luahbtex$(EXEEXT) +@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_43 = call_luajittex$(EXEEXT) +@LUAJITHBTEX_TRUE@@WIN32_TRUE@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 @@ nodist_gftype_OBJECTS = gftype.$(OBJEXT) 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 @@ am__depfiles_remade = ./$(DEPDIR)/aleph-aleph-pool.Po \ ./$(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 @@ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ $(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 @@ DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ $(am__libxetex_a_SOURCES_DIST) $(libsynctex_la_SOURCES) \ $(dist_aleph_SOURCES) $(am__dist_eptex_SOURCES_DIST) \ $(am__dist_etex_SOURCES_DIST) $(am__dist_euptex_SOURCES_DIST) \ - $(gftodvi_SOURCES) $(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 @@ am__set_TESTS_bases = \ 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 -@WEB_TRUE@am__EXEEXT_46 = $(am__EXEEXT_45) +@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@.log=.log) @@ -3024,7 +3030,7 @@ NM = @NM@ 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 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluaotfcc.a \ 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 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__append_26) \ $(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_tangle_SOURCES = tangle.c tangle.h 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 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C 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 @@ upmpost_LDADD = $(pmpost_LDADD) 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,21 +4335,21 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \ 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 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,20 +4378,20 @@ pweb_programs = pbibtex pdvitype ppltotf ptftopl 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 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,22 +4435,22 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \ 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 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,21 +4486,21 @@ up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) 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 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,23 +4548,23 @@ upweb_tests = \ 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 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 @@ hi_ctangle_sh = CWEBINPUTS=$(srcdir)/hitexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle # 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 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \ pdftexdir/writejbig2.c pdftexdir/writejpg.c \ pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \ pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \ - $(am__append_83) + $(am__append_84) @MINGW32_TRUE@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 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \ # Force Automake to use CXXLD for linking nodist_EXTRA_pdftex_SOURCES = dummy.cxx pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE) -pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_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 @@ pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \ pdftexdir/pdftex_version.h pdftexdir/etex_version.h \ - $(am__append_153) + $(am__append_154) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -5356,18 +5373,18 @@ libxetex = libxetex.a xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \ $(GRAPHITE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) \ - $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_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@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 @@ xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \ xetexdir/etex_version.h xetexdir/xetex_version.h \ - $(am__append_155) + $(am__append_156) xetex_ch_srcs = \ xetexdir/xetex.web \ xetexdir/tex.ch0 \ @@ -5408,7 +5425,7 @@ libxetex_a_SOURCES = xetexdir/XeTeXFontInst.cpp \ xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \ xetexdir/image/mfileio.h xetexdir/image/numbers.c \ xetexdir/image/numbers.h xetexdir/image/pngimage.c \ - xetexdir/image/pngimage.h $(am__append_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 @@ aleph_tests = alephdir/aleph.test 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 @@ gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDE 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 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftodvi.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftopk.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftype.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/himktables.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hishrink-hishrink.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hishrink-hitables.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/histretch-histretch.Po@am__quote@ # am--include-marker @@ -19825,6 +19847,7 @@ distclean: distclean-recursive -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 @@ maintainer-clean: maintainer-clean-recursive -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,44 +21426,38 @@ triptrap-clean: $(TRIPTRAP_CLEAN) .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 # 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 \ 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 @@ $(ctangleboot_OBJECTS): $(ctangleboot_DEPENDENCIES) .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 @@ tex-pool.c: tex.pool texd.h $(makecpool_stamp) # 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 @@ mf-pool.c: mf.pool mfd.h $(makecpool_stamp) # 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 @@ mftrap.diffs: mf$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT) trap-clean: rm -rf trapdir +# (end of texmf.am) + .PHONY: install-mflua-links uninstall-mflua-links @WIN32_TRUE@install-mflua-links: call_mflua$(EXEEXT) @MFLUAN_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_mflua$(EXEEXT) $(DESTDIR)$(bindir)/mflua-nowin$(EXEEXT) @@ -21680,9 +21702,9 @@ mflua-pool.c: mflua.pool mfluad.h $(makecpool_stamp) # 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.diffs: mflua$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT) mfluatrap-clean: rm -rf mfluatrapdir +# (end of mflua.am) + #libmfluaotfcc_a_DEPENDENCIES = $(ZLIB_DEPEND) #libmfluajitotfcc_a_DEPENDENCIES = $(ZLIB_DEPEND) @@ -21736,9 +21760,9 @@ mfluajit-pool.c: mfluajit.pool mfluajitd.h $(makecpool_stamp) # 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.diffs: mfluajit$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT) mfluajittrap-clean: rm -rf mfluajittrapdir +# (end of mfluajit.am) + .PHONY: install-mpost-links uninstall-mpost-links @WIN32_TRUE@install-mpost-links: call_mpost$(EXEEXT) @WIN32_TRUE@ $(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/dvitomp$(EXEEXT) @@ -21767,9 +21793,9 @@ mpost.c: ctangle$(EXEEXT) mplibdir/mpost.w $(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.diffs: mpost$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) mptrap-clean: rm -rf mptrapdir +# (end of mplib.am) + .PHONY: install-pmpost-links install-upmpost-links uninstall-pmpost-links uninstall-upmpost-links @WIN32_TRUE@install-pmpost-links: call_pmpost$(EXEEXT) @WIN32_TRUE@ $(INSTALL_PROGRAM) call_pmpost$(EXEEXT) $(DESTDIR)$(bindir)/pdvitomp$(EXEEXT) @@ -21838,85 +21866,89 @@ ptfmin.c: ctangle$(EXEEXT) ptfmin.w pmpostdir/ptfmin.ch # 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) 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 # 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) $(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 @@ etex-pool.c: etex.pool etexd.h $(makecpool_stamp) # 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 @@ etrip.diffs: etex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) .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 @@ ptex-pool.c: ptex.pool ptexd.h $(makecpool_stamp) # 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 @@ ptrip.diffs: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) .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 @@ eptex-pool.c: eptex.pool eptexd.h $(makecpool_stamp) # 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 @@ eptrip.diffs: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) .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 @@ uptex-pool.c: uptex.pool uptexd.h $(makecpool_stamp) # 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 @@ uptrip.diffs: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) .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 @@ euptex-pool.c: euptex.pool euptexd.h $(makecpool_stamp) # 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.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) 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 @@ hitexdir/tests/rule.log: hitex$(EXEEXT) histretch$(EXEEXT) hishrink$(EXEEXT) $(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 @@ pdftex.tex: $(srcdir)/pdftexdir/pdftex.web 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 @@ xetex-pool.c: xetex.pool xetexd.h $(makecpool_stamp) $(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 @@ xetex-final.ch: tie$(EXEEXT) $(xetex_ch_srcs) $(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.p: otangle$(EXEEXT) opl2ofm.web omegaware/opl2ofm.ch 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/yannis.log: wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) wovp 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,15 +22504,17 @@ aleph-pool.c: aleph.pool alephd.h $(makecpool_stamp) # 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) $(tie_c) aleph.web $(aleph_ch_srcs) alephdir/aleph.log: aleph$(EXEEXT) +# (end of aleph.am) + $(synctex_OBJECTS): $(libsynctex) $(libsynctex_la_OBJECTS): $(ZLIB_DEPEND) diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog index 9a243b00dc8..20a10e64ffa 100644 --- a/Build/source/texk/web2c/alephdir/ChangeLog +++ b/Build/source/texk/web2c/alephdir/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/aleph.am: do not silence tangle-sh. + 2021-07-19 Hironobu Yamashita <h.y.acetaminophen@gmail.com> * com16bit.ch: Sync with tex.ch to initialize limit. diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am index b3845969931..39f1fb7059f 100644 --- a/Build/source/texk/web2c/alephdir/am/aleph.am +++ b/Build/source/texk/web2c/alephdir/am/aleph.am @@ -1,6 +1,8 @@ +## $Id$ ## texk/web2c/alephdir/am/aleph.am: Makefile fragment for Aleph. ## -## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2015-2022 Karl Berry <tex-live@tug.org> +## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## Aleph @@ -39,9 +41,9 @@ aleph-pool.c: aleph.pool alephd.h $(makecpool_stamp) # 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 @@ if ALEPH TESTS += $(aleph_tests) endif ALEPH +# (end of aleph.am) diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am index 63717703ae3..e46ab3aa04e 100644 --- a/Build/source/texk/web2c/am/bootstrap.am +++ b/Build/source/texk/web2c/am/bootstrap.am @@ -1,6 +1,8 @@ +## $Id$ ## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle. ## -## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2015-2022 Karl Berry <tex-live@tug.org> +## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. cp_silent = $(cp_silent_@AM_V@) @@ -13,30 +15,23 @@ cp_silent_1 = 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 # 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 \ 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 @@ DISTCLEANFILES += tangle.c tangle.h tangle.p tangle-web2c 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 @@ DISTCLEANFILES += tangleboot.c tangleboot.h tangleboot.p tangleboot-web2c # 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 @@ tangle.log: tangle$(EXEEXT) DISTCLEANFILES += cftest.p +# (end of bootstrap.am) diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am index 33b99ecdef6..c4a635fc4ed 100644 --- a/Build/source/texk/web2c/am/texmf.am +++ b/Build/source/texk/web2c/am/texmf.am @@ -1,7 +1,7 @@ ## $Id$ ## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF. ## -## Copyright 2015-2021 Karl Berry <tex-live@tug.org> +## Copyright 2015-2022 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -54,9 +54,9 @@ tex-pool.c: tex.pool texd.h $(makecpool_stamp) # 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 @@ mf-pool.c: mf.pool mfd.h $(makecpool_stamp) # 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 @@ EXTRA_DIST += \ triptrap/writeo \ triptrap/writeo.2 +# (end of texmf.am) diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am index c7d700373c6..55048d62358 100644 --- a/Build/source/texk/web2c/am/web.am +++ b/Build/source/texk/web2c/am/web.am @@ -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@tug.org> +## Copyright 2018-2022 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. diff --git a/Build/source/texk/web2c/ctangleboot-sh.in b/Build/source/texk/web2c/ctangleboot-sh.in index 1cc839f058c..516ad0339a8 100644 --- a/Build/source/texk/web2c/ctangleboot-sh.in +++ b/Build/source/texk/web2c/ctangleboot-sh.in @@ -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@tug.org> +# Copyright 2015-2022 Karl Berry <tex-live@tug.org> +# Copyright 2009-2012 Peter Breitenlohner <tex-live@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 @@ CWEBINPUTS=@srcdir@/cwebdir; export CWEBINPUTS 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 @@ case $target in 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. diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index 11b59fe970e..38863aa20d2 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/eptex.am: do not silence tangle-sh. + 2021-12-07 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> * suppresserrors.ch, tests/suppress_errors.tex: New files diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am index e0f7ad6c98a..43bac3443f5 100644 --- a/Build/source/texk/web2c/eptexdir/am/eptex.am +++ b/Build/source/texk/web2c/eptexdir/am/eptex.am @@ -1,7 +1,7 @@ ## $Id$ ## texk/web2c/eptexdir/am/eptex.am: Makefile fragment for e-pTeX. ## -## Copyright 2015-2021 Karl Berry <tex-live@tug.org> +## Copyright 2015-2022 Karl Berry <tex-live@tug.org> ## Copyright 2011-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -37,9 +37,9 @@ eptex-pool.c: eptex.pool eptexd.h $(makecpool_stamp) # 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 @@ EXTRA_DIST += \ eptexdir/tests/pdfprimitive-eptex.log DISTCLEANFILES += pdfprimitive-eptex.* +# (end of eptex.am) diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index 5627301256e..af462d196d0 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/etex.am: do not silence tangle-sh. + 2021-03-23 Karl Berry <karl@tug.org> * TL'21. diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index a7c954f729c..440cf1852a5 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -1,7 +1,7 @@ ## $Id$ ## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX. ## -## Copyright 2015-2021 Karl Berry <tex-live@tug.org> +## Copyright 2015-2022 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -38,9 +38,9 @@ etex-pool.c: etex.pool etexd.h $(makecpool_stamp) # 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 @@ EXTRA_DIST += \ etexdir/etrip/texmf.cnf \ etexdir/etrip/trip2.in +# (end of etex.am) diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 7d93185e1f4..97c6e6f9500 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/euptex.am: do not silence tangle-sh. + 2021-12-07 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> * am/euptex.am: Add suppresserrors.ch. diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am index 2db36b29f72..4b351295329 100644 --- a/Build/source/texk/web2c/euptexdir/am/euptex.am +++ b/Build/source/texk/web2c/euptexdir/am/euptex.am @@ -1,7 +1,7 @@ ## $Id$ ## texk/web2c/euptexdir/am/euptex.am: Makefile fragment for e-upTeX. ## -## Copyright 2015-2021 Karl Berry <tex-live@tug.org> +## Copyright 2015-2022 Karl Berry <tex-live@tug.org> ## Copyright 2011-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -38,9 +38,9 @@ euptex-pool.c: euptex.pool euptexd.h $(makecpool_stamp) # 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 @@ EXTRA_DIST += \ euptexdir/tests/pdfprimitive-euptex.log DISTCLEANFILES += pdfprimitive-euptex.* +# (end of euptex.am) diff --git a/Build/source/texk/web2c/help.h b/Build/source/texk/web2c/help.h index 38d3bd7950c..c3146b58f44 100644 --- a/Build/source/texk/web2c/help.h +++ b/Build/source/texk/web2c/help.h @@ -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. diff --git a/Build/source/texk/web2c/hitexdir/ChangeLog b/Build/source/texk/web2c/hitexdir/ChangeLog index 25da394d2a5..2b359ac17b7 100644 --- a/Build/source/texk/web2c/hitexdir/ChangeLog +++ b/Build/source/texk/web2c/hitexdir/ChangeLog @@ -1,3 +1,14 @@ +2022-01-10 Karl Berry <karl@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@gmail.com> * am/hitex.am (hitables.c): need $(EXEEXT) to execute himktables. diff --git a/Build/source/texk/web2c/hitexdir/am/hitex.am b/Build/source/texk/web2c/hitexdir/am/hitex.am index 01009a31625..4db01ff926b 100644 --- a/Build/source/texk/web2c/hitexdir/am/hitex.am +++ b/Build/source/texk/web2c/hitexdir/am/hitex.am @@ -1,13 +1,13 @@ ## $Id$ ## texk/web2c/hitexdir/am/hitex.am: Makefile fragment for HiTeX ## -## Copyright 2021 Martin Ruckert <ruckert@cs.hm.edu> +## Copyright 2021-2022 Martin Ruckert <ruckert@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 @@ hi_ctangle_sh = CWEBINPUTS=$(srcdir)/hitexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle # 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 diff --git a/Build/source/texk/web2c/hitexdir/hilexer.l b/Build/source/texk/web2c/hitexdir/hilexer.l deleted file mode 100644 index c6334a9b9e0..00000000000 --- a/Build/source/texk/web2c/hitexdir/hilexer.l +++ /dev/null @@ -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*/ diff --git a/Build/source/texk/web2c/hitexdir/hiparser.y b/Build/source/texk/web2c/hitexdir/hiparser.y deleted file mode 100644 index 707bc9287f4..00000000000 --- a/Build/source/texk/web2c/hitexdir/hiparser.y +++ /dev/null @@ -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*/ diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog index 745cc661f7d..0dd8cc156b3 100644 --- a/Build/source/texk/web2c/man/ChangeLog +++ b/Build/source/texk/web2c/man/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * Makefile.am: copyright 2022. + 2022-01-09 Andreas Scherer <https://ascherer.github.io> * twill.man, diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am index ee46f83904f..4c51c664487 100644 --- a/Build/source/texk/web2c/man/Makefile.am +++ b/Build/source/texk/web2c/man/Makefile.am @@ -1,6 +1,7 @@ ## $Id$ ## Makefile.am for the TeX Live subdirectory texk/web2c/man/ -## Copyright 2015-2019 Karl Berry <tex-live@tug.org> +## +## Copyright 2015-2022 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## diff --git a/Build/source/texk/web2c/mfluadir/ChangeLog b/Build/source/texk/web2c/mfluadir/ChangeLog index 4f6f9833246..09765823e1e 100644 --- a/Build/source/texk/web2c/mfluadir/ChangeLog +++ b/Build/source/texk/web2c/mfluadir/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/mflua.am: do not silence tangle-sh. + 2021-03-15 Luigi Scarso <luigi.scarso@gmail.com> * Code clean up (thanks to A. Kakuto) diff --git a/Build/source/texk/web2c/mfluadir/am/mflua.am b/Build/source/texk/web2c/mfluadir/am/mflua.am index 5f19d8ceca8..850a9746f4c 100644 --- a/Build/source/texk/web2c/mfluadir/am/mflua.am +++ b/Build/source/texk/web2c/mfluadir/am/mflua.am @@ -1,6 +1,7 @@ +## $Id$ ## texk/web2c/mfluadir/am/mflua.am: Makefile fragment for MFLua. ## -## Copyright 2016 Karl Berry <tex-live@tug.org> +## Copyright 2016-2022 Karl Berry <tex-live@tug.org> ## Copyright 2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -76,9 +77,9 @@ mflua-pool.c: mflua.pool mfluad.h $(makecpool_stamp) # 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 @@ EXTRA_DIST += \ mfluadir/mfluatrap/mflua_ttx_backend.lua \ mfluadir/mfluatrap/texmf.cnf \ mfluadir/mfluatrap/mfluatrap.diffs + +# (end of mflua.am) diff --git a/Build/source/texk/web2c/mfluajitdir/ChangeLog b/Build/source/texk/web2c/mfluajitdir/ChangeLog index aa75e43ea2e..5337e281a67 100644 --- a/Build/source/texk/web2c/mfluajitdir/ChangeLog +++ b/Build/source/texk/web2c/mfluajitdir/ChangeLog @@ -1,8 +1,11 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/mfluajit.am: do not silence tangle-sh. + 2017-04-16 Luigi Scarso <luigi.scarso@gmail.com> * am/mfluajit.am: delete useless lua files - 2016-04-05 Karl Berry <karl@tug.org> * am/mflua.am: no need for inimfluajit. diff --git a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am index 424554e43b4..180b6617e24 100644 --- a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am +++ b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am @@ -1,6 +1,7 @@ +## $Id$ ## texk/web2c/mfluajitdir/am/mfluajit.am: Makefile fragment for MFLuaJIT. ## -## Copyright 2016 Karl Berry <tex-live@tug.org> +## Copyright 2016-2022 Karl Berry <tex-live@tug.org> ## Copyright 2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -76,9 +77,9 @@ mfluajit-pool.c: mfluajit.pool mfluajitd.h $(makecpool_stamp) # 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 @@ EXTRA_DIST += \ mfluadir/mfluatrap/mflua_ttx_backend.lua \ mfluadir/mfluatrap/texmf.cnf \ mfluadir/mfluatrap/mfluatrap.diffs + +# (end of mfluajit.am) diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 1ad10d39285..bfbc58fca3e 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,8 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/libmplib.am, + * am/mplib.am: do not silence tangle-sh. + 2021-05-09 Luigi Scarso <luigi.scarso@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). diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am index 24245f5785e..9136bb10b3e 100644 --- a/Build/source/texk/web2c/mplibdir/am/libmplib.am +++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am @@ -1,7 +1,8 @@ +## $Id$ ## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib. ## -## Copyright (C) 2015-2021 Luigi Scarso <tex-live@tug.org> -## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2015-2022 Luigi Scarso <tex-live@tug.org> +## Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## libmplib.a, used by MetaPost and luaTeX @@ -38,49 +39,49 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w # 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 @@ DISTCLEANFILES += $(nodist_libmplibcore_a_SOURCES) $(nodist_libmplibextramath_a_ mp-tangle mpmath-tangle mpmathdecimal-tangle mpmathdouble-tangle \ mpstrings-tangle psout-tangle svgout-tangle pngout-tangle +# (end of libmplib.am) diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index 0cfdec7ac31..29a75557f18 100644 --- a/Build/source/texk/web2c/mplibdir/am/mplib.am +++ b/Build/source/texk/web2c/mplibdir/am/mplib.am @@ -1,6 +1,7 @@ +## $Id$ ## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost. ## -## Copyright 2017-2021 Luigi Scarso <tex-live@tug.org> +## Copyright 2017-2022 Luigi Scarso <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -52,9 +53,9 @@ mpost.c: ctangle$(EXEEXT) mplibdir/mpost.w $(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.diffs: mpost$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) mptrap-clean: rm -rf mptrapdir +# (end of mplib.am) diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog index 9b0673a99ee..9ec2edb6bad 100644 --- a/Build/source/texk/web2c/omegaware/ChangeLog +++ b/Build/source/texk/web2c/omegaware/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/omegaware.am: do not silence tangle-sh. + 2021-03-23 Karl Berry <karl@tug.org> * TL'21. diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am index b1a8aa0ee37..ef63d19d734 100644 --- a/Build/source/texk/web2c/omegaware/am/omegaware.am +++ b/Build/source/texk/web2c/omegaware/am/omegaware.am @@ -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@tug.org> +## Copyright 2015-2022 Karl Berry <tex-live@tug.org> +## Copyright 2009-2015 Peter Breitenlohner <tex-live@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 @@ DISTCLEANFILES += opl2ofm.web 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 @@ EXTRA_DIST += \ omegaware/tests/arabicr.pl omegaware/tests/arabic.ovp DISTCLEANFILES += omegaware/tests/*yarabic* +# (end of omegaware.am) diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 75398711724..6891173a1b7 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@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. diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am index bb85a00f23a..58d51fa06da 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am @@ -1,7 +1,7 @@ ## $Id$ ## texk/web2c/pdftexdir/am/pdftex.am: Makefile fragment for pdfTeX. ## -## Copyright 2016-2021 Karl Berry <tex-live@tug.org> +## Copyright 2016-2022 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -43,13 +43,13 @@ 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 $(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 @@ DISTCLEANFILES += cnfline.log ## partoken.test EXTRA_DIST += tests/partoken-ok.tex tests/partoken-xfail.tex DISTCLEANFILES += partoken-ok.log partoken-xfail.log + +# (end of pdftex.am) diff --git a/Build/source/texk/web2c/pmpostdir/ChangeLog b/Build/source/texk/web2c/pmpostdir/ChangeLog index 0af9fe1dcc2..8ce57298c64 100644 --- a/Build/source/texk/web2c/pmpostdir/ChangeLog +++ b/Build/source/texk/web2c/pmpostdir/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/pmpost.am: do not silence tangle-sh. + 2021-04-11 Akira Kakuto <kakuto@w32tex.org> * pmp.ch: Sync with the version 2.01 mp.w. diff --git a/Build/source/texk/web2c/pmpostdir/am/pmpost.am b/Build/source/texk/web2c/pmpostdir/am/pmpost.am index f7e60851bf4..f7dbe7d0bed 100644 --- a/Build/source/texk/web2c/pmpostdir/am/pmpost.am +++ b/Build/source/texk/web2c/pmpostdir/am/pmpost.am @@ -1,6 +1,7 @@ +## $Id$ ## texk/web2c/pmpostdir/am/pmpost.am: Makefile fragment for pMetaPost. ## -## Copyright 2018 Karl Berry <tex-live@tug.org> +## Copyright 2018-2022 Karl Berry <tex-live@tug.org> ## Copyright 2014-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -64,9 +65,11 @@ pmp_ctangle = $(ctangle_silent)CWEBINPUTS=.:$(srcdir)/pmpostdir $(ctangle) 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 @@ ptfmin.c: ctangle$(EXEEXT) ptfmin.w pmpostdir/ptfmin.ch # 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 @@ DISTCLEANFILES += pmpsamp.* ## pmpostdir/upmpsamp.test DISTCLEANFILES += upmpsamp.* +# (end of pmpost.am) diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index cc9ee72ca37..c77ab5bbd3f 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/ptex.am: do not silence tangle-sh. + 2021-07-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> * ptex-base.ch: Set subtype=0 for adjust_node. diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index 2714e21449b..4ab8c3bb486 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -1,7 +1,7 @@ ## $Id$ ## texk/web2c/ptexdir/am/ptex.am: Makefile fragment for pTeX. ## -## Copyright 2015-2021 Karl Berry <tex-live@tug.org> +## Copyright 2015-2022 Karl Berry <tex-live@tug.org> ## Copyright 2010-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -60,9 +60,9 @@ ptex-pool.c: ptex.pool ptexd.h $(makecpool_stamp) # 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 @@ ptrip-clean: rm -rf ptripdir DISTCLEANFILES += ptrip.diffs + +# (end of ptex.am) diff --git a/Build/source/texk/web2c/tangle-sh.in b/Build/source/texk/web2c/tangle-sh.in index 6af8991f042..3221dc76160 100644 --- a/Build/source/texk/web2c/tangle-sh.in +++ b/Build/source/texk/web2c/tangle-sh.in @@ -1,31 +1,50 @@ #! @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@tug.org> +# Copyright 2015-2022 Karl Berry <tex-live@tug.org> +# Copyright 2009-2015 Peter Breitenlohner <tex-live@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. # # 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" 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 @@ base=$1 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 @@ case $target in 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. diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 427056e0d20..34a49bf8842 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/uptex.am: do not silence tangle-sh. + 2021-06-29 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> * uptex-m.ch: Adapt to pTeX p3.10.0. diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am index 826dc260f00..775400ec72a 100644 --- a/Build/source/texk/web2c/uptexdir/am/uptex.am +++ b/Build/source/texk/web2c/uptexdir/am/uptex.am @@ -1,7 +1,7 @@ ## $Id$ ## texk/web2c/uptexdir/am/uptex.am: Makefile fragment for upTeX. ## -## Copyright 2016-2021 Karl Berry <tex-live@tug.org> +## Copyright 2016-2022 Karl Berry <tex-live@tug.org> ## Copyright 2011-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -53,9 +53,9 @@ uptex-pool.c: uptex.pool uptexd.h $(makecpool_stamp) # 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 @@ uptrip-clean: DISTCLEANFILES += uptrip.diffs +# (end of uptex.am) diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 0342c56105e..6df4bc9054b 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,7 @@ +2022-01-10 Karl Berry <karl@freefriends.org> + + * am/xetex.am: do not silence tangle-sh. + 2021-07-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com> * xetex.web: Avoid an error diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index 7f164eb423a..6a1b76b9672 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -1,7 +1,7 @@ ## $Id$ ## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX. ## -## Copyright 2017-2021 Karl Berry <tex-live@tug.org> +## Copyright 2017-2022 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -92,9 +92,9 @@ xetex-pool.c: xetex.pool xetexd.h $(makecpool_stamp) ## 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 @@ DISTCLEANFILES += bug73.fmt bug73.log bug73.out bug73.tex ## xetex-filedump.test EXTRA_DIST += xetexdir/tests/filedump.log xetexdir/tests/filedump.tex DISTCLEANFILES += filedump.log filedump.out filedump.tex + +# (end of xetex.am) |