diff --git a/source/configure b/source/configure
index 26483169d3774b8af15d3532e40333550a21ae79..1f9fe2cb8459c2d05838ece09c4822344d35cce5 100755
--- a/source/configure
+++ b/source/configure
@@ -816,6 +816,23 @@ enable_native_texlive_build
enable_multiplatform
enable_cxx_runtime_hack
enable_libtool_hack
+enable_autosp
+enable_axodraw2
+enable_devnag
+enable_lacheck
+enable_m_tx
+enable_pmx
+enable_ps2eps
+enable_t1utils
+enable_texdoctk
+enable_tpic2pdftex
+enable_vlna
+enable_xindy
+enable_xindy_rules
+enable_xindy_docs
+with_clisp_runtime
+enable_xml2pmx
+enable_xpdfopen
enable_web2c
with_banner_add
with_editor
@@ -864,15 +881,81 @@ enable_tektronixwin
enable_unitermwin
enable_web_progs
enable_synctex
+enable_afm2pl
+enable_bibtex_x
+enable_bibtex8
+enable_bibtexu
+enable_chktex
+enable_cjkutils
+enable_detex
+enable_dtl
+enable_dvi2tty
+enable_dvidvi
+enable_dviljk
+enable_dviout_util
+enable_dvipdfm_x
+enable_dvipng
+enable_debug
+enable_timing
+with_gs
+enable_dvipos
+enable_dvipsk
+enable_dvisvgm
+enable_gregorio
+enable_gsftopk
+enable_lcdf_typetools
+enable_cfftot1
+enable_mmafm
+enable_mmpfb
+enable_otfinfo
+enable_otftotfm
+enable_t1dotlessj
+enable_t1lint
+enable_t1rawafm
+enable_t1reencode
+enable_t1testpage
+enable_ttftotype42
+enable_updmap
+enable_makeindexk
+enable_makejvf
+enable_mendexk
+enable_musixtnt
+enable_ps2pk
+enable_psutils
+enable_seetexk
+enable_tex4htk
+enable_ttf2pk2
+enable_ttfdump
+enable_upmendex
+enable_xdvik
+with_xdvi_x_toolkit
enable_texlive
enable_linked_scripts
with_system_harfbuzz
+with_system_icu
+with_system_teckit
with_system_graphite2
with_system_zziplib
+with_system_mpfr
+with_mpfr_includes
+with_mpfr_libdir
+with_system_gmp
+with_gmp_includes
+with_gmp_libdir
+with_system_cairo
+with_system_pixman
+with_system_gd
+with_gd_includes
+with_gd_libdir
+with_system_freetype2
with_system_libpng
+with_system_libpaper
+with_libpaper_includes
+with_libpaper_libdir
with_system_zlib
with_zlib_includes
with_zlib_libdir
+with_system_ptexenc
with_system_kpathsea
enable_mktexmf_default
enable_mktexpk_default
@@ -1552,6 +1635,22 @@ Optional Features:
lib/PLATFORM
--enable-cxx-runtime-hack link C++ runtime statically
--enable-libtool-hack ignore libtool dependency_libs
+ --disable-autosp do not build the autosp package
+ --disable-axodraw2 do not build the axodraw2 package
+ --disable-devnag do not build the devnag package
+ --disable-lacheck do not build the lacheck package
+ --disable-m-tx do not build the m-tx package
+ --disable-pmx do not build the pmx package
+ --disable-ps2eps do not build the ps2eps package
+ --disable-t1utils do not build the t1utils package
+ --disable-texdoctk do not build the texdoctk package
+ --disable-tpic2pdftex do not build the tpic2pdftex package
+ --disable-vlna do not build the vlna package
+ --enable-xindy build the xindy package
+ --enable-xindy-rules build and install make-rules package
+ --enable-xindy-docs build and install documentation
+ --disable-xml2pmx do not build the xml2pmx package
+ --disable-xpdfopen do not build the xpdfopen package
--disable-web2c do not build the web2c (TeX & Co.) package
--enable-auto-core cause TeX&MF to dump core, given a certain
filename
@@ -1600,6 +1699,57 @@ Optional Features:
--enable-unitermwin include Uniterm window support
--disable-web-progs do not build WEB programs bibtex ... weave
--disable-synctex do not build the SyncTeX library and tool
+ --disable-afm2pl do not build the afm2pl package
+ --disable-bibtex-x do not build the bibtex-x package
+ --disable-bibtex8 do not build the bibtex8 program
+ --disable-bibtexu do not build the bibtexu program
+ --disable-chktex do not build the chktex package
+ --disable-cjkutils do not build the cjkutils package
+ --disable-detex do not build the detex package
+ --disable-dtl do not build the dtl package
+ --disable-dvi2tty do not build the dvi2tty package
+ --disable-dvidvi do not build the dvidvi package
+ --disable-dviljk do not build the dviljk package
+ --disable-dviout-util do not build the dviout-util package
+ --disable-dvipdfm-x do not build the dvipdfm-x package
+ --disable-dvipng do not build the dvipng package
+ --disable-debug Compile without debug (-d) option
+ --enable-timing Output execution time of dvipng
+ --disable-dvipos do not build the dvipos package
+ --disable-dvipsk do not build the dvipsk package
+ --disable-dvisvgm do not build the dvisvgm package
+ --disable-gregorio do not build the gregorio package
+ --disable-gsftopk do not build the gsftopk package
+ --disable-lcdf-typetools
+ do not build the lcdf-typetools package
+ --disable-cfftot1 do not build the cfftot1 program
+ --disable-mmafm do not build the mmafm program
+ --disable-mmpfb do not build the mmpfb program
+ --disable-otfinfo do not build the otfinfo program
+ --disable-otftotfm do not build the otftotfm program
+ --disable-t1dotlessj do not build the t1dotlessj program
+ --disable-t1lint do not build the t1lint program
+ --disable-t1rawafm do not build the t1rawafm program
+ --disable-t1reencode do not build the t1reencode program
+ --disable-t1testpage do not build the t1testpage program
+ --disable-ttftotype42 do not build the ttftotype42 program
+ --disable-auto-cfftot1 disable running cfftot1 from otftotfm
+ --disable-auto-t1dotlessj disable running t1dotlessj from otftotfm
+ --disable-auto-ttftotype42
+ disable running ttftotype42 from otftotfm
+ --disable-auto-updmap disable running updmap from otftotfm
+ --disable-makeindexk do not build the makeindexk package
+ --disable-makejvf do not build the makejvf package
+ --disable-mendexk do not build the mendexk package
+ --disable-musixtnt do not build the musixtnt package
+ --disable-ps2pk do not build the ps2pk package
+ --disable-psutils do not build the psutils package
+ --disable-seetexk do not build the seetexk package
+ --disable-tex4htk do not build the tex4htk package
+ --disable-ttf2pk2 do not build the ttf2pk2 package
+ --disable-ttfdump do not build the ttfdump package
+ --disable-upmendex do not build the upmendex package
+ --disable-xdvik do not build the xdvik package
--disable-texlive do not build the texlive (TeX Live scripts) package
--disable-linked-scripts do not install the linked scripts
--disable-mktexmf-default do not run mktexmf if MF source missing
@@ -1631,22 +1781,57 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-clisp-runtime=PATH
+ pathname of clisp runtime to install for `xindy',
+ `default' to derive from clisp, or `system' to use
+ installed version
--with-banner-add=STR add STR to version string appended to banner lines
--with-editor=CMD invoke CMD from the `e' option [vi +%d '%s'] or
[texworks --position=%d "%s"]
--with-mf-x-toolkit use X toolkit for METAFONT
+ --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript
+ --with-xdvi-x-toolkit=KIT
+ Use toolkit KIT (xaw/motif/xaw3d/neXtaw) for xdvi
+ [default: Xaw]
--with-system-harfbuzz use installed harfbuzz headers and library (requires
pkg-config)
+ --with-system-icu use installed ICU headers and libraries (requires
+ pkg-config or icu-config)
+ --with-system-teckit use installed teckit headers and library (requires
+ pkg-config)
--with-system-graphite2 use installed graphite2 headers and library
(requires pkg-config)
--with-system-zziplib use installed zziplib headers and library (requires
pkg-config)
+ --with-system-mpfr use installed mpfr headers and library
+ --with-mpfr-includes=DIR
+ mpfr headers installed in DIR
+ --with-mpfr-libdir=DIR mpfr library installed in DIR
+ --with-system-gmp use installed gmp headers and library
+ --with-gmp-includes=DIR gmp headers installed in DIR
+ --with-gmp-libdir=DIR gmp library installed in DIR
+ --with-system-cairo use installed cairo headers and library (requires
+ pkg-config)
+ --with-system-pixman use installed pixman headers and library (requires
+ pkg-config)
+ --with-system-gd use installed gd headers and library
+ --with-gd-includes=DIR gd headers installed in DIR
+ --with-gd-libdir=DIR gd library installed in DIR
+ --with-system-freetype2 use installed freetype2 headers and library
+ (requires freetype-config)
--with-system-libpng use installed libpng headers and library (requires
pkg-config)
+ --with-system-libpaper use installed libpaper headers and library
+ --with-libpaper-includes=DIR
+ libpaper headers installed in DIR
+ --with-libpaper-libdir=DIR
+ libpaper library installed in DIR
--with-system-zlib use installed zlib headers and library
--with-zlib-includes=DIR
zlib headers installed in DIR
--with-zlib-libdir=DIR zlib library installed in DIR
+ --with-system-ptexenc use installed ptexenc headers and library (requires
+ pkg-config)
--with-system-kpathsea use installed kpathsea headers and library (requires
pkg-config)
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
@@ -4787,6 +4972,332 @@ printf "%s\n" "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
esac ;;
esac
+## utils/autosp/ac/withenable.ac: configure.ac fragment for Tl subdir
+## configure options and TL libraries required for autosp.
+# Check whether --enable-autosp was given.
+if test ${enable_autosp+y}
+then :
+ enableval=$enable_autosp;
+fi
+case $enable_autosp in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_autosp=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-autosp=$enable_autosp'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-autosp=$enable_autosp'"
+ ;;
+esac
+
+## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries for axodraw2.
+# Check whether --enable-axodraw2 was given.
+if test ${enable_axodraw2+y}
+then :
+ enableval=$enable_axodraw2;
+fi
+case $enable_axodraw2 in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_axodraw2=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-axodraw2=$enable_axodraw2'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-axodraw2=$enable_axodraw2'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-axodraw2=$enable_axodraw2'"
+ ;;
+esac
+
+## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/
+## configure options and TL libraries required for devnag
+# Check whether --enable-devnag was given.
+if test ${enable_devnag+y}
+then :
+ enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_devnag=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
+ ;;
+esac
+
+## utils/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/lacheck/
+## configure options and TL libraries required for lacheck
+# Check whether --enable-lacheck was given.
+if test ${enable_lacheck+y}
+then :
+ enableval=$enable_lacheck;
+fi
+case $enable_lacheck in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_lacheck=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-lacheck=$enable_lacheck'"
+ ;;
+esac
+
+## utils/m-tx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/m-tx/
+## configure options and TL libraries required for mtx
+# Check whether --enable-m-tx was given.
+if test ${enable_m_tx+y}
+then :
+ enableval=$enable_m_tx;
+fi
+case $enable_m_tx in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_m_tx=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-m-tx=$enable_m_tx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-m-tx=$enable_m_tx'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-m-tx=$enable_m_tx'"
+ ;;
+esac
+
+## utils/pmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pmx/
+## configure options and TL libraries required for pmx
+# Check whether --enable-pmx was given.
+if test ${enable_pmx+y}
+then :
+ enableval=$enable_pmx;
+fi
+case $enable_pmx in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_pmx=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-pmx=$enable_pmx'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-pmx=$enable_pmx'"
+ ;;
+esac
+
+## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/
+## configure options and TL libraries required for ps2eps
+# Check whether --enable-ps2eps was given.
+if test ${enable_ps2eps+y}
+then :
+ enableval=$enable_ps2eps;
+fi
+case $enable_ps2eps in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_ps2eps=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-ps2eps=$enable_ps2eps'"
+ ;;
+esac
+
+## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/
+## configure options and TL libraries required for t1utils
+# Check whether --enable-t1utils was given.
+if test ${enable_t1utils+y}
+then :
+ enableval=$enable_t1utils;
+fi
+case $enable_t1utils in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_t1utils=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-t1utils=$enable_t1utils'"
+ ;;
+esac
+
+## utils/texdoctk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/texdoctk/
+## configure options and TL libraries required for texdoctk
+# Check whether --enable-texdoctk was given.
+if test ${enable_texdoctk+y}
+then :
+ enableval=$enable_texdoctk;
+fi
+case $enable_texdoctk in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_texdoctk=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-texdoctk=$enable_texdoctk'"
+ ;;
+esac
+
+## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/
+## configure options and TL libraries required for tpic2pdftex
+# Check whether --enable-tpic2pdftex was given.
+if test ${enable_tpic2pdftex+y}
+then :
+ enableval=$enable_tpic2pdftex;
+fi
+case $enable_tpic2pdftex in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_tpic2pdftex=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-tpic2pdftex=$enable_tpic2pdftex'"
+ ;;
+esac
+
+## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/
+## configure options and TL libraries required for vlna
+# Check whether --enable-vlna was given.
+if test ${enable_vlna+y}
+then :
+ enableval=$enable_vlna;
+fi
+case $enable_vlna in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_vlna=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-vlna=$enable_vlna'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-vlna=$enable_vlna'"
+ ;;
+esac
+
+## utils/xindy/ac/withenable.ac: configure.ac fragment for TL subdir
+## configure options and TL libraries required for xindy.
+# Check whether --enable-xindy was given.
+if test ${enable_xindy+y}
+then :
+ enableval=$enable_xindy;
+fi
+case $enable_xindy in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_xindy=no
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'"
+ ;;
+esac
+
+## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+## configure options for xindy
+# Check whether --enable-xindy-rules was given.
+if test ${enable_xindy_rules+y}
+then :
+ enableval=$enable_xindy_rules;
+fi
+# Check whether --enable-xindy-docs was given.
+if test ${enable_xindy_docs+y}
+then :
+ enableval=$enable_xindy_docs;
+fi
+
+# Check whether --with-clisp-runtime was given.
+if test ${with_clisp_runtime+y}
+then :
+ withval=$with_clisp_runtime;
+fi
+
+## utils/xindy/ac/clisp.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+## configure checks for xindy and clisp
+case $with_clisp_runtime in #(
+ default) :
+ ;; #(
+ system) :
+ if test "x$enable_native_texlive_build" = xyes
+then :
+ as_fn_error $? "you can not use the installed clisp for a native TeX Live build" "$LINENO" 5
+fi ;; #(
+ "") :
+ if test "x$enable_native_texlive_build" = xyes
+then :
+ with_clisp_runtime=default
+else $as_nop
+ with_clisp_runtime=system
+fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&5
+printf "%s\n" "$as_me: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&6;}
+ ac_configure_args="$ac_configure_args '--with-clisp-runtime=$with_clisp_runtime'" ;; #(
+ *) :
+ if test ! -f "$with_clisp_runtime"
+then :
+ as_fn_error $? "no such file: \"$with_clisp_runtime\"" "$LINENO" 5
+fi ;;
+esac
+
+## utils/xml2pmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xml2pmx/
+## configure options and TL libraries required for xml2pmx
+# Check whether --enable-xml2pmx was given.
+if test ${enable_xml2pmx+y}
+then :
+ enableval=$enable_xml2pmx;
+fi
+case $enable_xml2pmx in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_xml2pmx=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xml2pmx=$enable_xml2pmx'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xml2pmx=$enable_xml2pmx'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-xml2pmx=$enable_xml2pmx'"
+ ;;
+esac
+
+## utils/xpdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xpdfopen/
+## configure options and TL libraries required for xpdfopen
+# Check whether --enable-xpdfopen was given.
+if test ${enable_xpdfopen+y}
+then :
+ enableval=$enable_xpdfopen;
+fi
+if test "x$with_x" = xno
+then :
+ case $enable_xpdfopen in #(
+ "") :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xpdfopen'" >&5
+printf "%s\n" "$as_me: \`--without-x' -> \`--disable-xpdfopen'" >&6;}
+ enable_xpdfopen=no
+ ac_configure_args="$ac_configure_args '--disable-xpdfopen'" ;; #(
+ yes) :
+ as_fn_error $? "Sorry, incompatible options \`--without-x' and \`--enable-xpdfopen'" "$LINENO" 5 ;; #(
+ *) :
+ ;;
+esac
+fi
+case $enable_xpdfopen in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_xpdfopen=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-xpdfopen=$enable_xpdfopen'"
+ ;;
+esac
+
## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
## configure options and TL libraries required for web2c
@@ -5307,107 +5818,1038 @@ then :
fi
-## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
-## configure options and TL libraries required for texlive
-# Check whether --enable-texlive was given.
-if test ${enable_texlive+y}
+## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
+## configure options and TL libraries required for afm2pl
+# Check whether --enable-afm2pl was given.
+if test ${enable_afm2pl+y}
then :
- enableval=$enable_texlive;
+ enableval=$enable_afm2pl;
fi
-case $enable_texlive in #(
+case $enable_afm2pl in #(
yes|no) :
;; #(
*) :
- enable_texlive=$enable_all_pkgs
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
-printf "%s\n" "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;}
- ac_configure_args="$ac_configure_args '--enable-texlive=$enable_texlive'"
+ enable_afm2pl=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'"
;;
esac
-## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
-## configure options for texlive
-# Check whether --enable-linked-scripts was given.
-if test ${enable_linked_scripts+y}
+test "x$enable_afm2pl" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/bibtex-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
+## configure options and TL libraries required for bibtex-x
+# Check whether --enable-bibtex-x was given.
+if test ${enable_bibtex_x+y}
then :
- enableval=$enable_linked_scripts;
+ enableval=$enable_bibtex_x;
fi
+case $enable_bibtex_x in #(
+ yes|no) :
+ ;; #(
+ *) :
+ enable_bibtex_x=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-bibtex-x=$enable_bibtex_x'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-bibtex-x=$enable_bibtex_x'"
+ ;;
+esac
-## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
-## configure options and TL libraries required for pplib
-
-## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
-## configure options and TL libraries required for harfbuzz
+test "x$enable_bibtex_x" = xno || {
+ need_kpathsea=yes
+}
-# Check whether --with-system-harfbuzz was given.
-if test ${with_system_harfbuzz+y}
+## texk/bibtex-x/ac/bibtex-x.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
+## configure options for bibtex-x
+# Check whether --enable-bibtex8 was given.
+if test ${enable_bibtex8+y}
then :
- withval=$with_system_harfbuzz;
-fi
-if test "x$with_system_harfbuzz" = x; then
- if test -f $srcdir/libs/harfbuzz/configure; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
-printf "%s\n" "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
- with_system_harfbuzz=no
- else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
-printf "%s\n" "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
- with_system_harfbuzz=yes
- fi
- ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
-elif test "x$with_system_harfbuzz" = xyes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`harfbuzz' headers and library" >&5
-printf "%s\n" "$as_me: Using installed \`harfbuzz' headers and library" >&6;}
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`harfbuzz' headers and library from TL tree" >&5
-printf "%s\n" "$as_me: Using \`harfbuzz' headers and library from TL tree" >&6;}
- if test "x$with_system_harfbuzz" != xno; then
- with_system_harfbuzz=no
- ac_configure_args="$ac_configure_args '--without-system-harfbuzz'"
- fi
+ enableval=$enable_bibtex8;
fi
-if test "x$with_system_harfbuzz" = xyes; then
- if test "x$with_system_graphite2" = x; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -> installed \`graphite2' headers and library" >&5
-printf "%s\n" "$as_me: -> installed \`graphite2' headers and library" >&6;}
- with_system_graphite2=yes
- ac_configure_args="$ac_configure_args '--with-system-graphite2'"
- elif test "x$with_system_graphite2" != xyes; then
- as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-graphite2'" "$LINENO" 5
- fi
- if test "x$with_system_icu" = x; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -> installed \`icu' headers and library" >&5
-printf "%s\n" "$as_me: -> installed \`icu' headers and library" >&6;}
- with_system_icu=yes
- ac_configure_args="$ac_configure_args '--with-system-icu'"
- elif test "x$with_system_icu" != xyes; then
- as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-icu'" "$LINENO" 5
- fi
+
+case $enable_bibtex8 in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_bibtex8=yes ;;
+esac
+# Check whether --enable-bibtexu was given.
+if test ${enable_bibtexu+y}
+then :
+ enableval=$enable_bibtexu;
fi
-test "x$need_harfbuzz" = xyes && {
- need_graphite2=yes
- need_icu=yes
-}
+case $enable_bibtexu in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_bibtexu=yes ;;
+esac
-## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/
-## configure options and TL libraries required for graphite2
+test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes
-# Check whether --with-system-graphite2 was given.
-if test ${with_system_graphite2+y}
+## texk/chktex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/chktex/
+## configure options and TL libraries required for chktex
+# Check whether --enable-chktex was given.
+if test ${enable_chktex+y}
then :
- withval=$with_system_graphite2;
+ enableval=$enable_chktex;
fi
-if test "x$with_system_graphite2" = x; then
- if test -f $srcdir/libs/graphite2/configure; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
-printf "%s\n" "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
- with_system_graphite2=no
- else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
-printf "%s\n" "$as_me: Assuming installed \`graphite2' headers and library" >&6;}
+case $enable_chktex in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_chktex=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-chktex=$enable_chktex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-chktex=$enable_chktex'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-chktex=$enable_chktex'"
+ ;;
+esac
+
+test "x$enable_chktex" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/
+## configure options and TL libraries required for cjkutils
+# Check whether --enable-cjkutils was given.
+if test ${enable_cjkutils+y}
+then :
+ enableval=$enable_cjkutils;
+fi
+case $enable_cjkutils in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_cjkutils=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-cjkutils=$enable_cjkutils'"
+ ;;
+esac
+
+test "x$enable_cjkutils" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/
+## configure options and TL libraries required for detex
+# Check whether --enable-detex was given.
+if test ${enable_detex+y}
+then :
+ enableval=$enable_detex;
+fi
+case $enable_detex in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_detex=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-detex=$enable_detex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-detex=$enable_detex'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-detex=$enable_detex'"
+ ;;
+esac
+
+test "x$enable_detex" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
+## configure options and TL libraries required for dtl
+# Check whether --enable-dtl was given.
+if test ${enable_dtl+y}
+then :
+ enableval=$enable_dtl;
+fi
+case $enable_dtl in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_dtl=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dtl=$enable_dtl'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dtl=$enable_dtl'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-dtl=$enable_dtl'"
+ ;;
+esac
+
+test "x$enable_dtl" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/
+## configure options and TL libraries required for dvi2tty
+# Check whether --enable-dvi2tty was given.
+if test ${enable_dvi2tty+y}
+then :
+ enableval=$enable_dvi2tty;
+fi
+case $enable_dvi2tty in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_dvi2tty=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-dvi2tty=$enable_dvi2tty'"
+ ;;
+esac
+
+test "x$enable_dvi2tty" = xno || {
+ need_ptexenc=yes
+}
+
+## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/
+## configure options and TL libraries required for dvidvi
+# Check whether --enable-dvidvi was given.
+if test ${enable_dvidvi+y}
+then :
+ enableval=$enable_dvidvi;
+fi
+case $enable_dvidvi in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_dvidvi=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-dvidvi=$enable_dvidvi'"
+ ;;
+esac
+
+test "x$enable_dvidvi" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/
+## configure options and TL libraries required for dviljk
+# Check whether --enable-dviljk was given.
+if test ${enable_dviljk+y}
+then :
+ enableval=$enable_dviljk;
+fi
+case $enable_dviljk in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_dviljk=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dviljk=$enable_dviljk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-dviljk=$enable_dviljk'"
+ ;;
+esac
+
+test "x$enable_dviljk" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/dviout-util/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviout-util/
+## configure options and TL libraries required for dviout-util
+# Check whether --enable-dviout-util was given.
+if test ${enable_dviout_util+y}
+then :
+ enableval=$enable_dviout_util;
+fi
+case $enable_dviout_util in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_dviout_util=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-dviout-util=$enable_dviout_util'"
+ ;;
+esac
+
+test "x$enable_dviout_util" = xno || {
+ need_ptexenc=yes
+}
+
+## texk/dvipdfm-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/
+## configure options and TL libraries required for dvipdfm-x
+# Check whether --enable-dvipdfm-x was given.
+if test ${enable_dvipdfm_x+y}
+then :
+ enableval=$enable_dvipdfm_x;
+fi
+case $enable_dvipdfm_x in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_dvipdfm_x=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipdfm-x=$enable_dvipdfm_x'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-dvipdfm-x=$enable_dvipdfm_x'"
+ ;;
+esac
+
+test "x$enable_dvipdfm_x" = xno || {
+ need_kpathsea=yes
+ need_libpng=yes
+ need_libpaper=yes
+}
+
+## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
+## configure options and TL libraries required for dvipng
+# Check whether --enable-dvipng was given.
+if test ${enable_dvipng+y}
+then :
+ enableval=$enable_dvipng;
+fi
+case $enable_dvipng in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_dvipng=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipng=$enable_dvipng'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-dvipng=$enable_dvipng'"
+ ;;
+esac
+
+test "x$enable_dvipng" = xno || {
+ need_kpathsea=yes
+ need_gd=yes
+}
+
+## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
+## configure options for dvipng
+# Check whether --enable-debug was given.
+if test ${enable_debug+y}
+then :
+ enableval=$enable_debug;
+fi
+
+# Check whether --enable-timing was given.
+if test ${enable_timing+y}
+then :
+ enableval=$enable_timing;
+fi
+
+
+# Check whether --with-gs was given.
+if test ${with_gs+y}
+then :
+ withval=$with_gs;
+fi
+
+
+## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/
+## configure options and TL libraries required for dvipos
+# Check whether --enable-dvipos was given.
+if test ${enable_dvipos+y}
+then :
+ enableval=$enable_dvipos;
+fi
+case $enable_dvipos in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_dvipos=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipos=$enable_dvipos'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-dvipos=$enable_dvipos'"
+ ;;
+esac
+
+test "x$enable_dvipos" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/
+## configure options and TL libraries required for dvipsk
+# Check whether --enable-dvipsk was given.
+if test ${enable_dvipsk+y}
+then :
+ enableval=$enable_dvipsk;
+fi
+case $enable_dvipsk in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_dvipsk=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-dvipsk=$enable_dvipsk'"
+ ;;
+esac
+
+test "x$enable_dvipsk" = xno || {
+ need_kpathsea=yes
+}
+
+# texk/dvisvgm/ac/withenable.ac: configure.ac fragment
+## configure options and TL libraries required for dvisvgm
+# Check whether --enable-dvisvgm was given.
+if test ${enable_dvisvgm+y}
+then :
+ enableval=$enable_dvisvgm;
+fi
+case $enable_dvisvgm in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_dvisvgm=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-dvisvgm=$enable_dvisvgm'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-dvisvgm=$enable_dvisvgm'"
+ ;;
+esac
+
+test "x$enable_dvisvgm" = xno || {
+ need_kpathsea=yes
+ need_potrace=yes
+ need_freetype2=yes
+ need_zlib=yes
+}
+
+## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
+## configure options and TL libraries required for gregorio
+# Check whether --enable-gregorio was given.
+if test ${enable_gregorio+y}
+then :
+ enableval=$enable_gregorio;
+fi
+case $enable_gregorio in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_gregorio=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gregorio=$enable_gregorio'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-gregorio=$enable_gregorio'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-gregorio=$enable_gregorio'"
+ ;;
+esac
+
+test "x$enable_gregorio" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+## configure options and TL libraries required for gsftopk
+# Check whether --enable-gsftopk was given.
+if test ${enable_gsftopk+y}
+then :
+ enableval=$enable_gsftopk;
+fi
+case $enable_gsftopk in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_gsftopk=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-gsftopk=$enable_gsftopk'"
+ ;;
+esac
+
+test "x$enable_gsftopk" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/
+## configure options and TL libraries required for lcdf-typetools
+# Check whether --enable-lcdf-typetools was given.
+if test ${enable_lcdf_typetools+y}
+then :
+ enableval=$enable_lcdf_typetools;
+fi
+case $enable_lcdf_typetools in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_lcdf_typetools=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-lcdf-typetools=$enable_lcdf_typetools'"
+ ;;
+esac
+
+test "x$enable_lcdf_typetools" = xno || {
+ need_kpathsea=yes
+}
+
+## Define configure options for lcdf-typetools. Extracted from configure.ac
+## for ease of building TeX Live.
+# Check whether --enable-cfftot1 was given.
+if test ${enable_cfftot1+y}
+then :
+ enableval=$enable_cfftot1;
+fi
+# Check whether --enable-mmafm was given.
+if test ${enable_mmafm+y}
+then :
+ enableval=$enable_mmafm;
+fi
+# Check whether --enable-mmpfb was given.
+if test ${enable_mmpfb+y}
+then :
+ enableval=$enable_mmpfb;
+fi
+# Check whether --enable-otfinfo was given.
+if test ${enable_otfinfo+y}
+then :
+ enableval=$enable_otfinfo;
+fi
+# Check whether --enable-otftotfm was given.
+if test ${enable_otftotfm+y}
+then :
+ enableval=$enable_otftotfm;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test ${enable_t1dotlessj+y}
+then :
+ enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-t1lint was given.
+if test ${enable_t1lint+y}
+then :
+ enableval=$enable_t1lint;
+fi
+# Check whether --enable-t1rawafm was given.
+if test ${enable_t1rawafm+y}
+then :
+ enableval=$enable_t1rawafm;
+fi
+# Check whether --enable-t1reencode was given.
+if test ${enable_t1reencode+y}
+then :
+ enableval=$enable_t1reencode;
+fi
+# Check whether --enable-t1testpage was given.
+if test ${enable_t1testpage+y}
+then :
+ enableval=$enable_t1testpage;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test ${enable_ttftotype42+y}
+then :
+ enableval=$enable_ttftotype42;
+fi
+
+# Check whether --enable-cfftot1 was given.
+if test ${enable_cfftot1+y}
+then :
+ enableval=$enable_cfftot1;
+fi
+# Check whether --enable-t1dotlessj was given.
+if test ${enable_t1dotlessj+y}
+then :
+ enableval=$enable_t1dotlessj;
+fi
+# Check whether --enable-ttftotype42 was given.
+if test ${enable_ttftotype42+y}
+then :
+ enableval=$enable_ttftotype42;
+fi
+# Check whether --enable-updmap was given.
+if test ${enable_updmap+y}
+then :
+ enableval=$enable_updmap;
+fi
+
+
+## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/
+## configure options and TL libraries required for makeindexk
+# Check whether --enable-makeindexk was given.
+if test ${enable_makeindexk+y}
+then :
+ enableval=$enable_makeindexk;
+fi
+case $enable_makeindexk in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_makeindexk=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-makeindexk=$enable_makeindexk'"
+ ;;
+esac
+
+test "x$enable_makeindexk" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/
+## configure options and TL libraries required for makejvf
+# Check whether --enable-makejvf was given.
+if test ${enable_makejvf+y}
+then :
+ enableval=$enable_makejvf;
+fi
+case $enable_makejvf in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_makejvf=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makejvf=$enable_makejvf'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-makejvf=$enable_makejvf'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-makejvf=$enable_makejvf'"
+ ;;
+esac
+
+test "x$enable_makejvf" = xno || {
+ need_ptexenc=yes
+}
+
+## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/
+## configure options and TL libraries required for mendexk
+# Check whether --enable-mendexk was given.
+if test ${enable_mendexk+y}
+then :
+ enableval=$enable_mendexk;
+fi
+case $enable_mendexk in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_mendexk=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-mendexk=$enable_mendexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-mendexk=$enable_mendexk'"
+ ;;
+esac
+
+test "x$enable_mendexk" = xno || {
+ need_ptexenc=yes
+}
+
+## texk/musixtnt/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixtnt/
+## configure options and TL libraries required for musixtnt
+# Check whether --enable-musixtnt was given.
+if test ${enable_musixtnt+y}
+then :
+ enableval=$enable_musixtnt;
+fi
+case $enable_musixtnt in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_musixtnt=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-musixtnt=$enable_musixtnt'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-musixtnt=$enable_musixtnt'"
+ ;;
+esac
+
+test "x$enable_musixtnt" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/ps2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pk/
+## configure options and TL libraries required for ps2pk
+# Check whether --enable-ps2pk was given.
+if test ${enable_ps2pk+y}
+then :
+ enableval=$enable_ps2pk;
+fi
+case $enable_ps2pk in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_ps2pk=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-ps2pk=$enable_ps2pk'"
+ ;;
+esac
+
+test "x$enable_ps2pk" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/psutils/
+## configure options and TL libraries required for psutils
+# Check whether --enable-psutils was given.
+if test ${enable_psutils+y}
+then :
+ enableval=$enable_psutils;
+fi
+case $enable_psutils in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_psutils=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-psutils=$enable_psutils'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-psutils=$enable_psutils'"
+ ;;
+esac
+
+test "x$enable_psutils" = xno || {
+ need_kpathsea=yes
+ need_libpaper=yes
+}
+
+## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/
+## configure options and TL libraries required for seetexk
+# Check whether --enable-seetexk was given.
+if test ${enable_seetexk+y}
+then :
+ enableval=$enable_seetexk;
+fi
+case $enable_seetexk in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_seetexk=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-seetexk=$enable_seetexk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-seetexk=$enable_seetexk'"
+ ;;
+esac
+
+test "x$enable_seetexk" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/
+## configure options and TL libraries required for tex4htk
+# Check whether --enable-tex4htk was given.
+if test ${enable_tex4htk+y}
+then :
+ enableval=$enable_tex4htk;
+fi
+case $enable_tex4htk in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_tex4htk=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-tex4htk=$enable_tex4htk'"
+ ;;
+esac
+
+test "x$enable_tex4htk" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/
+## configure options and TL libraries required for ttf2pk
+# Check whether --enable-ttf2pk2 was given.
+if test ${enable_ttf2pk2+y}
+then :
+ enableval=$enable_ttf2pk2;
+fi
+case $enable_ttf2pk2 in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_ttf2pk2=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-ttf2pk2=$enable_ttf2pk2'"
+ ;;
+esac
+
+test "x$enable_ttf2pk2" = xno || {
+ need_kpathsea=yes
+ need_freetype2=yes
+}
+
+## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/
+## configure options and TL libraries required for ttfdump
+# Check whether --enable-ttfdump was given.
+if test ${enable_ttfdump+y}
+then :
+ enableval=$enable_ttfdump;
+fi
+case $enable_ttfdump in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_ttfdump=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-ttfdump=$enable_ttfdump'"
+ ;;
+esac
+
+test "x$enable_ttfdump" = xno || {
+ need_kpathsea=yes
+}
+
+## texk/upmendex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/upmendex/
+## configure options and TL libraries required for upmendex
+# Check whether --enable-upmendex was given.
+if test ${enable_upmendex+y}
+then :
+ enableval=$enable_upmendex;
+fi
+case $enable_upmendex in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_upmendex=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-upmendex=$enable_upmendex'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-upmendex=$enable_upmendex'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-upmendex=$enable_upmendex'"
+ ;;
+esac
+
+test "x$enable_upmendex" = xno || {
+ need_kpathsea=yes
+ need_icu=yes
+}
+
+## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
+## configure options and TL libraries required for xdvik
+# Check whether --enable-xdvik was given.
+if test ${enable_xdvik+y}
+then :
+ enableval=$enable_xdvik;
+fi
+if test "x$with_x" = xno
+then :
+ case $enable_xdvik in #(
+ "") :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xdvik'" >&5
+printf "%s\n" "$as_me: \`--without-x' -> \`--disable-xdvik'" >&6;}
+ enable_xdvik=no
+ ac_configure_args="$ac_configure_args '--disable-xdvik'" ;; #(
+ yes) :
+ as_fn_error $? "Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" "$LINENO" 5 ;; #(
+ *) :
+ ;;
+esac
+fi
+case $enable_xdvik in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_xdvik=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-xdvik=$enable_xdvik'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-xdvik=$enable_xdvik'"
+ ;;
+esac
+
+test "x$enable_xdvik" = xno || {
+ need_kpathsea=yes
+ need_freetype2=yes
+}
+
+## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
+## configure options for xdvik
+
+# Check whether --with-xdvi-x-toolkit was given.
+if test ${with_xdvi_x_toolkit+y}
+then :
+ withval=$with_xdvi_x_toolkit;
+fi
+
+
+## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
+## configure options and TL libraries required for texlive
+# Check whether --enable-texlive was given.
+if test ${enable_texlive+y}
+then :
+ enableval=$enable_texlive;
+fi
+case $enable_texlive in #(
+ yes|no) :
+ ;; #(
+ *) :
+
+ enable_texlive=$enable_all_pkgs
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
+printf "%s\n" "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-texlive=$enable_texlive'"
+ ;;
+esac
+
+## texk/texlive/ac/texlive.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
+## configure options for texlive
+# Check whether --enable-linked-scripts was given.
+if test ${enable_linked_scripts+y}
+then :
+ enableval=$enable_linked_scripts;
+fi
+
+
+## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
+## configure options and TL libraries required for pplib
+
+## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
+## configure options and TL libraries required for harfbuzz
+
+# Check whether --with-system-harfbuzz was given.
+if test ${with_system_harfbuzz+y}
+then :
+ withval=$with_system_harfbuzz;
+fi
+if test "x$with_system_harfbuzz" = x; then
+ if test -f $srcdir/libs/harfbuzz/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
+ with_system_harfbuzz=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
+ with_system_harfbuzz=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
+elif test "x$with_system_harfbuzz" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`harfbuzz' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`harfbuzz' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`harfbuzz' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`harfbuzz' headers and library from TL tree" >&6;}
+ if test "x$with_system_harfbuzz" != xno; then
+ with_system_harfbuzz=no
+ ac_configure_args="$ac_configure_args '--without-system-harfbuzz'"
+ fi
+fi
+if test "x$with_system_harfbuzz" = xyes; then
+ if test "x$with_system_graphite2" = x; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -> installed \`graphite2' headers and library" >&5
+printf "%s\n" "$as_me: -> installed \`graphite2' headers and library" >&6;}
+ with_system_graphite2=yes
+ ac_configure_args="$ac_configure_args '--with-system-graphite2'"
+ elif test "x$with_system_graphite2" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-graphite2'" "$LINENO" 5
+ fi
+ if test "x$with_system_icu" = x; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -> installed \`icu' headers and library" >&5
+printf "%s\n" "$as_me: -> installed \`icu' headers and library" >&6;}
+ with_system_icu=yes
+ ac_configure_args="$ac_configure_args '--with-system-icu'"
+ elif test "x$with_system_icu" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-icu'" "$LINENO" 5
+ fi
+fi
+
+test "x$need_harfbuzz" = xyes && {
+ need_graphite2=yes
+ need_icu=yes
+}
+
+## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
+## configure options and TL libraries required for icu (modified for XeTeX)
+
+# Check whether --with-system-icu was given.
+if test ${with_system_icu+y}
+then :
+ withval=$with_system_icu;
+fi
+if test "x$with_system_icu" = x; then
+ if test -f $srcdir/libs/icu/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`icu' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`icu' headers and library from TL tree" >&6;}
+ with_system_icu=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`icu' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`icu' headers and library" >&6;}
+ with_system_icu=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-icu=$with_system_icu'"
+elif test "x$with_system_icu" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`icu' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`icu' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`icu' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`icu' headers and library from TL tree" >&6;}
+ if test "x$with_system_icu" != xno; then
+ with_system_icu=no
+ ac_configure_args="$ac_configure_args '--without-system-icu'"
+ fi
+fi
+
+## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
+## configure options and TL libraries required for teckit
+
+# Check whether --with-system-teckit was given.
+if test ${with_system_teckit+y}
+then :
+ withval=$with_system_teckit;
+fi
+if test "x$with_system_teckit" = x; then
+ if test -f $srcdir/libs/teckit/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`teckit' headers and library from TL tree" >&6;}
+ with_system_teckit=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`teckit' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`teckit' headers and library" >&6;}
+ with_system_teckit=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-teckit=$with_system_teckit'"
+elif test "x$with_system_teckit" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`teckit' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`teckit' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`teckit' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`teckit' headers and library from TL tree" >&6;}
+ if test "x$with_system_teckit" != xno; then
+ with_system_teckit=no
+ ac_configure_args="$ac_configure_args '--without-system-teckit'"
+ fi
+fi
+if test "x$with_system_teckit" = xyes; then
+ if test "x$with_system_zlib" = x; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5
+printf "%s\n" "$as_me: -> installed \`zlib' headers and library" >&6;}
+ with_system_zlib=yes
+ ac_configure_args="$ac_configure_args '--with-system-zlib'"
+ elif test "x$with_system_zlib" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
+ fi
+fi
+
+test "x$need_teckit" = xyes && {
+ need_zlib=yes
+}
+
+## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/
+## configure options and TL libraries required for graphite2
+
+# Check whether --with-system-graphite2 was given.
+if test ${with_system_graphite2+y}
+then :
+ withval=$with_system_graphite2;
+fi
+if test "x$with_system_graphite2" = x; then
+ if test -f $srcdir/libs/graphite2/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
+ with_system_graphite2=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`graphite2' headers and library" >&6;}
with_system_graphite2=yes
fi
ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'"
@@ -5468,6 +6910,319 @@ test "x$need_zziplib" = xyes && {
need_zlib=yes
}
+## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
+## configure options and TL libraries required for xpdf
+: "kpse_xpdf_options - no-op"
+if test "x$with_system_xpdf" = x; then
+ if test -f $srcdir/libs/xpdf/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`xpdf' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`xpdf' headers and library from TL tree" >&6;}
+ with_system_xpdf=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`xpdf' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`xpdf' headers and library" >&6;}
+ with_system_xpdf=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'"
+elif test "x$with_system_xpdf" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`xpdf' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`xpdf' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`xpdf' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`xpdf' headers and library from TL tree" >&6;}
+ if test "x$with_system_xpdf" != xno; then
+ with_system_xpdf=no
+ ac_configure_args="$ac_configure_args '--without-system-xpdf'"
+ fi
+fi
+
+## libs/mpfr/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/
+## configure options and TL libraries required for mpfr
+
+# Check whether --with-system-mpfr was given.
+if test ${with_system_mpfr+y}
+then :
+ withval=$with_system_mpfr;
+fi
+
+# Check whether --with-mpfr-includes was given.
+if test ${with_mpfr_includes+y}
+then :
+ withval=$with_mpfr_includes;
+fi
+
+# Check whether --with-mpfr-libdir was given.
+if test ${with_mpfr_libdir+y}
+then :
+ withval=$with_mpfr_libdir;
+fi
+if test "x$with_system_mpfr" = x; then
+ if test -f $srcdir/libs/mpfr/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`mpfr' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`mpfr' headers and library from TL tree" >&6;}
+ with_system_mpfr=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`mpfr' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`mpfr' headers and library" >&6;}
+ with_system_mpfr=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-mpfr=$with_system_mpfr'"
+elif test "x$with_system_mpfr" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`mpfr' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`mpfr' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`mpfr' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`mpfr' headers and library from TL tree" >&6;}
+ if test "x$with_system_mpfr" != xno; then
+ with_system_mpfr=no
+ ac_configure_args="$ac_configure_args '--without-system-mpfr'"
+ fi
+fi
+if test "x$with_system_mpfr" = xyes; then
+ if test "x$with_system_gmp" = x; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -> installed \`gmp' headers and library" >&5
+printf "%s\n" "$as_me: -> installed \`gmp' headers and library" >&6;}
+ with_system_gmp=yes
+ ac_configure_args="$ac_configure_args '--with-system-gmp'"
+ elif test "x$with_system_gmp" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-mpfr' requires \`--with-system-gmp'" "$LINENO" 5
+ fi
+fi
+
+test "x$need_mpfr" = xyes && {
+ need_gmp=yes
+}
+
+## libs/gmp/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gmp/
+## configure options and TL libraries required for gmp
+
+# Check whether --with-system-gmp was given.
+if test ${with_system_gmp+y}
+then :
+ withval=$with_system_gmp;
+fi
+
+# Check whether --with-gmp-includes was given.
+if test ${with_gmp_includes+y}
+then :
+ withval=$with_gmp_includes;
+fi
+
+# Check whether --with-gmp-libdir was given.
+if test ${with_gmp_libdir+y}
+then :
+ withval=$with_gmp_libdir;
+fi
+if test "x$with_system_gmp" = x; then
+ if test -f $srcdir/libs/gmp/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`gmp' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`gmp' headers and library from TL tree" >&6;}
+ with_system_gmp=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`gmp' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`gmp' headers and library" >&6;}
+ with_system_gmp=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-gmp=$with_system_gmp'"
+elif test "x$with_system_gmp" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`gmp' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`gmp' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`gmp' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`gmp' headers and library from TL tree" >&6;}
+ if test "x$with_system_gmp" != xno; then
+ with_system_gmp=no
+ ac_configure_args="$ac_configure_args '--without-system-gmp'"
+ fi
+fi
+
+## libs/cairo/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/
+## configure options and TL libraries required for cairo
+
+# Check whether --with-system-cairo was given.
+if test ${with_system_cairo+y}
+then :
+ withval=$with_system_cairo;
+fi
+if test "x$with_system_cairo" = x; then
+ if test -f $srcdir/libs/cairo/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`cairo' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`cairo' headers and library from TL tree" >&6;}
+ with_system_cairo=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`cairo' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`cairo' headers and library" >&6;}
+ with_system_cairo=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-cairo=$with_system_cairo'"
+elif test "x$with_system_cairo" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`cairo' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`cairo' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`cairo' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`cairo' headers and library from TL tree" >&6;}
+ if test "x$with_system_cairo" != xno; then
+ with_system_cairo=no
+ ac_configure_args="$ac_configure_args '--without-system-cairo'"
+ fi
+fi
+if test "x$with_system_cairo" = xyes; then
+ if test "x$with_system_pixman" = x; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -> installed \`pixman' headers and library" >&5
+printf "%s\n" "$as_me: -> installed \`pixman' headers and library" >&6;}
+ with_system_pixman=yes
+ ac_configure_args="$ac_configure_args '--with-system-pixman'"
+ elif test "x$with_system_pixman" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-cairo' requires \`--with-system-pixman'" "$LINENO" 5
+ fi
+fi
+
+test "x$need_cairo" = xyes && {
+ need_pixman=yes
+}
+
+## libs/pixman/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/
+## configure options and TL libraries required for pixman
+
+# Check whether --with-system-pixman was given.
+if test ${with_system_pixman+y}
+then :
+ withval=$with_system_pixman;
+fi
+if test "x$with_system_pixman" = x; then
+ if test -f $srcdir/libs/pixman/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`pixman' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`pixman' headers and library from TL tree" >&6;}
+ with_system_pixman=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`pixman' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`pixman' headers and library" >&6;}
+ with_system_pixman=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-pixman=$with_system_pixman'"
+elif test "x$with_system_pixman" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`pixman' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`pixman' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`pixman' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`pixman' headers and library from TL tree" >&6;}
+ if test "x$with_system_pixman" != xno; then
+ with_system_pixman=no
+ ac_configure_args="$ac_configure_args '--without-system-pixman'"
+ fi
+fi
+
+## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
+## configure options and TL libraries required for gd
+
+# Check whether --with-system-gd was given.
+if test ${with_system_gd+y}
+then :
+ withval=$with_system_gd;
+fi
+
+# Check whether --with-gd-includes was given.
+if test ${with_gd_includes+y}
+then :
+ withval=$with_gd_includes;
+fi
+
+# Check whether --with-gd-libdir was given.
+if test ${with_gd_libdir+y}
+then :
+ withval=$with_gd_libdir;
+fi
+if test "x$with_system_gd" = x; then
+ if test -f $srcdir/libs/gd/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`gd' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`gd' headers and library from TL tree" >&6;}
+ with_system_gd=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`gd' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`gd' headers and library" >&6;}
+ with_system_gd=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-gd=$with_system_gd'"
+elif test "x$with_system_gd" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`gd' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`gd' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`gd' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`gd' headers and library from TL tree" >&6;}
+ if test "x$with_system_gd" != xno; then
+ with_system_gd=no
+ ac_configure_args="$ac_configure_args '--without-system-gd'"
+ fi
+fi
+if test "x$with_system_gd" = xyes; then
+ if test "x$with_system_libpng" = x; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -> installed \`libpng' headers and library" >&5
+printf "%s\n" "$as_me: -> installed \`libpng' headers and library" >&6;}
+ with_system_libpng=yes
+ ac_configure_args="$ac_configure_args '--with-system-libpng'"
+ elif test "x$with_system_libpng" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-gd' requires \`--with-system-libpng'" "$LINENO" 5
+ fi
+ if test "x$with_system_freetype2" = x; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -> installed \`freetype2' headers and library" >&5
+printf "%s\n" "$as_me: -> installed \`freetype2' headers and library" >&6;}
+ with_system_freetype2=yes
+ ac_configure_args="$ac_configure_args '--with-system-freetype2'"
+ elif test "x$with_system_freetype2" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" "$LINENO" 5
+ fi
+fi
+
+test "x$need_gd" = xyes && {
+ need_libpng=yes
+ need_freetype2=yes
+}
+
+## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
+## configure options and TL libraries required for freetype2
+
+# Check whether --with-system-freetype2 was given.
+if test ${with_system_freetype2+y}
+then :
+ withval=$with_system_freetype2;
+fi
+if test "x$with_system_freetype2" = x; then
+ if test -f $srcdir/libs/freetype2/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`freetype2' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`freetype2' headers and library from TL tree" >&6;}
+ with_system_freetype2=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype2' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`freetype2' headers and library" >&6;}
+ with_system_freetype2=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'"
+elif test "x$with_system_freetype2" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`freetype2' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`freetype2' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`freetype2' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`freetype2' headers and library from TL tree" >&6;}
+ if test "x$with_system_freetype2" != xno; then
+ with_system_freetype2=no
+ ac_configure_args="$ac_configure_args '--without-system-freetype2'"
+ fi
+fi
+if test "x$with_system_freetype2" = xyes; then
+ if test "x$with_system_zlib" = x; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5
+printf "%s\n" "$as_me: -> installed \`zlib' headers and library" >&6;}
+ with_system_zlib=yes
+ ac_configure_args="$ac_configure_args '--with-system-zlib'"
+ elif test "x$with_system_zlib" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" "$LINENO" 5
+ fi
+fi
+
+test "x$need_freetype2" = xyes && {
+ need_zlib=yes
+}
+
## libs/libpng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
## configure options and TL libraries required for libpng
@@ -5513,6 +7268,49 @@ test "x$need_libpng" = xyes && {
need_zlib=yes
}
+## libs/libpaper/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/
+## configure options and TL libraries required for libpaper
+
+# Check whether --with-system-libpaper was given.
+if test ${with_system_libpaper+y}
+then :
+ withval=$with_system_libpaper;
+fi
+
+# Check whether --with-libpaper-includes was given.
+if test ${with_libpaper_includes+y}
+then :
+ withval=$with_libpaper_includes;
+fi
+
+# Check whether --with-libpaper-libdir was given.
+if test ${with_libpaper_libdir+y}
+then :
+ withval=$with_libpaper_libdir;
+fi
+if test "x$with_system_libpaper" = x; then
+ if test -f $srcdir/libs/libpaper/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`libpaper' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`libpaper' headers and library from TL tree" >&6;}
+ with_system_libpaper=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpaper' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`libpaper' headers and library" >&6;}
+ with_system_libpaper=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-libpaper=$with_system_libpaper'"
+elif test "x$with_system_libpaper" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`libpaper' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`libpaper' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`libpaper' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`libpaper' headers and library from TL tree" >&6;}
+ if test "x$with_system_libpaper" != xno; then
+ with_system_libpaper=no
+ ac_configure_args="$ac_configure_args '--without-system-libpaper'"
+ fi
+fi
+
## libs/luajit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
## configure options and TL libraries required for luajit
@@ -5563,6 +7361,51 @@ printf "%s\n" "$as_me: Using \`zlib' headers and library from TL tree" >&6;}
fi
+## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
+## configure options and TL libraries required for ptexenc
+
+# Check whether --with-system-ptexenc was given.
+if test ${with_system_ptexenc+y}
+then :
+ withval=$with_system_ptexenc;
+fi
+if test "x$with_system_ptexenc" = x; then
+ if test -f $srcdir/texk/ptexenc/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+ with_system_ptexenc=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`ptexenc' headers and library" >&6;}
+ with_system_ptexenc=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-ptexenc=$with_system_ptexenc'"
+elif test "x$with_system_ptexenc" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`ptexenc' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`ptexenc' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`ptexenc' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`ptexenc' headers and library from TL tree" >&6;}
+ if test "x$with_system_ptexenc" != xno; then
+ with_system_ptexenc=no
+ ac_configure_args="$ac_configure_args '--without-system-ptexenc'"
+ fi
+fi
+if test "x$with_system_ptexenc" = xyes; then
+ if test "x$with_system_kpathsea" = x; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -> installed \`kpathsea' headers and library" >&5
+printf "%s\n" "$as_me: -> installed \`kpathsea' headers and library" >&6;}
+ with_system_kpathsea=yes
+ ac_configure_args="$ac_configure_args '--with-system-kpathsea'"
+ elif test "x$with_system_kpathsea" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-ptexenc' requires \`--with-system-kpathsea'" "$LINENO" 5
+ fi
+fi
+
+test "x$need_ptexenc" = xyes && {
+ need_kpathsea=yes
+}
+
## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
## configure options and TL libraries required for kpathsea
@@ -20656,6 +22499,12 @@ printf %s "checking for TeX specific libraries to build... " >&6; }
echo 'tldbg:_KPSE_RECURSE called: list=texlibs, text=TeX specific libraries, cond=test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes, prefix=texk/.' >&5
MAKE_SUBDIRS=
CONF_SUBDIRS=
+if test -x $srcdir/texk/ptexenc/configure; then
+ test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes && MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS"
+ CONF_SUBDIRS="texk/ptexenc $CONF_SUBDIRS"
+else
+ echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/texk/ptexenc/configure' >&5
+fi
if test -x $srcdir/texk/kpathsea/configure; then
test "x$with_system_kpathsea" != xyes && test "x$need_kpathsea" = xyes && MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS"
CONF_SUBDIRS="texk/kpathsea $CONF_SUBDIRS"
@@ -21315,27 +23164,58 @@ elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
as_fn_error $? "did not find harfbuzz" "$LINENO" 5
fi
-
-
-
-
-
-## texk/kpathsea/ac/kpathsea.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
-## basic check of system kpathsea
-if test "x$need_kpathsea:$with_system_kpathsea" = xyes:yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`kpathsea' library" >&5
-printf %s "checking requested system \`kpathsea' library... " >&6; }
- CPPFLAGS="$KPATHSEA_INCLUDES $CPPFLAGS"
- LIBS="$KPATHSEA_LIBS $LIBS"
+
+
+
+
+
+## texk/kpathsea/ac/kpathsea.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
+## basic check of system kpathsea
+if test "x$need_kpathsea:$with_system_kpathsea" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`kpathsea' library" >&5
+printf %s "checking requested system \`kpathsea' library... " >&6; }
+ CPPFLAGS="$KPATHSEA_INCLUDES $CPPFLAGS"
+ LIBS="$KPATHSEA_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <kpathsea/kpathsea.h>
+#include <kpathsea/version.h>
+int
+main (void)
+{
+const char *version = kpathsea_version_string;
+kpse_set_program_name("prog", "name");
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+
+## texk/ptexenc/ac/ptexenc.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
+## basic check of system ptexenc
+if test "x$need_ptexenc:$with_system_ptexenc" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`ptexenc' library" >&5
+printf %s "checking requested system \`ptexenc' library... " >&6; }
+ CPPFLAGS="$PTEXENC_INCLUDES $CPPFLAGS"
+ LIBS="$PTEXENC_LIBS $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <kpathsea/kpathsea.h>
-#include <kpathsea/version.h>
+#include <ptexenc/ptexenc.h>
int
main (void)
{
-const char *version = kpathsea_version_string;
-kpse_set_program_name("prog", "name");
+const char *version = ptexenc_version_string;
+set_enc_string("prog", "name");
;
return 0;
}
@@ -21384,6 +23264,36 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
printf "%s\n" "$kpse_res" >&6; }
fi
+## libs/libpaper/ac/libpaper.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/
+## basic check of system libpaper
+if test "x$need_libpaper:$with_system_libpaper" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`libpaper' library" >&5
+printf %s "checking requested system \`libpaper' library... " >&6; }
+ CPPFLAGS="$LIBPAPER_INCLUDES $CPPFLAGS"
+ LIBS="$LIBPAPER_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <paper.h>
+int
+main (void)
+{
+const char *v = defaultpapername();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+
## libs/libpng/ac/libpng.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
## basic check of system libpng
if test "x$need_libpng:$with_system_libpng" = xyes:yes; then
@@ -21415,6 +23325,228 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
printf "%s\n" "$kpse_res" >&6; }
fi
+## libs/freetype2/ac/freetype2.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
+## basic check of system freetype2
+if test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`freetype2' library" >&5
+printf %s "checking requested system \`freetype2' library... " >&6; }
+ CPPFLAGS="$FREETYPE2_INCLUDES $CPPFLAGS"
+ LIBS="$FREETYPE2_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ft2build.h>
+#include FT_FREETYPE_H
+int
+main (void)
+{
+FT_Library library; FT_Init_FreeType(&library);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+
+## libs/gd/ac/gd.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
+## basic check of system gd
+if test "x$need_gd:$with_system_gd" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`gd' library" >&5
+printf %s "checking requested system \`gd' library... " >&6; }
+ CPPFLAGS="$GD_INCLUDES $CPPFLAGS"
+ LIBS="$GD_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <gd.h>
+int
+main (void)
+{
+gdImageCreate(1, 2);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+
+## libs/pixman/ac/pixman.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/
+## basic check of system pixman
+if test "x$need_pixman:$with_system_pixman" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`pixman' library" >&5
+printf %s "checking requested system \`pixman' library... " >&6; }
+ CPPFLAGS="$PIXMAN_INCLUDES $CPPFLAGS"
+ LIBS="$PIXMAN_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <pixman.h>
+int
+main (void)
+{
+const char *s = pixman_version_string();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+
+## libs/cairo/ac/cairo.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/
+## basic check of system cairo
+if test "x$need_cairo:$with_system_cairo" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`cairo' library" >&5
+printf %s "checking requested system \`cairo' library... " >&6; }
+ CPPFLAGS="$CAIRO_INCLUDES $CPPFLAGS"
+ LIBS="$CAIRO_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <cairo.h>
+int
+main (void)
+{
+const char *s = cairo_version_string();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+
+## libs/gmp/ac/gmp.ac: configure.ac fragment for the TeX Live subdirectory libs/gmp/
+## basic check of system gmp
+if test "x$need_gmp:$with_system_gmp" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`gmp' library" >&5
+printf %s "checking requested system \`gmp' library... " >&6; }
+ CPPFLAGS="$GMP_INCLUDES $CPPFLAGS"
+ LIBS="$GMP_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <gmp.h>
+int
+main (void)
+{
+const char *s = gmp_version;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+
+## libs/mpfr/ac/mpfr.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/
+## basic check of system mpfr
+if test "x$need_mpfr:$with_system_mpfr" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`mpfr' library" >&5
+printf %s "checking requested system \`mpfr' library... " >&6; }
+ CPPFLAGS="$MPFR_INCLUDES $CPPFLAGS"
+ LIBS="$MPFR_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <mpfr.h>
+int
+main (void)
+{
+const char *s = mpfr_get_version();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+
+## libs/xpdf/ac/xpdf.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
+## basic check of system xpdf (a.k.a. poppler, no longer supported in
+## TL sources)
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`xpdf' library" >&5
+printf %s "checking requested system \`xpdf' library... " >&6; }
+ CPPFLAGS="$XPDF_INCLUDES $CPPFLAGS"
+ LIBS="$XPDF_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <GfxFont.h>
+int
+main (void)
+{
+GfxFont *gfxFont; gfxFont->decRefCnt();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
## libs/zziplib/ac/zziplib.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/
## basic check of system zziplib
if test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then
@@ -21476,6 +23608,87 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
printf "%s\n" "$kpse_res" >&6; }
fi
+## libs/teckit/ac/teckit.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
+## basic check of system teckit
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test "x$need_teckit:$with_system_teckit" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`teckit' library" >&5
+printf %s "checking requested system \`teckit' library... " >&6; }
+ CPPFLAGS="$TECKIT_INCLUDES $CPPFLAGS"
+ LIBS="$TECKIT_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <teckit/TECkit_Engine.h>
+int
+main (void)
+{
+TECkit_Converter converter; TECkit_DisposeConverter(converter);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+## libs/icu/ac/icu.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
+## basic check of system icu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test "x$need_icu:$with_system_icu" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`icu' library" >&5
+printf %s "checking requested system \`icu' library... " >&6; }
+ CPPFLAGS="$ICU_INCLUDES $CPPFLAGS"
+ LIBS="$ICU_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <unicode/ustring.h>
+int
+main (void)
+{
+UErrorCode code; const UChar *src; UChar *dst;
+u_strToLower(dst, -1, src, -1, NULL, &code);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
## libs/harfbuzz/ac/harfbuzz.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
## basic check of system harfbuzz
if test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
diff --git a/source/texk/README b/source/texk/README
index b01c5b741f855e178cb0807755a3130a47a2b5b7..a83d8a871f29f7e5412ac891a9b401ae3e1892bd 100644
--- a/source/texk/README
+++ b/source/texk/README
@@ -1,4 +1,4 @@
-$Id: README 61694 2022-01-22 19:07:04Z hironobu $
+$Id: README 61755 2022-01-26 23:21:49Z karl $
Copyright 2006-2022 TeX Users Group.
You may freely use, modify and/or distribute this file.
@@ -64,7 +64,7 @@ dvipos - maintained here, by us
dvipsk - maintained here, by us
-dvisvgm 2.13 - checked 21jan22
+dvisvgm 2.13.1 - checked 26jan22
https://dvisvgm.de/Downloads/
https://github.com/mgieseki/dvisvgm
https://ctan.org/pkg/dvisvgm
diff --git a/source/texk/texlive/linked_scripts/Makefile.am b/source/texk/texlive/linked_scripts/Makefile.am
index fcb99f6e2ae4609accb4fa859a42ba35c65d66ab..46d59049f66cf88addc9f41c1277e9ad55849c77 100644
--- a/source/texk/texlive/linked_scripts/Makefile.am
+++ b/source/texk/texlive/linked_scripts/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 61687 2022-01-21 22:58:35Z karl $
+## $Id: Makefile.am 61780 2022-01-28 22:36:18Z karl $
## Makefile.am for the TeX Live subdirectory texk/texlive/linked_scripts/
##
## Copyright 2016-2022 Karl Berry <tex-live@tug.org>
@@ -236,6 +236,7 @@ texmf_other_scripts = \
texlive-extra/e2pall.pl \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
+ texlogfilter/texlogfilter \
texlogsieve/texlogsieve \
texplate/texplate.sh \
thumbpdf/thumbpdf.pl \
diff --git a/source/texk/texlive/linked_scripts/Makefile.in b/source/texk/texlive/linked_scripts/Makefile.in
index 56f1db5ca8ede9d886c317eaba778710fa7e4e7a..fcb7641014a2be7a0bb20892c3fae82595bcb8b2 100644
--- a/source/texk/texlive/linked_scripts/Makefile.in
+++ b/source/texk/texlive/linked_scripts/Makefile.in
@@ -450,6 +450,7 @@ texmf_other_scripts = \
texlive-extra/e2pall.pl \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
+ texlogfilter/texlogfilter \
texlogsieve/texlogsieve \
texplate/texplate.sh \
thumbpdf/thumbpdf.pl \
diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog
index b5e542f74e91ce9f8c63a0478b26c516d45a35f7..362846541d6c5e814b191f19e0bf8c13f3ae5fa1 100644
--- a/source/texk/web2c/ChangeLog
+++ b/source/texk/web2c/ChangeLog
@@ -1,3 +1,11 @@
+2022-02-05 Andreas Scherer <https://ascherer.github.io>
+
+ * ctangleboot.bin: CWEB 4.7 release.
+
+2022-01-29 Karl Berry <karl@freefriends.org>
+
+ * doc/web2c.texi (TeX extensions): simplify references.
+
2022-01-22 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* texmfmem.h: Change type of str_pool to unsigned short for pTeX.
diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in
index 17bd5a7b5ba3880428f4cee460bd9a6f52aee2c5..06862f4cd8128b100b969b36d0a8e23cf25b32d0 100644
--- a/source/texk/web2c/Makefile.in
+++ b/source/texk/web2c/Makefile.in
@@ -4535,7 +4535,8 @@ upweb_tests = \
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_149)
diff --git a/source/texk/web2c/NEWS b/source/texk/web2c/NEWS
index 25c123d49be0512c3925dbf59349e862ffd3b13c..f47bcb49c42d437be24990f6607dd41e8e6e6c8f 100644
--- a/source/texk/web2c/NEWS
+++ b/source/texk/web2c/NEWS
@@ -3,15 +3,17 @@ This file records noteworthy changes. (Public domain.)
2022 (for TeX Live 2022)
-* hitex engine included for mobile output in HINT format.
+* 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, (u)pTeX, hitex):
+ (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.
diff --git a/source/texk/web2c/ctangleboot.cin b/source/texk/web2c/ctangleboot.cin
index 8c346559f8fa95f721f4882f8fab0651351c7e8b..76bb67f48fa52cb0acc4ce55c625b866b1e4b06e 100644
--- a/source/texk/web2c/ctangleboot.cin
+++ b/source/texk/web2c/ctangleboot.cin
@@ -25,7 +25,7 @@
/*:4*/
#line 67 "cwebdir/ctangle.w"
-#define banner "This is CTANGLE, Version 4.6" \
+#define banner "This is CTANGLE, Version 4.7" \
\
#define _(s) gettext(s) \
diff --git a/source/texk/web2c/cwebdir/ChangeLog b/source/texk/web2c/cwebdir/ChangeLog
index 32f34133a62cd3e09a0f3c42a43bbb1bbf768379..22f36a7898b6921ce14f84118bef1a8f08eb3360 100644
--- a/source/texk/web2c/cwebdir/ChangeLog
+++ b/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,47 @@
+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,
diff --git a/source/texk/web2c/cwebdir/Makefile b/source/texk/web2c/cwebdir/Makefile
index 86db9f3bfc6ee5d096e678105e27e03ff1419d81..92e59b857b84b66ddfc14605e3c37b01da1ea7d4 100644
--- a/source/texk/web2c/cwebdir/Makefile
+++ b/source/texk/web2c/cwebdir/Makefile
@@ -1,6 +1,6 @@
# This file is part of CWEB.
# It is distributed WITHOUT ANY WARRANTY, express or implied.
-# Version 4.6 --- December 2021
+# Version 4.7 --- February 2022
# Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -64,9 +64,11 @@ CP= /bin/cp
# 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 #######
@@ -108,6 +110,7 @@ ALL = common.w ctangle.w cweave.w prod.w \
dvipdfm ) tex "\let\pdf+ \input $*"; dvipdfm $* ;; \
pdftex ) pdftex $* ;; \
xetex ) xetex $* ;; \
+ hitex ) hitex $* ;; \
esac
all: ctangle cweave
@@ -163,7 +166,7 @@ fullmanual: usermanual $(SOURCES) comm-man.ch ctang-man.ch cweav-man.ch
# 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)
diff --git a/source/texk/web2c/cwebdir/comm-mac.ch b/source/texk/web2c/cwebdir/comm-mac.ch
index 4d1382accd1cbf770f6bc0df47bd4d60325f39eb..6d795ff4e8e8abe0f94c13da2fc2d367d9011649 100644
--- a/source/texk/web2c/cwebdir/comm-mac.ch
+++ b/source/texk/web2c/cwebdir/comm-mac.ch
@@ -4,9 +4,9 @@ No changes to CTANGLE or CWEAVE are needed.
(Contributed 13 Oct 2000 by AndPio@aol.com; slightly edited by Don Knuth)
@x in limbo, change the title page document to specify Mac version
- \centerline{(Version 4.6)}
+ \centerline{(Version 4.7)}
@y
- \centerline{(Version 4.6 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
diff --git a/source/texk/web2c/cwebdir/comm-man.ch b/source/texk/web2c/cwebdir/comm-man.ch
index c922c03631202278fe83e0dd19a59a1623ab728a..f2cdcf52e45121ec1c4c6b03353af5ea970d1d7e 100644
--- a/source/texk/web2c/cwebdir/comm-man.ch
+++ b/source/texk/web2c/cwebdir/comm-man.ch
@@ -16,7 +16,7 @@ under the terms of a permission notice identical to this one.
}
@y
\def\botofcontents{\vfill\titlefalse}
-\def\contentspagenumber{28}
+\def\contentspagenumber{29}
\def\title{APPENDIX D: COMMON}
\let\K=\leftarrow
@z
diff --git a/source/texk/web2c/cwebdir/comm-ql.ch b/source/texk/web2c/cwebdir/comm-ql.ch
index 191fb51f1dd9aaf7acc7a0354498583f2d074145..aa451c745568a47ce3d8667f7669c78783fc1076 100644
--- a/source/texk/web2c/cwebdir/comm-ql.ch
+++ b/source/texk/web2c/cwebdir/comm-ql.ch
@@ -10,24 +10,24 @@ ex <dev_>cc;'-v -h -c -=500000 -DCWEBINPUTS=flp2_ common_c'
@x
\def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.6)}
+\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.6)}
+ \centerline{(Version 4.7)}
\vfill}
\def\botofcontents{\vfill
\noindent
@y
\def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.6)}
+\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.6)}
+ \centerline{(Version 4.7)}
\vfill}
\def\botofcontents{\vfill
\noindent
diff --git a/source/texk/web2c/cwebdir/comm-w2c.ch b/source/texk/web2c/cwebdir/comm-w2c.ch
index f37e23c5ab9892fe2fe4a02e2d2aa614138f4d50..fea407efbeb5b1d30d0b71f135075b61f1bab0e9 100644
--- a/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -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.6)}
+\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.6 [\TeX~Live])}
+\def\title{Common code for CTANGLE and CWEAVE (4.7 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.6)}
+ \centerline{(Version 4.7)}
@y
- \centerline{(Version 4.6 [\TeX~Live])}
+ \centerline{(Version 4.7 [\TeX~Live])}
@z
@x
diff --git a/source/texk/web2c/cwebdir/comm-w2c.h b/source/texk/web2c/cwebdir/comm-w2c.h
index ae0ffa3d7a398479ecaca5274fbaff021fd98af6..e0c23709fcdefc0a9a9b30a6faea5e1fce799d7d 100644
--- a/source/texk/web2c/cwebdir/comm-w2c.h
+++ b/source/texk/web2c/cwebdir/comm-w2c.h
@@ -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.6 --- December 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
diff --git a/source/texk/web2c/cwebdir/common.h b/source/texk/web2c/cwebdir/common.h
index ee75ca2f77a76b0e2c874fa56fc86b8e75afaf8f..4d2caba05d7a6b1f57d43fcdd1dc818a9a5b4439 100644
--- a/source/texk/web2c/cwebdir/common.h
+++ b/source/texk/web2c/cwebdir/common.h
@@ -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.6 --- December 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
diff --git a/source/texk/web2c/cwebdir/common.w b/source/texk/web2c/cwebdir/common.w
index 36f35f3cbc9ddb7ef9545207788acaac183d184f..941b7206cc26a5fdf93bc5c054107b2dafddb5de 100644
--- a/source/texk/web2c/cwebdir/common.w
+++ b/source/texk/web2c/cwebdir/common.w
@@ -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.6 --- December 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.6)}
+\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.6)}
+ \centerline{(Version 4.7)}
\vfill}
\def\botofcontents{\vfill
\noindent
diff --git a/source/texk/web2c/cwebdir/ctang-bs.ch b/source/texk/web2c/cwebdir/ctang-bs.ch
index 401e165f9aa35e56d44912a53dd2a1d7ad416571..ecdb4be591ce4f6ad073045c18d398ac2f47361d 100644
--- a/source/texk/web2c/cwebdir/ctang-bs.ch
+++ b/source/texk/web2c/cwebdir/ctang-bs.ch
@@ -17,12 +17,12 @@ by using "huge" pointers.
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
-@d banner "This is CTANGLE (Version 4.6)"
+@d banner "This is CTANGLE (Version 4.7)"
@y
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
-@d banner "This is CTANGLE (Version 4.6pc/big)"
+@d banner "This is CTANGLE (Version 4.7pc/big)"
@z
diff --git a/source/texk/web2c/cwebdir/ctang-man.ch b/source/texk/web2c/cwebdir/ctang-man.ch
index f90d5361ae8913f6465750d170b4a035133daf93..69bc686b724f392e3da417dc6b1c0ee40b52bb92 100644
--- a/source/texk/web2c/cwebdir/ctang-man.ch
+++ b/source/texk/web2c/cwebdir/ctang-man.ch
@@ -16,7 +16,7 @@ under the terms of a permission notice identical to this one.
}
@y
\def\botofcontents{\vfill\titlefalse}
-\def\contentspagenumber{64}
+\def\contentspagenumber{65}
\def\title{APPENDIX E: CTANGLE}
\let\K=\leftarrow
@z
diff --git a/source/texk/web2c/cwebdir/ctang-pc.ch b/source/texk/web2c/cwebdir/ctang-pc.ch
index 947a4dc621491a1f8ab35ed0d743c470c0d50b43..459356a59eea01d10943a799b45c2a911a1844dd 100644
--- a/source/texk/web2c/cwebdir/ctang-pc.ch
+++ b/source/texk/web2c/cwebdir/ctang-pc.ch
@@ -9,9 +9,9 @@ that allows >64K arrays. If you need lots of bytes and toks, try the
alternate change files with -bs suffix instead of -pc.
@x section 1
-@d banner "This is CTANGLE (Version 4.6)"
+@d banner "This is CTANGLE (Version 4.7)"
@y
-@d banner "This is CTANGLE (Version 4.6pc)"
+@d banner "This is CTANGLE (Version 4.7pc)"
@z
@x section 17
@d max_bytes 100000 /* the number of bytes in identifiers,
diff --git a/source/texk/web2c/cwebdir/ctang-ql.ch b/source/texk/web2c/cwebdir/ctang-ql.ch
index 2f4ff604b176302654313e635cd887cdffbbba38..727b20ea9c87837ba4f2b6c524b4b016641050b9 100644
--- a/source/texk/web2c/cwebdir/ctang-ql.ch
+++ b/source/texk/web2c/cwebdir/ctang-ql.ch
@@ -7,15 +7,15 @@ ex <dev_>cc;"-v -h -c -=500000 ctangle_c"
@x
-\def\title{CTANGLE (Version 4.6)}
+\def\title{CTANGLE (Version 4.7)}
@y
-\def\title{CTANGLE (QL Version 4.6)}
+\def\title{CTANGLE (QL Version 4.7)}
@z
@x section 1
-@d banner "This is CTANGLE (Version 4.6)"
+@d banner "This is CTANGLE (Version 4.7)"
@y
-@d banner "This is CTANGLE (QL Version 4.6)"
+@d banner "This is CTANGLE (QL Version 4.7)"
@z
@x
diff --git a/source/texk/web2c/cwebdir/ctang-vms.ch b/source/texk/web2c/cwebdir/ctang-vms.ch
index 9f5dd2a677223e2f7f2fce42c5d8321f167e5de9..e494b86f4fa0213b0d15d2759ad49dab8463f28d 100644
--- a/source/texk/web2c/cwebdir/ctang-vms.ch
+++ b/source/texk/web2c/cwebdir/ctang-vms.ch
@@ -10,9 +10,9 @@ created:
(these changes not necessary for initial bootstrapping)
@x section 1 (01-FEB-1992 ST)
-@d banner "This is CTANGLE (Version 4.6)"
+@d banner "This is CTANGLE (Version 4.7)"
@y
-@d banner "This is CTANGLE (VAX/VMS Version 4.6)"
+@d banner "This is CTANGLE (VAX/VMS Version 4.7)"
@z
@x section 4 (01-FEB-1992 ST)
diff --git a/source/texk/web2c/cwebdir/ctang-w2c.ch b/source/texk/web2c/cwebdir/ctang-w2c.ch
index 334f54ca0745b4c64a79d574127283a357e83cb6..6a284181224e85ead168d6b67ba7ceb460b130bf 100644
--- a/source/texk/web2c/cwebdir/ctang-w2c.ch
+++ b/source/texk/web2c/cwebdir/ctang-w2c.ch
@@ -17,15 +17,15 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
@x
-\def\title{CTANGLE (Version 4.6)}
+\def\title{CTANGLE (Version 4.7)}
@y
-\def\title{CTANGLE (Version 4.6 [\TeX~Live])}
+\def\title{CTANGLE (Version 4.7 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.6)}
+ \centerline{(Version 4.7)}
@y
- \centerline{(Version 4.6 [\TeX~Live])}
+ \centerline{(Version 4.7 [\TeX~Live])}
@z
@x
@@ -41,9 +41,9 @@
@z
@x
-@d banner "This is CTANGLE (Version 4.6)"
+@d banner "This is CTANGLE (Version 4.7)"
@y
-@d banner "This is CTANGLE, Version 4.6"
+@d banner "This is CTANGLE, Version 4.7"
/* will be extended by the \TeX~Live |versionstring| */
@z
diff --git a/source/texk/web2c/cwebdir/ctang-w32.ch b/source/texk/web2c/cwebdir/ctang-w32.ch
index d299f006837be9954881d79eca58640e5183c0bb..d54b84b9f9d7f51a706441f73883366a8bb885c6 100644
--- a/source/texk/web2c/cwebdir/ctang-w32.ch
+++ b/source/texk/web2c/cwebdir/ctang-w32.ch
@@ -4,9 +4,9 @@ This is the change file for CWEB's CTANGLE under Win32
Changes necessary for compiling with Borland C/C++
@x section 1
-@d banner "This is CTANGLE (Version 4.6)"
+@d banner "This is CTANGLE (Version 4.7)"
@y
-@d banner "This is CTANGLE (Version 4.6win32)"
+@d banner "This is CTANGLE (Version 4.7win32)"
@z
@x
@@ -14,13 +14,13 @@ boolean 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} */
@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
diff --git a/source/texk/web2c/cwebdir/ctangle.c b/source/texk/web2c/cwebdir/ctangle.c
index 6faee0b9463cfa6ee3550f6f3cf7cfa87eb4720b..d7bc2ecbf8856a29a7cd40044f7503e6a01c8655 100644
--- a/source/texk/web2c/cwebdir/ctangle.c
+++ b/source/texk/web2c/cwebdir/ctangle.c
@@ -15,7 +15,7 @@
/*:4*/
#line 67 "ctangle.w"
-#define banner "This is CTANGLE (Version 4.6)" \
+#define banner "This is CTANGLE (Version 4.7)" \
#define ctangle false
#define cweave true \
diff --git a/source/texk/web2c/cwebdir/ctangle.w b/source/texk/web2c/cwebdir/ctangle.w
index 2aeb5a8af45ac62653b2c1522113c1e4159684a3..1ee2aaf1958c6873ae655173f8b23d711b39ec97 100644
--- a/source/texk/web2c/cwebdir/ctangle.w
+++ b/source/texk/web2c/cwebdir/ctangle.w
@@ -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.6 --- December 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.6)}
+\def\title{CTANGLE (Version 4.7)}
\def\topofcontents{\null\vfill
\centerline{\titlefont The {\ttitlefont CTANGLE} processor}
\vskip 15pt
- \centerline{(Version 4.6)}
+ \centerline{(Version 4.7)}
\vfill}
\def\botofcontents{\vfill
\noindent
@@ -61,7 +61,7 @@ Joachim Schrod, Lee Wittenberg, and others who have contributed improvements.
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
-@d banner "This is CTANGLE (Version 4.6)"
+@d banner "This is CTANGLE (Version 4.7)"
@c
@<Include files@>@/
@@ -157,7 +157,7 @@ boolean 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} */
{@+(void)t;@/
return length(p)==l && strncmp(first,p->byte_start,l)==0;
}
diff --git a/source/texk/web2c/cwebdir/cweav-bs.ch b/source/texk/web2c/cwebdir/cweav-bs.ch
index 5aa05c8b8cb77b755fa8c8f35b20b8e69bcf1646..c0fc3981ae5145409c4771bdc4ef747107c5072f 100644
--- a/source/texk/web2c/cwebdir/cweav-bs.ch
+++ b/source/texk/web2c/cwebdir/cweav-bs.ch
@@ -20,12 +20,12 @@ This file contributed by Barry Schwartz, trashman@crud.mn.org, 28 Jun 94.
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
-@d banner "This is CWEAVE (Version 4.6)"
+@d banner "This is CWEAVE (Version 4.7)"
@y
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
-@d banner "This is CWEAVE (Version 4.6pc/big)"
+@d banner "This is CWEAVE (Version 4.7pc/big)"
@z
diff --git a/source/texk/web2c/cwebdir/cweav-man.ch b/source/texk/web2c/cwebdir/cweav-man.ch
index 366cda6f1147438d158aac426c5188a8f17bde61..6cfcc8fe2d229789016497d4e96652e5b3ca4d0a 100644
--- a/source/texk/web2c/cwebdir/cweav-man.ch
+++ b/source/texk/web2c/cwebdir/cweav-man.ch
@@ -16,7 +16,7 @@ under the terms of a permission notice identical to this one.
}
@y
\def\botofcontents{\vfill\titlefalse}
-\def\contentspagenumber{108}
+\def\contentspagenumber{109}
\def\title{APPENDIX F: CWEAVE}
\let\K=\leftarrow
@z
diff --git a/source/texk/web2c/cwebdir/cweav-pc.ch b/source/texk/web2c/cwebdir/cweav-pc.ch
index ca1e5ef158751590c834212b91b292da30a39caa..101b4d8a7ae2e48047107c95fd5eaa609006a0e6 100644
--- a/source/texk/web2c/cwebdir/cweav-pc.ch
+++ b/source/texk/web2c/cwebdir/cweav-pc.ch
@@ -11,9 +11,9 @@ that allows >64K arrays. (If you need lots more bytes, try the alternate
change files that have -bs in their name instead of -pc.)
@x section 1
-@d banner "This is CWEAVE (Version 4.6)"
+@d banner "This is CWEAVE (Version 4.7)"
@y
-@d banner "This is CWEAVE (Version 4.6pc)"
+@d banner "This is CWEAVE (Version 4.7pc)"
@z
@x section 17
diff --git a/source/texk/web2c/cwebdir/cweav-ql.ch b/source/texk/web2c/cwebdir/cweav-ql.ch
index 4525b8006dbbe0567d97faf944b4225ca7b2138a..041cba0a830e319ba8a4e886a2a28ac4d31b272c 100644
--- a/source/texk/web2c/cwebdir/cweav-ql.ch
+++ b/source/texk/web2c/cwebdir/cweav-ql.ch
@@ -7,15 +7,15 @@ ex <dev_>cc;"-v -h -c =500000 cweave_c"
@x
-\def\title{CWEAVE (Version 4.6)}
+\def\title{CWEAVE (Version 4.7)}
@y
-\def\title{CWEAVE (QL Version 4.6)}
+\def\title{CWEAVE (QL Version 4.7)}
@z
@x section 1
-@d banner "This is CWEAVE (Version 4.6)"
+@d banner "This is CWEAVE (Version 4.7)"
@y
-@d banner "This is CWEAVE (QL Version 4.6)"
+@d banner "This is CWEAVE (QL Version 4.7)"
@z
@x
diff --git a/source/texk/web2c/cwebdir/cweav-vms.ch b/source/texk/web2c/cwebdir/cweav-vms.ch
index f6d786da4a0c91fa1cb73f647757e9c2fd699115..5078c16541d10f32eb5b25c2a622b13b50dc6db4 100644
--- a/source/texk/web2c/cwebdir/cweav-vms.ch
+++ b/source/texk/web2c/cwebdir/cweav-vms.ch
@@ -13,9 +13,9 @@ modified:
(also modified by Don Knuth to keep version numbers uptodate)
@x section 1 (01-FEB-1992 ST)
-@d banner "This is CWEAVE (Version 4.6)"
+@d banner "This is CWEAVE (Version 4.7)"
@y
-@d banner "This is CWEAVE (VAX/VMS Version 4.6)"
+@d banner "This is CWEAVE (VAX/VMS Version 4.7)"
@z
@x section 4 (01-FEB-1992 ST)
diff --git a/source/texk/web2c/cwebdir/cweav-w2c.ch b/source/texk/web2c/cwebdir/cweav-w2c.ch
index 926dc97f87facde7b3b154dd35d7bb85cab631ba..80951343d37f0e26dce29c26a149b694e89e5230 100644
--- a/source/texk/web2c/cwebdir/cweav-w2c.ch
+++ b/source/texk/web2c/cwebdir/cweav-w2c.ch
@@ -17,15 +17,15 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
@x
-\def\title{CWEAVE (Version 4.6)}
+\def\title{CWEAVE (Version 4.7)}
@y
-\def\title{CWEAVE (Version 4.6 [\TeX~Live])}
+\def\title{CWEAVE (Version 4.7 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.6)}
+ \centerline{(Version 4.7)}
@y
- \centerline{(Version 4.6 [\TeX~Live])}
+ \centerline{(Version 4.7 [\TeX~Live])}
@z
@x
@@ -41,9 +41,9 @@
@z
@x
-@d banner "This is CWEAVE (Version 4.6)"
+@d banner "This is CWEAVE (Version 4.7)"
@y
-@d banner "This is CWEAVE, Version 4.6"
+@d banner "This is CWEAVE, Version 4.7"
/* will be extended by the \TeX~Live |versionstring| */
@z
diff --git a/source/texk/web2c/cwebdir/cweav-w32.ch b/source/texk/web2c/cwebdir/cweav-w32.ch
index 1fc91f1a885d0d862a1ed46ebce67f6fa74e4bf9..84e6a321a57ee43418f397b1577ba08a3e0b701f 100644
--- a/source/texk/web2c/cwebdir/cweav-w32.ch
+++ b/source/texk/web2c/cwebdir/cweav-w32.ch
@@ -2,9 +2,9 @@ This is the change file for CWEB's CWEAVE under Win32
(Contributed by Fabrice Popineau, February 2002)
@x section 1
-@d banner "This is CWEAVE (Version 4.6)"
+@d banner "This is CWEAVE (Version 4.7)"
@y
-@d banner "This is CWEAVE (Version 4.6win32)"
+@d banner "This is CWEAVE (Version 4.7win32)"
@z
@x
diff --git a/source/texk/web2c/cwebdir/cweave.w b/source/texk/web2c/cwebdir/cweave.w
index 96ee6442d21b26e5e0c5af4aa0fd62d0db057c38..5db1c371b552251260e1a6c8b20392112955e108 100644
--- a/source/texk/web2c/cwebdir/cweave.w
+++ b/source/texk/web2c/cwebdir/cweave.w
@@ -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.6 --- December 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.6)}
+\def\title{CWEAVE (Version 4.7)}
\def\topofcontents{\null\vfill
\centerline{\titlefont The {\ttitlefont CWEAVE} processor}
\vskip 15pt
- \centerline{(Version 4.6)}
+ \centerline{(Version 4.7)}
\vfill}
\def\botofcontents{\vfill
\noindent
@@ -67,7 +67,7 @@ Crusius, and others who have contributed improvements.
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
-@d banner "This is CWEAVE (Version 4.6)"
+@d banner "This is CWEAVE (Version 4.7)"
@c
@<Include files@>@/
diff --git a/source/texk/web2c/cwebdir/cwebmac.tex b/source/texk/web2c/cwebdir/cwebmac.tex
index 586e7bb30f0fbcfcfe42dc93d2c90052db359a5d..9384d068866d498dae016ccf7717b8babf02a0f8 100644
--- a/source/texk/web2c/cwebdir/cwebmac.tex
+++ b/source/texk/web2c/cwebdir/cwebmac.tex
@@ -1,8 +1,8 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.6 --- December 2021
+% Version 4.7--- January 2022
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+CWEB4.6}
-\chardef\cwebversion=4 \chardef\cwebrevision=6
+\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)
@@ -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,19 +370,19 @@
\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
\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,15 +539,20 @@
\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
\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)
diff --git a/source/texk/web2c/cwebdir/cwebman.tex b/source/texk/web2c/cwebdir/cwebman.tex
index 4540802d31ed5914c7b50b91e343f0b1d7a9164d..c36b26c9ff4b9a5d02e8cd61bcebc80b095d3156 100644
--- a/source/texk/web2c/cwebdir/cwebman.tex
+++ b/source/texk/web2c/cwebdir/cwebman.tex
@@ -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.6)}
+\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.6 --- December 2021)}
+\vskip 18pt\centerline{(Version 4.7 --- February 2022)}
\vskip 24pt
\centerline{\authorfont Donald E. Knuth and Silvio Levy}
\vfill
@@ -889,8 +889,8 @@ the change file can have any number of lines that do not begin with
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 @@ saying `\.{pdftex}~\.{cob}'.
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
@@ -1592,7 +1597,7 @@ $$\lpile{\.{\\def\\topofcontents\{\\null\\vfill}\cr
\.{ { }\\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.6)\}{ }\\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.
diff --git a/source/texk/web2c/cwebdir/prod.w b/source/texk/web2c/cwebdir/prod.w
index cba9473fd05aaa9eff2ae4d68b6ab179101e36e1..ff33c57a46a3035a5b1b6a3922b6bf07fbbebf37 100644
--- a/source/texk/web2c/cwebdir/prod.w
+++ b/source/texk/web2c/cwebdir/prod.w
@@ -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.6 --- December 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 \$}
diff --git a/source/texk/web2c/doc/web2c.info b/source/texk/web2c/doc/web2c.info
index 44402f96c10d7e72076b3dbe48cde563ae96a89f..de5ce04906ebb9b46b8b949f7a86b05aa8e1b3ca 100644
--- a/source/texk/web2c/doc/web2c.info
+++ b/source/texk/web2c/doc/web2c.info
@@ -1628,13 +1628,13 @@ File: web2c.info, Node: TeX extensions, Prev: IPC and TeX, Up: TeX
The base TeX program has been extended in many ways.
- There has been a substantial effort to make some extended
-functionality available across all engines, so that formats, notably
-LaTeX, can rely on it. A list of this common extended functionality is
-in a 'LaTeX News' article,
+ 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 the extended
-primitives is mostly in the pdfTeX manual (<http://pdftex.org>).
+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.
@@ -1673,7 +1673,7 @@ XeTeX
Home page: <https://tug.org/xetex>.
hiTeX
- Outputs the so-called HINT format, which is designed for reading
+ Outputs its own HINT format, which is designed for reading
technical documents on mobile devices. More info:
<https://ctan.org/pkg/hitex>.
@@ -4589,42 +4589,42 @@ Node: patgen invocation63460
Node: Shell escapes64167
Node: IPC and TeX67747
Node: TeX extensions68317
-Node: Metafont71090
-Node: mf invocation72378
-Node: Initial Metafont76215
-Node: Modes77845
-Node: Online Metafont graphics80095
-Node: gftodvi invocation83520
-Node: mft invocation86340
-Node: MetaPost90338
-Node: mpost invocation91174
-Node: Initial MetaPost96210
-Node: dvitomp invocation97132
-Node: BibTeX97797
-Node: bibtex invocation98158
-Node: Basic BibTeX style files100632
-Node: WEB101962
-Node: tangle invocation103171
-Node: weave invocation105295
-Node: pooltype invocation106702
-Node: DVI utilities107832
-Node: dvicopy invocation108766
-Node: dvitype invocation110051
-Node: dvitype output example112382
-Node: Font utilities115435
-Node: Font file formats116615
-Node: gftopk invocation119882
-Node: pktogf invocation121073
-Node: pktype invocation122239
-Node: gftype invocation125062
-Node: tftopl invocation129565
-Node: pltotf invocation134158
-Node: vftovp invocation135209
-Node: vptovf invocation137444
-Node: Font utilities available elsewhere138471
-Node: Legalisms140676
-Node: References142123
-Node: Index146256
+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
diff --git a/source/texk/web2c/doc/web2c.texi b/source/texk/web2c/doc/web2c.texi
index 68cd67afb19d85d5316f5b54045b80b30428d76f..23d827c5fc6b092f87d497085a367aefc6ae400e 100644
--- a/source/texk/web2c/doc/web2c.texi
+++ b/source/texk/web2c/doc/web2c.texi
@@ -1915,13 +1915,13 @@ debugging.
The base @TeX{} program has been extended in many ways.
@cindex cross-engine functionality
-There has been a substantial effort to make some extended
-functionality available across all engines, so that formats, notably
-@LaTeX{}, can rely on it. A list of this common extended
-functionality is in a @cite{@LaTeX{} News} article,
+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,
@url{https://www.latex-project.org/news/latex2e-news/ltnews31.pdf}.
-For engines in @TeX{} Live, the detailed documentation for the
-extended primitives is mostly in the pdf@TeX{} manual
+For engines in @TeX{} Live, the detailed documentation for these
+primitives is mostly in the pdf@TeX{} manual
(@url{http://pdftex.org}).
In addition, each engine (naturally) has its own particular features,
@@ -1981,7 +1981,7 @@ Home page: @url{https://tug.org/xetex}.
@item hi@TeX{}
@cindex hi@TeX{}
@cindex HINT (Hint Is Not @TeX{})
-Outputs the so-called HINT format, which is designed for reading
+Outputs its own HINT format, which is designed for reading
technical documents on mobile devices. More info:
@url{https://ctan.org/pkg/hitex}.
diff --git a/source/texk/web2c/lib/texmfmp.c b/source/texk/web2c/lib/texmfmp.c
index e4f2a2b5e5f05bd59b18eacf122e6ff15a8d4fbd..a50b9b5ac2f8958102c1d80d1f28b0f470bf9ba3 100644
--- a/source/texk/web2c/lib/texmfmp.c
+++ b/source/texk/web2c/lib/texmfmp.c
@@ -597,12 +597,12 @@ runsystem (const char *cmd)
char *safecmd = NULL;
char *cmdname = NULL;
#if IS_pTeX && !defined(WIN32)
- char *cmd2;
+ 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=cmd;
+ if (!cmd2) cmd2=(char *)cmd;
#endif
if (shellenabledp <= 0) {
@@ -640,7 +640,7 @@ runsystem (const char *cmd)
/* 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);
diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h
index ce2de16fab7e5ee9e7ce8a8e9baab1ee43b6fad5..ef7e23f3a25e67194488265e77ceb255b3c73da9 100644
--- a/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 7487
+#define luatex_svn_revision 7490
diff --git a/source/texk/web2c/luatexdir/tex/maincontrol.c b/source/texk/web2c/luatexdir/tex/maincontrol.c
index 4f91283b9c0c613321912bd8ea958ff47ae540c5..477842ec4218c1c2462d650535984554c888123e 100644
--- a/source/texk/web2c/luatexdir/tex/maincontrol.c
+++ b/source/texk/web2c/luatexdir/tex/maincontrol.c
@@ -2705,7 +2705,7 @@ void prefixed_command(void)
get_x_token();
} while ((cur_cmd == spacer_cmd) || (cur_cmd == relax_cmd));
- if (cur_cmd <= max_non_prefixed_command) {
+ if (cur_cmd <= max_non_prefixed_command || cur_cmd == combine_toks_cmd) {
/*tex
Discard erroneous prefixes and |return|
*/
diff --git a/source/texk/web2c/man/ChangeLog b/source/texk/web2c/man/ChangeLog
index 0dd8cc156b31ab5110a08e1d4a2f6e8b239887be..0d6f4b8d16529cd93dc2cb6cba25802cbb89e565 100644
--- a/source/texk/web2c/man/ChangeLog
+++ b/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,12 @@
+2022-02-02 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill.man: CWEB 4.7 release.
+
+2022-02-02 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill.man,
+ * cweb.man: Pandoc (2.17.1) added some code.
+
2022-01-10 Karl Berry <karl@freefriends.org>
* Makefile.am: copyright 2022.
diff --git a/source/texk/web2c/man/ctwill.man b/source/texk/web2c/man/ctwill.man
index db182ab72770a4f7bb03d68fc469a6e59730e388..0965faa9d5cc5469b61b2231af3853afda80937d 100644
--- a/source/texk/web2c/man/ctwill.man
+++ b/source/texk/web2c/man/ctwill.man
@@ -1,6 +1,20 @@
.\" Automatically generated by Pandoc
.\"
-.TH "CTWILL" "1" "December 25, 2021" "Web2c @VERSION@" "General Commands Manual"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
+.TH "CTWILL" "1" "February 5, 2022" "Web2c @VERSION@" "General Commands Manual"
.hy
.SH NAME
.PP
@@ -111,7 +125,7 @@ The present incarnation of \f[B]ctwill\f[R] and its utilities tries hard
to be a drop-in replacement for the original package.
There are, however, a few differences worth noting:
.IP \[bu] 2
-This version is based on the most recent version of CWEB (4.6).
+This version is based on the most recent version of CWEB (4.7).
.IP \[bu] 2
In TeX\ Live the utility programs are prefixed with \f[B]ctwill-\f[R]
and the macro files with \f[B]ct\f[R] for technical reasons.
diff --git a/source/texk/web2c/man/cweb.man b/source/texk/web2c/man/cweb.man
index 9123b851e62d08e381b41557259539f03d30c303..fd481db48d47f0e44a7b8b8bd479610efe69054e 100644
--- a/source/texk/web2c/man/cweb.man
+++ b/source/texk/web2c/man/cweb.man
@@ -1,5 +1,19 @@
.\" Automatically generated by Pandoc
.\"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
.TH "CWEB" "1" "July 27, 2021" "Web2c @VERSION@" "General Commands Manual"
.hy
.SH NAME
diff --git a/source/texk/web2c/uptexdir/am/uptex.am b/source/texk/web2c/uptexdir/am/uptex.am
index 2dc928ef1853119e203971bc8f0d85d8504c47fd..86f2e82ce9e11d5845856e19cc74d480092fe65d 100644
--- a/source/texk/web2c/uptexdir/am/uptex.am
+++ b/source/texk/web2c/uptexdir/am/uptex.am
@@ -1,4 +1,4 @@
-## $Id: uptex.am 61575 2022-01-11 22:47:10Z karl $
+## $Id: uptex.am 61784 2022-01-29 10:40:22Z hironobu $
## texk/web2c/uptexdir/am/uptex.am: Makefile fragment for upTeX.
##
## Copyright 2016-2022 Karl Berry <tex-live@tug.org>
@@ -172,7 +172,8 @@ upweb_tests = \
uptexdir/yokotate.test \
uptexdir/newjfm.test \
uptexdir/uparse.test \
- uptexdir/gkhuge.test
+ uptexdir/gkhuge.test \
+ uptexdir/upkcat.test
uptexdir/upbibtex.log: upbibtex$(EXEEXT)
uptexdir/updvitype.log: updvitype$(EXEEXT)
uptexdir/uppltotf.log: uppltotf$(EXEEXT)