pdftex[874] branches/stable/source/src: sync from tl 62272, tl22
commits+karl at tug.org
commits+karl at tug.org
Tue Mar 1 03:03:01 CET 2022
Revision: 874
http://tug.org/svn/pdftex?view=revision&revision=874
Author: karl
Date: 2022-03-01 03:03:00 +0100 (Tue, 01 Mar 2022)
Log Message:
-----------
sync from tl 62272, tl22 pretest
Modified Paths:
--------------
branches/stable/source/src/Makefile.in
branches/stable/source/src/am/ChangeLog
branches/stable/source/src/am/bin_links.am
branches/stable/source/src/am/recurse.am
branches/stable/source/src/build-aux/ar-lib
branches/stable/source/src/build-aux/compile
branches/stable/source/src/build-aux/config.guess
branches/stable/source/src/build-aux/config.sub
branches/stable/source/src/build-aux/depcomp
branches/stable/source/src/build-aux/missing
branches/stable/source/src/build-aux/test-driver
branches/stable/source/src/build-aux/texinfo.tex
branches/stable/source/src/build-aux/ylwrap
branches/stable/source/src/configure
branches/stable/source/src/doc/ChangeLog
branches/stable/source/src/doc/tlbuild.info
branches/stable/source/src/doc/tlbuild.texi
branches/stable/source/src/libs/Makefile.in
branches/stable/source/src/libs/README
branches/stable/source/src/libs/configure
branches/stable/source/src/texk/Makefile.in
branches/stable/source/src/texk/README
branches/stable/source/src/texk/configure
branches/stable/source/src/texk/kpathsea/ChangeLog
branches/stable/source/src/texk/kpathsea/NEWS
branches/stable/source/src/texk/kpathsea/c-auto.in
branches/stable/source/src/texk/kpathsea/configure
branches/stable/source/src/texk/kpathsea/doc/kpathsea.info
branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi
branches/stable/source/src/texk/kpathsea/kpsewhich.c
branches/stable/source/src/texk/kpathsea/texmf.cnf
branches/stable/source/src/texk/kpathsea/version.ac
branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm
branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
branches/stable/source/src/texk/web2c/ChangeLog
branches/stable/source/src/texk/web2c/Makefile.am
branches/stable/source/src/texk/web2c/Makefile.in
branches/stable/source/src/texk/web2c/NEWS
branches/stable/source/src/texk/web2c/ac/web2c.ac
branches/stable/source/src/texk/web2c/am/bootstrap.am
branches/stable/source/src/texk/web2c/am/texmf.am
branches/stable/source/src/texk/web2c/am/web.am
branches/stable/source/src/texk/web2c/configure
branches/stable/source/src/texk/web2c/ctangleboot-sh.in
branches/stable/source/src/texk/web2c/ctangleboot.cin
branches/stable/source/src/texk/web2c/cwebboot.cin
branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
branches/stable/source/src/texk/web2c/cwebdir/Makefile
branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch
branches/stable/source/src/texk/web2c/cwebdir/comm-man.ch
branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch
branches/stable/source/src/texk/web2c/cwebdir/comm-pc.ch
branches/stable/source/src/texk/web2c/cwebdir/comm-ql.ch
branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.h
branches/stable/source/src/texk/web2c/cwebdir/common.c
branches/stable/source/src/texk/web2c/cwebdir/common.h
branches/stable/source/src/texk/web2c/cwebdir/common.w
branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-man.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-pc.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-ql.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-vms.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-w32.ch
branches/stable/source/src/texk/web2c/cwebdir/ctangle.c
branches/stable/source/src/texk/web2c/cwebdir/ctangle.w
branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch
branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/ctwimac.tex
branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-man.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-pc.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-ql.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-vms.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-w32.ch
branches/stable/source/src/texk/web2c/cwebdir/cweave.w
branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex
branches/stable/source/src/texk/web2c/cwebdir/po/cweb-tl.pot
branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot
branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb-tl.po
branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po
branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po
branches/stable/source/src/texk/web2c/cwebdir/prod-cweave.w
branches/stable/source/src/texk/web2c/cwebdir/prod-twill.w
branches/stable/source/src/texk/web2c/cwebdir/prod.w
branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebstrings.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex
branches/stable/source/src/texk/web2c/doc/web2c.info
branches/stable/source/src/texk/web2c/doc/web2c.texi
branches/stable/source/src/texk/web2c/etexdir/ChangeLog
branches/stable/source/src/texk/web2c/etexdir/am/etex.am
branches/stable/source/src/texk/web2c/help.h
branches/stable/source/src/texk/web2c/lib/ChangeLog
branches/stable/source/src/texk/web2c/lib/openclose.c
branches/stable/source/src/texk/web2c/lib/printversion.c
branches/stable/source/src/texk/web2c/lib/texmfmp.c
branches/stable/source/src/texk/web2c/man/Makefile.in
branches/stable/source/src/texk/web2c/omegafonts/Makefile.in
branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
branches/stable/source/src/texk/web2c/pdftexdir/NEWS
branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am
branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web
branches/stable/source/src/texk/web2c/showstream.ch
branches/stable/source/src/texk/web2c/synctexdir/ChangeLog
branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am
branches/stable/source/src/texk/web2c/synctexdir/synctex.c
branches/stable/source/src/texk/web2c/synctexdir/synctex_main.c
branches/stable/source/src/texk/web2c/tangle-sh.in
branches/stable/source/src/texk/web2c/tangle.ch
branches/stable/source/src/texk/web2c/tangleboot.pin
branches/stable/source/src/texk/web2c/texmfmem.h
branches/stable/source/src/texk/web2c/web2c/ChangeLog
branches/stable/source/src/texk/web2c/web2c/Makefile.am
branches/stable/source/src/texk/web2c/web2c/Makefile.in
branches/stable/source/src/texk/web2c/web2c/common.defines
branches/stable/source/src/texk/web2c/web2c/configure
branches/stable/source/src/utils/Makefile.in
branches/stable/source/src/utils/README
branches/stable/source/src/utils/configure
branches/stable/source/src/version.ac
Added Paths:
-----------
branches/stable/source/src/texk/web2c/tests/xeteximage.tex
Modified: branches/stable/source/src/Makefile.in
===================================================================
--- branches/stable/source/src/Makefile.in 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/Makefile.in 2022-03-01 02:03:00 UTC (rev 874)
@@ -494,23 +494,6 @@
DIST_SUBDIRS = auxdir/auxsub doc $(CONF_SUBDIRS) libs utils texk
recurse_this =
recurse_top =
-
-# am/recurse.am: Makefile fragment to configure and build subdirs.
-#
-# Copyright 2017-2020 Karl Berry <tex-live at tug.org>
-# Copyright 2013 Peter Breitenlohner <tex-live at tug.org>
-# You may freely use, modify and/or distribute this file.
-#
-# Requires $(recurse_this) and $(recurse_top).
-# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
-#
-# For subdirs not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because, e.g., some required libraries were not built.
-# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
-#
-# Code inspired by automake's way to handle recursive targets.
-#
cf_silent = $(cf_silent_ at AM_V@)
cf_silent_ = $(cf_silent_ at AM_DEFAULT_V@)
cf_silent_0 = --silent
@@ -1044,6 +1027,8 @@
@echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
exit 1
+# (end of recurse.am)
+
# This (world) is the default target for the ./Build script in TeX Live.
.PHONY: world
world: all
Modified: branches/stable/source/src/am/ChangeLog
===================================================================
--- branches/stable/source/src/am/ChangeLog 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/am/ChangeLog 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,3 +1,11 @@
+2022-01-11 Karl Berry <karl at freefriends.org>
+
+ * bin_links.am,
+ * recurse.am: comment out comments (##) again; turns out
+ the leading comments all end up at the beginning of Makefile.in,
+ which is not useful. On the other hand, insert # (end of ...)
+ comments, which do show up in the normal place.
+
2017-02-17 Karl Berry <karl at freefriends.org>
* bin_links.am,
Modified: branches/stable/source/src/am/bin_links.am
===================================================================
--- branches/stable/source/src/am/bin_links.am 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/am/bin_links.am 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,18 +1,18 @@
-## $Id: bin_links.am 55466 2020-06-07 18:00:56Z karl $
-# am/bin_links.am: Makefile fragment for bindir links.
-#
-# Copyright 2017-2020 Karl Berry <tex-live at tug.org>
-# Copyright 2011-2013 Peter Breitenlohner <tex-live at tug.org>
-# You may freely use, modify and/or distribute this file.
-#
-# requires conditional WIN32
-# requires $(bin_links)
-# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
-# for binaries and scripts use, e.g.,
-# binprog$(EXEEXT):foo
-# script:bar
-# respectively, such that the links created on cygwin are
-# 'foo->binprog.exe' and 'bar->script'.
+## $Id: bin_links.am 61576 2022-01-11 22:54:49Z karl $
+## am/bin_links.am: Makefile fragment for bindir links.
+##
+## Copyright 2017-2022 Karl Berry <tex-live at tug.org>
+## Copyright 2011-2013 Peter Breitenlohner <tex-live at tug.org>
+## You may freely use, modify and/or distribute this file.
+##
+## requires conditional WIN32
+## requires $(bin_links)
+## Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
+## for binaries and scripts use, e.g.,
+## binprog$(EXEEXT):foo
+## script:bar
+## respectively, such that the links created on cygwin are
+## 'foo->binprog.exe' and 'bar->script'.
.PHONY: install-bin-links uninstall-bin-links
@@ -37,3 +37,4 @@
done
endif !WIN32
+# (end of bin_links.am)
Modified: branches/stable/source/src/am/recurse.am
===================================================================
--- branches/stable/source/src/am/recurse.am 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/am/recurse.am 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,20 +1,20 @@
-## $Id: recurse.am 55466 2020-06-07 18:00:56Z karl $
-# am/recurse.am: Makefile fragment to configure and build subdirs.
-#
-# Copyright 2017-2020 Karl Berry <tex-live at tug.org>
-# Copyright 2013 Peter Breitenlohner <tex-live at tug.org>
-# You may freely use, modify and/or distribute this file.
-#
-# Requires $(recurse_this) and $(recurse_top).
-# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
-#
-# For subdirs not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because, e.g., some required libraries were not built.
-# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
-#
-# Code inspired by automake's way to handle recursive targets.
-#
+## $Id: recurse.am 61576 2022-01-11 22:54:49Z karl $
+## am/recurse.am: Makefile fragment to configure and build subdirs.
+##
+## Copyright 2017-2022 Karl Berry <tex-live at tug.org>
+## Copyright 2013 Peter Breitenlohner <tex-live at tug.org>
+## You may freely use, modify and/or distribute this file.
+##
+## Requires $(recurse_this) and $(recurse_top).
+## Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
+##
+## For subdirs not required for the current set of configure options
+## we append '--disable-build' so they can skip tests that would
+## fail because, e.g., some required libraries were not built.
+## (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
+##
+## Code inspired by automake's way to handle recursive targets.
+
cf_silent = $(cf_silent_ at AM_V@)
cf_silent_ = $(cf_silent_ at AM_DEFAULT_V@)
cf_silent_0 = --silent
@@ -56,3 +56,5 @@
$(CONFIG_AUX):
@echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
exit 1
+
+# (end of recurse.am)
Modified: branches/stable/source/src/build-aux/ar-lib
===================================================================
--- branches/stable/source/src/build-aux/ar-lib 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/build-aux/ar-lib 2022-03-01 02:03:00 UTC (rev 874)
@@ -4,7 +4,7 @@
me=ar-lib
scriptversion=2019-07-04.01; # UTC
-# Copyright (C) 2010-2021 Free Software Foundation, Inc.
+# Copyright (C) 2010-2022 Free Software Foundation, Inc.
# Written by Peter Rosin <peda at lysator.liu.se>.
#
# This program is free software; you can redistribute it and/or modify
@@ -135,6 +135,10 @@
AR="$AR $1"
shift
;;
+ -nologo | -NOLOGO)
+ # We always invoke AR with -nologo, so don't need to add it again.
+ shift
+ ;;
*)
action=$1
shift
Modified: branches/stable/source/src/build-aux/compile
===================================================================
--- branches/stable/source/src/build-aux/compile 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/build-aux/compile 2022-03-01 02:03:00 UTC (rev 874)
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2022 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
Modified: branches/stable/source/src/build-aux/config.guess
===================================================================
--- branches/stable/source/src/build-aux/config.guess 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/build-aux/config.guess 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,14 +1,14 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2021 Free Software Foundation, Inc.
+# Copyright 1992-2022 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2021-06-03'
+timestamp='2022-01-09'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -60,7 +60,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -437,7 +437,7 @@
# This test works for both compilers.
if test "$CC_FOR_BUILD" != no_compiler_found; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
SUN_ARCH=x86_64
@@ -929,6 +929,9 @@
i*:PW*:*)
GUESS=$UNAME_MACHINE-pc-pw32
;;
+ *:SerenityOS:*:*)
+ GUESS=$UNAME_MACHINE-pc-serenity
+ ;;
*:Interix*:*)
case $UNAME_MACHINE in
x86)
@@ -1522,6 +1525,9 @@
i*86:rdos:*:*)
GUESS=$UNAME_MACHINE-pc-rdos
;;
+ i*86:Fiwix:*:*)
+ GUESS=$UNAME_MACHINE-pc-fiwix
+ ;;
*:AROS:*:*)
GUESS=$UNAME_MACHINE-unknown-aros
;;
Modified: branches/stable/source/src/build-aux/config.sub
===================================================================
--- branches/stable/source/src/build-aux/config.sub 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/build-aux/config.sub 2022-03-01 02:03:00 UTC (rev 874)
@@ -4,11 +4,11 @@
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2021-08-14'
+timestamp='2021-12-25'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -1020,6 +1020,11 @@
;;
# Here we normalize CPU types with a missing or matching vendor
+ armh-unknown | armh-alt)
+ cpu=armv7l
+ vendor=alt
+ basic_os=${basic_os:-linux-gnueabihf}
+ ;;
dpx20-unknown | dpx20-bull)
cpu=rs6000
vendor=bull
@@ -1121,7 +1126,7 @@
xscale-* | xscalee[bl]-*)
cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
;;
- arm64-*)
+ arm64-* | aarch64le-*)
cpu=aarch64
;;
@@ -1304,7 +1309,7 @@
if test x$basic_os != x
then
-# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
# set os.
case $basic_os in
gnu/linux*)
@@ -1748,7 +1753,8 @@
| skyos* | haiku* | rdos* | toppers* | drops* | es* \
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
| midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
+ | fiwix* )
;;
# This one is extra strict with allowed versions
sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
Modified: branches/stable/source/src/build-aux/depcomp
===================================================================
--- branches/stable/source/src/build-aux/depcomp 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/build-aux/depcomp 2022-03-01 02:03:00 UTC (rev 874)
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2022 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -113,7 +113,6 @@
# These definitions help.
upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
alpha=${upper}${lower}
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
Modified: branches/stable/source/src/build-aux/missing
===================================================================
--- branches/stable/source/src/build-aux/missing 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/build-aux/missing 2022-03-01 02:03:00 UTC (rev 874)
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
Modified: branches/stable/source/src/build-aux/test-driver
===================================================================
--- branches/stable/source/src/build-aux/test-driver 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/build-aux/test-driver 2022-03-01 02:03:00 UTC (rev 874)
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -105,8 +105,11 @@
trap "st=141; $do_exit" 13
trap "st=143; $do_exit" 15
-# Test script is run here.
-"$@" >$log_file 2>&1
+# Test script is run here. We create the file first, then append to it,
+# to ameliorate tests themselves also writing to the log file. Our tests
+# don't, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1
estatus=$?
if test $enable_hard_errors = no && test $estatus -eq 99; then
@@ -128,7 +131,7 @@
# know whether the test passed or failed simply by looking at the '.log'
# file, without the need of also peaking into the corresponding '.trs'
# file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>$log_file
+echo "$res $test_name (exit status: $estatus)" >>"$log_file"
# Report outcome to console.
echo "${col}${res}${std}: $test_name"
Modified: branches/stable/source/src/build-aux/texinfo.tex
===================================================================
--- branches/stable/source/src/build-aux/texinfo.tex 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/build-aux/texinfo.tex 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,9 +1,9 @@
% texinfo.tex -- TeX macros to handle Texinfo files.
-%
+%
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2021-04-25.21}
+\def\texinfoversion{2022-01-02.12}
%
% Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
%
@@ -218,7 +218,7 @@
% @errormsg{MSG}. Do the index-like expansions on MSG, but if things
% aren't perfect, it's not the end of the world, being an error message,
% after all.
-%
+%
\def\errormsg{\begingroup \indexnofonts \doerrormsg}
\def\doerrormsg#1{\errmessage{#1}}
@@ -323,9 +323,9 @@
% the output routine. The saved contents are valid until we actually
% \shipout a page.
%
-% (We used to run a short output routine to actually set \topmark and
-% \firstmark to the right values, but if this was called with an empty page
-% containing whatsits for writing index entries, the whatsits would be thrown
+% (We used to run a short output routine to actually set \topmark and
+% \firstmark to the right values, but if this was called with an empty page
+% containing whatsits for writing index entries, the whatsits would be thrown
% away and the index auxiliary file would remain empty.)
%
\newtoks\savedtopmark
@@ -449,7 +449,7 @@
}%
}
-% First remove any @comment, then any @c comment. Pass the result on to
+% First remove any @comment, then any @c comment. Pass the result on to
% \argcheckspaces.
\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
@@ -1093,8 +1093,8 @@
end
end
}
- % The -2 in the arguments here gives all the input to TeX catcode 12
- % (other) or 10 (space), preventing undefined control sequence errors. See
+ % The -2 in the arguments here gives all the input to TeX catcode 12
+ % (other) or 10 (space), preventing undefined control sequence errors. See
% https://lists.gnu.org/archive/html/bug-texinfo/2019-08/msg00031.html
%
\endgroup
@@ -1188,7 +1188,7 @@
% for display in the outlines, and in other places. Thus, we have to
% double any backslashes. Otherwise, a name like "\node" will be
% interpreted as a newline (\n), followed by o, d, e. Not good.
-%
+%
% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and
% related messages. The final outcome is that it is up to the TeX user
% to double the backslashes and otherwise make the string valid, so
@@ -1476,7 +1476,7 @@
% We use the node names as the destinations.
%
% Currently we prefix the section name with the section number
- % for chapter and appendix headings only in order to avoid too much
+ % for chapter and appendix headings only in order to avoid too much
% horizontal space being required in the PDF viewer.
\def\numchapentry##1##2##3##4{%
\dopdfoutline{##2 ##1}{count-\expnumber{chap##2}}{##3}{##4}}%
@@ -1499,7 +1499,7 @@
% their "best" equivalent, based on the @documentencoding. Too
% much work for too little return. Just use the ASCII equivalents
% we use for the index sort strings.
- %
+ %
\indexnofonts
\setupdatafile
% We can have normal brace characters in the PDF outlines, unlike
@@ -1724,7 +1724,7 @@
% We use node names as destinations.
%
% Currently we prefix the section name with the section number
- % for chapter and appendix headings only in order to avoid too much
+ % for chapter and appendix headings only in order to avoid too much
% horizontal space being required in the PDF viewer.
\def\partentry##1##2##3##4{}% ignore parts in the outlines
\def\numchapentry##1##2##3##4{%
@@ -2736,7 +2736,7 @@
}
% Commands to set the quote options.
-%
+%
\parseargdef\codequoteundirected{%
\def\temp{#1}%
\ifx\temp\onword
@@ -2777,7 +2777,7 @@
% If we are in a monospaced environment, however, 1) always use \ttsl,
% and 2) do not add an italic correction.
\def\dosmartslant#1#2{%
- \ifusingtt
+ \ifusingtt
{{\ttsl #2}\let\next=\relax}%
{\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}%
\next
@@ -2923,7 +2923,7 @@
\gdef\codedash{\futurelet\next\codedashfinish}
\gdef\codedashfinish{%
\normaldash % always output the dash character itself.
- %
+ %
% Now, output a discretionary to allow a line break, unless
% (a) the next character is a -, or
% (b) the preceding character is a -.
@@ -2930,7 +2930,7 @@
% E.g., given --posix, we do not want to allow a break after either -.
% Given --foo-bar, we do want to allow a break between the - and the b.
\ifx\next\codedash \else
- \ifx\codedashprev\codedash
+ \ifx\codedashprev\codedash
\else \discretionary{}{}{}\fi
\fi
% we need the space after the = for the case when \next itself is a
@@ -3020,7 +3020,7 @@
% For pdfTeX and LuaTeX
\ifurefurlonlylink
% PDF plus option to not display url, show just arg
- \unhbox0
+ \unhbox0
\else
% PDF, normally display both arg and url for consistency,
% visibility, if the pdf is eventually used to print, etc.
@@ -3033,7 +3033,7 @@
% For XeTeX
\ifurefurlonlylink
% PDF plus option to not display url, show just arg
- \unhbox0
+ \unhbox0
\else
% PDF, normally display both arg and url for consistency,
% visibility, if the pdf is eventually used to print, etc.
@@ -3091,10 +3091,10 @@
}
}
-% By default we'll break after the special characters, but some people like to
-% break before the special chars, so allow that. Also allow no breaking at
+% By default we'll break after the special characters, but some people like to
+% break before the special chars, so allow that. Also allow no breaking at
% all, for manual control.
-%
+%
\parseargdef\urefbreakstyle{%
\def\txiarg{#1}%
\ifx\txiarg\wordnone
@@ -3113,10 +3113,10 @@
\def\wordnone{none}
% Allow a ragged right output to aid breaking long URL's. There can
-% be a break at the \allowbreak with no extra glue (if the existing stretch in
+% be a break at the \allowbreak with no extra glue (if the existing stretch in
% the line is sufficient), a break at the \penalty with extra glue added
% at the end of the line, or no break at all here.
-% Changing the value of the penalty and/or the amount of stretch affects how
+% Changing the value of the penalty and/or the amount of stretch affects how
% preferable one choice is over the other.
\def\urefallowbreak{%
\penalty0\relax
@@ -3193,14 +3193,9 @@
% \kern-0.4pt\hrule}%
% \kern-.06em\raise0.4pt\hbox{\angleright}}}}
-% definition of @key with no lozenge. If the current font is already
-% monospace, don't change it; that way, we respect @kbdinputstyle. But
-% if it isn't monospace, then use \tt.
+% definition of @key with no lozenge.
%
-\def\key#1{{\setregularquotes
- \nohyphenation
- \ifmonospace\else\tt\fi
- #1}\null}
+\def\key#1{{\setregularquotes \nohyphenation \tt #1}\null}
% @clicksequence{File @click{} Open ...}
\def\clicksequence#1{\begingroup #1\endgroup}
@@ -3344,7 +3339,7 @@
% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
% Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
% except specified as a normal braced arg, so no newlines to worry about.
-%
+%
\def\outfmtnametex{tex}
%
\long\def\inlinefmt#1{\doinlinefmt #1,\finish}
@@ -3352,7 +3347,7 @@
\def\inlinefmtname{#1}%
\ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
}
-%
+%
% @inlinefmtifelse{FMTNAME,THEN-TEXT,ELSE-TEXT} expands THEN-TEXT if
% FMTNAME is tex, else ELSE-TEXT.
\long\def\inlinefmtifelse#1{\doinlinefmtifelse #1,,,\finish}
@@ -3368,7 +3363,7 @@
% *right* brace they would have to use a command anyway, so they may as
% well use a command to get a left brace too. We could re-use the
% delimiter character idea from \verb, but it seems like overkill.
-%
+%
\long\def\inlineraw{\tex \doinlineraw}
\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
\def\doinlinerawtwo#1,#2,\finish{%
@@ -3614,6 +3609,9 @@
\def\quotedblbase{{\ecfont \char"12}}
\def\quotesinglbase{{\ecfont \char"0D}}
%
+\def\L{{\ecfont \char"8A}} % L with stroke
+\def\l{{\ecfont \char"AA}} % l with stroke
+%
% This positioning is not perfect (see the ogonek LaTeX package), but
% we have the precomposed glyphs for the most common cases. We put the
% tests to use those glyphs in the single \ogonek macro so we have fewer
@@ -3645,7 +3643,7 @@
% for non-CM glyphs. That is ec* for regular text and tc* for the text
% companion symbols (LaTeX TS1 encoding). Both are part of the ec
% package and follow the same conventions.
-%
+%
\def\ecfont{\etcfont{e}}
\def\tcfont{\etcfont{t}}
%
@@ -3725,7 +3723,7 @@
after the title page.}}%
\def\setshortcontentsaftertitlepage{%
\errmessage{@setshortcontentsaftertitlepage has been removed as a Texinfo
- command; move your @shortcontents and @contents commands if you
+ command; move your @shortcontents and @contents commands if you
want the contents after the title page.}}%
\parseargdef\shorttitlepage{%
@@ -3780,7 +3778,7 @@
% don't worry much about spacing, ragged right. This should be used
% inside a \vbox, and fonts need to be set appropriately first. \par should
% be specified before the end of the \vbox, since a vbox is a group.
-%
+%
\def\raggedtitlesettings{%
\rm
\hyphenpenalty=10000
@@ -4613,7 +4611,7 @@
% Like \expandablevalue, but completely expandable (the \message in the
% definition above operates at the execution level of TeX). Used when
% writing to auxiliary files, due to the expansion that \write does.
-% If flag is undefined, pass through an unexpanded @value command: maybe it
+% If flag is undefined, pass through an unexpanded @value command: maybe it
% will be set by the time it is read back in.
%
% NB flag names containing - or _ may not work here.
@@ -4637,7 +4635,7 @@
% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
% with @set.
-%
+%
% To get the special treatment we need for `@end ifset,' we call
% \makecond and then redefine.
%
@@ -4670,7 +4668,7 @@
% without the @) is in fact defined. We can only feasibly check at the
% TeX level, so something like `mathcode' is going to considered
% defined even though it is not a Texinfo command.
-%
+%
\makecond{ifcommanddefined}
\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}}
%
@@ -4778,8 +4776,8 @@
\def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx}
\def\docodeindexxxx #1{\docind{\indexname}{#1}}
-
-% Used for the aux, toc and index files to prevent expansion of Texinfo
+
+% Used for the aux, toc and index files to prevent expansion of Texinfo
% commands.
%
\def\atdummies{%
@@ -5126,13 +5124,13 @@
\let\value\indexnofontsvalue
}
-% Give the control sequence a definition that removes the {} that follows
+% Give the control sequence a definition that removes the {} that follows
% its use, e.g. @AA{} -> AA
\def\indexnofontsdef#1#2{\def#1##1{#2}}%
-
+
% #1 is the index name, #2 is the entry text.
\def\doind#1#2{%
\iflinks
@@ -5171,7 +5169,7 @@
\ifx\suffix\indexisfl\def\suffix{f1}\fi
% Open the file
\immediate\openout\csname#1indfile\endcsname \jobname.\suffix
- % Using \immediate above here prevents an object entering into the current
+ % Using \immediate above here prevents an object entering into the current
% box, which could confound checks such as those in \safewhatsit for
% preceding skips.
\typeout{Writing index file \jobname.\suffix}%
@@ -5223,7 +5221,7 @@
\ifx\segment\isfinish
\else
%
- % Fully expand the segment, throwing away any @sortas directives, and
+ % Fully expand the segment, throwing away any @sortas directives, and
% trim spaces.
\edef\trimmed{\segment}%
\edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
@@ -5284,12 +5282,12 @@
% the current value of \escapechar.
\def\escapeisbackslash{\escapechar=`\\}
-% Use \ in index files by default. texi2dvi didn't support @ as the escape
-% character (as it checked for "\entry" in the files, and not "@entry"). When
-% the new version of texi2dvi has had a chance to become more prevalent, then
-% the escape character can change back to @ again. This should be an easy
-% change to make now because both @ and \ are only used as escape characters in
-% index files, never standing for themselves.
+% Use \ in index files by default. texi2dvi didn't support @ as the escape
+% character (as it checked for "\entry" in the files, and not "@entry"). When
+% the new version of texi2dvi has had a chance to become more prevalent, then
+% the escape character can change back to @ again. This should be an easy
+% change to make now because both @ and \ are only used as escape characters in
+% index files, never standing for themselves.
%
\set txiindexescapeisbackslash
@@ -5314,7 +5312,7 @@
\def\}{\rbracechar{}}%
\uccode`\~=`\\ \uppercase{\def~{\backslashchar{}}}%
%
- % Split the entry into primary entry and any subentries, and get the index
+ % Split the entry into primary entry and any subentries, and get the index
% sort key.
\splitindexentry\indextext
%
@@ -5495,18 +5493,18 @@
\uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1
\expandafter\ifx\csname SETtxiskipindexfileswithbackslash\endcsname\relax
\errmessage{%
-ERROR: A sorted index file in an obsolete format was skipped.
+ERROR: A sorted index file in an obsolete format was skipped.
To fix this problem, please upgrade your version of 'texi2dvi'
or 'texi2pdf' to that at <https://ftp.gnu.org/gnu/texinfo>.
-If you are using an old version of 'texindex' (part of the Texinfo
+If you are using an old version of 'texindex' (part of the Texinfo
distribution), you may also need to upgrade to a newer version (at least 6.0).
You may be able to typeset the index if you run
'texindex \jobname.\indexname' yourself.
-You could also try setting the 'txiindexescapeisbackslash' flag by
+You could also try setting the 'txiindexescapeisbackslash' flag by
running a command like
-'texi2dvi -t "@set txiindexescapeisbackslash" \jobname.texi'. If you do
+'texi2dvi -t "@set txiindexescapeisbackslash" \jobname.texi'. If you do
this, Texinfo will try to use index files in the old format.
-If you continue to have problems, deleting the index files and starting again
+If you continue to have problems, deleting the index files and starting again
might help (with 'rm \jobname.?? \jobname.??s')%
}%
\else
@@ -5579,7 +5577,7 @@
% bottom of a column to reduce an increase in inter-line spacing.
\nobreak
\vskip 0pt plus 5\baselineskip
- \penalty -300
+ \penalty -300
\vskip 0pt plus -5\baselineskip
%
% Typeset the initial. Making this add up to a whole number of
@@ -5695,7 +5693,7 @@
\advance\dimen at ii by 1\dimen at i
\ifdim\wd\boxA > \dimen at ii % If the entry doesn't fit in one line
\ifdim\dimen@ > 0.8\dimen at ii % due to long index text
- % Try to split the text roughly evenly. \dimen@ will be the length of
+ % Try to split the text roughly evenly. \dimen@ will be the length of
% the first line.
\dimen@ = 0.7\dimen@
\dimen at ii = \hsize
@@ -5903,7 +5901,7 @@
\newbox\balancedcolumns
\setbox\balancedcolumns=\vbox{shouldnt see this}%
%
-% Only called for the last of the double column material. \doublecolumnout
+% Only called for the last of the double column material. \doublecolumnout
% does the others.
\def\balancecolumns{%
\setbox0 = \vbox{\unvbox\PAGE}% like \box255 but more efficient, see p.120.
@@ -5931,7 +5929,7 @@
}%
% Now the left column is in box 1, and the right column in box 3.
%
- % Check whether the left column has come out higher than the page itself.
+ % Check whether the left column has come out higher than the page itself.
% (Note that we have doubled \vsize for the double columns, so
% the actual height of the page is 0.5\vsize).
\ifdim2\ht1>\vsize
@@ -6228,7 +6226,7 @@
\let\top\unnumbered
% Sections.
-%
+%
\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
\def\seczzz#1{%
\global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1
@@ -6251,7 +6249,7 @@
}
% Subsections.
-%
+%
% normally calls numberedsubseczzz:
\outer\parseargdef\numberedsubsec{\numhead2{#1}}
\def\numberedsubseczzz#1{%
@@ -6276,7 +6274,7 @@
}
% Subsubsections.
-%
+%
% normally numberedsubsubseczzz:
\outer\parseargdef\numberedsubsubsec{\numhead3{#1}}
\def\numberedsubsubseczzz#1{%
@@ -7342,7 +7340,7 @@
% @indentedblock is like @quotation, but indents only on the left and
% has no optional argument.
-%
+%
\makedispenvdef{indentedblock}{\indentedblockstart}
%
\def\indentedblockstart{%
@@ -7592,6 +7590,7 @@
%
\def\printdefunline#1#2{%
\begingroup
+ \plainfrenchspacing
% call \deffnheader:
#1#2 \endheader
% common ending:
@@ -7639,7 +7638,7 @@
% @deftypefnnewline on|off says whether the return type of typed functions
% are printed on their own line. This affects @deftypefn, @deftypefun,
% @deftypeop, and @deftypemethod.
-%
+%
\parseargdef\deftypefnnewline{%
\def\temp{#1}%
\ifx\temp\onword
@@ -7658,8 +7657,8 @@
% \dosubind {index}{topic}{subtopic}
%
% If SUBTOPIC is present, precede it with a space, and call \doind.
-% (At some time during the 20th century, this made a two-level entry in an
-% index such as the operation index. Nobody seemed to notice the change in
+% (At some time during the 20th century, this made a two-level entry in an
+% index such as the operation index. Nobody seemed to notice the change in
% behaviour though.)
\def\dosubind#1#2#3{%
\def\thirdarg{#3}%
@@ -7834,7 +7833,7 @@
\tclose{\temp}% typeset the return type
\ifrettypeownline
% put return type on its own line; prohibit line break following:
- \hfil\vadjust{\nobreak}\break
+ \hfil\vadjust{\nobreak}\break
\else
\space % type on same line, so just followed by a space
\fi
@@ -7988,7 +7987,7 @@
\scantokens{#1 at comment}%
%
% The \comment is to remove the \newlinechar added by \scantokens, and
- % can be noticed by \parsearg. Note \c isn't used because this means cedilla
+ % can be noticed by \parsearg. Note \c isn't used because this means cedilla
% in math mode.
}
@@ -8194,7 +8193,7 @@
% list to some hook where the argument is to be expanded. If there are
% less than 10 arguments that hook is to be replaced by ##N where N
% is the position in that list, that is to say the macro arguments are to be
-% defined `a la TeX in the macro body.
+% defined `a la TeX in the macro body.
%
% That gets used by \mbodybackslash (above).
%
@@ -8228,8 +8227,8 @@
%
% Read recursive and nonrecursive macro bodies. (They're different since
% rec and nonrec macros end differently.)
-%
-% We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro
+%
+% We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro
% body to be transformed.
% Set \macrobody to the body of the macro, and call \defmacro.
%
@@ -8263,7 +8262,7 @@
% twice the \macarg.BLAH macros does not cost too much processing power.
\def\parsemmanyargdef@@#1,{%
\if#1;\let\next=\relax
- \else
+ \else
\let\next=\parsemmanyargdef@@
\edef\tempb{\eatspaces{#1}}%
\expandafter\def\expandafter\tempa
@@ -8348,7 +8347,7 @@
% Replace arguments by their values in the macro body, and place the result
% in macro \@tempa.
-%
+%
\def\macvalstoargs@{%
% To do this we use the property that token registers that are \the'ed
% within an \edef expand only once. So we are going to place all argument
@@ -8372,9 +8371,9 @@
\expandafter\def\expandafter\@tempa\expandafter{\@tempc}%
}
-% Define the named-macro outside of this group and then close this group.
-%
-\def\macargexpandinbody@{%
+% Define the named-macro outside of this group and then close this group.
+%
+\def\macargexpandinbody@{%
\expandafter
\endgroup
\macargdeflist@
@@ -8412,7 +8411,7 @@
}
% Trailing missing arguments are set to empty.
-%
+%
\def\setemptyargvalues@{%
\ifx\paramlist\nilm@
\let\next\macargexpandinbody@
@@ -8489,7 +8488,7 @@
\else % at most 9
\ifnum\paramno<10\relax
% @MACNAME sets the context for reading the macro argument
- % @MACNAME@@ gets the argument, processes backslashes and appends a
+ % @MACNAME@@ gets the argument, processes backslashes and appends a
% comma.
% @MACNAME@@@ removes braces surrounding the argument list.
% @MACNAME@@@@ scans the macro body with arguments substituted.
@@ -8533,11 +8532,11 @@
% Call #1 with a list of tokens #2, with any doubled backslashes in #2
% compressed to one.
%
-% This implementation works by expansion, and not execution (so we cannot use
-% \def or similar). This reduces the risk of this failing in contexts where
-% complete expansion is done with no execution (for example, in writing out to
+% This implementation works by expansion, and not execution (so we cannot use
+% \def or similar). This reduces the risk of this failing in contexts where
+% complete expansion is done with no execution (for example, in writing out to
% an auxiliary file for an index entry).
-%
+%
% State is kept in the input stream: the argument passed to
% @look_ahead, @gobble_and_check_finish and @add_segment is
%
@@ -8559,11 +8558,11 @@
% #3 - NEXT_TOKEN
% #4 used to look ahead
%
-% If the next token is not a backslash, process the rest of the argument;
+% If the next token is not a backslash, process the rest of the argument;
% otherwise, remove the next token.
@gdef at look_ahead#1!#2#3#4{%
@ifx#4\%
- @expandafter at gobble_and_check_finish
+ @expandafter at gobble_and_check_finish
@else
@expandafter at add_segment
@fi#1!{#2}#4#4%
@@ -8587,9 +8586,9 @@
% #3 - NEXT_TOKEN
% #4 is input stream until next backslash
%
-% Input stream is either at the start of the argument, or just after a
-% backslash sequence, either a lone backslash, or a doubled backslash.
-% NEXT_TOKEN contains the first token in the input stream: if it is \finish,
+% Input stream is either at the start of the argument, or just after a
+% backslash sequence, either a lone backslash, or a doubled backslash.
+% NEXT_TOKEN contains the first token in the input stream: if it is \finish,
% finish; otherwise, append to ARG_RESULT the segment of the argument up until
% the next backslash. PENDING_BACKSLASH contains a backslash to represent
% a backslash just before the start of the input stream that has not been
@@ -8601,13 +8600,13 @@
% append the pending backslash to the result, followed by the next segment
@expandafter at is_fi@look_ahead#1#2#4!{\}@fi
% this @fi is discarded by @look_ahead.
- % we can't get rid of it with \expandafter because we don't know how
+ % we can't get rid of it with \expandafter because we don't know how
% long #4 is.
}
% #1 - THE_MACRO
% #2 - ARG_RESULT
-% #3 discards the res of the conditional in @add_segment, and @is_fi ends the
+% #3 discards the res of the conditional in @add_segment, and @is_fi ends the
% conditional.
@gdef at call_the_macro#1#2!#3 at fi{@is_fi #1{#2}}
@@ -8619,7 +8618,7 @@
% for reading the argument (slightly different in the two cases). Then,
% to read the argument, in the whole-line case, it then calls the regular
% \parsearg MAC; in the lbrace case, it calls \passargtomacro MAC.
-%
+%
\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
\def\braceorlinexxx{%
\ifx\nchar\bgroup
@@ -8673,7 +8672,7 @@
% Used so that the @top node doesn't have to be wrapped in an @ifnottex
% conditional.
-% \doignore goes to more effort to skip nested conditionals but we don't need
+% \doignore goes to more effort to skip nested conditionals but we don't need
% that here.
\def\omittopnode{%
\ifx\lastnode\wordTop
@@ -8681,7 +8680,7 @@
}
\def\wordTop{Top}
-% Until the next @node or @bye command, divert output to a box that is not
+% Until the next @node or @bye command, divert output to a box that is not
% output.
\def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}%
\ignorenodebye
@@ -8748,7 +8747,7 @@
% automatically in xrefs, if the third arg is not explicitly specified.
% This was provided as a "secret" @set xref-automatic-section-title
% variable, now it's official.
-%
+%
\parseargdef\xrefautomaticsectiontitle{%
\def\temp{#1}%
\ifx\temp\onword
@@ -8764,7 +8763,7 @@
\fi\fi
}
-%
+%
% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is
% the node name, #2 the name of the Info cross-reference, #3 the printed
% node name, #4 the name of the Info file, #5 the name of the printed
@@ -8917,7 +8916,7 @@
\fi
\else
% node/anchor (non-float) references.
- %
+ %
% If we use \unhbox to print the node names, TeX does not insert
% empty discretionaries after hyphens, which means that it will not
% find a line break at a hyphen in a node names. Since some manuals
@@ -8924,10 +8923,10 @@
% are best written with fairly long node names, containing hyphens,
% this is a loss. Therefore, we give the text of the node name
% again, so it is as if TeX is seeing it for the first time.
- %
+ %
\ifdim \wd\printedmanualbox > 0pt
% Cross-manual reference with a printed manual name.
- %
+ %
\crossmanualxref{\cite{\printedmanual\unskip}}%
%
\else\ifdim \wd\infofilenamebox > 0pt
@@ -8934,7 +8933,7 @@
% Cross-manual reference with only an info filename (arg 4), no
% printed manual name (arg 5). This is essentially the same as
% the case above; we output the filename, since we have nothing else.
- %
+ %
\crossmanualxref{\code{\infofilename\unskip}}%
%
\else
@@ -8970,20 +8969,20 @@
\endgroup}
% Output a cross-manual xref to #1. Used just above (twice).
-%
+%
% Only include the text "Section ``foo'' in" if the foo is neither
% missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply
% "see The Foo Manual", the idea being to refer to the whole manual.
-%
+%
% But, this being TeX, we can't easily compare our node name against the
% string "Top" while ignoring the possible spaces before and after in
% the input. By adding the arbitrary 7sp below, we make it much less
% likely that a real node name would have the same width as "Top" (e.g.,
% in a monospaced font). Hopefully it will never happen in practice.
-%
+%
% For the same basic reason, we retypeset the "Top" at every
% reference, since the current font is indeterminate.
-%
+%
\def\crossmanualxref#1{%
\setbox\toprefbox = \hbox{Top\kern7sp}%
\setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
@@ -9060,9 +9059,9 @@
\fi
}
-% This is the macro invoked by entries in the aux file. Define a control
-% sequence for a cross-reference target (we prepend XR to the control sequence
-% name to avoid collisions). The value is the page number. If this is a float
+% This is the macro invoked by entries in the aux file. Define a control
+% sequence for a cross-reference target (we prepend XR to the control sequence
+% name to avoid collisions). The value is the page number. If this is a float
% type, we have more work to do.
%
\def\xrdef#1#2{%
@@ -9078,10 +9077,10 @@
\bgroup
\expandafter\gdef\csname XR\safexrefname\endcsname{#2}%
\egroup
- % We put the \gdef inside a group to avoid the definitions building up on
- % TeX's save stack, which can cause it to run out of space for aux files with
+ % We put the \gdef inside a group to avoid the definitions building up on
+ % TeX's save stack, which can cause it to run out of space for aux files with
% thousands of lines. \gdef doesn't use the save stack, but \csname does
- % when it defines an unknown control sequence as \relax.
+ % when it defines an unknown control sequence as \relax.
%
% Was that xref control sequence that we just defined for a float?
\expandafter\iffloat\csname XR\safexrefname\endcsname
@@ -9402,7 +9401,7 @@
\fi\fi
%
\ifimagevmode
- \nobreak\medskip
+ \medskip
% Usually we'll have text after the image which will insert
% \parskip glue, so insert it here too to equalize the space
% above and below.
@@ -9440,7 +9439,7 @@
%
\ifimagevmode
\medskip % space after a standalone image
- \fi
+ \fi
\ifx\centersub\centerV \egroup \fi
\endgroup}
@@ -10271,7 +10270,7 @@
\uppercase{.}
\endgroup
\else
- \errhelp = \EMsimple
+ \errhelp = \EMsimple
\errmessage{Unicode character U+#1 not supported, sorry}%
\fi
\else
@@ -10304,7 +10303,7 @@
\countUTFz = "#1\relax
\begingroup
\parseXMLCharref
-
+
% Give \u8:... its definition. The sequence of seven \expandafter's
% expands after the \gdef three times, e.g.
%
@@ -10316,7 +10315,7 @@
\expandafter\expandafter
\expandafter\expandafter
\expandafter\gdef \UTFviiiTmp{#2}%
- %
+ %
\expandafter\ifx\csname uni:#1\endcsname \relax \else
\message{Internal error, already defined: #1}%
\fi
@@ -10355,7 +10354,7 @@
\divide\countUTFz by 64
\countUTFy = \countUTFz % Save to be the future value of \countUTFz.
\multiply\countUTFz by 64
-
+
% \countUTFz is now \countUTFx with the last 5 bits cleared. Subtract
% in order to get the last five bits.
\advance\countUTFx by -\countUTFz
@@ -10390,7 +10389,7 @@
% U+0080..U+00FF = https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block)
% U+0100..U+017F = https://en.wikipedia.org/wiki/Latin_Extended-A
% U+0180..U+024F = https://en.wikipedia.org/wiki/Latin_Extended-B
-%
+%
% Many of our renditions are less than wonderful, and all the missing
% characters are available somewhere. Loading the necessary fonts
% awaits user request. We can't truly support Unicode without
@@ -11244,23 +11243,6 @@
\defbodyindent = .5cm
}}
-% Use @smallerbook to reset parameters for 6x9 trim size.
-% (Just testing, parameters still in flux.)
-\def\smallerbook{{\globaldefs = 1
- \parskip = 1.5pt plus 1pt
- \textleading = 12pt
- %
- \internalpagesizes{7.4in}{4.8in}%
- {-.2in}{-.4in}%
- {0pt}{14pt}%
- {9in}{6in}%
- %
- \lispnarrowing = 0.25in
- \tolerance = 700
- \contentsrightmargin = 0pt
- \defbodyindent = .4cm
-}}
-
% Use @afourpaper to print on European A4 paper.
\def\afourpaper{{\globaldefs = 1
\parskip = 3pt plus 2pt minus 1pt
@@ -11442,7 +11424,7 @@
\def\texinfochars{%
\let< = \activeless
\let> = \activegtr
- \let~ = \activetilde
+ \let~ = \activetilde
\let^ = \activehat
\setregularquotes
\let\b = \strong
@@ -11599,11 +11581,9 @@
@setregularquotes
@c Local variables:
- at c eval: (add-hook 'before-save-hook 'time-stamp)
+ at c eval: (add-hook 'before-save-hook 'time-stamp nil t)
+ at c time-stamp-pattern: "texinfoversion{%Y-%02m-%02d.%02H}"
@c page-delimiter: "^\\\\message\\|emacs-page"
- at c time-stamp-start: "def\\\\texinfoversion{"
- at c time-stamp-format: "%:y-%02m-%02d.%02H"
- at c time-stamp-end: "}"
@c End:
@c vim:sw=2:
Modified: branches/stable/source/src/build-aux/ylwrap
===================================================================
--- branches/stable/source/src/build-aux/ylwrap 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/build-aux/ylwrap 2022-03-01 02:03:00 UTC (rev 874)
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# Written by Tom Tromey <tromey at cygnus.com>.
#
Modified: branches/stable/source/src/configure
===================================================================
--- branches/stable/source/src/configure 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/configure 2022-03-01 02:03:00 UTC (rev 874)
@@ -1670,7 +1670,7 @@
--disable-euptex do not compile and install e-upTeX
--disable-euptex-synctex build e-upTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
- --enable-hitex compile and install HiTeX
+ --disable-hitex do not compile and install HiTeX
--disable-pdftex do not compile and install pdfTeX
--disable-pdftex-synctex build pdfTeX without SyncTeX support
--disable-luatex do not compile and install LuaTeX
@@ -5499,7 +5499,7 @@
yes | no) :
;; #(
*) :
- enable_hitex=no ;;
+ enable_hitex=yes ;;
esac
test "x$enable_web2c:$enable_hitex" = xyes:yes && {
@@ -26338,11 +26338,11 @@
test "x$srcdir" = x. || msg_compiling="$msg_compiling
from sources in $kpse_src"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
-** Configuration summary for $PACKAGE_STRING (2022/dev$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2022$with_banner_add):
$msg_compiling" >&5
printf "%s\n" "
-** Configuration summary for $PACKAGE_STRING (2022/dev$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2022$with_banner_add):
$msg_compiling" >&6; }
case $kpse_src$kpse_bld in
Modified: branches/stable/source/src/doc/ChangeLog
===================================================================
--- branches/stable/source/src/doc/ChangeLog 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/doc/ChangeLog 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,3 +1,18 @@
+2022-02-19 Karl Berry <karl at freefriends.org>
+
+ * tlbuild.texi (Prerequisites): C++11 required by HarfBuzz;
+ Python required by ICU tests.
+ (Build problems): move basic idea to "Removing C++11 dependency";
+ not worth its own section.
+ (Build one program): add subsubheadings; mention TEXMFROOT
+ and TEXMFCNF settings to run a program from the build tree.
+ (Build one engine): mention testing hints.
+
+2022-01-11 Karl Berry <karl at freefriends.org>
+
+ * tlbuild.texi (Prerequisites): mention use of GNU make $@ feature
+ wrt tangle-sh[.in], etc.
+
2021-07-06 Karl Berry <karl at tug.org>
* tlbuild.texi (Build one package, Build one engine): more
Modified: branches/stable/source/src/doc/tlbuild.info
===================================================================
--- branches/stable/source/src/doc/tlbuild.info 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/doc/tlbuild.info 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,9 +1,9 @@
-This is tlbuild.info, produced by makeinfo version 6.8 from
+This is tlbuild.info, produced by makeinfo version 5.1 from
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
@@ -33,7 +33,7 @@
File: tlbuild.info, Node: Top, Next: Introduction, Up: (dir)
-Building TeX Live (2021)
+Building TeX Live (2022)
************************
For an overview of this manual, *note Introduction::.
@@ -59,7 +59,7 @@
1 Introduction
**************
-This manual (dated September 2021) corresponds to the TeX Live 2021
+This manual (dated February 2022) corresponds to the TeX Live 2022
release.
This manual is aimed at system installers and programmers, and
@@ -159,32 +159,41 @@
***************
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'
-environment variable to whatever is necessary.
+the TL source tree, requires C and C++11 compilers, GNU 'make', and
+Python.
- 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'.
+ * If 'make' from your 'PATH' is not GNU 'make', you can set the
+ 'MAKE' environment variable to whatever is necessary.
- A C++11 compiler is similarly required because of the third-party
-library ICU; the program 'dvisvgm' also requires C++11. It is possible
-to build everything else with older compilers, but you have to remove
-the C++11-dependent sources. *Note Build one package::.
+ GNU 'make' is required only because of third-party libraries,
+ 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
+ libraries ICU and HarfBuzz (at least); the program 'dvisvgm' also
+ requires C++11. It is possible to build what remains with older
+ compilers, but you have to remove the C++11-dependent sources.
+ *Note Build one package::.
+
+ * Python is required by ICU tests. (If you know how to disable these
+ tests and thus eliminate the requirement, please write.)
+
A few programs in the tree have additional requirements:
'web2c'
- requires 'perl' for some tests run by 'make check'.
+ requires 'perl' for some tests run by 'make check'. Incidentally,
+ the TeX Live installer ('install-tl') and manager ('tlmgr') are
+ also written in Perl, but this does not matter for compiling the
+ sources.
'xdvik'
'xpdfopen'
- require X11 headers and libraries, typically in "development"
+ require X11 headers and libraries, typically in devel(opment)
packages that are not installed by default.
'xetex'
requires 'fontconfig' (again both headers and library), or, for
- MacOSX only, the 'ApplicationServices' and 'Cocoa' frameworks.
+ MacOS only, the 'ApplicationServices' and 'Cocoa' frameworks.
'xindy'
requires GNU 'clisp', 'libsigsegv', and 'libiconv'; additionally,
@@ -213,9 +222,17 @@
If you haven't modified any source files, and infrastructure tools
such as 'autoconf' or 'makeinfo' are still being run, check your
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.
+Subversion configuration (*note Build system tools::). No
+infrastructure tools are needed to do a normal build (barring bugs).
+ ---------- 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 laborious editing, but since there's no way
+to avoid GNU 'make' for builds of the entire tree, it does not seem
+worth the trouble.
+
File: tlbuild.info, Node: Building, Next: Installing, Prev: Prerequisites, Up: Top
@@ -240,7 +257,6 @@
* Menu:
* Build iteration:: What 'configure' and 'make' do in TL.
-* Build problems:: If the build fails.
* Build in parallel:: Simultaneous 'make' processes.
* Build distribution:: Making a distribution tarball.
* Build one package:: Example of working on just one program.
@@ -248,7 +264,7 @@
* Cross compilation:: Building on host X for target Y.
-File: tlbuild.info, Node: Build iteration, Next: Build problems, Up: Building
+File: tlbuild.info, Node: Build iteration, Next: Build in parallel, Up: Building
4.1 Build iteration
===================
@@ -273,21 +289,9 @@
done.
-File: tlbuild.info, Node: Build problems, Next: Build in parallel, Prev: Build iteration, Up: Building
+File: tlbuild.info, Node: Build in parallel, Next: Build distribution, Prev: Build iteration, Up: Building
-4.2 Build problems
-==================
-
-If configuring or building a module fails, you should first try to find
-and fix the problem. Failing that, a possible workaround is to remove
-the subdirectory for that module from the build tree (so 'configure'
-won't try to run there, and finally rerun the top level 'make' (or
-'./Build' '--no-clean').
-
-
-File: tlbuild.info, Node: Build in parallel, Next: Build distribution, Prev: Build problems, Up: Building
-
-4.3 Build in parallel
+4.2 Build in parallel
=====================
The TL build system carefully formulates dependencies as well as 'make'
@@ -302,7 +306,7 @@
File: tlbuild.info, Node: Build distribution, Next: Build one package, Prev: Build in parallel, Up: Building
-4.4 Build distribution
+4.3 Build distribution
======================
Running 'make dist' at the top level creates a tarball
@@ -318,19 +322,19 @@
File: tlbuild.info, Node: Build one package, Next: Build one engine, Prev: Build distribution, Up: Building
-4.5 Build one package
+4.4 Build one package
=====================
To build one package, the basic idea is to use the 'configure' option
-'--disable-all-pkgs' (*note --disable-all-pkgs::). Then all program and
-library modules are configured but none are made. However, the
+'--disable-all-pkgs' (*note '--disable-all-pkgs'::). Then all program
+and library modules are configured but none are made. However, the
'Makefile's still contain all build rules and dependencies and can be
invoked to build an individual program or library, first building any
required libraries.
Here is an example from start to finish for working on 'dvipdfm-x'.
-(Unfortunately, this does not suffice for building the TeX engines; see
-the next section.)
+Unfortunately, this does not suffice for building the TeX engines; see
+the next section.
mkdir mydir && cd mydir # new working directory
@@ -348,10 +352,17 @@
# Do the make:
make >&outm || echo fail
- # Test:
+ # Run the tests:
cd texk/dvipdfm-x
make check
+ # Run the new binary in the buil tree, finding support files
+ # in a separate tree for a TeX Live release YYYY
+ # (Bourne shell syntax):
+ TEXMFROOT=/usr/local/texlive/YYYY \
+ TEXMFCNF=$TEXMFROOT/texmf-dist/web2c \
+ ./xdvipdfmx ...
+
Then you can modify source files in 'mydir/texk/dvipdfm-x' and rerun
'make' in 'mydir/Work/texk/dvipdfm-x' to rebuild; that build directory
is where the binary ends up and where you can run a debugger, etc.
@@ -368,10 +379,13 @@
idea to run 'make check' after making any changes, to ensure that
whatever tests have been written still pass.
- Finally, the above retrieves the entire TL source tree (several
-hundred megabytes). It is natural to ask if this is really necessary.
-Strictly speaking, the answer is no, but it is vastly more convenient to
-do so. If you cut down the source tree, you must also give additional
+Reducing source download size
+.............................
+
+The above retrieves the entire TL source tree (several hundred
+megabytes). It is natural to ask if this is really necessary. Strictly
+speaking, the answer is no, but it is vastly more convenient to do so.
+If you cut down the source tree, you must also give additional
'configure' flags to individually disable using system versions of
libraries, or the intricacies of the dependencies (such as 'teckit'
requiring 'zlib') will have undesired side effects. For an example of
@@ -379,7 +393,18 @@
development source (details at <http://pdftex.org>), which is indeed
such a cut-down TL source tree.
- Some libraries and programs require C++11; one such is XeTeX. If you
+GCC used by default
+...................
+
+By default, the 'gcc' compilers will be used if present; otherwise,
+individual packages may use something different. You can explicitly
+specify the compilers to be used with the environment variables 'CC',
+'CXX', and 'OBJCXX'.
+
+Removing C+11 dependency
+........................
+
+Some libraries and programs require C++11; one such is XeTeX. If you
want to build with an older compiler lacking such support, you need to
(re)move those source directories; unfortunately, specifying '--disable'
for them does not suffice. It's also necessary to specify
@@ -389,22 +414,28 @@
rm -rf libs/icu libs/graphite2 texk/dvisvgm texk/web2c/xetexdir
Also, even with '--disable-all-pkgs', dependencies are (currently)
-checked. One notable case: if a (non-MacOSX) system does not have
+checked. One notable case: if a (non-MacOS) system does not have
'fontconfig', XeTeX cannot be built (*note Prerequisites::), and
'configure' will terminate even with '--disable-xetex'. To proceed
without such dependencies, specify '--enable-missing' also.
+ As of 2022, HarfBuzz also requires C++11. Therefore even more would
+have to be disabled and removed, notably including 'luahbtex', the
+standard engine used for LuaLaTeX. Removing that would not be
+acceptable for builds intended for distribution; but perhaps for testing
+the above information could still be useful.
+
+ In general, the TL 'configure' will run in all directories.
+Therefore a general workaround for build problems is to remove failing
+directories from the tree, and also specify the relevant '--disable-...'
+option(s).
+
Patches to improve all this would be most welcome.
- By default, the 'gcc' compilers will be used if present; otherwise,
-individual packages may use something different. You can explicitly
-specify the compilers to be used with the environment variables 'CC',
-'CXX', and 'OBJCXX'.
-
File: tlbuild.info, Node: Build one engine, Next: Cross compilation, Prev: Build one package, Up: Building
-4.6 Build one engine
+4.5 Build one engine
====================
Unfortunately, there is one common case where the steps in the preceding
@@ -440,13 +471,34 @@
Then it is necessary to again specify the target engine ('tex', in
the above) in the 'make'.
- All this is somewhat unfortunate. We hope to improve the situation
-in the future. Patches are welcome.
+ All these complications are rather unfortunate. Patches are welcome.
+Testing one engine
+..................
+
+To run only the tests for a given engine, say 'hitex':
+
+ make -C $ww check SUBDIRS=. TESTS='$(hitex_tests)'
+
+where '$ww' is the web2c build directory, that is,
+'ww=/wherever/Build/source/Work/texk/web2c'.
+
+ It's also possible to run individual tests the same way, using the
+test name exactly as specified in the '.am' file:
+
+ make -C $ww check SUBDIRS=. TESTS=hitexdir/tests/hello.test
+
+ If you get tired of looking at the 'Entering'/'Leaving directory'
+lines, you can add the (GNU) make option '--no-print-dir'.
+
+ You may find it useful to put lengthy incantations like this into a
+trivial shell script with a short name (say, 'hitst'). Then you just
+run 'hitst' and edit the file when necessary to change things around.
+
File: tlbuild.info, Node: Cross compilation, Prev: Build one engine, Up: Building
-4.7 Cross compilation
+4.6 Cross compilation
=====================
In a cross compilation a "build" system is used to create binaries to be
@@ -464,7 +516,7 @@
(*note (autoconf)Hosts and Cross-Compilation::).
In order to build, e.g., 32-bit binaries with 'clang' on a 64-bit
-MacOSX system one could use:
+MacOS system one could use:
TL_BUILD_ENV="CC='clang -arch i386' \
CXX='clang++ -arch i386' \
@@ -479,7 +531,7 @@
File: tlbuild.info, Node: Cross configuring, Next: Cross problems, Up: Cross compilation
-4.7.1 Cross configuring
+4.6.1 Cross configuring
-----------------------
In a standard cross compilation, binaries for the host system cannot
@@ -528,7 +580,7 @@
File: tlbuild.info, Node: Cross problems, Prev: Cross configuring, Up: Cross compilation
-4.7.2 Cross problems
+4.6.2 Cross problems
--------------------
The fact that binaries for the host system cannot be executed on the
@@ -1057,13 +1109,13 @@
* Menu:
-* png library:: 'libs/libpng'
-* zlib library:: 'libs/zlib'
-* freetype library:: 'libs/freetype2'
-* kpathsea library:: 'texk/kpathsea'
+* 'png' library:: 'libs/libpng'
+* 'zlib' library:: 'libs/zlib'
+* 'freetype' library:: 'libs/freetype2'
+* 'kpathsea' library:: 'texk/kpathsea'
-File: tlbuild.info, Node: png library, Next: zlib library, Up: Library modules
+File: tlbuild.info, Node: 'png' library, Next: 'zlib' library, Up: Library modules
6.4.1 The 'png' library in 'libs/libpng'
----------------------------------------
@@ -1119,7 +1171,7 @@
flags required for the system library.
-File: tlbuild.info, Node: zlib library, Next: freetype library, Prev: png library, Up: Library modules
+File: tlbuild.info, Node: 'zlib' library, Next: 'freetype' library, Prev: 'png' library, Up: Library modules
6.4.2 The 'zlib' library in 'libs/zlib'
---------------------------------------
@@ -1131,7 +1183,7 @@
locations of the 'zlib' headers and/or library.
-File: tlbuild.info, Node: freetype library, Next: kpathsea library, Prev: zlib library, Up: Library modules
+File: tlbuild.info, Node: 'freetype' library, Next: 'kpathsea' library, Prev: 'zlib' library, Up: Library modules
6.4.3 The 'freetype' library in 'libs/freetype2'
------------------------------------------------
@@ -1147,7 +1199,7 @@
'freetype-config'.
-File: tlbuild.info, Node: kpathsea library, Prev: freetype library, Up: Library modules
+File: tlbuild.info, Node: 'kpathsea' library, Prev: 'freetype' library, Up: Library modules
6.4.4 The 'kpathsea' library in 'texk/kpathsea'
-----------------------------------------------
@@ -1185,13 +1237,13 @@
* Menu:
-* t1utils package:: 'utils/t1utils'
-* xindy package:: 'utils/xindy'
-* xdvik package:: 'texk/xdvik'
-* asymptote:: 'utils/asymptote'
+* 't1utils' package:: 'utils/t1utils'
+* 'xindy' package:: 'utils/xindy'
+* 'xdvik' package:: 'texk/xdvik'
+* 'asymptote':: 'utils/asymptote'
-File: tlbuild.info, Node: t1utils package, Next: xindy package, Up: Program modules
+File: tlbuild.info, Node: 't1utils' package, Next: 'xindy' package, Up: Program modules
6.5.1 The 't1utils' package in 'utils/t1utils'
----------------------------------------------
@@ -1207,7 +1259,7 @@
configure option '--disable-t1utils'.
-File: tlbuild.info, Node: xindy package, Next: xdvik package, Prev: t1utils package, Up: Program modules
+File: tlbuild.info, Node: 'xindy' package, Next: 'xdvik' package, Prev: 't1utils' package, Up: Program modules
6.5.2 The 'xindy' package in 'utils/xindy'
------------------------------------------
@@ -1233,7 +1285,7 @@
included by 'configure.ac'.
-File: tlbuild.info, Node: xdvik package, Next: asymptote, Prev: xindy package, Up: Program modules
+File: tlbuild.info, Node: 'xdvik' package, Next: 'asymptote', Prev: 'xindy' package, Up: Program modules
6.5.3 The 'xdvik' package in 'texk/xdvik'
-----------------------------------------
@@ -1258,7 +1310,7 @@
also seen at the top level.
-File: tlbuild.info, Node: asymptote, Prev: xdvik package, Up: Program modules
+File: tlbuild.info, Node: 'asymptote', Prev: 'xdvik' package, Up: Program modules
6.5.4 The subdirectory 'utils/asymptote'
----------------------------------------
@@ -1538,21 +1590,21 @@
* Menu:
-* --disable-native-texlive-build::
-* --prefix --bindir ...::
-* --disable-largefile::
-* --disable-missing::
-* --enable-compiler-warnings=LEVEL::
-* --enable-cxx-runtime-hack::
-* --enable-maintainer-mode::
-* --enable-multiplatform::
-* --enable-shared::
-* --enable-silent-rules::
-* --without-ln-s::
-* --without-x::
+* '--disable-native-texlive-build'::
+* '--prefix' '--bindir' ...::
+* '--disable-largefile'::
+* '--disable-missing'::
+* '--enable-compiler-warnings='LEVEL::
+* '--enable-cxx-runtime-hack'::
+* '--enable-maintainer-mode'::
+* '--enable-multiplatform'::
+* '--enable-shared'::
+* '--enable-silent-rules'::
+* '--without-ln-s'::
+* '--without-x'::
-File: tlbuild.info, Node: --disable-native-texlive-build, Next: --prefix --bindir ..., Up: Global configure options
+File: tlbuild.info, Node: '--disable-native-texlive-build', Next: '--prefix' '--bindir' ..., Up: Global configure options
7.1.1 '--disable-native-texlive-build'
--------------------------------------
@@ -1573,7 +1625,7 @@
TL-specific adaptations, such as installation paths.
-File: tlbuild.info, Node: --prefix --bindir ..., Next: --disable-largefile, Prev: --disable-native-texlive-build, Up: Global configure options
+File: tlbuild.info, Node: '--prefix' '--bindir' ..., Next: '--disable-largefile', Prev: '--disable-native-texlive-build', Up: Global configure options
7.1.2 '--prefix', '--bindir', ...
---------------------------------
@@ -1586,7 +1638,7 @@
location: (automake)Staged Installs.).
-File: tlbuild.info, Node: --disable-largefile, Next: --disable-missing, Prev: --prefix --bindir ..., Up: Global configure options
+File: tlbuild.info, Node: '--disable-largefile', Next: '--disable-missing', Prev: '--prefix' '--bindir' ..., Up: Global configure options
7.1.3 '--disable-largefile'
---------------------------
@@ -1600,7 +1652,7 @@
'pdftex' or PostScript files created by 'dvips'.
-File: tlbuild.info, Node: --disable-missing, Next: --enable-compiler-warnings=LEVEL, Prev: --disable-largefile, Up: Global configure options
+File: tlbuild.info, Node: '--disable-missing', Next: '--enable-compiler-warnings='LEVEL, Prev: '--disable-largefile', Up: Global configure options
7.1.4 '--disable-missing'
-------------------------
@@ -1610,7 +1662,7 @@
when figuring out a specific (sub)set of modules to enable.
-File: tlbuild.info, Node: --enable-compiler-warnings=LEVEL, Next: --enable-cxx-runtime-hack, Prev: --disable-missing, Up: Global configure options
+File: tlbuild.info, Node: '--enable-compiler-warnings='LEVEL, Next: '--enable-cxx-runtime-hack', Prev: '--disable-missing', Up: Global configure options
7.1.5 '--enable-compiler-warnings='LEVEL
----------------------------------------
@@ -1623,7 +1675,7 @@
At present, these warning flags assume options from the GNU compilers.
-File: tlbuild.info, Node: --enable-cxx-runtime-hack, Next: --enable-maintainer-mode, Prev: --enable-compiler-warnings=LEVEL, Up: Global configure options
+File: tlbuild.info, Node: '--enable-cxx-runtime-hack', Next: '--enable-maintainer-mode', Prev: '--enable-compiler-warnings='LEVEL, Up: Global configure options
7.1.6 '--enable-cxx-runtime-hack'
---------------------------------
@@ -1633,7 +1685,7 @@
resulting binary. *Note Macros for compilers::.
-File: tlbuild.info, Node: --enable-maintainer-mode, Next: --enable-multiplatform, Prev: --enable-cxx-runtime-hack, Up: Global configure options
+File: tlbuild.info, Node: '--enable-maintainer-mode', Next: '--enable-multiplatform', Prev: '--enable-cxx-runtime-hack', Up: Global configure options
7.1.7 '--enable-maintainer-mode'
--------------------------------
@@ -1645,7 +1697,7 @@
'AM_MAINTAINER_MODE': (automake)maintainer-mode.
-File: tlbuild.info, Node: --enable-multiplatform, Next: --enable-shared, Prev: --enable-maintainer-mode, Up: Global configure options
+File: tlbuild.info, Node: '--enable-multiplatform', Next: '--enable-shared', Prev: '--enable-maintainer-mode', Up: Global configure options
7.1.8 '--enable-multiplatform'
------------------------------
@@ -1658,7 +1710,7 @@
subdirectories.
-File: tlbuild.info, Node: --enable-shared, Next: --enable-silent-rules, Prev: --enable-multiplatform, Up: Global configure options
+File: tlbuild.info, Node: '--enable-shared', Next: '--enable-silent-rules', Prev: '--enable-multiplatform', Up: Global configure options
7.1.9 '--enable-shared'
-----------------------
@@ -1668,7 +1720,7 @@
'--disable-native-texlive-build' must also be specified).
-File: tlbuild.info, Node: --enable-silent-rules, Next: --without-ln-s, Prev: --enable-shared, Up: Global configure options
+File: tlbuild.info, Node: '--enable-silent-rules', Next: '--without-ln-s', Prev: '--enable-shared', Up: Global configure options
7.1.10 '--enable-silent-rules'
------------------------------
@@ -1679,7 +1731,7 @@
'V=0' to get less, regardless of this option.
-File: tlbuild.info, Node: --without-ln-s, Next: --without-x, Prev: --enable-silent-rules, Up: Global configure options
+File: tlbuild.info, Node: '--without-ln-s', Next: '--without-x', Prev: '--enable-silent-rules', Up: Global configure options
7.1.11 '--without-ln-s'
-----------------------
@@ -1689,7 +1741,7 @@
anything useful, and might fail.
-File: tlbuild.info, Node: --without-x, Prev: --without-ln-s, Up: Global configure options
+File: tlbuild.info, Node: '--without-x', Prev: '--without-ln-s', Up: Global configure options
7.1.12 '--without-x'
--------------------
@@ -1706,18 +1758,18 @@
* Menu:
-* --enable-PROG --disable-PROG::
-* --disable-all-pkgs::
-* Configure options for texk/web2c::
-* Configure options for texk/bibtex-x::
-* Configure options for texk/dvipdfm-x::
-* Configure options for texk/dvisvgm::
-* Configure options for texk/texlive::
-* Configure options for texk/xdvik::
-* Configure options for utils/xindy::
+* '--enable-PROG' '--disable-PROG'::
+* '--disable-all-pkgs'::
+* Configure options for 'texk/web2c'::
+* Configure options for 'texk/bibtex-x'::
+* Configure options for 'texk/dvipdfm-x'::
+* Configure options for 'texk/dvisvgm'::
+* Configure options for 'texk/texlive'::
+* Configure options for 'texk/xdvik'::
+* Configure options for 'utils/xindy'::
-File: tlbuild.info, Node: --enable-PROG --disable-PROG, Next: --disable-all-pkgs, Up: Program-specific configure options
+File: tlbuild.info, Node: '--enable-PROG' '--disable-PROG', Next: '--disable-all-pkgs', Up: Program-specific configure options
7.2.1 '--enable-PROG', '--disable-PROG'
---------------------------------------
@@ -1725,7 +1777,7 @@
Do or do not build and install the program(s) of module 'PROG'.
-File: tlbuild.info, Node: --disable-all-pkgs, Next: Configure options for texk/web2c, Prev: --enable-PROG --disable-PROG, Up: Program-specific configure options
+File: tlbuild.info, Node: '--disable-all-pkgs', Next: Configure options for 'texk/web2c', Prev: '--enable-PROG' '--disable-PROG', Up: Program-specific configure options
7.2.2 '--disable-all-pkgs'
--------------------------
@@ -1742,7 +1794,7 @@
fragment.
-File: tlbuild.info, Node: Configure options for texk/web2c, Next: Configure options for texk/bibtex-x, Prev: --disable-all-pkgs, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/web2c', Next: Configure options for 'texk/bibtex-x', Prev: '--disable-all-pkgs', Up: Program-specific configure options
7.2.3 Configure options for 'texk/web2c'
----------------------------------------
@@ -1809,7 +1861,7 @@
Do not build the 'SyncTeX' library and tool.
-File: tlbuild.info, Node: Configure options for texk/bibtex-x, Next: Configure options for texk/dvipdfm-x, Prev: Configure options for texk/web2c, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/bibtex-x', Next: Configure options for 'texk/dvipdfm-x', Prev: Configure options for 'texk/web2c', Up: Program-specific configure options
7.2.4 Configure options for 'texk/bibtex-x'
-------------------------------------------
@@ -1825,7 +1877,7 @@
libraries).
-File: tlbuild.info, Node: Configure options for texk/dvipdfm-x, Next: Configure options for texk/dvisvgm, Prev: Configure options for texk/bibtex-x, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/dvipdfm-x', Next: Configure options for 'texk/dvisvgm', Prev: Configure options for 'texk/bibtex-x', Up: Program-specific configure options
7.2.5 Configure options for 'texk/dvipdfm-x'
--------------------------------------------
@@ -1843,7 +1895,7 @@
Do not build the 'xdvipdfmx' program.
-File: tlbuild.info, Node: Configure options for texk/dvisvgm, Next: Configure options for texk/texlive, Prev: Configure options for texk/dvipdfm-x, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/dvisvgm', Next: Configure options for 'texk/texlive', Prev: Configure options for 'texk/dvipdfm-x', Up: Program-specific configure options
7.2.6 Configure options for 'texk/dvisvgm'
------------------------------------------
@@ -1863,7 +1915,7 @@
Specify non-standard locations of the Ghostscript headers and library.
-File: tlbuild.info, Node: Configure options for texk/texlive, Next: Configure options for texk/xdvik, Prev: Configure options for texk/dvisvgm, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/texlive', Next: Configure options for 'texk/xdvik', Prev: Configure options for 'texk/dvisvgm', Up: Program-specific configure options
7.2.7 Configure options for 'texk/texlive'
------------------------------------------
@@ -1873,7 +1925,7 @@
the TL scripts required to run 'texlinks'.
-File: tlbuild.info, Node: Configure options for texk/xdvik, Next: Configure options for utils/xindy, Prev: Configure options for texk/texlive, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/xdvik', Next: Configure options for 'utils/xindy', Prev: Configure options for 'texk/texlive', Up: Program-specific configure options
7.2.8 Configure options for 'texk/xdvik'
----------------------------------------
@@ -1890,7 +1942,7 @@
a native TL build).
-File: tlbuild.info, Node: Configure options for utils/xindy, Prev: Configure options for texk/xdvik, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'utils/xindy', Prev: Configure options for 'texk/xdvik', Up: Program-specific configure options
7.2.9 Configure options for 'utils/xindy'
-----------------------------------------
@@ -1936,10 +1988,10 @@
* Menu:
-* Configure options for kpathsea::
+* Configure options for 'kpathsea'::
-File: tlbuild.info, Node: Configure options for kpathsea, Up: Library-specific configure options
+File: tlbuild.info, Node: Configure options for 'kpathsea', Up: Library-specific configure options
7.3.1 Configure options for 'kpathsea'
--------------------------------------
@@ -1963,7 +2015,7 @@
(TFM file)
to generate the specified type of file dynamically. The default can be
-overridden by the user in any case (*note kpathsea library::).
+overridden by the user in any case (*note 'kpathsea' library::).
File: tlbuild.info, Node: Variables for configure, Prev: Library-specific configure options, Up: Configure options
@@ -5146,11 +5198,11 @@
* Menu:
-* tlmgr Machine-readable update and install output::
-* tlmgr Machine-readable option output::
+* tlmgr Machine-readable 'update' and 'install' output::
+* tlmgr Machine-readable 'option' output::
-File: tlbuild.info, Node: tlmgr Machine-readable update and install output, Next: tlmgr Machine-readable option output, Up: tlmgr MACHINE-READABLE OUTPUT
+File: tlbuild.info, Node: tlmgr Machine-readable 'update' and 'install' output, Next: tlmgr Machine-readable 'option' output, Up: tlmgr MACHINE-READABLE OUTPUT
B.12.1 Machine-readable 'update' and 'install' output
-----------------------------------------------------
@@ -5268,7 +5320,7 @@
The estimated total time.
-File: tlbuild.info, Node: tlmgr Machine-readable option output, Prev: tlmgr Machine-readable update and install output, Up: tlmgr MACHINE-READABLE OUTPUT
+File: tlbuild.info, Node: tlmgr Machine-readable 'option' output, Prev: tlmgr Machine-readable 'update' and 'install' output, Up: tlmgr MACHINE-READABLE OUTPUT
B.12.2 Machine-readable 'option' output
---------------------------------------
@@ -5389,570 +5441,604 @@
[index ]
* Menu:
-* --bindir configure option: --prefix --bindir ....
- (line 6)
-* --bindir configure option <1>: --enable-multiplatform.
- (line 6)
-* --build=HOST: Cross configuring. (line 6)
-* --disable-all-packages: Build one package. (line 6)
-* --disable-all-pkgs: --disable-all-pkgs. (line 6)
-* --disable-bibtex8: Configure options for texk/bibtex-x.
- (line 9)
-* --disable-bibtexu: Configure options for texk/bibtex-x.
- (line 12)
-* --disable-dump-share: Configure options for texk/web2c.
- (line 27)
-* --disable-dvipdfmx: Configure options for texk/dvipdfm-x.
- (line 12)
-* --disable-etex-synctex: Configure options for texk/web2c.
- (line 59)
-* --disable-ipc: Configure options for texk/web2c.
- (line 31)
-* --disable-largefile: --disable-largefile. (line 6)
-* --disable-linked-scripts: Configure options for texk/texlive.
- (line 6)
-* --disable-mf-nowin: Configure options for texk/web2c.
- (line 34)
-* --disable-missing: --disable-missing. (line 6)
-* --disable-native-texlive-build: --disable-native-texlive-build.
- (line 6)
-* --disable-PROG: --enable-PROG --disable-PROG.
- (line 6)
-* --disable-synctex: Configure options for texk/web2c.
- (line 64)
-* --disable-tex: Configure options for texk/web2c.
- (line 37)
-* --disable-web-progs: Configure options for texk/web2c.
- (line 41)
-* --disable-xdvipdfmx: Configure options for texk/dvipdfm-x.
- (line 15)
-* --enable-*win for Metafont window support: Configure options for texk/web2c.
- (line 55)
-* --enable-auto-core: Configure options for texk/web2c.
- (line 45)
-* --enable-compiler-warnings=LEVEL: --enable-compiler-warnings=LEVEL.
- (line 6)
-* --enable-cxx-runtime-hack: Macros for compilers. (line 29)
-* --enable-etex: Configure options for texk/web2c.
- (line 37)
-* --enable-libtool-hack: Configure options for texk/web2c.
- (line 50)
-* --enable-maintainer-mode: Build system tools. (line 28)
-* --enable-maintainer-mode <1>: --enable-maintainer-mode.
- (line 6)
-* --enable-missing to ignore dependencies: Build one package. (line 73)
-* --enable-mktextfm-default: kpathsea library. (line 18)
-* --enable-multiplatform: --enable-multiplatform.
- (line 6)
-* --enable-PROG: --enable-PROG --disable-PROG.
- (line 6)
-* --enable-shared: --enable-shared. (line 6)
-* --enable-silent-rules: --enable-silent-rules.
- (line 6)
-* --enable-tex-synctex: Configure options for texk/web2c.
- (line 59)
-* --enable-texlive-build: --disable-native-texlive-build.
- (line 15)
-* --enable-xi2-scrolling: Configure options for texk/xdvik.
- (line 13)
-* --enable-xindy-docs: Configure options for utils/xindy.
- (line 10)
-* --enable-xindy-rules: Configure options for utils/xindy.
- (line 6)
-* --host=HOST: Cross configuring. (line 6)
-* --libdir configure option: --enable-multiplatform.
- (line 6)
-* --no-clean Build option: Build problems. (line 6)
-* --prefix configure option: --prefix --bindir ....
- (line 6)
-* --with-banner-add=STR: Configure options for texk/web2c.
- (line 6)
-* --with-clisp-runtime=FILENAME: Configure options for utils/xindy.
- (line 14)
-* --with-editor=CMD: Configure options for texk/web2c.
- (line 11)
-* --with-fontconfig-includes=DIR: Configure options for texk/web2c.
- (line 16)
-* --with-fontconfig-libdir=DIR: Configure options for texk/web2c.
- (line 16)
-* --with-gs=FILENAME: Configure options for texk/xdvik.
- (line 6)
+* '$@' target in normal 'make' rules: Prerequisites. (line 13)
+* --bindir configure option: '--prefix' '--bindir' ....
+ (line 6)
+* --bindir configure option <1>: '--enable-multiplatform'.
+ (line 6)
+* --build=HOST: Cross configuring. (line 6)
+* --disable-all-packages: Build one package. (line 6)
+* --disable-all-pkgs: '--disable-all-pkgs'.
+ (line 6)
+* --disable-bibtex8: Configure options for 'texk/bibtex-x'.
+ (line 9)
+* --disable-bibtexu: Configure options for 'texk/bibtex-x'.
+ (line 12)
+* --disable-dump-share: Configure options for 'texk/web2c'.
+ (line 27)
+* --disable-dvipdfmx: Configure options for 'texk/dvipdfm-x'.
+ (line 12)
+* --disable-etex-synctex: Configure options for 'texk/web2c'.
+ (line 59)
+* --disable-ipc: Configure options for 'texk/web2c'.
+ (line 31)
+* --disable-largefile: '--disable-largefile'.
+ (line 6)
+* --disable-linked-scripts: Configure options for 'texk/texlive'.
+ (line 6)
+* --disable-mf-nowin: Configure options for 'texk/web2c'.
+ (line 34)
+* --disable-missing: '--disable-missing'. (line 6)
+* --disable-native-texlive-build: '--disable-native-texlive-build'.
+ (line 6)
+* --disable-PROG: '--enable-PROG' '--disable-PROG'.
+ (line 6)
+* --disable-synctex: Configure options for 'texk/web2c'.
+ (line 64)
+* --disable-tex: Configure options for 'texk/web2c'.
+ (line 37)
+* --disable-web-progs: Configure options for 'texk/web2c'.
+ (line 41)
+* --disable-xdvipdfmx: Configure options for 'texk/dvipdfm-x'.
+ (line 15)
+* --enable-*win for Metafont window support: Configure options for 'texk/web2c'.
+ (line 55)
+* --enable-auto-core: Configure options for 'texk/web2c'.
+ (line 45)
+* --enable-compiler-warnings=LEVEL: '--enable-compiler-warnings='LEVEL.
+ (line 6)
+* --enable-cxx-runtime-hack: Macros for compilers.
+ (line 29)
+* --enable-etex: Configure options for 'texk/web2c'.
+ (line 37)
+* --enable-libtool-hack: Configure options for 'texk/web2c'.
+ (line 50)
+* --enable-maintainer-mode: Build system tools. (line 28)
+* --enable-maintainer-mode <1>: '--enable-maintainer-mode'.
+ (line 6)
+* --enable-missing to ignore dependencies: Build one package. (line 94)
+* --enable-mktextfm-default: 'kpathsea' library. (line 18)
+* --enable-multiplatform: '--enable-multiplatform'.
+ (line 6)
+* --enable-PROG: '--enable-PROG' '--disable-PROG'.
+ (line 6)
+* --enable-shared: '--enable-shared'. (line 6)
+* --enable-silent-rules: '--enable-silent-rules'.
+ (line 6)
+* --enable-tex-synctex: Configure options for 'texk/web2c'.
+ (line 59)
+* --enable-texlive-build: '--disable-native-texlive-build'.
+ (line 15)
+* --enable-xi2-scrolling: Configure options for 'texk/xdvik'.
+ (line 13)
+* --enable-xindy-docs: Configure options for 'utils/xindy'.
+ (line 10)
+* --enable-xindy-rules: Configure options for 'utils/xindy'.
+ (line 6)
+* --host=HOST: Cross configuring. (line 6)
+* --libdir configure option: '--enable-multiplatform'.
+ (line 6)
+* --no-print-directory GNU make option: Build one engine. (line 56)
+* --prefix configure option: '--prefix' '--bindir' ....
+ (line 6)
+* --with-banner-add=STR: Configure options for 'texk/web2c'.
+ (line 6)
+* --with-clisp-runtime=FILENAME: Configure options for 'utils/xindy'.
+ (line 14)
+* --with-editor=CMD: Configure options for 'texk/web2c'.
+ (line 11)
+* --with-fontconfig-includes=DIR: Configure options for 'texk/web2c'.
+ (line 16)
+* --with-fontconfig-libdir=DIR: Configure options for 'texk/web2c'.
+ (line 16)
+* --with-gs=FILENAME: Configure options for 'texk/xdvik'.
+ (line 6)
* --with-LIB-includes=DIR, -libdir: Library-specific configure options.
- (line 16)
-* --with-libgs-includes, -libdir: Configure options for texk/dvisvgm.
- (line 17)
-* --with-system-kpathsea: kpathsea library. (line 13)
+ (line 16)
+* --with-libgs-includes, -libdir: Configure options for 'texk/dvisvgm'.
+ (line 17)
+* --with-system-kpathsea: 'kpathsea' library. (line 13)
* --with-system-LIB: Adding a new generic library module.
- (line 34)
+ (line 34)
* --with-system-LIB <1>: Library-specific configure options.
- (line 9)
-* --with-system-libgs: Configure options for texk/dvisvgm.
- (line 6)
-* --with-xdvi-x-toolkit: xdvik package. (line 21)
-* --with-xdvi-x-toolkit=KIT: Configure options for texk/xdvik.
- (line 9)
-* --without-libgs: Configure options for texk/dvisvgm.
- (line 12)
-* --without-ln-s: --without-ln-s. (line 6)
-* --without-x: --without-x. (line 6)
-* -C configure option: Build in parallel. (line 11)
-* -j make option: Build in parallel. (line 6)
+ (line 9)
+* --with-system-libgs: Configure options for 'texk/dvisvgm'.
+ (line 6)
+* --with-xdvi-x-toolkit: 'xdvik' package. (line 21)
+* --with-xdvi-x-toolkit=KIT: Configure options for 'texk/xdvik'.
+ (line 9)
+* --without-libgs: Configure options for 'texk/dvisvgm'.
+ (line 12)
+* --without-ln-s: '--without-ln-s'. (line 6)
+* --without-x: '--without-x'. (line 6)
+* -C configure option: Build in parallel. (line 11)
+* -j make option: Build in parallel. (line 6)
* ac/withenable.ac: Adding a new program module.
- (line 42)
-* adapting TeX Live for distros: Distro builds. (line 54)
-* adding a new engine: Adding a new engine. (line 6)
+ (line 42)
+* adapting TeX Live for distros: Distro builds. (line 54)
+* adding a new engine: Adding a new engine. (line 6)
* adding a new generic library: Adding a new generic library module.
- (line 6)
+ (line 6)
* adding a new program: Adding a new program module.
- (line 6)
+ (line 6)
* adding a new TeX-specific library: Adding a new TeX-specific library module.
- (line 6)
-* adding to TeX Live: Extending TeX Live. (line 6)
-* am/ top-level directory: Top-level directories.
- (line 14)
+ (line 6)
+* adding to TeX Live: Extending TeX Live. (line 6)
+* 'am/' top-level directory: Top-level directories.
+ (line 14)
* ANSI C: Declarations and definitions.
- (line 6)
-* ApplicationServices Mac framework, required by xetex: Prerequisites.
- (line 31)
-* asymptote: Linked scripts. (line 23)
-* asymptote <1>: asymptote. (line 6)
+ (line 6)
+* 'ApplicationServices' Mac framework, required by 'xetex': Prerequisites.
+ (line 40)
+* asymptote: Linked scripts. (line 23)
+* asymptote <1>: 'asymptote'. (line 6)
* Autoconf: Overview of build system.
- (line 6)
-* autoconf macros: Autoconf macros. (line 6)
+ (line 6)
+* autoconf macros: Autoconf macros. (line 6)
* Automake: Overview of build system.
- (line 6)
+ (line 6)
* autoreconf, for new program: Adding a new program module.
- (line 76)
-* biber: Linked scripts. (line 23)
-* bibtex-x: Configure options for texk/bibtex-x.
- (line 6)
-* bibtex8: Configure options for texk/bibtex-x.
- (line 6)
-* bibtexu: Configure options for texk/bibtex-x.
- (line 6)
-* BSD distro: Distro builds. (line 6)
-* build directory, required: Building. (line 17)
-* build iteration: Build iteration. (line 6)
-* build on demand: Build one package. (line 6)
-* build one engine: Build one engine. (line 6)
-* build one package: Build one package. (line 6)
-* build problems: Build problems. (line 6)
-* Build script: Building. (line 6)
+ (line 76)
+* biber: Linked scripts. (line 23)
+* bibtex-x: Configure options for 'texk/bibtex-x'.
+ (line 6)
+* bibtex8: Configure options for 'texk/bibtex-x'.
+ (line 6)
+* bibtexu: Configure options for 'texk/bibtex-x'.
+ (line 6)
+* BSD distro: Distro builds. (line 6)
+* build directory, required: Building. (line 17)
+* build iteration: Build iteration. (line 6)
+* build on demand: Build one package. (line 6)
+* build one engine: Build one engine. (line 6)
+* build one package: Build one package. (line 6)
+* Build script: Building. (line 6)
* build system, design of: Overview of build system.
- (line 6)
-* build-aux/ top-level directory: Top-level directories.
- (line 30)
-* BUILDCC, BUILDCFLAGS, ...: Cross configuring. (line 42)
-* building: Building. (line 6)
-* building a distribution: Build distribution. (line 6)
-* building in parallel: Build in parallel. (line 6)
-* C++11, removing dependent sources: Build one package. (line 64)
-* C++11, required: Prerequisites. (line 15)
+ (line 6)
+* 'build-aux/' top-level directory: Top-level directories.
+ (line 30)
+* BUILDCC, BUILDCFLAGS, ...: Cross configuring. (line 42)
+* building: Building. (line 6)
+* building a distribution: Build distribution. (line 6)
+* building in parallel: Build in parallel. (line 6)
+* C++11, removing dependent sources: Build one package. (line 85)
+* C++11, required: Prerequisites. (line 17)
* C, ANSI, required: Declarations and definitions.
- (line 6)
+ (line 6)
* C99, avoided: Declarations and definitions.
- (line 6)
-* cache file, for configure: Build in parallel. (line 11)
-* cache for configure: Build in parallel. (line 6)
-* callexe.c: Macros for Windows. (line 32)
+ (line 6)
+* cache file, for 'configure': Build in parallel. (line 11)
+* cache for 'configure': Build in parallel. (line 6)
+* callexe.c: Macros for Windows. (line 32)
* CC: Variables for configure.
- (line 10)
-* CC=C-COMPILER: Build one package. (line 81)
-* CC_BUILD: Cross problems. (line 13)
+ (line 10)
+* CC=C-COMPILER: Build one package. (line 77)
+* CC_BUILD: Cross problems. (line 13)
* ChangeLog: Adding a new program module.
- (line 73)
+ (line 73)
* chktex: Declarations and definitions.
- (line 18)
+ (line 18)
* clisp: Variables for configure.
- (line 18)
+ (line 18)
* CLISP: Variables for configure.
- (line 17)
-* CLISP <1>: Configure options for utils/xindy.
- (line 14)
-* clisp, required by xindy: Prerequisites. (line 35)
-* Cocoa Mac framework, required by xetex: Prerequisites. (line 31)
-* coding conventions: Coding conventions. (line 6)
-* compilers, C and C++11: Prerequisites. (line 6)
+ (line 17)
+* CLISP <1>: Configure options for 'utils/xindy'.
+ (line 14)
+* 'clisp', required by 'xindy': Prerequisites. (line 44)
+* 'Cocoa' Mac framework, required by 'xetex': Prerequisites. (line 40)
+* coding conventions: Coding conventions. (line 6)
+* compilers, C and C++11: Prerequisites. (line 6)
* config.guess, config.sub, ...: Top-level directories.
- (line 30)
-* configure options: Configure options. (line 6)
-* configure options, for bibtex-x: Configure options for texk/bibtex-x.
- (line 6)
-* configure options, for dvipdfm-x: Configure options for texk/dvipdfm-x.
- (line 6)
-* configure options, for dvisvgm: Configure options for texk/dvisvgm.
- (line 6)
-* configure options, for kpathsea: Configure options for kpathsea.
- (line 6)
-* configure options, for texk/texlive: Configure options for texk/texlive.
- (line 6)
-* configure options, for web2c: Configure options for texk/web2c.
- (line 6)
-* configure options, for xdvik: Configure options for texk/xdvik.
- (line 6)
-* configure options, for xindy: Configure options for utils/xindy.
- (line 6)
-* configure options, global: Global configure options.
- (line 6)
-* configure options, library-specific: Library-specific configure options.
- (line 6)
-* configure options, program-specific: Program-specific configure options.
- (line 6)
-* configure variables: Variables for configure.
- (line 6)
+ (line 30)
+* 'configure' options: Configure options. (line 6)
+* 'configure' options, for 'bibtex-x': Configure options for 'texk/bibtex-x'.
+ (line 6)
+* 'configure' options, for 'dvipdfm-x': Configure options for 'texk/dvipdfm-x'.
+ (line 6)
+* 'configure' options, for 'dvisvgm': Configure options for 'texk/dvisvgm'.
+ (line 6)
+* 'configure' options, for 'kpathsea': Configure options for 'kpathsea'.
+ (line 6)
+* 'configure' options, for 'texk/texlive': Configure options for 'texk/texlive'.
+ (line 6)
+* 'configure' options, for 'web2c': Configure options for 'texk/web2c'.
+ (line 6)
+* 'configure' options, for 'xdvik': Configure options for 'texk/xdvik'.
+ (line 6)
+* 'configure' options, for 'xindy': Configure options for 'utils/xindy'.
+ (line 6)
+* 'configure' options, global: Global configure options.
+ (line 6)
+* 'configure' options, library-specific: Library-specific configure options.
+ (line 6)
+* 'configure' options, program-specific: Program-specific configure options.
+ (line 6)
+* 'configure' problems, work around by removing: Build one package.
+ (line 106)
+* 'configure' variables: Variables for configure.
+ (line 6)
* configure.ac: Adding a new program module.
- (line 45)
-* configuring, for cross compilation: Cross configuring. (line 6)
-* const: Const. (line 6)
+ (line 45)
+* configuring, for cross compilation: Cross configuring. (line 6)
+* 'const': Const. (line 6)
* continuous integration: Continuous integration.
- (line 6)
-* conventions, coding: Coding conventions. (line 6)
+ (line 6)
+* conventions, coding: Coding conventions. (line 6)
* CPPFLAGS: Variables for configure.
- (line 12)
-* cross compilation: Cross compilation. (line 6)
-* cross compilation configuring: Cross configuring. (line 6)
-* cross compilation problems: Cross problems. (line 6)
-* cross compilation, with host binary: xdvik package. (line 14)
-* ctangle: Cross problems. (line 26)
+ (line 12)
+* cross compilation: Cross compilation. (line 6)
+* cross compilation configuring: Cross configuring. (line 6)
+* cross compilation problems: Cross problems. (line 6)
+* cross compilation, with host binary: 'xdvik' package. (line 14)
+* ctangle: Cross problems. (line 26)
* CXX: Variables for configure.
- (line 11)
-* CXX=C++-COMPILER: Build one package. (line 81)
+ (line 11)
+* CXX=C++-COMPILER: Build one package. (line 77)
* declarations and definitions, in source code: Declarations and definitions.
- (line 6)
+ (line 6)
* declarations before statements, avoiding: Declarations and definitions.
- (line 6)
-* dependencies, with several output files: Build in parallel. (line 6)
-* DESTDIR: --prefix --bindir ....
- (line 9)
+ (line 6)
+* dependencies, with several output files: Build in parallel. (line 6)
+* DESTDIR: '--prefix' '--bindir' ....
+ (line 9)
* directories, for installation: Installation directories.
- (line 6)
+ (line 6)
* directories, top-level: Top-level directories.
- (line 6)
-* discards qualifiers warning: Const. (line 30)
-* dist and distcheck targets for make: Build distribution. (line 6)
-* distribution tarball, making: Build distribution. (line 6)
-* distro, building for: Distro builds. (line 6)
-* dvipdfm-x: Configure options for texk/dvipdfm-x.
- (line 6)
-* dvipdfmx: Configure options for texk/dvipdfm-x.
- (line 6)
-* dvisvgm: Configure options for texk/dvisvgm.
- (line 6)
-* engine, adding new: Adding a new engine. (line 6)
-* engine, building one: Build one engine. (line 6)
-* environment variables, for configure: Configure options. (line 16)
-* exec_prefix: --enable-multiplatform.
- (line 6)
-* extending TeX Live: Extending TeX Live. (line 6)
-* extern functions: Declarations and definitions.
- (line 41)
-* failure to build: Build problems. (line 6)
+ (line 6)
+* discards qualifiers warning: Const. (line 30)
+* 'dist' and 'distcheck' targets for 'make': Build distribution.
+ (line 6)
+* distribution tarball, making: Build distribution. (line 6)
+* distro, building for: Distro builds. (line 6)
+* dvipdfm-x: Configure options for 'texk/dvipdfm-x'.
+ (line 6)
+* dvipdfmx: Configure options for 'texk/dvipdfm-x'.
+ (line 6)
+* dvisvgm: Configure options for 'texk/dvisvgm'.
+ (line 6)
+* 'dvisvgm', requires C++11: Prerequisites. (line 17)
+* engine, adding new: Adding a new engine. (line 6)
+* engine, building one: Build one engine. (line 6)
+* environment variables, for 'configure': Configure options. (line 16)
+* exec_prefix: '--enable-multiplatform'.
+ (line 6)
+* extending TeX Live: Extending TeX Live. (line 6)
+* 'extern' functions: Declarations and definitions.
+ (line 41)
* flags, macros for library and header: Macros for library and header flags.
- (line 6)
-* fontconfig library, required by xetex: Prerequisites. (line 31)
-* FreeType: Prerequisites. (line 11)
-* freetype cross compiling: Cross problems. (line 13)
-* freetype library: freetype library. (line 6)
-* freetype-config: freetype library. (line 13)
+ (line 6)
+* 'fontconfig' library, required by 'xetex': Prerequisites. (line 40)
+* 'freetype' cross compiling: Cross problems. (line 13)
+* freetype library: 'freetype' library. (line 6)
+* FreeType, requires 'gmake': Prerequisites. (line 13)
+* freetype-config: 'freetype' library. (line 13)
* freetype-config <1>: Variables for configure.
- (line 24)
+ (line 24)
* FT2_CONFIG: Variables for configure.
- (line 21)
-* gcc, default compilers: Build one package. (line 81)
-* general setup macros: General setup macros. (line 6)
+ (line 21)
+* gcc, default compilers: Build one package. (line 77)
+* general setup macros: General setup macros.
+ (line 6)
* generic library module, adding: Adding a new generic library module.
- (line 6)
-* Ghostscript location for Xdvik: Configure options for texk/xdvik.
- (line 6)
+ (line 6)
+* Ghostscript location for Xdvik: Configure options for 'texk/xdvik'.
+ (line 6)
* git-svn: Transfer from Subversion to Github.
- (line 6)
-* global configure options: Global configure options.
- (line 6)
-* gmake, required: Prerequisites. (line 11)
-* GNU make, required: Prerequisites. (line 11)
-* GNU tools, needed for building: Build system tools. (line 6)
-* GNU/Linux distro: Distro builds. (line 6)
+ (line 6)
+* global 'configure' options: Global configure options.
+ (line 6)
+* 'gmake', required: Prerequisites. (line 13)
+* GNU 'make', required: Prerequisites. (line 13)
+* GNU tools, needed for building: Build system tools. (line 6)
+* GNU/Linux distro: Distro builds. (line 6)
* Gnulib, used for common files: Top-level directories.
- (line 30)
-* ICU cross compiling: Cross problems. (line 20)
+ (line 30)
+* HarfBuzz, requires C++11: Prerequisites. (line 17)
+* ICU cross compiling: Cross problems. (line 20)
* ICU libraries: Variables for configure.
- (line 24)
+ (line 24)
+* ICU, requires C++11: Prerequisites. (line 17)
* icu-config: Variables for configure.
- (line 24)
+ (line 24)
* ICU_CONFIG: Variables for configure.
- (line 22)
-* infrastructure, tools needed for: Build system tools. (line 6)
-* inst/ top-level directory: Top-level directories.
- (line 39)
-* install-tl, TeX Live installer: Installing. (line 8)
+ (line 22)
+* infrastructure, tools needed for: Build system tools. (line 6)
+* 'inst/' top-level directory: Top-level directories.
+ (line 39)
+* install-tl, TeX Live installer: Installing. (line 8)
* installation directories: Installation directories.
- (line 6)
-* installing: Installing. (line 6)
-* interprocess communication: Configure options for texk/web2c.
- (line 31)
-* introduction: Introduction. (line 6)
-* iteration through sources, by configure and make: Build iteration.
- (line 6)
-* kpathsea library: kpathsea library. (line 6)
-* kpathsea.ac: kpathsea library. (line 18)
-* kpse-libpng-flags.m4: png library. (line 45)
+ (line 6)
+* installing: Installing. (line 6)
+* interprocess communication: Configure options for 'texk/web2c'.
+ (line 31)
+* introduction: Introduction. (line 6)
+* iteration through sources, by 'configure' and 'make': Build iteration.
+ (line 6)
+* kpathsea library: 'kpathsea' library. (line 6)
+* kpathsea.ac: 'kpathsea' library. (line 18)
+* kpse-libpng-flags.m4: 'png' library. (line 46)
* kpse-pkgs.m4: Overview of build system.
- (line 30)
-* kpse-zlib-flags.m4: zlib library. (line 6)
+ (line 30)
+* kpse-zlib-flags.m4: 'zlib' library. (line 6)
* kpsewhich: Variables for configure.
- (line 30)
+ (line 30)
* KPSEWHICH: Variables for configure.
- (line 29)
+ (line 29)
* KPSE_ADD_FLAGS: Macros for library and header flags.
- (line 20)
+ (line 20)
* KPSE_ALL_SYSTEM_FLAGS: Adding a new generic library module.
- (line 34)
-* KPSE_BASIC: General setup macros. (line 8)
-* KPSE_CHECK_LATEX: Macros for programs. (line 8)
-* KPSE_CHECK_PDFLATEX: Macros for programs. (line 15)
-* KPSE_CHECK_PERL: Macros for programs. (line 18)
-* KPSE_CHECK_WIN32: Macros for Windows. (line 9)
-* KPSE_COMMON: General setup macros. (line 16)
-* KPSE_COMPILER_VISIBILITY: Macros for compilers. (line 18)
-* KPSE_COMPILER_WARNINGS: Macros for compilers. (line 8)
-* KPSE_COND_MINGW32: Macros for Windows. (line 19)
-* KPSE_COND_WIN32: Macros for Windows. (line 15)
-* KPSE_COND_WIN32_WRAP: Macros for Windows. (line 24)
-* kpse_cv_cxx_hack: Macros for compilers. (line 33)
-* kpse_cv_have_win32: Macros for Windows. (line 10)
-* kpse_cv_visibility_c[xx]flags: Macros for compilers. (line 25)
-* kpse_cv_warning_cflags: Macros for compilers. (line 15)
-* KPSE_CXX_HACK: Macros for compilers. (line 28)
+ (line 34)
+* KPSE_BASIC: General setup macros.
+ (line 8)
+* KPSE_CHECK_LATEX: Macros for programs. (line 8)
+* KPSE_CHECK_PDFLATEX: Macros for programs. (line 15)
+* KPSE_CHECK_PERL: Macros for programs. (line 18)
+* KPSE_CHECK_WIN32: Macros for Windows. (line 9)
+* KPSE_COMMON: General setup macros.
+ (line 16)
+* KPSE_COMPILER_VISIBILITY: Macros for compilers.
+ (line 18)
+* KPSE_COMPILER_WARNINGS: Macros for compilers.
+ (line 8)
+* KPSE_COND_MINGW32: Macros for Windows. (line 19)
+* KPSE_COND_WIN32: Macros for Windows. (line 15)
+* KPSE_COND_WIN32_WRAP: Macros for Windows. (line 24)
+* kpse_cv_cxx_hack: Macros for compilers.
+ (line 33)
+* kpse_cv_have_win32: Macros for Windows. (line 10)
+* kpse_cv_visibility_c[xx]flags: Macros for compilers.
+ (line 25)
+* kpse_cv_warning_cflags: Macros for compilers.
+ (line 15)
+* KPSE_CXX_HACK: Macros for compilers.
+ (line 28)
* KPSE_ENABLE_PROG: Adding a new program module.
- (line 14)
-* KPSE_LARGEFILE: Macros for libraries. (line 8)
+ (line 14)
+* KPSE_LARGEFILE: Macros for libraries.
+ (line 8)
* KPSE_LIBPNG_FLAGS: Macros for library and header flags.
- (line 10)
-* KPSE_LIBPNG_FLAGS <1>: png library. (line 45)
+ (line 10)
+* KPSE_LIBPNG_FLAGS <1>: 'png' library. (line 46)
* kpse_libs_pkgs: Adding a new generic library module.
- (line 6)
+ (line 6)
* KPSE_LIB_FLAGS: Macros for library and header flags.
- (line 6)
+ (line 6)
* KPSE_LIB_FLAGS <1>: Adding a new generic library module.
- (line 26)
+ (line 26)
* KPSE_LIB_SYSTEM_FLAGS: Adding a new generic library module.
- (line 34)
-* KPSE_PROG_LEX: Macros for programs. (line 21)
+ (line 34)
+* KPSE_PROG_LEX: Macros for programs. (line 21)
* KPSE_RESTORE_FLAGS: Macros for library and header flags.
- (line 24)
+ (line 24)
* kpse_texk_pkgs: Adding a new program module.
- (line 6)
+ (line 6)
* kpse_texlibs_pkgs: Adding a new TeX-specific library module.
- (line 11)
-* KPSE_TRY_LIB: png library. (line 17)
+ (line 11)
+* KPSE_TRY_LIB: 'png' library. (line 18)
* KPSE_TRY_LIB <1>: Adding a new generic library module.
- (line 20)
-* KPSE_TRY_LIBXX: png library. (line 30)
+ (line 20)
+* KPSE_TRY_LIBXX: 'png' library. (line 31)
* KPSE_TRY_LIBXX <1>: Adding a new generic library module.
- (line 20)
+ (line 20)
* kpse_utils_pkgs: Adding a new program module.
- (line 10)
-* KPSE_WIN32_CALL: Macros for Windows. (line 31)
+ (line 10)
+* KPSE_WIN32_CALL: Macros for Windows. (line 31)
* KPSE_WITH_LIB: Adding a new generic library module.
- (line 11)
+ (line 11)
* KPSE_WITH_TEXLIB: Adding a new TeX-specific library module.
- (line 14)
-* large file support: --disable-largefile. (line 6)
+ (line 14)
+* large file support: '--disable-largefile'.
+ (line 6)
* LATEX: Variables for configure.
- (line 40)
+ (line 40)
* layout of sources: Layout and infrastructure.
- (line 6)
-* LFS (large file support): --disable-largefile. (line 6)
-* libexpat, dependency of libfontconfig: Configure options for texk/web2c.
- (line 50)
-* libfontconfig, hack for avoiding linking dependencies: Configure options for texk/web2c.
- (line 50)
+ (line 6)
+* LFS (large file support): '--disable-largefile'.
+ (line 6)
+* libexpat, dependency of 'libfontconfig': Configure options for 'texk/web2c'.
+ (line 50)
+* libfontconfig, hack for avoiding linking dependencies: Configure options for 'texk/web2c'.
+ (line 50)
* libfreetype: Variables for configure.
- (line 24)
-* libfreetype, and const: Const. (line 21)
-* libpng library: png library. (line 6)
+ (line 24)
+* 'libfreetype', and 'const': Const. (line 21)
+* libpng library: 'png' library. (line 6)
* library module, generic, adding: Adding a new generic library module.
- (line 6)
+ (line 6)
* library module, TeX-specific, adding: Adding a new TeX-specific library module.
- (line 6)
-* library modules: Library modules. (line 6)
-* library-specific configure options: Library-specific configure options.
- (line 6)
-* libsigsegv, required by xindy: Prerequisites. (line 35)
-* libstc++, statically linking: Macros for compilers. (line 29)
+ (line 6)
+* library modules: Library modules. (line 6)
+* library-specific 'configure' options: Library-specific configure options.
+ (line 6)
+* 'libsigsegv', required by 'xindy': Prerequisites. (line 44)
+* libstc++, statically linking: Macros for compilers.
+ (line 29)
* Libtool: Overview of build system.
- (line 6)
-* libtool, hack for avoiding excessive linking: Configure options for texk/web2c.
- (line 50)
-* libXt: Configure options for texk/web2c.
- (line 22)
-* linked scripts: Linked scripts. (line 6)
-* linking C++ libraries statically: Macros for compilers. (line 29)
-* lisp.run, lisp.exe: Configure options for utils/xindy.
- (line 14)
-* LittleEndian architectures: Configure options for texk/web2c.
- (line 27)
-* m4/ top-level directory: Top-level directories.
- (line 14)
-* macros, for compilers: Macros for compilers. (line 6)
-* macros, for libraries: Macros for libraries. (line 6)
+ (line 6)
+* libtool, hack for avoiding excessive linking: Configure options for 'texk/web2c'.
+ (line 50)
+* libXt: Configure options for 'texk/web2c'.
+ (line 22)
+* linked scripts: Linked scripts. (line 6)
+* linking C++ libraries statically: Macros for compilers.
+ (line 29)
+* lisp.run, lisp.exe: Configure options for 'utils/xindy'.
+ (line 14)
+* LittleEndian architectures: Configure options for 'texk/web2c'.
+ (line 27)
+* 'm4/' top-level directory: Top-level directories.
+ (line 14)
+* macros, for compilers: Macros for compilers.
+ (line 6)
+* macros, for libraries: Macros for libraries.
+ (line 6)
* macros, for library and header flags: Macros for library and header flags.
- (line 6)
-* macros, for programs: Macros for programs. (line 6)
-* macros, for Windows: Macros for Windows. (line 6)
-* macros, general setup: General setup macros. (line 6)
+ (line 6)
+* macros, for programs: Macros for programs. (line 6)
+* macros, for Windows: Macros for Windows. (line 6)
+* macros, general setup: General setup macros.
+ (line 6)
* MAKE: Variables for configure.
- (line 33)
-* make -t: Build system tools. (line 43)
-* make rules, verbose vs. silent: --enable-silent-rules.
- (line 6)
+ (line 33)
+* make -t: Build system tools. (line 43)
+* 'make' rules, verbose vs. silent: '--enable-silent-rules'.
+ (line 6)
* Makefile.am: Adding a new program module.
- (line 46)
-* mf-nowin: Configure options for texk/web2c.
- (line 34)
-* mingw32: Cross configuring. (line 27)
-* MINGW32, Automake conditional: Macros for Windows. (line 20)
-* mktex.ac: kpathsea library. (line 18)
-* mktextfm: kpathsea library. (line 18)
-* modules, for libraries: Library modules. (line 6)
-* modules, for programs: Program modules. (line 6)
-* motif: Configure options for texk/xdvik.
- (line 9)
-* native cross compilation: Cross compilation. (line 10)
+ (line 46)
+* mf-nowin: Configure options for 'texk/web2c'.
+ (line 34)
+* 'mingw32': Cross configuring. (line 27)
+* MINGW32, Automake conditional: Macros for Windows. (line 20)
+* mktex.ac: 'kpathsea' library. (line 18)
+* mktextfm: 'kpathsea' library. (line 18)
+* modules, for libraries: Library modules. (line 6)
+* modules, for programs: Program modules. (line 6)
+* motif: Configure options for 'texk/xdvik'.
+ (line 9)
+* native cross compilation: Cross compilation. (line 10)
* NEWPROG-SRC, original source subdirectory: Adding a new program module.
- (line 33)
-* OBJCXX=OBJC-COMPILER: Build one package. (line 81)
-* one engine, building: Build one engine. (line 6)
-* one package, building: Build one package. (line 6)
-* OpenGL, required for Asymptote: asymptote. (line 6)
-* operating system distribution, building for: Distro builds. (line 6)
-* otangle: Cross problems. (line 26)
-* overall build process: Building. (line 6)
-* parallel build: Build in parallel. (line 6)
+ (line 33)
+* OBJCXX=OBJC-COMPILER: Build one package. (line 77)
+* one engine, building: Build one engine. (line 6)
+* one package, building: Build one package. (line 6)
+* OpenGL, required for Asymptote: 'asymptote'. (line 6)
+* operating system distribution, building for: Distro builds. (line 6)
+* otangle: Cross problems. (line 26)
+* overall build process: Building. (line 6)
+* parallel build: Build in parallel. (line 6)
* paths, for installation: Installation directories.
- (line 6)
-* PDF files, size of: --disable-largefile. (line 11)
+ (line 6)
+* PDF files, size of: '--disable-largefile'.
+ (line 11)
* PDFLATEX: Variables for configure.
- (line 41)
+ (line 41)
* PERL: Variables for configure.
- (line 39)
-* perl, required by web2c, etc.: Prerequisites. (line 23)
+ (line 39)
+* 'perl', required by 'web2c', etc.: Prerequisites. (line 29)
* PKG_CONFIG: Variables for configure.
- (line 23)
-* plain.tex, not in source tree: Installing. (line 8)
-* png library: png library. (line 6)
-* PostScript files, size of: --disable-largefile. (line 11)
-* Preining, Norbert: Distro builds. (line 54)
-* preloaded binaries: Configure options for texk/web2c.
- (line 45)
-* prerequisites for building: Prerequisites. (line 6)
-* problems with build: Build problems. (line 6)
+ (line 23)
+* plain.tex, not in source tree: Installing. (line 8)
+* png library: 'png' library. (line 6)
+* PostScript files, size of: '--disable-largefile'.
+ (line 11)
+* Preining, Norbert: Distro builds. (line 54)
+* preloaded binaries: Configure options for 'texk/web2c'.
+ (line 45)
+* prerequisites for building: Prerequisites. (line 6)
* program module, adding: Adding a new program module.
- (line 6)
-* program modules: Program modules. (line 6)
-* program-specific configure options: Program-specific configure options.
- (line 6)
-* proxy build system: png library. (line 35)
-* reautoconf: Build system tools. (line 28)
+ (line 6)
+* program modules: Program modules. (line 6)
+* program-specific 'configure' options: Program-specific configure options.
+ (line 6)
+* proxy build system: 'png' library. (line 36)
+* Python, required by ICU: Prerequisites. (line 23)
+* reautoconf: Build system tools. (line 28)
* reautoconf, for new program: Adding a new program module.
- (line 89)
-* requirements for building: Prerequisites. (line 6)
-* runscript.exe: Macros for Windows. (line 25)
-* scripts, linked and not maintained: Linked scripts. (line 6)
-* scrolling, smooth: Configure options for texk/xdvik.
- (line 13)
+ (line 89)
+* removing build directories: Build one package. (line 106)
+* requirements for building: Prerequisites. (line 6)
+* runscript.exe: Macros for Windows. (line 25)
+* scripts, linked and not maintained: Linked scripts. (line 6)
+* scrolling, smooth: Configure options for 'texk/xdvik'.
+ (line 13)
* SED: Variables for configure.
- (line 34)
-* setup macros, general: General setup macros. (line 6)
-* shared libraries, using vs. avoiding: Distro builds. (line 11)
-* size of PDF and PS files: --disable-largefile. (line 11)
-* size of source tree: Build one package. (line 53)
+ (line 34)
+* setup macros, general: General setup macros.
+ (line 6)
+* shared libraries, using vs. avoiding: Distro builds. (line 11)
+* size of PDF and PS files: '--disable-largefile'.
+ (line 11)
+* size of source tree: Build one package. (line 63)
* source code declarations: Declarations and definitions.
- (line 6)
-* source directory building, not supported: Building. (line 17)
+ (line 6)
+* source directory building, not supported: Building. (line 17)
* source tree: Layout and infrastructure.
- (line 6)
-* squeeze: Cross problems. (line 13)
-* squeeze/configure.ac: xdvik package. (line 14)
-* static functions: Declarations and definitions.
- (line 35)
-* static linking for C++: Macros for compilers. (line 29)
+ (line 6)
+* squeeze: Cross problems. (line 13)
+* squeeze/configure.ac: 'xdvik' package. (line 14)
+* 'static' functions: Declarations and definitions.
+ (line 35)
+* static linking for C++: Macros for compilers.
+ (line 29)
* stpcpy: Declarations and definitions.
- (line 18)
-* Subversion repository: Build system tools. (line 38)
-* support files, separate from build: Installing. (line 8)
-* symlinks, used for scripts: Linked scripts. (line 6)
-* synctex: Configure options for texk/web2c.
- (line 59)
-* synctex <1>: Configure options for texk/web2c.
- (line 64)
-* system distribution, building for: Distro builds. (line 6)
-* t1utils package: t1utils package. (line 6)
-* tangle: Cross problems. (line 26)
+ (line 18)
+* Subversion repository: Build system tools. (line 38)
+* support files, separate from build: Installing. (line 8)
+* symlinks, used for scripts: Linked scripts. (line 6)
+* synctex: Configure options for 'texk/web2c'.
+ (line 59)
+* synctex <1>: Configure options for 'texk/web2c'.
+ (line 64)
+* system distribution, building for: Distro builds. (line 6)
+* t1utils package: 't1utils' package. (line 6)
+* tangle: Cross problems. (line 26)
* tests, running: Overview of build system.
- (line 6)
+ (line 6)
* TeX-specific library module, adding: Adding a new TeX-specific library module.
- (line 6)
-* texlive.tlpdb, TeX Live database: Installing. (line 8)
-* tie: Cross problems. (line 26)
-* timestamps, in repository: Build system tools. (line 38)
+ (line 6)
+* texlive.tlpdb, TeX Live database: Installing. (line 8)
+* TEXMFCNF for running standalone: Build one package. (line 44)
+* TEXMFROOT for running standalone: Build one package. (line 44)
+* tie: Cross problems. (line 26)
+* timestamps, in repository: Build system tools. (line 38)
* TLpatches/patch-...: Adding a new program module.
- (line 68)
+ (line 68)
* TLpatches/TL-Changes: Adding a new program module.
- (line 64)
-* tools, for building: Build system tools. (line 6)
+ (line 64)
+* tools, for building: Build system tools. (line 6)
* top-level directories: Top-level directories.
- (line 6)
-* touching files to avoid rerunning: Build system tools. (line 43)
+ (line 6)
+* touching files to avoid rerunning: Build system tools. (line 43)
* Travis-CI: Continuous integration.
- (line 6)
+ (line 6)
* travis.yml: CI testing on Travis-CI.
- (line 6)
-* type cast from const, avoiding: Const. (line 38)
-* use-commit-times, Subversion: Build system tools. (line 38)
+ (line 6)
+* type cast from const, avoiding: Const. (line 38)
+* use-commit-times, Subversion: Build system tools. (line 38)
* variable declarations, in source code: Declarations and definitions.
- (line 52)
-* variables for configure: Variables for configure.
- (line 6)
-* warning, discards qualifiers: Const. (line 30)
-* WARNING_C[XX]FLAGS: Macros for compilers. (line 9)
-* web2c program: Cross problems. (line 13)
-* web2c.ac: Configure options for texk/web2c.
- (line 37)
-* wget: Linked scripts. (line 23)
-* WIN32, Automake conditional: Macros for Windows. (line 16)
-* WIN32_WRAP, Automake conditional: Macros for Windows. (line 25)
-* Windows, invoking scripts on: Linked scripts. (line 6)
-* Windows, macros for: Macros for Windows. (line 6)
+ (line 52)
+* variables for 'configure': Variables for configure.
+ (line 6)
+* warning, discards qualifiers: Const. (line 30)
+* WARNING_C[XX]FLAGS: Macros for compilers.
+ (line 9)
+* web2c program: Cross problems. (line 13)
+* web2c.ac: Configure options for 'texk/web2c'.
+ (line 37)
+* wget: Linked scripts. (line 23)
+* WIN32, Automake conditional: Macros for Windows. (line 16)
+* WIN32_WRAP, Automake conditional: Macros for Windows. (line 25)
+* Windows, invoking scripts on: Linked scripts. (line 6)
+* Windows, macros for: Macros for Windows. (line 6)
* withenable.ac, for new modules: Adding a new program module.
- (line 14)
-* Work/ top-level directory: Top-level directories.
- (line 39)
-* wrapper binary for scripts on Windows: Linked scripts. (line 6)
-* wrapper build system: freetype library. (line 6)
-* X toolkit: Configure options for texk/web2c.
- (line 22)
-* X11 development, required by X clients: Prerequisites. (line 27)
-* X11 headers, and const: Const. (line 21)
-* xasy: asymptote. (line 6)
-* xaw: Configure options for texk/xdvik.
- (line 9)
-* xdvik: xdvik package. (line 6)
-* xdvik <1>: Configure options for texk/xdvik.
- (line 6)
-* xdvipdfmx: Configure options for texk/dvipdfm-x.
- (line 6)
-* xindy: Linked scripts. (line 23)
-* xindy <1>: xindy package. (line 6)
-* xindy <2>: Configure options for utils/xindy.
- (line 6)
-* xindy cross compiling requires clisp: Cross problems. (line 33)
-* XInput: Configure options for texk/xdvik.
- (line 13)
-* Xlib: Configure options for texk/web2c.
- (line 22)
-* xz: Linked scripts. (line 23)
-* zlib library: zlib library. (line 6)
+ (line 14)
+* 'Work/' top-level directory: Top-level directories.
+ (line 39)
+* wrapper binary for scripts on Windows: Linked scripts. (line 6)
+* wrapper build system: 'freetype' library. (line 6)
+* X toolkit: Configure options for 'texk/web2c'.
+ (line 22)
+* X11 development, required by X clients: Prerequisites. (line 36)
+* X11 headers, and 'const': Const. (line 21)
+* xasy: 'asymptote'. (line 6)
+* xaw: Configure options for 'texk/xdvik'.
+ (line 9)
+* xdvik: 'xdvik' package. (line 6)
+* xdvik <1>: Configure options for 'texk/xdvik'.
+ (line 6)
+* xdvipdfmx: Configure options for 'texk/dvipdfm-x'.
+ (line 6)
+* xindy: Linked scripts. (line 23)
+* xindy <1>: 'xindy' package. (line 6)
+* xindy <2>: Configure options for 'utils/xindy'.
+ (line 6)
+* 'xindy' cross compiling requires 'clisp': Cross problems. (line 33)
+* XInput: Configure options for 'texk/xdvik'.
+ (line 13)
+* Xlib: Configure options for 'texk/web2c'.
+ (line 22)
+* xz: Linked scripts. (line 23)
+* zlib library: 'zlib' library. (line 6)
@@ -5959,405 +6045,400 @@
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 at 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 system3946
+Node: Prerequisites5997
+Ref: Prerequisites-Footnote-18996
+Node: Building9299
+Node: Build iteration10641
+Node: Build in parallel11685
+Node: Build distribution12290
+Node: Build one package12938
+Node: Build one engine17652
+Node: Cross compilation20077
+Node: Cross configuring21356
+Node: Cross problems23033
+Node: Installing24695
+Node: Installation directories25715
+Node: Linked scripts27533
+Node: Distro builds29024
+Node: Layout and infrastructure31400
+Node: Build system tools32231
+Node: Top-level directories34448
+Node: Autoconf macros36684
+Node: General setup macros37446
+Node: Macros for programs38321
+Node: Macros for compilers39122
+Node: Macros for libraries40530
+Node: Macros for library and header flags40956
+Node: Macros for Windows42867
+Node: Library modules44454
+Node: 'png' library44951
+Node: 'zlib' library47303
+Node: 'freetype' library47824
+Node: 'kpathsea' library48526
+Node: Program modules49909
+Node: 't1utils' package50345
+Node: 'xindy' package50894
+Node: 'xdvik' package52016
+Node: 'asymptote'53081
+Node: Extending TeX Live53581
+Node: Adding a new program module54388
+Node: Adding a new engine59151
+Node: Adding a new generic library module60936
+Node: Adding a new TeX-specific library module63157
+Node: Configure options63855
+Node: Global configure options65236
+Node: '--disable-native-texlive-build'65804
+Node: '--prefix' '--bindir' ...66772
+Node: '--disable-largefile'67320
+Node: '--disable-missing'67870
+Node: '--enable-compiler-warnings='LEVEL68277
+Node: '--enable-cxx-runtime-hack'68939
+Node: '--enable-maintainer-mode'69365
+Node: '--enable-multiplatform'69900
+Node: '--enable-shared'70479
+Node: '--enable-silent-rules'70856
+Node: '--without-ln-s'71314
+Node: '--without-x'71667
+Node: Program-specific configure options71859
+Node: '--enable-PROG' '--disable-PROG'72522
+Node: '--disable-all-pkgs'72801
+Node: Configure options for 'texk/web2c'73592
+Node: Configure options for 'texk/bibtex-x'76136
+Node: Configure options for 'texk/dvipdfm-x'76685
+Node: Configure options for 'texk/dvisvgm'77467
+Node: Configure options for 'texk/texlive'78354
+Node: Configure options for 'texk/xdvik'78781
+Node: Configure options for 'utils/xindy'79408
+Node: Library-specific configure options80302
+Node: Configure options for 'kpathsea'81265
+Node: Variables for configure81973
+Node: Coding conventions83399
+Node: Declarations and definitions84114
+Node: Const86288
+Node: Continuous integration88152
+Node: Transfer from Subversion to Github88816
+Node: Automatic update of the Git mirror90978
+Node: CI testing on Travis-CI91560
+Node: Releases on Github92269
+Node: install-tl92709
+Node: install-tl NAME93078
+Node: install-tl SYNOPSIS93236
+Node: install-tl DESCRIPTION93494
+Node: install-tl REFERENCES94554
+Node: install-tl OPTIONS95078
+Ref: install-tl *-gui* [[=]_module_]95419
+Ref: install-tl 'text'95627
+Ref: install-tl 'tcl' (or "perltk" or "wizard" or "expert" or nothing)95812
+Ref: install-tl *-no-gui*96444
+Ref: install-tl *-lang* _llcode_96534
+Ref: install-tl *-repository* _url|path_97158
+Ref: install-tl *-select-repository*98047
+Ref: install-tl *-all-options*98465
+Ref: install-tl *-custom-bin* _path_98720
+Ref: install-tl *-debug-translation*99554
+Ref: install-tl *-force-platform* _platform_99830
+Ref: install-tl *-help*, *--help*, *-?*100074
+Ref: install-tl *-in-place*100487
+Ref: install-tl *-init-from-profile* _profile_file_101032
+Ref: install-tl *-logfile* _file_101301
+Ref: install-tl *-no-cls*101652
+Ref: install-tl *-no-persistent-downloads*101800
+Ref: install-tl *-persistent-downloads*101825
+Ref: install-tl *-no-verify-downloads*102443
+Ref: install-tl *-non-admin*102806
+Ref: install-tl *-portable*102899
+Ref: install-tl *-print-platform*103038
+Ref: install-tl *-profile* _profile_file_103236
+Ref: install-tl *-q*103457
+Ref: install-tl *-scheme* _scheme_103519
+Ref: install-tl *-v*103993
+Ref: install-tl *-version*, *--version*104148
+Node: install-tl PROFILES104282
+Ref: install-tl 'instopt_adjustpath' (default 0 on Unix, 1 on Windows)107148
+Ref: install-tl 'instopt_adjustrepo' (default 1)107224
+Ref: install-tl 'instopt_letter' (default 0)107361
+Ref: install-tl 'instopt_portable' (default 0)107452
+Ref: install-tl 'instopt_write18_restricted' (default 1)107548
+Node: install-tl ENVIRONMENT VARIABLES108887
+Ref: install-tl 'TEXLIVE_DOWNLOADER'109265
+Ref: install-tl 'TL_DOWNLOAD_PROGRAM'109288
+Ref: install-tl 'TL_DOWNLOAD_ARGS'109308
+Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'109512
+Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'109714
+Ref: install-tl 'TEXLIVE_INSTALL_NO_RESUME'109823
+Ref: install-tl 'TEXLIVE_INSTALL_NO_WELCOME'109975
+Ref: install-tl 'TEXLIVE_INSTALL_PAPER'110096
+Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'110242
+Ref: install-tl 'TEXLIVE_INSTALL_TEXDIR'110268
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'110299
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'110327
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'110356
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'110386
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'110420
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'110451
+Ref: install-tl 'NOPERLDOC'110822
+Node: install-tl AUTHORS AND COPYRIGHT110886
+Node: tlmgr111299
+Node: tlmgr NAME111784
+Node: tlmgr SYNOPSIS111916
+Node: tlmgr DESCRIPTION112106
+Node: tlmgr EXAMPLES113205
+Ref: tlmgr 'tlmgr option repository ctan'113456
+Ref: tlmgr 'tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet'113529
+Ref: tlmgr 'tlmgr update --list'114134
+Ref: tlmgr 'tlmgr update --all'114227
+Ref: tlmgr 'tlmgr info' _what_114384
+Node: tlmgr OPTIONS114646
+Ref: tlmgr *--repository* _url|path_115166
+Ref: tlmgr '/some/local/dir'116352
+Ref: tlmgr 'file:/some/local/dir'116381
+Ref: tlmgr 'ctan'116454
+Ref: tlmgr 'https://mirror.ctan.org/systems/texlive/tlnet'116508
+Ref: tlmgr 'http://server/path/to/tlnet'116849
+Ref: tlmgr 'https://server/path/to/tlnet'117230
+Ref: tlmgr 'ftp://server/path/to/tlnet'117698
+Ref: tlmgr 'user at machine:/path/to/tlnet'117830
+Ref: tlmgr 'scp://user@machine/path/to/tlnet'117871
+Ref: tlmgr 'ssh://user@machine/path/to/tlnet'117912
+Ref: tlmgr *--gui* [_action_]118305
+Ref: tlmgr *--gui-lang* _llcode_119118
+Ref: tlmgr *--command-logfile* _file_119859
+Ref: tlmgr *--debug-translation*120125
+Ref: tlmgr *--machine-readable*120328
+Ref: tlmgr *--no-execute-actions*120596
+Ref: tlmgr *--package-logfile* _file_120789
+Ref: tlmgr *--pause*121043
+Ref: tlmgr *--persistent-downloads*121198
+Ref: tlmgr *--no-persistent-downloads*121226
+Ref: tlmgr *--pin-file*121720
+Ref: tlmgr *--usermode*121938
+Ref: tlmgr *--usertree* _dir_122058
+Ref: tlmgr *--verify-repo=[none|main|all]*122184
+Node: tlmgr ACTIONS123083
+Node: tlmgr help123944
+Node: tlmgr version124421
+Node: tlmgr backup124684
+Ref: tlmgr *backup [_option_...] --all*124855
+Ref: tlmgr *backup [_option_...] _pkg_...*124888
+Ref: tlmgr *--backupdir* _directory_125954
+Ref: tlmgr *--all*126171
+Ref: tlmgr *--clean*[=_N_]126423
+Ref: tlmgr *--dry-run*126750
+Node: tlmgr candidates _pkg_126880
+Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]127235
+Ref: tlmgr *depends*127749
+Ref: tlmgr *executes*128091
+Ref: tlmgr *files*128206
+Ref: tlmgr *runfiles*128342
+Ref: tlmgr *texmfdbs*128479
+Ref: tlmgr - all items in 'TEXMFDBS' have the '!!' prefix.128709
+Ref: tlmgr - all items in 'TEXMFBDS' have an 'ls-R' file (if they exist at all).128785
+Ref: tlmgr - all items in 'TEXMF' with '!!' are listed in 'TEXMFDBS'.128850
+Ref: tlmgr - all items in 'TEXMF' with an 'ls-R' file are listed in 'TEXMFDBS'.128925
+Ref: tlmgr *--use-svn*128950
+Node: tlmgr conf129091
+Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*129379
+Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*129443
+Node: tlmgr dump-tlpdb [_option_...] [--json]131858
+Ref: tlmgr *--local*132291
+Ref: tlmgr *--remote*132330
+Ref: tlmgr *--json*132368
+Node: tlmgr generate132939
+Ref: tlmgr *generate [_option_...] language*133135
+Ref: tlmgr *generate [_option_...] language.dat*133174
+Ref: tlmgr *generate [_option_...] language.def*133213
+Ref: tlmgr *generate [_option_...] language.dat.lua*133256
+Ref: tlmgr *--dest* _output_file_135583
+Ref: tlmgr *--localcfg* _local_conf_file_136159
+Ref: tlmgr *--rebuild-sys*136282
+Node: tlmgr gui137097
+Node: tlmgr info137275
+Ref: tlmgr *info [_option_...] _pkg_...*137437
+Ref: tlmgr *info [_option_...] collections*137471
+Ref: tlmgr *info [_option_...] schemes*137501
+Ref: tlmgr *--list*139031
+Ref: tlmgr *--only-installed*139345
+Ref: tlmgr *--only-remote*139533
+Ref: tlmgr *--data 'item1,item2,...'*139837
+Ref: tlmgr *--json* 1141200
+Node: tlmgr init-usertree141583
+Node: tlmgr install [_option_...] _pkg_...141964
+Ref: tlmgr *--dry-run* 1142472
+Ref: tlmgr *--file*142589
+Ref: tlmgr *--force*142811
+Ref: tlmgr *--no-depends*143031
+Ref: tlmgr *--no-depends-at-all*143190
+Ref: tlmgr *--reinstall*143590
+Ref: tlmgr *--with-doc*143968
+Ref: tlmgr *--with-src*143981
+Node: tlmgr key144709
+Ref: tlmgr *key list*144867
+Ref: tlmgr *key add _file_*144885
+Ref: tlmgr *key remove _keyid_*144907
+Node: tlmgr list145501
+Node: tlmgr option145663
+Ref: tlmgr *option [--json] [show]*145818
+Ref: tlmgr *option [--json] showall|help*145849
+Ref: tlmgr *option _key_ [_value_]*145875
+Node: tlmgr paper150454
+Ref: tlmgr *paper [a4|letter]*150603
+Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>150679
+Ref: tlmgr *paper --json*150694
+Node: tlmgr path151909
+Ref: tlmgr *path [--w32mode=user|admin] add*152070
+Ref: tlmgr *path [--w32mode=user|admin] remove*152107
+Node: tlmgr pinning153592
+Ref: tlmgr 'pinning show'153833
+Ref: tlmgr 'pinning add' _repo_ _pkgglob_...153906
+Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...154025
+Ref: tlmgr 'pinning remove _repo_ --all'154178
+Node: tlmgr platform154232
+Ref: tlmgr *platform list|add|remove _platform_...*154418
+Ref: tlmgr *platform set _platform_*154445
+Ref: tlmgr *platform set auto*154466
+Ref: tlmgr *--dry-run* 2155343
+Node: tlmgr postaction155462
+Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*155692
+Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*155766
+Ref: tlmgr *--w32mode=[user|admin]*156081
+Ref: tlmgr *--fileassocmode=[1|2]*156497
+Ref: tlmgr *--all* 1156782
+Node: tlmgr print-platform156837
+Node: tlmgr print-platform-info157168
+Node: tlmgr remove [_option_...] _pkg_...157468
+Ref: tlmgr *--all* 2157952
+Ref: tlmgr *--backup*158062
+Ref: tlmgr *--backupdir* _directory_ 1158088
+Ref: tlmgr *--no-depends* 1158493
+Ref: tlmgr *--no-depends-at-all* 1158555
+Ref: tlmgr *--force* 1158658
+Ref: tlmgr *--dry-run* 3159131
+Node: tlmgr repository159467
+Ref: tlmgr *repository list*159655
+Ref: tlmgr *repository list _path|url|tag_*159689
+Ref: tlmgr *repository add _path_ [_tag_]*159722
+Ref: tlmgr *repository remove _path|tag_*159754
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*159808
+Ref: tlmgr *repository status*159829
+Ref: tlmgr The tag (which can be the same as the url);161056
+Node: tlmgr restore161534
+Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*161713
+Ref: tlmgr *restore [_option_...] --all*161743
+Ref: tlmgr *--all* 3162443
+Ref: tlmgr *--backupdir* _directory_ 2162657
+Ref: tlmgr *--dry-run* 4162838
+Ref: tlmgr *--force* 2162970
+Ref: tlmgr *--json* 2163016
+Node: tlmgr search163343
+Ref: tlmgr *search [_option_...] _what_*163507
+Ref: tlmgr *search [_option_...] --file _what_*163544
+Ref: tlmgr *search [_option_...] --all _what_*163580
+Ref: tlmgr *--file* 1163800
+Ref: tlmgr *--all* 4163862
+Ref: tlmgr *--global*163951
+Ref: tlmgr *--word*164078
+Node: tlmgr shell164393
+Ref: tlmgr protocol165128
+Ref: tlmgr help 1165192
+Ref: tlmgr version 1165245
+Ref: tlmgr quit, end, bye, byebye, EOF165313
+Ref: tlmgr restart165334
+Ref: tlmgr load [local|remote]165457
+Ref: tlmgr save165527
+Ref: tlmgr get [_var_] =item set [_var_ [_val_]]165650
+Node: tlmgr show166251
+Node: tlmgr uninstall166418
+Node: tlmgr update [_option_...] [_pkg_...]166648
+Ref: tlmgr *--all* 5167019
+Ref: tlmgr *--self*169198
+Ref: tlmgr *--dry-run* 5169962
+Ref: tlmgr *--list* [_pkg_]170139
+Ref: tlmgr *--exclude* _pkg_170828
+Ref: tlmgr *--no-auto-remove* [_pkg_...]171628
+Ref: tlmgr *--no-auto-install* [_pkg_...]172112
+Ref: tlmgr *--reinstall-forcibly-removed*172874
+Ref: tlmgr *--backup* 1173409
+Ref: tlmgr *--backupdir* _directory_ 3173435
+Ref: tlmgr *--no-depends* 2174601
+Ref: tlmgr *--no-depends-at-all* 2174804
+Ref: tlmgr *--force* 3174907
+Node: tlmgr CONFIGURATION FILE FOR TLMGR175898
+Ref: tlmgr 'auto-remove', value 0 or 1 (default 1), same as command-line option.176905
+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.177042
+Ref: tlmgr 'gui-lang' _llcode_, with a language code value as with the command-line option.177124
+Ref: tlmgr 'no-checksums', value 0 or 1 (default 0, see below).177178
+Ref: tlmgr 'persistent-downloads', value 0 or 1 (default 1), same as command-line option.177258
+Ref: tlmgr 'require-verification', value 0 or 1 (default 0), same as command-line option.177338
+Ref: tlmgr 'tkfontscale', value any float. Controls the scaling of fonts in the Tk based frontends.177428
+Ref: tlmgr 'update-exclude', value: comma-separated list of packages (no space allowed). Same as the command line option '--exclude' for the action 'update'.177576
+Ref: tlmgr 'verify-downloads', value 0 or 1 (default 1), same as command-line option.177652
+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').177921
+Node: tlmgr CRYPTOGRAPHIC VERIFICATION179009
+Node: tlmgr Configuration of GnuPG invocation181182
+Node: tlmgr USER MODE181820
+Node: tlmgr User mode install184666
+Node: tlmgr User mode backup, restore, remove, update185810
+Node: tlmgr User mode generate, option, paper186252
+Node: tlmgr MULTIPLE REPOSITORIES186628
+Node: tlmgr Pinning188357
+Node: tlmgr GUI FOR TLMGR190280
+Node: tlmgr Main display191929
+Node: tlmgr Display configuration area192181
+Ref: tlmgr Status192542
+Ref: tlmgr Category192706
+Ref: tlmgr Match192892
+Ref: tlmgr Selection193073
+Ref: tlmgr Display configuration buttons193277
+Node: tlmgr Package list area193460
+Ref: tlmgr a checkbox194044
+Ref: tlmgr package name194180
+Ref: tlmgr local revision (and version)194279
+Ref: tlmgr remote revision (and version)194654
+Ref: tlmgr short description194951
+Node: tlmgr Main display action buttons194996
+Ref: tlmgr Update all installed195262
+Ref: tlmgr Update195634
+Ref: tlmgr Install195684
+Ref: tlmgr Remove195870
+Ref: tlmgr Backup196048
+Node: tlmgr Menu bar196205
+Ref: tlmgr 'tlmgr' menu196428
+Ref: tlmgr 'Options menu'196736
+Ref: tlmgr 'Actions menu'197819
+Ref: tlmgr 'Help menu'198247
+Node: tlmgr GUI options198381
+Ref: tlmgr '-background' _color_198627
+Ref: tlmgr '-font "' _fontname_ _fontsize_ '"'198692
+Ref: tlmgr '-foreground' _color_198850
+Ref: tlmgr '-geometry' _geomspec_198902
+Ref: tlmgr '-xrm' _xresource_199094
+Node: tlmgr MACHINE-READABLE OUTPUT199363
+Node: tlmgr Machine-readable 'update' and 'install' output200179
+Ref: tlmgr 'location-url' _location_201461
+Ref: tlmgr 'total-bytes' _count_201677
+Ref: tlmgr _pkgname_202087
+Ref: tlmgr _status_202297
+Ref: tlmgr 'd'202375
+Ref: tlmgr 'f'202435
+Ref: tlmgr 'u'202614
+Ref: tlmgr 'r'202660
+Ref: tlmgr 'a'202783
+Ref: tlmgr 'i'202961
+Ref: tlmgr 'I'203080
+Ref: tlmgr _localrev_203182
+Ref: tlmgr _serverrev_203289
+Ref: tlmgr _size_203401
+Ref: tlmgr _runtime_203570
+Ref: tlmgr _esttot_203640
+Node: tlmgr Machine-readable 'option' output203673
+Node: tlmgr ENVIRONMENT VARIABLES204191
+Ref: tlmgr 'TEXLIVE_COMPRESSOR'204702
+Ref: tlmgr 'TEXLIVE_DOWNLOADER'205550
+Ref: tlmgr 'TL_DOWNLOAD_PROGRAM'205573
+Ref: tlmgr 'TL_DOWNLOAD_ARGS'205593
+Ref: tlmgr 'TEXLIVE_PREFER_OWN'206619
+Node: tlmgr AUTHORS AND COPYRIGHT207443
+Node: Index207841
End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:
Modified: branches/stable/source/src/doc/tlbuild.texi
===================================================================
--- branches/stable/source/src/doc/tlbuild.texi 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/doc/tlbuild.texi 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,8 +1,8 @@
\input texinfo
@setfilename tlbuild.info
- at set version 2021
- at set month-year September 2021
+ at set version 2022
+ at set month-year February 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
@@ -96,7 +96,6 @@
@end menu
@end ifnottex
-
@node Introduction
@chapter Introduction
@@ -148,7 +147,6 @@
@url{https://tug.org/texlive/doc.html}, or by invoking the program
with @samp{--help} (or look at the end of the source).
-
@c The first word of the chapter/section title here is used to
@c construct the README.* filenames, so choose well. (Or hack the script.)
@@ -210,7 +208,6 @@
integrating new modules into the TL build system. (Despite all
efforts, neither task is easy.)
-
@node Prerequisites
@chapter Prerequisites
@@ -219,24 +216,46 @@
@cindex compilers, C and C++11
Overall, building the @TL{} programs, when using all libraries from
-the TL source tree, requires C and C++11 compilers and GNU
- at code{make}. If @code{make} from your @code{PATH} is not GNU make,
-you can set the @code{MAKE} environment variable to whatever is necessary.
+the TL source tree, requires C and C++11 compilers, GNU @code{make},
+and Python.
+ at itemize
+ at item
+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
- at cindex FreeType
-GNU @code{make} is required only because of some third-party
-libraries, notably FreeType; all the TL-maintained directories (and
-Automake/Autoconf output in general) work with any reasonable
- at code{make}.
+ at cindex FreeType, requires @code{gmake}
+ at cindex @code{$@@} target in normal @code{make} rules
+GNU @code{make} is required only because of third-party libraries,
+notably FreeType. Automake/Autoconf output in general, and the
+TL-maintained directories, work with any reasonable
+ at code{make}. at footnote{There is one exception in TL: the
+ at code{tangle-sh} and related rules use @code{$@@} to mean the target
+name, a feature not present in all @code{make}s. This could be
+alleviated by laborious editing, but since there's no way to avoid GNU
+ at code{make} for builds of the entire tree, it does not seem worth the
+trouble.}
+ at item
@cindex C++11, required
+ at cindex @code{dvisvgm}, requires C++11
+ at cindex HarfBuzz, requires C++11
+ at cindex ICU, requires C++11
A C++11 compiler is similarly required because of the third-party
-library ICU; the program @code{dvisvgm} also requires C++11. It is
-possible to build everything else with older compilers, but you have
-to remove the C++11-dependent sources. @xref{Build one package}.
+libraries ICU and HarfBuzz (at least); the program @code{dvisvgm} also
+requires C++11. It is possible to build what remains with older
+compilers, but you have to remove the C++11-dependent sources.
+ at xref{Build one package}.
+ at item
+ at cindex Python, required by ICU
+Python is required by ICU tests. (If you know how to disable these
+tests and thus eliminate the requirement, please write.)
+
+ at end itemize
+
A few programs in the tree have additional requirements:
@table @file
@@ -243,11 +262,14 @@
@item web2c
@cindex @code{perl}, required by @code{web2c}, etc.
requires @code{perl} for some tests run by @code{make check}.
+Incidentally, the @TeX{} Live installer (@code{install-tl}) and
+manager (@code{tlmgr}) are also written in Perl, but this does not
+matter for compiling the sources.
@item xdvik
@itemx xpdfopen
@cindex X11 development, required by X clients
-require X11 headers and libraries, typically in ``development'' packages
+require X11 headers and libraries, typically in devel(opment) packages
that are not installed by default.
@item xetex
@@ -255,7 +277,7 @@
@cindex @code{ApplicationServices} Mac framework, required by @code{xetex}
@cindex @code{Cocoa} Mac framework, required by @code{xetex}
requires @file{fontconfig} (again both headers and library), or, for
-MacOSX only, the @code{ApplicationServices} and @code{Cocoa}
+MacOS only, the @code{ApplicationServices} and @code{Cocoa}
frameworks.
@item xindy
@@ -296,10 +318,9 @@
such as @code{autoconf} or @code{makeinfo} are still being run, check
your timestamps---notably, @code{use-commit-times} must be set to
@code{yes} in your Subversion configuration (@pxref{Build system
-tools}). Barring buggy commits, no infrastructure tools are needed to
-do a normal build.
+tools}). No infrastructure tools are needed to do a normal build
+(barring bugs).
-
@node Building
@chapter Building
@@ -327,7 +348,6 @@
@menu
* Build iteration:: What @code{configure} and @code{make} do in TL.
-* Build problems:: If the build fails.
* Build in parallel:: Simultaneous @code{make} processes.
* Build distribution:: Making a distribution tarball.
* Build one package:: Example of working on just one program.
@@ -335,7 +355,6 @@
* Cross compilation:: Building on host X for target Y.
@end menu
-
@node Build iteration
@section Build iteration
@@ -368,21 +387,6 @@
all the library and program modules, and finds (should find) nothing
to be done.
-
- at node Build problems
- at section Build problems
-
- at cindex build problems
- at cindex problems with build
- at cindex failure to build
- at vindex --no-clean Build @r{option}
-If configuring or building a module fails, you should first try to
-find and fix the problem. Failing that, a possible workaround is to
-remove the subdirectory for that module from the build tree (so
- at code{configure} won't try to run there, and finally rerun the top
-level @code{make} (or @file{./Build} @code{--no-clean}).
-
-
@node Build in parallel
@section Build in parallel
@@ -404,7 +408,6 @@
using a configure cache file, i.e., specifying the @code{configure}
option @code{-C} (recommended).
-
@node Build distribution
@section Build distribution
@@ -423,7 +426,6 @@
We do not actually distribute any such tarball, and have no plans to
do so.
-
@node Build one package
@section Build one package
@@ -440,8 +442,8 @@
library, first building any required libraries.
Here is an example from start to finish for working on
- at code{dvipdfm-x}. (Unfortunately, this does not suffice for building
-the @TeX{} engines; see the next section.)
+ at code{dvipdfm-x}. Unfortunately, this does not suffice for building
+the @TeX{} engines; see the next section.
@example
mkdir mydir && cd mydir # new working directory
@@ -460,11 +462,21 @@
# Do the make:
make >&outm || echo fail
-# Test:
+# Run the tests:
cd texk/dvipdfm-x
make check
+
+# Run the new binary in the buil tree, finding support files
+# in a separate tree for a TeX Live release YYYY
+# (Bourne shell syntax):
+TEXMFROOT=/usr/local/texlive/YYYY \
+TEXMFCNF=$TEXMFROOT/texmf-dist/web2c \
+./xdvipdfmx ...
@end example
+ at vindex TEXMFROOT @r{for running standalone}
+ at vindex TEXMFCNF @r{for running standalone}
+
Then you can modify source files in @file{mydir/texk/dvipdfm-x} and
rerun @code{make} in @file{mydir/Work/texk/dvipdfm-x} to rebuild; that
build directory is where the binary ends up and where you can run a
@@ -483,8 +495,10 @@
is also a good idea to run @code{make check} after making any changes,
to ensure that whatever tests have been written still pass.
+ at subsubheading Reducing source download size
+
@cindex size of source tree
-Finally, the above retrieves the entire TL source tree (several
+The above retrieves the entire TL source tree (several
hundred megabytes). It is natural to ask if this is really necessary.
Strictly speaking, the answer is no, but it is vastly more convenient
to do so. If you cut down the source tree, you must also give
@@ -496,6 +510,19 @@
@url{http://pdftex.org}), which is indeed such a cut-down TL source
tree.
+ at subsubheading GCC used by default
+
+ at vindex CC=@var{c-compiler}
+ at vindex CXX=@var{c++-compiler}
+ at vindex OBJCXX=@var{objc-compiler}
+ at pindex gcc at r{, default compilers}
+By default, the @code{gcc} compilers will be used if present;
+otherwise, individual packages may use something different. You can
+explicitly specify the compilers to be used with the environment
+variables @code{CC}, @code{CXX}, and @code{OBJCXX}.
+
+ at subsubheading Removing C+11 dependency
+
@cindex C++11, removing dependent sources
Some libraries and programs require C++11; one such is XeTeX. If you
want to build with an older compiler lacking such support, you need to
@@ -510,23 +537,26 @@
@vindex --enable-missing @r{to ignore dependencies}
Also, even with @code{--disable-all-pkgs}, dependencies are (currently)
-checked. One notable case: if a (non-MacOSX) system does not have
+checked. One notable case: if a (non-MacOS) system does not have
@code{fontconfig}, Xe at TeX{} cannot be built (@pxref{Prerequisites}),
and @code{configure} will terminate even with @code{--disable-xetex}.
To proceed without such dependencies, specify @code{--enable-missing}
also.
-Patches to improve all this would be most welcome.
+As of 2022, HarfBuzz also requires C++11. Therefore even more would
+have to be disabled and removed, notably including @code{luahbtex},
+the standard engine used for Lua at LaTeX{}. Removing that would not
+be acceptable for builds intended for distribution; but perhaps for
+testing the above information could still be useful.
- at vindex CC=@var{c-compiler}
- at vindex CXX=@var{c++-compiler}
- at vindex OBJCXX=@var{objc-compiler}
- at pindex gcc at r{, default compilers}
-By default, the @code{gcc} compilers will be used if present;
-otherwise, individual packages may use something different. You can
-explicitly specify the compilers to be used with the environment
-variables @code{CC}, @code{CXX}, and @code{OBJCXX}.
+ at cindex removing build directories
+ at cindex @code{configure} problems, work around by removing
+In general, the TL @code{configure} will run in all directories.
+Therefore a general workaround for build problems is to remove failing
+directories from the tree, and also specify the relevant
+ at code{--disable-...} option(s).
+Patches to improve all this would be most welcome.
@node Build one engine
@section Build one engine
@@ -570,9 +600,36 @@
Then it is necessary to again specify the target engine (@code{tex},
in the above) in the @code{make}.
-All this is somewhat unfortunate. We hope to improve the situation in
-the future. Patches are welcome.
+All these complications are rather unfortunate. Patches are welcome.
+ at subsubheading Testing one engine
+
+To run only the tests for a given engine, say @code{hitex}:
+
+ at example
+make -C $ww check SUBDIRS=. TESTS='$(hitex_tests)'
+ at end example
+
+ at noindent where @code{$ww} is the web2c build directory, that is,
+ at file{ww=/wherever/Build/source/Work/texk/web2c}.
+
+It's also possible to run individual tests the same way, using the test
+name exactly as specified in the @file{.am} file:
+
+ at example
+make -C $ww check SUBDIRS=. TESTS=hitexdir/tests/hello.test
+ at end example
+
+ at vindex --no-print-directory @r{GNU make option}
+If you get tired of looking at the @samp{Entering}/@samp{Leaving
+directory} lines, you can add the (GNU) make option
+ at code{--no-print-dir}.
+
+You may find it useful to put lengthy incantations like this into a
+trivial shell script with a short name (say, @code{hitst}). Then you
+just run @code{hitst} and edit the file when necessary to change
+things around.
+
@node Cross compilation
@section Cross compilation
@@ -594,7 +651,7 @@
(@pxref{Hosts and Cross-Compilation,,, autoconf, GNU Autoconf}).
In order to build, e.g., 32-bit binaries with @command{clang} on a 64-bit
-MacOSX system one could use:
+MacOS system one could use:
@example
TL_BUILD_ENV="CC='clang -arch i386' \
@@ -721,7 +778,6 @@
Building @code{xindy} requires running the host system @code{clisp}
binary, thus cross compilation is painful, but possible.
-
@node Installing
@chapter Installing
@@ -751,7 +807,6 @@
* Distro builds:: Configuring and building for OS distributions.
@end menu
-
@node Installation directories
@section Installation directories
@@ -811,7 +866,6 @@
@file{Master/bin/@var{tl-platform}}. The other files and directories
that end up in @file{./inst/} are ignored.
-
@node Linked scripts
@section Linked scripts
@@ -852,7 +906,6 @@
information about building those exceptions, as well as the @code{xz}
and @code{wget} programs that are used in the TL infrastructure.)
-
@node Distro builds
@section Distro builds
@@ -925,7 +978,6 @@
article needs updating in the future, perhaps we will merge it into
this document.)
-
@node Layout and infrastructure
@chapter Layout and infrastructure
@@ -947,7 +999,6 @@
* Extending @TL{}:: Adding a new module.
@end menu
-
@node Build system tools
@section Build system tools
@@ -1006,7 +1057,6 @@
@file{config.h.in} (or @file{c-auto.in}), and finally all
@file{Makefile.in} files.
-
@node Top-level directories
@section Top-level directories
@@ -1062,7 +1112,6 @@
be changed by setting environment variables before running it; see the
script source.
-
@node Autoconf macros
@section Autoconf macros
@@ -1124,7 +1173,6 @@
modules.
@end defmac
-
@node Macros for programs
@subsection Macros for programs
@@ -1152,7 +1200,6 @@
Call @code{AC_PROG_LEX} and add the flag @code{-l} for @code{flex}.
@end defmac
-
@node Macros for compilers
@subsection Macros for compilers
@@ -1199,7 +1246,6 @@
This macro caches its result in the @code{kpse_cv_cxx_hack} variable.
@end defmac
-
@node Macros for libraries
@subsection Macros for libraries
@@ -1212,7 +1258,6 @@
@code{-D at var{extra-define}}) to @var{variable}.
@end defmac
-
@node Macros for library and header flags
@subsection Macros for library and header flags
@@ -1281,7 +1326,6 @@
KPSE_RESTORE_FLAGS # @r{restore @code{CPPFLAGS} and @code{LIBS}}
@end example
-
@node Macros for Windows
@subsection Macros for Windows
@@ -1332,7 +1376,6 @@
@code{@var{bar}->@var{foo}} for Unix-like systems.
@end defmac
-
@node Library modules
@section Library modules
@@ -1420,7 +1463,6 @@
@code{--with-system-libpng}, which then uses @code{pkg-config} to
determine the flags required for the system library.
-
@node @code{zlib} library
@subsection The @code{zlib} library in @file{libs/zlib}
@@ -1434,7 +1476,6 @@
@code{--with-zlib-libdir} to specify non-standard locations of the
@code{zlib} headers and/or library.
-
@node @code{freetype} library
@subsection The @code{freetype} library in @file{libs/freetype2}
@@ -1453,7 +1494,6 @@
The flags required for the system library are obtained through
@code{freetype-config}.
-
@node @code{kpathsea} library
@subsection The @code{kpathsea} library in @file{texk/kpathsea}
@@ -1489,7 +1529,6 @@
@code{-no-mktex=tfm} for the @TeX{}-like engines override this
default.
-
@node Program modules
@section Program modules
@@ -1505,7 +1544,6 @@
* @code{asymptote}:: @file{utils/asymptote}
@end menu
-
@node @code{t1utils} package
@subsection The @code{t1utils} package in @file{utils/t1utils}
@@ -1523,7 +1561,6 @@
@noindent specifying the module name without any dependencies, and
supplies the configure option @code{--disable-t1utils}.
-
@node @code{xindy} package
@subsection The @code{xindy} package in @file{utils/xindy}
@@ -1554,7 +1591,6 @@
specify more @code{configure} options to be seen at the top level,
with @file{ac/xindy.ac} also included by @file{configure.ac}.
-
@node @code{xdvik} package
@subsection The @code{xdvik} package in @file{texk/xdvik}
@@ -1585,7 +1621,6 @@
@file{configure.ac} and supplies the configure option
@code{--with-xdvi-x-toolkit} also seen at the top level.
-
@node @code{asymptote}
@subsection The subdirectory @file{utils/asymptote}
@@ -1599,7 +1634,6 @@
installed independently, but are included on the TL DVD together with
their support files. See @url{https://tug.org/build.html#asymptote}.
-
@node Extending @TL{}
@section Extending @TL{}
@@ -1624,7 +1658,6 @@
* Adding a new @TeX{}-specific library module::
@end menu
-
@node Adding a new program module
@subsection Adding a new program module
@@ -1848,7 +1881,6 @@
@file{m4/kpse-pkgs.m4} must be extended by the line:@*@ @ @
@code{AC_REQUIRE([KPSE_ at var{LIB}_SYSTEM_FLAGS])}
-
@node Adding a new @TeX{}-specific library module
@subsection Adding a new @TeX{}-specific library module
@@ -1873,7 +1905,6 @@
The fragment @code{ac/withenable.ac} must use @code{KPSE_WITH_TEXLIB}.
@end itemize
-
@node Configure options
@chapter Configure options
@@ -1910,7 +1941,6 @@
* Variables for configure::
@end menu
-
@node Global configure options
@section Global configure options
@@ -1933,7 +1963,6 @@
* @code{--without-x}::
@end menu
-
@node @code{--disable-native-texlive-build}
@subsection @code{--disable-native-texlive-build}
@@ -1956,7 +1985,6 @@
use this option to enable TL-specific adaptations, such as
installation paths.
-
@node @code{--prefix} @code{--bindir} @dots{}
@subsection @code{--prefix}, @code{--bindir}, @dots{}
@@ -1971,7 +1999,6 @@
if set, on the @code{make} command line (@pxref{Staged Installs, ,
Installation in a temporary location, automake, GNU Automake}).
-
@node @code{--disable-largefile}
@subsection @code{--disable-largefile}
@@ -1989,7 +2016,6 @@
With LFS, there is no fixed limit on the size of PDF files created by
@file{pdftex} or PostScript files created by @file{dvips}.
-
@node @code{--disable-missing}
@subsection @code{--disable-missing}
@@ -1998,7 +2024,6 @@
must be disabled, e.g., due to missing libraries. This can help when
figuring out a specific (sub)set of modules to enable.
-
@node @code{--enable-compiler-warnings=}@var{level}
@subsection @code{--enable-compiler-warnings=}@var{level}
@@ -2011,7 +2036,6 @@
consistently used in all library and program modules. At present,
these warning flags assume options from the GNU compilers.
-
@node @code{--enable-cxx-runtime-hack}
@subsection @code{--enable-cxx-runtime-hack}
@@ -2019,7 +2043,6 @@
try to statically link with @code{libstdc++}, thus improving
portability of the resulting binary. @xref{Macros for compilers}.
-
@node @code{--enable-maintainer-mode}
@subsection @code{--enable-maintainer-mode}
@@ -2030,7 +2053,6 @@
rebuilds infrastructure files as needed. @xref{maintainer-mode,,
@code{missing} and @code{AM_MAINTAINER_MODE}, automake, GNU Automake}.
-
@node @code{--enable-multiplatform}
@subsection @code{--enable-multiplatform}
@@ -2047,7 +2069,6 @@
@code{bindir} and @code{libdir} are automatically propagated to all
subdirectories.
-
@node @code{--enable-shared}
@subsection @code{--enable-shared}
@@ -2056,7 +2077,6 @@
@file{libkpathsea}. This is not allowed for a native TL build (i.e.,
@code{--disable-native-texlive-build} must also be specified).
-
@node @code{--enable-silent-rules}
@subsection @code{--enable-silent-rules}
@@ -2068,7 +2088,6 @@
command line to get more verbosity, or @code{V=0} to get less,
regardless of this option.
-
@node @code{--without-ln-s}
@subsection @code{--without-ln-s}
@@ -2077,7 +2096,6 @@
binaries for a Unix-like system. However, @code{make install} will
not create anything useful, and might fail.
-
@node @code{--without-x}
@subsection @code{--without-x}
@@ -2084,7 +2102,6 @@
@vindex --without-x
Disable all programs using the X Window System.
-
@node Program-specific configure options
@section Program-specific configure options
@@ -2104,7 +2121,6 @@
* Configure options for @file{utils/xindy}::
@end menu
-
@node @code{--enable- at var{prog}} @code{--disable- at var{prog}}
@subsection @code{--enable- at var{prog}}, @code{--disable- at var{prog}}
@@ -2112,7 +2128,6 @@
@vindex --disable- at var{prog}
Do or do not build and install the program(s) of module @code{@var{prog}}.
-
@node @code{--disable-all-pkgs}
@subsection @code{--disable-all-pkgs}
@@ -2128,7 +2143,6 @@
explicitly disabled or specify @code{disable} in their
@file{ac/withenable.ac} fragment.
-
@node Configure options for @file{texk/web2c}
@subsection Configure options for @file{texk/web2c}
@@ -2225,7 +2239,6 @@
@noindent @code{--disable-synctex}
@*Do not build the @code{SyncTeX} library and tool.
-
@node Configure options for @file{texk/bibtex-x}
@subsection Configure options for @file{texk/bibtex-x}
@@ -2243,7 +2256,6 @@
@noindent @code{--disable-bibtexu}@*Do not build the @file{bibtexu} program
(building @file{bibtexu} requires @code{ICU} libraries).
-
@node Configure options for @file{texk/dvipdfm-x}
@subsection Configure options for @file{texk/dvipdfm-x}
@@ -2267,7 +2279,6 @@
@noindent @code{--disable-xdvipdfmx}@*Do not build the @file{xdvipdfmx}
program.
-
@node Configure options for @file{texk/dvisvgm}
@subsection Configure options for @file{texk/dvisvgm}
@@ -2291,7 +2302,6 @@
@code{--with-libgs-libdir=@var{dir}}@*Specify non-standard locations
of the Ghostscript headers and library.
-
@node Configure options for @file{texk/texlive}
@subsection Configure options for @file{texk/texlive}
@@ -2301,7 +2311,6 @@
scripts'' (@pxref{Linked scripts}), except for the TL scripts required
to run @code{texlinks}.
-
@node Configure options for @file{texk/xdvik}
@subsection Configure options for @file{texk/xdvik}
@@ -2326,7 +2335,6 @@
@noindent @code{--enable-xi2-scrolling}@*Use XInput 2.1 ``smooth scrolling''
if available (default: yes, except for a native TL build).
-
@node Configure options for @file{utils/xindy}
@subsection Configure options for @file{utils/xindy}
@@ -2353,7 +2361,6 @@
the installed version of @file{clisp} (which must be identical to the
one used to build @file{xindy}).
-
@node Library-specific configure options
@section Library-specific configure options
@@ -2467,7 +2474,6 @@
@end vtable
-
@node Coding conventions
@chapter Coding conventions
@@ -2488,7 +2494,6 @@
* Const::
@end menu
-
@node Declarations and definitions
@section Declarations and definitions
@@ -2601,7 +2606,6 @@
otherwise must be carefully analyzed to make sure that they cannot
cause the modification of quantities supposed to be constant.
-
@node Continuous integration
@chapter Continuous integration
@@ -2622,7 +2626,6 @@
* Releases on Github::
@end menu
-
@node Transfer from Subversion to Github
@section Transfer from Subversion to Github
Modified: branches/stable/source/src/libs/Makefile.in
===================================================================
--- branches/stable/source/src/libs/Makefile.in 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/libs/Makefile.in 2022-03-01 02:03:00 UTC (rev 874)
@@ -420,23 +420,6 @@
# Files not to be distributed
recurse_this = libs/
recurse_top = ../
-
-# am/recurse.am: Makefile fragment to configure and build subdirs.
-#
-# Copyright 2017-2020 Karl Berry <tex-live at tug.org>
-# Copyright 2013 Peter Breitenlohner <tex-live at tug.org>
-# You may freely use, modify and/or distribute this file.
-#
-# Requires $(recurse_this) and $(recurse_top).
-# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
-#
-# For subdirs not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because, e.g., some required libraries were not built.
-# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
-#
-# Code inspired by automake's way to handle recursive targets.
-#
cf_silent = $(cf_silent_ at AM_V@)
cf_silent_ = $(cf_silent_ at AM_DEFAULT_V@)
cf_silent_0 = --silent
@@ -947,6 +930,8 @@
@echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
exit 1
+# (end of recurse.am)
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/stable/source/src/libs/README
===================================================================
--- branches/stable/source/src/libs/README 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/libs/README 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,5 +1,4 @@
-
-$Id: README 60943 2021-11-04 00:51:18Z kakuto $
+$Id: README 61999 2022-02-13 03:14:24Z kakuto $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -13,7 +12,7 @@
cairo 1.16.0 - checked 20oct18
http://cairographics.org/releases/
-freetype2 2.11.0 - checked 01sep21
+freetype2 2.11.1 - checked 03dec21
http://download.savannah.gnu.org/releases/freetype/
gd 2.3.3 - checked 13sep21
@@ -26,11 +25,11 @@
http://sourceforge.net/projects/silgraphite/files/graphite2/
(requires C++11)
-harfbuzz 3.1.0 - checked 04nov21
- https://github.com/harfbuzz/harfbuzz/releases/download/3.1.0/
+harfbuzz 3.4.0 - checked 13feb22
+ https://github.com/harfbuzz/harfbuzz/releases/download/3.4.0/
-icu 68.2 - checked 13feb21
- http://download.icu-project.org/files/icu4c/
+icu 70.1 - checked 16jan22
+ https://github.com/unicode-org/icu/releases/
libpaper 1.1.24+nmu2 - checked 24oct13
ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/
@@ -56,8 +55,8 @@
pplib 2.05.0 - checked 21apr20
https://github.com/contextgarden/pplib
-teckit 2.5.10 - checked 06may20
- https://github.com/silnrsi/teckit/archive/2.5.10.tar.gz
+teckit 2.5.11 - checked 09nov21
+ https://github.com/silnrsi/teckit/archive/2.5.11.tar.gz
xpdf 4.03 - checked 01feb21
http://www.xpdfreader.com/download.html
Modified: branches/stable/source/src/libs/configure
===================================================================
--- branches/stable/source/src/libs/configure 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/libs/configure 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for TeX Live libs 2022/dev.
+# Generated by GNU Autoconf 2.71 for TeX Live libs 2022.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -610,8 +610,8 @@
# Identity of this package.
PACKAGE_NAME='TeX Live libs'
PACKAGE_TARNAME='tex-live-libs'
-PACKAGE_VERSION='2022/dev'
-PACKAGE_STRING='TeX Live libs 2022/dev'
+PACKAGE_VERSION='2022'
+PACKAGE_STRING='TeX Live libs 2022'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1438,7 +1438,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live libs 2022/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live libs 2022 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,7 +1509,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live libs 2022/dev:";;
+ short | recursive ) echo "Configuration of TeX Live libs 2022:";;
esac
cat <<\_ACEOF
@@ -1561,7 +1561,7 @@
--disable-euptex do not compile and install e-upTeX
--disable-euptex-synctex build e-upTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
- --enable-hitex compile and install HiTeX
+ --disable-hitex do not compile and install HiTeX
--disable-pdftex do not compile and install pdfTeX
--disable-pdftex-synctex build pdfTeX without SyncTeX support
--disable-luatex do not compile and install LuaTeX
@@ -1796,7 +1796,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live libs configure 2022/dev
+TeX Live libs configure 2022
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1919,7 +1919,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live libs $as_me 2022/dev, which was
+It was created by TeX Live libs $as_me 2022, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4571,7 +4571,7 @@
yes | no) :
;; #(
*) :
- enable_hitex=no ;;
+ enable_hitex=yes ;;
esac
test "x$enable_web2c:$enable_hitex" = xyes:yes && {
@@ -6973,7 +6973,7 @@
# Define the identity of the package.
PACKAGE='tex-live-libs'
- VERSION='2022/dev'
+ VERSION='2022'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -8002,7 +8002,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live libs $as_me 2022/dev, which was
+This file was extended by TeX Live libs $as_me 2022, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8061,7 +8061,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-TeX Live libs config.status 2022/dev
+TeX Live libs config.status 2022
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/texk/Makefile.in
===================================================================
--- branches/stable/source/src/texk/Makefile.in 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/Makefile.in 2022-03-01 02:03:00 UTC (rev 874)
@@ -420,23 +420,6 @@
# Files not to be distributed
recurse_this = texk/
recurse_top = ../
-
-# am/recurse.am: Makefile fragment to configure and build subdirs.
-#
-# Copyright 2017-2020 Karl Berry <tex-live at tug.org>
-# Copyright 2013 Peter Breitenlohner <tex-live at tug.org>
-# You may freely use, modify and/or distribute this file.
-#
-# Requires $(recurse_this) and $(recurse_top).
-# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
-#
-# For subdirs not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because, e.g., some required libraries were not built.
-# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
-#
-# Code inspired by automake's way to handle recursive targets.
-#
cf_silent = $(cf_silent_ at AM_V@)
cf_silent_ = $(cf_silent_ at AM_DEFAULT_V@)
cf_silent_0 = --silent
@@ -950,6 +933,8 @@
@echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
exit 1
+# (end of recurse.am)
+
# Special target to run TRIP and TRAP tests and create diffs.
.PHONY: triptrap
triptrap:
Modified: branches/stable/source/src/texk/README
===================================================================
--- branches/stable/source/src/texk/README 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/README 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,5 +1,5 @@
-$Id: README 60856 2021-10-24 05:44:35Z takuji $
-Copyright 2006-2021 TeX Users Group.
+$Id: README 62296 2022-02-28 22:04:29Z karl $
+Copyright 2006-2022 TeX Users Group.
You may freely use, modify and/or distribute this file.
This TeX Live directory contains the programs that use the kpathsea
@@ -31,7 +31,7 @@
http://mirror.ctan.org/support/chktex/
http://download.savannah.gnu.org/releases/chktex/
-cjkutils 4.8.4 - checked 18jul21
+cjkutils 4.8.5 - checked 22jan22
http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=summary
http://www.nongnu.org/cjk/
@@ -64,12 +64,13 @@
dvipsk - maintained here, by us
-dvisvgm 2.11.1 - checked 23jan21
+dvisvgm 2.13.3 - checked 28feb22
https://dvisvgm.de/Downloads/
https://github.com/mgieseki/dvisvgm
+ https://ctan.org/pkg/dvisvgm
-gregorio 5.2.1 - checked 19dec19
- CTAN/support/gregoriotex/gregorio-5.2.1.zip
+gregorio 6.0.0 - checked 14mar21
+ CTAN/support/gregoriotex/gregorio-6.0.0.zip
gsftopk - from Paul Vojta's xdvi.
@@ -108,7 +109,7 @@
ttfdump - maintained here, by us, since Taiwan upstream apparently gone.
-upmendex 0.60 - by Takuji Tanaka
+upmendex 1.00 - by Takuji Tanaka
http://www.ctan.org/pkg/upmendex
https://github.com/t-tk/upmendex-package
Modified: branches/stable/source/src/texk/configure
===================================================================
--- branches/stable/source/src/texk/configure 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/configure 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for TeX Live texk 2022/dev.
+# Generated by GNU Autoconf 2.71 for TeX Live texk 2022.
#
# Report bugs to <tex-live at tug.org>.
#
@@ -610,8 +610,8 @@
# Identity of this package.
PACKAGE_NAME='TeX Live texk'
PACKAGE_TARNAME='tex-live-texk'
-PACKAGE_VERSION='2022/dev'
-PACKAGE_STRING='TeX Live texk 2022/dev'
+PACKAGE_VERSION='2022'
+PACKAGE_STRING='TeX Live texk 2022'
PACKAGE_BUGREPORT='tex-live at tug.org'
PACKAGE_URL=''
@@ -1438,7 +1438,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live texk 2022/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live texk 2022 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,7 +1509,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live texk 2022/dev:";;
+ short | recursive ) echo "Configuration of TeX Live texk 2022:";;
esac
cat <<\_ACEOF
@@ -1561,7 +1561,7 @@
--disable-euptex do not compile and install e-upTeX
--disable-euptex-synctex build e-upTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
- --enable-hitex compile and install HiTeX
+ --disable-hitex do not compile and install HiTeX
--disable-pdftex do not compile and install pdfTeX
--disable-pdftex-synctex build pdfTeX without SyncTeX support
--disable-luatex do not compile and install LuaTeX
@@ -1796,7 +1796,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live texk configure 2022/dev
+TeX Live texk configure 2022
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1919,7 +1919,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live texk $as_me 2022/dev, which was
+It was created by TeX Live texk $as_me 2022, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4571,7 +4571,7 @@
yes | no) :
;; #(
*) :
- enable_hitex=no ;;
+ enable_hitex=yes ;;
esac
test "x$enable_web2c:$enable_hitex" = xyes:yes && {
@@ -6973,7 +6973,7 @@
# Define the identity of the package.
PACKAGE='tex-live-texk'
- VERSION='2022/dev'
+ VERSION='2022'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -8086,7 +8086,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live texk $as_me 2022/dev, which was
+This file was extended by TeX Live texk $as_me 2022, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8145,7 +8145,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-TeX Live texk config.status 2022/dev
+TeX Live texk config.status 2022
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/texk/kpathsea/ChangeLog
===================================================================
--- branches/stable/source/src/texk/kpathsea/ChangeLog 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/kpathsea/ChangeLog 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,3 +1,19 @@
+2022-02-27 Karl Berry <karl at tug.org>
+
+ * texmf.cnf (nest_size): 500 -> 1000.
+ (param_size): 10000 -> 20000.
+ (stack_size): 5000 -> 10000.
+ For stex (ctan.org/pkg/stex), although they also double main_memory
+ to 12M (despite the supposed limit of 8M)?
+
+2022-01-18 Karl Berry <karl at freefriends.org>
+
+ * version.ac (kpse_dev): no more /dev.
+ * NEWS,
+ * doc/kpathsea.texi,
+ * kpsewhich.c,
+ * texmf.cnf: copyright 2022.
+
2021-11-01 Marcel Fabian Krueger <tex at 2krueger.de>
* str-list.c (str_list_uniqify): compare each input element
Modified: branches/stable/source/src/texk/kpathsea/NEWS
===================================================================
--- branches/stable/source/src/texk/kpathsea/NEWS 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/kpathsea/NEWS 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,6 +1,7 @@
-$Id: NEWS 60982 2021-11-07 00:26:08Z karl $
+$Id: NEWS 61654 2022-01-18 22:17:46Z karl $
This file records noteworthy changes. (Public domain.)
+6.3.4 (for TeX Live 2022)
* First return path from kpsewhich -all is now the same as non-all.
(Internally, str_list_uniqify retains ordering.)
Modified: branches/stable/source/src/texk/kpathsea/c-auto.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/c-auto.in 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/kpathsea/c-auto.in 2022-03-01 02:03:00 UTC (rev 874)
@@ -23,7 +23,7 @@
#define KPATHSEA_C_AUTO_H
/* kpathsea: the version string. */
-#define KPSEVERSION "kpathsea version 6.3.4/dev"
+#define KPSEVERSION "kpathsea version 6.3.4"
/* Define to 1 if the `closedir' function returns void instead of int. */
#undef CLOSEDIR_VOID
Modified: branches/stable/source/src/texk/kpathsea/configure
===================================================================
--- branches/stable/source/src/texk/kpathsea/configure 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/kpathsea/configure 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Kpathsea 6.3.4/dev.
+# Generated by GNU Autoconf 2.71 for Kpathsea 6.3.4.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -621,8 +621,8 @@
# Identity of this package.
PACKAGE_NAME='Kpathsea'
PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.3.4/dev'
-PACKAGE_STRING='Kpathsea 6.3.4/dev'
+PACKAGE_VERSION='6.3.4'
+PACKAGE_STRING='Kpathsea 6.3.4'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1376,7 +1376,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Kpathsea 6.3.4/dev to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.3.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1447,7 +1447,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Kpathsea 6.3.4/dev:";;
+ short | recursive ) echo "Configuration of Kpathsea 6.3.4:";;
esac
cat <<\_ACEOF
@@ -1575,7 +1575,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Kpathsea configure 6.3.4/dev
+Kpathsea configure 6.3.4
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2331,7 +2331,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Kpathsea $as_me 6.3.4/dev, which was
+It was created by Kpathsea $as_me 6.3.4, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3091,7 +3091,7 @@
-KPSEVERSION=6.3.4/dev
+KPSEVERSION=6.3.4
KPSE_LT_VERSINFO=9:4:3
@@ -3098,7 +3098,7 @@
- WEB2CVERSION=" (TeX Live 2022/dev)"
+ WEB2CVERSION=" (TeX Live 2022)"
am__api_version='1.16'
@@ -8663,7 +8663,7 @@
# Define the identity of the package.
PACKAGE='kpathsea'
- VERSION='6.3.4/dev'
+ VERSION='6.3.4'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -15415,7 +15415,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Kpathsea $as_me 6.3.4/dev, which was
+This file was extended by Kpathsea $as_me 6.3.4, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15483,7 +15483,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-Kpathsea config.status 6.3.4/dev
+Kpathsea config.status 6.3.4
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/texk/kpathsea/doc/kpathsea.info
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/kpathsea.info 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/kpathsea/doc/kpathsea.info 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,9 +1,9 @@
-This is kpathsea.info, produced by makeinfo version 6.8 from
+This is kpathsea.info, produced by makeinfo version 5.1 from
kpathsea.texi.
This file documents the Kpathsea library for path searching.
- Copyright (C) 1996-2021 Karl Berry & Olaf Weber.
+ Copyright (C) 1996-2022 Karl Berry & Olaf Weber.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
@@ -37,7 +37,7 @@
****************
This manual documents the Kpathsea library for path searching. It
-corresponds to version 6.3.3, released in July 2021.
+corresponds to version 6.3.4, released in January 2022.
* Menu:
@@ -61,8 +61,8 @@
1 Introduction
**************
-This manual corresponds to version 6.3.3 of the Kpathsea library,
-released in July 2021.
+This manual corresponds to version 6.3.4 of the Kpathsea library,
+released in January 2022.
The library's fundamental purpose is to return a filename from a list
of directories specified by the user, similar to what shells do when
@@ -3031,7 +3031,7 @@
* !! and casefolding: Casefolding examples.
(line 57)
* !! in path specifications: ls-R. (line 57)
-* !! in TEXMFDBS: ls-R. (line 11)
+* !! in 'TEXMFDBS': ls-R. (line 11)
* $ expansion: Variable expansion. (line 6)
* --all: Path searching options.
(line 12)
@@ -3039,7 +3039,7 @@
(line 19)
* --cnf-line: Path searching options.
(line 28)
-* --cnf-line, source for path: Path sources. (line 9)
+* '--cnf-line', source for path: Path sources. (line 9)
* --color=tty: ls-R. (line 25)
* --debug=NUM: Auxiliary tasks. (line 9)
* --dpi=NUM: Path searching options.
@@ -3085,12 +3085,12 @@
* --without-mktexpk-default: mktex configuration. (line 12)
* --without-mktextfm-default: mktex configuration. (line 12)
* -1 debugging value: Debugging. (line 23)
-* -A option to ls: ls-R. (line 39)
+* -A option to 'ls': ls-R. (line 39)
* -D NUM: Path searching options.
(line 49)
* -iname, find predicate: Casefolding examples.
(line 78)
-* -L option to ls: ls-R. (line 44)
+* -L option to 'ls': ls-R. (line 44)
* . directories, ignored: ls-R. (line 39)
* . files: ls-R. (line 39)
* .2602gf: Unable to generate fonts.
@@ -3167,7 +3167,7 @@
(line 195)
* .pro: Supported file formats.
(line 169)
-* .PROGNAME qualifier in texmf.cnf: Config files. (line 50)
+* .PROGNAME qualifier in 'texmf.cnf': Config files. (line 50)
* .rhosts, writable by TeX: Security. (line 10)
* .ris: Supported file formats.
(line 173)
@@ -3177,7 +3177,7 @@
(line 42)
* .tex: Supported file formats.
(line 180)
-* .tex file, included in ls-R: ls-R. (line 39)
+* .tex file, included in 'ls-R': ls-R. (line 39)
* .tfm: Supported file formats.
(line 199)
* .ttc: Supported file formats.
@@ -3205,9 +3205,9 @@
* 8.3 filenames, using: mktex configuration. (line 68)
* : may not be :: Searching overview. (line 13)
* :: expansion: Default expansion. (line 6)
-* ; translated to : in texmf.cnf: Config files. (line 66)
-* = omitted in texmf.cnf and misparsing: Config files. (line 86)
-* \, line continuation in texmf.cnf: Config files. (line 37)
+* ; translated to ':' in 'texmf.cnf': Config files. (line 66)
+* = omitted in 'texmf.cnf' and misparsing: Config files. (line 86)
+* \, line continuation in 'texmf.cnf': Config files. (line 37)
* \openin: Searching overview. (line 31)
* \special, suppressing warnings about: Suppressing warnings.
(line 31)
@@ -3230,15 +3230,15 @@
* announcement mailing list: Mailing lists. (line 6)
* API, re-entrant: Programming overview.
(line 16)
-* append-only directories and mktexpk: Security. (line 36)
+* append-only directories and 'mktexpk': Security. (line 36)
* appendonlydir: mktex configuration. (line 60)
* Apple filesystem, case-insensitive: Casefolding rationale.
(line 6)
-* arguments to mktex: mktex script arguments.
+* arguments to 'mktex': mktex script arguments.
(line 6)
* argv[0]: Calling sequence. (line 14)
* autoconf, recommended: Calling sequence. (line 117)
-* automounter, and ls-R: ls-R. (line 46)
+* automounter, and 'ls-R': ls-R. (line 46)
* auxiliary tasks: Auxiliary tasks. (line 6)
* Bach, Johann Sebastian: Default expansion. (line 41)
* backslash-newline: Config files. (line 37)
@@ -3248,7 +3248,7 @@
(line 30)
* BIBINPUTS <1>: Supported file formats.
(line 121)
-* blank lines, in texmf.cnf: Config files. (line 35)
+* blank lines, in 'texmf.cnf': Config files. (line 35)
* BLTXMLINPUTS: Supported file formats.
(line 34)
* brace expansion: Brace expansion. (line 6)
@@ -3276,7 +3276,7 @@
* checksum: Suppressing warnings.
(line 16)
* circle fonts: Fontmap. (line 19)
-* client_path in kpse->format_info: Calling sequence. (line 47)
+* client_path in 'kpse->format_info': Calling sequence. (line 47)
* CLUAINPUTS: Supported file formats.
(line 42)
* CMAPFONTS: Supported file formats.
@@ -3287,7 +3287,7 @@
* cnf.h: Programming with config files.
(line 27)
* comments, in fontmap files: Fontmap. (line 27)
-* comments, in texmf.cnf: Config files. (line 27)
+* comments, in 'texmf.cnf': Config files. (line 27)
* comments, making: Introduction. (line 29)
* common features in glyph lookup: Basic glyph lookup. (line 6)
* common problems: Common problems. (line 6)
@@ -3312,8 +3312,9 @@
* config.status: Bug checklist. (line 27)
* configuration bugs: Bug checklist. (line 27)
* configuration file, source for path: Path sources. (line 20)
-* configuration of mktex scripts: mktex configuration. (line 6)
-* configure options for mktex scripts: mktex configuration. (line 12)
+* configuration of 'mktex' scripts: mktex configuration. (line 6)
+* 'configure' options for 'mktex' scripts: mktex configuration.
+ (line 12)
* context diff: Bug checklist. (line 52)
* continuation character: Config files. (line 37)
* core dumps, reporting: Bug checklist. (line 58)
@@ -3337,7 +3338,7 @@
* directory permissions: Security. (line 51)
* directory structure, for TeX files: TeX directory structure.
(line 6)
-* disabling mktex scripts: mktex configuration. (line 6)
+* disabling 'mktex' scripts: mktex configuration. (line 6)
* disk search: Searching overview. (line 22)
* disk searching, avoiding: ls-R. (line 57)
* disk usage, reducing: Logging. (line 6)
@@ -3364,7 +3365,7 @@
(line 41)
* elt-dirs.c <1>: Subdirectory expansion.
(line 48)
-* enabling mktex scripts: mktex configuration. (line 6)
+* enabling 'mktex' scripts: mktex configuration. (line 6)
* ENCFONTS: Supported file formats.
(line 61)
* engine name: Path searching options.
@@ -3393,7 +3394,7 @@
* extensions, filename: File lookup. (line 24)
* externally-built filename database: Filename database. (line 6)
* extra colons: Default expansion. (line 6)
-* failed mktex... script invocation: mktex script names. (line 35)
+* failed 'mktex...' script invocation: mktex script names. (line 35)
* fallback font: Fallback font. (line 6)
* fallback resolutions: Fallback font. (line 6)
* FAQ, Kpathsea: Common problems. (line 6)
@@ -3479,7 +3480,7 @@
(line 151)
* interface, not frozen: Introduction. (line 29)
* introduction: Introduction. (line 6)
-* kdebug:: Debugging. (line 105)
+* 'kdebug:': Debugging. (line 105)
* kdefault.c: Default expansion. (line 48)
* Knuth, Donald E.: History. (line 6)
* Knuth, Donald E., archive of programs by: unixtex.ftp. (line 20)
@@ -3490,7 +3491,7 @@
(line 27)
* KPATHSEA_DEBUG: Calling sequence. (line 28)
* KPATHSEA_DEBUG <1>: Debugging. (line 18)
-* kpathsea_find_file: File lookup. (line 37)
+* kpathsea_find_file: File lookup. (line 38)
* kpathsea_find_file <1>: Calling sequence. (line 62)
* kpathsea_find_glyph: Glyph lookup. (line 26)
* kpathsea_finish: Calling sequence. (line 106)
@@ -3582,9 +3583,9 @@
(line 20)
* mkocp: mktex script names. (line 18)
* mkofm: mktex script names. (line 21)
-* mktex script configuration: mktex configuration. (line 6)
-* mktex script names: mktex script names. (line 6)
-* mktex scripts: mktex scripts. (line 6)
+* 'mktex' script configuration: mktex configuration. (line 6)
+* 'mktex' script names: mktex script names. (line 6)
+* 'mktex' scripts: mktex scripts. (line 6)
* mktex.cnf: Specially-recognized files.
(line 28)
* mktex.cnf <1>: mktex configuration. (line 29)
@@ -3594,7 +3595,7 @@
* mktexfmt: mktex script names. (line 10)
* mktexmf: mktex script names. (line 15)
* mktexpk: mktex script names. (line 24)
-* mktexpk can't guess mode: Unable to generate fonts.
+* 'mktexpk' can't guess mode: Unable to generate fonts.
(line 12)
* mktextex: mktex script names. (line 27)
* mktextfm: mktex script names. (line 30)
@@ -3615,9 +3616,9 @@
* MT_FEATURES: mktex configuration. (line 39)
* multiple TeX hierarchies: Brace expansion. (line 20)
* must exist: Searching overview. (line 31)
-* names for mktex scripts: mktex script names. (line 6)
+* names for 'mktex' scripts: mktex script names. (line 6)
* Neumann, Gustaf: History. (line 56)
-* NFS and ls-R: ls-R. (line 46)
+* NFS and 'ls-R': ls-R. (line 46)
* nomfdrivers: mktex configuration. (line 92)
* nomode: mktex configuration. (line 97)
* none: Suppressing warnings.
@@ -3729,7 +3730,7 @@
* shell variables: Variable expansion. (line 17)
* shell_escape, example for code: Programming with config files.
(line 10)
-* site overrides for mktex...: mktex configuration. (line 29)
+* site overrides for 'mktex...': mktex configuration. (line 29)
* skeleton TeX directory: TeX directory structure.
(line 6)
* slow startup time: Slow path searching. (line 6)
@@ -3764,7 +3765,7 @@
(line 6)
* symbolic links not found: Unable to find files.
(line 21)
-* symbolic links, and ls-R: ls-R. (line 44)
+* symbolic links, and 'ls-R': ls-R. (line 44)
* symlinks, resolving: Calling sequence. (line 31)
* system C compiler bugs: TeX or Metafont failing.
(line 16)
@@ -3789,8 +3790,8 @@
* TeX file lookup: File lookup. (line 6)
* TeX glyph lookup: Glyph lookup. (line 6)
* TeX support: TeX support. (line 6)
-* TeX Users Group: Introduction. (line 42)
-* tex-file.c: File lookup. (line 37)
+* TeX Users Group: Introduction. (line 43)
+* tex-file.c: File lookup. (line 38)
* tex-file.h: Programming overview.
(line 26)
* tex-glyph.c: Glyph lookup. (line 26)
@@ -3830,7 +3831,7 @@
(line 6)
* texmf.cnf: Specially-recognized files.
(line 38)
-* texmf.cnf missing, warning about: Config files. (line 18)
+* 'texmf.cnf' missing, warning about: Config files. (line 18)
* texmf.cnf, and variable expansion: Variable expansion. (line 6)
* texmf.cnf, definition for: Config files. (line 6)
* texmf.cnf, source for path: Path sources. (line 20)
@@ -3875,7 +3876,7 @@
* tilde.c: Tilde expansion. (line 25)
* time system call: Logging. (line 15)
* tolerance for glyph lookup: Basic glyph lookup. (line 15)
-* trailing / in home directory: Tilde expansion. (line 19)
+* trailing '/' in home directory: Tilde expansion. (line 19)
* trailing colons: Default expansion. (line 6)
* translations, of path searching description: Path searching.
(line 10)
@@ -3901,7 +3902,7 @@
* unreadable file warnings: Suppressing warnings.
(line 27)
* unreadable files: Searching overview. (line 63)
-* unusable ls-R warning: ls-R. (line 51)
+* unusable 'ls-R' warning: ls-R. (line 51)
* usage patterns, finding: Logging. (line 6)
* USERPROFILE, as ~ expansion: Tilde expansion. (line 6)
* USE_TEXMFVAR: mktex configuration. (line 128)
@@ -3919,8 +3920,8 @@
(line 219)
* Vojta, Paul: History. (line 30)
* Walsh, Norman: History. (line 56)
-* warning about unusable ls-R: ls-R. (line 51)
-* warning, about missing texmf.cnf: Config files. (line 18)
+* warning about unusable 'ls-R': ls-R. (line 51)
+* warning, about missing 'texmf.cnf': Config files. (line 18)
* warnings, file access: Searching overview. (line 63)
* warnings, suppressing: Suppressing warnings.
(line 6)
@@ -3947,66 +3948,61 @@
Tag Table:
Node: Top1480
-Node: Introduction2259
-Node: History4325
-Node: unixtex.ftp8921
-Node: Security10391
-Node: TeX directory structure12895
-Node: Path searching16934
-Node: Searching overview17892
-Node: Path sources21711
-Node: Config files22937
-Node: Path expansion27809
-Node: Default expansion28762
-Node: Variable expansion30832
-Node: Tilde expansion32233
-Node: Brace expansion33213
-Node: KPSE_DOT expansion34152
-Node: Subdirectory expansion34665
-Node: Casefolding search37013
-Node: Casefolding rationale37782
-Node: Casefolding examples39128
-Node: Filename database44174
-Node: ls-R45156
-Node: Filename aliases48832
-Node: Database format50010
-Node: Invoking kpsewhich51023
-Node: Path searching options51978
-Node: Specially-recognized files61576
-Node: Auxiliary tasks62931
-Node: Standard options66656
-Node: TeX support67012
-Node: Supported file formats68366
-Node: File lookup76034
-Node: Glyph lookup77783
-Node: Basic glyph lookup78907
-Node: Fontmap79787
-Node: Fallback font82297
-Node: Suppressing warnings83209
-Node: mktex scripts84336
-Node: mktex configuration85551
-Node: mktex script names91354
-Node: mktex script arguments92740
-Node: Programming93619
-Node: Programming overview94192
-Node: Calling sequence97053
-Node: Program-specific files103582
-Node: Programming with config files104605
-Node: Reporting bugs106192
-Node: Bug checklist106870
-Node: Mailing lists110339
-Node: Debugging111016
-Node: Logging116093
-Node: Common problems117960
-Node: Unable to find files118437
-Node: Slow path searching120847
-Node: Unable to generate fonts122222
-Node: TeX or Metafont failing124694
-Node: Index125896
+Node: Introduction2262
+Node: History4331
+Node: unixtex.ftp8927
+Node: Security10397
+Node: TeX directory structure12901
+Node: Path searching16940
+Node: Searching overview17898
+Node: Path sources21717
+Node: Config files22943
+Node: Path expansion27815
+Node: Default expansion28768
+Node: Variable expansion30838
+Node: Tilde expansion32239
+Node: Brace expansion33219
+Node: KPSE_DOT expansion34158
+Node: Subdirectory expansion34671
+Node: Casefolding search37019
+Node: Casefolding rationale37788
+Node: Casefolding examples39134
+Node: Filename database44180
+Node: ls-R45162
+Node: Filename aliases48838
+Node: Database format50016
+Node: Invoking kpsewhich51029
+Node: Path searching options51984
+Node: Specially-recognized files61582
+Node: Auxiliary tasks62937
+Node: Standard options66662
+Node: TeX support67018
+Node: Supported file formats68372
+Node: File lookup76040
+Node: Glyph lookup77789
+Node: Basic glyph lookup78913
+Node: Fontmap79793
+Node: Fallback font82303
+Node: Suppressing warnings83215
+Node: mktex scripts84342
+Node: mktex configuration85557
+Node: mktex script names91360
+Node: mktex script arguments92746
+Node: Programming93625
+Node: Programming overview94198
+Node: Calling sequence97059
+Node: Program-specific files103588
+Node: Programming with config files104611
+Node: Reporting bugs106198
+Node: Bug checklist106876
+Node: Mailing lists110345
+Node: Debugging111022
+Node: Logging116099
+Node: Common problems117966
+Node: Unable to find files118443
+Node: Slow path searching120853
+Node: Unable to generate fonts122228
+Node: TeX or Metafont failing124700
+Node: Index125902
End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:
Modified: branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,13 +2,13 @@
@setfilename kpathsea.info
@settitle Kpathsea: A library for path searching
- at set version 6.3.3
- at set month-year July 2021
+ at set version 6.3.4
+ at set month-year January 2022
@copying
This file documents the Kpathsea library for path searching.
-Copyright @copyright{} 1996--2021 Karl Berry & Olaf Weber.
+Copyright @copyright{} 1996--2022 Karl Berry & Olaf Weber.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
Modified: branches/stable/source/src/texk/kpathsea/kpsewhich.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/kpsewhich.c 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/kpathsea/kpsewhich.c 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,7 +1,7 @@
/* kpsewhich -- standalone path lookup and variable expansion for Kpathsea.
Ideas from Thomas Esser, Pierre MacKay, and many others.
- Copyright 1995-2021 Karl Berry & Olaf Weber.
+ Copyright 1995-2022 Karl Berry & Olaf Weber.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -736,7 +736,7 @@
} else if (ARGUMENT_IS ("version")) {
puts (kpathsea_version_string);
- puts ("Copyright 2021 Karl Berry & Olaf Weber.\n\
+ puts ("Copyright 2022 Karl Berry & Olaf Weber.\n\
License LGPLv2.1+: GNU Lesser GPL version 2.1 or later <https://gnu.org/licenses/lgpl.html>\n\
This is free software: you are free to change and redistribute it.\n\
There is NO WARRANTY, to the extent permitted by law.\n");
Modified: branches/stable/source/src/texk/kpathsea/texmf.cnf
===================================================================
--- branches/stable/source/src/texk/kpathsea/texmf.cnf 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/kpathsea/texmf.cnf 2022-03-01 02:03:00 UTC (rev 874)
@@ -4,8 +4,8 @@
% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
% updated. Instead, put your changes -- and only your changes, not an
% entire copy! -- in ../../texmf.cnf. That is, if this file is
-% installed in /some/path/to/texlive/2021/texmf-dist/web2c/texmf.cnf,
-% put your custom settings in /some/path/to/texlive/2021/texmf.cnf.
+% installed in /some/path/to/texlive/2022/texmf-dist/web2c/texmf.cnf,
+% put your custom settings in /some/path/to/texlive/2022/texmf.cnf.
% (Below, we use YYYY in place of the specific year.)
%
% What follows is a super-summary of what this .cnf file can
@@ -84,10 +84,10 @@
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2021/texmf-var
+TEXMFVAR = ~/.texlive2022/texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2021/texmf-config
+TEXMFCONFIG = ~/.texlive2022/texmf-config
% This is the value manipulated by tlmgr's auxtrees subcommand in the
% root texmf.cnf. Kpathsea warns about a literally empty string for a
@@ -781,9 +781,6 @@
% To increase space for boxes (as might be needed by, e.g., PiCTeX),
% increase extra_mem_bot.
%
-% For some xy-pic samples, you may need as much as 700000 words of memory.
-% For the vast majority of documents, 60000 or less will do.
-%
main_memory = 5000000 % words of inimemory available; also applies to inimf&mp
extra_mem_top = 0 % extra high memory for chars, tokens, etc.
extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc.
@@ -831,12 +828,12 @@
hyph_size = 8191 % prime number of hyphenation exceptions, >610, <65535
% http://primes.utm.edu/curios/page.php/8191.html
% dynamically increased as necessary, so not important.
-nest_size = 500 % simultaneous semantic levels (e.g., groups)
+nest_size = 1000 % simultaneous semantic levels (e.g., groups)
max_in_open = 15 % simultaneous input files and error insertions,
% also applies to MetaPost
-param_size = 10000 % simultaneous macro parameters, also applies to MP
+param_size = 20000 % simultaneous macro parameters, also applies to MP
save_size = 200000 % for saving values outside current group
-stack_size = 5000 % simultaneous input sources
+stack_size = 10000 % simultaneous input sources
% Limit on recursive expansion calls so TeX has a chance to quit nicely
% before stack space runs out. The default is 10000. Normally there is no
Modified: branches/stable/source/src/texk/kpathsea/version.ac
===================================================================
--- branches/stable/source/src/texk/kpathsea/version.ac 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/kpathsea/version.ac 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,5 +1,5 @@
-dnl $Id: version.ac 58897 2021-04-17 21:02:42Z karl $
-dnl Copyright 2016-2021 Karl Berry <tex-live at tug.org>
+dnl $Id: version.ac 61654 2022-01-18 22:17:46Z karl $
+dnl Copyright 2016-2022 Karl Berry <tex-live at tug.org>
dnl Copyright 2011-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
dnl This file is free software; the copyright holder
@@ -20,4 +20,4 @@
dnl --------------------------------------------------------
dnl
dnl This file is m4-included from configure.ac.
-m4_define([kpse_version], [6.3.4/dev])
+m4_define([kpse_version], [6.3.4])
Modified: branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm
===================================================================
--- branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,12 +1,12 @@
-# $Id: TLConfig.pm 59225 2021-05-16 17:41:12Z karl $
# TeXLive::TLConfig.pm - module exporting configuration values
# Copyright 2007-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
+use strict; use warnings;
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 59225 $';
+my $svnrev = '$Revision: 61229 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -60,12 +60,12 @@
# the year of our release, will be used in the location of the
# network packages, and in menu names, and other places.
-$ReleaseYear = 2021;
+our $ReleaseYear = 2021;
# users can upgrade from this year to the current year; might be the
# same as the release year, or any number of releases earlier.
# Generally not tested, but should be.
-$MinRelease = 2016;
+our $MinRelease = 2016;
# Meta Categories do not ship files, but only call for other packages.
our @MetaCategories = qw/Collection Scheme/;
Modified: branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,12 +1,14 @@
-# $Id: TLUtils.pm 59259 2021-05-18 21:39:53Z karl $
+# $Id: TLUtils.pm 61960 2022-02-09 21:43:08Z karl $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2021 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2022 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
+use strict; use warnings;
+
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 59259 $';
+my $svnrev = '$Revision: 61960 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -112,7 +114,7 @@
TeXLive::TLUtils::report_tlpdb_differences(\%ret);
TeXLive::TLUtils::tlnet_disabled_packages($root);
TeXLive::TLUtils::mktexupd();
- TeXLive::TLUtils::setup_sys_user_mode($optsref,$tmfc, $tmfsc, $tmfv, $tmfsv);
+ TeXLive::TLUtils::setup_sys_user_mode($prg,$optsref,$tmfc,$tmfsc,$tmfv,$tmfsv);
TeXLive::TLUtils::prepend_own_path();
TeXLive::TLUtils::repository_to_array($str);
@@ -128,17 +130,54 @@
# avoid -warnings.
our $PERL_SINGLE_QUOTE; # we steal code from Text::ParseWords
-use vars qw(
- $::LOGFILE $::LOGFILENAME @::LOGLINES
- @::debug_hook @::ddebug_hook @::dddebug_hook @::info_hook
- @::install_packages_hook @::warn_hook
- $TeXLive::TLDownload::net_lib_avail
- $::checksum_method $::gui_mode $::machinereadable $::no_execute_actions
- $::regenerate_all_formats
- $JSON::false $JSON::true
-);
+# We use myriad global and package-global variables, unfortunately.
+# To avoid "used only once" warnings, we must use the variable names again.
+#
+# This ugly repetition in the BEGIN block works with all Perl versions.
BEGIN {
+ $::LOGFILE = $::LOGFILE;
+ $::LOGFILENAME = $::LOGFILENAME;
+ @::LOGLINES = @::LOGLINES;
+ @::debug_hook = @::debug_hook;
+ @::ddebug_hook = @::ddebug_hook;
+ @::dddebug_hook = @::dddebug_hook;
+ @::info_hook = @::info_hook;
+ @::warn_hook = @::warn_hook;
+ $::checksum_method = $::checksum_method;
+ $::gui_mode = $::gui_mode;
+ @::install_packages_hook = @::install_packages_hook;
+ $::machinereadable = $::machinereadable;
+ $::no_execute_actions = $::no_execute_actions;
+ $::regenerate_all_formats = $::regenerate_all_formats;
+ #
+ $JSON::false = $JSON::false;
+ $JSON::true = $JSON::true;
+ #
+ $TeXLive::TLDownload::net_lib_avail = $TeXLive::TLDownload::net_lib_avail;
+}
+
+## A cleaner way is to use the "package PKGNAME BLOCK" syntax:
+## when providing a block to the package command, the scope is
+## limited to that block, so the current real package ends up unaffected.
+## Example in first reply to: https://perlmonks.org/?node_id=11139324
+## (Other solutions are also given there, but they don't work well in
+## our context here, although we use them elsewhere.)
+##
+## Unfortunately the package BLOCK syntax was invented for perl 5.14.0,
+## ca.2011, and OpenCSW on Solaris 10 only provides an older Perl. If we
+## ever drop Solaris 10 support, we can replace the above with this.
+##
+#package main {
+# our ($LOGFILE, $LOGFILENAME, @LOGLINES,
+# @debug_hook, @ddebug_hook, @dddebug_hook, @info_hook,
+# @install_packages_hook, @warn_hook,
+# $checksum_method, $gui_mode, $machinereadable,
+# $no_execute_actions, $regenerate_all_formats); }
+#package JSON { our ($false, $true); }
+#package TeXLive::TLDownload { our $net_lib_avail; }
+
+BEGIN {
use Exporter ();
use vars qw(@ISA @EXPORT_OK @EXPORT);
@ISA = qw(Exporter);
@@ -405,7 +444,7 @@
# We don't use uname numbers here.)
#
# this changes each year, per above:
- my $mactex_darwin = 14; # lowest minor rev supported by x86_64-darwin.
+ my $mactex_darwin = 14; # lowest minor rev supported by universal-darwin.
#
# Most robust approach is apparently to check sw_vers (os version,
# returns "10.x" values), and sysctl (processor hardware).
@@ -967,7 +1006,7 @@
# from the UNC path, since (! -d //servername/) tests true
$subdir = $& if ( win32() && ($tree =~ s!^//[^/]+/!!) );
- @dirs = split (/[\/\\]/, $tree);
+ my @dirs = split (/[\/\\]/, $tree);
for my $dir (@dirs) {
$subdir .= "$dir/";
if (! -d $subdir) {
@@ -1184,14 +1223,14 @@
Windows, C<(-l $file)> will never return 'C<true>' and so symlinks will
be (uselessly) copied as regular files.
-If the argument is C<"-L"> and C<$file> is a symlink, the link is
+If the first argument is C<"-L"> and C<$file> is a symlink, the link is
dereferenced before the copying is done. (If both C<"-f"> and C<"-L">
-are desired, they must be given in that order, although the current code
-has no need to do this.)
+are desired, they must be given in that order, although the codebase
+currently has no need to do this.)
-C<copy> invokes C<mkdirhier> if target directories do not exist. Files
-have mode C<0777> if they are executable and C<0666> otherwise, with
-the set bits in I<umask> cleared in each case.
+C<copy> invokes C<mkdirhier> if target directories do not exist. Files
+start with mode C<0777> if they are executable and C<0666> otherwise,
+with the set bits in I<umask> cleared in each case.
C<$file> can begin with a C<file:/> prefix.
@@ -1279,11 +1318,11 @@
chmod ($mode, $outfile) || warn "chmod($mode,$outfile) failed: $!";
- while ($read = sysread (IN, $buffer, $blocksize)) {
+ while (my $read = sysread (IN, $buffer, $blocksize)) {
die "read($infile) failed: $!" unless defined $read;
$offset = 0;
while ($read) {
- $written = syswrite (OUT, $buffer, $read, $offset);
+ my $written = syswrite (OUT, $buffer, $read, $offset);
die "write($outfile) failed: $!" unless defined $written;
$read -= $written;
$offset += $written;
@@ -1521,7 +1560,7 @@
$min %= 60;
}
my $sec = $remsecs % 60;
- $remtime = sprintf("%02d:%02d", $min, $sec);
+ my $remtime = sprintf("%02d:%02d", $min, $sec);
if ($hour) {
$remtime = sprintf("%02d:$remtime", $hour);
}
@@ -1532,7 +1571,7 @@
$tmin %= 60;
}
my $tsec = $esttotalsecs % 60;
- $tottime = sprintf("%02d:%02d", $tmin, $tsec);
+ my $tottime = sprintf("%02d:%02d", $tmin, $tsec);
if ($thour) {
$tottime = sprintf("%02d:$tottime", $thour);
}
@@ -1753,7 +1792,7 @@
}
my $cmd = $keyval{'cmd'};
- my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
+ my $texdir = `kpsewhich -var-value=TEXMFROOT`;
chomp($texdir);
my $texdir_bsl = conv_to_w32_path($texdir);
$cmd =~ s!^("?)TEXDIR/!$1$texdir/!g;
@@ -1828,7 +1867,7 @@
if (win32() && defined($keyval{'filew32'})) {
$file = $keyval{'filew32'};
}
- my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
+ my $texdir = `kpsewhich -var-value=TEXMFROOT`;
chomp($texdir);
my @syscmd;
if ($file =~ m/\.pl$/i) {
@@ -1903,7 +1942,7 @@
&log("postaction $how shortcut for " . $tlpobj->name . "\n");
if ($how eq "install") {
- my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
+ my $texdir = `kpsewhich -var-value=TEXMFROOT`;
chomp($texdir);
my $texdir_bsl = conv_to_w32_path($texdir);
$icon =~ s!^TEXDIR/!$texdir/!;
@@ -2058,7 +2097,7 @@
}
if (-w $to) {
debug ("TLUtils::add_link_dir_dir: linking from $from to $to\n");
- chomp (@files = `ls "$from"`);
+ chomp (my @files = `ls "$from"`);
my $ret = 1;
for my $f (@files) {
# don't make a system-dir link to our special "man" link.
@@ -2094,7 +2133,7 @@
my ($from, $to) = @_;
if ((-d "$to") && (-w "$to")) {
debug("TLUtils::remove_link_dir_dir: removing links from $from to $to\n");
- chomp (@files = `ls "$from"`);
+ chomp (my @files = `ls "$from"`);
my $ret = 1;
foreach my $f (@files) {
next if (! -r "$to/$f");
@@ -2585,6 +2624,20 @@
setup_one(($isWin ? "w32" : "unix"), $defprog,
"$bindir/$dltype/$defprog.$platform", "--version", $tlfirst);
}
+ # check for curl special stuff on MacOS
+ if (member("curl", @working_downloaders) && platform() =~ m/darwin/) {
+ # copied from platform_name
+ chomp (my $sw_vers = `sw_vers -productVersion`);
+ my ($os_major,$os_minor) = split (/\./, $sw_vers);
+ if ($os_major == 10 && ($os_minor == 13 || $os_minor == 14)) {
+ my @curlargs = @{$TeXLive::TLConfig::FallbackDownloaderArgs{'curl'}};
+ # can't push new arg at end of list because builtin list ends with
+ # -o to set the output file.
+ unshift (@curlargs, '--cacert', "$::installerdir/tlpkg/installer/curl/curl-ca-bundle.crt");
+ $TeXLive::TLConfig::FallbackDownloaderArgs{'curl'} = \@curlargs;
+ debug("TLUtils::setup_programs: curl on old darwin, final curl args: @{$TeXLive::TLConfig::FallbackDownloaderArgs{'curl'}}\n");
+ }
+ }
# check for wget/ssl support
if (member("wget", @working_downloaders)) {
debug("TLUtils::setup_programs: checking for ssl enabled wget\n");
@@ -2655,11 +2708,11 @@
if ($::opt_verbosity >= 2) {
require Data::Dumper;
- use vars qw($Data::Dumper::Indent $Data::Dumper::Sortkeys
- $Data::Dumper::Purity); # -w pain
- $Data::Dumper::Indent = 1;
- $Data::Dumper::Sortkeys = 1; # stable output
- $Data::Dumper::Purity = 1; # recursive structures must be safe
+ # avoid spurious "used only once" warnings due to require
+ # (warnings restored at end of scope). https://perlmonks.org/?node_id=3333
+ no warnings 'once';
+ local $Data::Dumper::Sortkeys = 1; # stable output
+ local $Data::Dumper::Purity = 1; # reconstruct recursive structures
print STDERR "DD:dumping ";
print STDERR Data::Dumper->Dump([\%::progs], [qw(::progs)]);
}
@@ -3650,7 +3703,7 @@
sub backtrace {
my $ret = "";
- my ($line, $subr);
+ my ($filename, $line, $subr);
my $stackframe = 1; # skip ourselves
while ((undef,$filename,$line,$subr) = caller ($stackframe)) {
# the undef is for the package, which is already included in $subr.
@@ -4123,9 +4176,9 @@
# so try wget and only check for the return value
# please KEEP the / after $mirror, some ftp mirrors do give back
# an error if the / is missing after ../CTAN/
- my $cmd = "$wget $mirror/ --timeout=$NetworkTimeout -O "
- . (win32() ? "nul" : "/dev/null")
- . " 2>" . (win32() ? "nul" : "/dev/null");
+ my $cmd = "$wget $mirror/ --timeout=$NetworkTimeout -O -"
+ . " >" . (TeXLive::TLUtils::nulldev())
+ . " 2>" . (TeXLive::TLUtils::nulldev());
my $ret = system($cmd);
# if return value is not zero it is a failure, so switch the meanings
return ($ret ? 0 : 1);
@@ -4276,6 +4329,7 @@
sub download_to_temp_or_file {
my $url = shift;
+ my $ret;
my ($url_fh, $url_file);
if ($url =~ m,^(https?|ftp|file)://, || $url =~ m!$SshURIRegex!) {
($url_fh, $url_file) = tl_tmpfile();
@@ -4644,7 +4698,7 @@
foreach my $db (@texmfdbs) {
$db=substr($db, -1) if ($db=~m|/$|); # strip leading /
$db = lc($db) if win32();
- $up = (win32() ? lc($path) : $path);
+ my $up = (win32() ? lc($path) : $path);
if (substr($up, 0, length("$db/")) eq "$db/") {
# we appended a / because otherwise "texmf" is recognized as a
# substring of "texmf-dist".
@@ -4677,10 +4731,15 @@
=item C<setup_sys_user_mode($prg, $optsref, $tmfc, $tmfsc, $tmfv, $tmfsv)>
-Return two-element list C<($texmfconfig,$texmfvar)> of which directories
-to use, either user or sys. If C<$prg> is C<mktexfmt>, and the system
-dirs are writable, use them even if we are in user mode.
+Return two-element list C<($texmfconfig,$texmfvar)> specifying which
+directories to use, either user or sys. If C<$optsref->{'sys'}> is
+true, we are in sys mode; else if C<$optsref->{'user'}> is set, we are
+in user mode; else a fatal error.
+If C<$prg> eq C<"mktexfmt">, and C<$TEXMFSYSVAR/web2c> is writable, use
+it instead of C<$TEXMFVAR>, even if we are in user mode. C<$TEXMFCONFIG>
+is not switched, however.
+
=cut
sub setup_sys_user_mode {
Modified: branches/stable/source/src/texk/web2c/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/ChangeLog 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/ChangeLog 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,3 +1,126 @@
+2022-02-24 Karl Berry <karl at freefriends.org>
+
+ * dvitype.ch (scan_bop, [99]): output a newline between
+ font definitions so they do not run together.
+ From Igor Liferenko,
+ https://tug.org/pipermail/tex-k/2022-January/003760.html (change#3).
+ Original report part of
+ https://tug.org/pipermail/tex-k/2021-November/003711.html,
+ and a first patch from Andreas Scherer in that thread,
+ https://tug.org/pipermail/tex-k/2021-November/003721.html.
+
+2022-02-18 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebboot.cin,
+ * ctangleboot.bin: Add '#line' after '#elif', '#else', and '#endif'.
+
+2022-02-15 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebboot.cin,
+ * ctangleboot.bin: Add '#line' after '#endif'.
+
+2022-02-11 Andreas Scherer <https://ascherer.github.io>
+
+ * weave.ch: Fix spacing in math expression.
+
+2022-02-05 Andreas Scherer <https://ascherer.github.io>
+
+ * ctangleboot.bin: CWEB 4.7 release.
+
+2022-01-29 Karl Berry <karl at freefriends.org>
+
+ * doc/web2c.texi (TeX extensions): simplify references.
+
+2022-01-22 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
+
+ * texmfmem.h: Change type of str_pool to unsigned short for pTeX.
+ We use only 0--511, and use flag 0x100 for Japanese char.
+
+2022-01-21 Karl Berry <karl at freefriends.org>
+
+ * ac/web2c.ac (kpse_tex_progs): enable hitex by default.
+
+2022-01-18 Karl Berry <karl at freefriends.org>
+
+ * doc/web2c.texi (TeX extensions): mention pdftex manual and
+ ltnews31.pdf as primary documentation for the cross-engine
+ functionality.
+ (Introduction): mention TeX Live and teTeX.
+
+2022-01-16 Andreas Scherer <https://ascherer.github.io>
+
+ * weave.ch: Add a third layer to 'byte_mem'.
+
+2022-01-15 Andreas Scherer <https://ascherer.github.io>
+
+ * tangle.ch,
+ * tangleboot.pin,
+ * weave.ch: Adapt WEB to general conventions.
+
+2022-01-12 Marcel Kr\"uger <tex at 2krueger.de>
+
+ * showstream.ch: if (selector<no_print), rather than <log_only.
+
+2022-01-11 Marcel Kr\"uger <tex at 2krueger.de>
+
+ * showstream.ch: adjust selector for show_stream.
+ Bug report from Hironobu Yamashita, 8 Dec 2021:
+\newwrite\IO
+\immediate\openout\IO=io.tex
+\showstream=\IO
+\showtokens A \end
+
+This should throw an error "! Missing { inserted." but for now
+it just stops silently and if I press [Enter] it crashes.
+
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * tangle-sh.in,
+ * ctangleboot-sh.in: be more verbose if AM_V_P.
+ https://tug.org/pipermail/tlbuild/2022q1/005001.html
+ Mention the Automake manual section which is the source for
+ the approach taken:
+ https://gnu.org/s/automake/manual/html_node/Multiple-Outputs.html
+
+ * am/bootstrap.am: do not silence {,c}tangle{,boot}.
+ (common_ctangle): change to variable from common-ctangle target,
+ to avoid endless remakes due to (I think) conflict with
+ common-ctangle stamp file created by ctangleboot-sh[.in].
+ (tangle.web): replace ancient message about web.tar.gz.
+
+ * am/texmf.am: do not silence tangle-sh.
+
+ * Makefile.am,
+ * help.h,
+ * am/web.am: copyright 2022.
+
+2022-01-09 Andreas Scherer <https://ascherer.github.io>
+
+ * help.h,
+ * weav-twill.ch: Minor adaptions for TWILL.
+
+2022-01-07 Karl Berry <karl at freefriends.org>
+
+ * 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>
+
+ * Makefile.in,
+ * am/web.am,
+ * help.h,
+ * twill.test,
+ * weav-twill.ch: Add TWILL 4.5.
+
+2021-12-26 Andreas Scherer <https://ascherer.github.io>
+
+ * ctangleboot.cin,
+ * cwebboot.cin: CWEB release 4.6.
+
+2021-11-14 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebboot.cin: More generic point of interest.
+
2021-11-07 Marcel Kr\"uger <tex at 2krueger.de>
* showstream.ch: new primitive \showstream.
Modified: branches/stable/source/src/texk/web2c/Makefile.am
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.am 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/Makefile.am 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,7 +1,7 @@
-## $Id: Makefile.am 60569 2021-09-21 16:46:46Z karl $
+## $Id: Makefile.am 61986 2022-02-12 18:02:57Z lscarso $
## Makefile.am for the TeX Live subdirectory texk/web2c/.
##
-## Copyright 2017-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2017-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
##
@@ -245,9 +245,12 @@
## MFLua
include $(srcdir)/mfluadir/am/mflua.am
include $(srcdir)/mfluadir/am/mfluaotfcc.am
+include $(srcdir)/mfluadir/am/mfluapotrace.am
+include $(srcdir)/mfluadir/am/mflualpeg.am
## MFLuaJIT
include $(srcdir)/mfluajitdir/am/mfluajit.am
+include $(srcdir)/mfluajitdir/am/mfluajitlpeg.am
## MetaPost
include $(srcdir)/mplibdir/am/mplib.am
Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/Makefile.in 2022-03-01 02:03:00 UTC (rev 874)
@@ -14,25 +14,10 @@
@SET_MAKE@
-# am/bin_links.am: Makefile fragment for bindir links.
-#
-# Copyright 2017-2020 Karl Berry <tex-live at tug.org>
-# Copyright 2011-2013 Peter Breitenlohner <tex-live at tug.org>
-# You may freely use, modify and/or distribute this file.
-#
-# requires conditional WIN32
-# requires $(bin_links)
-# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
-# for binaries and scripts use, e.g.,
-# binprog$(EXEEXT):foo
-# script:bar
-# respectively, such that the links created on cygwin are
-# 'foo->binprog.exe' and 'bar->script'.
-
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -112,8 +97,7 @@
mfluajit$(EXEEXT) mfluajit-nowin$(EXEEXT) mpost$(EXEEXT) \
pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) \
$(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) \
- euptex$(EXEEXT) hitex$(EXEEXT) hishrink$(EXEEXT) \
- histretch$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+ euptex$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
pdftosrc$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) \
luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
$(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
@@ -135,17 +119,17 @@
$(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \
$(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \
$(am__EXEEXT_40) $(am__EXEEXT_41) $(am__EXEEXT_42) \
- $(am__EXEEXT_43)
-TESTS = tangle.test $(am__EXEEXT_46) ctiedir/ctie.test \
+ $(am__EXEEXT_43) $(am__EXEEXT_44)
+TESTS = tangle.test $(am__EXEEXT_47) ctiedir/ctie.test \
cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
$(am__append_16) $(am__append_25) $(am__append_34) \
$(am__append_42) $(am__append_55) $(am__append_56) \
$(am__append_58) $(am__append_63) $(am__append_66) \
$(am__append_68) $(am__append_73) $(am__append_76) \
- $(am__append_78) $(am__append_84) $(am__append_105) \
- $(am__append_106) $(am__append_107) $(am__append_108) \
- $(am__append_116) $(am__append_118) $(am__append_120) \
- $(am__append_154) libmd5/md5.test
+ $(am__append_78) $(am__append_83) $(am__append_86) \
+ $(am__append_107) $(am__append_108) $(am__append_109) \
+ $(am__append_110) $(am__append_118) $(am__append_120) \
+ $(am__append_122) $(am__append_157) libmd5/md5.test
@WEB_TRUE at am__append_1 = $(web_programs)
@WEB_TRUE at am__append_2 = $(web_tests)
@TEX_TRUE at am__append_3 = tex
@@ -231,45 +215,47 @@
@EUPTEX_TRUE at am__append_79 = euptrip.diffs
@EUPTEX_TRUE at am__append_80 = euptrip-clean
@HITEX_TRUE at am__append_81 = hitex hishrink histretch
- at MINGW32_TRUE@am__append_82 = \
+ at HITEX_TRUE@am__append_82 = himktables
+ at HITEX_TRUE@am__append_83 = $(hitex_tests)
+ at MINGW32_TRUE@am__append_84 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
- at PDFTEX_TRUE@am__append_83 = pdftex ttf2afm pdftosrc
- at PDFTEX_TRUE@am__append_84 = $(pdftex_tests) $(ttf2afm_tests) \
+ at PDFTEX_TRUE@am__append_85 = pdftex ttf2afm pdftosrc
+ at PDFTEX_TRUE@am__append_86 = $(pdftex_tests) $(ttf2afm_tests) \
@PDFTEX_TRUE@ $(pdftosrc_tests)
- at LUATEX_TRUE@am__append_85 = luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_86 = call_luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_87 = install-luatex-links
- at LUATEX_TRUE@@WIN32_TRUE at am__append_88 = uninstall-luatex-links
- at LUATEX_TRUE@@WIN32_FALSE at am__append_89 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
- at LUAHBTEX_TRUE@am__append_90 = luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_91 = call_luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_92 = install-luahbtex-links
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_93 = uninstall-luahbtex-links
+ at LUATEX_TRUE@am__append_87 = luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_88 = call_luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_89 = install-luatex-links
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_90 = uninstall-luatex-links
+ at LUATEX_TRUE@@WIN32_FALSE at am__append_91 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+ at LUAHBTEX_TRUE@am__append_92 = luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_93 = call_luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_94 = install-luahbtex-links
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_95 = uninstall-luahbtex-links
# keep texlua[c] as links to luatex unless luatex is not installed.
- at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_94 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
- at LUAJITTEX_TRUE@am__append_95 = luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_96 = call_luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_97 = install-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_98 = uninstall-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_99 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
- at LUAJITHBTEX_TRUE@am__append_100 = luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_101 = call_luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_102 = install-luajithbtex-links
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_103 = uninstall-luajithbtex-links
+ at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_96 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
+ at LUAJITTEX_TRUE@am__append_97 = luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_98 = call_luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_99 = install-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_100 = uninstall-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_101 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+ at LUAJITHBTEX_TRUE@am__append_102 = luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_103 = call_luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_104 = install-luajithbtex-links
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_105 = uninstall-luajithbtex-links
# keep texluajit[c] as links to luajittex unless luajittex is not installed.
- at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_104 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
- at LUATEX_TRUE@am__append_105 = $(luatex_tests)
- at LUAHBTEX_TRUE@am__append_106 = $(luahbtex_tests)
- at LUAJITTEX_TRUE@am__append_107 = $(luajittex_tests)
- at LUAJITHBTEX_TRUE@am__append_108 = $(luajithbtex_tests)
- at XETEX_TRUE@am__append_109 = xetex
- at XETEX_MACOSX_TRUE@am__append_110 = -DXETEX_MAC
- at XETEX_MACOSX_TRUE@am__append_111 = -std=c++11
- at XETEX_MACOSX_FALSE@am__append_112 = $(FONTCONFIG_INCLUDES)
- at XETEX_MACOSX_FALSE@am__append_113 = $(FONTCONFIG_LIBS)
- at XETEX_MACOSX_TRUE@am__append_114 = \
+ at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_106 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
+ at LUATEX_TRUE@am__append_107 = $(luatex_tests)
+ at LUAHBTEX_TRUE@am__append_108 = $(luahbtex_tests)
+ at LUAJITTEX_TRUE@am__append_109 = $(luajittex_tests)
+ at LUAJITHBTEX_TRUE@am__append_110 = $(luajithbtex_tests)
+ at XETEX_TRUE@am__append_111 = xetex
+ at XETEX_MACOSX_TRUE@am__append_112 = -DXETEX_MAC
+ at XETEX_MACOSX_TRUE@am__append_113 = -std=c++11
+ at XETEX_MACOSX_FALSE@am__append_114 = $(FONTCONFIG_INCLUDES)
+ at XETEX_MACOSX_FALSE@am__append_115 = $(FONTCONFIG_LIBS)
+ at XETEX_MACOSX_TRUE@am__append_116 = \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.mm \
@@ -276,105 +262,106 @@
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
- at XETEX_MACOSX_FALSE@am__append_115 = \
+ at XETEX_MACOSX_FALSE@am__append_117 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h
- at XETEX_TRUE@am__append_116 = $(xetex_tests)
- at OTANGLE_TRUE@am__append_117 = $(omegaware_programs)
- at OTANGLE_TRUE@am__append_118 = $(OTANGLE_tests) $(OMFONTS_tests)
- at ALEPH_TRUE@am__append_119 = aleph
- at ALEPH_TRUE@am__append_120 = $(aleph_tests)
- at SYNCTEX_TRUE@am__append_121 = synctex
- at SYNCTEX_TRUE@am__append_122 = $(LTLIBSYNCTEX)
- at SYNCTEX_TRUE@am__append_123 = $(LIBSYNCTEX)
- at MINGW32_TRUE@am__append_124 = -lshlwapi
- at MINGW32_TRUE@am__append_125 = -lshlwapi
- at TEX_SYNCTEX_TRUE@am__append_126 = -I$(srcdir)/synctexdir \
+ at XETEX_TRUE@am__append_118 = $(xetex_tests)
+ at OTANGLE_TRUE@am__append_119 = $(omegaware_programs)
+ at OTANGLE_TRUE@am__append_120 = $(OTANGLE_tests) $(OMFONTS_tests)
+ at ALEPH_TRUE@am__append_121 = aleph
+ at ALEPH_TRUE@am__append_122 = $(aleph_tests)
+ at SYNCTEX_TRUE@am__append_123 = synctex
+ at SYNCTEX_TRUE@am__append_124 = $(LTLIBSYNCTEX)
+ at SYNCTEX_TRUE@am__append_125 = $(LIBSYNCTEX)
+ at MINGW32_TRUE@am__append_126 = $(KPATHSEA_INCLUDES)
+ at MINGW32_TRUE@am__append_127 = -lshlwapi $(KPATHSEA_LIBS)
+ at MINGW32_TRUE@am__append_128 = -lshlwapi
+ at TEX_SYNCTEX_TRUE@am__append_129 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
- at TEX_SYNCTEX_TRUE@am__append_127 = $(ZLIB_LIBS)
- at TEX_SYNCTEX_TRUE@am__append_128 = $(ZLIB_DEPEND)
- at TEX_SYNCTEX_TRUE@am__append_129 = \
+ at TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_LIBS)
+ at TEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_DEPEND)
+ at TEX_SYNCTEX_TRUE@am__append_132 = \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h
- at ETEX_SYNCTEX_TRUE@am__append_130 = -I$(srcdir)/synctexdir \
+ at ETEX_SYNCTEX_TRUE@am__append_133 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
- at ETEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_LIBS)
- at ETEX_SYNCTEX_TRUE@am__append_132 = $(ZLIB_DEPEND)
- at ETEX_SYNCTEX_TRUE@am__append_133 = \
+ at ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_LIBS)
+ at ETEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_DEPEND)
+ at ETEX_SYNCTEX_TRUE@am__append_136 = \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h
- at PTEX_SYNCTEX_TRUE@am__append_134 = -I$(srcdir)/synctexdir \
+ at PTEX_SYNCTEX_TRUE@am__append_137 = -I$(srcdir)/synctexdir \
@PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
- at PTEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_LIBS)
- at PTEX_SYNCTEX_TRUE@am__append_136 = $(ZLIB_DEPEND)
- at PTEX_SYNCTEX_TRUE@am__append_137 = \
+ at PTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_LIBS)
+ at PTEX_SYNCTEX_TRUE@am__append_139 = $(ZLIB_DEPEND)
+ at PTEX_SYNCTEX_TRUE@am__append_140 = \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-ptex.h
- at UPTEX_SYNCTEX_TRUE@am__append_138 = -I$(srcdir)/synctexdir \
+ at UPTEX_SYNCTEX_TRUE@am__append_141 = -I$(srcdir)/synctexdir \
@UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
- at UPTEX_SYNCTEX_TRUE@am__append_139 = $(ZLIB_LIBS)
- at UPTEX_SYNCTEX_TRUE@am__append_140 = $(ZLIB_DEPEND)
- at UPTEX_SYNCTEX_TRUE@am__append_141 = \
+ at UPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_LIBS)
+ at UPTEX_SYNCTEX_TRUE@am__append_143 = $(ZLIB_DEPEND)
+ at UPTEX_SYNCTEX_TRUE@am__append_144 = \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-uptex.h
- at EPTEX_SYNCTEX_TRUE@am__append_142 = -I$(srcdir)/synctexdir \
+ at EPTEX_SYNCTEX_TRUE@am__append_145 = -I$(srcdir)/synctexdir \
@EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
- at EPTEX_SYNCTEX_TRUE@am__append_143 = $(ZLIB_LIBS)
- at EPTEX_SYNCTEX_TRUE@am__append_144 = $(ZLIB_DEPEND)
- at EPTEX_SYNCTEX_TRUE@am__append_145 = \
+ at EPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_LIBS)
+ at EPTEX_SYNCTEX_TRUE@am__append_147 = $(ZLIB_DEPEND)
+ at EPTEX_SYNCTEX_TRUE@am__append_148 = \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-eptex.h
- at EUPTEX_SYNCTEX_TRUE@am__append_146 = -I$(srcdir)/synctexdir \
+ at EUPTEX_SYNCTEX_TRUE@am__append_149 = -I$(srcdir)/synctexdir \
@EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
- at EUPTEX_SYNCTEX_TRUE@am__append_147 = $(ZLIB_LIBS)
- at EUPTEX_SYNCTEX_TRUE@am__append_148 = $(ZLIB_DEPEND)
- at EUPTEX_SYNCTEX_TRUE@am__append_149 = \
+ at EUPTEX_SYNCTEX_TRUE@am__append_150 = $(ZLIB_LIBS)
+ at EUPTEX_SYNCTEX_TRUE@am__append_151 = $(ZLIB_DEPEND)
+ at EUPTEX_SYNCTEX_TRUE@am__append_152 = \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-euptex.h
- at PDFTEX_SYNCTEX_TRUE@am__append_150 = -I$(srcdir)/synctexdir \
+ at PDFTEX_SYNCTEX_TRUE@am__append_153 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
- at PDFTEX_SYNCTEX_TRUE@am__append_151 = \
+ at PDFTEX_SYNCTEX_TRUE@am__append_154 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h
- at XETEX_SYNCTEX_TRUE@am__append_152 = -I$(srcdir)/synctexdir \
+ at XETEX_SYNCTEX_TRUE@am__append_155 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
- at XETEX_SYNCTEX_TRUE@am__append_153 = \
+ at XETEX_SYNCTEX_TRUE@am__append_156 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xetex.h
- at SYNCTEX_TRUE@am__append_154 = $(synctex_tests)
+ at SYNCTEX_TRUE@am__append_157 = $(synctex_tests)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -436,7 +423,7 @@
gftodvi$(EXEEXT) gftopk$(EXEEXT) gftype$(EXEEXT) mft$(EXEEXT) \
patgen$(EXEEXT) pktogf$(EXEEXT) pktype$(EXEEXT) \
pltotf$(EXEEXT) pooltype$(EXEEXT) tftopl$(EXEEXT) \
- vftovp$(EXEEXT) vptovf$(EXEEXT) weave$(EXEEXT)
+ vftovp$(EXEEXT) vptovf$(EXEEXT) weave$(EXEEXT) twill$(EXEEXT)
am__EXEEXT_2 = pbibtex$(EXEEXT) pdvitype$(EXEEXT) ppltotf$(EXEEXT) \
ptftopl$(EXEEXT)
am__EXEEXT_3 = upbibtex$(EXEEXT) updvitype$(EXEEXT) uppltotf$(EXEEXT) \
@@ -486,10 +473,11 @@
@MP_TRUE@@WIN32_TRUE at am__EXEEXT_37 = call_mpost$(EXEEXT)
@PMP_TRUE@@WIN32_TRUE at am__EXEEXT_38 = call_pmpost$(EXEEXT)
@UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_upmpost$(EXEEXT)
- at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_40 = call_luatex$(EXEEXT)
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_41 = call_luahbtex$(EXEEXT)
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_42 = call_luajittex$(EXEEXT)
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_43 = \
+ at HITEX_TRUE@am__EXEEXT_40 = himktables$(EXEEXT)
+ at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_41 = call_luatex$(EXEEXT)
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_42 = call_luahbtex$(EXEEXT)
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_43 = call_luajittex$(EXEEXT)
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_44 = \
@LUAJITHBTEX_TRUE@@WIN32_TRUE@ call_luajithbtex$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -599,7 +587,8 @@
luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-ot.$(OBJEXT) \
luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-script.$(OBJEXT) \
luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-tag.$(OBJEXT) \
- luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-unicode.$(OBJEXT)
+ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-unicode.$(OBJEXT) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.$(OBJEXT)
libluaharfbuzz_a_OBJECTS = $(am_libluaharfbuzz_a_OBJECTS)
libluahbtexspecific_a_AR = $(AR) $(ARFLAGS)
libluahbtexspecific_a_LIBADD =
@@ -624,7 +613,8 @@
luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-ot.$(OBJEXT) \
luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-script.$(OBJEXT) \
luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-tag.$(OBJEXT) \
- luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-unicode.$(OBJEXT)
+ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-unicode.$(OBJEXT) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.$(OBJEXT)
am_libluajitharfbuzz_a_OBJECTS = $(am__objects_3)
libluajitharfbuzz_a_OBJECTS = $(am_libluajitharfbuzz_a_OBJECTS)
libluajithbtexspecific_a_AR = $(AR) $(ARFLAGS)
@@ -995,11 +985,16 @@
libmfluajit_a-mfluajit-pool.$(OBJEXT)
libmfluajit_a_OBJECTS = $(dist_libmfluajit_a_OBJECTS) \
$(nodist_libmfluajit_a_OBJECTS)
-libmfluajitotfcc_a_AR = $(AR) $(ARFLAGS)
-libmfluajitotfcc_a_LIBADD =
-libmfluajitotfcc_a_SOURCES = libmfluajitotfcc.c
-libmfluajitotfcc_a_OBJECTS = \
- libmfluajitotfcc_a-libmfluajitotfcc.$(OBJEXT)
+libmfluajitlpeg_a_AR = $(AR) $(ARFLAGS)
+libmfluajitlpeg_a_LIBADD =
+am_libmfluajitlpeg_a_OBJECTS = \
+ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT)
+libmfluajitlpeg_a_OBJECTS = $(am_libmfluajitlpeg_a_OBJECTS)
+libmflualpeg_a_AR = $(AR) $(ARFLAGS)
+libmflualpeg_a_LIBADD =
+am_libmflualpeg_a_OBJECTS = \
+ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT)
+libmflualpeg_a_OBJECTS = $(am_libmflualpeg_a_OBJECTS)
libmfluaotfcc_a_AR = $(AR) $(ARFLAGS)
libmfluaotfcc_a_LIBADD =
am_libmfluaotfcc_a_OBJECTS = mfluadir/otfcc/dep/extern/emyg-dtoa/libmfluaotfcc_a-emyg-dtoa.$(OBJEXT) \
@@ -1119,6 +1114,15 @@
mfluadir/otfcc/lib/table/libmfluaotfcc_a-SVG.$(OBJEXT) \
mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT)
libmfluaotfcc_a_OBJECTS = $(am_libmfluaotfcc_a_OBJECTS)
+libmfluapotrace_a_AR = $(AR) $(ARFLAGS)
+libmfluapotrace_a_LIBADD =
+am_libmfluapotrace_a_OBJECTS = \
+ mfluadir/potrace/libmfluapotrace_a-curve.$(OBJEXT) \
+ mfluadir/potrace/libmfluapotrace_a-decompose.$(OBJEXT) \
+ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT) \
+ mfluadir/potrace/libmfluapotrace_a-potracelib.$(OBJEXT) \
+ mfluadir/potrace/libmfluapotrace_a-trace.$(OBJEXT)
+libmfluapotrace_a_OBJECTS = $(am_libmfluapotrace_a_OBJECTS)
libmplibbackends_a_AR = $(AR) $(ARFLAGS)
libmplibbackends_a_LIBADD =
am__objects_17 = libmplibbackends_a-pngout.$(OBJEXT)
@@ -1387,25 +1391,28 @@
gftype_OBJECTS = $(nodist_gftype_OBJECTS)
gftype_LDADD = $(LDADD)
gftype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-nodist_hishrink_OBJECTS = hishrink-hformat.$(OBJEXT) \
- hishrink-hishrink.$(OBJEXT) \
- hitexdir/hishrink-hishrink-lexer.$(OBJEXT) \
- hitexdir/hishrink-hishrink-parser.$(OBJEXT)
+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) \
+ hishrink-hishrink.$(OBJEXT)
hishrink_OBJECTS = $(nodist_hishrink_OBJECTS)
-nodist_histretch_OBJECTS = histretch-hformat.$(OBJEXT) \
+nodist_histretch_OBJECTS = histretch-hitables.$(OBJEXT) \
histretch-histretch.$(OBJEXT)
histretch_OBJECTS = $(nodist_histretch_OBJECTS)
-am__objects_37 = hitex-htex.$(OBJEXT)
-am__objects_38 = hitex-hitex.$(OBJEXT)
-nodist_hitex_OBJECTS = hitex-hformat.$(OBJEXT) hitex-hput.$(OBJEXT) \
- $(am__objects_37) $(am__objects_38)
+am__objects_37 = hitex-hitex.$(OBJEXT)
+nodist_hitex_OBJECTS = hitex-hitables.$(OBJEXT) hitex-hiput.$(OBJEXT) \
+ $(am__objects_37)
hitex_OBJECTS = $(nodist_hitex_OBJECTS)
nodist_initex_OBJECTS = initex-callexe.$(OBJEXT)
initex_OBJECTS = $(nodist_initex_OBJECTS)
initex_DEPENDENCIES =
-am__objects_39 = luatexdir/luahbtex-luatex.$(OBJEXT) \
+am__objects_38 = luatexdir/luahbtex-luatex.$(OBJEXT) \
mplibdir/luahbtex-lmplib.$(OBJEXT)
-nodist_luahbtex_OBJECTS = $(am__objects_39)
+nodist_luahbtex_OBJECTS = $(am__objects_38)
luahbtex_OBJECTS = $(nodist_luahbtex_OBJECTS)
am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
am__DEPENDENCIES_7 = libmplibcore.a $(am__DEPENDENCIES_1) \
@@ -1416,16 +1423,16 @@
luahbtex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luahbtex_CXXFLAGS) \
$(CXXFLAGS) $(luahbtex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_40 = luatexdir/luajithbtex-luatex.$(OBJEXT) \
+am__objects_39 = luatexdir/luajithbtex-luatex.$(OBJEXT) \
mplibdir/luajithbtex-lmplib.$(OBJEXT)
-nodist_luajithbtex_OBJECTS = $(am__objects_40)
+nodist_luajithbtex_OBJECTS = $(am__objects_39)
luajithbtex_OBJECTS = $(nodist_luajithbtex_OBJECTS)
luajithbtex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luajithbtex_CXXFLAGS) \
$(CXXFLAGS) $(luajithbtex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_41 = luatexdir/luajittex-luatex.$(OBJEXT) \
+am__objects_40 = luatexdir/luajittex-luatex.$(OBJEXT) \
mplibdir/luajittex-lmplib.$(OBJEXT)
-nodist_luajittex_OBJECTS = $(am__objects_41)
+nodist_luajittex_OBJECTS = $(am__objects_40)
luajittex_OBJECTS = $(nodist_luajittex_OBJECTS)
am__DEPENDENCIES_8 = libmplibcore.a $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1434,9 +1441,9 @@
luajittex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(luajittex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_42 = luatexdir/luatex-luatex.$(OBJEXT) \
+am__objects_41 = luatexdir/luatex-luatex.$(OBJEXT) \
mplibdir/luatex-lmplib.$(OBJEXT)
-nodist_luatex_OBJECTS = $(am__objects_42)
+nodist_luatex_OBJECTS = $(am__objects_41)
luatex_OBJECTS = $(nodist_luatex_OBJECTS)
luatex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -1457,16 +1464,18 @@
mf_nowin_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib)
dist_mflua_OBJECTS = mfluadir/mflua-mfluaextra.$(OBJEXT)
mflua_OBJECTS = $(dist_mflua_OBJECTS)
-mflua_DEPENDENCIES = libmflua.a libmfluaotfcc.a $(am__DEPENDENCIES_2) \
- $(windowlib) $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_6)
+mflua_DEPENDENCIES = libmflua.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a $(am__DEPENDENCIES_2) $(windowlib) \
+ $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_6)
mflua_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mflua_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_43 = mfluadir/mflua_nowin-mfluaextra.$(OBJEXT)
-nodist_mflua_nowin_OBJECTS = $(am__objects_43)
+am__objects_42 = mfluadir/mflua_nowin-mfluaextra.$(OBJEXT)
+nodist_mflua_nowin_OBJECTS = $(am__objects_42)
mflua_nowin_OBJECTS = $(nodist_mflua_nowin_OBJECTS)
mflua_nowin_DEPENDENCIES = libmflua.a libmfluaotfcc.a \
- $(am__DEPENDENCIES_2) $(windowlib) $(am__DEPENDENCIES_6)
+ libmfluapotrace.a libmflualpeg.a $(am__DEPENDENCIES_2) \
+ $(windowlib) $(am__DEPENDENCIES_6)
mflua_nowin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mflua_nowin_LDFLAGS) $(LDFLAGS) -o $@
@@ -1473,16 +1482,17 @@
dist_mfluajit_OBJECTS = mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT)
mfluajit_OBJECTS = $(dist_mfluajit_OBJECTS)
mfluajit_DEPENDENCIES = libmfluajit.a libmfluaotfcc.a \
- $(am__DEPENDENCIES_2) $(windowlib) $(am__DEPENDENCIES_9) \
- $(am__DEPENDENCIES_1)
+ libmfluapotrace.a libmfluajitlpeg.a $(am__DEPENDENCIES_2) \
+ $(windowlib) $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_1)
mfluajit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mfluajit_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_44 = mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT)
-nodist_mfluajit_nowin_OBJECTS = $(am__objects_44)
+am__objects_43 = mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT)
+nodist_mfluajit_nowin_OBJECTS = $(am__objects_43)
mfluajit_nowin_OBJECTS = $(nodist_mfluajit_nowin_OBJECTS)
mfluajit_nowin_DEPENDENCIES = libmfluajit.a libmfluaotfcc.a \
- $(am__DEPENDENCIES_2) $(windowlib) $(am__DEPENDENCIES_1)
+ libmfluapotrace.a libmfluajitlpeg.a $(am__DEPENDENCIES_2) \
+ $(windowlib) $(am__DEPENDENCIES_1)
mfluajit_nowin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(mfluajit_nowin_LDFLAGS) $(LDFLAGS) -o \
@@ -1491,8 +1501,8 @@
mft_OBJECTS = $(nodist_mft_OBJECTS)
mft_LDADD = $(LDADD)
mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_45 = mpost-mpxout.$(OBJEXT)
-nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_45)
+am__objects_44 = mpost-mpxout.$(OBJEXT)
+nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_44)
mpost_OBJECTS = $(nodist_mpost_OBJECTS)
mpost_DEPENDENCIES = libmplibcore.a libmplibextramath.a \
libmplibbackends.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1525,12 +1535,12 @@
pdftexdir/etex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-pdftex.h
- at PDFTEX_SYNCTEX_TRUE@am__objects_46 = \
+ at PDFTEX_SYNCTEX_TRUE@am__objects_45 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/pdftex-synctex.$(OBJEXT)
dist_pdftex_OBJECTS = pdftexdir/pdftex-pdftexextra.$(OBJEXT) \
- $(am__objects_46)
-am__objects_47 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
-nodist_pdftex_OBJECTS = $(am__objects_47) pdftex-pdftex-pool.$(OBJEXT)
+ $(am__objects_45)
+am__objects_46 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_46) pdftex-pdftex-pool.$(OBJEXT)
pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) libmd5.a
@@ -1557,20 +1567,20 @@
pltotf_OBJECTS = $(nodist_pltotf_OBJECTS)
pltotf_LDADD = $(LDADD)
pltotf_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_48 = pmpost-pmp.$(OBJEXT)
-am__objects_49 = pmpost-pmpmath.$(OBJEXT)
-am__objects_50 = pmpost-pmpmathbinary.$(OBJEXT)
-am__objects_51 = pmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_52 = pmpost-pmpmathdouble.$(OBJEXT)
-am__objects_53 = pmpost-pmpstrings.$(OBJEXT)
-am__objects_54 = pmpost-pmpxout.$(OBJEXT)
-am__objects_55 = pmpost-ppngout.$(OBJEXT)
-am__objects_56 = pmpost-ppsout.$(OBJEXT)
-am__objects_57 = pmpost-psvgout.$(OBJEXT)
-nodist_pmpost_OBJECTS = $(am__objects_48) $(am__objects_49) \
- $(am__objects_50) $(am__objects_51) $(am__objects_52) \
- pmpost-pmpost.$(OBJEXT) $(am__objects_53) $(am__objects_54) \
- $(am__objects_55) $(am__objects_56) $(am__objects_57) \
+am__objects_47 = pmpost-pmp.$(OBJEXT)
+am__objects_48 = pmpost-pmpmath.$(OBJEXT)
+am__objects_49 = pmpost-pmpmathbinary.$(OBJEXT)
+am__objects_50 = pmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_51 = pmpost-pmpmathdouble.$(OBJEXT)
+am__objects_52 = pmpost-pmpstrings.$(OBJEXT)
+am__objects_53 = pmpost-pmpxout.$(OBJEXT)
+am__objects_54 = pmpost-ppngout.$(OBJEXT)
+am__objects_55 = pmpost-ppsout.$(OBJEXT)
+am__objects_56 = pmpost-psvgout.$(OBJEXT)
+nodist_pmpost_OBJECTS = $(am__objects_47) $(am__objects_48) \
+ $(am__objects_49) $(am__objects_50) $(am__objects_51) \
+ pmpost-pmpost.$(OBJEXT) $(am__objects_52) $(am__objects_53) \
+ $(am__objects_54) $(am__objects_55) $(am__objects_56) \
pmpost-ptfmin.$(OBJEXT)
pmpost_OBJECTS = $(nodist_pmpost_OBJECTS)
pmpost_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1588,10 +1598,10 @@
ptexdir/ptex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-ptex.h
- at PTEX_SYNCTEX_TRUE@am__objects_58 = synctexdir/ptex-synctex.$(OBJEXT)
-dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_58)
-am__objects_59 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_59) ptex-ptex-pool.$(OBJEXT)
+ at PTEX_SYNCTEX_TRUE@am__objects_57 = synctexdir/ptex-synctex.$(OBJEXT)
+dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_57)
+am__objects_58 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_58) ptex-ptex-pool.$(OBJEXT)
ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
@PTEX_SYNCTEX_TRUE at am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
am_ptftopl_OBJECTS =
@@ -1600,8 +1610,9 @@
am_synctex_OBJECTS = synctexdir/synctex-synctex_main.$(OBJEXT)
synctex_OBJECTS = $(am_synctex_OBJECTS)
am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ at MINGW32_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
synctex_DEPENDENCIES = $(am__DEPENDENCIES_13) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_14)
nodist_tangle_OBJECTS = tangle.$(OBJEXT)
tangle_OBJECTS = $(nodist_tangle_OBJECTS)
tangle_LDADD = $(LDADD)
@@ -1612,14 +1623,14 @@
am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-tex.h
- at TEX_SYNCTEX_TRUE@am__objects_60 = synctexdir/tex-synctex.$(OBJEXT)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_60)
-am__objects_61 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_61) tex-tex-pool.$(OBJEXT)
+ at TEX_SYNCTEX_TRUE@am__objects_59 = synctexdir/tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_59)
+am__objects_60 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_60) tex-tex-pool.$(OBJEXT)
tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
- at TEX_SYNCTEX_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
+ at TEX_SYNCTEX_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_14)
+ $(am__DEPENDENCIES_15)
nodist_tftopl_OBJECTS = tftopl.$(OBJEXT)
tftopl_OBJECTS = $(nodist_tftopl_OBJECTS)
tftopl_LDADD = $(LDADD)
@@ -1631,36 +1642,40 @@
am_ttf2afm_OBJECTS = pdftexdir/ttf2afm-ttf2afm.$(OBJEXT)
ttf2afm_OBJECTS = $(am_ttf2afm_OBJECTS)
ttf2afm_LDADD = $(LDADD)
+nodist_twill_OBJECTS = twill.$(OBJEXT)
+twill_OBJECTS = $(nodist_twill_OBJECTS)
+twill_LDADD = $(LDADD)
+twill_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
am_upbibtex_OBJECTS =
nodist_upbibtex_OBJECTS = upbibtex-upbibtex.$(OBJEXT)
upbibtex_OBJECTS = $(am_upbibtex_OBJECTS) $(nodist_upbibtex_OBJECTS)
-am__DEPENDENCIES_15 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_16 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
am_updvitype_OBJECTS =
nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT)
updvitype_OBJECTS = $(am_updvitype_OBJECTS) \
$(nodist_updvitype_OBJECTS)
-am__objects_62 = upmpost-pmp.$(OBJEXT)
-am__objects_63 = upmpost-pmpmath.$(OBJEXT)
-am__objects_64 = upmpost-pmpmathbinary.$(OBJEXT)
-am__objects_65 = upmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_66 = upmpost-pmpmathdouble.$(OBJEXT)
-am__objects_67 = upmpost-pmpstrings.$(OBJEXT)
-am__objects_68 = upmpost-pmpxout.$(OBJEXT)
-am__objects_69 = upmpost-ppngout.$(OBJEXT)
-am__objects_70 = upmpost-ppsout.$(OBJEXT)
-am__objects_71 = upmpost-psvgout.$(OBJEXT)
-am__objects_72 = $(am__objects_62) $(am__objects_63) $(am__objects_64) \
- $(am__objects_65) $(am__objects_66) upmpost-pmpost.$(OBJEXT) \
- $(am__objects_67) $(am__objects_68) $(am__objects_69) \
- $(am__objects_70) $(am__objects_71) upmpost-ptfmin.$(OBJEXT)
-nodist_upmpost_OBJECTS = $(am__objects_72)
+am__objects_61 = upmpost-pmp.$(OBJEXT)
+am__objects_62 = upmpost-pmpmath.$(OBJEXT)
+am__objects_63 = upmpost-pmpmathbinary.$(OBJEXT)
+am__objects_64 = upmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_65 = upmpost-pmpmathdouble.$(OBJEXT)
+am__objects_66 = upmpost-pmpstrings.$(OBJEXT)
+am__objects_67 = upmpost-pmpxout.$(OBJEXT)
+am__objects_68 = upmpost-ppngout.$(OBJEXT)
+am__objects_69 = upmpost-ppsout.$(OBJEXT)
+am__objects_70 = upmpost-psvgout.$(OBJEXT)
+am__objects_71 = $(am__objects_61) $(am__objects_62) $(am__objects_63) \
+ $(am__objects_64) $(am__objects_65) upmpost-pmpost.$(OBJEXT) \
+ $(am__objects_66) $(am__objects_67) $(am__objects_68) \
+ $(am__objects_69) $(am__objects_70) upmpost-ptfmin.$(OBJEXT)
+nodist_upmpost_OBJECTS = $(am__objects_71)
upmpost_OBJECTS = $(nodist_upmpost_OBJECTS)
-am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmputil.a
-upmpost_DEPENDENCIES = $(am__DEPENDENCIES_16)
+upmpost_DEPENDENCIES = $(am__DEPENDENCIES_17)
am_uppltotf_OBJECTS =
nodist_uppltotf_OBJECTS = uppltotf-uppltotf.$(OBJEXT)
uppltotf_OBJECTS = $(am_uppltotf_OBJECTS) $(nodist_uppltotf_OBJECTS)
@@ -1668,14 +1683,14 @@
uptexdir/uptexextra.h uptexdir/uptex_version.h \
synctexdir/synctex.c synctexdir/synctex.h \
synctexdir/synctex-common.h synctexdir/synctex-uptex.h
- at UPTEX_SYNCTEX_TRUE@am__objects_73 = \
+ at UPTEX_SYNCTEX_TRUE@am__objects_72 = \
@UPTEX_SYNCTEX_TRUE@ synctexdir/uptex-synctex.$(OBJEXT)
dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT) \
- $(am__objects_73)
-am__objects_74 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
-nodist_uptex_OBJECTS = $(am__objects_74) uptex-uptex-pool.$(OBJEXT)
+ $(am__objects_72)
+am__objects_73 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
+nodist_uptex_OBJECTS = $(am__objects_73) uptex-uptex-pool.$(OBJEXT)
uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
- at UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1)
+ at UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_18 = $(am__DEPENDENCIES_1)
am_uptftopl_OBJECTS =
nodist_uptftopl_OBJECTS = uptftopl-uptftopl.$(OBJEXT)
uptftopl_OBJECTS = $(am_uptftopl_OBJECTS) $(nodist_uptftopl_OBJECTS)
@@ -1712,20 +1727,20 @@
xetexdir/xetex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-xetex.h
- at XETEX_SYNCTEX_TRUE@am__objects_75 = \
+ at XETEX_SYNCTEX_TRUE@am__objects_74 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/xetex-synctex.$(OBJEXT)
dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \
- $(am__objects_75)
-am__objects_76 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_76) xetex-xetex-pool.$(OBJEXT)
+ $(am__objects_74)
+am__objects_75 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_75) xetex-xetex-pool.$(OBJEXT)
xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
- at XETEX_MACOSX_FALSE@am__DEPENDENCIES_18 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_19 = $(libxetex) $(am__DEPENDENCIES_1) \
+ at XETEX_MACOSX_FALSE@am__DEPENDENCIES_19 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_20 = $(libxetex) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_18)
-xetex_DEPENDENCIES = $(am__DEPENDENCIES_19) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_19)
+xetex_DEPENDENCIES = $(am__DEPENDENCIES_20) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_1)
xetex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xetex_CXXFLAGS) \
@@ -1768,12 +1783,12 @@
./$(DEPDIR)/euptex-euptex-pool.Po \
./$(DEPDIR)/euptex-euptex0.Po ./$(DEPDIR)/euptex-euptexini.Po \
./$(DEPDIR)/gftodvi.Po ./$(DEPDIR)/gftopk.Po \
- ./$(DEPDIR)/gftype.Po ./$(DEPDIR)/hishrink-hformat.Po \
+ ./$(DEPDIR)/gftype.Po ./$(DEPDIR)/himktables.Po \
./$(DEPDIR)/hishrink-hishrink.Po \
- ./$(DEPDIR)/histretch-hformat.Po \
+ ./$(DEPDIR)/hishrink-hitables.Po \
./$(DEPDIR)/histretch-histretch.Po \
- ./$(DEPDIR)/hitex-hformat.Po ./$(DEPDIR)/hitex-hitex.Po \
- ./$(DEPDIR)/hitex-hput.Po ./$(DEPDIR)/hitex-htex.Po \
+ ./$(DEPDIR)/histretch-hitables.Po ./$(DEPDIR)/hitex-hiput.Po \
+ ./$(DEPDIR)/hitex-hitables.Po ./$(DEPDIR)/hitex-hitex.Po \
./$(DEPDIR)/initex-callexe.Po \
./$(DEPDIR)/libluahbtexspecific_a-luainit-hb.Po \
./$(DEPDIR)/libluahbtexspecific_a-luastuff-hb.Po \
@@ -1789,7 +1804,6 @@
./$(DEPDIR)/libmfluajit_a-mfluajit-pool.Po \
./$(DEPDIR)/libmfluajit_a-mfluajit0.Po \
./$(DEPDIR)/libmfluajit_a-mfluajitini.Po \
- ./$(DEPDIR)/libmfluajitotfcc_a-libmfluajitotfcc.Po \
./$(DEPDIR)/libmplibbackends_a-pngout.Po \
./$(DEPDIR)/libmplibbackends_a-svgout.Po \
./$(DEPDIR)/libmplibcore_a-mp.Po \
@@ -1829,7 +1843,8 @@
./$(DEPDIR)/tangleboot.Po ./$(DEPDIR)/tex-tex-pool.Po \
./$(DEPDIR)/tex-tex0.Po ./$(DEPDIR)/tex-texextra.Po \
./$(DEPDIR)/tex-texini.Po ./$(DEPDIR)/tftopl.Po \
- ./$(DEPDIR)/tie-tie.Po ./$(DEPDIR)/upbibtex-upbibtex.Po \
+ ./$(DEPDIR)/tie-tie.Po ./$(DEPDIR)/twill.Po \
+ ./$(DEPDIR)/upbibtex-upbibtex.Po \
./$(DEPDIR)/updvitype-updvitype.Po ./$(DEPDIR)/upmpost-pmp.Po \
./$(DEPDIR)/upmpost-pmpmath.Po \
./$(DEPDIR)/upmpost-pmpmathbinary.Po \
@@ -1852,8 +1867,8 @@
eptexdir/$(DEPDIR)/eptex-eptexextra.Po \
etexdir/$(DEPDIR)/etex-etexextra.Po \
euptexdir/$(DEPDIR)/euptex-euptexextra.Po \
- hitexdir/$(DEPDIR)/hishrink-hishrink-lexer.Po \
- hitexdir/$(DEPDIR)/hishrink-hishrink-parser.Po \
+ hitexdir/$(DEPDIR)/hishrink-hilexer.Po \
+ hitexdir/$(DEPDIR)/hishrink-hiparser.Po \
libmd5/$(DEPDIR)/a-md5.Po libmd5/$(DEPDIR)/md5main-md5main.Po \
luatexdir/$(DEPDIR)/luahbtex-luatex.Po \
luatexdir/$(DEPDIR)/luajithbtex-luatex.Po \
@@ -2036,6 +2051,7 @@
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-script.Po \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-tag.Po \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-unicode.Po \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-variation.Po \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-blob.Po \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-buffer.Po \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-class_utils.Po \
@@ -2049,6 +2065,7 @@
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-script.Po \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-tag.Po \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-unicode.Po \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-variation.Po \
luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5.Po \
luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5lib.Po \
luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5.Po \
@@ -2229,6 +2246,8 @@
mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po \
mfluadir/$(DEPDIR)/mflua-mfluaextra.Po \
mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po \
+ mfluadir/luapeg/$(DEPDIR)/libmfluajitlpeg_a-lpeg.Po \
+ mfluadir/luapeg/$(DEPDIR)/libmflualpeg_a-lpeg.Po \
mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-json-builder.Po \
mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-json.Po \
mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-sds.Po \
@@ -2345,6 +2364,11 @@
mfluadir/otfcc/lib/vf/$(DEPDIR)/libmfluaotfcc_a-vq.Po \
mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-luafunc.Po \
mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-otfccdll.Po \
+ mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po \
+ mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po \
+ mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Po \
+ mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po \
+ mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po \
mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po \
mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po \
mplibdir/$(DEPDIR)/libmputil_a-avl.Po \
@@ -2493,8 +2517,9 @@
$(nodist_libluatexspecific_a_SOURCES) $(libmd5_a_SOURCES) \
$(nodist_libmf_a_SOURCES) $(dist_libmflua_a_SOURCES) \
$(nodist_libmflua_a_SOURCES) $(dist_libmfluajit_a_SOURCES) \
- $(nodist_libmfluajit_a_SOURCES) libmfluajitotfcc.c \
- $(libmfluaotfcc_a_SOURCES) \
+ $(nodist_libmfluajit_a_SOURCES) $(libmfluajitlpeg_a_SOURCES) \
+ $(libmflualpeg_a_SOURCES) $(libmfluaotfcc_a_SOURCES) \
+ $(libmfluapotrace_a_SOURCES) \
$(nodist_libmplibbackends_a_SOURCES) \
$(nodist_libmplibcore_a_SOURCES) \
$(nodist_libmplibextramath_a_SOURCES) $(libmputil_a_SOURCES) \
@@ -2518,7 +2543,7 @@
$(dist_etex_SOURCES) $(nodist_etex_SOURCES) \
$(dist_euptex_SOURCES) $(nodist_euptex_SOURCES) \
$(gftodvi_SOURCES) $(nodist_gftodvi_SOURCES) \
- $(nodist_gftopk_SOURCES) $(nodist_gftype_SOURCES) \
+ $(nodist_gftopk_SOURCES) $(nodist_gftype_SOURCES) himktables.c \
$(nodist_hishrink_SOURCES) $(nodist_histretch_SOURCES) \
$(nodist_hitex_SOURCES) $(nodist_initex_SOURCES) \
$(nodist_luahbtex_SOURCES) $(nodist_EXTRA_luahbtex_SOURCES) \
@@ -2545,33 +2570,34 @@
$(dist_tex_SOURCES) $(nodist_tex_SOURCES) \
$(nodist_tftopl_SOURCES) $(nodist_tie_SOURCES) \
$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
- $(upbibtex_SOURCES) $(nodist_upbibtex_SOURCES) \
- $(updvitype_SOURCES) $(nodist_updvitype_SOURCES) \
- $(nodist_upmpost_SOURCES) $(uppltotf_SOURCES) \
- $(nodist_uppltotf_SOURCES) $(dist_uptex_SOURCES) \
- $(nodist_uptex_SOURCES) $(uptftopl_SOURCES) \
- $(nodist_uptftopl_SOURCES) $(nodist_vftovp_SOURCES) \
- $(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES) \
- $(nodist_wofm2opl_SOURCES) $(nodist_wopl2ofm_SOURCES) \
- $(nodist_wovf2ovp_SOURCES) $(nodist_wovp2ovf_SOURCES) \
- $(dist_xetex_SOURCES) $(nodist_xetex_SOURCES) \
- $(nodist_EXTRA_xetex_SOURCES)
+ $(nodist_twill_SOURCES) $(upbibtex_SOURCES) \
+ $(nodist_upbibtex_SOURCES) $(updvitype_SOURCES) \
+ $(nodist_updvitype_SOURCES) $(nodist_upmpost_SOURCES) \
+ $(uppltotf_SOURCES) $(nodist_uppltotf_SOURCES) \
+ $(dist_uptex_SOURCES) $(nodist_uptex_SOURCES) \
+ $(uptftopl_SOURCES) $(nodist_uptftopl_SOURCES) \
+ $(nodist_vftovp_SOURCES) $(nodist_vptovf_SOURCES) \
+ $(nodist_weave_SOURCES) $(nodist_wofm2opl_SOURCES) \
+ $(nodist_wopl2ofm_SOURCES) $(nodist_wovf2ovp_SOURCES) \
+ $(nodist_wovp2ovf_SOURCES) $(dist_xetex_SOURCES) \
+ $(nodist_xetex_SOURCES) $(nodist_EXTRA_xetex_SOURCES)
DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
$(libluaharfbuzz_a_SOURCES) $(libluajitharfbuzz_a_SOURCES) \
$(dist_libluajittex_a_SOURCES) $(dist_libluatex_a_SOURCES) \
$(libmd5_a_SOURCES) $(dist_libmflua_a_SOURCES) \
- $(dist_libmfluajit_a_SOURCES) libmfluajitotfcc.c \
- $(libmfluaotfcc_a_SOURCES) $(libmputil_a_SOURCES) \
+ $(dist_libmfluajit_a_SOURCES) $(libmfluajitlpeg_a_SOURCES) \
+ $(libmflualpeg_a_SOURCES) $(libmfluaotfcc_a_SOURCES) \
+ $(libmfluapotrace_a_SOURCES) $(libmputil_a_SOURCES) \
$(am__libpdftex_a_SOURCES_DIST) $(EXTRA_libpdftex_a_SOURCES) \
$(libukanji_a_SOURCES) $(libunilib_a_SOURCES) \
$(am__libxetex_a_SOURCES_DIST) $(libsynctex_la_SOURCES) \
$(dist_aleph_SOURCES) $(am__dist_eptex_SOURCES_DIST) \
$(am__dist_etex_SOURCES_DIST) $(am__dist_euptex_SOURCES_DIST) \
- $(gftodvi_SOURCES) $(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) \
@@ -2594,7 +2620,7 @@
man1dir = $(mandir)/man1
man5dir = $(mandir)/man5
NROFF = nroff
-MANS = $(dist_man_MANS) $(nodist_man_MANS)
+MANS = $(dist_man_MANS) $(man1_MANS) $(nodist_man_MANS)
DATA = $(pkgconfig_DATA)
am__syncinclude_HEADERS_DIST = synctexdir/synctex_parser.h \
synctexdir/synctex_version.h synctexdir/synctex_parser_utils.h
@@ -2783,14 +2809,14 @@
bases=`echo $$bases`
AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_44 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_45 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
gftopk.test gftype.test mft.test patgen.test pktogf.test \
pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
- vptovf.test weave.test
-am__EXEEXT_45 = $(am__EXEEXT_44) tests/bibtex-openout-test.pl \
+ vptovf.test weave.test twill.test
+am__EXEEXT_46 = $(am__EXEEXT_45) tests/bibtex-openout-test.pl \
tests/bibtex-longline-test.pl tests/bibtex-mem.test \
tests/bibtex-bigauth.test tests/bibtex-auxinclude.test
- at WEB_TRUE@am__EXEEXT_46 = $(am__EXEEXT_45)
+ at WEB_TRUE@am__EXEEXT_47 = $(am__EXEEXT_46)
TEST_SUITE_LOG = test-suite.log
am__test_logs1 = $(TESTS:=.log)
am__test_logs2 = $(am__test_logs1:@EXEEXT at .log=.log)
@@ -2829,8 +2855,11 @@
$(srcdir)/luatexdir/am/luasocket.am \
$(srcdir)/luatexdir/am/luatex.am \
$(srcdir)/mfluadir/am/mflua.am \
+ $(srcdir)/mfluadir/am/mflualpeg.am \
$(srcdir)/mfluadir/am/mfluaotfcc.am \
+ $(srcdir)/mfluadir/am/mfluapotrace.am \
$(srcdir)/mfluajitdir/am/mfluajit.am \
+ $(srcdir)/mfluajitdir/am/mfluajitlpeg.am \
$(srcdir)/mplibdir/am/libmplib.am \
$(srcdir)/mplibdir/am/libmputil.am \
$(srcdir)/mplibdir/am/mplib.am \
@@ -3014,7 +3043,7 @@
NMEDIT = @NMEDIT@
OBJCXX = @OBJCXX@
OBJCXXDEPMODE = @OBJCXXDEPMODE@
-OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_111)
+OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_113)
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTANGLE = @OTANGLE@
@@ -3146,18 +3175,20 @@
#EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a
#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
-EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluaotfcc.a \
- libmfluajitotfcc.a libmfluajit.a libmfluaotfcc.a libmputil.a \
- libmplibcore.a libmplibextramath.a libmplibbackends.a \
- libkanji.a libukanji.a libpdftex.a libluasocket.a \
- libluajitsocket.a libluamisc.a libluajitmisc.a libunilib.a \
- libff.a libluatex.a libluajittex.a libluatexspecific.a \
- libluajittexspecific.a libluahbtexspecific.a \
- libluajithbtexspecific.a libluaffi.a libluaharfbuzz.a \
- libluajitharfbuzz.a libxetex.a libsynctex.a libmd5.a
+EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \
+ libmfluajitlpeg.a libmfluajitlpeg.a libmputil.a libmplibcore.a \
+ libmplibextramath.a libmplibbackends.a libkanji.a libukanji.a \
+ libpdftex.a libluasocket.a libluajitsocket.a libluamisc.a \
+ libluajitmisc.a libunilib.a libff.a libluatex.a libluajittex.a \
+ libluatexspecific.a libluajittexspecific.a \
+ libluahbtexspecific.a libluajithbtexspecific.a libluaffi.a \
+ libluaharfbuzz.a libluajitharfbuzz.a libxetex.a libsynctex.a \
+ libmd5.a
EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_123)
-lib_LTLIBRARIES = $(am__append_122)
+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
@@ -3280,7 +3311,8 @@
euptexdir/pdfprimitive.test \
eptexdir/tests/pdfprimitive-test.tex \
euptexdir/tests/pdfprimitive-euptex.log hitexdir/ChangeLog \
- $(hitex_web) pdftexdir/regex/COPYING.LIB \
+ $(hitex_web) $(hitex_tests) hitexdir/tests/hello.tex \
+ hitexdir/tests/rule.tex pdftexdir/regex/COPYING.LIB \
pdftexdir/regex/README $(pdftex_ch_srcs) \
pdftexdir/pdftex.defines pdftexdir/ChangeLog pdftexdir/NEWS \
pdftexdir/README pdftexdir/change-files.txt $(pdftex_tests) \
@@ -3604,7 +3636,7 @@
euptex.p euptex.pool euptex-tangle euptrip.diffs \
pdfprimitive-euptex.* $(nodist_hitex_SOURCES) \
$(nodist_hishrink_SOURCES) $(nodist_histretch_SOURCES) \
- format-tangle htex-tangle hitex-tangle \
+ hiformat-tangle hitex-tangle hello.log rule.log \
$(nodist_pdftex_SOURCES) pdftex-final.ch pdftex-web2c pdftex.p \
pdftex.pool pdftex-tangle pwprob.log pwprob.tex pdfimage.fmt \
pdfimage.log pdfimage.pdf expanded.log cnfline.log \
@@ -3644,16 +3676,16 @@
$(am__append_79)
bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
$(am__append_24) $(am__append_33) $(am__append_41) \
- $(am__append_49) $(am__append_54) $(am__append_89) \
- $(am__append_94) $(am__append_99) $(am__append_104)
+ $(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_87) $(am__append_92) $(am__append_97) \
- $(am__append_102)
+ $(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_88) $(am__append_93) \
- $(am__append_98) $(am__append_103)
+ $(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 \
@@ -3786,13 +3818,17 @@
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 \
- patgen pktogf pktype pltotf pooltype tftopl vftovp vptovf weave
+ patgen pktogf pktype pltotf pooltype tftopl vftovp vptovf \
+ weave twill
web_tests = $(web_programs:=.test) tests/bibtex-openout-test.pl \
tests/bibtex-longline-test.pl tests/bibtex-mem.test \
@@ -3814,6 +3850,7 @@
nodist_vftovp_SOURCES = vftovp.c vftovp.h
nodist_vptovf_SOURCES = vptovf.c vptovf.h
nodist_weave_SOURCES = weave.c weave.h
+nodist_twill_SOURCES = twill.c twill.h
nodist_ctie_SOURCES = ctie.c
nodist_cweave_SOURCES = cweave.c cweb.c
nodist_ctwill_SOURCES = ctwill.c cweb.c
@@ -3824,18 +3861,18 @@
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
nodist_initex_SOURCES = callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_126)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_129)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_127)
+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_129)
+dist_tex_SOURCES = texextra.c $(am__append_132)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_128)
+tex_prereq = texd.h $(am__append_131)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -3886,11 +3923,11 @@
call_mflua_LDADD =
dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h
mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES)
-mflua_LDADD = libmflua.a libmfluaotfcc.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS)
+mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS)
mflua_LDFLAGS = -export-dynamic
nodist_mflua_nowin_SOURCES = $(dist_mflua_SOURCES)
mflua_nowin_CPPFLAGS = $(mflua_CPPFLAGS) -DMFNOWIN $(LUA_INCLUDES)
-mflua_nowin_LDADD = libmflua.a libmfluaotfcc.a $(LDADD) $(windowlib) $(LUA_LIBS)
+mflua_nowin_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(LUA_LIBS)
mflua_nowin_LDFLAGS = -export-dynamic
# MFLua C sources
@@ -3915,22 +3952,11 @@
-std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \
-I$(top_srcdir)/mfluadir/otfcc/include \
-I$(top_srcdir)/mfluadir/otfcc/include/dep \
- -I$(top_srcdir)/mfluadir/otfcc/lib \
- $(LUA_INCLUDES)
+ -I$(top_srcdir)/mfluadir/otfcc/lib
-libmfluajitotfcc_a_CPPFLAGS = \
- -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \
- -DJIT \
- -I$(top_srcdir)/mfluadir/otfcc/include \
- -I$(top_srcdir)/mfluadir/otfcc/include/dep \
- -I$(top_srcdir)/mfluadir/otfcc/lib \
- $(LUAJIT_INCLUDES)
-
libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS)
-libmfluajitotfcc_a_CFLAGS = # $(WARNING_CFLAGS)
#nodist_libmfluaotfcc_a_SOURCES = $(libmfluaotfcc_sources)
-#nodist_libmfluajitotfcc_a_SOURCES = $(libmfluaotfcc_sources)
libmfluaotfcc_a_SOURCES = \
mfluadir/otfcc/dep/extern/sdsalloc.h \
mfluadir/otfcc/dep/extern/emyg-dtoa/emyg-dtoa.c \
@@ -4190,16 +4216,48 @@
mfluadir/otfcc/lib/table/head.h \
mfluadir/otfcc/lib/table/TSI5.c
+libmfluapotrace_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/potrace
+
+libmfluapotrace_a_CFLAGS = # $(WARNING_CFLAGS)
+
+#nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources)
+libmfluapotrace_a_SOURCES = \
+ mfluadir/potrace/auxiliary.h \
+ mfluadir/potrace/bitmap.h \
+ mfluadir/potrace/config.h \
+ mfluadir/potrace/curve.c \
+ mfluadir/potrace/curve.h \
+ mfluadir/potrace/decompose.c \
+ mfluadir/potrace/decompose.h \
+ mfluadir/potrace/lists.h \
+ mfluadir/potrace/luafunc.c \
+ mfluadir/potrace/luafunc.h \
+ mfluadir/potrace/potracelib.c \
+ mfluadir/potrace/potracelib.h \
+ mfluadir/potrace/progress.h \
+ mfluadir/potrace/trace.c \
+ mfluadir/potrace/trace.h
+
+libmflualpeg_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/luapeg \
+ $(LUA_INCLUDES)
+
+libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+libmflualpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+ mfluadir/luapeg/lpeg.h
+
call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\"
nodist_call_mfluajit_SOURCES = callexe.c
call_mfluajit_LDADD =
dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h
mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES)
-mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS)
+mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS)
mfluajit_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
nodist_mfluajit_nowin_SOURCES = $(dist_mfluajit_SOURCES)
mfluajit_nowin_CPPFLAGS = $(mfluajit_CPPFLAGS) -DMFNOWIN $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES)
-mfluajit_nowin_LDADD = libmfluajit.a libmfluaotfcc.a $(LDADD) $(windowlib) $(LUAJIT_LIBS)
+mfluajit_nowin_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(LUAJIT_LIBS)
mfluajit_nowin_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
# MFLuaJIT C sources
@@ -4221,6 +4279,15 @@
# MFLuaJIT tests
#
mfluajit_tests = mfluajitdir/mfluajittraptest.test
+libmfluajitlpeg_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/luapeg \
+ $(LUAJIT_INCLUDES)
+
+libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+libmfluajitlpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+ mfluadir/luapeg/lpeg.h
+
mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
$(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a
@@ -4256,10 +4323,12 @@
pmp_ctangle = $(ctangle_silent)CWEBINPUTS=.:$(srcdir)/pmpostdir $(ctangle)
# Creating several files: need stamp file and two rules with identical recipes
pmp_ctangle_sh = CWEBINPUTS=.:$(srcdir)/pmpostdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(CTANGLE)
-nodist_pmpost_SOURCES = $(pmp_c_h) $(pmpmath_c_h) $(pmpmathbinary_c_h) $(pmpmathdecimal_c_h) \
+nodist_pmpost_SOURCES = $(pmp_c_h) $(pmpmath_c_h) $(pmpmathbinary_c_h) \
+ $(pmpmathdecimal_c_h) \
$(pmpmathdouble_c_h) pmpost.c $(pmpstrings_c_h) $(pmpxout_c_h) \
$(ppngout_c_h) $(ppsout_c_h) $(psvgout_c_h) ptfmin.c
+#
pmp_c_h = pmp.c pmplib.h pmpmp.h
pmpmath_c_h = pmpmath.c pmpmath.h
pmpmathbinary_c_h = pmpmathbinary.c pmpmathbinary.h
@@ -4311,10 +4380,10 @@
mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_130)
+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_131)
+etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_134)
etex_DEPENDENCIES = $(ZLIB_DEPEND)
# e-TeX C sources
@@ -4321,11 +4390,11 @@
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
- etexdir/etex_version.h $(am__append_133)
+ 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_132)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_135)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -4354,10 +4423,10 @@
pproglib = lib/libp.a
libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h ptexdir/kanji_dump.c
libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_134)
+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_135)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_138)
ptex_DEPENDENCIES = $(ptex_dependencies)
# pTeX C sources
@@ -4364,10 +4433,10 @@
ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
- ptexdir/ptex_version.h $(am__append_137)
+ 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_136)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_139)
ptex_web_srcs = \
tex.web \
tex.ch \
@@ -4411,11 +4480,11 @@
ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test \
ptexdir/skipjfmp.test
eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
- $(ZLIB_INCLUDES) $(am__append_142)
+ $(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_143)
+ $(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
@@ -4422,11 +4491,11 @@
eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
- eptexdir/eptex_version.h $(am__append_145)
+ 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_144)
+ eptexdir/eptex_version.h $(am__append_147)
eptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4447,6 +4516,7 @@
$(eptex_ch_synctex) \
eptexdir/fam256.ch \
eptexdir/pdfutils.ch \
+ eptexdir/suppresserrors.ch \
eptexdir/char-warning-eptex.ch \
tex-binpool.ch
@@ -4461,10 +4531,10 @@
upweb_programs = upbibtex updvitype uppltotf uptftopl
libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_138)
+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_139)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_142)
uptex_DEPENDENCIES = $(uptex_dependencies)
# upTeX C sources
@@ -4471,11 +4541,11 @@
uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
- uptexdir/uptex_version.h $(am__append_141)
+ 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_140)
+ uptexdir/uptex_version.h $(am__append_143)
uptex_web_srcs = \
tex.web \
tex.ch \
@@ -4520,14 +4590,15 @@
uptexdir/yokotate.test \
uptexdir/newjfm.test \
uptexdir/uparse.test \
- uptexdir/gkhuge.test
+ uptexdir/gkhuge.test \
+ uptexdir/upkcat.test
euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
- -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_146)
+ -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_147)
+ $(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
@@ -4534,12 +4605,12 @@
euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
- $(am__append_149)
+ $(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_148)
+ uptexdir/uptex_version.h $(am__append_151)
euptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4564,6 +4635,7 @@
euptexdir/pdfstrcmp-eup-pre.ch \
eptexdir/pdfutils.ch \
euptexdir/pdfstrcmp-eup-post.ch \
+ eptexdir/suppresserrors.ch \
eptexdir/char-warning-eptex.ch \
tex-binpool.ch
@@ -4571,11 +4643,17 @@
# e-upTeX Tests
#
euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test
-hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/libmd5
-hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS) libmd5.a
+
+# At the moment, these are the only man pages handled in the
+# conglomerated web2c/Makefile[.am]. (All the others are in man/.)
+# If that changes, have to set at top level and use +=.
+ at HITEX_TRUE@man1_MANS = hitexdir/hishrink.man hitexdir/histretch.man hitexdir/hitex.man
+hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 \
+ -DINIT -DSTAT -DDEBUG
+hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS) libmd5.a libmd5.a
hitex_DEPENDENCIES = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) libmd5.a
#
-histretch_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
+histretch_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/hitexdir
histretch_LDADD = $(ZLIB_LIBS)
histretch_DEPENDENCIES = $(ZLIB_DEPEND)
#
@@ -4585,7 +4663,7 @@
hishrink_DEPENDENCIES = $(ZLIB_DEPEND)
# HiTeX CWEB sources
-hitex_web = hitexdir/format.w hitexdir/htex.w hitexdir/hitex.w
+hitex_web = hitexdir/hiformat.w hitexdir/hitex.w
# Creating several files: need stamp file and two rules with identical recipes
hi_ctangle_sh = CWEBINPUTS=$(srcdir)/hitexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(CTANGLE)
@@ -4592,31 +4670,42 @@
# HiTeX C/yacc/lex sources generated using ctangle.
# For each cweb (.w) source file, list the files generated.
-format_c_h_l_y = basetypes.h error.h hformat.h \
- mkhformat.c \
- hput.c hput.h \
- hget.c hget.h \
- shrink.l shrink.y \
- hishrink.c histretch.c
+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 \
+ hishrink.c \
+ hiskip.c \
+ histretch.c
-htex_c_h = htex.c htex.h
-hitex_c_h = hitex.c hitex.h
+hitex_c = hitex.c
# hitex
-nodist_hitex_SOURCES = hformat.c hput.c $(htex_c_h) $(hitex_c_h)
+nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c)
# histretch
-nodist_histretch_SOURCES = hformat.c histretch.c
+nodist_histretch_SOURCES = hitables.c histretch.c
-# The actual sources for the lexer and parser are in format.w.
-# However, to simplify life with Automake (a little), we include the
-# generated [.ch] files as if they were the sources here, and don't try
-# to have Automake support the derivation from .w.
+# The actual sources for the lexer and parser are in hiformat.w.
+# However, to simplify life with Automake (a little), we specify the
+# generated .[ch] files here as if they were the sources, and don't try
+# to have Automake support the derivation from .w, or even from the .[ly].
#
-nodist_hishrink_SOURCES = hformat.c hishrink.c \
- hitexdir/hishrink-lexer.c \
- hitexdir/hishrink-parser.c hitexdir/hishrink-parser.h
+nodist_hishrink_SOURCES = hitables.c \
+ hitexdir/hilexer.c \
+ hitexdir/hiparser.c hitexdir/hiparser.h \
+ hishrink.c
+
+#
+hitex_tests = hitexdir/tests/hello.test \
+ hitexdir/tests/rule.test
+
libpdftex_a_CPPFLAGS = $(REGEX_INCLUDES) $(pdftex_cppflags)
libpdftex_a_CXXFLAGS = $(WARNING_CXXFLAGS)
libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
@@ -4630,7 +4719,7 @@
pdftexdir/writejbig2.c pdftexdir/writejpg.c \
pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
- $(am__append_82)
+ $(am__append_84)
@MINGW32_TRUE at REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
@@ -4646,7 +4735,7 @@
# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_150)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_153)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -4659,7 +4748,7 @@
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
- $(am__append_151)
+ $(am__append_154)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -5323,7 +5412,8 @@
luatexdir/luaharfbuzz/src/luaharfbuzz/ot.c \
luatexdir/luaharfbuzz/src/luaharfbuzz/script.c \
luatexdir/luaharfbuzz/src/luaharfbuzz/tag.c \
- luatexdir/luaharfbuzz/src/luaharfbuzz/unicode.c
+ luatexdir/luaharfbuzz/src/luaharfbuzz/unicode.c \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c
libluajitharfbuzz_a_SOURCES = $(libluaharfbuzz_a_SOURCES)
@@ -5334,18 +5424,18 @@
xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
$(GRAPHITE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) \
- $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_110) \
- $(am__append_112)
+ $(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_113)
+ $(am__append_115)
xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
$(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) \
$(PPLIB_DEPEND) libmd5.a
@XETEX_MACOSX_TRUE at xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_152)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_155)
xetex_CFLAGS = $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -5354,7 +5444,7 @@
nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
xetexdir/etex_version.h xetexdir/xetex_version.h \
- $(am__append_153)
+ $(am__append_156)
xetex_ch_srcs = \
xetexdir/xetex.web \
xetexdir/tex.ch0 \
@@ -5386,7 +5476,7 @@
xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \
xetexdir/image/mfileio.h xetexdir/image/numbers.c \
xetexdir/image/numbers.h xetexdir/image/pngimage.c \
- xetexdir/image/pngimage.h $(am__append_114) $(am__append_115)
+ 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)
@@ -5490,13 +5580,13 @@
synctex_SOURCES = \
synctexdir/synctex_main.c
-synctex_CPPFLAGS = -I$(srcdir)/synctexdir
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_124)
+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_125)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_128)
libsynctex_la_SOURCES = \
synctexdir/synctex_parser.c \
synctexdir/synctex_parser_local.h \
@@ -5613,7 +5703,7 @@
.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .pl .pl$(EXEEXT) .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluadir/am/mfluapotrace.am $(srcdir)/mfluadir/am/mflualpeg.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mfluajitdir/am/mfluajitlpeg.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -5635,7 +5725,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
-$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluadir/am/mfluapotrace.am $(srcdir)/mfluadir/am/mflualpeg.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mfluajitdir/am/mfluajitlpeg.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -6028,6 +6118,9 @@
luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-unicode.$(OBJEXT): \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.$(OBJEXT): \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluaharfbuzz.a
@@ -6077,6 +6170,9 @@
luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-unicode.$(OBJEXT): \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.$(OBJEXT): \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluajitharfbuzz.a
@@ -7124,11 +7220,28 @@
$(AM_V_at)-rm -f libmfluajit.a
$(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD)
$(AM_V_at)$(RANLIB) libmfluajit.a
+mfluadir/luapeg/$(am__dirstamp):
+ @$(MKDIR_P) mfluadir/luapeg
+ @: > mfluadir/luapeg/$(am__dirstamp)
+mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) mfluadir/luapeg/$(DEPDIR)
+ @: > mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
-libmfluajitotfcc.a: $(libmfluajitotfcc_a_OBJECTS) $(libmfluajitotfcc_a_DEPENDENCIES) $(EXTRA_libmfluajitotfcc_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libmfluajitotfcc.a
- $(AM_V_AR)$(libmfluajitotfcc_a_AR) libmfluajitotfcc.a $(libmfluajitotfcc_a_OBJECTS) $(libmfluajitotfcc_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmfluajitotfcc.a
+libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajitlpeg.a
+ $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajitlpeg.a
+mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflualpeg.a
+ $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflualpeg.a
mfluadir/otfcc/dep/extern/emyg-dtoa/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/dep/extern/emyg-dtoa
@: > mfluadir/otfcc/dep/extern/emyg-dtoa/$(am__dirstamp)
@@ -7650,7 +7763,33 @@
$(AM_V_at)-rm -f libmfluaotfcc.a
$(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD)
$(AM_V_at)$(RANLIB) libmfluaotfcc.a
+mfluadir/potrace/$(am__dirstamp):
+ @$(MKDIR_P) mfluadir/potrace
+ @: > mfluadir/potrace/$(am__dirstamp)
+mfluadir/potrace/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) mfluadir/potrace/$(DEPDIR)
+ @: > mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+mfluadir/potrace/libmfluapotrace_a-curve.$(OBJEXT): \
+ mfluadir/potrace/$(am__dirstamp) \
+ mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+mfluadir/potrace/libmfluapotrace_a-decompose.$(OBJEXT): \
+ mfluadir/potrace/$(am__dirstamp) \
+ mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT): \
+ mfluadir/potrace/$(am__dirstamp) \
+ mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+mfluadir/potrace/libmfluapotrace_a-potracelib.$(OBJEXT): \
+ mfluadir/potrace/$(am__dirstamp) \
+ mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+mfluadir/potrace/libmfluapotrace_a-trace.$(OBJEXT): \
+ mfluadir/potrace/$(am__dirstamp) \
+ mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluapotrace.a
+ $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluapotrace.a
+
libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmplibbackends.a
$(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD)
@@ -8037,6 +8176,10 @@
gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
@rm -f gftype$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS)
+
+himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
+ @rm -f himktables$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS)
hitexdir/$(am__dirstamp):
@$(MKDIR_P) hitexdir
@: > hitexdir/$(am__dirstamp)
@@ -8043,9 +8186,9 @@
hitexdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) hitexdir/$(DEPDIR)
@: > hitexdir/$(DEPDIR)/$(am__dirstamp)
-hitexdir/hishrink-hishrink-lexer.$(OBJEXT): hitexdir/$(am__dirstamp) \
+hitexdir/hishrink-hilexer.$(OBJEXT): hitexdir/$(am__dirstamp) \
hitexdir/$(DEPDIR)/$(am__dirstamp)
-hitexdir/hishrink-hishrink-parser.$(OBJEXT): hitexdir/$(am__dirstamp) \
+hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \
hitexdir/$(DEPDIR)/$(am__dirstamp)
hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
@@ -8266,6 +8409,10 @@
@rm -f ttf2afm$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS)
+twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
+ @rm -f twill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS)
+
upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
@rm -f upbibtex$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS)
@@ -8361,6 +8508,7 @@
-rm -f luatexdir/unilib/*.$(OBJEXT)
-rm -f luatexdir/utils/*.$(OBJEXT)
-rm -f mfluadir/*.$(OBJEXT)
+ -rm -f mfluadir/luapeg/*.$(OBJEXT)
-rm -f mfluadir/otfcc/dep/extern/*.$(OBJEXT)
-rm -f mfluadir/otfcc/dep/extern/emyg-dtoa/*.$(OBJEXT)
-rm -f mfluadir/otfcc/lib/bk/*.$(OBJEXT)
@@ -8390,6 +8538,7 @@
-rm -f mfluadir/otfcc/lib/table/vdmx/*.$(OBJEXT)
-rm -f mfluadir/otfcc/lib/vf/*.$(OBJEXT)
-rm -f mfluadir/otfcc/src/*.$(OBJEXT)
+ -rm -f mfluadir/potrace/*.$(OBJEXT)
-rm -f mfluajitdir/*.$(OBJEXT)
-rm -f mplibdir/*.$(OBJEXT)
-rm -f pdftexdir/*.$(OBJEXT)
@@ -8441,14 +8590,14 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftodvi.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftopk.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftype.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hishrink-hformat.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/himktables.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hishrink-hishrink.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/histretch-hformat.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hishrink-hitables.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/histretch-histretch.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hitex-hformat.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/histretch-hitables.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hitex-hiput.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hitex-hitables.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hitex-hitex.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hitex-hput.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hitex-htex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/initex-callexe.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluahbtexspecific_a-luainit-hb.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluahbtexspecific_a-luastuff-hb.Po at am__quote@ # am--include-marker
@@ -8464,7 +8613,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmfluajit_a-mfluajit-pool.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmfluajit_a-mfluajit0.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmfluajit_a-mfluajitini.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmfluajitotfcc_a-libmfluajitotfcc.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibbackends_a-pngout.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibbackends_a-svgout.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mp.Po at am__quote@ # am--include-marker
@@ -8529,6 +8677,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-texini.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tftopl.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tie-tie.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/twill.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upbibtex-upbibtex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/updvitype-updvitype.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmp.Po at am__quote@ # am--include-marker
@@ -8561,8 +8710,8 @@
@AMDEP_TRUE@@am__include@ @am__quote at eptexdir/$(DEPDIR)/eptex-eptexextra.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at etexdir/$(DEPDIR)/etex-etexextra.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at euptexdir/$(DEPDIR)/euptex-euptexextra.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at hitexdir/$(DEPDIR)/hishrink-hishrink-lexer.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at hitexdir/$(DEPDIR)/hishrink-hishrink-parser.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at hitexdir/$(DEPDIR)/hishrink-hilexer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at hitexdir/$(DEPDIR)/hishrink-hiparser.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at libmd5/$(DEPDIR)/a-md5.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at libmd5/$(DEPDIR)/md5main-md5main.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/$(DEPDIR)/luahbtex-luatex.Po at am__quote@ # am--include-marker
@@ -8746,6 +8895,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-script.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-tag.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-unicode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-variation.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-blob.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-buffer.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-class_utils.Po at am__quote@ # am--include-marker
@@ -8759,6 +8909,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-script.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-tag.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-unicode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-variation.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5lib.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5.Po at am__quote@ # am--include-marker
@@ -8939,6 +9090,8 @@
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/mflua-mfluaextra.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/luapeg/$(DEPDIR)/libmfluajitlpeg_a-lpeg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/luapeg/$(DEPDIR)/libmflualpeg_a-lpeg.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-json-builder.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-json.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-sds.Po at am__quote@ # am--include-marker
@@ -9055,6 +9208,11 @@
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/otfcc/lib/vf/$(DEPDIR)/libmfluaotfcc_a-vq.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-luafunc.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-otfccdll.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/libmputil_a-avl.Po at am__quote@ # am--include-marker
@@ -10018,6 +10176,20 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaharfbuzz_a_CPPFLAGS) $(CPPFLAGS) $(libluaharfbuzz_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-unicode.obj `if test -f 'luatexdir/luaharfbuzz/src/luaharfbuzz/unicode.c'; then $(CYGPATH_W) 'luatexdir/luaharfbuzz/src/luaharfbuzz/unicode.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaharfbuzz/src/luaharfbuzz/unicode.c'; fi`
+luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.o: luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaharfbuzz_a_CPPFLAGS) $(CPPFLAGS) $(libluaharfbuzz_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.o -MD -MP -MF luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-variation.Tpo -c -o luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.o `test -f 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c' || echo '$(srcdir)/'`luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-variation.Tpo luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-variation.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c' object='luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaharfbuzz_a_CPPFLAGS) $(CPPFLAGS) $(libluaharfbuzz_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.o `test -f 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c' || echo '$(srcdir)/'`luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c
+
+luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.obj: luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaharfbuzz_a_CPPFLAGS) $(CPPFLAGS) $(libluaharfbuzz_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.obj -MD -MP -MF luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-variation.Tpo -c -o luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.obj `if test -f 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; then $(CYGPATH_W) 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-variation.Tpo luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-variation.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c' object='luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaharfbuzz_a_CPPFLAGS) $(CPPFLAGS) $(libluaharfbuzz_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.obj `if test -f 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; then $(CYGPATH_W) 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; fi`
+
libluahbtexspecific_a-utils-hb.o: utils-hb.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluahbtexspecific_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluahbtexspecific_a-utils-hb.o -MD -MP -MF $(DEPDIR)/libluahbtexspecific_a-utils-hb.Tpo -c -o libluahbtexspecific_a-utils-hb.o `test -f 'utils-hb.c' || echo '$(srcdir)/'`utils-hb.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libluahbtexspecific_a-utils-hb.Tpo $(DEPDIR)/libluahbtexspecific_a-utils-hb.Po
@@ -10256,6 +10428,20 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitharfbuzz_a_CPPFLAGS) $(CPPFLAGS) $(libluajitharfbuzz_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-unicode.obj `if test -f 'luatexdir/luaharfbuzz/src/luaharfbuzz/unicode.c'; then $(CYGPATH_W) 'luatexdir/luaharfbuzz/src/luaharfbuzz/unicode.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaharfbuzz/src/luaharfbuzz/unicode.c'; fi`
+luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.o: luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitharfbuzz_a_CPPFLAGS) $(CPPFLAGS) $(libluajitharfbuzz_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.o -MD -MP -MF luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-variation.Tpo -c -o luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.o `test -f 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c' || echo '$(srcdir)/'`luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-variation.Tpo luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-variation.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c' object='luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitharfbuzz_a_CPPFLAGS) $(CPPFLAGS) $(libluajitharfbuzz_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.o `test -f 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c' || echo '$(srcdir)/'`luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c
+
+luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.obj: luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitharfbuzz_a_CPPFLAGS) $(CPPFLAGS) $(libluajitharfbuzz_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.obj -MD -MP -MF luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-variation.Tpo -c -o luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.obj `if test -f 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; then $(CYGPATH_W) 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-variation.Tpo luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-variation.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c' object='luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitharfbuzz_a_CPPFLAGS) $(CPPFLAGS) $(libluajitharfbuzz_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-variation.obj `if test -f 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; then $(CYGPATH_W) 'luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaharfbuzz/src/luaharfbuzz/variation.c'; fi`
+
libluajithbtexspecific_a-utils-hb.o: utils-hb.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajithbtexspecific_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluajithbtexspecific_a-utils-hb.o -MD -MP -MF $(DEPDIR)/libluajithbtexspecific_a-utils-hb.Tpo -c -o libluajithbtexspecific_a-utils-hb.o `test -f 'utils-hb.c' || echo '$(srcdir)/'`utils-hb.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libluajithbtexspecific_a-utils-hb.Tpo $(DEPDIR)/libluajithbtexspecific_a-utils-hb.Po
@@ -14442,20 +14628,34 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmfluajit_a-mfluajit-pool.obj `if test -f 'mfluajit-pool.c'; then $(CYGPATH_W) 'mfluajit-pool.c'; else $(CYGPATH_W) '$(srcdir)/mfluajit-pool.c'; fi`
-libmfluajitotfcc_a-libmfluajitotfcc.o: libmfluajitotfcc.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajitotfcc_a_CPPFLAGS) $(CPPFLAGS) $(libmfluajitotfcc_a_CFLAGS) $(CFLAGS) -MT libmfluajitotfcc_a-libmfluajitotfcc.o -MD -MP -MF $(DEPDIR)/libmfluajitotfcc_a-libmfluajitotfcc.Tpo -c -o libmfluajitotfcc_a-libmfluajitotfcc.o `test -f 'libmfluajitotfcc.c' || echo '$(srcdir)/'`libmfluajitotfcc.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmfluajitotfcc_a-libmfluajitotfcc.Tpo $(DEPDIR)/libmfluajitotfcc_a-libmfluajitotfcc.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmfluajitotfcc.c' object='libmfluajitotfcc_a-libmfluajitotfcc.o' libtool=no @AMDEPBACKSLASH@
+mfluadir/luapeg/libmfluajitlpeg_a-lpeg.o: mfluadir/luapeg/lpeg.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajitlpeg_a_CPPFLAGS) $(CPPFLAGS) $(libmfluajitlpeg_a_CFLAGS) $(CFLAGS) -MT mfluadir/luapeg/libmfluajitlpeg_a-lpeg.o -MD -MP -MF mfluadir/luapeg/$(DEPDIR)/libmfluajitlpeg_a-lpeg.Tpo -c -o mfluadir/luapeg/libmfluajitlpeg_a-lpeg.o `test -f 'mfluadir/luapeg/lpeg.c' || echo '$(srcdir)/'`mfluadir/luapeg/lpeg.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/luapeg/$(DEPDIR)/libmfluajitlpeg_a-lpeg.Tpo mfluadir/luapeg/$(DEPDIR)/libmfluajitlpeg_a-lpeg.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/luapeg/lpeg.c' object='mfluadir/luapeg/libmfluajitlpeg_a-lpeg.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajitotfcc_a_CPPFLAGS) $(CPPFLAGS) $(libmfluajitotfcc_a_CFLAGS) $(CFLAGS) -c -o libmfluajitotfcc_a-libmfluajitotfcc.o `test -f 'libmfluajitotfcc.c' || echo '$(srcdir)/'`libmfluajitotfcc.c
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajitlpeg_a_CPPFLAGS) $(CPPFLAGS) $(libmfluajitlpeg_a_CFLAGS) $(CFLAGS) -c -o mfluadir/luapeg/libmfluajitlpeg_a-lpeg.o `test -f 'mfluadir/luapeg/lpeg.c' || echo '$(srcdir)/'`mfluadir/luapeg/lpeg.c
-libmfluajitotfcc_a-libmfluajitotfcc.obj: libmfluajitotfcc.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajitotfcc_a_CPPFLAGS) $(CPPFLAGS) $(libmfluajitotfcc_a_CFLAGS) $(CFLAGS) -MT libmfluajitotfcc_a-libmfluajitotfcc.obj -MD -MP -MF $(DEPDIR)/libmfluajitotfcc_a-libmfluajitotfcc.Tpo -c -o libmfluajitotfcc_a-libmfluajitotfcc.obj `if test -f 'libmfluajitotfcc.c'; then $(CYGPATH_W) 'libmfluajitotfcc.c'; else $(CYGPATH_W) '$(srcdir)/libmfluajitotfcc.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmfluajitotfcc_a-libmfluajitotfcc.Tpo $(DEPDIR)/libmfluajitotfcc_a-libmfluajitotfcc.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmfluajitotfcc.c' object='libmfluajitotfcc_a-libmfluajitotfcc.obj' libtool=no @AMDEPBACKSLASH@
+mfluadir/luapeg/libmfluajitlpeg_a-lpeg.obj: mfluadir/luapeg/lpeg.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajitlpeg_a_CPPFLAGS) $(CPPFLAGS) $(libmfluajitlpeg_a_CFLAGS) $(CFLAGS) -MT mfluadir/luapeg/libmfluajitlpeg_a-lpeg.obj -MD -MP -MF mfluadir/luapeg/$(DEPDIR)/libmfluajitlpeg_a-lpeg.Tpo -c -o mfluadir/luapeg/libmfluajitlpeg_a-lpeg.obj `if test -f 'mfluadir/luapeg/lpeg.c'; then $(CYGPATH_W) 'mfluadir/luapeg/lpeg.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/luapeg/lpeg.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/luapeg/$(DEPDIR)/libmfluajitlpeg_a-lpeg.Tpo mfluadir/luapeg/$(DEPDIR)/libmfluajitlpeg_a-lpeg.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/luapeg/lpeg.c' object='mfluadir/luapeg/libmfluajitlpeg_a-lpeg.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajitotfcc_a_CPPFLAGS) $(CPPFLAGS) $(libmfluajitotfcc_a_CFLAGS) $(CFLAGS) -c -o libmfluajitotfcc_a-libmfluajitotfcc.obj `if test -f 'libmfluajitotfcc.c'; then $(CYGPATH_W) 'libmfluajitotfcc.c'; else $(CYGPATH_W) '$(srcdir)/libmfluajitotfcc.c'; fi`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajitlpeg_a_CPPFLAGS) $(CPPFLAGS) $(libmfluajitlpeg_a_CFLAGS) $(CFLAGS) -c -o mfluadir/luapeg/libmfluajitlpeg_a-lpeg.obj `if test -f 'mfluadir/luapeg/lpeg.c'; then $(CYGPATH_W) 'mfluadir/luapeg/lpeg.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/luapeg/lpeg.c'; fi`
+mfluadir/luapeg/libmflualpeg_a-lpeg.o: mfluadir/luapeg/lpeg.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflualpeg_a_CPPFLAGS) $(CPPFLAGS) $(libmflualpeg_a_CFLAGS) $(CFLAGS) -MT mfluadir/luapeg/libmflualpeg_a-lpeg.o -MD -MP -MF mfluadir/luapeg/$(DEPDIR)/libmflualpeg_a-lpeg.Tpo -c -o mfluadir/luapeg/libmflualpeg_a-lpeg.o `test -f 'mfluadir/luapeg/lpeg.c' || echo '$(srcdir)/'`mfluadir/luapeg/lpeg.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/luapeg/$(DEPDIR)/libmflualpeg_a-lpeg.Tpo mfluadir/luapeg/$(DEPDIR)/libmflualpeg_a-lpeg.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/luapeg/lpeg.c' object='mfluadir/luapeg/libmflualpeg_a-lpeg.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflualpeg_a_CPPFLAGS) $(CPPFLAGS) $(libmflualpeg_a_CFLAGS) $(CFLAGS) -c -o mfluadir/luapeg/libmflualpeg_a-lpeg.o `test -f 'mfluadir/luapeg/lpeg.c' || echo '$(srcdir)/'`mfluadir/luapeg/lpeg.c
+
+mfluadir/luapeg/libmflualpeg_a-lpeg.obj: mfluadir/luapeg/lpeg.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflualpeg_a_CPPFLAGS) $(CPPFLAGS) $(libmflualpeg_a_CFLAGS) $(CFLAGS) -MT mfluadir/luapeg/libmflualpeg_a-lpeg.obj -MD -MP -MF mfluadir/luapeg/$(DEPDIR)/libmflualpeg_a-lpeg.Tpo -c -o mfluadir/luapeg/libmflualpeg_a-lpeg.obj `if test -f 'mfluadir/luapeg/lpeg.c'; then $(CYGPATH_W) 'mfluadir/luapeg/lpeg.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/luapeg/lpeg.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/luapeg/$(DEPDIR)/libmflualpeg_a-lpeg.Tpo mfluadir/luapeg/$(DEPDIR)/libmflualpeg_a-lpeg.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/luapeg/lpeg.c' object='mfluadir/luapeg/libmflualpeg_a-lpeg.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflualpeg_a_CPPFLAGS) $(CPPFLAGS) $(libmflualpeg_a_CFLAGS) $(CFLAGS) -c -o mfluadir/luapeg/libmflualpeg_a-lpeg.obj `if test -f 'mfluadir/luapeg/lpeg.c'; then $(CYGPATH_W) 'mfluadir/luapeg/lpeg.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/luapeg/lpeg.c'; fi`
+
mfluadir/otfcc/dep/extern/emyg-dtoa/libmfluaotfcc_a-emyg-dtoa.o: mfluadir/otfcc/dep/extern/emyg-dtoa/emyg-dtoa.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluaotfcc_a_CPPFLAGS) $(CPPFLAGS) $(libmfluaotfcc_a_CFLAGS) $(CFLAGS) -MT mfluadir/otfcc/dep/extern/emyg-dtoa/libmfluaotfcc_a-emyg-dtoa.o -MD -MP -MF mfluadir/otfcc/dep/extern/emyg-dtoa/$(DEPDIR)/libmfluaotfcc_a-emyg-dtoa.Tpo -c -o mfluadir/otfcc/dep/extern/emyg-dtoa/libmfluaotfcc_a-emyg-dtoa.o `test -f 'mfluadir/otfcc/dep/extern/emyg-dtoa/emyg-dtoa.c' || echo '$(srcdir)/'`mfluadir/otfcc/dep/extern/emyg-dtoa/emyg-dtoa.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/otfcc/dep/extern/emyg-dtoa/$(DEPDIR)/libmfluaotfcc_a-emyg-dtoa.Tpo mfluadir/otfcc/dep/extern/emyg-dtoa/$(DEPDIR)/libmfluaotfcc_a-emyg-dtoa.Po
@@ -16080,6 +16280,76 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluaotfcc_a_CPPFLAGS) $(CPPFLAGS) $(libmfluaotfcc_a_CFLAGS) $(CFLAGS) -c -o mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.obj `if test -f 'mfluadir/otfcc/lib/table/TSI5.c'; then $(CYGPATH_W) 'mfluadir/otfcc/lib/table/TSI5.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/otfcc/lib/table/TSI5.c'; fi`
+mfluadir/potrace/libmfluapotrace_a-curve.o: mfluadir/potrace/curve.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-curve.o -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-curve.o `test -f 'mfluadir/potrace/curve.c' || echo '$(srcdir)/'`mfluadir/potrace/curve.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/curve.c' object='mfluadir/potrace/libmfluapotrace_a-curve.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-curve.o `test -f 'mfluadir/potrace/curve.c' || echo '$(srcdir)/'`mfluadir/potrace/curve.c
+
+mfluadir/potrace/libmfluapotrace_a-curve.obj: mfluadir/potrace/curve.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-curve.obj -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-curve.obj `if test -f 'mfluadir/potrace/curve.c'; then $(CYGPATH_W) 'mfluadir/potrace/curve.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/curve.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/curve.c' object='mfluadir/potrace/libmfluapotrace_a-curve.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-curve.obj `if test -f 'mfluadir/potrace/curve.c'; then $(CYGPATH_W) 'mfluadir/potrace/curve.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/curve.c'; fi`
+
+mfluadir/potrace/libmfluapotrace_a-decompose.o: mfluadir/potrace/decompose.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-decompose.o -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-decompose.o `test -f 'mfluadir/potrace/decompose.c' || echo '$(srcdir)/'`mfluadir/potrace/decompose.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/decompose.c' object='mfluadir/potrace/libmfluapotrace_a-decompose.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-decompose.o `test -f 'mfluadir/potrace/decompose.c' || echo '$(srcdir)/'`mfluadir/potrace/decompose.c
+
+mfluadir/potrace/libmfluapotrace_a-decompose.obj: mfluadir/potrace/decompose.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-decompose.obj -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-decompose.obj `if test -f 'mfluadir/potrace/decompose.c'; then $(CYGPATH_W) 'mfluadir/potrace/decompose.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/decompose.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/decompose.c' object='mfluadir/potrace/libmfluapotrace_a-decompose.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-decompose.obj `if test -f 'mfluadir/potrace/decompose.c'; then $(CYGPATH_W) 'mfluadir/potrace/decompose.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/decompose.c'; fi`
+
+mfluadir/potrace/libmfluapotrace_a-luafunc.o: mfluadir/potrace/luafunc.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-luafunc.o -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-luafunc.o `test -f 'mfluadir/potrace/luafunc.c' || echo '$(srcdir)/'`mfluadir/potrace/luafunc.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/luafunc.c' object='mfluadir/potrace/libmfluapotrace_a-luafunc.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-luafunc.o `test -f 'mfluadir/potrace/luafunc.c' || echo '$(srcdir)/'`mfluadir/potrace/luafunc.c
+
+mfluadir/potrace/libmfluapotrace_a-luafunc.obj: mfluadir/potrace/luafunc.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-luafunc.obj -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-luafunc.obj `if test -f 'mfluadir/potrace/luafunc.c'; then $(CYGPATH_W) 'mfluadir/potrace/luafunc.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/luafunc.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/luafunc.c' object='mfluadir/potrace/libmfluapotrace_a-luafunc.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-luafunc.obj `if test -f 'mfluadir/potrace/luafunc.c'; then $(CYGPATH_W) 'mfluadir/potrace/luafunc.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/luafunc.c'; fi`
+
+mfluadir/potrace/libmfluapotrace_a-potracelib.o: mfluadir/potrace/potracelib.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-potracelib.o -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-potracelib.o `test -f 'mfluadir/potrace/potracelib.c' || echo '$(srcdir)/'`mfluadir/potrace/potracelib.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/potracelib.c' object='mfluadir/potrace/libmfluapotrace_a-potracelib.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-potracelib.o `test -f 'mfluadir/potrace/potracelib.c' || echo '$(srcdir)/'`mfluadir/potrace/potracelib.c
+
+mfluadir/potrace/libmfluapotrace_a-potracelib.obj: mfluadir/potrace/potracelib.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-potracelib.obj -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-potracelib.obj `if test -f 'mfluadir/potrace/potracelib.c'; then $(CYGPATH_W) 'mfluadir/potrace/potracelib.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/potracelib.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/potracelib.c' object='mfluadir/potrace/libmfluapotrace_a-potracelib.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-potracelib.obj `if test -f 'mfluadir/potrace/potracelib.c'; then $(CYGPATH_W) 'mfluadir/potrace/potracelib.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/potracelib.c'; fi`
+
+mfluadir/potrace/libmfluapotrace_a-trace.o: mfluadir/potrace/trace.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-trace.o -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-trace.o `test -f 'mfluadir/potrace/trace.c' || echo '$(srcdir)/'`mfluadir/potrace/trace.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/trace.c' object='mfluadir/potrace/libmfluapotrace_a-trace.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-trace.o `test -f 'mfluadir/potrace/trace.c' || echo '$(srcdir)/'`mfluadir/potrace/trace.c
+
+mfluadir/potrace/libmfluapotrace_a-trace.obj: mfluadir/potrace/trace.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-trace.obj -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-trace.obj `if test -f 'mfluadir/potrace/trace.c'; then $(CYGPATH_W) 'mfluadir/potrace/trace.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/trace.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/trace.c' object='mfluadir/potrace/libmfluapotrace_a-trace.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-trace.obj `if test -f 'mfluadir/potrace/trace.c'; then $(CYGPATH_W) 'mfluadir/potrace/trace.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/trace.c'; fi`
+
libmplibbackends_a-pngout.o: pngout.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplibbackends_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplibbackends_a-pngout.o -MD -MP -MF $(DEPDIR)/libmplibbackends_a-pngout.Tpo -c -o libmplibbackends_a-pngout.o `test -f 'pngout.c' || echo '$(srcdir)/'`pngout.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmplibbackends_a-pngout.Tpo $(DEPDIR)/libmplibbackends_a-pngout.Po
@@ -17368,20 +17638,48 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptex-pool.obj `if test -f 'euptex-pool.c'; then $(CYGPATH_W) 'euptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/euptex-pool.c'; fi`
-hishrink-hformat.o: hformat.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hishrink-hformat.o -MD -MP -MF $(DEPDIR)/hishrink-hformat.Tpo -c -o hishrink-hformat.o `test -f 'hformat.c' || echo '$(srcdir)/'`hformat.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hishrink-hformat.Tpo $(DEPDIR)/hishrink-hformat.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hformat.c' object='hishrink-hformat.o' libtool=no @AMDEPBACKSLASH@
+hishrink-hitables.o: hitables.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hishrink-hitables.o -MD -MP -MF $(DEPDIR)/hishrink-hitables.Tpo -c -o hishrink-hitables.o `test -f 'hitables.c' || echo '$(srcdir)/'`hitables.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hishrink-hitables.Tpo $(DEPDIR)/hishrink-hitables.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitables.c' object='hishrink-hitables.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hishrink-hformat.o `test -f 'hformat.c' || echo '$(srcdir)/'`hformat.c
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hishrink-hitables.o `test -f 'hitables.c' || echo '$(srcdir)/'`hitables.c
-hishrink-hformat.obj: hformat.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hishrink-hformat.obj -MD -MP -MF $(DEPDIR)/hishrink-hformat.Tpo -c -o hishrink-hformat.obj `if test -f 'hformat.c'; then $(CYGPATH_W) 'hformat.c'; else $(CYGPATH_W) '$(srcdir)/hformat.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hishrink-hformat.Tpo $(DEPDIR)/hishrink-hformat.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hformat.c' object='hishrink-hformat.obj' libtool=no @AMDEPBACKSLASH@
+hishrink-hitables.obj: hitables.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hishrink-hitables.obj -MD -MP -MF $(DEPDIR)/hishrink-hitables.Tpo -c -o hishrink-hitables.obj `if test -f 'hitables.c'; then $(CYGPATH_W) 'hitables.c'; else $(CYGPATH_W) '$(srcdir)/hitables.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hishrink-hitables.Tpo $(DEPDIR)/hishrink-hitables.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitables.c' object='hishrink-hitables.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hishrink-hformat.obj `if test -f 'hformat.c'; then $(CYGPATH_W) 'hformat.c'; else $(CYGPATH_W) '$(srcdir)/hformat.c'; fi`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hishrink-hitables.obj `if test -f 'hitables.c'; then $(CYGPATH_W) 'hitables.c'; else $(CYGPATH_W) '$(srcdir)/hitables.c'; fi`
+hitexdir/hishrink-hilexer.o: hitexdir/hilexer.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitexdir/hishrink-hilexer.o -MD -MP -MF hitexdir/$(DEPDIR)/hishrink-hilexer.Tpo -c -o hitexdir/hishrink-hilexer.o `test -f 'hitexdir/hilexer.c' || echo '$(srcdir)/'`hitexdir/hilexer.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) hitexdir/$(DEPDIR)/hishrink-hilexer.Tpo hitexdir/$(DEPDIR)/hishrink-hilexer.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitexdir/hilexer.c' object='hitexdir/hishrink-hilexer.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitexdir/hishrink-hilexer.o `test -f 'hitexdir/hilexer.c' || echo '$(srcdir)/'`hitexdir/hilexer.c
+
+hitexdir/hishrink-hilexer.obj: hitexdir/hilexer.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitexdir/hishrink-hilexer.obj -MD -MP -MF hitexdir/$(DEPDIR)/hishrink-hilexer.Tpo -c -o hitexdir/hishrink-hilexer.obj `if test -f 'hitexdir/hilexer.c'; then $(CYGPATH_W) 'hitexdir/hilexer.c'; else $(CYGPATH_W) '$(srcdir)/hitexdir/hilexer.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) hitexdir/$(DEPDIR)/hishrink-hilexer.Tpo hitexdir/$(DEPDIR)/hishrink-hilexer.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitexdir/hilexer.c' object='hitexdir/hishrink-hilexer.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitexdir/hishrink-hilexer.obj `if test -f 'hitexdir/hilexer.c'; then $(CYGPATH_W) 'hitexdir/hilexer.c'; else $(CYGPATH_W) '$(srcdir)/hitexdir/hilexer.c'; fi`
+
+hitexdir/hishrink-hiparser.o: hitexdir/hiparser.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitexdir/hishrink-hiparser.o -MD -MP -MF hitexdir/$(DEPDIR)/hishrink-hiparser.Tpo -c -o hitexdir/hishrink-hiparser.o `test -f 'hitexdir/hiparser.c' || echo '$(srcdir)/'`hitexdir/hiparser.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) hitexdir/$(DEPDIR)/hishrink-hiparser.Tpo hitexdir/$(DEPDIR)/hishrink-hiparser.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitexdir/hiparser.c' object='hitexdir/hishrink-hiparser.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitexdir/hishrink-hiparser.o `test -f 'hitexdir/hiparser.c' || echo '$(srcdir)/'`hitexdir/hiparser.c
+
+hitexdir/hishrink-hiparser.obj: hitexdir/hiparser.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitexdir/hishrink-hiparser.obj -MD -MP -MF hitexdir/$(DEPDIR)/hishrink-hiparser.Tpo -c -o hitexdir/hishrink-hiparser.obj `if test -f 'hitexdir/hiparser.c'; then $(CYGPATH_W) 'hitexdir/hiparser.c'; else $(CYGPATH_W) '$(srcdir)/hitexdir/hiparser.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) hitexdir/$(DEPDIR)/hishrink-hiparser.Tpo hitexdir/$(DEPDIR)/hishrink-hiparser.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitexdir/hiparser.c' object='hitexdir/hishrink-hiparser.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitexdir/hishrink-hiparser.obj `if test -f 'hitexdir/hiparser.c'; then $(CYGPATH_W) 'hitexdir/hiparser.c'; else $(CYGPATH_W) '$(srcdir)/hitexdir/hiparser.c'; fi`
+
hishrink-hishrink.o: hishrink.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hishrink-hishrink.o -MD -MP -MF $(DEPDIR)/hishrink-hishrink.Tpo -c -o hishrink-hishrink.o `test -f 'hishrink.c' || echo '$(srcdir)/'`hishrink.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hishrink-hishrink.Tpo $(DEPDIR)/hishrink-hishrink.Po
@@ -17396,48 +17694,20 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hishrink-hishrink.obj `if test -f 'hishrink.c'; then $(CYGPATH_W) 'hishrink.c'; else $(CYGPATH_W) '$(srcdir)/hishrink.c'; fi`
-hitexdir/hishrink-hishrink-lexer.o: hitexdir/hishrink-lexer.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitexdir/hishrink-hishrink-lexer.o -MD -MP -MF hitexdir/$(DEPDIR)/hishrink-hishrink-lexer.Tpo -c -o hitexdir/hishrink-hishrink-lexer.o `test -f 'hitexdir/hishrink-lexer.c' || echo '$(srcdir)/'`hitexdir/hishrink-lexer.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) hitexdir/$(DEPDIR)/hishrink-hishrink-lexer.Tpo hitexdir/$(DEPDIR)/hishrink-hishrink-lexer.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitexdir/hishrink-lexer.c' object='hitexdir/hishrink-hishrink-lexer.o' libtool=no @AMDEPBACKSLASH@
+histretch-hitables.o: hitables.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(histretch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT histretch-hitables.o -MD -MP -MF $(DEPDIR)/histretch-hitables.Tpo -c -o histretch-hitables.o `test -f 'hitables.c' || echo '$(srcdir)/'`hitables.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/histretch-hitables.Tpo $(DEPDIR)/histretch-hitables.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitables.c' object='histretch-hitables.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitexdir/hishrink-hishrink-lexer.o `test -f 'hitexdir/hishrink-lexer.c' || echo '$(srcdir)/'`hitexdir/hishrink-lexer.c
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(histretch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o histretch-hitables.o `test -f 'hitables.c' || echo '$(srcdir)/'`hitables.c
-hitexdir/hishrink-hishrink-lexer.obj: hitexdir/hishrink-lexer.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitexdir/hishrink-hishrink-lexer.obj -MD -MP -MF hitexdir/$(DEPDIR)/hishrink-hishrink-lexer.Tpo -c -o hitexdir/hishrink-hishrink-lexer.obj `if test -f 'hitexdir/hishrink-lexer.c'; then $(CYGPATH_W) 'hitexdir/hishrink-lexer.c'; else $(CYGPATH_W) '$(srcdir)/hitexdir/hishrink-lexer.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) hitexdir/$(DEPDIR)/hishrink-hishrink-lexer.Tpo hitexdir/$(DEPDIR)/hishrink-hishrink-lexer.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitexdir/hishrink-lexer.c' object='hitexdir/hishrink-hishrink-lexer.obj' libtool=no @AMDEPBACKSLASH@
+histretch-hitables.obj: hitables.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(histretch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT histretch-hitables.obj -MD -MP -MF $(DEPDIR)/histretch-hitables.Tpo -c -o histretch-hitables.obj `if test -f 'hitables.c'; then $(CYGPATH_W) 'hitables.c'; else $(CYGPATH_W) '$(srcdir)/hitables.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/histretch-hitables.Tpo $(DEPDIR)/histretch-hitables.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitables.c' object='histretch-hitables.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitexdir/hishrink-hishrink-lexer.obj `if test -f 'hitexdir/hishrink-lexer.c'; then $(CYGPATH_W) 'hitexdir/hishrink-lexer.c'; else $(CYGPATH_W) '$(srcdir)/hitexdir/hishrink-lexer.c'; fi`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(histretch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o histretch-hitables.obj `if test -f 'hitables.c'; then $(CYGPATH_W) 'hitables.c'; else $(CYGPATH_W) '$(srcdir)/hitables.c'; fi`
-hitexdir/hishrink-hishrink-parser.o: hitexdir/hishrink-parser.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitexdir/hishrink-hishrink-parser.o -MD -MP -MF hitexdir/$(DEPDIR)/hishrink-hishrink-parser.Tpo -c -o hitexdir/hishrink-hishrink-parser.o `test -f 'hitexdir/hishrink-parser.c' || echo '$(srcdir)/'`hitexdir/hishrink-parser.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) hitexdir/$(DEPDIR)/hishrink-hishrink-parser.Tpo hitexdir/$(DEPDIR)/hishrink-hishrink-parser.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitexdir/hishrink-parser.c' object='hitexdir/hishrink-hishrink-parser.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitexdir/hishrink-hishrink-parser.o `test -f 'hitexdir/hishrink-parser.c' || echo '$(srcdir)/'`hitexdir/hishrink-parser.c
-
-hitexdir/hishrink-hishrink-parser.obj: hitexdir/hishrink-parser.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitexdir/hishrink-hishrink-parser.obj -MD -MP -MF hitexdir/$(DEPDIR)/hishrink-hishrink-parser.Tpo -c -o hitexdir/hishrink-hishrink-parser.obj `if test -f 'hitexdir/hishrink-parser.c'; then $(CYGPATH_W) 'hitexdir/hishrink-parser.c'; else $(CYGPATH_W) '$(srcdir)/hitexdir/hishrink-parser.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) hitexdir/$(DEPDIR)/hishrink-hishrink-parser.Tpo hitexdir/$(DEPDIR)/hishrink-hishrink-parser.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitexdir/hishrink-parser.c' object='hitexdir/hishrink-hishrink-parser.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hishrink_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitexdir/hishrink-hishrink-parser.obj `if test -f 'hitexdir/hishrink-parser.c'; then $(CYGPATH_W) 'hitexdir/hishrink-parser.c'; else $(CYGPATH_W) '$(srcdir)/hitexdir/hishrink-parser.c'; fi`
-
-histretch-hformat.o: hformat.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(histretch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT histretch-hformat.o -MD -MP -MF $(DEPDIR)/histretch-hformat.Tpo -c -o histretch-hformat.o `test -f 'hformat.c' || echo '$(srcdir)/'`hformat.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/histretch-hformat.Tpo $(DEPDIR)/histretch-hformat.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hformat.c' object='histretch-hformat.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(histretch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o histretch-hformat.o `test -f 'hformat.c' || echo '$(srcdir)/'`hformat.c
-
-histretch-hformat.obj: hformat.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(histretch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT histretch-hformat.obj -MD -MP -MF $(DEPDIR)/histretch-hformat.Tpo -c -o histretch-hformat.obj `if test -f 'hformat.c'; then $(CYGPATH_W) 'hformat.c'; else $(CYGPATH_W) '$(srcdir)/hformat.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/histretch-hformat.Tpo $(DEPDIR)/histretch-hformat.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hformat.c' object='histretch-hformat.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(histretch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o histretch-hformat.obj `if test -f 'hformat.c'; then $(CYGPATH_W) 'hformat.c'; else $(CYGPATH_W) '$(srcdir)/hformat.c'; fi`
-
histretch-histretch.o: histretch.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(histretch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT histretch-histretch.o -MD -MP -MF $(DEPDIR)/histretch-histretch.Tpo -c -o histretch-histretch.o `test -f 'histretch.c' || echo '$(srcdir)/'`histretch.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/histretch-histretch.Tpo $(DEPDIR)/histretch-histretch.Po
@@ -17452,48 +17722,34 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(histretch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o histretch-histretch.obj `if test -f 'histretch.c'; then $(CYGPATH_W) 'histretch.c'; else $(CYGPATH_W) '$(srcdir)/histretch.c'; fi`
-hitex-hformat.o: hformat.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitex-hformat.o -MD -MP -MF $(DEPDIR)/hitex-hformat.Tpo -c -o hitex-hformat.o `test -f 'hformat.c' || echo '$(srcdir)/'`hformat.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hitex-hformat.Tpo $(DEPDIR)/hitex-hformat.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hformat.c' object='hitex-hformat.o' libtool=no @AMDEPBACKSLASH@
+hitex-hitables.o: hitables.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitex-hitables.o -MD -MP -MF $(DEPDIR)/hitex-hitables.Tpo -c -o hitex-hitables.o `test -f 'hitables.c' || echo '$(srcdir)/'`hitables.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hitex-hitables.Tpo $(DEPDIR)/hitex-hitables.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitables.c' object='hitex-hitables.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitex-hformat.o `test -f 'hformat.c' || echo '$(srcdir)/'`hformat.c
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitex-hitables.o `test -f 'hitables.c' || echo '$(srcdir)/'`hitables.c
-hitex-hformat.obj: hformat.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitex-hformat.obj -MD -MP -MF $(DEPDIR)/hitex-hformat.Tpo -c -o hitex-hformat.obj `if test -f 'hformat.c'; then $(CYGPATH_W) 'hformat.c'; else $(CYGPATH_W) '$(srcdir)/hformat.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hitex-hformat.Tpo $(DEPDIR)/hitex-hformat.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hformat.c' object='hitex-hformat.obj' libtool=no @AMDEPBACKSLASH@
+hitex-hitables.obj: hitables.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitex-hitables.obj -MD -MP -MF $(DEPDIR)/hitex-hitables.Tpo -c -o hitex-hitables.obj `if test -f 'hitables.c'; then $(CYGPATH_W) 'hitables.c'; else $(CYGPATH_W) '$(srcdir)/hitables.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hitex-hitables.Tpo $(DEPDIR)/hitex-hitables.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hitables.c' object='hitex-hitables.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitex-hformat.obj `if test -f 'hformat.c'; then $(CYGPATH_W) 'hformat.c'; else $(CYGPATH_W) '$(srcdir)/hformat.c'; fi`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitex-hitables.obj `if test -f 'hitables.c'; then $(CYGPATH_W) 'hitables.c'; else $(CYGPATH_W) '$(srcdir)/hitables.c'; fi`
-hitex-hput.o: hput.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitex-hput.o -MD -MP -MF $(DEPDIR)/hitex-hput.Tpo -c -o hitex-hput.o `test -f 'hput.c' || echo '$(srcdir)/'`hput.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hitex-hput.Tpo $(DEPDIR)/hitex-hput.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hput.c' object='hitex-hput.o' libtool=no @AMDEPBACKSLASH@
+hitex-hiput.o: hiput.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitex-hiput.o -MD -MP -MF $(DEPDIR)/hitex-hiput.Tpo -c -o hitex-hiput.o `test -f 'hiput.c' || echo '$(srcdir)/'`hiput.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hitex-hiput.Tpo $(DEPDIR)/hitex-hiput.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hiput.c' object='hitex-hiput.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitex-hput.o `test -f 'hput.c' || echo '$(srcdir)/'`hput.c
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitex-hiput.o `test -f 'hiput.c' || echo '$(srcdir)/'`hiput.c
-hitex-hput.obj: hput.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitex-hput.obj -MD -MP -MF $(DEPDIR)/hitex-hput.Tpo -c -o hitex-hput.obj `if test -f 'hput.c'; then $(CYGPATH_W) 'hput.c'; else $(CYGPATH_W) '$(srcdir)/hput.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hitex-hput.Tpo $(DEPDIR)/hitex-hput.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hput.c' object='hitex-hput.obj' libtool=no @AMDEPBACKSLASH@
+hitex-hiput.obj: hiput.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitex-hiput.obj -MD -MP -MF $(DEPDIR)/hitex-hiput.Tpo -c -o hitex-hiput.obj `if test -f 'hiput.c'; then $(CYGPATH_W) 'hiput.c'; else $(CYGPATH_W) '$(srcdir)/hiput.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hitex-hiput.Tpo $(DEPDIR)/hitex-hiput.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hiput.c' object='hitex-hiput.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitex-hput.obj `if test -f 'hput.c'; then $(CYGPATH_W) 'hput.c'; else $(CYGPATH_W) '$(srcdir)/hput.c'; fi`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitex-hiput.obj `if test -f 'hiput.c'; then $(CYGPATH_W) 'hiput.c'; else $(CYGPATH_W) '$(srcdir)/hiput.c'; fi`
-hitex-htex.o: htex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitex-htex.o -MD -MP -MF $(DEPDIR)/hitex-htex.Tpo -c -o hitex-htex.o `test -f 'htex.c' || echo '$(srcdir)/'`htex.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hitex-htex.Tpo $(DEPDIR)/hitex-htex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='htex.c' object='hitex-htex.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitex-htex.o `test -f 'htex.c' || echo '$(srcdir)/'`htex.c
-
-hitex-htex.obj: htex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitex-htex.obj -MD -MP -MF $(DEPDIR)/hitex-htex.Tpo -c -o hitex-htex.obj `if test -f 'htex.c'; then $(CYGPATH_W) 'htex.c'; else $(CYGPATH_W) '$(srcdir)/htex.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hitex-htex.Tpo $(DEPDIR)/hitex-htex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='htex.c' object='hitex-htex.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hitex-htex.obj `if test -f 'htex.c'; then $(CYGPATH_W) 'htex.c'; else $(CYGPATH_W) '$(srcdir)/htex.c'; fi`
-
hitex-hitex.o: hitex.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hitex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hitex-hitex.o -MD -MP -MF $(DEPDIR)/hitex-hitex.Tpo -c -o hitex-hitex.o `test -f 'hitex.c' || echo '$(srcdir)/'`hitex.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hitex-hitex.Tpo $(DEPDIR)/hitex-hitex.Po
@@ -18943,9 +19199,9 @@
distclean-libtool:
-rm -f libtool config.lt
-install-man1: $(dist_man_MANS) $(nodist_man_MANS)
+install-man1: $(dist_man_MANS) $(man1_MANS) $(nodist_man_MANS)
@$(NORMAL_INSTALL)
- @list1=''; \
+ @list1='$(man1_MANS)'; \
list2='$(dist_man_MANS) $(nodist_man_MANS)'; \
test -n "$(man1dir)" \
&& test -n "`echo $$list1$$list2`" \
@@ -18979,7 +19235,7 @@
uninstall-man1:
@$(NORMAL_UNINSTALL)
- @list=''; test -n "$(man1dir)" || exit 0; \
+ @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
files=`{ for i in $$list; do echo "$$i"; done; \
l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
sed -n '/\.1[a-z]*$$/p'; \
@@ -19651,6 +19907,8 @@
-rm -f luatexdir/utils/$(am__dirstamp)
-rm -f mfluadir/$(DEPDIR)/$(am__dirstamp)
-rm -f mfluadir/$(am__dirstamp)
+ -rm -f mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+ -rm -f mfluadir/luapeg/$(am__dirstamp)
-rm -f mfluadir/otfcc/dep/extern/$(DEPDIR)/$(am__dirstamp)
-rm -f mfluadir/otfcc/dep/extern/$(am__dirstamp)
-rm -f mfluadir/otfcc/dep/extern/emyg-dtoa/$(DEPDIR)/$(am__dirstamp)
@@ -19709,6 +19967,8 @@
-rm -f mfluadir/otfcc/lib/vf/$(am__dirstamp)
-rm -f mfluadir/otfcc/src/$(DEPDIR)/$(am__dirstamp)
-rm -f mfluadir/otfcc/src/$(am__dirstamp)
+ -rm -f mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+ -rm -f mfluadir/potrace/$(am__dirstamp)
-rm -f mfluajitdir/$(DEPDIR)/$(am__dirstamp)
-rm -f mfluajitdir/$(am__dirstamp)
-rm -f mplibdir/$(DEPDIR)/$(am__dirstamp)
@@ -19777,14 +20037,14 @@
-rm -f ./$(DEPDIR)/gftodvi.Po
-rm -f ./$(DEPDIR)/gftopk.Po
-rm -f ./$(DEPDIR)/gftype.Po
- -rm -f ./$(DEPDIR)/hishrink-hformat.Po
+ -rm -f ./$(DEPDIR)/himktables.Po
-rm -f ./$(DEPDIR)/hishrink-hishrink.Po
- -rm -f ./$(DEPDIR)/histretch-hformat.Po
+ -rm -f ./$(DEPDIR)/hishrink-hitables.Po
-rm -f ./$(DEPDIR)/histretch-histretch.Po
- -rm -f ./$(DEPDIR)/hitex-hformat.Po
+ -rm -f ./$(DEPDIR)/histretch-hitables.Po
+ -rm -f ./$(DEPDIR)/hitex-hiput.Po
+ -rm -f ./$(DEPDIR)/hitex-hitables.Po
-rm -f ./$(DEPDIR)/hitex-hitex.Po
- -rm -f ./$(DEPDIR)/hitex-hput.Po
- -rm -f ./$(DEPDIR)/hitex-htex.Po
-rm -f ./$(DEPDIR)/initex-callexe.Po
-rm -f ./$(DEPDIR)/libluahbtexspecific_a-luainit-hb.Po
-rm -f ./$(DEPDIR)/libluahbtexspecific_a-luastuff-hb.Po
@@ -19800,7 +20060,6 @@
-rm -f ./$(DEPDIR)/libmfluajit_a-mfluajit-pool.Po
-rm -f ./$(DEPDIR)/libmfluajit_a-mfluajit0.Po
-rm -f ./$(DEPDIR)/libmfluajit_a-mfluajitini.Po
- -rm -f ./$(DEPDIR)/libmfluajitotfcc_a-libmfluajitotfcc.Po
-rm -f ./$(DEPDIR)/libmplibbackends_a-pngout.Po
-rm -f ./$(DEPDIR)/libmplibbackends_a-svgout.Po
-rm -f ./$(DEPDIR)/libmplibcore_a-mp.Po
@@ -19865,6 +20124,7 @@
-rm -f ./$(DEPDIR)/tex-texini.Po
-rm -f ./$(DEPDIR)/tftopl.Po
-rm -f ./$(DEPDIR)/tie-tie.Po
+ -rm -f ./$(DEPDIR)/twill.Po
-rm -f ./$(DEPDIR)/upbibtex-upbibtex.Po
-rm -f ./$(DEPDIR)/updvitype-updvitype.Po
-rm -f ./$(DEPDIR)/upmpost-pmp.Po
@@ -19897,8 +20157,8 @@
-rm -f eptexdir/$(DEPDIR)/eptex-eptexextra.Po
-rm -f etexdir/$(DEPDIR)/etex-etexextra.Po
-rm -f euptexdir/$(DEPDIR)/euptex-euptexextra.Po
- -rm -f hitexdir/$(DEPDIR)/hishrink-hishrink-lexer.Po
- -rm -f hitexdir/$(DEPDIR)/hishrink-hishrink-parser.Po
+ -rm -f hitexdir/$(DEPDIR)/hishrink-hilexer.Po
+ -rm -f hitexdir/$(DEPDIR)/hishrink-hiparser.Po
-rm -f libmd5/$(DEPDIR)/a-md5.Po
-rm -f libmd5/$(DEPDIR)/md5main-md5main.Po
-rm -f luatexdir/$(DEPDIR)/luahbtex-luatex.Po
@@ -20082,6 +20342,7 @@
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-script.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-tag.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-unicode.Po
+ -rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-variation.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-blob.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-buffer.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-class_utils.Po
@@ -20095,6 +20356,7 @@
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-script.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-tag.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-unicode.Po
+ -rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-variation.Po
-rm -f luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5.Po
-rm -f luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5lib.Po
-rm -f luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5.Po
@@ -20275,6 +20537,8 @@
-rm -f mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po
-rm -f mfluadir/$(DEPDIR)/mflua-mfluaextra.Po
-rm -f mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po
+ -rm -f mfluadir/luapeg/$(DEPDIR)/libmfluajitlpeg_a-lpeg.Po
+ -rm -f mfluadir/luapeg/$(DEPDIR)/libmflualpeg_a-lpeg.Po
-rm -f mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-json-builder.Po
-rm -f mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-json.Po
-rm -f mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-sds.Po
@@ -20391,6 +20655,11 @@
-rm -f mfluadir/otfcc/lib/vf/$(DEPDIR)/libmfluaotfcc_a-vq.Po
-rm -f mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-luafunc.Po
-rm -f mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-otfccdll.Po
+ -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po
+ -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po
+ -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Po
+ -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po
+ -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po
-rm -f mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po
-rm -f mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po
-rm -f mplibdir/$(DEPDIR)/libmputil_a-avl.Po
@@ -20556,14 +20825,14 @@
-rm -f ./$(DEPDIR)/gftodvi.Po
-rm -f ./$(DEPDIR)/gftopk.Po
-rm -f ./$(DEPDIR)/gftype.Po
- -rm -f ./$(DEPDIR)/hishrink-hformat.Po
+ -rm -f ./$(DEPDIR)/himktables.Po
-rm -f ./$(DEPDIR)/hishrink-hishrink.Po
- -rm -f ./$(DEPDIR)/histretch-hformat.Po
+ -rm -f ./$(DEPDIR)/hishrink-hitables.Po
-rm -f ./$(DEPDIR)/histretch-histretch.Po
- -rm -f ./$(DEPDIR)/hitex-hformat.Po
+ -rm -f ./$(DEPDIR)/histretch-hitables.Po
+ -rm -f ./$(DEPDIR)/hitex-hiput.Po
+ -rm -f ./$(DEPDIR)/hitex-hitables.Po
-rm -f ./$(DEPDIR)/hitex-hitex.Po
- -rm -f ./$(DEPDIR)/hitex-hput.Po
- -rm -f ./$(DEPDIR)/hitex-htex.Po
-rm -f ./$(DEPDIR)/initex-callexe.Po
-rm -f ./$(DEPDIR)/libluahbtexspecific_a-luainit-hb.Po
-rm -f ./$(DEPDIR)/libluahbtexspecific_a-luastuff-hb.Po
@@ -20579,7 +20848,6 @@
-rm -f ./$(DEPDIR)/libmfluajit_a-mfluajit-pool.Po
-rm -f ./$(DEPDIR)/libmfluajit_a-mfluajit0.Po
-rm -f ./$(DEPDIR)/libmfluajit_a-mfluajitini.Po
- -rm -f ./$(DEPDIR)/libmfluajitotfcc_a-libmfluajitotfcc.Po
-rm -f ./$(DEPDIR)/libmplibbackends_a-pngout.Po
-rm -f ./$(DEPDIR)/libmplibbackends_a-svgout.Po
-rm -f ./$(DEPDIR)/libmplibcore_a-mp.Po
@@ -20644,6 +20912,7 @@
-rm -f ./$(DEPDIR)/tex-texini.Po
-rm -f ./$(DEPDIR)/tftopl.Po
-rm -f ./$(DEPDIR)/tie-tie.Po
+ -rm -f ./$(DEPDIR)/twill.Po
-rm -f ./$(DEPDIR)/upbibtex-upbibtex.Po
-rm -f ./$(DEPDIR)/updvitype-updvitype.Po
-rm -f ./$(DEPDIR)/upmpost-pmp.Po
@@ -20676,8 +20945,8 @@
-rm -f eptexdir/$(DEPDIR)/eptex-eptexextra.Po
-rm -f etexdir/$(DEPDIR)/etex-etexextra.Po
-rm -f euptexdir/$(DEPDIR)/euptex-euptexextra.Po
- -rm -f hitexdir/$(DEPDIR)/hishrink-hishrink-lexer.Po
- -rm -f hitexdir/$(DEPDIR)/hishrink-hishrink-parser.Po
+ -rm -f hitexdir/$(DEPDIR)/hishrink-hilexer.Po
+ -rm -f hitexdir/$(DEPDIR)/hishrink-hiparser.Po
-rm -f libmd5/$(DEPDIR)/a-md5.Po
-rm -f libmd5/$(DEPDIR)/md5main-md5main.Po
-rm -f luatexdir/$(DEPDIR)/luahbtex-luatex.Po
@@ -20861,6 +21130,7 @@
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-script.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-tag.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-unicode.Po
+ -rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluaharfbuzz_a-variation.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-blob.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-buffer.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-class_utils.Po
@@ -20874,6 +21144,7 @@
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-script.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-tag.Po
-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-unicode.Po
+ -rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/libluajitharfbuzz_a-variation.Po
-rm -f luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5.Po
-rm -f luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5lib.Po
-rm -f luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5.Po
@@ -21054,6 +21325,8 @@
-rm -f mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po
-rm -f mfluadir/$(DEPDIR)/mflua-mfluaextra.Po
-rm -f mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po
+ -rm -f mfluadir/luapeg/$(DEPDIR)/libmfluajitlpeg_a-lpeg.Po
+ -rm -f mfluadir/luapeg/$(DEPDIR)/libmflualpeg_a-lpeg.Po
-rm -f mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-json-builder.Po
-rm -f mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-json.Po
-rm -f mfluadir/otfcc/dep/extern/$(DEPDIR)/libmfluaotfcc_a-sds.Po
@@ -21170,6 +21443,11 @@
-rm -f mfluadir/otfcc/lib/vf/$(DEPDIR)/libmfluaotfcc_a-vq.Po
-rm -f mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-luafunc.Po
-rm -f mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-otfccdll.Po
+ -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po
+ -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po
+ -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Po
+ -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po
+ -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po
-rm -f mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po
-rm -f mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po
-rm -f mplibdir/$(DEPDIR)/libmputil_a-avl.Po
@@ -21350,9 +21628,9 @@
.PRECIOUS: %.ch %.p %.c
tangle.c tangle.h: tangle-web2c
- @$(web2c) tangle
+ $(web2c) tangle
tangle-web2c: tangle.p $(web2c_depend)
- @$(web2c) tangle
+ $(web2c) tangle
# tangle.p is a special case, since it is needed to compile itself. We
# convert and compile the (distributed) tangleboot.pin to make a tangle
# which we use to make the other programs. We depend on tangleboot, even
@@ -21359,7 +21637,7 @@
# though we might not use it.
tangle.p: tangleboot$(EXEEXT) tangle.web tangle.ch
$(tangleboot) tangle tangle
- @cmp -s tangle.p $(srcdir)/tangleboot.pin || { \
+ cmp -s tangle.p $(srcdir)/tangleboot.pin || { \
if $(AM_V_P); then \
echo "Updating tangle.p => $(srcdir)/tangleboot.pin"; \
else \
@@ -21366,28 +21644,22 @@
echo " UPD " tangleboot.pin; \
fi; cp -f tangle.p $(srcdir)/tangleboot.pin; }
tangle.web:
- @echo "You seem to be missing tangle.web, perhaps because you" >&2
- @echo "didn't retrieve web.tar.gz, only web2c.tar.gz." >&2
- @echo "You need both." >&2
- @echo >&2
- @echo "web.tar.gz should be available from the" >&2
- @echo "same place that you got web2c.tar.gz." >&2
- @echo "In any case, you can get it from" >&2
- @echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2
+ @echo "You seem to be missing tangle.web, goodbye." >&2
false
tangleboot.c tangleboot.h: tangleboot-web2c
- @$(web2c) tangleboot
+ $(web2c) tangleboot
tangleboot-web2c: tangleboot.p $(web2c_depend)
- @$(web2c) tangleboot
+ $(web2c) tangleboot
# tangleboot.pin is in the distribution
.pin.p:
$(cp_silent)cp -f $< $@
$(tangleboot_OBJECTS): $(tangleboot_DEPENDENCIES)
-ctangle.c: common-ctangle cwebdir/ctangle.w cwebdir/ctang-w2c.ch
- @$(ctangleboot) ctangle ctang-w2c
-cweb.c: common-ctangle cwebdir/common.w cwebdir/comm-w2c.ch
- @$(ctangleboot) common comm-w2c cweb.c
-common-ctangle: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh
+#
+ctangle.c: $(common_ctangle) cwebdir/ctangle.w cwebdir/ctang-w2c.ch
+ $(ctangleboot) ctangle ctang-w2c.ch
+#
+cweb.c: $(common_ctangle) cwebdir/common.w cwebdir/comm-w2c.ch
+ $(ctangleboot) common comm-w2c.ch cweb.c
$(ctangleboot_OBJECTS): $(ctangleboot_DEPENDENCIES)
# ctangleboot.cin and cwebboot.cin are in the distribution
.cin.c:
@@ -21395,6 +21667,8 @@
.hin.h:
$(cp_silent)cp -f $< $@
tangle.log: tangle$(EXEEXT)
+
+# (end of bootstrap.am)
bibtex.c bibtex.h: bibtex-web2c
@$(web2c) bibtex
bibtex-web2c: bibtex.p $(web2c_depend) web2c/cvtbib.sed
@@ -21510,6 +21784,15 @@
weave.p: tangle$(EXEEXT) weave.web weave.ch
$(tangle) weave weave
weave.log: weave$(EXEEXT)
+twill.c twill.h: twill-web2c
+ @$(web2c) twill
+twill-web2c: twill.p $(web2c_depend)
+ @$(web2c) twill
+twill.p: tangle$(EXEEXT) twill.web
+ $(tangle) twill
+twill.web: tie$(EXEEXT) weave.web weave.ch weav-twill.ch
+ $(tie_m) weave.web weave.ch weav-twill.ch
+twill.log: twill$(EXEEXT)
ctie.c: ctangle$(EXEEXT) ctiedir/ctie.w ctiedir/ctie-k.ch
$(ctangle_silent)CWEBINPUTS=$(srcdir)/ctiedir $(ctangle) ctie.w ctie-k.ch
cweave.c: ctangle$(EXEEXT) cwebdir/comm-w2c.h cwebdir/cweave.w cwebdir/prod-cweave.w cwebdir/cweav-w2c.ch
@@ -21540,9 +21823,9 @@
# Tangling TeX
tex.p tex.pool: tex-tangle
- @$(texmf_tangle) tex tex-final
+ $(texmf_tangle) tex tex-final
tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch tangle-sh
- @$(texmf_tangle) tex tex-final
+ $(texmf_tangle) tex tex-final
# Generate tex-final.ch
tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
@@ -21582,9 +21865,9 @@
# Tangling Metafont
mf.p mf.pool: mf-tangle
- @$(texmf_tangle) mf mf-final
+ $(texmf_tangle) mf mf-final
mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch tangle-sh
- @$(texmf_tangle) mf mf-final
+ $(texmf_tangle) mf mf-final
# Generate mf-final.ch
mf-final.ch: tie$(EXEEXT) $(mf_ch_src)
@@ -21597,6 +21880,8 @@
trap-clean:
rm -rf trapdir
+# (end of texmf.am)
+
.PHONY: install-mflua-links uninstall-mflua-links
@WIN32_TRUE at install-mflua-links: call_mflua$(EXEEXT)
@MFLUAN_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_mflua$(EXEEXT) $(DESTDIR)$(bindir)/mflua-nowin$(EXEEXT)
@@ -21644,15 +21929,17 @@
rm -rf mfluatrapdir
#libmfluaotfcc_a_DEPENDENCIES = $(ZLIB_DEPEND)
-#libmfluajitotfcc_a_DEPENDENCIES = $(ZLIB_DEPEND)
$(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND)
-$(libmfluajitotfcc_a_OBJECTS): $(LUAJIT_DEPEND)
#EXTRA_DIST +=
#EXTRA_DIST +=
+$(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND)
+
+$(libmflualpeg_a_OBJECTS): $(LUA_DEPEND)
+
.PHONY: install-mfluajit-links uninstall-mfluajit-links
@WIN32_TRUE at install-mfluajit-links: call_mfluajit$(EXEEXT)
@MFLUAJITN_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_mfluajit$(EXEEXT) $(DESTDIR)$(bindir)/mfluajit-nowin$(EXEEXT)
@@ -21694,6 +21981,8 @@
mfluajittrap-clean:
rm -rf mfluajittrapdir
+$(libmfluajitlpeg_a_OBJECTS): $(LUA_DEPEND)
+
.PHONY: install-mpost-links uninstall-mpost-links
@WIN32_TRUE at install-mpost-links: call_mpost$(EXEEXT)
@WIN32_TRUE@ $(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/dvitomp$(EXEEXT)
@@ -21706,9 +21995,9 @@
$(mp_ctangle) mpost.w
$(mpxout_c_h): mpxout-tangle
- @$(mp_ctangle_sh) mpxout
+ $(mp_ctangle_sh) mpxout
mpxout-tangle: ctangle$(EXEEXT) mplibdir/mpxout.w tangle-sh
- @$(mp_ctangle_sh) mpxout
+ $(mp_ctangle_sh) mpxout
#$(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a $(LIBPNG_DEPEND)
$(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplibcore.a libmplibextramath.a libmplibbackends.a $(LIBPNG_DEPEND)
@@ -21720,6 +22009,8 @@
mptrap-clean:
rm -rf mptrapdir
+# (end of mplib.am)
+
.PHONY: install-pmpost-links install-upmpost-links uninstall-pmpost-links uninstall-upmpost-links
@WIN32_TRUE at install-pmpost-links: call_pmpost$(EXEEXT)
@WIN32_TRUE@ $(INSTALL_PROGRAM) call_pmpost$(EXEEXT) $(DESTDIR)$(bindir)/pdvitomp$(EXEEXT)
@@ -21777,24 +22068,24 @@
# Creating several files: need stamp file and two rules with identical recipes
$(pmp_c_h): pmp-tangle
- @$(pmp_ctangle_sh) pmp pmp
+ $(pmp_ctangle_sh) pmp pmp
pmp-tangle: ctangle$(EXEEXT) pmp.w pmpostdir/pmp.ch tangle-sh
- @$(pmp_ctangle_sh) pmp pmp
+ $(pmp_ctangle_sh) pmp pmp
$(pmpxout_c_h): pmpxout-tangle
- @$(pmp_ctangle_sh) pmpxout pmpxout
+ $(pmp_ctangle_sh) pmpxout pmpxout
pmpxout-tangle: ctangle$(EXEEXT) pmpxout.w pmpostdir/pmpxout.ch tangle-sh
- @$(pmp_ctangle_sh) pmpxout pmpxout
+ $(pmp_ctangle_sh) pmpxout pmpxout
$(ppsout_c_h): ppsout-tangle
- @$(pmp_ctangle_sh) ppsout ppsout
+ $(pmp_ctangle_sh) ppsout ppsout
ppsout-tangle: ctangle$(EXEEXT) ppsout.w pmpostdir/ppsout.ch tangle-sh
- @$(pmp_ctangle_sh) ppsout ppsout
+ $(pmp_ctangle_sh) ppsout ppsout
$(psvgout_c_h): psvgout-tangle
- @$(pmp_ctangle_sh) psvgout psvgout
+ $(pmp_ctangle_sh) psvgout psvgout
psvgout-tangle: ctangle$(EXEEXT) psvgout.w pmpostdir/psvgout.ch tangle-sh
- @$(pmp_ctangle_sh) psvgout psvgout
+ $(pmp_ctangle_sh) psvgout psvgout
$(pmpost_OBJECTS) $(upmpost_OBJECTS): $(nodist_pmpost_SOURCES) $(PTEXENC_DEPEND) \
$(LIBPNG_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
@@ -21801,6 +22092,8 @@
pmpostdir/pmpost.log pmpostdir/pmpsamp.log: pmpost$(EXEEXT)
pmpostdir/upmpost.log pmpostdir/upmpsamp.log: upmpost$(EXEEXT)
+# (end of pmpost.am)
+
# Creating one file: just one rule
tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w
$(mp_ctangle) tfmin.w
@@ -21807,49 +22100,49 @@
# Creating several files: need stamp file and two rules with identical recipes
$(mp_c_h): mp-tangle
- @$(mp_ctangle_sh) mp
+ $(mp_ctangle_sh) mp
mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh
- @$(mp_ctangle_sh) mp
+ $(mp_ctangle_sh) mp
$(mpmath_c_h): mpmath-tangle mp-tangle
- @$(mp_ctangle_sh) mpmath
+ $(mp_ctangle_sh) mpmath
mpmath-tangle: ctangle$(EXEEXT) mplibdir/mpmath.w tangle-sh
- @$(mp_ctangle_sh) mpmath
+ $(mp_ctangle_sh) mpmath
$(mpmathbinary_c_h): mpmathbinary-tangle mp-tangle
- @$(mp_ctangle_sh) mpmathbinary
+ $(mp_ctangle_sh) mpmathbinary
mpmathbinary-tangle: ctangle$(EXEEXT) mplibdir/mpmathbinary.w tangle-sh
- @$(mp_ctangle_sh) mpmathbinary
+ $(mp_ctangle_sh) mpmathbinary
$(mpmathdecimal_c_h): mpmathdecimal-tangle mp-tangle
- @$(mp_ctangle_sh) mpmathdecimal
+ $(mp_ctangle_sh) mpmathdecimal
mpmathdecimal-tangle: ctangle$(EXEEXT) mplibdir/mpmathdecimal.w tangle-sh
- @$(mp_ctangle_sh) mpmathdecimal
+ $(mp_ctangle_sh) mpmathdecimal
$(mpmathdouble_c_h): mpmathdouble-tangle mp-tangle
- @$(mp_ctangle_sh) mpmathdouble
+ $(mp_ctangle_sh) mpmathdouble
mpmathdouble-tangle: ctangle$(EXEEXT) mplibdir/mpmathdouble.w tangle-sh
- @$(mp_ctangle_sh) mpmathdouble
+ $(mp_ctangle_sh) mpmathdouble
$(mpstrings_c_h): mpstrings-tangle
- @$(mp_ctangle_sh) mpstrings
+ $(mp_ctangle_sh) mpstrings
mpstrings-tangle: ctangle$(EXEEXT) mplibdir/mpstrings.w tangle-sh
- @$(mp_ctangle_sh) mpstrings
+ $(mp_ctangle_sh) mpstrings
$(pngout_c_h): pngout-tangle
- @$(mp_ctangle_sh) pngout
+ $(mp_ctangle_sh) pngout
pngout-tangle: ctangle$(EXEEXT) mplibdir/pngout.w tangle-sh
- @$(mp_ctangle_sh) pngout
+ $(mp_ctangle_sh) pngout
$(psout_c_h): psout-tangle
- @$(mp_ctangle_sh) psout
+ $(mp_ctangle_sh) psout
psout-tangle: ctangle$(EXEEXT) mplibdir/psout.w tangle-sh
- @$(mp_ctangle_sh) psout
+ $(mp_ctangle_sh) psout
$(svgout_c_h): svgout-tangle
- @$(mp_ctangle_sh) svgout
+ $(mp_ctangle_sh) svgout
svgout-tangle: ctangle$(EXEEXT) mplibdir/svgout.w tangle-sh
- @$(mp_ctangle_sh) svgout
+ $(mp_ctangle_sh) svgout
$(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h)
@@ -21856,6 +22149,8 @@
$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
$(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND)
$(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+
+# (end of libmplib.am)
$(etex_OBJECTS): $(etex_prereq)
$(etex_c_h): etex-web2c
@@ -21868,9 +22163,9 @@
# Tangling e-TeX
etex.p etex.pool: etex-tangle
- @$(texmf_tangle) etex etex
+ $(texmf_tangle) etex etex
etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh
- @$(texmf_tangle) etex etex
+ $(texmf_tangle) etex etex
# Extract etex version
$(srcdir)/etexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ etexdir/etex.ch
@@ -21891,6 +22186,8 @@
.PHONY: etrip-clean
etrip-clean:
rm -rf etripdir
+
+# (end of etex.am)
# Rebuild $(pproglib)
$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
cd lib && $(MAKE) $(AM_MAKEFLAGS) libp.a
@@ -21906,9 +22203,9 @@
# Tangling pTeX
ptex.p ptex.pool: ptex-tangle
- @$(texmf_tangle) ptex ptex
+ $(texmf_tangle) ptex ptex
ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
- @$(texmf_tangle) ptex ptex
+ $(texmf_tangle) ptex ptex
# Extract ptex version
$(srcdir)/ptexdir/ptex_version.h: @MAINTAINER_MODE_TRUE@ ptexdir/ptex-base.ch
@@ -21968,6 +22265,8 @@
.PHONY: ptrip-clean
ptrip-clean:
rm -rf ptripdir
+
+# (end of ptex.am)
$(eptex_OBJECTS): $(eptex_prereq)
$(eptex_c_h): eptex-web2c
@@ -21980,9 +22279,9 @@
# Tangling e-pTeX
eptex.p eptex.pool: eptex-tangle
- @$(texmf_tangle) eptex eptex
+ $(texmf_tangle) eptex eptex
eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh
- @$(texmf_tangle) eptex eptex
+ $(texmf_tangle) eptex eptex
# Extract eptex version
$(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech
@@ -22004,6 +22303,8 @@
.PHONY: eptrip-clean
eptrip-clean:
rm -rf eptripdir
+
+# (end of eptex.am)
$(uptex_OBJECTS): $(uptex_prereq)
$(uptex_c_h): uptex-web2c
@@ -22016,9 +22317,9 @@
# Tangling upTeX
uptex.p uptex.pool: uptex-tangle
- @$(texmf_tangle) uptex uptex
+ $(texmf_tangle) uptex uptex
uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh
- @$(texmf_tangle) uptex uptex
+ $(texmf_tangle) uptex uptex
# Extract uptex version
$(srcdir)/uptexdir/uptex_version.h: @MAINTAINER_MODE_TRUE@ uptexdir/uptex-m.ch
@@ -22079,6 +22380,8 @@
.PHONY: uptrip-clean
uptrip-clean:
rm -rf uptripdir
+
+# (end of uptex.am)
$(euptex_OBJECTS): $(euptex_prereq)
$(euptex_c_h): euptex-web2c
@@ -22091,9 +22394,9 @@
# Tangling e-upTeX
euptex.p euptex.pool: euptex-tangle
- @$(texmf_tangle) euptex euptex
+ $(texmf_tangle) euptex euptex
euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh
- @$(texmf_tangle) euptex euptex
+ $(texmf_tangle) euptex euptex
# Generate euptex.web
euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
@@ -22111,50 +22414,50 @@
euptrip-clean:
rm -rf euptripdir
+# (end of euptex.am)
+
# convenience target to build all the programs here.
-hiall: hitex hishrink histretch
+ at HITEX_TRUE@hiall: hitex hishrink histretch
-$(format_c_h_l_y): format-tangle
- $(hi_ctangle_sh) format
+$(hiformat_c_h_l_y): hiformat-tangle
+
#
-format-tangle: ctangle$(EXEEXT) hitexdir/format.w tangle-sh
- $(hi_ctangle_sh) format
+hiformat-tangle: ctangle$(EXEEXT) hitexdir/hiformat.w tangle-sh
+ $(hi_ctangle_sh) hiformat
-$(hitex_c_h): hitex-tangle
- $(hi_ctangle_sh) hitex
+$(hitex_c): hitex-tangle
+
#
hitex-tangle: ctangle$(EXEEXT) hitexdir/hitex.w tangle-sh
$(hi_ctangle_sh) hitex
-# htex.c needs hitex.h, so depend on the hitex tangle.
-$(htex_c_h): htex-tangle hitex-tangle
- $(hi_ctangle_sh) htex
+# Generating hitables.c using himktables.
+hitables.c: himktables$(EXEEXT)
+ ./himktables > $@ || { rm -f hitables.c; exit 1; }
+
+# hitex, histretch, and hishrink all need (at least) some
+# of the sources generated from hiformat.w.
#
-htex-tangle: ctangle$(EXEEXT) hitexdir/htex.w tangle-sh hitex-tangle
- $(hi_ctangle_sh) htex
+$(hitex_OBJECTS): hiformat-tangle
+$(hishrink_OBJECTS): hiformat-tangle
+$(histretch_OBJECTS): hiformat-tangle
-# Generating hformat.c using mkhformat.
-hformat.c: mkhformat
- ./mkhformat >hformat.c || { rm -f hformat.c; exit 1; }
+hitexdir/tests/hello.log: hitex$(EXEEXT) histretch$(EXEEXT)
+hitexdir/tests/rule.log: hitex$(EXEEXT) histretch$(EXEEXT) hishrink$(EXEEXT)
-# This is our attempt to ensure that bison got run before anything else,
-# when needed.
-#
-$(hishrink_OBJECTS): $(srcdir)/hitexdir/hishrink-parser.h
+# (end of hitex.am)
-# still missing
-
# We must create pdftexd.h (and xpdf...) before building the libpdftex_a_OBJECTS.
$(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 $@
@@ -22181,6 +22484,8 @@
pdftexdir/wprob.log pdftexdir/pdftex.log \
pdftexdir/pdfimage.log pdftexdir/expanded.log \
pdftexdir/tests/cnfline.log pdftexdir/tests/partoken.log: pdftex$(EXEEXT)
+
+# (end of pdftex.am)
pdftexdir/ttf2afm.log: ttf2afm$(EXEEXT)
$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND)
@@ -22305,9 +22610,9 @@
$(makecpool) xetex >$@ || rm -f $@
xetex.p xetex.pool: xetex-tangle
- @$(xe_tangle) xetex xetex-final
+ $(xe_tangle) xetex xetex-final
xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex-final.ch tangle-sh
- @$(xe_tangle) xetex xetex-final
+ $(xe_tangle) xetex xetex-final
# Extract etex version
$(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
@@ -22322,6 +22627,8 @@
$(tie_c) $(xetex_ch_srcs)
$(libxetex_a_OBJECTS): $(libxetex_prereq)
xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log: xetex$(EXEEXT)
+
+# (end of xetex.am)
odvicopy.c odvicopy.h: odvicopy-web2c
@$(web2c) odvicopy
odvicopy-web2c: odvicopy.p $(web2c_depend)
@@ -22351,9 +22658,9 @@
opl2ofm.web: tie$(EXEEXT) omegaware/opl2ofm.web omegaware/opl2ofm.up
$(tie_m) omegaware/opl2ofm.web omegaware/opl2ofm.up
otangle.c otangle.h: otangle-web2c
- @$(web2c) otangle
+ $(web2c) otangle
otangle-web2c: otangle.p $(web2c_depend)
- @$(web2c) otangle
+ $(web2c) otangle
otangle.p: tangle$(EXEEXT) $(otangle_sources)
$(tangle_silent)$(ow_tangle) otangle otangle
ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c
@@ -22386,6 +22693,8 @@
omegaware/odvitype.log: odvitype$(EXEEXT)
omegaware/otangle.log: otangle$(EXEEXT)
+# (end of omegaware.am)
+
# We must create alephd.h before building the aleph_OBJECTS.
$(aleph_OBJECTS): alephd.h
@@ -22398,9 +22707,9 @@
# Tangling Aleph
aleph.p aleph.pool: aleph-tangle
- @$(al_tangle) aleph aleph
+ $(al_tangle) aleph aleph
aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch tangle-sh
- @$(al_tangle) aleph aleph
+ $(al_tangle) aleph aleph
aleph.web: tie$(EXEEXT) $(aleph_web_srcs)
$(tie_m) $(aleph_web_srcs)
aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
@@ -22407,6 +22716,8 @@
$(tie_c) aleph.web $(aleph_ch_srcs)
alephdir/aleph.log: aleph$(EXEEXT)
+# (end of aleph.am)
+
$(synctex_OBJECTS): $(libsynctex)
$(libsynctex_la_OBJECTS): $(ZLIB_DEPEND)
@@ -22433,6 +22744,8 @@
@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \
@WIN32_FALSE@ done
+# (end of bin_links.am)
+
install-exec-hook: install-bin-links $(install_exe_links)
uninstall-hook: uninstall-bin-links $(uninstall_exe_links)
Modified: branches/stable/source/src/texk/web2c/NEWS
===================================================================
--- branches/stable/source/src/texk/web2c/NEWS 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/NEWS 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,13 +1,23 @@
This file records noteworthy changes. (Public domain.)
-* for all engines except original (e)TeX:
+
+2022 (for TeX Live 2022)
+
+* new hitex engine included, which outputs HINT files for display on
+mobile devices. HINT viewers for GNU/Linux, Windows, and Android are
+available.
+
+* twill program for original Pascal *.web mini-indexes included.
+
+* across actively-extended engines
+ (that is, not including original (e)TeX, Aleph, hiTeX):
- new primitive \showstream to redirect \show output to a file.
- new primitives \partokenname and \partokencontext allow overriding the
- name of the internally-emitted \par token at blank lines, the end of
+ name of the emitted \par token mitted at blank lines, the end of
vboxes, etc.
-2021 (for TeX Live 2021, 23 March (e)2021)
+2021 (for TeX Live 2021, 23 March 2021)
* Knuth 2021 tune-up, with fixes to all of his *.web files. Overview:
https://tug.org/TUGboat/42-1/tb130knuth-tuneup21.pdf
New TeX version is 3.141592653, MF 2.71828182.
Modified: branches/stable/source/src/texk/web2c/ac/web2c.ac
===================================================================
--- branches/stable/source/src/texk/web2c/ac/web2c.ac 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/ac/web2c.ac 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,4 +1,4 @@
-dnl $Id: web2c.ac 60569 2021-09-21 16:46:46Z karl $
+dnl $Id: web2c.ac 61680 2022-01-21 17:38:44Z karl $
# texk/web2c/ac/web2c.ac: configure.ac fragment for TL subdir
dnl
dnl Copyright 2015-2021 Karl Berry <tex-live at tug.org>
@@ -36,7 +36,7 @@
[[uptex], [yes], [yes], [upTeX], [ptexenc zlib]],
[[euptex], [yes], [yes], [e-upTeX], [ptexenc zlib]],
[[aleph], [yes], [], [Aleph], []],
-[[hitex], [no], [], [HiTeX], [zlib]],
+[[hitex], [yes], [], [HiTeX], [zlib]],
[[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng zlib]],
[[luatex], [yes], [], [LuaTeX], [pplib libpng zziplib lua53]],
[[luajittex], [yes], [], [LuaJITTeX], [pplib libpng zziplib luajit]],
Modified: branches/stable/source/src/texk/web2c/am/bootstrap.am
===================================================================
--- branches/stable/source/src/texk/web2c/am/bootstrap.am 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/am/bootstrap.am 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,6 +1,8 @@
+## $Id: bootstrap.am 61575 2022-01-11 22:47:10Z karl $
## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle.
##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
cp_silent = $(cp_silent_ at AM_V@)
@@ -13,9 +15,9 @@
bin_PROGRAMS += tangle
nodist_tangle_SOURCES = tangle.c tangle.h
tangle.c tangle.h: tangle-web2c
- @$(web2c) tangle
+ $(web2c) tangle
tangle-web2c: tangle.p $(web2c_depend)
- @$(web2c) tangle
+ $(web2c) tangle
# tangle.p is a special case, since it is needed to compile itself. We
# convert and compile the (distributed) tangleboot.pin to make a tangle
# which we use to make the other programs. We depend on tangleboot, even
@@ -22,7 +24,7 @@
# though we might not use it.
tangle.p: tangleboot$(EXEEXT) tangle.web tangle.ch
$(tangleboot) tangle tangle
- @cmp -s tangle.p $(srcdir)/tangleboot.pin || { \
+ cmp -s tangle.p $(srcdir)/tangleboot.pin || { \
if $(AM_V_P); then \
echo "Updating tangle.p => $(srcdir)/tangleboot.pin"; \
else \
@@ -29,14 +31,7 @@
echo " UPD " tangleboot.pin; \
fi; cp -f tangle.p $(srcdir)/tangleboot.pin; }
tangle.web:
- @echo "You seem to be missing tangle.web, perhaps because you" >&2
- @echo "didn't retrieve web.tar.gz, only web2c.tar.gz." >&2
- @echo "You need both." >&2
- @echo >&2
- @echo "web.tar.gz should be available from the" >&2
- @echo "same place that you got web2c.tar.gz." >&2
- @echo "In any case, you can get it from" >&2
- @echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2
+ @echo "You seem to be missing tangle.web, goodbye." >&2
false
EXTRA_DIST += tangle.web tangle.ch
DISTCLEANFILES += tangle.c tangle.h tangle.p tangle-web2c
@@ -44,9 +39,9 @@
noinst_PROGRAMS += tangleboot
nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
tangleboot.c tangleboot.h: tangleboot-web2c
- @$(web2c) tangleboot
+ $(web2c) tangleboot
tangleboot-web2c: tangleboot.p $(web2c_depend)
- @$(web2c) tangleboot
+ $(web2c) tangleboot
# tangleboot.pin is in the distribution
.pin.p:
$(cp_silent)cp -f $< $@
@@ -59,14 +54,19 @@
# to create an up-to-date ctangleboot.cin and cwebboot.cin as well.
bin_PROGRAMS += ctangle
nodist_ctangle_SOURCES = ctangle.c cweb.c
+#
# ctangle.c and cweb.c are special cases, since they are needed to compile
# themselves. We depend on ctangleboot, even though we might not use it.
ctangleboot = AM_V_P=$(AM_V_P) $(SHELL) ./ctangleboot-sh $@
-ctangle.c: common-ctangle cwebdir/ctangle.w cwebdir/ctang-w2c.ch
- @$(ctangleboot) ctangle ctang-w2c
-cweb.c: common-ctangle cwebdir/common.w cwebdir/comm-w2c.ch
- @$(ctangleboot) common comm-w2c cweb.c
-common-ctangle: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh
+#
+ctangle.c: $(common_ctangle) cwebdir/ctangle.w cwebdir/ctang-w2c.ch
+ $(ctangleboot) ctangle ctang-w2c.ch
+#
+cweb.c: $(common_ctangle) cwebdir/common.w cwebdir/comm-w2c.ch
+ $(ctangleboot) common comm-w2c.ch cweb.c
+#
+common_ctangle = ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh
+
EXTRA_DIST += cwebdir
NEVER_DIST += cwebdir/cweave.log cwebdir/cweave.trs
NEVER_DIST += cwebdir/ctwill.log cwebdir/ctwill.trs
@@ -97,3 +97,4 @@
DISTCLEANFILES += cftest.p
+# (end of bootstrap.am)
Modified: branches/stable/source/src/texk/web2c/am/texmf.am
===================================================================
--- branches/stable/source/src/texk/web2c/am/texmf.am 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/am/texmf.am 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,7 +1,7 @@
-## $Id: texmf.am 60940 2021-11-03 22:47:27Z karl $
+## $Id: texmf.am 61575 2022-01-11 22:47:10Z karl $
## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF.
##
-## Copyright 2015-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -54,9 +54,9 @@
# Tangling TeX
tex.p tex.pool: tex-tangle
- @$(texmf_tangle) tex tex-final
+ $(texmf_tangle) tex tex-final
tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch tangle-sh
- @$(texmf_tangle) tex tex-final
+ $(texmf_tangle) tex tex-final
# Generate tex-final.ch
tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
@@ -186,9 +186,9 @@
# Tangling Metafont
mf.p mf.pool: mf-tangle
- @$(texmf_tangle) mf mf-final
+ $(texmf_tangle) mf mf-final
mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch tangle-sh
- @$(texmf_tangle) mf mf-final
+ $(texmf_tangle) mf mf-final
# Generate mf-final.ch
mf-final.ch: tie$(EXEEXT) $(mf_ch_src)
@@ -273,3 +273,4 @@
triptrap/writeo \
triptrap/writeo.2
+# (end of texmf.am)
Modified: branches/stable/source/src/texk/web2c/am/web.am
===================================================================
--- branches/stable/source/src/texk/web2c/am/web.am 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/am/web.am 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,13 +1,14 @@
-## $Id: web.am 53153 2019-12-17 19:05:32Z karl $
+## $Id: web.am 61575 2022-01-11 22:47:10Z karl $
## texk/web2c/am/web.am: Makefile fragment for the standard web programs --
## except tangle.
##
-## Copyright 2018-2019 Karl Berry <tex-live at tug.org>
+## Copyright 2018-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
web_programs = bibtex dvicopy dvitype gftodvi gftopk gftype mft \
- patgen pktogf pktype pltotf pooltype tftopl vftovp vptovf weave
+ patgen pktogf pktype pltotf pooltype tftopl vftovp vptovf \
+ weave twill
## Basic tests, one for each program.
##
@@ -174,6 +175,17 @@
$(tangle) weave weave
weave.log: weave$(EXEEXT)
+nodist_twill_SOURCES = twill.c twill.h
+twill.c twill.h: twill-web2c
+ @$(web2c) twill
+twill-web2c: twill.p $(web2c_depend)
+ @$(web2c) twill
+twill.p: tangle$(EXEEXT) twill.web
+ $(tangle) twill
+twill.web: tie$(EXEEXT) weave.web weave.ch weav-twill.ch
+ $(tie_m) weave.web weave.ch weav-twill.ch
+twill.log: twill$(EXEEXT)
+
## Tests.
##
if WEB
Modified: branches/stable/source/src/texk/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/configure 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/configure 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Web2C 2022/dev.
+# Generated by GNU Autoconf 2.71 for Web2C 2022.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -629,8 +629,8 @@
# Identity of this package.
PACKAGE_NAME='Web2C'
PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2022/dev'
-PACKAGE_STRING='Web2C 2022/dev'
+PACKAGE_VERSION='2022'
+PACKAGE_STRING='Web2C 2022'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1668,7 +1668,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Web2C 2022/dev to adapt to many kinds of systems.
+\`configure' configures Web2C 2022 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1743,7 +1743,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C 2022/dev:";;
+ short | recursive ) echo "Configuration of Web2C 2022:";;
esac
cat <<\_ACEOF
@@ -1787,7 +1787,7 @@
--disable-euptex do not compile and install e-upTeX
--disable-euptex-synctex build e-upTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
- --enable-hitex compile and install HiTeX
+ --disable-hitex do not compile and install HiTeX
--disable-pdftex do not compile and install pdfTeX
--disable-pdftex-synctex build pdfTeX without SyncTeX support
--disable-luatex do not compile and install LuaTeX
@@ -1964,7 +1964,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C configure 2022/dev
+Web2C configure 2022
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2954,7 +2954,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Web2C $as_me 2022/dev, which was
+It was created by Web2C $as_me 2022, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3930,7 +3930,7 @@
-WEB2CVERSION=2022/dev
+WEB2CVERSION=2022
am__api_version='1.16'
@@ -9495,7 +9495,7 @@
# Define the identity of the package.
PACKAGE='web2c'
- VERSION='2022/dev'
+ VERSION='2022'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -19824,7 +19824,7 @@
yes | no) :
;; #(
*) :
- enable_hitex=no ;;
+ enable_hitex=yes ;;
esac
test "x$enable_web2c:$enable_hitex" = xyes:yes && {
@@ -25364,7 +25364,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-Web2C config.lt 2022/dev
+Web2C config.lt 2022
configured by $0, generated by GNU Autoconf 2.71.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -28888,7 +28888,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C $as_me 2022/dev, which was
+This file was extended by Web2C $as_me 2022, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -28960,7 +28960,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-Web2C config.status 2022/dev
+Web2C config.status 2022
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/texk/web2c/ctangleboot-sh.in
===================================================================
--- branches/stable/source/src/texk/web2c/ctangleboot-sh.in 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/ctangleboot-sh.in 2022-03-01 02:03:00 UTC (rev 874)
@@ -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.in 61575 2022-01-11 22:47:10Z karl $
+# ctangleboot-sh: shell script to invoke ctangleboot and, if required,
+# update c{tangle,web}boot.[ch]in from c{tangle,web}.[ch].
+# For details see tangle-sh[.in].
#
-# Copyright (C) 2009-2012 Peter Breitenlohner <tex-live at tug.org>
+# Copyright 2015-2022 Karl Berry <tex-live at tug.org>
+# Copyright 2009-2012 Peter Breitenlohner <tex-live at tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
#
+prg=`basename $0`
target=$1; shift
base=$1
case $base in
common) file=cweb; exts=c;;
ctangle) file=ctangle; exts=c;;
- *) echo "Usage: $0 TARGET {common|ctangle} [CHANGEFILE]" >&2; exit 1;;
+ *) echo "Usage: $0 TARGET common|ctangle [CHANGEFILE] [OUTFILE]" >&2
+ exit 1;;
esac
TEXMFCNF=@srcdir@/../kpathsea; export TEXMFCNF
@@ -23,12 +27,16 @@
do_ctangleboot () {
echo timestamp >$stamp.tmp
if $AM_V_P; then
- echo "@CTANGLEBOOT@ $@"
+ echo "$prg: @CTANGLEBOOT@ $@"
@CTANGLEBOOT@ "$@" || exit 1
+ test -s $file.$exts \
+ || { echo "$prg: $file.$exts empty." >&2; rm -f $file.$exts; exit 1; }
else
echo " CTANGLE " $base
@CTANGLEBOOT@ "$@" >$base.out 2>&1; rc=$?
- test $rc -eq 0 || { cat $base.out; exit $rc; }
+ # succeed and generate nonempty file
+ (test $rc -eq 0 && test -s $file.$exts) \
+ || { cat $base.out; rm -f $file.$exts exit $rc; }
rm -f $base.out
fi
mv -f $stamp.tmp $stamp
@@ -42,8 +50,14 @@
do_ctangleboot "$@"
;;
*)
- # Recover from removal of $target
- test -f $target && exit 0
+ # Recover from removal of $target if necessary.
+ if test -f $target; then
+ $AM_V_P && echo "$prg: checking for $target ... ok"
+ exit 0
+ else
+ $AM_V_P && echo "$prg: recovering $target"
+ fi
+ #
trap "rm -rf $stamp $stamp.lock" 1 2 13 15
if mkdir $stamp.lock 2>/dev/null; then
# Code executed by the first process.
Modified: branches/stable/source/src/texk/web2c/ctangleboot.cin
===================================================================
--- branches/stable/source/src/texk/web2c/ctangleboot.cin 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/ctangleboot.cin 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,30 +2,33 @@
#line 66 "cwebdir/ctangle.w"
/*4:*/
-#line 51 "cwebdir/comm-w2c.h"
+#line 54 "cwebdir/comm-w2c.h"
+#include <ctype.h>
+#include <kpathsea/simpletypes.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
#endif
+#line 66 "cwebdir/comm-w2c.h"
#if HAVE_GETTEXT
#include <libintl.h>
#else
+#line 70 "cwebdir/comm-w2c.h"
#define gettext(a) a
#endif
+#line 72 "cwebdir/comm-w2c.h"
-#include <ctype.h>
-#include <kpathsea/simpletypes.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
/*:4*/
#line 67 "cwebdir/ctangle.w"
-#define banner "This is CTANGLE, Version 4.5" \
+#define banner "This is CTANGLE, Version 4.7" \
\
#define _(s) gettext(s) \
@@ -178,7 +181,7 @@
extern int phase;
/*:3*//*5:*/
-#line 91 "cwebdir/comm-w2c.h"
+#line 94 "cwebdir/comm-w2c.h"
extern char section_text[];
extern char*section_text_end;
@@ -186,7 +189,7 @@
extern char*id_loc;
/*:5*//*6:*/
-#line 109 "cwebdir/comm-w2c.h"
+#line 112 "cwebdir/comm-w2c.h"
extern char buffer[];
extern char*buffer_end;
@@ -194,7 +197,7 @@
extern char*limit;
/*:6*//*7:*/
-#line 126 "cwebdir/comm-w2c.h"
+#line 129 "cwebdir/comm-w2c.h"
extern int include_depth;
extern FILE*file[];
@@ -211,7 +214,7 @@
extern boolean web_file_open;
/*:7*//*9:*/
-#line 147 "cwebdir/comm-w2c.h"
+#line 150 "cwebdir/comm-w2c.h"
extern sixteen_bits section_count;
extern boolean changed_section[];
@@ -219,7 +222,7 @@
extern boolean print_where;
/*:9*//*10:*/
-#line 161 "cwebdir/comm-w2c.h"
+#line 164 "cwebdir/comm-w2c.h"
typedef struct name_info{
char*byte_start;
@@ -244,12 +247,12 @@
extern hash_pointer h;
/*:10*//*12:*/
-#line 205 "cwebdir/comm-w2c.h"
+#line 208 "cwebdir/comm-w2c.h"
extern int history;
/*:12*//*14:*/
-#line 222 "cwebdir/comm-w2c.h"
+#line 225 "cwebdir/comm-w2c.h"
extern int argc;
extern char**argv;
@@ -261,7 +264,7 @@
extern const char*use_language;
/*:14*//*15:*/
-#line 237 "cwebdir/comm-w2c.h"
+#line 240 "cwebdir/comm-w2c.h"
extern FILE*C_file;
extern FILE*tex_file;
@@ -382,7 +385,7 @@
#line 71 "cwebdir/ctangle.w"
/*8:*/
-#line 141 "cwebdir/comm-w2c.h"
+#line 144 "cwebdir/comm-w2c.h"
extern boolean get_line(void);
extern void check_complete(void);
@@ -389,7 +392,7 @@
extern void reset_input(void);
/*:8*//*11:*/
-#line 184 "cwebdir/comm-w2c.h"
+#line 187 "cwebdir/comm-w2c.h"
extern boolean names_match(name_pointer,const char*,size_t,eight_bits);
extern name_pointer id_lookup(const char*,const char*,eight_bits);
@@ -402,7 +405,7 @@
extern void sprint_section_name(char*,name_pointer);
/*:11*//*13:*/
-#line 208 "cwebdir/comm-w2c.h"
+#line 211 "cwebdir/comm-w2c.h"
extern int wrap_up(void);
extern void err_print(const char*);
@@ -410,7 +413,7 @@
extern void overflow(const char*);
/*:13*//*16:*/
-#line 246 "cwebdir/comm-w2c.h"
+#line 249 "cwebdir/comm-w2c.h"
extern void common_init(void);
extern void print_stats(void);
@@ -459,15 +462,15 @@
static void scan_repl(eight_bits);
/*:84*//*91:*/
-#line 1404 "cwebdir/ctangle.w"
+#line 1411 "cwebdir/ctangle.w"
static void scan_section(void);
/*:91*//*99:*/
-#line 1481 "cwebdir/ctangle.w"
+#line 1488 "cwebdir/ctangle.w"
static void phase_one(void);
/*:99*//*101:*/
-#line 1514 "cwebdir/ctangle.w"
+#line 1521 "cwebdir/ctangle.w"
static void skip_limbo(void);
/*:101*/
@@ -1595,11 +1598,18 @@
/*86:*/
#line 1244 "cwebdir/ctangle.w"
-case identifier:store_id(a);break;
+case identifier:store_id(a);
+if(*buffer=='#'&&(
+(id_loc-id_first==5&&strncmp("endif",id_first,5)==0)||
+(id_loc-id_first==4&&strncmp("else",id_first,4)==0)||
+(id_loc-id_first==4&&strncmp("elif",id_first,4)==0)))
+
+print_where= true;
+break;
case section_name:if(t!=section_name)goto done;
else{
/*87:*/
-#line 1278 "cwebdir/ctangle.w"
+#line 1285 "cwebdir/ctangle.w"
{
char*try_loc= loc;
while(*try_loc==' '&&try_loc<limit)try_loc++;
@@ -1607,7 +1617,7 @@
while(*try_loc==' '&&try_loc<limit)try_loc++;
#line 294 "cwebdir/ctang-w2c.ch"
if(*try_loc=='=')err_print(_("! Missing `@ ' before a named section"));
-#line 1284 "cwebdir/ctangle.w"
+#line 1291 "cwebdir/ctangle.w"
@@ -1614,7 +1624,7 @@
}
/*:87*/
-#line 1248 "cwebdir/ctangle.w"
+#line 1255 "cwebdir/ctangle.w"
a= cur_section_name-name_dir;
app_repl((a/0400)+0250);
@@ -1637,13 +1647,13 @@
}
/*:85*/
-#line 1252 "cwebdir/ctangle.w"
+#line 1259 "cwebdir/ctangle.w"
}
break;
#line 282 "cwebdir/ctang-w2c.ch"
case output_defs_code:if(t!=section_name)err_print(_("! Misplaced @h"));
-#line 1256 "cwebdir/ctangle.w"
+#line 1263 "cwebdir/ctangle.w"
else{
output_defs_seen= true;
@@ -1668,13 +1678,13 @@
}
/*:85*/
-#line 1262 "cwebdir/ctangle.w"
+#line 1269 "cwebdir/ctangle.w"
}
break;
case constant:case string:
/*88:*/
-#line 1295 "cwebdir/ctangle.w"
+#line 1302 "cwebdir/ctangle.w"
app_repl(a);
while(id_first<id_loc){
@@ -1682,7 +1692,7 @@
if(*(id_first+1)=='@')id_first++;
#line 300 "cwebdir/ctang-w2c.ch"
else err_print(_("! Double @ should be used in string"));
-#line 1301 "cwebdir/ctangle.w"
+#line 1308 "cwebdir/ctangle.w"
}
else if(a==constant&&*id_first=='\''&&!keep_digit_separators)
@@ -1692,12 +1702,12 @@
app_repl(a);
/*:88*/
-#line 1266 "cwebdir/ctangle.w"
+#line 1273 "cwebdir/ctangle.w"
break;
case ord:
/*89:*/
-#line 1313 "cwebdir/ctangle.w"
+#line 1320 "cwebdir/ctangle.w"
{
int c= (int)((eight_bits)*id_first);
if(c=='\\'){
@@ -1736,7 +1746,7 @@
case'\"':c= '\"';break;
#line 306 "cwebdir/ctang-w2c.ch"
default:err_print(_("! Unrecognized escape sequence"));
-#line 1350 "cwebdir/ctangle.w"
+#line 1357 "cwebdir/ctangle.w"
}
}
@@ -1749,7 +1759,7 @@
}
/*:89*/
-#line 1269 "cwebdir/ctangle.w"
+#line 1276 "cwebdir/ctangle.w"
break;
case definition:case format_code:case begin_C:if(t!=section_name)goto done;
@@ -1756,7 +1766,7 @@
else{
#line 288 "cwebdir/ctang-w2c.ch"
err_print(_("! @d, @f and @c are ignored in C text"));continue;
-#line 1274 "cwebdir/ctangle.w"
+#line 1281 "cwebdir/ctangle.w"
}
case new_section:goto done;
@@ -1777,7 +1787,7 @@
}
/*:83*//*90:*/
-#line 1371 "cwebdir/ctangle.w"
+#line 1378 "cwebdir/ctangle.w"
static void
scan_section(void)
@@ -1792,7 +1802,7 @@
next_control= ignore;
while(true){
/*92:*/
-#line 1412 "cwebdir/ctangle.w"
+#line 1419 "cwebdir/ctangle.w"
while(next_control<definition)
@@ -1801,17 +1811,17 @@
}
/*:92*/
-#line 1385 "cwebdir/ctangle.w"
+#line 1392 "cwebdir/ctangle.w"
if(next_control==definition){
/*93:*/
-#line 1419 "cwebdir/ctangle.w"
+#line 1426 "cwebdir/ctangle.w"
while((next_control= get_next())=='\n');
if(next_control!=identifier){
#line 312 "cwebdir/ctang-w2c.ch"
err_print(_("! Definition flushed, must start with identifier"));
-#line 1423 "cwebdir/ctangle.w"
+#line 1430 "cwebdir/ctangle.w"
continue;
}
@@ -1823,7 +1833,7 @@
cur_text->text_link= macro;
/*:93*/
-#line 1387 "cwebdir/ctangle.w"
+#line 1394 "cwebdir/ctangle.w"
continue;
}
@@ -1833,7 +1843,7 @@
if(next_control==section_name){
p= cur_section_name;
/*94:*/
-#line 1441 "cwebdir/ctangle.w"
+#line 1448 "cwebdir/ctangle.w"
while((next_control= get_next())=='+');
if(next_control!='='&&next_control!=eq_eq)
@@ -1840,7 +1850,7 @@
continue;
/*:94*/
-#line 1395 "cwebdir/ctangle.w"
+#line 1402 "cwebdir/ctangle.w"
break;
}
@@ -1848,20 +1858,20 @@
}
no_where= print_where= false;
/*95:*/
-#line 1446 "cwebdir/ctangle.w"
+#line 1453 "cwebdir/ctangle.w"
/*96:*/
-#line 1451 "cwebdir/ctangle.w"
+#line 1458 "cwebdir/ctangle.w"
store_two_bytes((sixteen_bits)(0150000+section_count));
/*:96*/
-#line 1447 "cwebdir/ctangle.w"
+#line 1454 "cwebdir/ctangle.w"
scan_repl(section_name);
/*97:*/
-#line 1455 "cwebdir/ctangle.w"
+#line 1462 "cwebdir/ctangle.w"
if(p==name_dir||p==NULL){
last_unnamed->text_link= cur_text-text_info;last_unnamed= cur_text;
@@ -1878,16 +1888,16 @@
/*:97*/
-#line 1449 "cwebdir/ctangle.w"
+#line 1456 "cwebdir/ctangle.w"
/*:95*/
-#line 1401 "cwebdir/ctangle.w"
+#line 1408 "cwebdir/ctangle.w"
}
/*:90*//*98:*/
-#line 1470 "cwebdir/ctangle.w"
+#line 1477 "cwebdir/ctangle.w"
static void
phase_one(void){
@@ -1900,7 +1910,7 @@
}
/*:98*//*100:*/
-#line 1486 "cwebdir/ctangle.w"
+#line 1493 "cwebdir/ctangle.w"
static void
skip_limbo(void)
@@ -1914,7 +1924,7 @@
switch(ccode[(eight_bits)c]){
case new_section:return;
case translit_code:/*102:*/
-#line 1516 "cwebdir/ctangle.w"
+#line 1523 "cwebdir/ctangle.w"
while(xisspace(*loc)&&loc<limit)loc++;
loc+= 3;
@@ -1922,7 +1932,7 @@
||(*(loc-3)>='0'&&*(loc-3)<='7')||!xisspace(*(loc-1)))
#line 330 "cwebdir/ctang-w2c.ch"
err_print(_("! Improper hex number following @l"));
-#line 1522 "cwebdir/ctangle.w"
+#line 1529 "cwebdir/ctangle.w"
else{
unsigned int i;
@@ -1934,7 +1944,7 @@
if(loc-beg>=translit_length)
#line 336 "cwebdir/ctang-w2c.ch"
err_print(_("! Replacement string in @l too long"));
-#line 1532 "cwebdir/ctangle.w"
+#line 1539 "cwebdir/ctangle.w"
else{
strncpy(translit[i-0200],beg,(size_t)(loc-beg));
@@ -1943,7 +1953,7 @@
}
/*:102*/
-#line 1498 "cwebdir/ctangle.w"
+#line 1505 "cwebdir/ctangle.w"
break;
case format_code:case'@':break;
case control_text:if(c=='q'||c=='Q'){
@@ -1951,13 +1961,13 @@
if(*(loc-1)!='>')
#line 318 "cwebdir/ctang-w2c.ch"
err_print(_("! Double @ should be used in control text"));
-#line 1504 "cwebdir/ctangle.w"
+#line 1511 "cwebdir/ctangle.w"
break;
}
#line 324 "cwebdir/ctang-w2c.ch"
default:err_print(_("! Double @ should be used in limbo"));
-#line 1508 "cwebdir/ctangle.w"
+#line 1515 "cwebdir/ctangle.w"
}
}
@@ -1965,7 +1975,7 @@
}
/*:100*//*103:*/
-#line 1542 "cwebdir/ctangle.w"
+#line 1549 "cwebdir/ctangle.w"
void
print_stats(void){
@@ -1978,7 +1988,7 @@
printf(_("%td bytes (out of %ld)\n"),
(ptrdiff_t)(byte_ptr-byte_mem),(long)max_bytes);
printf(_("%td tokens (out of %ld)\n"),
-#line 1553 "cwebdir/ctangle.w"
+#line 1560 "cwebdir/ctangle.w"
(ptrdiff_t)(tok_ptr-tok_mem),(long)max_toks);
}
Modified: branches/stable/source/src/texk/web2c/cwebboot.cin
===================================================================
--- branches/stable/source/src/texk/web2c/cwebboot.cin 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebboot.cin 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,26 +2,29 @@
#line 62 "cwebdir/common.w"
/*3:*/
-#line 51 "cwebdir/comm-w2c.h"
+#line 54 "cwebdir/comm-w2c.h"
+#include <ctype.h>
+#include <kpathsea/simpletypes.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
#endif
+#line 66 "cwebdir/comm-w2c.h"
#if HAVE_GETTEXT
#include <libintl.h>
#else
+#line 70 "cwebdir/comm-w2c.h"
#define gettext(a) a
#endif
+#line 72 "cwebdir/comm-w2c.h"
-#include <ctype.h>
-#include <kpathsea/simpletypes.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
/*:3*//*91:*/
#line 739 "cwebdir/comm-w2c.ch"
@@ -28,10 +31,12 @@
#if HAVE_GETTEXT
#include <locale.h>
#else
+#line 743 "cwebdir/comm-w2c.ch"
#define setlocale(a,b) ""
#define bindtextdomain(a,b) ""
#define textdomain(a) ""
#endif
+#line 747 "cwebdir/comm-w2c.ch"
/*:91*//*93:*/
#line 786 "cwebdir/comm-w2c.ch"
@@ -184,7 +189,7 @@
extern int phase;
/*:2*//*4:*/
-#line 91 "cwebdir/comm-w2c.h"
+#line 94 "cwebdir/comm-w2c.h"
extern char section_text[];
extern char*section_text_end;
@@ -192,7 +197,7 @@
extern char*id_loc;
/*:4*//*5:*/
-#line 109 "cwebdir/comm-w2c.h"
+#line 112 "cwebdir/comm-w2c.h"
extern char buffer[];
extern char*buffer_end;
@@ -200,7 +205,7 @@
extern char*limit;
/*:5*//*6:*/
-#line 126 "cwebdir/comm-w2c.h"
+#line 129 "cwebdir/comm-w2c.h"
extern int include_depth;
extern FILE*file[];
@@ -217,7 +222,7 @@
extern boolean web_file_open;
/*:6*//*8:*/
-#line 147 "cwebdir/comm-w2c.h"
+#line 150 "cwebdir/comm-w2c.h"
extern sixteen_bits section_count;
extern boolean changed_section[];
@@ -225,7 +230,7 @@
extern boolean print_where;
/*:8*//*9:*/
-#line 161 "cwebdir/comm-w2c.h"
+#line 164 "cwebdir/comm-w2c.h"
typedef struct name_info{
char*byte_start;
@@ -250,12 +255,12 @@
extern hash_pointer h;
/*:9*//*11:*/
-#line 205 "cwebdir/comm-w2c.h"
+#line 208 "cwebdir/comm-w2c.h"
extern int history;
/*:11*//*13:*/
-#line 222 "cwebdir/comm-w2c.h"
+#line 225 "cwebdir/comm-w2c.h"
extern int argc;
extern char**argv;
@@ -267,7 +272,7 @@
extern const char*use_language;
/*:13*//*14:*/
-#line 237 "cwebdir/comm-w2c.h"
+#line 240 "cwebdir/comm-w2c.h"
extern FILE*C_file;
extern FILE*tex_file;
@@ -408,13 +413,14 @@
#ifndef SEPARATORS
#define SEPARATORS "://"
#endif
-char separators[]= SEPARATORS;
+#line 648 "cwebdir/comm-w2c.ch"
+ char separators[]= SEPARATORS;
/*:87*/
#line 66 "cwebdir/common.w"
/*7:*/
-#line 141 "cwebdir/comm-w2c.h"
+#line 144 "cwebdir/comm-w2c.h"
extern boolean get_line(void);
extern void check_complete(void);
@@ -421,7 +427,7 @@
extern void reset_input(void);
/*:7*//*10:*/
-#line 184 "cwebdir/comm-w2c.h"
+#line 187 "cwebdir/comm-w2c.h"
extern boolean names_match(name_pointer,const char*,size_t,eight_bits);
extern name_pointer id_lookup(const char*,const char*,eight_bits);
@@ -434,7 +440,7 @@
extern void sprint_section_name(char*,name_pointer);
/*:10*//*12:*/
-#line 208 "cwebdir/comm-w2c.h"
+#line 211 "cwebdir/comm-w2c.h"
extern int wrap_up(void);
extern void err_print(const char*);
@@ -442,7 +448,7 @@
extern void overflow(const char*);
/*:12*//*15:*/
-#line 246 "cwebdir/comm-w2c.h"
+#line 249 "cwebdir/comm-w2c.h"
extern void common_init(void);
extern void print_stats(void);
@@ -480,7 +486,7 @@
#line 836 "cwebdir/comm-w2c.ch"
static void cb_usage(const_string str);
-static void cb_usagehelp(const_string*message,const_string bug_email);
+static void cb_usagehelp(const_string*message);
/*:98*/
#line 67 "cwebdir/common.w"
@@ -1416,12 +1422,14 @@
strncpy(change_file_name,DEV_NULL,max_file_name_length-2);
change_file_name[max_file_name_length-2]= '\0';
#elif defined _DEV_NULL
-strncpy(change_file_name,_DEV_NULL,max_file_name_length-2);
+#line 482 "cwebdir/comm-w2c.ch"
+ strncpy(change_file_name,_DEV_NULL,max_file_name_length-2);
change_file_name[max_file_name_length-2]= '\0';
#endif
+#line 485 "cwebdir/comm-w2c.ch"
#line 1168 "cwebdir/common.w"
-while(--argc> 0){
+ while(--argc> 0){
if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*80:*/
#line 1247 "cwebdir/common.w"
@@ -1433,7 +1441,7 @@
#line 827 "cwebdir/comm-w2c.ch"
cb_usagehelp(program==ctangle?CTANGLEHELP:
-program==cweave?CWEAVEHELP:CTWILLHELP,NULL);
+program==cweave?CWEAVEHELP:CTWILLHELP);
/*:97*/
@@ -1442,7 +1450,7 @@
if(strcmp("-version",*argv)==0||strcmp("--version",*argv)==0)
/*100:*/
-#line 875 "cwebdir/comm-w2c.ch"
+#line 873 "cwebdir/comm-w2c.ch"
printversionandexit(cb_banner,
program==ctwill?"Donald E. Knuth":"Silvio Levy and Donald E. Knuth",
@@ -1630,10 +1638,8 @@
history= fatal_message;exit(wrap_up());
}
-static void cb_usagehelp(const_string*message,const_string bug_email)
+static void cb_usagehelp(const_string*message)
{
-if(!bug_email)
-bug_email= "tex-k at tug.org";
textdomain("web2c-help");
while(*message){
@@ -1643,7 +1649,7 @@
}
textdomain("cweb-tl");
-printf(_("\nEmail bug reports to %s.\n"),bug_email);
+printf(_("\nPackage home page: %s.\n"),"https://ctan.org/pkg/cweb");
textdomain("cweb");
history= spotless;exit(wrap_up());
@@ -1650,7 +1656,7 @@
}
/*:99*//*101:*/
-#line 883 "cwebdir/comm-w2c.ch"
+#line 881 "cwebdir/comm-w2c.ch"
void cb_show_banner(void)
{
Modified: branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ChangeLog 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ChangeLog 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,3 +1,154 @@
+2022-02-18 Andreas Scherer <https://ascherer.github.io>
+
+ * common.c,
+ * ctangle.c,
+ * ctangle.w: Add '#line' after '#elif', '#else', and '#endif'.
+
+2022-02-14 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebmac.tex,
+ * cwebman-w2c.ch,
+ * cwebman.tex,
+ * texinputs/dcwebstrings.tex,
+ * texinputs/fcwebmac.tex,
+ * texinputs/icwebmac.tex: Adapt to 'ifhint.tex'.
+
+2022-02-14 Andreas Scherer <https://ascherer.github.io>
+
+ * common.c,
+ * ctangle.c,
+ * ctangle.w: Add '#line' after '#endif'.
+
+2022-02-10 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwimac.tex: Add silent \datecontentspage macro.
+ * cwebmac.tex,
+ * texinputs/dcwebstrings.tex,
+ * texinputs/[fi]cwebmac.tex: Fix '\ATH' macro.
+
+2022-02-05 Andreas Scherer <https://ascherer.github.io>
+
+ * Makefile,
+ * comm-{mac,mini,ql,w2c}.ch,
+ * comm-w2c.h,
+ * common.h,
+ * common.w,
+ * ctang-{bs,pc,ql,vms,w2c,w32}.ch,
+ * ctangle.c,
+ * ctangle.w,
+ * ctwill-w2c.ch,
+ * cweav-{bs,pc,ql,w2c,w32}.ch,
+ * cweave.w,
+ * cwebman-w2c.ch,
+ * cwebman.tex,
+ * po/cweb-tl.pot,
+ * po/cweb.pot,
+ * po/de/cweb-tl.po,
+ * po/de/cweb.po,
+ * po/it/cweb.po,
+ * prod-{cweave,twill}.w,
+ * prod.w: CWEB 4.7 release.
+
+2022-02-03 Andreas Scherer <https://ascherer.github.io>
+
+ * ctang-w32.ch,
+ * ctangle.w,
+ * cwebmac.tex,
+ * cwebman.tex: Purge a few WEB leftovers.
+
+2022-02-02 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebmac.tex: Reshuffle '\pdfURL' macro for HiTeX.
+
+2022-01-29 Andreas Scherer <https://ascherer.github.io>
+
+ * Makefile,
+ * comm-man.ch,
+ * ctang-man.ch,
+ * cweav-man.ch,
+ * cwebmac.tex,
+ * cwebman-w2c.ch,
+ * cwebman.tex: Support HINT format.
+
+2022-01-15 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-pc.ch,
+ * comm-w2c.h,
+ * common.c,
+ * common.h,
+ * ctang-bs.ch,
+ * ctang-pc.ch,
+ * ctang-w2c.ch,
+ * ctangle.c,
+ * ctangle.w,
+ * ctwill-w2c.ch,
+ * cweav-pc.ch,
+ * cweav-w2c.ch,
+ * cweave.w,
+ * cwebman.tex,
+ * cwebman-w2c.ch,
+ * po/cweb.pot,
+ * po/de/cweb.po,
+ * po/it/cweb.po: Increase sizes in CWEB 4.6.1.
+
+2021-12-26 Andreas Scherer <https://ascherer.github.io>
+
+ * Makefile,
+ * comm-{mac,mini,ql,w2c}.ch,
+ * comm-w2c.h,
+ * common.h,
+ * common.w,
+ * ctang-{bs,pc,ql,vms,w2c,w32}.ch,
+ * ctangle.c,
+ * ctangle.w,
+ * ctwill-{mini,w2c}.ch,
+ * cweav-{bs,pc,ql,vms,w2c,w32}.ch,
+ * cweave.w,
+ * cwebmac.tex,
+ * cwebman-w2c.ch,
+ * cwebman.tex,
+ * po/cweb-tl.pot,
+ * po/cweb.pot,
+ * po/de/cweb-tl.po,
+ * po/de/cweb.po,
+ * po/it/cweb.po,
+ * prod-{cweave,twill}.w,
+ * prod.w: CWEB 4.6 and CWEBbin 2021.6 release.
+
+2021-12-20 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-w2c.h,
+ * ctwill-mini.ch: Reshuffle 'gettext' header.
+
+2021-12-05 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-w2c.ch,
+ * ctwill-mini.ch,
+ * ctwill-w2c.ch,
+ * cwebman-w2c.ch: Active link to the CTWILL user manual.
+
+2021-11-26 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill-mini.ch,
+ * cweave.w: Reshuffle code in CWEAVE.
+
+2021-11-22 Andreas Scherer <https://ascherer.github.io>
+
+ * Makefile,
+ * comm-w2c.h,
+ * common.h: Copyright text in common interface.
+
+2021-11-14 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-w2c.ch,
+ * po/cweb-tl.pot,
+ * po/de/cweb-tl.po: More generic point of interest.
+
+2021-11-12 Andreas Scherer <https://ascherer.github.io>
+
+ * ctangle.w,
+ * cweave.w: Consistently refer to the COMMON module.
+
2021-10-31 Andreas Scherer <https://ascherer.github.io>
* ctproofmac.tex,
Modified: branches/stable/source/src/texk/web2c/cwebdir/Makefile
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/Makefile 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/Makefile 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,6 +1,6 @@
# This file is part of CWEB.
# It is distributed WITHOUT ANY WARRANTY, express or implied.
-# Version 4.5 --- July 2021
+# Version 4.7 --- February 2022
# Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -64,9 +64,11 @@
# uncomment the second line if you use pdftex to bypass .dvi files
# uncomment the third line if you use xetex to bypass .dvi files
+# uncomment the forth line if you use hitex for HINT output
PDFTEX = dvipdfm
#PDFTEX = pdftex
#PDFTEX = xetex
+#PDFTEX = hitex
########## You shouldn't have to change anything after this point #######
@@ -78,7 +80,7 @@
cwebman.tex cwebmac.tex comm-vms.ch ctang-vms.ch \
cweav-vms.ch comm-man.ch ctang-man.ch cweav-man.ch \
comm-pc.ch ctang-pc.ch cweav-pc.ch comm-amiga.ch \
- comm-bs.ch ctang-bs.ch cweav-bs.ch makefile.bs \
+ comm-bs.ch ctang-bs.ch cweav-bs.ch makefile.bs \
comm-ql.ch ctang-ql.ch cweav-ql.ch readme.ql \
comm-w32.ch ctang-w32.ch cweav-w32.ch \
comm-os2.ch comm-mac.ch cweb.1 cweb.el c++lib.w iso_types.w
@@ -108,6 +110,7 @@
dvipdfm ) tex "\let\pdf+ \input $*"; dvipdfm $* ;; \
pdftex ) pdftex $* ;; \
xetex ) xetex $* ;; \
+ hitex ) hitex $* ;; \
esac
all: ctangle cweave
@@ -163,7 +166,7 @@
# be sure to leave ctangle.c and common.c for bootstrapping
clean:
$(RM) -f -r *~ *.o common.tex cweave.tex cweave.c ctangle.tex \
- *.log *.dvi *.toc *.idx *.scn *.pdf core cweave ctangle
+ *.log *.dvi *.toc *.idx *.scn *.pdf *.hnt core cweave ctangle
install: all
- mkdir $(DESTDIR)
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -4,9 +4,9 @@
(Contributed 13 Oct 2000 by AndPio at aol.com; slightly edited by Don Knuth)
@x in limbo, change the title page document to specify Mac version
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.7)}
@y
- \centerline{(Version 4.5 for MacOS)}
+ \centerline{(Version 4.7 for MacOS)}
@z
@x section 23: Make input_ln accept \n, \r, \n\r, or \r\n as line endings
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-man.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-man.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-man.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -16,7 +16,7 @@
}
@y
\def\botofcontents{\vfill\titlefalse}
-\def\contentspagenumber{28}
+\def\contentspagenumber{29}
\def\title{APPENDIX D: COMMON}
\let\K=\leftarrow
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,9 +1,9 @@
Limbo.
@x
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.5 [CWEBbin 2021])}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.7 [CWEBbin 2022])}
@y
-\def\title{COMMON (Version 4.5 [CWEBbin 2021])}
+\def\title{COMMON (Version 4.7 [CWEBbin 2022])}
\def\contentspagenumber{0}
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-pc.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-pc.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-pc.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -8,7 +8,7 @@
that allows >64K arrays.
@x section 16
- at d max_bytes 90000 /* the number of bytes in identifiers,
+ at d max_bytes 100000 /* the number of bytes in identifiers,
@y
@d max_bytes (unsigned)60000 /* the number of bytes in identifiers,
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-ql.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-ql.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-ql.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -10,12 +10,12 @@
@x
\def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.5)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.7)}
\def\topofcontents{\null\vfill
\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
{\ttitlefont CWEAVE}}
\vskip 15pt
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.7)}
\vfill}
\def\botofcontents{\vfill
\noindent
@@ -22,12 +22,12 @@
@y
\def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.5)}
+\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.7)}
\def\topofcontents{\null\vfill
\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
{\ttitlefont CWEAVE}}
\vskip 15pt
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.7)}
\vfill}
\def\botofcontents{\vfill
\noindent
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -17,16 +17,16 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
@x
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.5)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.7)}
@y
\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi
-\def\title{Common code for CTANGLE and CWEAVE (4.5 [\TeX~Live])}
+\def\title{Common code for CTANGLE and CWEAVE (4.7 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.7)}
@y
- \centerline{(Version 4.5 [\TeX~Live])}
+ \centerline{(Version 4.7 [\TeX~Live])}
@z
@x
@@ -203,7 +203,7 @@
\.{@@i} line should give a complete file name with or without
double quotes.
The actual file lookup is done with the help of the \Kpathsea/ library;
-see section~\X91:File lookup with \Kpathsea/\X~for details. % FIXME
+see section~\X93:File lookup with \Kpathsea/\X~for details. % FIXME
The remainder of the \.{@@i} line after the file name is ignored.
@^system dependencies@> @.CWEBINPUTS@>
@z
@@ -826,7 +826,7 @@
@ @<Display help message and |exit|@>=
cb_usagehelp(program==ctangle ? CTANGLEHELP :
- program==cweave ? CWEAVEHELP : CTWILLHELP, NULL);
+ program==cweave ? CWEAVEHELP : CTWILLHELP);
@.--help@>
@ Special variants from Web2c's `\.{lib/usage.c}', adapted for
@@ -835,7 +835,7 @@
@<Predecl...@>=
static void cb_usage (const_string str);@/
-static void cb_usagehelp (const_string *message, const_string bug_email);@/
+static void cb_usagehelp (const_string *message);@/
@ @c
static void cb_usage (const_string str)
@@ -850,10 +850,8 @@
history=fatal_message; exit(wrap_up());
}
-static void cb_usagehelp (const_string *message, const_string bug_email)
+static void cb_usagehelp (const_string *message)
{
- if (!bug_email)
- bug_email = "tex-k@@tug.org";
textdomain("web2c-help");
@.web2c-help.mo@>
while (*message) {
@@ -863,7 +861,7 @@
}
textdomain("cweb-tl");
@.cweb-tl.mo@>
- printf(_("\nEmail bug reports to %s.\n"), bug_email);
+ printf(_("\nPackage home page: %s.\n"), "https://ctan.org/pkg/cweb");
textdomain("cweb");
@.cweb.mo@>
history=spotless; exit(wrap_up());
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.h
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.h 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.h 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021 (works also with later versions)
+% Version 4.7 --- February 2022 (works also with later versions)
% Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
@@ -12,8 +12,8 @@
% Permission is granted to copy and distribute modified versions of this
% document under the conditions for verbatim copying, provided that the
-% entire resulting derived work is distributed under the terms of a
-% permission notice identical to this one.
+% entire resulting derived work is given a different name and distributed
+% under the terms of a permission notice identical to this one.
% Amendments to 'common.h' resulting in this updated version were created
% by numerous collaborators over the course of many years.
@@ -45,10 +45,21 @@
`|@!gettext|' function from the ``GNU~gettext utilities.'' For systems that do
not have this library installed, we wrap things for neutral behavior without
internationalization.
+For backward compatibility with pre-{\mc ANSI} compilers, we replace the
+``standard'' header file `\.{stdbool.h}' with the
+{\mc KPATHSEA\spacefactor1000} interface `\.{simpletypes.h}'.
@d _(s) gettext(s)
@<Include files@>=
+#include <ctype.h> /* definition of |@!isalpha|, |@!isdigit| and so on */
+#include <kpathsea/simpletypes.h> /* |@!boolean|, |@!true| and |@!false| */
+#include <stddef.h> /* definition of |@!ptrdiff_t| */
+#include <stdint.h> /* definition of |@!uint8_t| and |@!uint16_t| */
+#include <stdio.h> /* definition of |@!printf| and friends */
+#include <stdlib.h> /* definition of |@!getenv| and |@!exit| */
+#include <string.h> /* definition of |@!strlen|, |@!strcmp| and so on */
+@#
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
#endif
@@ -58,14 +69,6 @@
#else
#define gettext(a) a
#endif
-@#
-#include <ctype.h> /* definition of |@!isalpha|, |@!isdigit| and so on */
-#include <kpathsea/simpletypes.h> /* |@!boolean|, |@!true| and |@!false| */
-#include <stddef.h> /* definition of |@!ptrdiff_t| */
-#include <stdint.h> /* definition of |@!uint8_t| and |@!uint16_t| */
-#include <stdio.h> /* definition of |@!printf| and friends */
-#include <stdlib.h> /* definition of |@!getenv| and |@!exit| */
-#include <string.h> /* definition of |@!strlen|, |@!strcmp| and so on */
@ Code related to the character set:
@^ASCII code dependencies@>
@@ -248,9 +251,8 @@
extern void print_stats(void);@/
extern void cb_show_banner(void);
-@ The following parameters were sufficient in the original \.{WEB} to
-handle \TEX/, so they should be sufficient for most applications of
-\.{CWEB}.
+@ The following parameters are sufficient to handle \TEX/ (converted to
+\.{CWEB}), so they should be sufficient for most applications of \.{CWEB}.
@d buf_size 1000 /* maximum length of input line, plus one */
@d longest_name 10000 /* file names, section names, and section texts
Modified: branches/stable/source/src/texk/web2c/cwebdir/common.c
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/common.c 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/common.c 2022-03-01 02:03:00 UTC (rev 874)
@@ -82,13 +82,13 @@
#define new_line putchar('\n')
#define term_write(a,b) fflush(stdout) ,fwrite(a,sizeof(char) ,b,stdout) \
-#define buf_size 100
+#define buf_size 200
#define longest_name 10000 \
#define long_buf_size (buf_size+longest_name)
-#define max_bytes 90000 \
+#define max_bytes 100000 \
-#define max_names 4000 \
+#define max_names 5000 \
#define max_sections 2000 \
@@ -732,8 +732,10 @@
if((l= strlen(CWEBINPUTS))> max_file_name_length-2)too_long();
strcpy(temp_file_name,CWEBINPUTS);
#else
-l= 0;
+#line 474 "common.w"
+ l= 0;
#endif
+#line 476 "common.w"
}
if(l> 0){
if(k+l+2>=cur_file_name_end)too_long();
Modified: branches/stable/source/src/texk/web2c/cwebdir/common.h
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/common.h 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/common.h 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021 (works also with later versions)
+% Version 4.7 --- February 2022 (works also with later versions)
% Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
@@ -12,8 +12,8 @@
% Permission is granted to copy and distribute modified versions of this
% document under the conditions for verbatim copying, provided that the
-% entire resulting derived work is distributed under the terms of a
-% permission notice identical to this one.
+% entire resulting derived work is given a different name and distributed
+% under the terms of a permission notice identical to this one.
% Amendments to 'common.h' resulting in this updated version were created
% by numerous collaborators over the course of many years.
@@ -226,17 +226,16 @@
extern void common_init(void);@/
extern void print_stats(void);
-@ The following parameters were sufficient in the original \.{WEB} to
-handle \TEX/, so they should be sufficient for most applications of
-\.{CWEB}.
+@ The following parameters are sufficient to handle \TEX/ (converted to
+\.{CWEB}), so they should be sufficient for most applications of \.{CWEB}.
- at d buf_size 100 /* maximum length of input line, plus one */
+ at d buf_size 200 /* maximum length of input line, plus one */
@d longest_name 10000 /* file names, section names, and section texts
shouldn't be longer than this */
@d long_buf_size (buf_size+longest_name) /* for \.{CWEAVE} */
- at d max_bytes 90000 /* the number of bytes in identifiers,
+ at d max_bytes 100000 /* the number of bytes in identifiers,
index entries, and section names; must be less than $2^{24}$ */
- at d max_names 4000 /* number of identifiers, strings, section names;
+ at d max_names 5000 /* number of identifiers, strings, section names;
must be less than 10240 */
@d max_sections 2000 /* greater than the total number of sections */
Modified: branches/stable/source/src/texk/web2c/cwebdir/common.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/common.w 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/common.w 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.7 --- February 2022
% Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -22,12 +22,12 @@
\def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.5)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.7)}
\def\topofcontents{\null\vfill
\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
{\ttitlefont CWEAVE}}
\vskip 15pt
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.7)}
\vfill}
\def\botofcontents{\vfill
\noindent
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -17,12 +17,12 @@
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
- at d banner "This is CTANGLE (Version 4.5)"
+ at d banner "This is CTANGLE (Version 4.7)"
@y
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
- at d banner "This is CTANGLE (Version 4.5pc/big)"
+ at d banner "This is CTANGLE (Version 4.7pc/big)"
@z
@@ -98,7 +98,7 @@
@x Section 20.
-@ @d max_texts 2500 /* number of replacement texts, must be less than 10240 */
+@ @d max_texts 4000 /* number of replacement texts, must be less than 10240 */
@d max_toks 270000 /* number of bytes in compressed \CEE/ code */
@y
@ (This is a modified version of \.{CTANGLE}, and in fact one of the parameters
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-man.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-man.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-man.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -16,7 +16,7 @@
}
@y
\def\botofcontents{\vfill\titlefalse}
-\def\contentspagenumber{64}
+\def\contentspagenumber{65}
\def\title{APPENDIX E: CTANGLE}
\let\K=\leftarrow
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-pc.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-pc.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-pc.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -9,12 +9,12 @@
alternate change files with -bs suffix instead of -pc.
@x section 1
- at d banner "This is CTANGLE (Version 4.5)"
+ at d banner "This is CTANGLE (Version 4.7)"
@y
- at d banner "This is CTANGLE (Version 4.5pc)"
+ at d banner "This is CTANGLE (Version 4.7pc)"
@z
@x section 17
- at d max_bytes 90000 /* the number of bytes in identifiers,
+ at d max_bytes 100000 /* the number of bytes in identifiers,
index entries, and section names; must be less than $2^{24}$ */
@y (note that CWEAVE itself needs only about 42K toks)
@d max_bytes (unsigned)60000 /* the number of bytes in identifiers,
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-ql.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-ql.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-ql.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -7,15 +7,15 @@
@x
-\def\title{CTANGLE (Version 4.5)}
+\def\title{CTANGLE (Version 4.7)}
@y
-\def\title{CTANGLE (QL Version 4.5)}
+\def\title{CTANGLE (QL Version 4.7)}
@z
@x section 1
- at d banner "This is CTANGLE (Version 4.5)"
+ at d banner "This is CTANGLE (Version 4.7)"
@y
- at d banner "This is CTANGLE (QL Version 4.5)"
+ at d banner "This is CTANGLE (QL Version 4.7)"
@z
@x
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-vms.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-vms.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-vms.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -10,9 +10,9 @@
(these changes not necessary for initial bootstrapping)
@x section 1 (01-FEB-1992 ST)
- at d banner "This is CTANGLE (Version 4.5)"
+ at d banner "This is CTANGLE (Version 4.7)"
@y
- at d banner "This is CTANGLE (VAX/VMS Version 4.5)"
+ at d banner "This is CTANGLE (VAX/VMS Version 4.7)"
@z
@x section 4 (01-FEB-1992 ST)
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -17,15 +17,15 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
@x
-\def\title{CTANGLE (Version 4.5)}
+\def\title{CTANGLE (Version 4.7)}
@y
-\def\title{CTANGLE (Version 4.5 [\TeX~Live])}
+\def\title{CTANGLE (Version 4.7 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.7)}
@y
- \centerline{(Version 4.5 [\TeX~Live])}
+ \centerline{(Version 4.7 [\TeX~Live])}
@z
@x
@@ -41,9 +41,9 @@
@z
@x
- at d banner "This is CTANGLE (Version 4.5)"
+ at d banner "This is CTANGLE (Version 4.7)"
@y
- at d banner "This is CTANGLE, Version 4.5"
+ at d banner "This is CTANGLE, Version 4.7"
/* will be extended by the \TeX~Live |versionstring| */
@z
@@ -60,7 +60,7 @@
@z
@x
-@ @d max_texts 2500 /* number of replacement texts, must be less than 10240 */
+@ @d max_texts 4000 /* number of replacement texts, must be less than 10240 */
@d max_toks 270000 /* number of bytes in compressed \CEE/ code */
@y
@ @d max_texts 10239 /* number of replacement texts, must be less than 10240 */
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-w32.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-w32.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-w32.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -4,9 +4,9 @@
Changes necessary for compiling with Borland C/C++
@x section 1
- at d banner "This is CTANGLE (Version 4.5)"
+ at d banner "This is CTANGLE (Version 4.7)"
@y
- at d banner "This is CTANGLE (Version 4.5win32)"
+ at d banner "This is CTANGLE (Version 4.7win32)"
@z
@x
@@ -14,13 +14,13 @@
name_pointer p, /* points to the proposed match */
const char *first, /* position of first character of string */
size_t l, /* length of identifier */
-eight_bits t) /* not used by \.{TANGLE} */
+eight_bits t) /* not used by \.{CTANGLE} */
@y
boolean __cdecl names_match(
name_pointer p, /* points to the proposed match */
const char *first, /* position of first character of string */
size_t l, /* length of identifier */
-eight_bits t) /* not used by \.{TANGLE} */
+eight_bits t) /* not used by \.{CTANGLE} */
@z
@x
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctangle.c
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctangle.c 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctangle.c 2022-03-01 02:03:00 UTC (rev 874)
@@ -15,7 +15,7 @@
/*:4*/
#line 67 "ctangle.w"
-#define banner "This is CTANGLE (Version 4.5)" \
+#define banner "This is CTANGLE (Version 4.7)" \
#define ctangle false
#define cweave true \
@@ -84,17 +84,17 @@
#define new_line putchar('\n')
#define term_write(a,b) fflush(stdout) ,fwrite(a,sizeof(char) ,b,stdout) \
-#define buf_size 100
+#define buf_size 200
#define longest_name 10000 \
#define long_buf_size (buf_size+longest_name)
-#define max_bytes 90000 \
+#define max_bytes 100000 \
-#define max_names 4000 \
+#define max_names 5000 \
#define max_sections 2000 \
-#define max_texts 2500
+#define max_texts 4000
#define max_toks 270000
#define equiv equiv_or_xref \
@@ -434,15 +434,15 @@
static void scan_repl(eight_bits);
/*:84*//*91:*/
-#line 1404 "ctangle.w"
+#line 1411 "ctangle.w"
static void scan_section(void);
/*:91*//*99:*/
-#line 1481 "ctangle.w"
+#line 1488 "ctangle.w"
static void phase_one(void);
/*:99*//*101:*/
-#line 1514 "ctangle.w"
+#line 1521 "ctangle.w"
static void skip_limbo(void);
/*:101*/
@@ -1281,11 +1281,18 @@
/*86:*/
#line 1244 "ctangle.w"
-case identifier:store_id(a);break;
+case identifier:store_id(a);
+if(*buffer=='#'&&(
+(id_loc-id_first==5&&strncmp("endif",id_first,5)==0)||
+(id_loc-id_first==4&&strncmp("else",id_first,4)==0)||
+(id_loc-id_first==4&&strncmp("elif",id_first,4)==0)))
+
+print_where= true;
+break;
case section_name:if(t!=section_name)goto done;
else{
/*87:*/
-#line 1278 "ctangle.w"
+#line 1285 "ctangle.w"
{
char*try_loc= loc;
while(*try_loc==' '&&try_loc<limit)try_loc++;
@@ -1298,7 +1305,7 @@
}
/*:87*/
-#line 1248 "ctangle.w"
+#line 1255 "ctangle.w"
a= cur_section_name-name_dir;
app_repl((a/0400)+0250);
@@ -1321,7 +1328,7 @@
}
/*:85*/
-#line 1252 "ctangle.w"
+#line 1259 "ctangle.w"
}
break;
@@ -1350,13 +1357,13 @@
}
/*:85*/
-#line 1262 "ctangle.w"
+#line 1269 "ctangle.w"
}
break;
case constant:case string:
/*88:*/
-#line 1295 "ctangle.w"
+#line 1302 "ctangle.w"
app_repl(a);
while(id_first<id_loc){
@@ -1372,12 +1379,12 @@
app_repl(a);
/*:88*/
-#line 1266 "ctangle.w"
+#line 1273 "ctangle.w"
break;
case ord:
/*89:*/
-#line 1313 "ctangle.w"
+#line 1320 "ctangle.w"
{
int c= (int)((eight_bits)*id_first);
if(c=='\\'){
@@ -1427,7 +1434,7 @@
}
/*:89*/
-#line 1269 "ctangle.w"
+#line 1276 "ctangle.w"
break;
case definition:case format_code:case begin_C:if(t!=section_name)goto done;
@@ -1451,7 +1458,7 @@
}
/*:83*//*90:*/
-#line 1371 "ctangle.w"
+#line 1378 "ctangle.w"
static void
scan_section(void)
@@ -1466,7 +1473,7 @@
next_control= ignore;
while(true){
/*92:*/
-#line 1412 "ctangle.w"
+#line 1419 "ctangle.w"
while(next_control<definition)
@@ -1475,11 +1482,11 @@
}
/*:92*/
-#line 1385 "ctangle.w"
+#line 1392 "ctangle.w"
if(next_control==definition){
/*93:*/
-#line 1419 "ctangle.w"
+#line 1426 "ctangle.w"
while((next_control= get_next())=='\n');
if(next_control!=identifier){
@@ -1495,7 +1502,7 @@
cur_text->text_link= macro;
/*:93*/
-#line 1387 "ctangle.w"
+#line 1394 "ctangle.w"
continue;
}
@@ -1505,7 +1512,7 @@
if(next_control==section_name){
p= cur_section_name;
/*94:*/
-#line 1441 "ctangle.w"
+#line 1448 "ctangle.w"
while((next_control= get_next())=='+');
if(next_control!='='&&next_control!=eq_eq)
@@ -1512,7 +1519,7 @@
continue;
/*:94*/
-#line 1395 "ctangle.w"
+#line 1402 "ctangle.w"
break;
}
@@ -1520,20 +1527,20 @@
}
no_where= print_where= false;
/*95:*/
-#line 1446 "ctangle.w"
+#line 1453 "ctangle.w"
/*96:*/
-#line 1451 "ctangle.w"
+#line 1458 "ctangle.w"
store_two_bytes((sixteen_bits)(0150000+section_count));
/*:96*/
-#line 1447 "ctangle.w"
+#line 1454 "ctangle.w"
scan_repl(section_name);
/*97:*/
-#line 1455 "ctangle.w"
+#line 1462 "ctangle.w"
if(p==name_dir||p==NULL){
last_unnamed->text_link= cur_text-text_info;last_unnamed= cur_text;
@@ -1550,16 +1557,16 @@
/*:97*/
-#line 1449 "ctangle.w"
+#line 1456 "ctangle.w"
/*:95*/
-#line 1401 "ctangle.w"
+#line 1408 "ctangle.w"
}
/*:90*//*98:*/
-#line 1470 "ctangle.w"
+#line 1477 "ctangle.w"
static void
phase_one(void){
@@ -1572,7 +1579,7 @@
}
/*:98*//*100:*/
-#line 1486 "ctangle.w"
+#line 1493 "ctangle.w"
static void
skip_limbo(void)
@@ -1586,7 +1593,7 @@
switch(ccode[(eight_bits)c]){
case new_section:return;
case translit_code:/*102:*/
-#line 1516 "ctangle.w"
+#line 1523 "ctangle.w"
while(xisspace(*loc)&&loc<limit)loc++;
loc+= 3;
@@ -1611,7 +1618,7 @@
}
/*:102*/
-#line 1498 "ctangle.w"
+#line 1505 "ctangle.w"
break;
case format_code:case'@':break;
case control_text:if(c=='q'||c=='Q'){
@@ -1629,7 +1636,7 @@
}
/*:100*//*103:*/
-#line 1542 "ctangle.w"
+#line 1549 "ctangle.w"
void
print_stats(void){
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctangle.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctangle.w 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctangle.w 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.7 --- February 2022
% Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -27,11 +27,11 @@
\mathchardef\RA="3221 % right arrow
\mathchardef\BA="3224 % double arrow
-\def\title{CTANGLE (Version 4.5)}
+\def\title{CTANGLE (Version 4.7)}
\def\topofcontents{\null\vfill
\centerline{\titlefont The {\ttitlefont CTANGLE} processor}
\vskip 15pt
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.7)}
\vfill}
\def\botofcontents{\vfill
\noindent
@@ -61,7 +61,7 @@
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
- at d banner "This is CTANGLE (Version 4.5)"
+ at d banner "This is CTANGLE (Version 4.7)"
@c
@<Include files@>@/
@@ -75,7 +75,7 @@
two phases: First it reads the source file, saving the \CEE/ code in
compressed form; then it shuffles and outputs the code.
-Please read the documentation for \.{common}, the set of routines common
+Please read the documentation for \.{COMMON}, the set of routines common
to \.{CTANGLE} and \.{CWEAVE}, before proceeding further.
@c
@@ -126,7 +126,7 @@
} text;
typedef text *text_pointer;
-@ @d max_texts 2500 /* number of replacement texts, must be less than 10240 */
+@ @d max_texts 4000 /* number of replacement texts, must be less than 10240 */
@d max_toks 270000 /* number of bytes in compressed \CEE/ code */
@<Private...@>=
static text text_info[max_texts];
@@ -157,7 +157,7 @@
name_pointer p, /* points to the proposed match */
const char *first, /* position of first character of string */
size_t l, /* length of identifier */
-eight_bits t) /* not used by \.{TANGLE} */
+eight_bits t) /* not used by \.{CTANGLE} */
{@+(void)t;@/
return length(p)==l && strncmp(first,p->byte_start,l)==0;
}
@@ -1242,7 +1242,14 @@
}
@ @<In cases that |a| is...@>=@t\1\quad@>
-case identifier: store_id(a); break;
+case identifier: store_id(a);
+ if (*buffer=='#' && @| (
+ ( id_loc-id_first==5 && strncmp("endif",id_first,5)==0 ) || @|
+ ( id_loc-id_first==4 && strncmp("else",id_first,4)==0 ) || @|
+ ( id_loc-id_first==4 && strncmp("elif",id_first,4)==0 ) ) )
+ /* Avoid preprocessor calamities */
+ print_where=true;
+ break;
case section_name: if (t!=section_name) goto done;
else {
@<Was an `\.{@@}' missed here?@>@;
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -15,14 +15,15 @@
@x
A kind of ``user manual'' for \.{CTWILL} can be found in the appendix
-{\bf 271.~Mogrify \.{CWEAVE} into \.{CTWILL}} and beyond, together
-with additional material specific to \.{CTWILL}. % FIXME
+\X271:Mogrify \.{CWEAVE} into \.{CTWILL}\X~and beyond, together with
+additional material specific to \.{CTWILL}. % FIXME
Until then, \.{CWEAVE}'s sequence of sections will be preserved.
The ``banner line'' defined here should be changed whenever \.{CTWILL} is
@y
-A kind of ``user manual'' for \.{CTWILL} can be found in section~\&{289}
-and beyond, together with additional material specific to \.{CTWILL}. % FIXME
+A kind of ``user manual'' for \.{CTWILL} can be found in section~%
+\X288:Mogrify {\tentex CWEAVE} into {\tentex CTWILL}\X~and beyond,
+together with additional material specific to \.{CTWILL}. % FIXME
\bigskip
{\font\itt=cmitt10 \font\bit=cmbxti10
\noindent \bit Editor's Note: \it This heavily redacted version of
@@ -80,7 +81,7 @@
@x
@ Code related to input routines:
@y
- at r @ Code related to input routines:
+@ Code related to input routines:
@-c@>
@z
@@ -551,9 +552,9 @@
Section 108.
@x
- at d print_cat(c) fputs(cat_name[c],stdout)
+ at d print_cat(c) fputs(cat_name[c],stdout) /* symbolic printout of a category */
@y
- at d print_cat(c) fputs(cat_name[c],stdout)
+ at d print_cat(c) fputs(cat_name[c],stdout) /* symbolic printout of a category */
@-c@>
@z
@@ -1018,15 +1019,12 @@
Section 133.
@x
-The code below is an exact translation of the production rules into
+@ The |mathness| is an attribute of scraps that says whether they are
@y
-@ The code below is an exact translation of the production rules into
- at -a@>
- at -c@>
- at -p@>
+ at r @ The |mathness| is an attribute of scraps that says whether they are
@z
-Section 136--137.
+Section 135--136.
@x
@ Let us consider the big switch for productions now, before looking
@@ -1171,7 +1169,7 @@
case default_like: @<Cases for |default_like|@>@; @+break;
@z
-Section 138.
+Section 137.
@x
should say, for example, `\.{@@!@@\^\\\&\{operator\} \$+\{=\}\$@@>}' (or,
@@ -1193,7 +1191,7 @@
@$operator_found {CTWILL}138 =\hfil\break(\&{token\_pointer}) 2@>
@z
-Section 140.
+Section 139.
@x
the |for| loop below.
@@ -1216,7 +1214,7 @@
@$make_reserved {CTWILL}140 \&{static} \&{void} (\,)@>
@z
-Section 141.
+Section 140.
@x
@ In the following situations we want to mark the occurrence of
@@ -1242,7 +1240,7 @@
return; /* this happens, for example, in \&{case} \\{found}: */
@z
-Section 144.
+Section 143.
@x
strcpy(ministring_buf,"label");
@@ -1256,7 +1254,7 @@
else @/ if (cat1==attr) {
@z
-Section 158.
+Section 157.
@x
@ @<Cases for |struct_head|@>=
@@ -1264,7 +1262,7 @@
@r @ @<Cases for |struct_head|@>=
@z
-Section 165.
+Section 164.
@x
else reduce(pp,0,else_like,0,65);
@@ -1276,7 +1274,7 @@
@+ else @/ if (cat1==attr) {
@z
-Section 171.
+Section 170.
@x
@d force_lines flags['f'] /* should each statement be on its own line? */
@@ -1286,7 +1284,7 @@
@$force_lines {CTWILL}171 =\\{flags}[\.{'f'}]@>
@z
-Section 174.
+Section 173.
@x
if (cat1==else_like || cat1==if_like || cat1==define_like)
@@ -1300,7 +1298,7 @@
} else @/ if (cat1==exp || cat1==function) {
@z
-Section 182.
+Section 181.
@x
big_app1(pp+2); reduce(pp,3,new_exp,0,96);
@@ -1312,7 +1310,7 @@
@+ else @/ if (cat1==raw_ubin) {
@z
-Section 198.
+Section 197.
@x
@ Now here's the |reduce| procedure used in our code for productions,
@@ -1320,7 +1318,7 @@
@r @ Now here's the |reduce| procedure used in our code for productions,
@z
-Section 203.
+Section 202.
@x
@ @<Print a snapsh...@>=
@@ -1332,7 +1330,7 @@
@$n {CTWILL}199 \&{short}@>
@z
-Section 205.
+Section 204.
@x
@ @<Predecl...@>=@+static text_pointer translate(void);
@@ -1341,7 +1339,7 @@
@-translate@>
@z
-Section 209.
+Section 208.
@x
if (next_control=='|' || next_control==begin_comment ||
@@ -1353,7 +1351,7 @@
next_control==begin_short_comment) return;
@z
-Section 210.
+Section 209.
@x
@ @<Predecl...@>=@+static void C_parse(eight_bits);
@@ -1362,7 +1360,7 @@
@-C_parse@>
@z
-Section 211.
+Section 210.
@x
@ The following macro is used to append a scrap whose tokens have just
@@ -1372,7 +1370,7 @@
@-c@>
@z
-Section 212.
+Section 211.
@x
@ @<Append the scr...@>=
@@ -1435,7 +1433,7 @@
@#
@z
-Section 213--214.
+Section 212--213.
@x
overflow(_("scrap/token/text"));
@@ -1484,7 +1482,7 @@
case ':': app(':');@+app_scrap(colon,no_math);@+break;@/
@z
-Section 216.
+Section 215.
@x
@<Append a string or...@>={@+ int count=-1; /* characters remaining before string break */
@@ -1492,7 +1490,7 @@
@<Append a string or...@>={int count=-1; /* characters remaining before string break */
@z
-Section 221.
+Section 220.
@x
@ The |outer_parse| routine is to |C_parse| as |outer_xref|
@@ -1508,7 +1506,7 @@
@$make_pb {CTWILL}221 =\\{flags}[\.{'e'}]@>
@z
-Section 225.
+Section 224.
@x
@d cur_mode cur_state.mode_field /* current mode of interpretation */
@@ -1522,7 +1520,7 @@
@$cur_mode {CTWILL}225 =\\{cur\_state}.\\{mode\_field}]@>
@z
-Section 228.
+Section 227.
@x
push_level( /* suspends the current level */
@@ -1534,7 +1532,7 @@
@$push_level {CTWILL}228 \&{static} \&{void} (\,)@>
@z
-Section 229.
+Section 228.
@x
force when the current level was begun. This subroutine will never be
@@ -1545,7 +1543,7 @@
This subroutine will never be called when |stack_ptr==1|.
@z
-Section 234--235.
+Section 233--234.
@x
@ Here is \.{CWEAVE}'s major output handler.
@@ -1632,7 +1630,7 @@
}
@z
-Section 236.
+Section 235.
@x
@ An identifier of length one does not have to be enclosed in braces, and it
@@ -1640,7 +1638,7 @@
@r @ An identifier of length one does not have to be enclosed in braces, and it
@z
-Section 237.
+Section 236.
@x
} else if (a==opt) b=get_output(); /* ignore digit following |opt| */
@@ -1648,7 +1646,7 @@
}@+ else if (a==opt) b=get_output(); /* ignore digit following |opt| */
@z
-Section 238.
+Section 237.
@x
@<Look ahead for st...@>= {
@@ -1670,7 +1668,7 @@
while (true) {@+
@z
-Section 241.
+Section 240.
@x
case ' ': case '\\': case '#': case '%': case '$': case '^':
@@ -1683,7 +1681,7 @@
out('\\'); /* falls through */
@z
-Section 243.
+Section 242.
@x
if (b=='@@' || (b=='\\' && delim!=0))
@@ -1691,7 +1689,7 @@
if (b=='@@' || (b=='\\' && delim!=0)) @/
@z
-Section 245.
+Section 244.
@x
phase_two(void) {
@@ -1699,7 +1697,7 @@
phase_two(void) {@+
@z
-Section 246.
+Section 245.
@x
@ @<Predecl...@>=@+static void phase_two(void);
@@ -1708,7 +1706,7 @@
@-phase_two@>
@z
-Section 248.
+Section 247.
@x
@ @d usage_sentinel (struct perm_meaning *)1
@@ -1720,7 +1718,7 @@
@<Translate the current section@>=@+ {
@z
-Section 252.
+Section 251.
@x
finish_C( /* finishes a definition or a \CEE/ part */
@@ -1732,7 +1730,7 @@
@$finish_C {CTWILL}252 \&{static} \&{void} (\,)@>
@z
-Section 253.
+Section 252.
@x
@ @<Predecl...@>=@+static void finish_C(boolean);
@@ -1741,7 +1739,7 @@
@-finish_C@>
@z
-Section 255.
+Section 254.
@x
@ @<Start a format...@>= {
@@ -1749,7 +1747,7 @@
@r @ @<Start a format...@>= {
@z
-Section 256.
+Section 255.
@x
|next_control>=begin_C|. We will make the global variable |this_section|
@@ -1760,7 +1758,7 @@
\hfil\break the current section name, if it has a name.
@z
-Section 261.
+Section 260.
@x
footnote( /* outputs section cross-references */
@@ -1772,7 +1770,7 @@
@$footnote {CTWILL}261 \&{static} \&{void} (\,)@>
@z
-Section 262.
+Section 261.
@x
@ @<Predecl...@>=@+static void footnote(sixteen_bits);
@@ -1781,7 +1779,7 @@
@-footnote@>
@z
-Section 266.
+Section 265.
@x
@ @<Predecl...@>=@+static void phase_three(void);
@@ -1790,7 +1788,7 @@
@-phase_three@>
@z
-Section 269.
+Section 268.
@x
@ A left-to-right radix sorting method is used, since this makes it easy to
@@ -1799,7 +1797,7 @@
@-c@>
@z
-Section 271.
+Section 270.
@x
@<Rest of |trans_plus| union@>=
@@ -1809,7 +1807,7 @@
@-k@>
@z
-Section 272.
+Section 271.
@x
@ @d depth cat /* reclaims memory that is no longer needed for parsing */
@@ -1825,7 +1823,7 @@
@$max_sorts {CTWILL}272 =\\{max_scraps}@>
@z
-Section 274.
+Section 273.
@x
$|collate|[0]<|collate|[1]<\cdots<|collate|[100]$.
@@ -1833,7 +1831,7 @@
|collate[0]| ${}<{}$|collate[1]|${}<\cdots<{}$|collate[100]|.
@z
-Section 276.
+Section 275.
@x
@ Procedure |unbucket| goes through the buckets and adds nonempty lists
@@ -1843,7 +1841,7 @@
@$unbucket {CTWILL}276 \&{static} \&{void} (\,)@>
@z
-Section 277.
+Section 276.
@x
@ @<Predecl...@>=@+static void unbucket(eight_bits);
@@ -1852,7 +1850,7 @@
@-unbucket@>
@z
-Section 279.
+Section 278.
@x
@ @<Split the list...@>= {
@@ -1864,7 +1862,7 @@
next_name=sort_ptr->head;@/
@z
-Section 280.
+Section 279.
@x
cur_name=sort_ptr->head;
@@ -1872,7 +1870,7 @@
@+cur_name=sort_ptr->head;@/
@z
-Section 286.
+Section 285.
@x
@ @<Predecl...@>=@+static void section_print(name_pointer);
@@ -1881,7 +1879,7 @@
@-section_print@>
@z
-Section 288.
+Section 287.
@x
puts(_("\nMemory usage statistics:"));
@@ -1945,7 +1943,7 @@
@t\5\5\5\5@>(long)max_scraps);
@z
-Section 289.
+Section 288.
@x
@** Mogrify {\tentex CWEAVE} into {\tentex CTWILL}. The following sections
@@ -1970,7 +1968,7 @@
@-x@>
@z
-Section 290--291.
+Section 289--290.
@x
The current meaning of every identifier is initially `\.{\\uninitialized}'.
@@ -1995,7 +1993,7 @@
@y
@z
-Section 293.
+Section 292.
@x
static struct perm_meaning {
@@ -2005,7 +2003,7 @@
@$perm_meaning {CTWILL}293 \&{static} \&{struct}@>
@z
-Section 302.
+Section 301.
@x
@ @<Predec...@>=@+static boolean app_supp(text_pointer);
@@ -2014,7 +2012,7 @@
@-app_supp@>
@z
-Section 303.
+Section 302.
@x
@ The trickiest part of \.{CTWILL} is the procedure |make_ministring(pp+l)|,
@@ -2028,7 +2026,7 @@
@$make_ministring {CTWILL}303 \&{static} \&{void} (\,)@>
@z
-Section 304.
+Section 303.
@x
@ @<Predec...@>=@+static void make_ministring(scrap_pointer);
@@ -2037,7 +2035,7 @@
@-make_ministring@>
@z
-Section 307.
+Section 306.
@x
@ @<Append tokens for type |q|@>=
@@ -2051,7 +2049,7 @@
@|&& *(*r+1)=='{') app(**q); /* |struct_like| identifier */
@z
-Section 312.
+Section 311.
@x
@ @<Write the new meaning to the \.{.aux} file@>=
@@ -2062,7 +2060,7 @@
@$q {CTWILL}296 \&{struct perm\_meaning} ${}{*}{}$@>
@z
-Section 313.
+Section 312.
@x
@<Flag the usage of this identifier, for the mini-index@>=
@@ -2072,7 +2070,7 @@
@$p {CTWILL}219 \&{name\_pointer}@>
@z
-Section 316.
+Section 315.
@x
@ @<Predec...@>=@+static void out_mini(meaning_struct *);
@@ -2081,7 +2079,7 @@
@-out_mini@>
@z
-Section 317.
+Section 316.
@x
@ Compare this code with section |@<Output the name...@>|.
@@ -2091,7 +2089,7 @@
@ @<Mini-output...@>=
@z
-Section 319.
+Section 318.
@x
@ @<Predec...@>=@+static sixteen_bits title_lookup(void);
@@ -2100,7 +2098,7 @@
@-title_lookup@>
@z
-Section 322.
+Section 321.
@x
@d indent_param_decl flags['i'] /* should formal parameter declarations be indented? */
@@ -2110,7 +2108,7 @@
@$indent_param_decl {CTWILL}322 =\\{flags}[\.{'i'}]@>
@z
-Section 323.
+Section 322.
@x
@d order_decl_stmt flags['o'] /* should declarations and statements be separated? */
@@ -2120,7 +2118,7 @@
@$order_decl_stmt {CTWILL}323 =\\{flags}[\.{'o'}]@>
@z
-Section 329.
+Section 328.
@x
@** Index.
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -35,9 +35,9 @@
@z
@x
-\def\title{CWEAVE (Version 4.5)}
+\def\title{CWEAVE (Version 4.7)}
@y
-\def\title{CTWILL (Version 4.5 [\TeX~Live])}
+\def\title{CTWILL (Version 4.7 [\TeX~Live])}
@z
@x
@@ -47,9 +47,9 @@
@z
@x
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.7)}
@y
- \centerline{(Version 4.5 [\TeX~Live])}
+ \centerline{(Version 4.7 [\TeX~Live])}
@z
@x
@@ -76,7 +76,7 @@
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
- at d banner "This is CWEAVE (Version 4.5)"
+ at d banner "This is CWEAVE (Version 4.7)"
@y
This is the \.{CTWILL} program by D. E. Knuth, based
on \.{CWEAVE} by Silvio Levy and D.~E. Knuth. It is also based on
@@ -84,7 +84,7 @@
Volumes B and~D of {\sl Computers {\char`\&} Typesetting\/} in 1985.
\.{CTWILL} was hacked together hastily in June, 1992, to generate pages for
Knuth's book about the Stanford GraphBase, and updated even more hastily
-in March, 1993 to generate final copy for that book. The main idea was to
+in March, 1993, to generate final copy for that book. The main idea was to
extend \.{CWEAVE} so that ``mini-indexes'' could appear.
No time was available to make \.{CTWILL} into a refined or complete system,
nor even to fully update the program documentation below. Subsequent changes
@@ -93,14 +93,14 @@
reprinted in {\sl Digital Typography\/} (1999), 225--245.
A kind of ``user manual'' for \.{CTWILL} can be found in the appendix
-{\bf 271.~Mogrify \.{CWEAVE} into \.{CTWILL}} and beyond, together
-with additional material specific to \.{CTWILL}. % FIXME
+\X271:Mogrify \.{CWEAVE} into \.{CTWILL}\X~and beyond, together with
+additional material specific to \.{CTWILL}. % FIXME
Until then, \.{CWEAVE}'s sequence of sections will be preserved.
The ``banner line'' defined here should be changed whenever \.{CTWILL} is
modified. The version number parallels the corresponding version of \.{CWEAVE}.
- at d banner "This is CTWILL, Version 4.5"
+ at d banner "This is CTWILL, Version 4.7"
/* will be extended by the \TeX~Live |versionstring| */
@z
@@ -123,8 +123,8 @@
@z
@x
- at d max_refs 20000 /* number of cross-references; must be less than 65536 */
- at d max_scraps 2000 /* number of tokens in \CEE/ texts being parsed */
+ at d max_refs 30000 /* number of cross-references; must be less than 65536 */
+ at d max_scraps 5000 /* number of tokens in \CEE/ texts being parsed */
@y
@d max_refs 65535 /* number of cross-references; must be less than 65536 */
@d max_scraps 5000 /* number of tokens in \CEE/ texts being parsed */
@@ -146,9 +146,9 @@
@z
@x
- at d max_toks 20000 /* number of symbols in \CEE/ texts being parsed;
+ at d max_toks 30000 /* number of symbols in \CEE/ texts being parsed;
must be less than 65536 */
- at d max_texts 4000 /* number of phrases in \CEE/ texts being parsed;
+ at d max_texts 8000 /* number of phrases in \CEE/ texts being parsed;
must be less than 10240 */
@y
@d max_toks 65535 /* number of symbols in \CEE/ texts being parsed;
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctwimac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctwimac.tex 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctwimac.tex 2022-03-01 02:03:00 UTC (rev 874)
@@ -460,7 +460,7 @@
\def\I{\par\hangindent 2em}\let\*=*
\readsections}
\def\readsections{\input \jobname.sscn}
-\def\datethis{}
+\def\datethis{} \def\datecontentspage{}
% To produce only a subset of pages, put the page numbers on separate
% lines in a file called pages.tex
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -20,12 +20,12 @@
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
- at d banner "This is CWEAVE (Version 4.5)"
+ at d banner "This is CWEAVE (Version 4.7)"
@y
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
- at d banner "This is CWEAVE (Version 4.5pc/big)"
+ at d banner "This is CWEAVE (Version 4.7pc/big)"
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-man.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-man.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-man.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -16,7 +16,7 @@
}
@y
\def\botofcontents{\vfill\titlefalse}
-\def\contentspagenumber{108}
+\def\contentspagenumber{109}
\def\title{APPENDIX F: CWEAVE}
\let\K=\leftarrow
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-pc.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-pc.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-pc.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -11,18 +11,18 @@
change files that have -bs in their name instead of -pc.)
@x section 1
- at d banner "This is CWEAVE (Version 4.5)"
+ at d banner "This is CWEAVE (Version 4.7)"
@y
- at d banner "This is CWEAVE (Version 4.5pc)"
+ at d banner "This is CWEAVE (Version 4.7pc)"
@z
@x section 17
- at d max_bytes 90000 /* the number of bytes in identifiers,
+ at d max_bytes 100000 /* the number of bytes in identifiers,
@y
@d max_bytes (unsigned)60000 /* the number of bytes in identifiers,
@z
@x
- at d max_refs 20000 /* number of cross-references; must be less than 65536 */
+ at d max_refs 30000 /* number of cross-references; must be less than 65536 */
@y
@d max_refs 10000 /* number of cross-references; must be less than 65536 */
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-ql.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-ql.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-ql.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -7,15 +7,15 @@
@x
-\def\title{CWEAVE (Version 4.5)}
+\def\title{CWEAVE (Version 4.7)}
@y
-\def\title{CWEAVE (QL Version 4.5)}
+\def\title{CWEAVE (QL Version 4.7)}
@z
@x section 1
- at d banner "This is CWEAVE (Version 4.5)"
+ at d banner "This is CWEAVE (Version 4.7)"
@y
- at d banner "This is CWEAVE (QL Version 4.5)"
+ at d banner "This is CWEAVE (QL Version 4.7)"
@z
@x
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-vms.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-vms.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-vms.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -13,9 +13,9 @@
(also modified by Don Knuth to keep version numbers uptodate)
@x section 1 (01-FEB-1992 ST)
- at d banner "This is CWEAVE (Version 4.5)"
+ at d banner "This is CWEAVE (Version 4.7)"
@y
- at d banner "This is CWEAVE (VAX/VMS Version 4.5)"
+ at d banner "This is CWEAVE (VAX/VMS Version 4.7)"
@z
@x section 4 (01-FEB-1992 ST)
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -17,15 +17,15 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
@x
-\def\title{CWEAVE (Version 4.5)}
+\def\title{CWEAVE (Version 4.7)}
@y
-\def\title{CWEAVE (Version 4.5 [\TeX~Live])}
+\def\title{CWEAVE (Version 4.7 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.7)}
@y
- \centerline{(Version 4.5 [\TeX~Live])}
+ \centerline{(Version 4.7 [\TeX~Live])}
@z
@x
@@ -41,9 +41,9 @@
@z
@x
- at d banner "This is CWEAVE (Version 4.5)"
+ at d banner "This is CWEAVE (Version 4.7)"
@y
- at d banner "This is CWEAVE, Version 4.5"
+ at d banner "This is CWEAVE, Version 4.7"
/* will be extended by the \TeX~Live |versionstring| */
@z
@@ -60,8 +60,8 @@
@z
@x
- at d max_refs 20000 /* number of cross-references; must be less than 65536 */
- at d max_scraps 2000 /* number of tokens in \CEE/ texts being parsed */
+ at d max_refs 30000 /* number of cross-references; must be less than 65536 */
+ at d max_scraps 5000 /* number of tokens in \CEE/ texts being parsed */
@y
@d max_refs 65535 /* number of cross-references; must be less than 65536 */
@d max_scraps 5000 /* number of tokens in \CEE/ texts being parsed */
@@ -74,9 +74,9 @@
@z
@x
- at d max_toks 20000 /* number of symbols in \CEE/ texts being parsed;
+ at d max_toks 30000 /* number of symbols in \CEE/ texts being parsed;
must be less than 65536 */
- at d max_texts 4000 /* number of phrases in \CEE/ texts being parsed;
+ at d max_texts 8000 /* number of phrases in \CEE/ texts being parsed;
must be less than 10240 */
@y
@d max_toks 65535 /* number of symbols in \CEE/ texts being parsed;
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-w32.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-w32.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-w32.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,9 +2,9 @@
(Contributed by Fabrice Popineau, February 2002)
@x section 1
- at d banner "This is CWEAVE (Version 4.5)"
+ at d banner "This is CWEAVE (Version 4.7)"
@y
- at d banner "This is CWEAVE (Version 4.5win32)"
+ at d banner "This is CWEAVE (Version 4.7win32)"
@z
@x
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweave.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweave.w 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweave.w 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.7 --- February 2022
% Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -32,11 +32,11 @@
\def\skipxTeX{\\{skip\_\TEX/}}
\def\copyxTeX{\\{copy\_\TEX/}}
-\def\title{CWEAVE (Version 4.5)}
+\def\title{CWEAVE (Version 4.7)}
\def\topofcontents{\null\vfill
\centerline{\titlefont The {\ttitlefont CWEAVE} processor}
\vskip 15pt
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.7)}
\vfill}
\def\botofcontents{\vfill
\noindent
@@ -67,7 +67,7 @@
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
- at d banner "This is CWEAVE (Version 4.5)"
+ at d banner "This is CWEAVE (Version 4.7)"
@c
@<Include files@>@/
@@ -82,7 +82,7 @@
data, then it inputs the source once again and produces the \TEX/ output
file, finally it sorts and outputs the index.
-Please read the documentation for \.{common}, the set of routines common
+Please read the documentation for \.{COMMON}, the set of routines common
to \.{CTANGLE} and \.{CWEAVE}, before proceeding further.
@c
@@ -111,13 +111,13 @@
@i common.h
-@ The following parameters were sufficient in the original \.{WEAVE} to
-handle \TEX/, so they should be sufficient for most applications of \.{CWEAVE}.
+@ The following parameters are sufficient to handle \TEX/ (converted to
+\.{CWEB}), so they should be sufficient for most applications of \.{CWEAVE}.
@d line_length 80 /* lines of \TEX/ output have at most this many characters;
should be less than 256 */
- at d max_refs 20000 /* number of cross-references; must be less than 65536 */
- at d max_scraps 2000 /* number of tokens in \CEE/ texts being parsed */
+ at d max_refs 30000 /* number of cross-references; must be less than 65536 */
+ at d max_scraps 5000 /* number of tokens in \CEE/ texts being parsed */
@* Data structures exclusive to {\tt CWEAVE}.
As explained in \.{common.w}, the field of a |name_info| structure
@@ -335,9 +335,9 @@
unused location of |tok_start| is called |text_ptr|.
Thus, we usually have |*text_ptr==tok_ptr|.
- at d max_toks 20000 /* number of symbols in \CEE/ texts being parsed;
+ at d max_toks 30000 /* number of symbols in \CEE/ texts being parsed;
must be less than 65536 */
- at d max_texts 4000 /* number of phrases in \CEE/ texts being parsed;
+ at d max_texts 8000 /* number of phrases in \CEE/ texts being parsed;
must be less than 10240 */
@<Private...@>=
@@ -600,8 +600,8 @@
@<Special control codes for debugging@>@;
@ Users can write
-\.{@@2}, \.{@@1}, and \.{@@0} to turn tracing fully on, partly on,
-and off, respectively.
+\.{@@2}, \.{@@1}, and \.{@@0} to turn tracing |fully| on, |partly| on,
+and |off|, respectively.
@<Special control codes...@>=
ccode['0']=ccode['1']=ccode['2']=trace;
@@ -1838,7 +1838,7 @@
@ This code allows \.{CWEAVE} to display its parsing steps.
- at d print_cat(c) fputs(cat_name[c],stdout)
+ at d print_cat(c) fputs(cat_name[c],stdout) /* symbolic printout of a category */
@ The token lists for translated \TEX/ output contain some special control
symbols as well as ordinary characters. These control symbols are
@@ -2316,7 +2316,18 @@
tokens, and intercalates a `\.{\$}' token if necessary. When in
doubt what to use, use |big_app|.
-The |mathness| is an attribute of scraps that says whether they are
+ at d app(a) *(tok_ptr++)=(token)(a)
+ at d big_app2(a) big_app1(a);@+big_app1(a+1)
+ at d big_app3(a) big_app2(a);@+big_app1(a+2)
+ at d big_app4(a) big_app3(a);@+big_app1(a+3)
+ at d big_app1_insert(p,c) big_app1(p);@+big_app(c);@+big_app1(p+1)
+
+@<Predecl...@>=
+static void app_str(const char *);@/
+static void big_app(token);@/
+static void big_app1(scrap_pointer);
+
+@ The |mathness| is an attribute of scraps that says whether they are
to be printed in a math mode context or not. It is separate from the
``part of speech'' (the |cat|) because to make each |cat| have
a fixed |mathness| (as in the original \.{WEAVE}) would multiply the
@@ -2333,29 +2344,19 @@
or followed by a~\.{\$}. The left boundary is |maybe_math| if and
only if the right boundary is.
-The code below is an exact translation of the production rules into
-\CEE/, using such macros, and the reader should have no difficulty
-understanding the format by comparing the code with the symbolic
-productions as they were listed earlier.
-
@d no_math 2 /* should be in horizontal mode */
@d yes_math 1 /* should be in math mode */
@d maybe_math 0 /* works in either horizontal or math mode */
- at d big_app2(a) big_app1(a);@+big_app1(a+1)
- at d big_app3(a) big_app2(a);@+big_app1(a+2)
- at d big_app4(a) big_app3(a);@+big_app1(a+3)
- at d big_app1_insert(p,c) big_app1(p);@+big_app(c);@+big_app1(p+1)
- at d app(a) *(tok_ptr++)=(token)(a)
@<Private...@>=
static int cur_mathness, init_mathness;
-@ @<Predecl...@>=
-static void app_str(const char *);@/
-static void big_app(token);@/
-static void big_app1(scrap_pointer);
+@ The code below is an exact translation of the production rules into
+\CEE/, using such macros, and the reader should have no difficulty
+understanding the format by comparing the code with the symbolic
+productions as they were listed earlier.
-@ @c
+ at c
static void
app_str(
const char *s)
@@ -3764,7 +3765,7 @@
} output_state;
typedef output_state *stack_pointer;
-@ @d stack_size 400 /* number of simultaneous output levels */
+@ @d stack_size 2000 /* number of simultaneous output levels */
@d cur_end cur_state.end_field /* current ending location in |tok_mem| */
@d cur_tok cur_state.tok_field /* location of next output token in |tok_mem| */
@d cur_mode cur_state.mode_field /* current mode of interpretation */
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,8 +1,8 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.5 --- October 2021
+% Version 4.7--- January 2022
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+CWEB4.5}
-\chardef\cwebversion=4 \chardef\cwebrevision=5
+\xdef\fmtversion{\fmtversion+CWEB4.7}
+\chardef\cwebversion=4 \chardef\cwebrevision=7
\newif\ifpdf
\ifx\pdf+\pdftrue\fi
% Uncomment the following line if you want PDF goodies to be the default
@@ -16,7 +16,10 @@
\def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
\def\Blue{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
\fi\fi
+\newif\ifhint
+\ifx\HINTversion\undefined \hintfalse \else \hinttrue \fi
\newif\ifacro \ifpdf\acrotrue\fi \ifpdftex\acrotrue\fi
+\newif\ifacrohint \ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi
\let\:=\. % preserve a way to get the dot accent
% (all other accents will still work as usual)
@@ -67,7 +70,7 @@
tangles as \tentex "#2"\egroup\par}
\def\noATL#1 #2 {}
\def\noatl{\let\ATL=\noATL} % suppress output from @l
-\def\ATH{{\acrofalse\X\kern-.5em:Preprocessor definitions\X}}
+\def\ATH{{\acrohintfalse\X\kern-.5em:Preprocessor definitions\X}}
\let\PB=\relax % hook for program brackets |...| in TeX part or section name
\chardef\AM=`\& % ampersand character in a string
@@ -127,7 +130,7 @@
\def\?{\mathrel?}
\def\,{\relax\ifmmode\mskip\thinmuskip\else\thinspace\fi}
\def\note#1#2.{\Y\noindent{\hangindent2em%
- \baselineskip10pt\eightrm#1~\ifacro{\pdfnote#2.}\else#2\fi.\par}}
+ \baselineskip10pt\eightrm#1~\ifacrohint{\pdfnote#2.}\else#2\fi.\par}}
\newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD
\newtoks\toksE \newtoks\toksF \newtoks\usersanitizer
@@ -148,39 +151,6 @@
\special{pdf: ec}}\special{pdf: ann width \thewidth height \theheight
depth \thedepth << /Type /Annot /Subtype /Link
/Border [0 0 0] /A << /S /GoTo /D (#2) >> >>}\box0\relax}\fi
-\def\pdfnote#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}\maketoks}\the\toksA}
-\def\firstsecno#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}%
- \def\makenote{\addtokens\toksB{\the\toksC}\def\makenote{\toksD={}
- \toksC={}\let\space\empty}\makenote}\maketoks}}
-\def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
-\def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}%
- \ifcat\noexpand\first0\countB=`#1\else\countB=0\fi\toksA={#2}}
-\def\maketoks{\expandafter\poptoks\the\toksA|ENDTOKS|%
- \ifnum\countB>`9 \countB=0 \fi
- \ifnum\countB<`0
- \ifnum0=\countC\else\makenote\fi
- \ifx\first.\let\next=\maketoksdone\else
- \let\next=\maketoks
- \addtokens\toksB{\the\toksD}
- \ifx\first,\addtokens\toksB{\space}\fi
- \fi
- \else \addtokens\toksC{\the\toksD}\global\countC=1\let\next=\maketoks
- \fi
- \next
-}
-\def\makenote{\addtokens\toksB
- {\noexpand\pdflink{\the\toksC}{\romannumeral\the\toksC}}\toksC={}\global\countC=0}
-\def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
-\def\pdfURL#1#2{\ifpdftex\pdfannotlink height\ht\strutbox depth\dp\strutbox
- attr {/Border [0 0 0]} user { /Type /Action /Subtype /Link /A
- << /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69
- \else \ifpdf{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
- \special{pdf: ec}}\special{pdf: ann width \thewidth\space height \theheight
- \space depth \thedepth\space << /Border [0 0 0]
- /Type /Action /Subtype /Link /A << /S /URI /URI (#2) >> >>}\box0\relax}%
- \else #1 ({\tt#2})\fi\fi}
-{\catcode`\~=12 \gdef\TILDE/{~}} % ~ in a URL
-{\catcode`\_=12 \gdef\UNDER/{_}} % _ in a URL
\def\sanitizecommand#1#2{\addtokens\usersanitizer
{\noexpand\dosanitizecommand\noexpand#1{#2}}}
\def\dosanitizecommand#1#2{\ifx\nxt#1\addF{#2}\fi}
@@ -235,7 +205,7 @@
\else\ifx\nxt\_\ifTnum\addF{E}\else\addF_\fi % 0.1E5->\T{0.1\_5}
\else\ifx\nxt\^\ifTnum\addF{0x}\else\addF^\fi % 0x77 -> \T{\^77}
\else\ifx\nxt\\\\\ifTnum\addF{0b}\else\addF\\\fi % 0b10111 -> \T{\\10111}
- \else\ifx\nxt\$\ifTnum\tokprocessedtrue\else\addF$\fi % \T{77\$L}
+ \else\ifx\nxt\$\ifTnum\tokprocessedtrue\else\addF$\fi %$% \T{77\$L}
\else\ifx\nxt\{\addF\lbchar \else\ifx\nxt\}\addF\rbchar
\else\ifx\nxt\ \addF\space \else\ifx\nxt\#\addF{\string\#}%
\else\ifx\nxt\PP\addF{++}\else\ifx\nxt\MM\addF{--}%
@@ -281,9 +251,64 @@
\outlinest\let\outlinedone=\relax}
\fi % End of pdf macros
+\ifhint
+% The following uses HINT primitives to implement:
+% \HINThome to mark the position of the home page
+% \HINTlabel to attach a label to the top of a section
+% \HINTlink to link a section number to the section label
+% \HINTcontents to produce an 'outline' item
+% These are the top level HINT macros that are used in this file
+% No HINT primitives are used directly.
+\def\HINThome{\HINTdest name {HINT.home}%
+ \HINToutline goto name {HINT.home} depth 1 {Table of Contents}}
+\def\HINTlabel{{\let\*=\empty\HINTdest num \secstar top}}
+\def\HINTlink#1#2{\HINTstartlink goto num #1 {#1}\HINTendlink}% #2 not used ???
+\def\HINTcontents#1#2#3{\HINToutline goto num #3 depth #2 {#1}}
+\let\pdflink=\HINTlink
+\fi % End of HINT macros
+
+% Common macros for \ifacro and \ifhint
+\ifacrohint
+\def\pdfnote#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}\maketoks}\the\toksA}
+\def\firstsecno#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}%
+ \def\makenote{\addtokens\toksB{\the\toksC}\def\makenote{\toksD={}
+ \toksC={}\let\space\empty}\makenote}\maketoks}}
+\def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
+\def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}%
+ \ifcat\noexpand\first0\countB=`#1\else\countB=0\fi\toksA={#2}}
+\def\maketoks{\expandafter\poptoks\the\toksA|ENDTOKS|%
+ \ifnum\countB>`9 \countB=0 \fi
+ \ifnum\countB<`0
+ \ifnum0=\countC\else\makenote\fi
+ \ifx\first.\let\next=\maketoksdone\else
+ \let\next=\maketoks
+ \addtokens\toksB{\the\toksD}
+ \ifx\first,\addtokens\toksB{\space}\fi
+ \fi
+ \else \addtokens\toksC{\the\toksD}\global\countC=1\let\next=\maketoks
+ \fi
+ \next
+}
+\def\makenote{\addtokens\toksB
+ {\noexpand\pdflink{\the\toksC}{\romannumeral\the\toksC}}\toksC={}\global\countC=0}
+\def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
+\fi % End of common macros
+
+\def\pdfURL#1#2{\ifpdftex\pdfannotlink height\ht\strutbox depth\dp\strutbox
+ attr {/Border [0 0 0]} user { /Type /Action /Subtype /Link /A
+ << /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69
+ \else \ifpdf{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
+ \special{pdf: ec}}\special{pdf: ann width \thewidth\space height \theheight
+ \space depth \thedepth\space << /Border [0 0 0]
+ /Type /Action /Subtype /Link /A << /S /URI /URI (#2) >> >>}\box0\relax}%
+ \else #1 ({\tt#2})\fi\fi}
+{\catcode`\~=12 \gdef\TILDE/{~}} % ~ in a URL
+{\catcode`\_=12 \gdef\UNDER/{_}} % _ in a URL
+
\def\lapstar{\rlap{*}}
\def\stsec{\rightskip=0pt % get out of C mode (cf. \B)
\sfcode`;=1500 \pretolerance 200 \hyphenpenalty 50 \exhyphenpenalty 50
+ \ifhint\HINTlabel\fi% Start page before section
\noindent{\let\*=\lapstar\bf\secstar.\quad}%
\ifacro \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty
\ifpdftex \pdfdest num \secstar fith%
@@ -311,7 +336,7 @@
\let\G=\ge % greater than or equal sign
% \H is long Hungarian umlaut accent
\let\I=\ne % unequal sign
-\def\J{\.{@\&}} % TANGLE's join operation
+\def\J{\.{@\&}} % CTANGLE's join operation
\let\K== % assignment operator
%\let\K=\leftarrow % "honest" alternative to standard assignment operator
% \L is Polish letter suppressed-L
@@ -345,12 +370,12 @@
\let\R=\lnot % logical not
% \S is section sign
\def\T#1{\leavevmode % octal, hex or decimal constant
- \hbox{$\def\?{\kern.2em}%
+ \hbox{$\def\?{\kern.2em}%$%
\let\ \, % C++ digit separator becomes a little white space
% \def\$##1{\egroup_{\,\rm##1}\bgroup}% suffix to constant % versions < 3.67
\def\$##1{\egroup_{\rm##1}\bgroup}% suffix to constant % in version 3.67
\def\_{\cdot 10^{\aftergroup}}% power of ten (via dirty trick)
- \let\~=\oct \let\^=\hex \let\\=\bin {#1}$}}
+ \let\~=\oct \let\^=\hex \let\\=\bin {#1}$}}%$%
\def\U{\note{This code is used in section}} % xref for use of a section
\def\Us{\note{This code is used in sections}} % xref for uses of a section
\let\V=\lor % logical or
@@ -357,7 +382,7 @@
\let\W=\land % logical and
\def\X#1:#2\X{\ifmmode\gdef\XX{\null$\null}\else\gdef\XX{}\fi %$% section name
\XX$\langle\,${\let\I=\ne#2\eightrm\kern.5em
- \ifacro{\pdfnote#1.}\else#1\fi}$\,\rangle$\XX}
+ \ifacrohint{\pdfnote#1.}\else#1\fi}$\,\rangle$\XX}
\def\Y{\par\yskip}
\let\Z=\le
\let\ZZ=\let % now you can \write the control sequence \ZZ
@@ -451,7 +476,9 @@
\vsize=\pageheight \advance\vsize by -\ht\sbox % the remaining height
\hsize=.5\pagewidth \advance\hsize by -10pt
% column width for the index (20pt between cols)
+ \ifhint\else
\parfillskip 0pt plus .6\hsize % try to avoid almost empty lines
+ \fi
\def\lr{L} % this tells whether the left or right column is next
\output{\if L\lr\global\setbox\lbox=\page \gdef\lr{R}
\else\normaloutput{\vbox to\pageheight{\box\sbox\vss
@@ -460,7 +487,7 @@
\message{Index:}
\parskip 0pt plus .5pt
\outer\def\I##1, ##2.{\par\hangindent2em\noindent##1:\kern1em
- \ifacro\pdfnote##2.\else##2\fi.} % index entry
+ \ifacrohint\pdfnote##2.\else##2\fi.} % index entry
\def\[##1]{$\underline{##1}$} % underlined index item
\rm \rightskip0pt plus 2.5em \tolerance 10000 \let\*=\lapstar
\hyphenpenalty 10000 \parindent0pt
@@ -475,7 +502,7 @@
\message{Section names:}
\output={\normaloutput\page\lheader\rheader}
\setpage
- \def\note##1##2.{\quad{\eightrm##1~\ifacro{\pdfnote##2.}\else{##2}\fi.}}
+ \def\note##1##2.{\quad{\eightrm##1~\ifacrohint{\pdfnote##2.}\else{##2}\fi.}}
\def\Q{\note{Cited in section}} % crossref for mention of a section
\def\Qs{\note{Cited in sections}} % crossref for mentions of a section
\def\U{\note{Used in section}} % crossref for use of a section
@@ -512,8 +539,9 @@
\pageno=\contentspagenumber
\def\grouptitle{TABLE OF CONTENTS}
\message{Table of contents:}
+ \ifhint\HINThome\fi% Mark the Table of contents as home page
\topofcontents \startpdf
- \line{\hfil Section\hbox to3em{\hss Page}}
+ \line{\hfil Section\ifhint\else\hbox to3em{\hss Page}\fi}% No Page in HINT
\let\ZZ=\contentsline
\readcontents\relax % read the contents info
\botofcontents \end} % print the contents page(s) and terminate
@@ -520,7 +548,11 @@
\def\contentsline#1#2#3#4#5{\ifnum#2=0 \smallbreak\fi
\line{\consetup{#2}#1
\rm\leaders\hbox to .5em{.\hfil}\hfil
- \ \ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi\hbox to3em{\hss#4}}}
+ \ \ifhint
+ \HINTlink{#3}{\romannumeral#3}% No page numbers in HINT
+ \HINTcontents{#1}{#2}{#3}%
+ \else\ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi
+ \hbox to3em{\hss#4}\fi}}
\def\consetup#1{\ifcase#1 \bf % depth -1 (@**)
\or % depth 0 (@*)
\or \hskip2em % depth 1 (@*1)
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -18,7 +18,7 @@
@x
\input cwebmac
-\acrofalse\pdffalse\pdftexfalse
+\acrofalse\pdffalse\pdftexfalse\hintfalse\acrohintfalse
@y
\input cwebmac
@z
@@ -93,17 +93,17 @@
@z
@x
-\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.5)}
+\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.7)}
@y
\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}}
-\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.5 [\TeX~Live])}
+\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.7 [\TeX~Live])}
@z
@x
-\vskip 18pt\centerline{(Version 4.5 --- July 2021)}
+\vskip 18pt\centerline{(Version 4.7 --- February 2022)}
@y
-\vskip 18pt\centerline{(Version 4.5 --- July 2021)%
-\footnote*{This document describes the extended \.{CWEB} (Version 4.5 [\TeX~Live]).}}
+\vskip 18pt\centerline{(Version 4.7 --- February 2022)%
+\footnote*{This document describes the extended \.{CWEB} (Version 4.7 [\TeX~Live]).}}
@z
@x
@@ -144,7 +144,7 @@
it cannot find them in the current directory.%
\cwebfootnote{\acrofalse In this extended implementation, if an \.{@i}nclude
file can not be found in the current directory, \.{CWEB} will use the
-conventions of the \Kpathsea/ library as outlined in section~\X91:File lookup
+conventions of the \Kpathsea/ library as outlined in section~\X93:File lookup
with \Kpathsea/\X~of \pdfURL{appendix~D}{common-changes.pdf} to look for it.
% FIXME
(This is true for any other input or change file lookup.)}
@@ -172,7 +172,7 @@
\option c Check temporary output files for changes. (Off by default.)
\hfil\vskip\normallineskip
\option d Set the debugging variable \\{kpathsea\_debug} to the numeric
-value $N\in[0,127]$ of this option. See section~93 % FIXME
+value $N\in[0,127]$ of this option. See section~95 % FIXME
of \pdfURL{appendix~D}{common-changes.pdf} for details.
\hfil\vskip\normallineskip
\option i Indent parameters in function declarations. (On by default;
@@ -220,10 +220,10 @@
the program sources at \.{ftp://ftp.cs.stanford.edu/pub/ctwill}.
@y
the program sources at
-\pdfURL{\.{ftp://ftp.cs.stanford.edu/pub/ctwill}}%
- {ftp://ftp.cs.stanford.edu/pub/ctwill}.%
-\cwebfootnote{\TeX~Live comes with an up-to-date \.{ctwill} executable -- and
-its associated helpers -- out of the box.}
+\pdfURL{\.{http://ftp.cs.stanford.edu/pub/ctwill}}%
+ {http://ftp.cs.stanford.edu/pub/ctwill}.%
+\cwebfootnote{\TeX~Live comes with an up-to-date
+\.{ctwill} executable -- and its associated helpers -- out of the box.}
@z
@x
@@ -313,9 +313,9 @@
@z
@x
- \.{ { }\\vskip 15pt \\centerline\{(Version 4.5)\}{ }\\vfill\}}\cr}$$
+ \.{ { }\\vskip 15pt \\centerline\{(Version 4.7)\}{ }\\vfill\}}\cr}$$
@y
- \.{ { }\\vskip 15pt \\centerline\{(Version 4.5)\}{ }\\vfill\}}\cr}$$
+ \.{ { }\\vskip 15pt \\centerline\{(Version 4.7)\}{ }\\vfill\}}\cr}$$
@z
@x
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,7 +2,7 @@
\def\tangref{3} % where the main explanation of CTANGLing is given
\input cwebmac
-\acrofalse\pdffalse\pdftexfalse
+\acrofalse\pdffalse\pdftexfalse\hintfalse\acrohintfalse
\def\page{\box255 } \normalbottom
\parskip 0pt plus 1pt
\def\RA{\char'31 } % right arrow
@@ -35,7 +35,7 @@
\def\lheader{\mainfont\the\pageno\hfill\sc\runninghead\hfill}
\def\rheader{\hfill\sc\runninghead\hfill\mainfont\the\pageno}
-\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.5)}
+\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.7)}
% This verbatim mode assumes that ! marks are !! in the text being copied.
\def\verbatim{\begingroup
@@ -49,7 +49,7 @@
\null\vfill
\centerline{\titlefont The {\ttitlefont CWEB} System of
Structured Documentation}
-\vskip 18pt\centerline{(Version 4.5 --- July 2021)}
+\vskip 18pt\centerline{(Version 4.7 --- February 2022)}
\vskip 24pt
\centerline{\authorfont Donald E. Knuth and Silvio Levy}
\vfill
@@ -889,8 +889,8 @@
matching purposes.
\more This dual-input feature is useful when working with a master \.{CWEB}
-file that has been received from elsewhere (e.g., \.{tangle.w} or
-\.{weave.w} or \.{tex.web}), when changes are desirable to customize the
+file that has been received from elsewhere (e.g., \.{ctangle.w} or
+\.{cweave.w} or \.{ctex.w}), when changes are desirable to customize the
program for your local computer system. You will be able to debug your
system-dependent changes without clobbering the master web file; and once
your changes are working, you will be able to incorporate them readily
@@ -1166,6 +1166,11 @@
And a third way to create PDF output from \.{CWEB} input is to say
`\.{xetex}~\.{cob}'.
+Similar output for ``smart'' devices can be created with Martin Ruckert's
+Hi\TeX\ and its dynamic \.{HINT} format; just say `\.{hitex}~\.{cob}'.
+\.{HINT} files can be viewed with the \.{hintview} program, which is available
+for {\mc GNU}/Linux, {\mc MS}~Windows, and Android.
+
A more elaborate system called \.{CTWILL}, which extends the usual cross
references of \.{CWEAVE} by preparing links from the uses of identifiers
to their definitions, is also available---provided that you are willing
@@ -1241,7 +1246,7 @@
if (!!input_ln(change_file)) return;
if (limit<buffer+2) continue;
if (buffer[0]!!='@@') continue;
- if (xisupper(buffer[1])) buffer[1]=tolower((eight_bits)buffer[1]);
+ if (xisupper(buffer[1])) buffer[1]=tolower((int)buffer[1]);
if (buffer[1]=='x') break;
if (buffer[1]=='y' || buffer[1]=='z' || buffer[1]=='i') {
loc=buffer+2;
@@ -1293,7 +1298,7 @@
if(!!input_ln(change_file))return;
if(limit<buffer+2)continue;
if(buffer[0]!!='@')continue;
-if(xisupper(buffer[1]))buffer[1]= tolower((eight_bits)buffer[1]);
+if(xisupper(buffer[1]))buffer[1]= tolower((int)buffer[1]);
if(buffer[1]=='x')break;
if(buffer[1]=='y'||buffer[1]=='z'||buffer[1]=='i'){
loc= buffer+2;
@@ -1385,7 +1390,7 @@
\&{if} ${}(\\{buffer}[\T{0}]\I\.{'@'}){}$\1\5
\&{continue};\2\6
\&{if} (\\{xisupper}(\\{buffer}[\T{1}]))\1\5
-${}\\{buffer}[\T{1}]\K\\{tolower}{}$((\&{eight\_bits}) \\{buffer}[\T{1}]);\2\6
+${}\\{buffer}[\T{1}]\K\\{tolower}{}$((\&{int}) \\{buffer}[\T{1}]);\2\6
\&{if} ${}(\\{buffer}[\T{1}]\E\.{'x'}){}$\1\5
\&{break};\2\6
\&{if} ${}(\\{buffer}[\T{1}]\E\.{'y'}\V\\{buffer}[\T{1}]\E\.{'z'}\V\\{buffer}[%
@@ -1592,7 +1597,7 @@
\.{ { }\\titlefalse \% include headline on the contents page}\cr
\.{ { }\\def\\rheader\{\\mainfont The \{\\tt CWEAVE\}{ }processor\\hfil\}}\cr
\.{ { }\\centerline\{\\titlefont The \{\\ttitlefont CWEAVE\}{ }processor\}}\cr
- \.{ { }\\vskip 15pt \\centerline\{(Version 4.5)\}{ }\\vfill\}}\cr}$$
+ \.{ { }\\vskip 15pt \\centerline\{(Version 4.7)\}{ }\\vfill\}}\cr}$$
Redefining \.{\\rheader}, which is the headline for right-hand pages,
suffices in this case to put the desired information at the top of the
contents page.
@@ -1600,8 +1605,8 @@
\point 9. Data for the table of contents is written to a file that
is read after the indexes have been \TEX/ed; there's one line of data
for every starred section. The file \.{common.toc} might look like this:
-$$\lpile{\.{\\ZZ \{Introduction\}\{0\}\{1\}\{28\}\{\}}\cr
- \.{\\ZZ \{The character set\}\{2\}\{5\}\{29\}\{\}}\cr}$$
+$$\lpile{\.{\\ZZ \{Introduction\}\{0\}\{1\}\{29\}\{\}}\cr
+ \.{\\ZZ \{The character set\}\{1\}\{21\}\{35\}\{\}}\cr}$$
and so on. The \.{\\topofcontents} macro could
redefine \.{\\ZZ} so that the information appears in any desired format.
(See also point~19 below.)
Modified: branches/stable/source/src/texk/web2c/cwebdir/po/cweb-tl.pot
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/cweb-tl.pot 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/cweb-tl.pot 2022-03-01 02:03:00 UTC (rev 874)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: CWEBbin 2021\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-06 11:08+0200\n"
+"POT-Creation-Date: 2021-12-25 14:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,11 +17,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: comm-texlive.ch:531
+#: comm-texlive.ch:547
#, c-format
msgid ""
"\n"
-"Email bug reports to %s.\n"
+"\nPackage home page: %s.\n"
msgstr ""
#: comm-texlive.ch:511
@@ -30,15 +30,15 @@
msgstr ""
#: ctang-texlive.ch:39
-msgid "This is CTANGLE, Version 4.5"
+msgid "This is CTANGLE, Version 4.7"
msgstr ""
#: ctwill-texlive.ch:39
-msgid "This is CTWILL, Version 4.5"
+msgid "This is CTWILL, Version 4.7"
msgstr ""
#: cweav-texlive.ch:39
-msgid "This is CWEAVE, Version 4.5"
+msgid "This is CWEAVE, Version 4.7"
msgstr ""
#: comm-texlive.ch:512
Modified: branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot 2022-03-01 02:03:00 UTC (rev 874)
@@ -523,15 +523,15 @@
msgstr ""
#: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CTANGLE (Version 4.7 [CWEBbin 2022.1])"
msgstr ""
#: cweav-twill.ch:61
-msgid "This is CTWILL (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CTWILL (Version 4.7 [CWEBbin 2022.1])"
msgstr ""
#: cweav-i18n.ch:17 cweav-twill.ch:42
-msgid "This is CWEAVE (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CWEAVE (Version 4.7 [CWEBbin 2022.1])"
msgstr ""
#: cweav-i18n.ch:301 cweav-i18n.ch:309
Modified: branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb-tl.po
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb-tl.po 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb-tl.po 2022-03-01 02:03:00 UTC (rev 874)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: CWEBbin 2021\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-06 11:08+0200\n"
-"PO-Revision-Date: 2021-06-06 11:09+0200\n"
+"POT-Creation-Date: 2021-12-25 14:12+0100\n"
+"PO-Revision-Date: 2021-12-25 14:13+0100\n"
"Last-Translator: Andreas Scherer <andreas_github at freenet.de>\n"
"Language-Team: German\n"
"Language: de\n"
@@ -22,9 +22,10 @@
msgid ""
"\n"
"Email bug reports to %s.\n"
+"\nPackage home page: %s.\n"
msgstr ""
"\n"
-"Sende Fehler per Email an %s.\n"
+"Weitergehende Informationen auf %s.\n"
#: comm-texlive.ch:511
#, c-format
@@ -32,16 +33,16 @@
msgstr "%s: Benötige ein bis drei Dateiargumente.\n"
#: ctang-texlive.ch:39
-msgid "This is CTANGLE, Version 4.5"
-msgstr "Dies ist CTANGLE, Version 4.5"
+msgid "This is CTANGLE, Version 4.7"
+msgstr "Dies ist CTANGLE, Version 4.7"
#: ctwill-texlive.ch:39
-msgid "This is CTWILL, Version 4.5"
-msgstr "Dies ist CTWILL, Version 4.5"
+msgid "This is CTWILL, Version 4.7"
+msgstr "Dies ist CTWILL, Version 4.7"
#: cweav-texlive.ch:39
-msgid "This is CWEAVE, Version 4.5"
-msgstr "Dies ist CWEAVE, Version 4.5"
+msgid "This is CWEAVE, Version 4.7"
+msgstr "Dies ist CWEAVE, Version 4.7"
#: comm-texlive.ch:512
#, c-format
Modified: branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po 2022-03-01 02:03:00 UTC (rev 874)
@@ -603,16 +603,16 @@
msgstr "Sortieren:"
#: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Dies ist CTANGLE (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CTANGLE (Version 4.7 [CWEBbin 2022.1])"
+msgstr "Dies ist CTANGLE (Version 4.7 [CWEBbin 2022.1])"
#: cweav-twill.ch:61
-msgid "This is CTWILL (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Dies ist CTWILL (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CTWILL (Version 4.7 [CWEBbin 2022.1])"
+msgstr "Dies ist CTWILL (Version 4.7 [CWEBbin 2022.1])"
#: cweav-i18n.ch:17 cweav-twill.ch:42
-msgid "This is CWEAVE (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Dies ist CWEAVE (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CWEAVE (Version 4.7 [CWEBbin 2022.1])"
+msgstr "Dies ist CWEAVE (Version 4.7 [CWEBbin 2022.1])"
#: cweav-i18n.ch:301 cweav-i18n.ch:309
msgid "buffer"
Modified: branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po 2022-03-01 02:03:00 UTC (rev 874)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: CWEBbin 2021\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-06 11:08+0200\n"
-"PO-Revision-Date: 2021-06-06 11:10+0200\n"
+"POT-Creation-Date: 2021-02-06 15:25+0100\n"
+"PO-Revision-Date: 2021-12-25 14:14+0100\n"
"Last-Translator: Andreas Scherer <andreas_github at freenet.de>\n"
"Language-Team: Italian\n"
"Language: it\n"
@@ -598,16 +598,16 @@
msgstr "Ordinamento:"
#: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Questo è CTANGLE (Versione 4.5 [CWEBbin 2021])"
+msgid "This is CTANGLE (Version 4.7 [CWEBbin 2022.1])"
+msgstr "Questo è CTANGLE (Versione 4.7 [CWEBbin 2022.1])"
#: cweav-i18n.ch:17
-msgid "This is CWEAVE (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Questo è CWEAVE (Versione 4.5 [CWEBbin 2021])"
+msgid "This is CWEAVE (Version 4.7 [CWEBbin 2022.1])"
+msgstr "Questo è CWEAVE (Versione 4.7 [CWEBbin 2022.1])"
#: cweav-twill.ch:68
-msgid "This is CTWILL (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Questo è CTWILL (Versione 4.5 [CWEBbin 2021])"
+msgid "This is CTWILL (Version 4.7 [CWEBbin 2022.1])"
+msgstr "Questo è CTWILL (Versione 4.7 [CWEBbin 2022.1])"
#: cweav-i18n.ch:301 cweav-i18n.ch:309
msgid "buffer"
Modified: branches/stable/source/src/texk/web2c/cwebdir/prod-cweave.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/prod-cweave.w 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/prod-cweave.w 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.7 --- February 2022
%
@ Here is a table of all the productions. Each production that
combines two or more consecutive scraps implicitly inserts a {\tt \$}
Modified: branches/stable/source/src/texk/web2c/cwebdir/prod-twill.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/prod-twill.w 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/prod-twill.w 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.7 --- February 2022
%
@ Here is a table of all the productions. Each production that
combines two or more consecutive scraps implicitly inserts a {\tt \$}
Modified: branches/stable/source/src/texk/web2c/cwebdir/prod.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/prod.w 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/prod.w 2022-03-01 02:03:00 UTC (rev 874)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.7 --- February 2022
%
@ Here is a table of all the productions. Each production that
combines two or more consecutive scraps implicitly inserts a {\tt \$}
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebstrings.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebstrings.tex 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebstrings.tex 2022-03-01 02:03:00 UTC (rev 874)
@@ -3,7 +3,7 @@
% first command after `\input german.sty' in your CWEB source.
\def\originalthree{\def\3##1{\hfil\penalty##10\hfilneg}}
-\def\ATH{{\acrofalse\X\kern-.5em:Pr\"aprozessor Definitionen\X}}
+\def\ATH{{\acrohintfalse\X\kern-.5em:Pr\"aprozessor Definitionen\X}}
\def\A{\note{Siehe auch Abschnitt}} % xref for doubly defined section name
\def\As{\note{Siehe auch die Abschnitte}}
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex 2022-03-01 02:03:00 UTC (rev 874)
@@ -46,7 +46,7 @@
\def\postATL#1 #2 {\bf La lettre \\{\uppercase{\char"#1}}
est \string`\string`tanglee\string'\string' en \tentex "#2"\egroup\par}
-\def\ATH{{\acrofalse\X\kern-.5em:D\'efinitions du pr\'eprocesseur\X}}
+\def\ATH{{\acrohintfalse\X\kern-.5em:D\'efinitions du pr\'eprocesseur\X}}
\def\A{\note{Voir aussi la section}} % xref for doubly defined section name
\def\As{\note{Voir aussi les sections}} % xref for multiply defined section name
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex 2022-03-01 02:03:00 UTC (rev 874)
@@ -44,7 +44,7 @@
\def\postATL#1 #2 {\bf lettera \\{\uppercase{\char"#1}}
tangles as \tentex "#2"\egroup\par}
-\def\ATH{{\acrofalse\X\kern-.5em:Definizioni preprocessore\X}}
+\def\ATH{{\acrohintfalse\X\kern-.5em:Definizioni preprocessore\X}}
\def\A{\note{Vedi anche sezione}} % xref for doubly defined section name
\def\As{\note{Vedi anche sezioni}} % xref for multiply defined section name
Modified: branches/stable/source/src/texk/web2c/doc/web2c.info
===================================================================
--- branches/stable/source/src/texk/web2c/doc/web2c.info 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/doc/web2c.info 2022-03-01 02:03:00 UTC (rev 874)
@@ -4,7 +4,7 @@
an implementation of Donald Knuth's TeX system.
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2007, 2008, 2009, 2010-2021 Karl Berry & Olaf Weber.
+2005, 2007, 2008, 2009, 2010-2022 Karl Berry & Olaf Weber.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
@@ -58,7 +58,7 @@
This document describes how to install and use the programs in the Web2c
implementation of the TeX system, especially for Unix systems. It
-corresponds to Web2c version 2021, released in July 2021.
+corresponds to Web2c version 2022, released in January 2022.
* Menu:
@@ -83,15 +83,17 @@
1 Introduction
**************
-This manual corresponds to version 2021 of Web2c, released in July 2021.
+This manual corresponds to version 2022 of Web2c, released in January
+2022.
- "Web2c" is the name of a TeX implementation, originally for Unix, but
-now also running under various operating systems. By "TeX
-implementation", we mean all of the standard programs developed by the
-Stanford TeX project directed by Donald E. Knuth: Metafont, DVItype,
-GFtoDVI, BibTeX, Tangle, etc., as well as TeX itself. Other programs
-are also included: DVIcopy, written by Peter Breitenlohner, MetaPost and
-its utilities (derived from Metafont), by John Hobby, etc.
+ "Web2c" (also spelled Web2C) is the name of a TeX implementation,
+originally for Unix, but now also running under Windows and other
+operating systems. By "TeX implementation", we mean all of the standard
+programs developed by the Stanford TeX project led by Donald E. Knuth:
+Metafont, DVItype, GFtoDVI, BibTeX, Tangle, etc., as well as TeX itself.
+Other programs are also included: DVIcopy, written by Peter
+Breitenlohner, MetaPost and its utilities (derived from Metafont), by
+John Hobby, and many more.
General strategy: Web2c works, as its name implies, by translating
the WEB source in which TeX is written into C source code. Its output
@@ -127,9 +129,17 @@
He made many changes to the original sources, and started using the
shorter name Web2c. In 1997, Olaf Weber took over, and then in 2006,
Karl started taking care of it again. No significant development or
-changes have been needed for many years. Dozens of other people have
-contributed; their names are listed in the 'ChangeLog' files.
+changes have been needed for many years, though dozens of other people
+have contributed in many ways; their names are listed in the 'ChangeLog'
+files.
+ Originally, Web2c was distributed as its own package, alongside the
+original web programs from Stanford and other components. It was also
+the basis for the teTeX distribution (now discontinued). Around 2004,
+the packaging focus shifted entirely to the TeX Live distribution
+(<https://tug.org/texlive/>), though the same Web2c is at the heart of
+the release.
+
Other acknowledgements by Karl: The University of Massachusetts at
Boston (particularly Rick Martin and Bob Morris) provided computers and
ftp access to me for many years. Richard Stallman at the Free Software
@@ -373,6 +383,9 @@
Many aspects of the TeX system are the same among more than one program,
so we describe those pieces together, here.
+ Another kind of commonality is the extensions to TeX that are
+available across all the engines; *note TeX extensions::.
+
* Menu:
* Option conventions:: - or -, = or ' ' for values.
@@ -1613,9 +1626,19 @@
5.7 Extended TeX engines
========================
-The base TeX program has been extended in many ways. Here's a partial
-list.
+The base TeX program has been extended in many ways.
+ There has been a substantial effort to make a set of extended
+functionality available across all actively-updated engines, so that
+formats, notably LaTeX, can rely on it. A list of this common extended
+functionality is in a 'LaTeX News' article,
+<https://www.latex-project.org/news/latex2e-news/ltnews31.pdf>. For
+engines in TeX Live, the detailed documentation for these primitives is
+mostly in the pdfTeX manual (<http://pdftex.org>).
+
+ In addition, each engine (naturally) has its own particular features,
+described in its own manual. Here's a partial list of the engines.
+
e-TeX
Adds many new primitives, including right-to-left typesetting and
more registers. Now frozen. More info:
@@ -1622,11 +1645,11 @@
<https://ctan.org/pkg/etex>.
Aleph
- This adds Unicode support, right-to-left typesetting, and more.
- Omega was the original program. Aleph is an updated version with a
- variety of bug fixes, and includes e-TeX. Aleph is not actively
- maintained. More info: <https://ctan.org/pkg/aleph>,
- <https://ctan.org/pkg/omega>.
+ This adds Unicode support, right-to-left typesetting, and more,
+ based on the Omega engine, with the e-TeX and other extensions.
+ Aleph is maintained only for serious bug fixes and does not include
+ the common functionality mentioned above. More info:
+ <https://ctan.org/pkg/aleph>, <https://ctan.org/pkg/omega>.
pdfTeX
Can produce PDF as well as DVI files. It also incorporates the
@@ -1649,6 +1672,11 @@
with the exception of the font expansion part of micro-typography.
Home page: <https://tug.org/xetex>.
+hiTeX
+ Outputs its own HINT format, which is designed for reading
+ technical documents on mobile devices. More info:
+ <https://ctan.org/pkg/hitex>.
+
pTeX
upTeX
With additional support for Japanese; pTeX was the original engine,
@@ -3679,7 +3707,7 @@
(line 16)
* accented character: TCX files. (line 6)
* accents, hyphenating words with: MLTeX. (line 6)
-* acknowledgements: Introduction. (line 53)
+* acknowledgements: Introduction. (line 63)
* acm.bst: Basic BibTeX style files.
(line 19)
* Ada, WEB for: WEB. (line 12)
@@ -3690,7 +3718,7 @@
(line 12)
* afmtopl: Font utilities available elsewhere.
(line 12)
-* Aleph: TeX extensions. (line 15)
+* Aleph: TeX extensions. (line 25)
* aliases for fonts: Path searching. (line 14)
* alpha.bst: Basic BibTeX style files.
(line 22)
@@ -3723,7 +3751,7 @@
(line 15)
* beamer, package: Formats. (line 57)
* beginfig: mpost invocation. (line 31)
-* Berry, Karl: Introduction. (line 42)
+* Berry, Karl: Introduction. (line 44)
* BIBINPUTS, search path for bib files: bibtex invocation. (line 18)
* bibliographies, creating: BibTeX. (line 6)
* bibliography: References. (line 6)
@@ -3741,7 +3769,7 @@
* braced filename for \input: \input braced filename.
(line 6)
* breakpoints, memory for: Runtime options. (line 20)
-* Breitenlohner, Peter: Introduction. (line 8)
+* Breitenlohner, Peter: Introduction. (line 9)
* BSTINPUTS, search path for bst files: bibtex invocation. (line 18)
* btex for MetaPost labels: mpost invocation. (line 44)
* btxdoc.bib: bibtex invocation. (line 52)
@@ -3809,11 +3837,12 @@
* Cork encoding and ISO input: TCX files. (line 48)
* creating memory dumps: Creating memory dumps.
(line 6)
+* cross-engine functionality: TeX extensions. (line 8)
* cross-referenced bibliography items: bibtex invocation. (line 31)
* cross-references, omitting: weave invocation. (line 22)
* current directory, used for output: Output file location.
(line 6)
-* Curtis, Pavel: Introduction. (line 42)
+* Curtis, Pavel: Introduction. (line 44)
* Cweb: WEB. (line 12)
* CWEB: WEB. (line 12)
* date and time, in memory dumps: Hardware and memory dumps.
@@ -3858,7 +3887,7 @@
* dynamic packing variable: pktype invocation. (line 44)
* e response at error prompt: Editor invocation. (line 6)
* e-circumflex: \charsubdef. (line 20)
-* e-TeX: TeX extensions. (line 10)
+* e-TeX: TeX extensions. (line 20)
* e.mft: mft invocation. (line 72)
* EC fonts: tex invocation. (line 41)
* EC fonts <1>: mf invocation. (line 24)
@@ -3874,14 +3903,14 @@
* Eplain: Formats. (line 50)
* epsf: Online Metafont graphics.
(line 19)
-* epTeX: TeX extensions. (line 51)
+* epTeX: TeX extensions. (line 66)
* errors, editor invoked at: Editor invocation. (line 6)
* escapement, horizontal: pktype invocation. (line 57)
* escapement, horizontal <1>: gftype invocation. (line 106)
* escapement, vertical: gftype invocation. (line 106)
* etex for MetaPost labels: mpost invocation. (line 44)
-* etex is pdfTeX: TeX extensions. (line 22)
-* eupTeX: TeX extensions. (line 51)
+* etex is pdfTeX: TeX extensions. (line 32)
+* eupTeX: TeX extensions. (line 66)
* executables, shared initial and virgin: Initial and virgin. (line 6)
* exit status, of shell escape: Shell escapes. (line 34)
* expanded plain format: Formats. (line 50)
@@ -3935,7 +3964,7 @@
* fraction routines: Compile-time options.
(line 21)
* Free Software Foundation documentation system: Formats. (line 43)
-* freedom of Web2c: Introduction. (line 22)
+* freedom of Web2c: Introduction. (line 24)
* ftp.math.utah.edu: bibtex invocation. (line 58)
* generating source specials: tex invocation. (line 134)
* geometric designs: Metafont. (line 6)
@@ -3975,8 +4004,10 @@
* Herberts, Mathias: Online Metafont graphics.
(line 20)
* hex character codes, in TCX files: TCX files. (line 77)
-* history: Introduction. (line 42)
-* Hobby, John: Introduction. (line 8)
+* HINT (Hint Is Not TeX): TeX extensions. (line 53)
+* history: Introduction. (line 44)
+* hiTeX: TeX extensions. (line 53)
+* Hobby, John: Introduction. (line 9)
* horizontal escapement: pktype invocation. (line 57)
* horizontal escapement <1>: gftype invocation. (line 106)
* hp2627: Online Metafont graphics.
@@ -3988,11 +4019,11 @@
* human-readable text, converting PK to: pktype invocation. (line 6)
* human-readable text, converting TFM to: tftopl invocation. (line 6)
* human-readable text, converting VF to: vftovp invocation. (line 6)
-* hypertext: TeX extensions. (line 22)
+* hypertext: TeX extensions. (line 32)
* hyphenation and languages: Languages and hyphenation.
(line 6)
* hyphenation patterns, creating: patgen invocation. (line 6)
-* ice cream: Introduction. (line 22)
+* ice cream: Introduction. (line 24)
* identifier case: tangle invocation. (line 35)
* identifier collisions: tangle invocation. (line 46)
* identifier length: tangle invocation. (line 27)
@@ -4025,7 +4056,7 @@
* job name: Common options. (line 60)
* kerning table, in TFM files: tftopl invocation. (line 101)
* keyboard character code, translating: TCX files. (line 101)
-* Knuth, Donald E.: Introduction. (line 8)
+* Knuth, Donald E.: Introduction. (line 9)
* Knuth, Donald E. <1>: mft invocation. (line 56)
* KPATHSEA_DEBUG: Common options. (line 64)
* KRN property: tftopl invocation. (line 101)
@@ -4041,7 +4072,7 @@
* left side bearing <1>: gftype invocation. (line 82)
* legalisms: Legalisms. (line 6)
* libsigsegv library: Runtime options. (line 33)
-* licensing terms: Introduction. (line 22)
+* licensing terms: Introduction. (line 24)
* LIG property: tftopl invocation. (line 101)
* ligature table, in TFM files: tftopl invocation. (line 101)
* LIGTABLE property: tftopl invocation. (line 101)
@@ -4055,8 +4086,8 @@
* log file, BibTeX: bibtex invocation. (line 14)
* long data type, size of: Hardware and memory dumps.
(line 6)
-* Lua: TeX extensions. (line 30)
-* LuaTeX: TeX extensions. (line 30)
+* Lua: TeX extensions. (line 40)
+* LuaTeX: TeX extensions. (line 40)
* machine dependencies: Hardware and memory dumps.
(line 6)
* machine-readable, converting property lists to: pltotf invocation.
@@ -4071,7 +4102,7 @@
* magnification <1>: dvitype invocation. (line 28)
* main_memory: Runtime options. (line 15)
* Make targets, additional: Additional targets. (line 6)
-* Martin, Rick: Introduction. (line 53)
+* Martin, Rick: Introduction. (line 63)
* Mathematical Reviews: Formats. (line 35)
* mathematical typesetting: TeX. (line 6)
* mem file, determining: Determining the memory dump to use.
@@ -4125,7 +4156,7 @@
* MFTERM: Online Metafont graphics.
(line 11)
* mftmac.tex: mft invocation. (line 6)
-* micro-typography: TeX extensions. (line 22)
+* micro-typography: TeX extensions. (line 32)
* mktexmf, disabling: mf invocation. (line 24)
* mktextfM, disabling: tex invocation. (line 41)
* mltex: MLTeX. (line 6)
@@ -4136,8 +4167,8 @@
* mode_def: Modes. (line 15)
* mode_setup: Modes. (line 15)
* modifying texmf.cnf in TeX Live: Runtime options. (line 56)
-* Morgan, Tim: Introduction. (line 42)
-* Morris, Bob: Introduction. (line 53)
+* Morgan, Tim: Introduction. (line 44)
+* Morris, Bob: Introduction. (line 63)
* MPEDIT: Editor invocation. (line 10)
* mpgraph.pdf: mpost invocation. (line 14)
* mpman.pdf: mpost invocation. (line 6)
@@ -4167,11 +4198,11 @@
(line 12)
* octal character codes, in TCX files: TCX files. (line 77)
* offset for overflow labels: gftodvi invocation. (line 59)
-* Omega: TeX extensions. (line 15)
+* Omega: TeX extensions. (line 25)
* online Metafont graphics: Online Metafont graphics.
(line 6)
* opcodes, showing DVI: dvitype invocation. (line 52)
-* OpenType support: TeX extensions. (line 30)
+* OpenType support: TeX extensions. (line 40)
* optical font scaling: Font file formats. (line 21)
* option conventions: Option conventions. (line 6)
* origin: pktype invocation. (line 66)
@@ -4192,9 +4223,9 @@
* patgen: patgen invocation. (line 6)
* path searching: Path searching. (line 6)
* path searching debugging: Common options. (line 64)
-* PDF: TeX extensions. (line 22)
+* PDF: TeX extensions. (line 32)
* PDF, and .mps files: mpost invocation. (line 82)
-* pdfTeX: TeX extensions. (line 22)
+* pdfTeX: TeX extensions. (line 32)
* permissions, legal: Legalisms. (line 6)
* PFA and PFB conversion: Font utilities available elsewhere.
(line 39)
@@ -4246,7 +4277,7 @@
* predefined macros and memory dumps: Memory dumps. (line 6)
* prettyprinting Metafont source: mft invocation. (line 6)
* prettyprinting WEB programs: weave invocation. (line 6)
-* primitives, new: TeX extensions. (line 10)
+* primitives, new: TeX extensions. (line 20)
* printable characters, specifying: TCX files. (line 87)
* printer characteristics, for Metafont: Modes. (line 6)
* production use: Initial and virgin. (line 15)
@@ -4265,7 +4296,7 @@
* ps2pk: Font utilities available elsewhere.
(line 35)
* psfonts.map, read by MetaPost: mpost invocation. (line 76)
-* pTeX: TeX extensions. (line 44)
+* pTeX: TeX extensions. (line 59)
* PXL files, explained: Font file formats. (line 39)
* pxtoch: Font utilities available elsewhere.
(line 23)
@@ -4272,7 +4303,7 @@
* quoted filename for \input: \input quoted filename.
(line 6)
* Raichle, Bernd: MLTeX. (line 6)
-* reading, additional: Introduction. (line 61)
+* reading, additional: Introduction. (line 71)
* readonly directory, running TeX in: Output file location.
(line 15)
* readonly directory, running TeX in <1>: Output file location.
@@ -4292,7 +4323,7 @@
* restricted shell escapes: Shell escapes. (line 6)
* right side bearing: pktype invocation. (line 66)
* right side bearing <1>: gftype invocation. (line 82)
-* Rokicki, Tomas: Introduction. (line 42)
+* Rokicki, Tomas: Introduction. (line 44)
* run length encoded bitmaps: pktype invocation. (line 76)
* run length encoded bitmaps <1>: gftype invocation. (line 89)
* runtime options: Runtime options. (line 6)
@@ -4324,13 +4355,13 @@
* sockets: IPC and TeX. (line 6)
* space-terminated filenames: \input filenames. (line 10)
* Spiderweb: WEB. (line 12)
-* Stallman, Richard: Introduction. (line 53)
+* Stallman, Richard: Introduction. (line 63)
* starting page: dvicopy invocation. (line 28)
* starting page <1>: dvitype invocation. (line 46)
* Steele Jr., Guy L.: Hardware and memory dumps.
(line 39)
* stopping at the first error: Common options. (line 46)
-* strategy, overall: Introduction. (line 16)
+* strategy, overall: Introduction. (line 18)
* string numbers, displaying: pooltype invocation. (line 6)
* string pool, writing: tangle invocation. (line 16)
* string representation: pooltype invocation. (line 30)
@@ -4351,7 +4382,7 @@
* syntax of TCX files: TCX files. (line 65)
* system C library function: Shell escapes. (line 6)
* system command: Shell escapes. (line 6)
-* system fonts, using: TeX extensions. (line 30)
+* system fonts, using: TeX extensions. (line 40)
* T1 encoding and ISO input: TCX files. (line 48)
* tabs, and \input filenames: \input filename caveats.
(line 6)
@@ -4370,6 +4401,7 @@
(line 11)
* terminator for filenames: \input filenames. (line 10)
* terse output: bibtex invocation. (line 28)
+* teTeX distribution: Introduction. (line 56)
* tex: tex invocation. (line 6)
* TeX, bibliographies for: bibtex invocation. (line 58)
* TeX, creating from Metafont: mft invocation. (line 6)
@@ -4381,7 +4413,7 @@
* TeX, input files found: tex invocation. (line 20)
* TeX, invocation: tex invocation. (line 6)
* TeX, Metafont, and MetaPost: Three programs. (line 6)
-* TeX, Web2c implementation of: Introduction. (line 8)
+* TeX, Web2c implementation of: Introduction. (line 9)
* tex.fmt: Initial TeX. (line 13)
* TEXBIB, search path for bib files: bibtex invocation. (line 18)
* TEXEDIT: Editor invocation. (line 10)
@@ -4418,11 +4450,11 @@
(line 59)
* torture tests: Triptrap. (line 6)
* translation file for TeX, specifying: Common options. (line 103)
-* translation from WEB to C: Introduction. (line 16)
+* translation from WEB to C: Introduction. (line 18)
* trap Make target: Additional targets. (line 41)
* trap test: Triptrap. (line 6)
* trapman.tex: Triptrap. (line 6)
-* Trickey, Howard: Introduction. (line 42)
+* Trickey, Howard: Introduction. (line 44)
* trip Make target: Additional targets. (line 41)
* trip test: Triptrap. (line 6)
* tripman.tex: Triptrap. (line 6)
@@ -4431,7 +4463,7 @@
* troff, supported in MetaPost: MetaPost. (line 12)
* Troff, WEB for: WEB. (line 12)
* Trojan horses and TeX programs: tex invocation. (line 48)
-* TrueType support: TeX extensions. (line 30)
+* TrueType support: TeX extensions. (line 40)
* TUGboat bibliography: bibtex invocation. (line 58)
* Type 1 conversion: Font utilities available elsewhere.
(line 39)
@@ -4442,16 +4474,16 @@
* type programs, pool: pooltype invocation. (line 6)
* typeface families: Metafont. (line 6)
* typesetting: TeX. (line 6)
-* Unicode: TeX extensions. (line 15)
+* Unicode: TeX extensions. (line 25)
* Unicode input: tex invocation. (line 86)
-* Unicode input, native: TeX extensions. (line 37)
+* Unicode input, native: TeX extensions. (line 47)
* uniterm: Online Metafont graphics.
(line 50)
* unsrt.bst: Basic BibTeX style files.
(line 39)
-* upTeX: TeX extensions. (line 44)
+* upTeX: TeX extensions. (line 59)
* UTF-8 input: tex invocation. (line 86)
-* UTF-8 input, native: TeX extensions. (line 30)
+* UTF-8 input, native: TeX extensions. (line 40)
* validation, of DVI files: dvitype invocation. (line 6)
* validation, of GF files: gftype invocation. (line 6)
* validation, of PK files: pktype invocation. (line 6)
@@ -4477,7 +4509,7 @@
* WEB programs, compiling: tangle invocation. (line 6)
* WEB programs, typesetting: weave invocation. (line 6)
* WEB2C, search path for TCX files: TCX files. (line 35)
-* Weber, Olaf: Introduction. (line 42)
+* Weber, Olaf: Introduction. (line 44)
* webmac.tex: weave invocation. (line 22)
* webman.tex: WEB. (line 12)
* whitespace, in TCX files: TCX files. (line 68)
@@ -4500,7 +4532,7 @@
* xampl.bib: bibtex invocation. (line 55)
* xbfe, bitmap font editor: Font utilities available elsewhere.
(line 23)
-* XeTeX: TeX extensions. (line 37)
+* XeTeX: TeX extensions. (line 47)
* xfed, bitmap font editor: Font utilities available elsewhere.
(line 23)
* xfedor, bitmap font editor: Font utilities available elsewhere.
@@ -4521,78 +4553,78 @@
Tag Table:
Node: Top2759
-Node: Introduction3830
-Node: Installation7167
-Node: configure options9211
-Node: Compile-time options11233
-Node: Additional targets12335
-Node: Triptrap13612
-Node: Commonalities15115
-Node: Option conventions15648
-Node: Common options16871
-Node: Path searching21489
-Node: Output file location22461
-Node: Three programs23763
-Node: Runtime options24470
-Node: Initial and virgin27611
-Node: Memory dumps28560
-Node: Creating memory dumps29012
-Node: Determining the memory dump to use30219
-Node: Hardware and memory dumps31796
-Node: Editor invocation34546
-Node: \input filenames35409
-Node: \input quoted filename36960
-Node: \input braced filename37737
-Node: \input filename caveats38667
-Node: TeX40181
-Node: tex invocation41349
-Node: Initial TeX48335
-Node: Formats49699
-Node: Languages and hyphenation52516
-Node: MLTeX52946
-Node: \charsubdef54574
-Node: \tracingcharsubdef56897
-Node: TCX files57472
-Node: patgen invocation62912
-Node: Shell escapes63619
-Node: IPC and TeX67199
-Node: TeX extensions67769
-Node: Metafont69798
-Node: mf invocation71086
-Node: Initial Metafont74923
-Node: Modes76553
-Node: Online Metafont graphics78803
-Node: gftodvi invocation82228
-Node: mft invocation85048
-Node: MetaPost89046
-Node: mpost invocation89882
-Node: Initial MetaPost94918
-Node: dvitomp invocation95840
-Node: BibTeX96505
-Node: bibtex invocation96866
-Node: Basic BibTeX style files99340
-Node: WEB100670
-Node: tangle invocation101879
-Node: weave invocation104003
-Node: pooltype invocation105410
-Node: DVI utilities106540
-Node: dvicopy invocation107474
-Node: dvitype invocation108759
-Node: dvitype output example111090
-Node: Font utilities114143
-Node: Font file formats115323
-Node: gftopk invocation118590
-Node: pktogf invocation119781
-Node: pktype invocation120947
-Node: gftype invocation123770
-Node: tftopl invocation128273
-Node: pltotf invocation132866
-Node: vftovp invocation133917
-Node: vptovf invocation136152
-Node: Font utilities available elsewhere137179
-Node: Legalisms139384
-Node: References140831
-Node: Index144964
+Node: Introduction3833
+Node: Installation7591
+Node: configure options9635
+Node: Compile-time options11657
+Node: Additional targets12759
+Node: Triptrap14036
+Node: Commonalities15539
+Node: Option conventions16196
+Node: Common options17419
+Node: Path searching22037
+Node: Output file location23009
+Node: Three programs24311
+Node: Runtime options25018
+Node: Initial and virgin28159
+Node: Memory dumps29108
+Node: Creating memory dumps29560
+Node: Determining the memory dump to use30767
+Node: Hardware and memory dumps32344
+Node: Editor invocation35094
+Node: \input filenames35957
+Node: \input quoted filename37508
+Node: \input braced filename38285
+Node: \input filename caveats39215
+Node: TeX40729
+Node: tex invocation41897
+Node: Initial TeX48883
+Node: Formats50247
+Node: Languages and hyphenation53064
+Node: MLTeX53494
+Node: \charsubdef55122
+Node: \tracingcharsubdef57445
+Node: TCX files58020
+Node: patgen invocation63460
+Node: Shell escapes64167
+Node: IPC and TeX67747
+Node: TeX extensions68317
+Node: Metafont71098
+Node: mf invocation72386
+Node: Initial Metafont76223
+Node: Modes77853
+Node: Online Metafont graphics80103
+Node: gftodvi invocation83528
+Node: mft invocation86348
+Node: MetaPost90346
+Node: mpost invocation91182
+Node: Initial MetaPost96218
+Node: dvitomp invocation97140
+Node: BibTeX97805
+Node: bibtex invocation98166
+Node: Basic BibTeX style files100640
+Node: WEB101970
+Node: tangle invocation103179
+Node: weave invocation105303
+Node: pooltype invocation106710
+Node: DVI utilities107840
+Node: dvicopy invocation108774
+Node: dvitype invocation110059
+Node: dvitype output example112390
+Node: Font utilities115443
+Node: Font file formats116623
+Node: gftopk invocation119890
+Node: pktogf invocation121081
+Node: pktype invocation122247
+Node: gftype invocation125070
+Node: tftopl invocation129573
+Node: pltotf invocation134166
+Node: vftovp invocation135217
+Node: vptovf invocation137452
+Node: Font utilities available elsewhere138479
+Node: Legalisms140684
+Node: References142131
+Node: Index146264
End Tag Table
Modified: branches/stable/source/src/texk/web2c/doc/web2c.texi
===================================================================
--- branches/stable/source/src/texk/web2c/doc/web2c.texi 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/doc/web2c.texi 2022-03-01 02:03:00 UTC (rev 874)
@@ -11,8 +11,8 @@
\fi
@end tex
- at set version 2021
- at set month-year July 2021
+ at set version 2022
+ at set month-year January 2022
@c Define new indices for commands in auxiliary files, filenames, and options.
@defcodeindex cm
@@ -63,7 +63,7 @@
an implementation of Donald Knuth's TeX system.
Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2007, 2008, 2009, 2010-2021 Karl Berry & Olaf Weber.
+2004, 2005, 2007, 2008, 2009, 2010-2022 Karl Berry & Olaf Weber.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
@@ -142,14 +142,14 @@
@cindex @TeX{}, Web2c implementation of
@cindex Hobby, John
@cindex Breitenlohner, Peter
- at dfn{Web2c} is the name of a @TeX{} implementation, originally for
-Unix, but now also running under various operating systems. By
- at dfn{@TeX{} implementation}, we mean all of the standard programs
-developed by the Stanford @TeX{} project directed by Donald E. Knuth:
-Metafont, DVItype, GFtoDVI, Bib at TeX{}, Tangle, etc., as well as @TeX{}
-itself. Other programs are also included: DVIcopy, written by Peter
-Breitenlohner, MetaPost and its utilities (derived from Metafont), by
-John Hobby, etc.
+ at dfn{Web2c} (also spelled Web2C) is the name of a @TeX{}
+implementation, originally for Unix, but now also running under
+Windows and other operating systems. By @dfn{@TeX{} implementation},
+we mean all of the standard programs developed by the Stanford @TeX{}
+project led by Donald at tie{}E. Knuth: Metafont, DVItype, GFtoDVI,
+Bib at TeX{}, Tangle, etc., as well as @TeX{} itself. Other programs are
+also included: DVIcopy, written by Peter Breitenlohner, MetaPost and
+its utilities (derived from Metafont), by John Hobby, and many more.
@cindex translation from WEB to C
@cindex strategy, overall
@@ -196,10 +196,18 @@
the maintainer. He made many changes to the original sources, and
started using the shorter name Web2c. In 1997, Olaf Weber took over,
and then in 2006, Karl started taking care of it again. No
-significant development or changes have been needed for many
-years. Dozens of other people have contributed; their names are listed
-in the @file{ChangeLog} files.
+significant development or changes have been needed for many years,
+though dozens of other people have contributed in many ways; their
+names are listed in the @file{ChangeLog} files.
+ at cindex te at TeX{} distribution
+Originally, Web2c was distributed as its own package, alongside the
+original web programs from Stanford and other components. It was also
+the basis for the te at TeX{} distribution (now discontinued). Around
+2004, the packaging focus shifted entirely to the @TeX{} Live
+distribution (@url{https://tug.org/texlive/}), though the same Web2c
+is at the heart of the release.
+
@cindex acknowledgements
@cindex Martin, Rick
@cindex Morris, Bob
@@ -210,7 +218,7 @@
Foundation employed me while I wrote the original path searching library
(for the GNU font utilities). (rms also gave us Emacs, GDB, and GCC,
without which I cannot imagine developing Web2c.) And, of course,
- at TeX{} would not exist in the first place without Donald E. Knuth.
+ at TeX{} would not exist in the first place without Donald at tie{}E. Knuth.
@cindex reading, additional
Further reading: @xref{References}.
@@ -227,6 +235,9 @@
Many aspects of the @TeX{} system are the same among more than one
program, so we describe those pieces together, here.
+Another kind of commonality is the extensions to @TeX{} that are
+available across all the engines; @pxref{TeX extensions}.
+
@menu
* Option conventions:: -- or -, = or ` ' for values.
* Common options:: --help --version --verbose, and TeX/MF/MP options.
@@ -1901,24 +1912,37 @@
@cindex extensions to @TeX{}
@cindex @TeX{}, extensions to
-The base @TeX{} program has been extended in many ways. Here's a
-partial list.
+The base @TeX{} program has been extended in many ways.
+ at cindex cross-engine functionality
+There has been a substantial effort to make a set of extended
+functionality available across all actively-updated engines, so that
+formats, notably @LaTeX{}, can rely on it. A list of this common
+extended functionality is in a @cite{@LaTeX{} News} article,
+ at url{https://www.latex-project.org/news/latex2e-news/ltnews31.pdf}.
+For engines in @TeX{} Live, the detailed documentation for these
+primitives is mostly in the pdf at TeX{} manual
+(@url{http://pdftex.org}).
+
+In addition, each engine (naturally) has its own particular features,
+described in its own manual. Here's a partial list of the engines.
+
@table @asis
@item e- at TeX{}
@cindex e- at TeX{}
@cindex primitives, new
Adds many new primitives, including right-to-left typesetting and more
-registers. Now frozen. More info: @url{https://ctan.org/pkg/etex}.
+registers. Now frozen. More info: @url{https://ctan.org/pkg/etex}.
@item Aleph
@cindex Aleph
@cindex Omega
@cindex Unicode
-This adds Unicode support, right-to-left typesetting, and more. Omega
-was the original program. Aleph is an updated version with a variety
-of bug fixes, and includes e- at TeX{}. Aleph is not actively maintained.
-More info: @url{https://ctan.org/pkg/aleph}, @url{https://ctan.org/pkg/omega}.
+This adds Unicode support, right-to-left typesetting, and more, based
+on the Omega engine, with the e- at TeX{} and other extensions. Aleph is
+maintained only for serious bug fixes and does not include the common
+functionality mentioned above. More info:
+ at url{https://ctan.org/pkg/aleph}, @url{https://ctan.org/pkg/omega}.
@item pdf at TeX{}
@cindex pdf at TeX{}
@@ -1954,6 +1978,13 @@
with the exception of the font expansion part of micro-typography.
Home page: @url{https://tug.org/xetex}.
+ at item hi at TeX{}
+ at cindex hi at TeX{}
+ at cindex HINT (Hint Is Not @TeX{})
+Outputs its own HINT format, which is designed for reading
+technical documents on mobile devices. More info:
+ at url{https://ctan.org/pkg/hitex}.
+
@item p at TeX{}
@itemx up at TeX{}
@cindex p at TeX{}
Modified: branches/stable/source/src/texk/web2c/etexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/etexdir/ChangeLog 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/etexdir/ChangeLog 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,3 +1,7 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/etex.am: do not silence tangle-sh.
+
2021-03-23 Karl Berry <karl at tug.org>
* TL'21.
Modified: branches/stable/source/src/texk/web2c/etexdir/am/etex.am
===================================================================
--- branches/stable/source/src/texk/web2c/etexdir/am/etex.am 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/etexdir/am/etex.am 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,7 +1,7 @@
-## $Id: etex.am 57769 2021-02-17 03:03:54Z karl $
+## $Id: etex.am 61575 2022-01-11 22:47:10Z karl $
## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX.
##
-## Copyright 2015-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2015-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -38,9 +38,9 @@
# Tangling e-TeX
etex.p etex.pool: etex-tangle
- @$(texmf_tangle) etex etex
+ $(texmf_tangle) etex etex
etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh
- @$(texmf_tangle) etex etex
+ $(texmf_tangle) etex etex
# Extract etex version
$(srcdir)/etexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ etexdir/etex.ch
@@ -121,3 +121,4 @@
etexdir/etrip/texmf.cnf \
etexdir/etrip/trip2.in
+# (end of etex.am)
Modified: branches/stable/source/src/texk/web2c/help.h
===================================================================
--- branches/stable/source/src/texk/web2c/help.h 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/help.h 2022-03-01 02:03:00 UTC (rev 874)
@@ -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.
@@ -204,13 +204,13 @@
#ifdef MFT
const_string MFTHELP[] = {
- "Usage: mft [OPTION]... NAME[.mf|.mp]",
- " Translate MFNAME to TeX for printing, using the mftmac.tex (or",
- " mptmac.tex) macros. Output goes to basename of NAME extended",
- " with `.tex'.",
+ "Usage: mft [OPTION]... FILENAME[.mf|.mp]",
+ " Translate FILENAME to TeX for printing, using the mftmac.tex",
+ " (for mf) or mptmac.tex (for mpost) TeX macro file.",
+ " Output goes to basename of FILENAME extended with `.tex'.",
"",
"-change=CHFILE apply the change file CHFILE as with tangle and weave",
- "-metapost assume NAME is a METAPOST source file",
+ "-metapost assume FILENAME is a MetaPost source file",
"-style=MFTNAME use MFTNAME instead of plain.mft (or mplain.mft)",
" (this option can be given more than once)",
"-help display this help and exit",
@@ -639,4 +639,18 @@
};
#endif /* WEAVE */
+#ifdef TWILL
+const_string TWILLHELP[] = {
+ "Usage: twill [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
+ " Weave WEBFILE with CHANGEFILE into a TeX document with mini-indexes.",
+ " Default CHANGEFILE is " DEV_NULL ";",
+ " TeX output goes to the basename of WEBFILE extended with `.tex'.",
+ "",
+ "-x omit cross-reference information",
+ "-help display this help and exit",
+ "-version output version information and exit",
+ NULL
+};
+#endif /* TWILL */
+
#endif /* not HELP_H */
Modified: branches/stable/source/src/texk/web2c/lib/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/lib/ChangeLog 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/lib/ChangeLog 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,3 +1,13 @@
+2022-01-22 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
+
+ * openclose.c (open_input): Reencode nameoffile to utf8 for pTeX.
+ * texmfmp.c: Change type of str_pool to unsigned short for pTeX.
+ We use only 0--511, and use flag 0x100 for Japanese char.
+
+2022-01-01 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
+
+ * printversion.c: Update copyright year.
+
2021-07-25 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* texmfmp.c: Apply patch of W32TeX for Visual Studio 2015
Modified: branches/stable/source/src/texk/web2c/lib/openclose.c
===================================================================
--- branches/stable/source/src/texk/web2c/lib/openclose.c 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/lib/openclose.c 2022-03-01 02:03:00 UTC (rev 874)
@@ -281,6 +281,13 @@
must_exist);
if (fname) {
fullnameoffile = xstrdup(fname);
+#if defined(PTEX) && !defined(WIN32)
+ fname0 = ptenc_from_utf8_string_to_internal_enc(fullnameoffile);
+ if (fname0) {
+ free (fullnameoffile);
+ fullnameoffile = fname0;
+ }
+#endif
/* If we found the file in the current directory, don't leave
the `./' at the beginning of `nameoffile', since it looks
dumb when `tex foo' says `(./foo.tex ... )'. On the other
Modified: branches/stable/source/src/texk/web2c/lib/printversion.c
===================================================================
--- branches/stable/source/src/texk/web2c/lib/printversion.c 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/lib/printversion.c 2022-03-01 02:03:00 UTC (rev 874)
@@ -56,7 +56,7 @@
#endif
if (copyright_holder) {
- printf ("Copyright 2021 %s.\n", copyright_holder);
+ printf ("Copyright 2022 %s.\n", copyright_holder);
if (!author)
author = copyright_holder;
}
Modified: branches/stable/source/src/texk/web2c/lib/texmfmp.c
===================================================================
--- branches/stable/source/src/texk/web2c/lib/texmfmp.c 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/lib/texmfmp.c 2022-03-01 02:03:00 UTC (rev 874)
@@ -596,7 +596,14 @@
int allow = 0;
char *safecmd = NULL;
char *cmdname = NULL;
+#if IS_pTeX && !defined(WIN32)
+ char *cmd2 = NULL;
+#endif
int status = 0;
+#if IS_pTeX && !defined(WIN32)
+ cmd2 = (char *)ptenc_from_internal_enc_string_to_utf8((unsigned char *)cmd);
+ if (!cmd2) cmd2=(char *)cmd;
+#endif
if (shellenabledp <= 0) {
return 0;
@@ -606,10 +613,18 @@
if (restrictedshell == 0)
allow = 1;
else
+#if IS_pTeX && !defined(WIN32)
+ allow = shell_cmd_is_allowed (cmd2, &safecmd, &cmdname);
+#else
allow = shell_cmd_is_allowed (cmd, &safecmd, &cmdname);
+#endif
if (allow == 1)
+#if IS_pTeX && !defined(WIN32)
+ status = system (cmd2);
+#else
status = system (cmd);
+#endif
else if (allow == 2) {
/*
command including a character '|' is not allowed in
@@ -625,8 +640,11 @@
/* Not really meaningful, but we have to manage the return value of system. */
if (status != 0)
- fprintf(stderr,"system returned with code %d\n", status);
+ fprintf(stderr,"system returned with code %d\n", status);
+#if IS_pTeX && !defined(WIN32)
+ if (cmd!=cmd2) free(cmd2);
+#endif
if (safecmd)
free (safecmd);
if (cmdname)
@@ -779,7 +797,7 @@
#if IS_pTeX
kpse_set_program_name (argv[0], NULL);
- initkanji ();
+ initkanji (); ptenc_ptex_mode(true);
#endif
#if (defined(XeTeX) || defined(pdfTeX)) && defined(WIN32)
kpse_set_program_name (argv[0], NULL);
@@ -1457,7 +1475,11 @@
{
unsigned i;
for (i=0; i<len; i++)
+#if IS_pTeX
+ name[i] = 0xFF&strpool[i+strstart[outputfilename]];
+#else
name[i] = strpool[i+strstartar[outputfilename - 65536L]];
+#endif
}
#endif
name[len] = 0;
@@ -2502,7 +2524,8 @@
/* Recognize either LF or CR as a line terminator. */
#if IS_pTeX
- last = input_line2(f, (unsigned char *)buffer, first, bufsize, &i);
+ last = input_line2(f, (unsigned char *)buffer, (unsigned char *)buffer2,
+ first, bufsize, &i);
#else
#ifdef WIN32
if (f != Poptr && fileno (f) != fileno (stdin)) {
@@ -3035,7 +3058,7 @@
}
#else /* ! XeTeX */
while (len-- > 0)
- strpool[poolptr++] = *s++;
+ strpool[poolptr++] = 0xFF&(*s++);
#endif /* ! XeTeX */
return makestring();
@@ -3053,9 +3076,20 @@
strnumber
getjobname(strnumber name)
{
- strnumber ret = name;
+ strnumber ret = name; int i, l, p;
if (c_job_name != NULL)
ret = maketexstring(c_job_name);
+#if IS_pTeX
+ i = strstart[ret]; l = strstart[ret+1];
+ while (i<l)
+ {
+ p = multistrlenshort(strpool, l, i);
+ if (p>1) {
+ int j;
+ for (j=i+p; i<j; i++) strpool[i] = (0xFF&strpool[i])+0x100;
+ } else i++;
+ }
+#endif /* IS_pTeX */
return ret;
}
#endif
@@ -3140,13 +3174,17 @@
len = strstartar[s + 1 - 65536L] - strstartar[s - 65536L];
#endif
name = (string)xmalloc (len + 1);
-#if !defined(Aleph)
+#if !defined(Aleph) && !IS_pTeX
strncpy (name, (string)&strpool[strstart[s]], len);
#else
{
poolpointer i;
/* Don't use strncpy. The strpool is not made up of chars. */
+#if IS_pTeX
+ for (i=0; i<len; i++) name[i] = 0xFF&strpool[i+strstart[s]];
+#else
for (i=0; i<len; i++) name[i] = strpool[i+strstartar[s - 65536L]];
+#endif
}
#endif
name[len] = 0;
@@ -3389,7 +3427,11 @@
}
p = cstrbuf;
for (i = 0; i < l; i++)
+#if IS_pTeX
+ *p++ = 0xFF&strpool[i + strstart[s]];
+#else
*p++ = strpool[i + strstart[s]];
+#endif
*p = 0;
return cstrbuf;
}
@@ -3422,7 +3464,7 @@
getcreationdate(void)
{
size_t len;
-#if defined(XeTeX)
+#if defined(XeTeX) || IS_pTeX
int i;
#endif
initstarttime();
@@ -3438,7 +3480,7 @@
return;
}
-#if defined(XeTeX)
+#if defined(XeTeX) || IS_pTeX
for (i = 0; i < len; i++)
strpool[poolptr++] = (uint16_t)start_time_str[i];
#else
@@ -3472,7 +3514,7 @@
poolptr = poolsize;
/* error by str_toks that calls str_room(1) */
} else {
-#if defined(XeTeX)
+#if defined(XeTeX) || IS_pTeX
int i;
for (i = 0; i < len; i++)
@@ -3518,7 +3560,7 @@
poolptr = poolsize;
/* error by str_toks that calls str_room(1) */
} else {
-#if defined(XeTeX)
+#if defined(XeTeX) || IS_pTeX
for (i = 0; i < len; i++)
strpool[poolptr++] = (uint16_t)buf[i];
#else
@@ -3537,7 +3579,7 @@
{
FILE *f;
int read, i;
-#if defined(XeTeX)
+#if defined(XeTeX) || IS_pTeX
unsigned char *readbuffer;
char strbuf[3];
int j, k;
@@ -3544,7 +3586,7 @@
#else
poolpointer data_ptr;
poolpointer data_end;
-#endif /* XeTeX */
+#endif /* XeTeX || IS_pTeX */
char *file_name;
if (length == 0) {
@@ -3575,7 +3617,7 @@
xfree(file_name);
return;
}
-#if defined(XeTeX)
+#if defined(XeTeX) || IS_pTeX
readbuffer = (unsigned char *)xmalloc (length + 1);
read = fread(readbuffer, sizeof(char), length, f);
fclose(f);
@@ -3603,7 +3645,7 @@
check_nprintf(i, 3);
poolptr += i;
}
-#endif /* XeTeX */
+#endif /* XeTeX || IS_pTeX */
xfree(file_name);
}
@@ -3637,7 +3679,7 @@
md5_byte_t digest[DIGEST_SIZE];
char outbuf[2 * DIGEST_SIZE + 1];
int len = 2 * DIGEST_SIZE;
-#if defined(XeTeX)
+#if defined(XeTeX) || IS_pTeX
char *xname;
int i;
#endif
@@ -3673,7 +3715,7 @@
} else {
/* s contains the data */
md5_init(&state);
-#if defined(XeTeX)
+#if defined(XeTeX) || IS_pTeX
xname = gettexstring (s);
md5_append(&state,
(md5_byte_t *) xname,
@@ -3692,7 +3734,7 @@
return;
}
convertStringToHexString((char *) digest, outbuf, DIGEST_SIZE);
-#if defined(XeTeX)
+#if defined(XeTeX) || IS_pTeX
for (i = 0; i < 2 * DIGEST_SIZE; i++)
strpool[poolptr++] = (uint16_t)outbuf[i];
#else
Modified: branches/stable/source/src/texk/web2c/man/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/man/Makefile.in 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/man/Makefile.in 2022-03-01 02:03:00 UTC (rev 874)
@@ -468,7 +468,8 @@
latex-dev:uplatex-dev
web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
- pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
+ pltotf.man pooltype.man tftopl.man twill.man \
+ vftovp.man vptovf.man weave.man
pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man
Modified: branches/stable/source/src/texk/web2c/omegafonts/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/omegafonts/Makefile.in 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/omegafonts/Makefile.in 2022-03-01 02:03:00 UTC (rev 874)
@@ -14,21 +14,6 @@
@SET_MAKE@
-# am/bin_links.am: Makefile fragment for bindir links.
-#
-# Copyright 2017-2020 Karl Berry <tex-live at tug.org>
-# Copyright 2011-2013 Peter Breitenlohner <tex-live at tug.org>
-# You may freely use, modify and/or distribute this file.
-#
-# requires conditional WIN32
-# requires $(bin_links)
-# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
-# for binaries and scripts use, e.g.,
-# binprog$(EXEEXT):foo
-# script:bar
-# respectively, such that the links created on cygwin are
-# 'foo->binprog.exe' and 'bar->script'.
-
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -1424,10 +1409,12 @@
@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \
@WIN32_FALSE@ done
+# (end of bin_links.am)
+
@OTANGLE_TRUE at install-exec-hook: install-bin-links
# same install happens in dvipdfmx.
@OTANGLE_TRUE@@WIN32_TRUE@ for f in $(linked_programs); do \
- at OTANGLE_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) "$(DESTDIR)$(bindir)/$$f$(EXEEXT)"
+ at OTANGLE_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) "$(DESTDIR)$(bindir)/$$f$(EXEEXT)"; \
@OTANGLE_TRUE@@WIN32_TRUE@ done
@OTANGLE_TRUE at uninstall-hook: uninstall-bin-links
@OTANGLE_TRUE@@WIN32_TRUE@ for f in $(linked_programs); do \
Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,3 +1,11 @@
+2022-01-10 Karl Berry <karl at freefriends.org>
+
+ * am/pdftex.am: do not silence tangle-sh.
+
+2021-11-07 Andreas Scherer <https://ascherer.github.io>
+
+ * pdftex.web: Use WEB meta-comment for stale code.
+
2021-11-05 Karl Berry <karl at freefriends.org>
* pdftex_version.h,
Modified: branches/stable/source/src/texk/web2c/pdftexdir/NEWS
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/NEWS 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/pdftexdir/NEWS 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,4 +1,8 @@
+pdfTeX 3.141592653-2.6-1.40.24 (TeX Live 2022)
+
- changes:
+ - new primitive \showstream to redirect \show output.
+ - new primitives \partokenname, \partokencontext to control \par insertion.
- support structured destinations from PDF 2.0.
pdfTeX 3.141592653-2.6-1.40.23 (TeX Live 2021 post-release) (June 28, 2021)
Modified: branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,7 +1,7 @@
-## $Id: pdftex.am 60992 2021-11-07 22:51:07Z karl $
+## $Id: pdftex.am 61575 2022-01-11 22:47:10Z karl $
## texk/web2c/pdftexdir/am/pdftex.am: Makefile fragment for pdfTeX.
##
-## Copyright 2016-2021 Karl Berry <tex-live at tug.org>
+## Copyright 2016-2022 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
@@ -43,13 +43,13 @@
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
pdftexdir/pdftex_version.h pdftexdir/etex_version.h
$(pdftex_c_h): pdftex-web2c
- @$(web2c) pdftex
+ $(web2c) pdftex
pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
- @$(web2c) pdftex
+ $(web2c) pdftex
pdftex.p pdftex.pool: pdftex-tangle
- @$(pdf_tangle) pdftex pdftex-final
+ $(pdf_tangle) pdftex pdftex-final
pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex-final.ch tangle-sh
- @$(pdf_tangle) pdftex pdftex-final
+ $(pdf_tangle) pdftex pdftex-final
pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
$(makecpool) pdftex >$@ || rm -f $@
@@ -137,3 +137,5 @@
## partoken.test
EXTRA_DIST += tests/partoken-ok.tex tests/partoken-xfail.tex
DISTCLEANFILES += partoken-ok.log partoken-xfail.log
+
+# (end of pdftex.am)
Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web 2022-03-01 02:03:00 UTC (rev 874)
@@ -19929,11 +19929,11 @@
end;
print(" has been referenced but does not exist");
print_ln; print_ln;
- {pdf_begin_obj(k, 1);
+ @{pdf_begin_obj(k, 1);
pdf_out("[");
pdf_print_int(head_tab[obj_type_page]);
pdf_print_ln(" 0 R /Fit]");
- pdf_end_obj;}
+ pdf_end_obj;@}
end;
@ @<Check for non-existing structure destinations@>=
Modified: branches/stable/source/src/texk/web2c/showstream.ch
===================================================================
--- branches/stable/source/src/texk/web2c/showstream.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/showstream.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,3 +1,7 @@
+% $Id: showstream.ch 61589 2022-01-12 21:47:55Z karl $
+% Implementation of |\showstream|.
+% Public domain. Originally written by Marcel Kr\"uger, 2021.
+
Since we redirect content which is normally written to the terminal/log
to a write stream, print_nl will sometimes get called while selector is a write
stream. Therefore we adapt print_nl to handle that case properly.
@@ -9,7 +13,7 @@
end;
@y
procedure print_nl(@!s:str_number); {prints string |s| at beginning of line}
-begin if (selector<log_only)or((term_offset>0)and(odd(selector)))or@|
+begin if (selector<no_print)or((term_offset>0)and(odd(selector)))or@|
((file_offset>0)and(selector>=log_only)) then print_ln;
print(s);
end;
@@ -57,36 +61,24 @@
show_stream:=-1;
@z
-Then do the actual change: In |show_whatever| we save the old selector
-and then replace it based on |show_stream|. We don't need any changes
+Then do the actual change: In all cases of |show_whatever| we adjust the selector
+if |show_stream| is set. We don't need any changes
to |begin/end_diagnostic| since they don't do anything interesting if
|selector| isn't |term_and_log|.
+
+For |show_lists_code| this is done directly in |show_whatever|:
@x
-procedure show_whatever;
-label common_ending;
-var p:pointer; {tail of a token list to show}
-@!t:small_number; {type of conditional being shown}
-@!m:normal..or_code; {upper bound on |fi_or_else| codes}
-@!l:integer; {line where that conditional began}
-@!n:integer; {level of \.{\\if...\\fi} nesting}
-begin case cur_chr of
+show_lists_code: begin begin_diagnostic; show_activities;
+ end;
@y
-procedure show_whatever;
-label common_ending;
-var p:pointer; {tail of a token list to show}
-@!t:small_number; {type of conditional being shown}
-@!m:normal..or_code; {upper bound on |fi_or_else| codes}
-@!l:integer; {line where that conditional began}
-@!n:integer; {level of \.{\\if...\\fi} nesting}
-@!saved_selector:0..max_selector; {previous selector, separate from the global |old_setting|}
-begin saved_selector:=selector;
-if (show_stream>=0) and (show_stream<no_print) and write_open[show_stream] then
- selector:=show_stream;
-case cur_chr of
+show_lists_code:
+ begin @<Adjust |selector| based on |show_stream|@>
+ begin_diagnostic; show_activities;
+ end;
@z
The ending gets skipped if we changed the selector,
-but we have to restore |selector|.
+but we have to reset the |selector| based on the current interaction setting.
@x
@<Complete a potentially long \.{\\show} command@>;
common_ending: if interaction<error_stop_mode then
@@ -111,7 +103,8 @@
@<Complete a potentially long \.{\\show} command@>;
common_ending: if selector<no_print then
begin print_ln;
- selector:=saved_selector
+ @<Initialize the print |selector| based on |interaction|@>;
+ if log_opened then selector:=selector+2;
end
else begin if interaction<error_stop_mode then
begin help0; decr(error_count);
@@ -133,3 +126,50 @@
end;
end;
@z
+
+While the other cases have separate blocks
+ at x
+@ @<Show the current meaning of a token...@>=
+begin get_token;
+ at y
+@ @<Adjust |selector| based on |show_stream|@>=
+if (show_stream>=0) and (show_stream<no_print) and write_open[show_stream] then
+ selector:=show_stream;
+
+@ @<Show the current meaning of a token...@>=
+begin get_token;
+ @<Adjust |selector| based on |show_stream|@>
+ at z
+
+ at x
+@ @<Show the current contents of a box@>=
+begin scan_register_num; fetch_box(p); begin_diagnostic;
+ at y
+@ @<Show the current contents of a box@>=
+begin scan_register_num; fetch_box(p);
+@<Adjust |selector| based on |show_stream|@>
+begin_diagnostic;
+ at z
+
+ at x
+@ @<Show the current value of some parameter...@>=
+begin p:=the_toks;
+ at y
+@ @<Show the current value of some parameter...@>=
+begin p:=the_toks;
+@<Adjust |selector| based on |show_stream|@>
+ at z
+
+ at x
+show_groups: begin begin_diagnostic; show_save_groups;
+ at y
+show_groups: begin @<Adjust |selector| based on |show_stream|@>
+ begin_diagnostic; show_save_groups;
+ at z
+
+ at x
+show_ifs: begin begin_diagnostic; print_nl(""); print_ln;
+ at y
+show_ifs: begin @<Adjust |selector| based on |show_stream|@>
+ begin_diagnostic; print_nl(""); print_ln;
+ at z
Modified: branches/stable/source/src/texk/web2c/synctexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/ChangeLog 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/synctexdir/ChangeLog 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,3 +1,14 @@
+2022-01-22 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
+
+ * synctex.c: Reencode nameoffile to utf8 for pTeX.
+
+2021-12-16 Luigi Scarso <luigi.scarso at gmail.com>
+
+ * synctex_main.c [WIN32]: #include <kpathsea/progname.h>
+ * am/synctex.am (synctex_CPPFLAGS, synctex_LDADD) [MINGW32]:
+ include KPATHSEA_* variables.
+ https://tug.org/pipermail/tlbuild/2021q4/004983.html
+
2021-07-24 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* synctex_main.c (synctex_test_file):
Modified: branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am 2022-03-01 02:03:00 UTC (rev 874)
@@ -18,10 +18,14 @@
synctexdir/synctex_main.c
synctex_CPPFLAGS = -I$(srcdir)/synctexdir
+if MINGW32
+synctex_CPPFLAGS += $(KPATHSEA_INCLUDES)
+endif MINGW32
+
synctex_LDADD = $(libsynctex) $(ZLIB_LIBS)
if MINGW32
-synctex_LDADD += -lshlwapi
+synctex_LDADD += -lshlwapi $(KPATHSEA_LIBS)
endif MINGW32
$(synctex_OBJECTS): $(libsynctex)
Modified: branches/stable/source/src/texk/web2c/synctexdir/synctex.c
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/synctex.c 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/synctexdir/synctex.c 2022-03-01 02:03:00 UTC (rev 874)
@@ -301,7 +301,27 @@
#endif /* pdfTeX ... */
#endif /* _WIN32 */
+#if defined(pTeX) || defined(upTeX) || defined(epTeX) || defined(eupTeX)
+#define IS_pTeX 1
+#else
+#define IS_pTeX 0
+#endif
+
/* This macro layer was added to take luatex into account as suggested by T. Hoekwater. */
+# if IS_pTeX && !defined(_WIN32)
+char *SYNCTEX_GET_JOB_NAME()
+{
+ char *tmp = gettexstring(jobname);
+ char *tmpa = ptenc_from_internal_enc_string_to_utf8(tmp);
+ if (tmpa) { SYNCTEX_FREE(tmp); return tmpa; } else return tmp;
+}
+char *SYNCTEX_GET_LOG_NAME()
+{
+ char *tmp = gettexstring(texmflogname);
+ char *tmpa = ptenc_from_internal_enc_string_to_utf8(tmp);
+ if (tmpa) { SYNCTEX_FREE(tmp); return tmpa; } else return tmp;
+}
+# else
# if !defined(SYNCTEX_GET_JOB_NAME)
# define SYNCTEX_GET_JOB_NAME() (gettexstring(jobname))
# endif
@@ -308,6 +328,7 @@
# if !defined(SYNCTEX_GET_LOG_NAME)
# define SYNCTEX_GET_LOG_NAME() (gettexstring(texmflogname))
# endif
+# endif
# if !defined(SYNCTEX_CURRENT_TAG)
# define SYNCTEX_CURRENT_TAG (curinput.synctextagfield)
# endif
Modified: branches/stable/source/src/texk/web2c/synctexdir/synctex_main.c
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/synctex_main.c 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/synctexdir/synctex_main.c 2022-03-01 02:03:00 UTC (rev 874)
@@ -103,6 +103,11 @@
#endif
*/
+#ifdef WIN32
+# include <kpathsea/progname.h>
+#endif
+
+
#if SYNCTEX_DEBUG
# ifdef WIN32
# include <direct.h>
Modified: branches/stable/source/src/texk/web2c/tangle-sh.in
===================================================================
--- branches/stable/source/src/texk/web2c/tangle-sh.in 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/tangle-sh.in 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,7 +1,9 @@
#! @SHELL@
-# tangle-sh: shell script to invoke tangle (or ctangle, etc).
+# $Id: tangle-sh.in 61575 2022-01-11 22:47:10Z karl $
+# tangle-sh: shell script to invoke tangle, ctangle, otangle.
#
-# Copyright (C) 2009, 2012 Peter Breitenlohner <tex-live at tug.org>
+# Copyright 2015-2022 Karl Berry <tex-live at tug.org>
+# Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -8,18 +10,34 @@
# with or without modifications, as long as this notice is preserved.
#
# Tangle may create several files, e.g., tex.p and tex.pool from tex.web
-# and tex.ch. The naive rule
+# and tex.ch. The simple but naive rule
# tex.p tex.pool: tex.web tex.ch tangle$(EXEEXT)
# $(tangle) tex tex
-# could run 'tangle tex tex' twice in parallel and fail. To avoid this
-# and yet recover from removal of tex.p and/or tex.pool, we use an
-# auxiliary stamp file tex-tangle and the two rules
+# could run 'tangle tex tex' twice in parallel and thus fail.
+#
+# To avoid this and yet recover from removal of tex.p and/or tex.pool,
+# we use an auxiliary stamp file tex-tangle and the two identical rules:
# tex.p tex.pool: tex-tangle
+# # recover from deletion of target files:
# WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(TANGLE) tex tex
# tex-tangle: tex.web tex.ch tangle$(EXEEXT) tangle-sh
+# # normal build:
# WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(TANGLE) tex tex
-# Compare Automake manual (info Automake) 27.9: Multiple Outputs
#
+# Confusingly, both rules invoke this script (tangle-sh[.in]), but have
+# quite different purposes, as indicated above. As a result, make will
+# always run tangle-sh twice when a target needs to be rebuilt.
+#
+# The actual running of tangle happens in the second rule, when we are
+# making the stamp file. The first rule is to recover from deletion of
+# the derived files.
+#
+# This approach is in the Automake manual, Multiple Outputs node:
+# https://gnu.org/s/automake/manual/html_node/Multiple-Outputs.html
+#
+# By the way, the name of the stamp file (foo-tangle) is embedded both
+# in this script and in the various *.am files, so it can't be changed lightly.
+
TEXMFCNF=@srcdir@/../kpathsea; export TEXMFCNF
env="TEXMFCNF=$TEXMFCNF"
@@ -26,6 +44,7 @@
test "x$WEBINPUTS" = x || env="WEBINPUTS=$WEBINPUTS $env"
test "x$CWEBINPUTS" = x || env="CWEBINPUTS=$CWEBINPUTS $env"
+prg=`basename $0`
target=$1; shift
tangle=$1; shift
base=$1
@@ -33,13 +52,13 @@
do_tangle () {
echo timestamp >$stamp.tmp
if $AM_V_P; then
- echo "$env $tangle $@"
+ echo "$prg: $env $tangle $@"
$tangle "$@" || exit 1
else
case $base in
aleph | xetex) echo " OTANGLE " $base;;
- *tex | mf*) echo " TANGLE " $base;;
- *) echo " CTANGLE " $base;;
+ *tex | mf*) echo " TANGLE " $base;;
+ *) echo " CTANGLE " $base;;
esac
$tangle "$@" >$base.out 2>&1; rc=$?
test $rc -eq 0 || { cat $base.out; exit $rc; }
@@ -56,8 +75,14 @@
do_tangle "$@"
;;
*)
- # Recover from removal of $target
- test -f $target && exit 0
+ # Recover from removal of $target if necessary.
+ if test -f $target; then
+ $AM_V_P && echo "$prg: checking for $target ... ok"
+ exit 0
+ else
+ $AM_V_P && echo "$prg: recovering $target"
+ fi
+ #
trap "rm -rf $stamp $stamp.lock" 1 2 13 15
if mkdir $stamp.lock 2>/dev/null; then
# Code executed by the first process.
Modified: branches/stable/source/src/texk/web2c/tangle.ch
===================================================================
--- branches/stable/source/src/texk/web2c/tangle.ch 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/tangle.ch 2022-03-01 02:03:00 UTC (rev 874)
@@ -90,6 +90,7 @@
@!max_names=4000; {number of identifiers, strings, module names;
must be less than 10240}
@!max_texts=2000; {number of replacement texts, must be less than 10240}
+@!hash_size=353; {should be prime}
@y
@!max_bytes=65535; {|1/ww| times the number of bytes in identifiers,
strings, and module names; must be less than 65536}
@@ -98,6 +99,7 @@
@!max_names=10239; {number of identifiers, strings, module names;
must be less than 10240}
@!max_texts=10239; {number of replacement texts, must be less than 10240}
+@!hash_size=8501; {should be prime}
@z
@x
Modified: branches/stable/source/src/texk/web2c/tangleboot.pin
===================================================================
--- branches/stable/source/src/texk/web2c/tangleboot.pin 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/tangleboot.pin 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,7 +1,7 @@
{2:}{4:}{$C-,A+,D-}{[$C+,D+]}
{:4}program TANGLE(webfile,changefile,Pascalfile,pool);
const{8:}bufsize=1000;maxbytes=65535;maxtoks=65535;maxnames=10239;
-maxtexts=10239;hashsize=353;longestname=400;linelength=72;
+maxtexts=10239;hashsize=8501;longestname=400;linelength=72;
outbufsize=144;stacksize=100;maxidlength=50;defunambiglength=32;
{:8}type{11:}ASCIIcode=0..255;
{:11}{12:}textfile=packed file of ASCIIcode;{:12}{37:}eightbits=0..255;
Added: branches/stable/source/src/texk/web2c/tests/xeteximage.tex
===================================================================
--- branches/stable/source/src/texk/web2c/tests/xeteximage.tex (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/xeteximage.tex 2022-03-01 02:03:00 UTC (rev 874)
@@ -0,0 +1,76 @@
+% $Id: xeteximage.tex 61016 2021-11-10 15:35:19Z karl $
+% Copyright 2020 Bruno Voisin <tex-live at tug.org>
+% You may freely use, modify and/or distribute this file.
+%
+\ifx\fmtname\undefined
+ \input basic
+ \def\fmtname{basic}
+ \expandafter\dump
+\fi
+%==================
+\special{pdf:minorversion 7}
+
+\topskip0pt
+
+\hbox{\XeTeXpicfile "1-4.jpg" width \hsize height \vsize}
+\vfill\eject
+
+\hbox{\XeTeXpdffile "B.pdf" width \hsize height \vsize}
+\vfill\eject
+
+\hbox{\XeTeXpicfile "lily-ledger-broken.png" width \hsize height \vsize}
+\vfill\eject
+
+\vbox to\vsize{\vfill%
+ \special{pdf:image
+ width \the\hsize
+% height \the\vsize
+ (1-4.jpg)}}
+\eject
+
+\vbox to\vsize{\vfill%
+ \special{pdf:epdf
+ width \the\hsize
+% height \the\vsize
+ (B.pdf)}}
+\eject
+
+\vbox to\vsize{\vfill%
+ \special{pdf:image
+ width \the\hsize
+% height \the\vsize
+ (lily-ledger-broken.png)}}
+\eject
+
+\bye
+
+Date: Sat, 16 May 2020 01:33:51 +0200
+From: Bruno Voisin via tex-live <tex-live at tug.org>
+To: tex-live at tug.org
+Subject: Re: xetex test creation for reading pdf images?
+
+Here's a (very quickly) hacked adaptation of luaimage.tex to xetex. I commented out the format creation section at the beginning to test on my setup, after downloading
+
+Build/source/texk/web2c/luatexdir/tests/luaimage.tex
+
+Build/source/texk/web2c/tests/1-4.jpg
+Build/source/texk/web2c/tests/B.pdf
+Build/source/texk/web2c/tests/lily-ledger-broken.png
+
+Two forms of image inclusion commands are used:
+
+- \XeTeXpicfile and \XeTeXpdffile which are the original XeTeX commands,
+
+- \special{pdf:image and \special{pdf:epdf which are the (x)dvipdfm(x) specials,
+
+based on XeTeX-notes.pdf, xetex-reference.pdf, dvipdfm.pdf and dvipdfmx.pdf.
+
+There are some subtle differences between the two forms, not just their syntax but also the way they work. With the latter, specifying both the width and height in a way that alters the aspect ratio of the image does not seem to work: in this case, the image is nowhere to be seen.
+
+That's odd, because I looked at the associated xetex.def and dvipdfmx.def from the graphics package for double-checking and inspiration, and there seems to be no trick to deal with this, it seems to be business as usual with \Gin at req@width and \Gin at req@height.
+
+I won't be able to pursue the matter or maintain this file, it's just to get this thing started. (And I didn't attempt to modify the copyright at the beginning.)
+
+Bruno Voisin
+
+untyped binary data, xeteximage.tex [Press RETURN to save to a file]
Property changes on: branches/stable/source/src/texk/web2c/tests/xeteximage.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/texk/web2c/texmfmem.h
===================================================================
--- branches/stable/source/src/texk/web2c/texmfmem.h 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/texmfmem.h 2022-03-01 02:03:00 UTC (rev 874)
@@ -63,7 +63,7 @@
*/
/* Aleph is sufficiently different to separate the definition. */
-#if !defined(Aleph) && !defined(epTeX) && !defined(eupTeX) && !defined(upTeX)
+#if !defined(Aleph) && !defined(pTeX) && !defined(epTeX) && !defined(eupTeX) && !defined(upTeX)
typedef union
{
@@ -181,7 +181,7 @@
#define qqqq v.QQQQ
#endif
-#else /* Aleph || epTeX || eupTeX || upTeX */
+#else /* Aleph || pTeX || epTeX || eupTeX || upTeX */
typedef union
{
@@ -257,4 +257,4 @@
#define gr gg.GLUE
-#endif /* Aleph || epTeX || eupTeX || upTeX */
+#endif /* Aleph || pTeX || epTeX || eupTeX || upTeX */
Modified: branches/stable/source/src/texk/web2c/web2c/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/ChangeLog 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/web2c/ChangeLog 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,3 +1,26 @@
+2022-01-17 Karl Berry <karl at freefriends.org>
+
+ * Makefile.am (web2c_DEPENDENCIES),
+ (fixwrites_DEPENDENCIES),
+ (splitup_DEPENDENCIES): set empty, so that Automake doesn't
+ try to build libweb2c.a (what they'd be set to otherwise) in
+ parallel. This is probably why -L -lweb2c was used. Found by
+ Michael Orlitzky, https://tug.org/pipermail/tlbuild/2022q1/005021.html.
+
+ Why all the stamp files are needed still seems mysterious,
+ but moving on ...
+
+2022-01-15 Karl Berry <karl at freefriends.org>
+
+ * Makefile.am (web2c_LDADD): set to libweb2c.a
+ instead of -L. -lweb2c, for compatibility with slibtool,
+ and clarity. Report from Michael Orlitzky,
+ tex-k 15 Jan 2022 13:28:41.
+
+2022-01-06 Andreas Scherer <https://ascherer.github.io>
+
+ * common.defines: New TWILLHELP.
+
2021-03-23 Karl Berry <karl at tug.org>
* TL'21.
Modified: branches/stable/source/src/texk/web2c/web2c/Makefile.am
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/Makefile.am 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/web2c/Makefile.am 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,8 +1,10 @@
+## $Id$
## Makefile.am for the TeX Live subdirectory texk/web2c/web2c/.
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2022 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2009-2014 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
-##
+
AM_CPPFLAGS = -I$(srcdir)/../..
AM_YFLAGS = -d -v
AM_CFLAGS = $(WARNING_CFLAGS)
@@ -46,31 +48,27 @@
kps.c
$(libweb2c_a_OBJECTS): w2c/config.h
-
web2c_SOURCES = \
web2c-parser.y \
web2c-lexer.l \
main.c \
web2c.h
-
$(web2c_OBJECTS): web2c-parser.h stamp-lib
-
-web2c_LDADD = -L. -lweb2c
-
+web2c_DEPENDENCIES = # don't build libweb2c.a in parallel
+web2c_LDADD = libweb2c.a
+#
DISTCLEANFILES += web2c-parser.output
fixwrites_SOURCES = \
fixwrites.c
-
$(fixwrites_OBJECTS): stamp-lib
-
+fixwrites_DEPENDENCIES = # don't build libweb2c.a in parallel
fixwrites_LDADD = $(web2c_LDADD)
splitup_SOURCES = \
splitup.c
-
$(splitup_OBJECTS): stamp-lib
-
+splitup_DEPENDENCIES = # don't build libweb2c.a in parallel
splitup_LDADD = $(web2c_LDADD)
makecpool_SOURCES = \
@@ -106,4 +104,3 @@
distclean-local:
rm -rf kpathsea w2c
-
Modified: branches/stable/source/src/texk/web2c/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/Makefile.in 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/web2c/Makefile.in 2022-03-01 02:03:00 UTC (rev 874)
@@ -127,8 +127,6 @@
libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
-am__DEPENDENCIES_1 =
-fixwrites_DEPENDENCIES = $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_ at AM_V@)
am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -138,11 +136,9 @@
makecpool_LDADD = $(LDADD)
am_splitup_OBJECTS = splitup.$(OBJEXT)
splitup_OBJECTS = $(am_splitup_OBJECTS)
-splitup_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \
main.$(OBJEXT)
web2c_OBJECTS = $(am_web2c_OBJECTS)
-web2c_DEPENDENCIES =
SCRIPTS = $(dist_noinst_SCRIPTS)
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
@@ -396,6 +392,7 @@
AM_CFLAGS = $(WARNING_CFLAGS)
EXTRA_LIBRARIES = libweb2c.a
BUILT_SOURCES = w2c/config.h
+#
DISTCLEANFILES = w2c/config.h web2c-parser.output
noinst_HEADERS = coerce.h
dist_noinst_SCRIPTS = convert
@@ -416,14 +413,17 @@
main.c \
web2c.h
-web2c_LDADD = -L. -lweb2c
+web2c_DEPENDENCIES = # don't build libweb2c.a in parallel
+web2c_LDADD = libweb2c.a
fixwrites_SOURCES = \
fixwrites.c
+fixwrites_DEPENDENCIES = # don't build libweb2c.a in parallel
fixwrites_LDADD = $(web2c_LDADD)
splitup_SOURCES = \
splitup.c
+splitup_DEPENDENCIES = # don't build libweb2c.a in parallel
splitup_LDADD = $(web2c_LDADD)
makecpool_SOURCES = \
makecpool.c
@@ -974,11 +974,8 @@
fi
$(libweb2c_a_OBJECTS): w2c/config.h
-
$(web2c_OBJECTS): web2c-parser.h stamp-lib
-
$(fixwrites_OBJECTS): stamp-lib
-
$(splitup_OBJECTS): stamp-lib
stamp-lib:
Modified: branches/stable/source/src/texk/web2c/web2c/common.defines
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/common.defines 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/web2c/common.defines 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,4 +1,4 @@
-{$Id: common.defines 53078 2019-12-10 18:39:13Z karl $
+{$Id: common.defines 61509 2022-01-06 11:08:43Z ascherer $
common.defines. Public domain.
This file is concatenated by ./convert to the beginning of the Pascal
@@ -94,6 +94,7 @@
@define const VFTOVPHELP;
@define const VPTOVFHELP;
@define const WEAVEHELP;
+ at define const TWILLHELP;
@define function abs ();
@define function addressof ();
Modified: branches/stable/source/src/texk/web2c/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/configure 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/texk/web2c/web2c/configure 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Web2C Tools 2022/dev.
+# Generated by GNU Autoconf 2.71 for Web2C Tools 2022.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -621,8 +621,8 @@
# Identity of this package.
PACKAGE_NAME='Web2C Tools'
PACKAGE_TARNAME='web2c-tools'
-PACKAGE_VERSION='2022/dev'
-PACKAGE_STRING='Web2C Tools 2022/dev'
+PACKAGE_VERSION='2022'
+PACKAGE_STRING='Web2C Tools 2022'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1365,7 +1365,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Web2C Tools 2022/dev to adapt to many kinds of systems.
+\`configure' configures Web2C Tools 2022 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1436,7 +1436,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C Tools 2022/dev:";;
+ short | recursive ) echo "Configuration of Web2C Tools 2022:";;
esac
cat <<\_ACEOF
@@ -1559,7 +1559,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C Tools configure 2022/dev
+Web2C Tools configure 2022
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2315,7 +2315,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Web2C Tools $as_me 2022/dev, which was
+It was created by Web2C Tools $as_me 2022, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -8637,7 +8637,7 @@
# Define the identity of the package.
PACKAGE='web2c-tools'
- VERSION='2022/dev'
+ VERSION='2022'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -15371,7 +15371,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C Tools $as_me 2022/dev, which was
+This file was extended by Web2C Tools $as_me 2022, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15439,7 +15439,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-Web2C Tools config.status 2022/dev
+Web2C Tools config.status 2022
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/utils/Makefile.in
===================================================================
--- branches/stable/source/src/utils/Makefile.in 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/utils/Makefile.in 2022-03-01 02:03:00 UTC (rev 874)
@@ -420,23 +420,6 @@
# Files not to be distributed
recurse_this = utils/
recurse_top = ../
-
-# am/recurse.am: Makefile fragment to configure and build subdirs.
-#
-# Copyright 2017-2020 Karl Berry <tex-live at tug.org>
-# Copyright 2013 Peter Breitenlohner <tex-live at tug.org>
-# You may freely use, modify and/or distribute this file.
-#
-# Requires $(recurse_this) and $(recurse_top).
-# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
-#
-# For subdirs not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because, e.g., some required libraries were not built.
-# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
-#
-# Code inspired by automake's way to handle recursive targets.
-#
cf_silent = $(cf_silent_ at AM_V@)
cf_silent_ = $(cf_silent_ at AM_DEFAULT_V@)
cf_silent_0 = --silent
@@ -947,6 +930,8 @@
@echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
exit 1
+# (end of recurse.am)
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/stable/source/src/utils/README
===================================================================
--- branches/stable/source/src/utils/README 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/utils/README 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,10 +1,10 @@
-$Id: README 60823 2021-10-21 18:17:33Z karl $
+$Id: README 61904 2022-02-05 22:26:16Z karl $
Public domain. Originally written 2005 by Karl Berry.
Extra utilities we (optionally) compile for TeX Live.
See comments in ../texk/README.
-asymptote 2.70 - checked 15mar21
+asymptote 2.78 - checked 5feb22
update to TL from CTAN, to include prebuilt doc.
see https://tug.org/texlive/build.html#asymptote
and tlpkg/bin/tl-update-asy
Modified: branches/stable/source/src/utils/configure
===================================================================
--- branches/stable/source/src/utils/configure 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/utils/configure 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for TeX Live utils 2022/dev.
+# Generated by GNU Autoconf 2.71 for TeX Live utils 2022.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -610,8 +610,8 @@
# Identity of this package.
PACKAGE_NAME='TeX Live utils'
PACKAGE_TARNAME='tex-live-utils'
-PACKAGE_VERSION='2022/dev'
-PACKAGE_STRING='TeX Live utils 2022/dev'
+PACKAGE_VERSION='2022'
+PACKAGE_STRING='TeX Live utils 2022'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1438,7 +1438,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live utils 2022/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live utils 2022 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,7 +1509,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live utils 2022/dev:";;
+ short | recursive ) echo "Configuration of TeX Live utils 2022:";;
esac
cat <<\_ACEOF
@@ -1561,7 +1561,7 @@
--disable-euptex do not compile and install e-upTeX
--disable-euptex-synctex build e-upTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
- --enable-hitex compile and install HiTeX
+ --disable-hitex do not compile and install HiTeX
--disable-pdftex do not compile and install pdfTeX
--disable-pdftex-synctex build pdfTeX without SyncTeX support
--disable-luatex do not compile and install LuaTeX
@@ -1796,7 +1796,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live utils configure 2022/dev
+TeX Live utils configure 2022
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1919,7 +1919,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live utils $as_me 2022/dev, which was
+It was created by TeX Live utils $as_me 2022, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4571,7 +4571,7 @@
yes | no) :
;; #(
*) :
- enable_hitex=no ;;
+ enable_hitex=yes ;;
esac
test "x$enable_web2c:$enable_hitex" = xyes:yes && {
@@ -6973,7 +6973,7 @@
# Define the identity of the package.
PACKAGE='tex-live-utils'
- VERSION='2022/dev'
+ VERSION='2022'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -7978,7 +7978,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live utils $as_me 2022/dev, which was
+This file was extended by TeX Live utils $as_me 2022, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8037,7 +8037,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-TeX Live utils config.status 2022/dev
+TeX Live utils config.status 2022
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/version.ac
===================================================================
--- branches/stable/source/src/version.ac 2021-11-09 16:13:48 UTC (rev 873)
+++ branches/stable/source/src/version.ac 2022-03-01 02:03:00 UTC (rev 874)
@@ -1,5 +1,5 @@
-dnl $Id: version.ac 58897 2021-04-17 21:02:42Z karl $
-dnl Copyright 2016-2021 Karl Berry <tex-live at tug.org>
+dnl $Id: version.ac 61654 2022-01-18 22:17:46Z karl $
+dnl Copyright 2016-2022 Karl Berry <tex-live at tug.org>
dnl Copyright 2010-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
dnl This file is free software; the copyright holder
@@ -9,4 +9,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current TeX Live version
-m4_define([tex_live_version], [2022/dev])
+m4_define([tex_live_version], [2022])
More information about the pdftex-commits
mailing list.