pdftex[820] branches/stable/source/src: sync with tl r53830

commits+karl at tug.org commits+karl at tug.org
Tue Feb 18 20:11:23 CET 2020


Revision: 820
          http://tug.org/svn/pdftex?view=revision&revision=820
Author:   karl
Date:     2020-02-18 20:11:23 +0100 (Tue, 18 Feb 2020)
Log Message:
-----------
sync with tl r53830

Revision Links:
--------------
    http://tug.org/svn/pdftex?view=revision&revision=53830

Modified Paths:
--------------
    branches/stable/source/src/Makefile.am
    branches/stable/source/src/Makefile.in
    branches/stable/source/src/build-aux/ar-lib
    branches/stable/source/src/build-aux/compile
    branches/stable/source/src/build-aux/config.guess
    branches/stable/source/src/build-aux/config.sub
    branches/stable/source/src/build-aux/depcomp
    branches/stable/source/src/build-aux/texinfo.tex
    branches/stable/source/src/configure
    branches/stable/source/src/doc/ChangeLog
    branches/stable/source/src/doc/build-tools.txt
    branches/stable/source/src/doc/tlbuild.info
    branches/stable/source/src/libs/README
    branches/stable/source/src/libs/configure
    branches/stable/source/src/m4/ChangeLog
    branches/stable/source/src/m4/kpse-setup.m4
    branches/stable/source/src/texk/README
    branches/stable/source/src/texk/configure
    branches/stable/source/src/texk/kpathsea/ChangeLog
    branches/stable/source/src/texk/kpathsea/Makefile.am
    branches/stable/source/src/texk/kpathsea/Makefile.in
    branches/stable/source/src/texk/kpathsea/NEWS
    branches/stable/source/src/texk/kpathsea/access.c
    branches/stable/source/src/texk/kpathsea/c-auto.in
    branches/stable/source/src/texk/kpathsea/configure
    branches/stable/source/src/texk/kpathsea/doc/kpathsea.info
    branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi
    branches/stable/source/src/texk/kpathsea/kpsewhich.c
    branches/stable/source/src/texk/kpathsea/line.c
    branches/stable/source/src/texk/kpathsea/man/Makefile.am
    branches/stable/source/src/texk/kpathsea/man/Makefile.in
    branches/stable/source/src/texk/kpathsea/progname.c
    branches/stable/source/src/texk/kpathsea/texmf.cnf
    branches/stable/source/src/texk/kpathsea/version.ac
    branches/stable/source/src/texk/kpathsea/win32/ChangeLog
    branches/stable/source/src/texk/kpathsea/win32/mktextfm.c
    branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm
    branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
    branches/stable/source/src/texk/web2c/ChangeLog
    branches/stable/source/src/texk/web2c/Makefile.in
    branches/stable/source/src/texk/web2c/NEWS
    branches/stable/source/src/texk/web2c/ac/web2c.ac
    branches/stable/source/src/texk/web2c/am/texmf.am
    branches/stable/source/src/texk/web2c/am/web.am
    branches/stable/source/src/texk/web2c/configure
    branches/stable/source/src/texk/web2c/ctangleboot.cin
    branches/stable/source/src/texk/web2c/cwebboot.cin
    branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
    branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
    branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch
    branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot
    branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po
    branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po
    branches/stable/source/src/texk/web2c/doc/web2c.info
    branches/stable/source/src/texk/web2c/doc/web2c.texi
    branches/stable/source/src/texk/web2c/etexdir/ChangeLog
    branches/stable/source/src/texk/web2c/etexdir/am/etex.am
    branches/stable/source/src/texk/web2c/lib/ChangeLog
    branches/stable/source/src/texk/web2c/lib/printversion.c
    branches/stable/source/src/texk/web2c/lib/texmfmp.c
    branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
    branches/stable/source/src/texk/web2c/pdftexdir/NEWS
    branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am
    branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web
    branches/stable/source/src/texk/web2c/pdftexdir/pdftex_version.h
    branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc
    branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc
    branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc
    branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc
    branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
    branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
    branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc
    branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc
    branches/stable/source/src/texk/web2c/pdftexdir/utils.c
    branches/stable/source/src/texk/web2c/tex.ch
    branches/stable/source/src/texk/web2c/texmfmp.h
    branches/stable/source/src/texk/web2c/web2c/common.defines
    branches/stable/source/src/texk/web2c/web2c/configure
    branches/stable/source/src/utils/README
    branches/stable/source/src/utils/configure
    branches/stable/source/src/version.ac

Added Paths:
-----------
    branches/stable/source/src/texk/kpathsea/tests/cnfnull.test
    branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.83.0.cc
    branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-poppler0.83.0.cc
    branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.bib
    branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.test
    branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.tex
    branches/stable/source/src/texk/web2c/tests/tex-closeout.test
    branches/stable/source/src/texk/web2c/zlib-fmt.ch

Removed Paths:
-------------
    branches/stable/source/src/texk/kpathsea/man/mktexlsr.man
    branches/stable/source/src/texk/kpathsea/man/mktexmf.man
    branches/stable/source/src/texk/kpathsea/man/mktexpk.man
    branches/stable/source/src/texk/kpathsea/man/mktextfm.man
    branches/stable/source/src/texk/kpathsea/mktex.cnf
    branches/stable/source/src/texk/kpathsea/mktex.opt
    branches/stable/source/src/texk/kpathsea/mktexdir
    branches/stable/source/src/texk/kpathsea/mktexdir.opt
    branches/stable/source/src/texk/kpathsea/mktexlsr
    branches/stable/source/src/texk/kpathsea/mktexmf
    branches/stable/source/src/texk/kpathsea/mktexnam
    branches/stable/source/src/texk/kpathsea/mktexnam.opt
    branches/stable/source/src/texk/kpathsea/mktexpk
    branches/stable/source/src/texk/kpathsea/mktextfm
    branches/stable/source/src/texk/kpathsea/mktexupd

Modified: branches/stable/source/src/Makefile.am
===================================================================
--- branches/stable/source/src/Makefile.am	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/Makefile.am	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,7 +1,7 @@
-## $Id: Makefile.am 51428 2019-06-23 17:20:20Z karl $
+## $Id: Makefile.am 53614 2020-01-31 18:59:27Z karl $
 ## Makefile.am for the TeX Live top-level
 ##
-## Copyright 2016      Karl Berry <tex-live at tug.org>
+## Copyright 2016-2020 Karl Berry <tex-live at tug.org>
 ## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
@@ -47,7 +47,7 @@
 # Run texlinks here since the binaries won't be there
 # at install-data, and fmtutil.cnf won't be there at install-exec,
 # and there is no install-hook or install-local.
-texlinks_dir = texk/texlive/tl_scripts
+texlinks_dir = texk/texlive/tl_support
 world: all
 # Serialize 'make all' and 'make install-strip'.
 	@echo "top-level make $@: running install-strip..."

Modified: branches/stable/source/src/Makefile.in
===================================================================
--- branches/stable/source/src/Makefile.in	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/Makefile.in	2020-02-18 19:11:23 UTC (rev 820)
@@ -492,7 +492,7 @@
 recurse_this = 
 recurse_top = 
 
-# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $
+# $Id: Makefile.in 53614 2020-01-31 18:59:27Z karl $
 #
 # Requires $(recurse_this) and $(recurse_top).
 # Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
@@ -512,7 +512,7 @@
 # Run texlinks here since the binaries won't be there
 # at install-data, and fmtutil.cnf won't be there at install-exec,
 # and there is no install-hook or install-local.
-texlinks_dir = texk/texlive/tl_scripts
+texlinks_dir = texk/texlive/tl_support
 
 # should be harmless to run it, but just in case:
 build_info_target = buildinfo

Modified: branches/stable/source/src/build-aux/ar-lib
===================================================================
--- branches/stable/source/src/build-aux/ar-lib	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/build-aux/ar-lib	2020-02-18 19:11:23 UTC (rev 820)
@@ -4,7 +4,7 @@
 me=ar-lib
 scriptversion=2019-07-04.01; # UTC
 
-# Copyright (C) 2010-2019 Free Software Foundation, Inc.
+# Copyright (C) 2010-2020 Free Software Foundation, Inc.
 # Written by Peter Rosin <peda at lysator.liu.se>.
 #
 # This program is free software; you can redistribute it and/or modify

Modified: branches/stable/source/src/build-aux/compile
===================================================================
--- branches/stable/source/src/build-aux/compile	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/build-aux/compile	2020-02-18 19:11:23 UTC (rev 820)
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2019 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey at cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify

Modified: branches/stable/source/src/build-aux/config.guess
===================================================================
--- branches/stable/source/src/build-aux/config.guess	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/build-aux/config.guess	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2019 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2019-09-10'
+timestamp='2020-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2019 Free Software Foundation, Inc.
+Copyright 1992-2020 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -99,6 +99,8 @@
 trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
 
 set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
     : "${TMPDIR=/tmp}"
     # shellcheck disable=SC2039
     { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
@@ -924,7 +926,7 @@
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
 	  EV56)  UNAME_MACHINE=alphaev56 ;;
 	  PCA56) UNAME_MACHINE=alphapca56 ;;

Modified: branches/stable/source/src/build-aux/config.sub
===================================================================
--- branches/stable/source/src/build-aux/config.sub	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/build-aux/config.sub	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2019 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2019-06-30'
+timestamp='2020-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2019 Free Software Foundation, Inc.
+Copyright 1992-2020 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

Modified: branches/stable/source/src/build-aux/depcomp
===================================================================
--- branches/stable/source/src/build-aux/depcomp	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/build-aux/depcomp	2020-02-18 19:11:23 UTC (rev 820)
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2019 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

Modified: branches/stable/source/src/build-aux/texinfo.tex
===================================================================
--- branches/stable/source/src/build-aux/texinfo.tex	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/build-aux/texinfo.tex	2020-02-18 19:11:23 UTC (rev 820)
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2019-09-24.13}
+\def\texinfoversion{2020-02-11.09}
 %
 % Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc.
 %
@@ -373,12 +373,12 @@
   % Common context changes for both heading and footing.
   % Do this outside of the \shipout so @code etc. will be expanded in
   % the headline as they should be, not taken literally (outputting ''code).
-  \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
+  \def\commonheadfootline{\let\hsize=\txipagewidth \texinfochars}
   %
-  \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}%
+  \global\setbox\headlinebox = \vbox{\commonheadfootline \makeheadline}%
   %
   \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
-  \global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}%
+  \global\setbox\footlinebox = \vbox{\commonheadfootline \makefootline}%
   %
   {%
     % Set context for writing to auxiliary files like index files.
@@ -3107,9 +3107,9 @@
 % preferrable one choice is over the other.
 \def\urefallowbreak{%
   \allowbreak
-  \hskip 0pt plus 4 em\relax
-  \penalty100
-  \hskip 0pt plus -4 em\relax
+  \hskip 0pt plus 2 em\relax
+  \penalty300
+  \hskip 0pt plus -2 em\relax
 }
 
 \urefbreakstyle after
@@ -8955,17 +8955,11 @@
     \else
       % Reference within this manual.
       %
-      % _ (for example) has to be the character _ for the purposes of the
-      % control sequence corresponding to the node, but it has to expand
-      % into the usual \leavevmode...\vrule stuff for purposes of
-      % printing. So we \turnoffactive for the \refx-snt, back on for the
-      % printing, back off for the \refx-pg.
-      {\turnoffactive
-       % Only output a following space if the -snt ref is nonempty; for
-       % @unnumbered and @anchor, it won't be.
-       \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
-       \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
-      }%
+      % Only output a following space if the -snt ref is nonempty; for
+      % @unnumbered and @anchor, it won't be.
+      \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
+      \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
+      %
       % output the `[mynode]' via the macro below so it can be overridden.
       \xrefprintnodename\printedrefname
       %
@@ -9055,7 +9049,7 @@
   \requireauxfile
   {%
     \indexnofonts
-    \otherbackslash
+    \turnoffactive
     \def\value##1{##1}%
     \expandafter\global\expandafter\let\expandafter\thisrefX
       \csname XR#1\endcsname

Modified: branches/stable/source/src/configure
===================================================================
--- branches/stable/source/src/configure	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/configure	2020-02-18 19:11:23 UTC (rev 820)
@@ -4140,7 +4140,7 @@
   yes:no | no:*) :
     : ;; #(
   yes:*) :
-    as_fn_error $? "you can not use \`--with-x' for WIN32" "$LINENO" 5 ;; #(
+    as_fn_error $? "you can not use \`--with-x' for Windows" "$LINENO" 5 ;; #(
   *:no) :
     with_x=yes
                  { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-x'" >&5
@@ -4165,6 +4165,19 @@
      ;;
 esac ;;
 esac
+case $enable_luajithbtex in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    case $host in #(
+  alpha* | sparc* | x86_64-*-solaris* | powerpc-*-darwin* ) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajithbtex'" >&5
+$as_echo "$as_me: $host -> \`--disable-luajithbtex'" >&6;}
+                      ac_configure_args="$ac_configure_args '--disable-luajithbtex'" ;; #(
+  *) :
+     ;;
+esac ;;
+esac
 case $enable_mfluajit in #(
   yes | no) :
     : ;; #(
@@ -4178,6 +4191,19 @@
      ;;
 esac ;;
 esac
+case $enable_mfluajit_nowin in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    case $host in #(
+  alpha* | sparc* | x86_64-*-solaris* | powerpc-*-darwin* ) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit-nowin'" >&5
+$as_echo "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
+                      ac_configure_args="$ac_configure_args '--disable-mfluajit-nowin'" ;; #(
+  *) :
+     ;;
+esac ;;
+esac
 
 ## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
 ## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
@@ -4493,7 +4519,7 @@
   need_zlib=yes
 }
 
-# $Id: web2c.ac 51577 2019-07-08 06:07:11Z lscarso $
+# $Id: web2c.ac 53078 2019-12-10 18:39:13Z karl $
 # texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options for TeX and MF
 
@@ -4549,6 +4575,10 @@
 if test "${enable_etex_synctex+set}" = set; then :
   enableval=$enable_etex_synctex;
 fi
+
+test "x$enable_web2c:$enable_etex" = xyes:yes && {
+  need_zlib=yes
+}
 # Check whether --enable-ptex was given.
 if test "${enable_ptex+set}" = set; then :
   enableval=$enable_ptex;
@@ -4567,6 +4597,7 @@
 
 test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-eptex was given.
 if test "${enable_eptex+set}" = set; then :
@@ -4586,6 +4617,7 @@
 
 test "x$enable_web2c:$enable_eptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-uptex was given.
 if test "${enable_uptex+set}" = set; then :
@@ -4605,6 +4637,7 @@
 
 test "x$enable_web2c:$enable_uptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-euptex was given.
 if test "${enable_euptex+set}" = set; then :
@@ -4624,6 +4657,7 @@
 
 test "x$enable_web2c:$enable_euptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-aleph was given.
 if test "${enable_aleph+set}" = set; then :
@@ -4654,6 +4688,7 @@
 test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
+  need_zlib=yes
 }
 # Check whether --enable-luatex was given.
 if test "${enable_luatex+set}" = set; then :
@@ -24926,11 +24961,11 @@
 test "x$srcdir" = x. || msg_compiling="$msg_compiling
       from sources in $kpse_src"
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:
-** Configuration summary for $PACKAGE_STRING (2020/dev$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2020$with_banner_add):
 
    $msg_compiling" >&5
 $as_echo "
-** Configuration summary for $PACKAGE_STRING (2020/dev$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2020$with_banner_add):
 
    $msg_compiling" >&6; }
 case $kpse_src$kpse_bld in

Modified: branches/stable/source/src/doc/ChangeLog
===================================================================
--- branches/stable/source/src/doc/ChangeLog	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/doc/ChangeLog	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,3 +1,7 @@
+2019-12-22  Karl Berry  <karl at freefriends.org>
+
+	* build-tools.txt: bison 3.5.
+
 2019-08-11  Karl Berry  <karl at freefriends.org>
 
 	* tlbuild.texi (Build one package): rm sources to build without C++11.

Modified: branches/stable/source/src/doc/build-tools.txt
===================================================================
--- branches/stable/source/src/doc/build-tools.txt	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/doc/build-tools.txt	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,6 @@
 autoconf (GNU Autoconf) 2.69
 automake (GNU automake) 1.16.1
-bison (GNU Bison) 3.4.2
+bison (GNU Bison) 3.5.1
 flex 2.6.0
 ltmain.sh (GNU libtool) 2.4.6
 m4 (GNU M4) 1.4.18

Modified: branches/stable/source/src/doc/tlbuild.info
===================================================================
--- branches/stable/source/src/doc/tlbuild.info	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/doc/tlbuild.info	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,4 +1,4 @@
-This is tlbuild.info, produced by makeinfo version 6.7 from
+This is tlbuild.info, produced by makeinfo version 5.1 from
 tlbuild.texi.
 
 This file documents the TeX Live build system and more.
@@ -322,8 +322,8 @@
 =====================
 
 To build one package, the basic idea is to use the 'configure' option
-'--disable-all-pkgs' (*note --disable-all-pkgs::).  Then all program and
-library modules are configured but none are made.  However, the
+'--disable-all-pkgs' (*note '--disable-all-pkgs'::).  Then all program
+and library modules are configured but none are made.  However, the
 'Makefile's still contain all build rules and dependencies and can be
 invoked to build an individual program or library, first building any
 required libraries.
@@ -747,7 +747,7 @@
 
      autoconf (GNU Autoconf) 2.69
      automake (GNU automake) 1.16.1
-     bison (GNU Bison) 3.4.2
+     bison (GNU Bison) 3.5.1
      flex 2.6.0
      ltmain.sh (GNU libtool) 2.4.6
      m4 (GNU M4) 1.4.18
@@ -1038,13 +1038,13 @@
 
 * Menu:
 
-* png library::       'libs/libpng'
-* zlib library::      'libs/zlib'
-* freetype library::  'libs/freetype2'
-* kpathsea library::  'texk/kpathsea'
+* 'png' library::       'libs/libpng'
+* 'zlib' library::      'libs/zlib'
+* 'freetype' library::  'libs/freetype2'
+* 'kpathsea' library::  'texk/kpathsea'
 
 
-File: tlbuild.info,  Node: png library,  Next: zlib library,  Up: Library modules
+File: tlbuild.info,  Node: 'png' library,  Next: 'zlib' library,  Up: Library modules
 
 6.4.1 The 'png' library in 'libs/libpng'
 ----------------------------------------
@@ -1100,7 +1100,7 @@
 flags required for the system library.
 
 
-File: tlbuild.info,  Node: zlib library,  Next: freetype library,  Prev: png library,  Up: Library modules
+File: tlbuild.info,  Node: 'zlib' library,  Next: 'freetype' library,  Prev: 'png' library,  Up: Library modules
 
 6.4.2 The 'zlib' library in 'libs/zlib'
 ---------------------------------------
@@ -1112,7 +1112,7 @@
 locations of the 'zlib' headers and/or library.
 
 
-File: tlbuild.info,  Node: freetype library,  Next: kpathsea library,  Prev: zlib library,  Up: Library modules
+File: tlbuild.info,  Node: 'freetype' library,  Next: 'kpathsea' library,  Prev: 'zlib' library,  Up: Library modules
 
 6.4.3 The 'freetype' library in 'libs/freetype2'
 ------------------------------------------------
@@ -1128,7 +1128,7 @@
 'freetype-config'.
 
 
-File: tlbuild.info,  Node: kpathsea library,  Prev: freetype library,  Up: Library modules
+File: tlbuild.info,  Node: 'kpathsea' library,  Prev: 'freetype' library,  Up: Library modules
 
 6.4.4 The 'kpathsea' library in 'texk/kpathsea'
 -----------------------------------------------
@@ -1166,13 +1166,13 @@
 
 * Menu:
 
-* t1utils package:: 'utils/t1utils'
-* xindy package::   'utils/xindy'
-* xdvik package::   'texk/xdvik'
-* asymptote::       'utils/asymptote'
+* 't1utils' package:: 'utils/t1utils'
+* 'xindy' package::   'utils/xindy'
+* 'xdvik' package::   'texk/xdvik'
+* 'asymptote'::       'utils/asymptote'
 
 
-File: tlbuild.info,  Node: t1utils package,  Next: xindy package,  Up: Program modules
+File: tlbuild.info,  Node: 't1utils' package,  Next: 'xindy' package,  Up: Program modules
 
 6.5.1 The 't1utils' package in 'utils/t1utils'
 ----------------------------------------------
@@ -1188,7 +1188,7 @@
 configure option '--disable-t1utils'.
 
 
-File: tlbuild.info,  Node: xindy package,  Next: xdvik package,  Prev: t1utils package,  Up: Program modules
+File: tlbuild.info,  Node: 'xindy' package,  Next: 'xdvik' package,  Prev: 't1utils' package,  Up: Program modules
 
 6.5.2 The 'xindy' package in 'utils/xindy'
 ------------------------------------------
@@ -1214,7 +1214,7 @@
 included by 'configure.ac'.
 
 
-File: tlbuild.info,  Node: xdvik package,  Next: asymptote,  Prev: xindy package,  Up: Program modules
+File: tlbuild.info,  Node: 'xdvik' package,  Next: 'asymptote',  Prev: 'xindy' package,  Up: Program modules
 
 6.5.3 The 'xdvik' package in 'texk/xdvik'
 -----------------------------------------
@@ -1239,7 +1239,7 @@
 also seen at the top level.
 
 
-File: tlbuild.info,  Node: asymptote,  Prev: xdvik package,  Up: Program modules
+File: tlbuild.info,  Node: 'asymptote',  Prev: 'xdvik' package,  Up: Program modules
 
 6.5.4 The subdirectory 'utils/asymptote'
 ----------------------------------------
@@ -1456,21 +1456,21 @@
 
 * Menu:
 
-* --disable-native-texlive-build::
-* --prefix --bindir ...::
-* --disable-largefile::
-* --disable-missing::
-* --enable-compiler-warnings=LEVEL::
-* --enable-cxx-runtime-hack::
-* --enable-maintainer-mode::
-* --enable-multiplatform::
-* --enable-shared::
-* --enable-silent-rules::
-* --without-ln-s::
-* --without-x::
+* '--disable-native-texlive-build'::
+* '--prefix' '--bindir' ...::
+* '--disable-largefile'::
+* '--disable-missing'::
+* '--enable-compiler-warnings='LEVEL::
+* '--enable-cxx-runtime-hack'::
+* '--enable-maintainer-mode'::
+* '--enable-multiplatform'::
+* '--enable-shared'::
+* '--enable-silent-rules'::
+* '--without-ln-s'::
+* '--without-x'::
 
 
-File: tlbuild.info,  Node: --disable-native-texlive-build,  Next: --prefix --bindir ...,  Up: Global configure options
+File: tlbuild.info,  Node: '--disable-native-texlive-build',  Next: '--prefix' '--bindir' ...,  Up: Global configure options
 
 7.1.1 '--disable-native-texlive-build'
 --------------------------------------
@@ -1491,7 +1491,7 @@
 TL-specific adaptations, such as installation paths.
 
 
-File: tlbuild.info,  Node: --prefix --bindir ...,  Next: --disable-largefile,  Prev: --disable-native-texlive-build,  Up: Global configure options
+File: tlbuild.info,  Node: '--prefix' '--bindir' ...,  Next: '--disable-largefile',  Prev: '--disable-native-texlive-build',  Up: Global configure options
 
 7.1.2 '--prefix', '--bindir', ...
 ---------------------------------
@@ -1504,7 +1504,7 @@
 location: (automake)Staged Installs.).
 
 
-File: tlbuild.info,  Node: --disable-largefile,  Next: --disable-missing,  Prev: --prefix --bindir ...,  Up: Global configure options
+File: tlbuild.info,  Node: '--disable-largefile',  Next: '--disable-missing',  Prev: '--prefix' '--bindir' ...,  Up: Global configure options
 
 7.1.3 '--disable-largefile'
 ---------------------------
@@ -1520,7 +1520,7 @@
 'poppler' version 0.22 or before (even on 64-bit systems with LFS).
 
 
-File: tlbuild.info,  Node: --disable-missing,  Next: --enable-compiler-warnings=LEVEL,  Prev: --disable-largefile,  Up: Global configure options
+File: tlbuild.info,  Node: '--disable-missing',  Next: '--enable-compiler-warnings='LEVEL,  Prev: '--disable-largefile',  Up: Global configure options
 
 7.1.4 '--disable-missing'
 -------------------------
@@ -1530,7 +1530,7 @@
 when figuring out a specific (sub)set of modules to enable.
 
 
-File: tlbuild.info,  Node: --enable-compiler-warnings=LEVEL,  Next: --enable-cxx-runtime-hack,  Prev: --disable-missing,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-compiler-warnings='LEVEL,  Next: '--enable-cxx-runtime-hack',  Prev: '--disable-missing',  Up: Global configure options
 
 7.1.5 '--enable-compiler-warnings='LEVEL
 ----------------------------------------
@@ -1543,7 +1543,7 @@
 At present, these warning flags assume options from the GNU compilers.
 
 
-File: tlbuild.info,  Node: --enable-cxx-runtime-hack,  Next: --enable-maintainer-mode,  Prev: --enable-compiler-warnings=LEVEL,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-cxx-runtime-hack',  Next: '--enable-maintainer-mode',  Prev: '--enable-compiler-warnings='LEVEL,  Up: Global configure options
 
 7.1.6 '--enable-cxx-runtime-hack'
 ---------------------------------
@@ -1553,7 +1553,7 @@
 resulting binary.  *Note Macros for compilers::.
 
 
-File: tlbuild.info,  Node: --enable-maintainer-mode,  Next: --enable-multiplatform,  Prev: --enable-cxx-runtime-hack,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-maintainer-mode',  Next: '--enable-multiplatform',  Prev: '--enable-cxx-runtime-hack',  Up: Global configure options
 
 7.1.7 '--enable-maintainer-mode'
 --------------------------------
@@ -1565,7 +1565,7 @@
 'AM_MAINTAINER_MODE': (automake)maintainer-mode.
 
 
-File: tlbuild.info,  Node: --enable-multiplatform,  Next: --enable-shared,  Prev: --enable-maintainer-mode,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-multiplatform',  Next: '--enable-shared',  Prev: '--enable-maintainer-mode',  Up: Global configure options
 
 7.1.8 '--enable-multiplatform'
 ------------------------------
@@ -1578,7 +1578,7 @@
 subdirectories.
 
 
-File: tlbuild.info,  Node: --enable-shared,  Next: --enable-silent-rules,  Prev: --enable-multiplatform,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-shared',  Next: '--enable-silent-rules',  Prev: '--enable-multiplatform',  Up: Global configure options
 
 7.1.9 '--enable-shared'
 -----------------------
@@ -1588,7 +1588,7 @@
 '--disable-native-texlive-build' must also be specified).
 
 
-File: tlbuild.info,  Node: --enable-silent-rules,  Next: --without-ln-s,  Prev: --enable-shared,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-silent-rules',  Next: '--without-ln-s',  Prev: '--enable-shared',  Up: Global configure options
 
 7.1.10 '--enable-silent-rules'
 ------------------------------
@@ -1599,7 +1599,7 @@
 'V=0' to get less, regardless of this option.
 
 
-File: tlbuild.info,  Node: --without-ln-s,  Next: --without-x,  Prev: --enable-silent-rules,  Up: Global configure options
+File: tlbuild.info,  Node: '--without-ln-s',  Next: '--without-x',  Prev: '--enable-silent-rules',  Up: Global configure options
 
 7.1.11 '--without-ln-s'
 -----------------------
@@ -1609,7 +1609,7 @@
 anything useful, and might fail.
 
 
-File: tlbuild.info,  Node: --without-x,  Prev: --without-ln-s,  Up: Global configure options
+File: tlbuild.info,  Node: '--without-x',  Prev: '--without-ln-s',  Up: Global configure options
 
 7.1.12 '--without-x'
 --------------------
@@ -1626,18 +1626,18 @@
 
 * Menu:
 
-* --enable-PROG --disable-PROG::
-* --disable-all-pkgs::
-* Configure options for texk/web2c::
-* Configure options for texk/bibtex-x::
-* Configure options for texk/dvipdfm-x::
-* Configure options for texk/dvisvgm::
-* Configure options for texk/texlive::
-* Configure options for texk/xdvik::
-* Configure options for utils/xindy::
+* '--enable-PROG' '--disable-PROG'::
+* '--disable-all-pkgs'::
+* Configure options for 'texk/web2c'::
+* Configure options for 'texk/bibtex-x'::
+* Configure options for 'texk/dvipdfm-x'::
+* Configure options for 'texk/dvisvgm'::
+* Configure options for 'texk/texlive'::
+* Configure options for 'texk/xdvik'::
+* Configure options for 'utils/xindy'::
 
 
-File: tlbuild.info,  Node: --enable-PROG --disable-PROG,  Next: --disable-all-pkgs,  Up: Program-specific configure options
+File: tlbuild.info,  Node: '--enable-PROG' '--disable-PROG',  Next: '--disable-all-pkgs',  Up: Program-specific configure options
 
 7.2.1 '--enable-PROG', '--disable-PROG'
 ---------------------------------------
@@ -1645,7 +1645,7 @@
 Do or do not build and install the program(s) of module 'PROG'.
 
 
-File: tlbuild.info,  Node: --disable-all-pkgs,  Next: Configure options for texk/web2c,  Prev: --enable-PROG --disable-PROG,  Up: Program-specific configure options
+File: tlbuild.info,  Node: '--disable-all-pkgs',  Next: Configure options for 'texk/web2c',  Prev: '--enable-PROG' '--disable-PROG',  Up: Program-specific configure options
 
 7.2.2 '--disable-all-pkgs'
 --------------------------
@@ -1662,7 +1662,7 @@
 fragment.
 
 
-File: tlbuild.info,  Node: Configure options for texk/web2c,  Next: Configure options for texk/bibtex-x,  Prev: --disable-all-pkgs,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/web2c',  Next: Configure options for 'texk/bibtex-x',  Prev: '--disable-all-pkgs',  Up: Program-specific configure options
 
 7.2.3 Configure options for 'texk/web2c'
 ----------------------------------------
@@ -1729,7 +1729,7 @@
 Do not build the 'SyncTeX' library and tool.
 
 
-File: tlbuild.info,  Node: Configure options for texk/bibtex-x,  Next: Configure options for texk/dvipdfm-x,  Prev: Configure options for texk/web2c,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/bibtex-x',  Next: Configure options for 'texk/dvipdfm-x',  Prev: Configure options for 'texk/web2c',  Up: Program-specific configure options
 
 7.2.4 Configure options for 'texk/bibtex-x'
 -------------------------------------------
@@ -1745,7 +1745,7 @@
 libraries).
 
 
-File: tlbuild.info,  Node: Configure options for texk/dvipdfm-x,  Next: Configure options for texk/dvisvgm,  Prev: Configure options for texk/bibtex-x,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/dvipdfm-x',  Next: Configure options for 'texk/dvisvgm',  Prev: Configure options for 'texk/bibtex-x',  Up: Program-specific configure options
 
 7.2.5 Configure options for 'texk/dvipdfm-x'
 --------------------------------------------
@@ -1763,7 +1763,7 @@
 Do not build the 'xdvipdfmx' program.
 
 
-File: tlbuild.info,  Node: Configure options for texk/dvisvgm,  Next: Configure options for texk/texlive,  Prev: Configure options for texk/dvipdfm-x,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/dvisvgm',  Next: Configure options for 'texk/texlive',  Prev: Configure options for 'texk/dvipdfm-x',  Up: Program-specific configure options
 
 7.2.6 Configure options for 'texk/dvisvgm'
 ------------------------------------------
@@ -1783,7 +1783,7 @@
 Specify non-standard locations of the Ghostscript headers and library.
 
 
-File: tlbuild.info,  Node: Configure options for texk/texlive,  Next: Configure options for texk/xdvik,  Prev: Configure options for texk/dvisvgm,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/texlive',  Next: Configure options for 'texk/xdvik',  Prev: Configure options for 'texk/dvisvgm',  Up: Program-specific configure options
 
 7.2.7 Configure options for 'texk/texlive'
 ------------------------------------------
@@ -1793,7 +1793,7 @@
 the TL scripts required to run 'texlinks'.
 
 
-File: tlbuild.info,  Node: Configure options for texk/xdvik,  Next: Configure options for utils/xindy,  Prev: Configure options for texk/texlive,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/xdvik',  Next: Configure options for 'utils/xindy',  Prev: Configure options for 'texk/texlive',  Up: Program-specific configure options
 
 7.2.8 Configure options for 'texk/xdvik'
 ----------------------------------------
@@ -1810,7 +1810,7 @@
 a native TL build).
 
 
-File: tlbuild.info,  Node: Configure options for utils/xindy,  Prev: Configure options for texk/xdvik,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'utils/xindy',  Prev: Configure options for 'texk/xdvik',  Up: Program-specific configure options
 
 7.2.9 Configure options for 'utils/xindy'
 -----------------------------------------
@@ -1856,11 +1856,11 @@
 
 * Menu:
 
-* Configure options for kpathsea::
-* Configure options for system poppler::
+* Configure options for 'kpathsea'::
+* Configure options for system 'poppler'::
 
 
-File: tlbuild.info,  Node: Configure options for kpathsea,  Next: Configure options for system poppler,  Up: Library-specific configure options
+File: tlbuild.info,  Node: Configure options for 'kpathsea',  Next: Configure options for system 'poppler',  Up: Library-specific configure options
 
 7.3.1 Configure options for 'kpathsea'
 --------------------------------------
@@ -1884,10 +1884,10 @@
      (TFM file)
 
 to generate the specified type of file dynamically.  The default can be
-overridden by the user in any case (*note kpathsea library::).
+overridden by the user in any case (*note 'kpathsea' library::).
 
 
-File: tlbuild.info,  Node: Configure options for system poppler,  Prev: Configure options for kpathsea,  Up: Library-specific configure options
+File: tlbuild.info,  Node: Configure options for system 'poppler',  Prev: Configure options for 'kpathsea',  Up: Library-specific configure options
 
 7.3.2 Configure options for system 'poppler'
 --------------------------------------------
@@ -1902,7 +1902,8 @@
 
 '--with-system-xpdf'
 Use a system version (0.12 or newer) of 'poppler' (and 'pkg-config') for
-pdfTeX instead of 'xpdf' from the TL tree.  *Note --disable-largefile::.
+pdfTeX instead of 'xpdf' from the TL tree.  *Note
+'--disable-largefile'::.
 
 
 File: tlbuild.info,  Node: Variables for configure,  Prev: Library-specific configure options,  Up: Configure options
@@ -4893,11 +4894,11 @@
 
 * Menu:
 
-* tlmgr Machine-readable update and install output::
-* tlmgr Machine-readable option output::
+* tlmgr Machine-readable 'update' and 'install' output::
+* tlmgr Machine-readable 'option' output::
 
 
-File: tlbuild.info,  Node: tlmgr Machine-readable update and install output,  Next: tlmgr Machine-readable option output,  Up: tlmgr MACHINE-READABLE OUTPUT
+File: tlbuild.info,  Node: tlmgr Machine-readable 'update' and 'install' output,  Next: tlmgr Machine-readable 'option' output,  Up: tlmgr MACHINE-READABLE OUTPUT
 
 B.12.1 Machine-readable 'update' and 'install' output
 -----------------------------------------------------
@@ -5015,7 +5016,7 @@
      The estimated total time.
 
 
-File: tlbuild.info,  Node: tlmgr Machine-readable option output,  Prev: tlmgr Machine-readable update and install output,  Up: tlmgr MACHINE-READABLE OUTPUT
+File: tlbuild.info,  Node: tlmgr Machine-readable 'option' output,  Prev: tlmgr Machine-readable 'update' and 'install' output,  Up: tlmgr MACHINE-READABLE OUTPUT
 
 B.12.2 Machine-readable 'option' output
 ---------------------------------------
@@ -5051,116 +5052,117 @@
  [index ]
 * Menu:
 
-* --bindir configure option:             --prefix --bindir ....
+* --bindir configure option:             '--prefix' '--bindir' ....
                                                                (line  6)
-* --bindir configure option <1>:         --enable-multiplatform.
+* --bindir configure option <1>:         '--enable-multiplatform'.
                                                                (line  6)
 * --build=HOST:                          Cross configuring.    (line  6)
 * --disable-all-packages:                Build one package.    (line  6)
-* --disable-all-pkgs:                    --disable-all-pkgs.   (line  6)
-* --disable-bibtex8:                     Configure options for texk/bibtex-x.
+* --disable-all-pkgs:                    '--disable-all-pkgs'. (line  6)
+* --disable-bibtex8:                     Configure options for 'texk/bibtex-x'.
                                                                (line  9)
-* --disable-bibtexu:                     Configure options for texk/bibtex-x.
+* --disable-bibtexu:                     Configure options for 'texk/bibtex-x'.
                                                                (line 12)
-* --disable-dump-share:                  Configure options for texk/web2c.
+* --disable-dump-share:                  Configure options for 'texk/web2c'.
                                                                (line 27)
-* --disable-dvipdfmx:                    Configure options for texk/dvipdfm-x.
+* --disable-dvipdfmx:                    Configure options for 'texk/dvipdfm-x'.
                                                                (line 12)
-* --disable-etex-synctex:                Configure options for texk/web2c.
+* --disable-etex-synctex:                Configure options for 'texk/web2c'.
                                                                (line 59)
-* --disable-ipc:                         Configure options for texk/web2c.
+* --disable-ipc:                         Configure options for 'texk/web2c'.
                                                                (line 31)
-* --disable-largefile:                   --disable-largefile.  (line  6)
-* --disable-linked-scripts:              Configure options for texk/texlive.
+* --disable-largefile:                   '--disable-largefile'.
                                                                (line  6)
-* --disable-mf-nowin:                    Configure options for texk/web2c.
+* --disable-linked-scripts:              Configure options for 'texk/texlive'.
+                                                               (line  6)
+* --disable-mf-nowin:                    Configure options for 'texk/web2c'.
                                                                (line 34)
-* --disable-missing:                     --disable-missing.    (line  6)
-* --disable-native-texlive-build:        --disable-native-texlive-build.
+* --disable-missing:                     '--disable-missing'.  (line  6)
+* --disable-native-texlive-build:        '--disable-native-texlive-build'.
                                                                (line  6)
-* --disable-PROG:                        --enable-PROG --disable-PROG.
+* --disable-PROG:                        '--enable-PROG' '--disable-PROG'.
                                                                (line  6)
-* --disable-synctex:                     Configure options for texk/web2c.
+* --disable-synctex:                     Configure options for 'texk/web2c'.
                                                                (line 64)
-* --disable-tex:                         Configure options for texk/web2c.
+* --disable-tex:                         Configure options for 'texk/web2c'.
                                                                (line 37)
-* --disable-web-progs:                   Configure options for texk/web2c.
+* --disable-web-progs:                   Configure options for 'texk/web2c'.
                                                                (line 41)
-* --disable-xdvipdfmx:                   Configure options for texk/dvipdfm-x.
+* --disable-xdvipdfmx:                   Configure options for 'texk/dvipdfm-x'.
                                                                (line 15)
-* --enable-*win for Metafont window support: Configure options for texk/web2c.
+* --enable-*win for Metafont window support: Configure options for 'texk/web2c'.
                                                                (line 55)
-* --enable-auto-core:                    Configure options for texk/web2c.
+* --enable-auto-core:                    Configure options for 'texk/web2c'.
                                                                (line 45)
-* --enable-compiler-warnings=LEVEL:      --enable-compiler-warnings=LEVEL.
+* --enable-compiler-warnings=LEVEL:      '--enable-compiler-warnings='LEVEL.
                                                                (line  6)
 * --enable-cxx-runtime-hack:             Macros for compilers. (line 29)
-* --enable-etex:                         Configure options for texk/web2c.
+* --enable-etex:                         Configure options for 'texk/web2c'.
                                                                (line 37)
-* --enable-libtool-hack:                 Configure options for texk/web2c.
+* --enable-libtool-hack:                 Configure options for 'texk/web2c'.
                                                                (line 50)
 * --enable-maintainer-mode:              Build system tools.   (line 28)
-* --enable-maintainer-mode <1>:          --enable-maintainer-mode.
+* --enable-maintainer-mode <1>:          '--enable-maintainer-mode'.
                                                                (line  6)
 * --enable-missing to ignore dependencies: Build one package.  (line 71)
-* --enable-mktextfm-default:             kpathsea library.     (line 18)
-* --enable-multiplatform:                --enable-multiplatform.
+* --enable-mktextfm-default:             'kpathsea' library.   (line 18)
+* --enable-multiplatform:                '--enable-multiplatform'.
                                                                (line  6)
-* --enable-PROG:                         --enable-PROG --disable-PROG.
+* --enable-PROG:                         '--enable-PROG' '--disable-PROG'.
                                                                (line  6)
-* --enable-shared:                       --enable-shared.      (line  6)
-* --enable-silent-rules:                 --enable-silent-rules.
+* --enable-shared:                       '--enable-shared'.    (line  6)
+* --enable-silent-rules:                 '--enable-silent-rules'.
                                                                (line  6)
-* --enable-tex-synctex:                  Configure options for texk/web2c.
+* --enable-tex-synctex:                  Configure options for 'texk/web2c'.
                                                                (line 59)
-* --enable-texlive-build:                --disable-native-texlive-build.
+* --enable-texlive-build:                '--disable-native-texlive-build'.
                                                                (line 15)
-* --enable-xi2-scrolling:                Configure options for texk/xdvik.
+* --enable-xi2-scrolling:                Configure options for 'texk/xdvik'.
                                                                (line 13)
-* --enable-xindy-docs:                   Configure options for utils/xindy.
+* --enable-xindy-docs:                   Configure options for 'utils/xindy'.
                                                                (line 10)
-* --enable-xindy-rules:                  Configure options for utils/xindy.
+* --enable-xindy-rules:                  Configure options for 'utils/xindy'.
                                                                (line  6)
 * --host=HOST:                           Cross configuring.    (line  6)
-* --libdir configure option:             --enable-multiplatform.
+* --libdir configure option:             '--enable-multiplatform'.
                                                                (line  6)
 * --no-clean Build option:               Build problems.       (line  6)
-* --prefix configure option:             --prefix --bindir ....
+* --prefix configure option:             '--prefix' '--bindir' ....
                                                                (line  6)
-* --with-banner-add=STR:                 Configure options for texk/web2c.
+* --with-banner-add=STR:                 Configure options for 'texk/web2c'.
                                                                (line  6)
-* --with-clisp-runtime=FILENAME:         Configure options for utils/xindy.
+* --with-clisp-runtime=FILENAME:         Configure options for 'utils/xindy'.
                                                                (line 14)
-* --with-editor=CMD:                     Configure options for texk/web2c.
+* --with-editor=CMD:                     Configure options for 'texk/web2c'.
                                                                (line 11)
-* --with-fontconfig-includes=DIR:        Configure options for texk/web2c.
+* --with-fontconfig-includes=DIR:        Configure options for 'texk/web2c'.
                                                                (line 16)
-* --with-fontconfig-libdir=DIR:          Configure options for texk/web2c.
+* --with-fontconfig-libdir=DIR:          Configure options for 'texk/web2c'.
                                                                (line 16)
-* --with-gs=FILENAME:                    Configure options for texk/xdvik.
+* --with-gs=FILENAME:                    Configure options for 'texk/xdvik'.
                                                                (line  6)
 * --with-LIB-includes=DIR, -libdir:      Library-specific configure options.
                                                                (line 16)
-* --with-libgs-includes, -libdir:        Configure options for texk/dvisvgm.
+* --with-libgs-includes, -libdir:        Configure options for 'texk/dvisvgm'.
                                                                (line 17)
-* --with-system-kpathsea:                kpathsea library.     (line 13)
+* --with-system-kpathsea:                'kpathsea' library.   (line 13)
 * --with-system-LIB:                     Adding a new generic library module.
                                                                (line 34)
 * --with-system-LIB <1>:                 Library-specific configure options.
                                                                (line  9)
-* --with-system-libgs:                   Configure options for texk/dvisvgm.
+* --with-system-libgs:                   Configure options for 'texk/dvisvgm'.
                                                                (line  6)
-* --with-system-poppler:                 Configure options for system poppler.
+* --with-system-poppler:                 Configure options for system 'poppler'.
                                                                (line 11)
-* --with-system-xpdf:                    Configure options for system poppler.
+* --with-system-xpdf:                    Configure options for system 'poppler'.
                                                                (line 15)
-* --with-xdvi-x-toolkit:                 xdvik package.        (line 21)
-* --with-xdvi-x-toolkit=KIT:             Configure options for texk/xdvik.
+* --with-xdvi-x-toolkit:                 'xdvik' package.      (line 21)
+* --with-xdvi-x-toolkit=KIT:             Configure options for 'texk/xdvik'.
                                                                (line  9)
-* --without-libgs:                       Configure options for texk/dvisvgm.
+* --without-libgs:                       Configure options for 'texk/dvisvgm'.
                                                                (line 12)
-* --without-ln-s:                        --without-ln-s.       (line  6)
-* --without-x:                           --without-x.          (line  6)
+* --without-ln-s:                        '--without-ln-s'.     (line  6)
+* --without-x:                           '--without-x'.        (line  6)
 * -C configure option:                   Build in parallel.    (line 11)
 * -j make option:                        Build in parallel.    (line  6)
 * adapting TeX Live for distros:         Distro builds.        (line 54)
@@ -5171,14 +5173,14 @@
 * adding a new TeX-specific library:     Adding a new TeX-specific library module.
                                                                (line  6)
 * adding to TeX Live:                    Extending TeX Live.   (line  6)
-* am/ top-level directory:               Top-level directories.
+* 'am/' top-level directory:             Top-level directories.
                                                                (line 14)
 * ANSI C:                                Declarations and definitions.
                                                                (line  6)
-* ApplicationServices Mac framework, required by xetex: Prerequisites.
+* 'ApplicationServices' Mac framework, required by 'xetex': Prerequisites.
                                                                (line 31)
 * asymptote:                             Linked scripts.       (line 23)
-* asymptote <1>:                         asymptote.            (line  6)
+* asymptote <1>:                         'asymptote'.          (line  6)
 * Autoconf:                              Overview of build system.
                                                                (line  6)
 * autoconf macros:                       Autoconf macros.      (line  6)
@@ -5185,11 +5187,11 @@
 * Automake:                              Overview of build system.
                                                                (line  6)
 * biber:                                 Linked scripts.       (line 23)
-* bibtex-x:                              Configure options for texk/bibtex-x.
+* bibtex-x:                              Configure options for 'texk/bibtex-x'.
                                                                (line  6)
-* bibtex8:                               Configure options for texk/bibtex-x.
+* bibtex8:                               Configure options for 'texk/bibtex-x'.
                                                                (line  6)
-* bibtexu:                               Configure options for texk/bibtex-x.
+* bibtexu:                               Configure options for 'texk/bibtex-x'.
                                                                (line  6)
 * BSD distro:                            Distro builds.        (line  6)
 * build directory, required:             Building.             (line 17)
@@ -5201,7 +5203,7 @@
 * Build script:                          Building.             (line  6)
 * build system, design of:               Overview of build system.
                                                                (line  6)
-* build-aux/ top-level directory:        Top-level directories.
+* 'build-aux/' top-level directory:      Top-level directories.
                                                                (line 30)
 * BUILDCC, BUILDCFLAGS, ...:             Cross configuring.    (line 42)
 * building:                              Building.             (line  6)
@@ -5213,8 +5215,8 @@
                                                                (line  6)
 * C99, avoided:                          Declarations and definitions.
                                                                (line  6)
-* cache file, for configure:             Build in parallel.    (line 11)
-* cache for configure:                   Build in parallel.    (line  6)
+* cache file, for 'configure':           Build in parallel.    (line 11)
+* cache for 'configure':                 Build in parallel.    (line  6)
 * callexe.c:                             Macros for Windows.   (line 32)
 * CC:                                    Variables for configure.
                                                                (line 10)
@@ -5226,43 +5228,43 @@
                                                                (line 18)
 * CLISP:                                 Variables for configure.
                                                                (line 17)
-* CLISP <1>:                             Configure options for utils/xindy.
+* CLISP <1>:                             Configure options for 'utils/xindy'.
                                                                (line 14)
-* clisp, required by xindy:              Prerequisites.        (line 35)
-* Cocoa Mac framework, required by xetex: Prerequisites.       (line 31)
+* 'clisp', required by 'xindy':          Prerequisites.        (line 35)
+* 'Cocoa' Mac framework, required by 'xetex': Prerequisites.   (line 31)
 * coding conventions:                    Coding conventions.   (line  6)
 * compilers, C and C++11:                Prerequisites.        (line  6)
 * config.guess, config.sub, ...:         Top-level directories.
                                                                (line 30)
-* configure options:                     Configure options.    (line  6)
-* configure options, for bibtex-x:       Configure options for texk/bibtex-x.
+* 'configure' options:                   Configure options.    (line  6)
+* 'configure' options, for 'bibtex-x':   Configure options for 'texk/bibtex-x'.
                                                                (line  6)
-* configure options, for dvipdfm-x:      Configure options for texk/dvipdfm-x.
+* 'configure' options, for 'dvipdfm-x':  Configure options for 'texk/dvipdfm-x'.
                                                                (line  6)
-* configure options, for dvisvgm:        Configure options for texk/dvisvgm.
+* 'configure' options, for 'dvisvgm':    Configure options for 'texk/dvisvgm'.
                                                                (line  6)
-* configure options, for kpathsea:       Configure options for kpathsea.
+* 'configure' options, for 'kpathsea':   Configure options for 'kpathsea'.
                                                                (line  6)
-* configure options, for system poppler: Configure options for system poppler.
+* 'configure' options, for system 'poppler': Configure options for system 'poppler'.
                                                                (line  6)
-* configure options, for texk/texlive:   Configure options for texk/texlive.
+* 'configure' options, for 'texk/texlive': Configure options for 'texk/texlive'.
                                                                (line  6)
-* configure options, for web2c:          Configure options for texk/web2c.
+* 'configure' options, for 'web2c':      Configure options for 'texk/web2c'.
                                                                (line  6)
-* configure options, for xdvik:          Configure options for texk/xdvik.
+* 'configure' options, for 'xdvik':      Configure options for 'texk/xdvik'.
                                                                (line  6)
-* configure options, for xindy:          Configure options for utils/xindy.
+* 'configure' options, for 'xindy':      Configure options for 'utils/xindy'.
                                                                (line  6)
-* configure options, global:             Global configure options.
+* 'configure' options, global:           Global configure options.
                                                                (line  6)
-* configure options, library-specific:   Library-specific configure options.
+* 'configure' options, library-specific: Library-specific configure options.
                                                                (line  6)
-* configure options, program-specific:   Program-specific configure options.
+* 'configure' options, program-specific: Program-specific configure options.
                                                                (line  6)
-* configure variables:                   Variables for configure.
+* 'configure' variables:                 Variables for configure.
                                                                (line  6)
 * configuring, for cross compilation:    Cross configuring.    (line  6)
-* const:                                 Const.                (line  6)
+* 'const':                               Const.                (line  6)
 * continuous integration:                Continuous integration.
                                                                (line  6)
 * conventions, coding:                   Coding conventions.   (line  6)
@@ -5271,7 +5273,7 @@
 * cross compilation:                     Cross compilation.    (line  6)
 * cross compilation configuring:         Cross configuring.    (line  6)
 * cross compilation problems:            Cross problems.       (line  6)
-* cross compilation, with host binary:   xdvik package.        (line 14)
+* cross compilation, with host binary:   'xdvik' package.      (line 14)
 * ctangle:                               Cross problems.       (line 26)
 * CXX:                                   Variables for configure.
                                                                (line 11)
@@ -5281,7 +5283,7 @@
 * declarations before statements, avoiding: Declarations and definitions.
                                                                (line  6)
 * dependencies, with several output files: Build in parallel.  (line  6)
-* DESTDIR:                               --prefix --bindir ....
+* DESTDIR:                               '--prefix' '--bindir' ....
                                                                (line  9)
 * directories, for installation:         Installation directories.
                                                                (line  6)
@@ -5288,30 +5290,31 @@
 * directories, top-level:                Top-level directories.
                                                                (line  6)
 * discards qualifiers warning:           Const.                (line 30)
-* dist and distcheck targets for make:   Build distribution.   (line  6)
+* 'dist' and 'distcheck' targets for 'make': Build distribution.
+                                                               (line  6)
 * distribution tarball, making:          Build distribution.   (line  6)
 * distro, building for:                  Distro builds.        (line  6)
-* dvipdfm-x:                             Configure options for texk/dvipdfm-x.
+* dvipdfm-x:                             Configure options for 'texk/dvipdfm-x'.
                                                                (line  6)
-* dvipdfmx:                              Configure options for texk/dvipdfm-x.
+* dvipdfmx:                              Configure options for 'texk/dvipdfm-x'.
                                                                (line  6)
-* dvisvgm:                               Configure options for texk/dvisvgm.
+* dvisvgm:                               Configure options for 'texk/dvisvgm'.
                                                                (line  6)
 * engine, building one:                  Build one engine.     (line  6)
-* environment variables, for configure:  Configure options.    (line 16)
-* exec_prefix:                           --enable-multiplatform.
+* environment variables, for 'configure': Configure options.   (line 16)
+* exec_prefix:                           '--enable-multiplatform'.
                                                                (line  6)
 * extending TeX Live:                    Extending TeX Live.   (line  6)
-* extern functions:                      Declarations and definitions.
+* 'extern' functions:                    Declarations and definitions.
                                                                (line 41)
 * failure to build:                      Build problems.       (line  6)
 * flags, macros for library and header:  Macros for library and header flags.
                                                                (line  6)
-* fontconfig library, required by xetex: Prerequisites.        (line 31)
+* 'fontconfig' library, required by 'xetex': Prerequisites.    (line 31)
 * FreeType:                              Prerequisites.        (line 11)
-* freetype cross compiling:              Cross problems.       (line 13)
-* freetype library:                      freetype library.     (line  6)
-* freetype-config:                       freetype library.     (line 13)
+* 'freetype' cross compiling:            Cross problems.       (line 13)
+* freetype library:                      'freetype' library.   (line  6)
+* freetype-config:                       'freetype' library.   (line 13)
 * freetype-config <1>:                   Variables for configure.
                                                                (line 24)
 * FT2_CONFIG:                            Variables for configure.
@@ -5320,14 +5323,14 @@
 * general setup macros:                  General setup macros. (line  6)
 * generic library module, adding:        Adding a new generic library module.
                                                                (line  6)
-* Ghostscript location for Xdvik:        Configure options for texk/xdvik.
+* Ghostscript location for Xdvik:        Configure options for 'texk/xdvik'.
                                                                (line  6)
 * git-svn:                               Transfer from Subversion to Github.
                                                                (line  6)
-* global configure options:              Global configure options.
+* global 'configure' options:            Global configure options.
                                                                (line  6)
-* gmake, required:                       Prerequisites.        (line 11)
-* GNU make, required:                    Prerequisites.        (line 11)
+* 'gmake', required:                     Prerequisites.        (line 11)
+* GNU 'make', required:                  Prerequisites.        (line 11)
 * GNU tools, needed for building:        Build system tools.   (line  6)
 * GNU/Linux distro:                      Distro builds.        (line  6)
 * Gnulib, used for common files:         Top-level directories.
@@ -5340,23 +5343,23 @@
 * ICU_CONFIG:                            Variables for configure.
                                                                (line 22)
 * infrastructure, tools needed for:      Build system tools.   (line  6)
-* inst/ top-level directory:             Top-level directories.
+* 'inst/' top-level directory:           Top-level directories.
                                                                (line 39)
 * install-tl, TeX Live installer:        Installing.           (line  8)
 * installation directories:              Installation directories.
                                                                (line  6)
 * installing:                            Installing.           (line  6)
-* interprocess communication:            Configure options for texk/web2c.
+* interprocess communication:            Configure options for 'texk/web2c'.
                                                                (line 31)
 * introduction:                          Introduction.         (line  6)
-* iteration through sources, by configure and make: Build iteration.
+* iteration through sources, by 'configure' and 'make': Build iteration.
                                                                (line  6)
-* kpathsea library:                      kpathsea library.     (line  6)
-* kpathsea.ac:                           kpathsea library.     (line 18)
-* kpse-libpng-flags.m4:                  png library.          (line 46)
+* kpathsea library:                      'kpathsea' library.   (line  6)
+* kpathsea.ac:                           'kpathsea' library.   (line 18)
+* kpse-libpng-flags.m4:                  'png' library.        (line 46)
 * kpse-pkgs.m4:                          Overview of build system.
                                                                (line 30)
-* kpse-zlib-flags.m4:                    zlib library.         (line  6)
+* kpse-zlib-flags.m4:                    'zlib' library.       (line  6)
 * kpsewhich:                             Variables for configure.
                                                                (line 30)
 * KPSEWHICH:                             Variables for configure.
@@ -5386,7 +5389,7 @@
 * KPSE_LARGEFILE:                        Macros for libraries. (line  8)
 * KPSE_LIBPNG_FLAGS:                     Macros for library and header flags.
                                                                (line 10)
-* KPSE_LIBPNG_FLAGS <1>:                 png library.          (line 46)
+* KPSE_LIBPNG_FLAGS <1>:                 'png' library.        (line 46)
 * kpse_libs_pkgs:                        Adding a new generic library module.
                                                                (line  6)
 * KPSE_LIB_FLAGS:                        Macros for library and header flags.
@@ -5402,10 +5405,10 @@
                                                                (line  6)
 * kpse_texlibs_pkgs:                     Adding a new TeX-specific library module.
                                                                (line 11)
-* KPSE_TRY_LIB:                          png library.          (line 18)
+* KPSE_TRY_LIB:                          'png' library.        (line 18)
 * KPSE_TRY_LIB <1>:                      Adding a new generic library module.
                                                                (line 20)
-* KPSE_TRY_LIBXX:                        png library.          (line 31)
+* KPSE_TRY_LIBXX:                        'png' library.        (line 31)
 * KPSE_TRY_LIBXX <1>:                    Adding a new generic library module.
                                                                (line 20)
 * kpse_utils_pkgs:                       Adding a new program module.
@@ -5415,42 +5418,44 @@
                                                                (line 11)
 * KPSE_WITH_TEXLIB:                      Adding a new TeX-specific library module.
                                                                (line 14)
-* large file support:                    --disable-largefile.  (line  6)
+* large file support:                    '--disable-largefile'.
+                                                               (line  6)
 * LATEX:                                 Variables for configure.
                                                                (line 40)
 * layout of sources:                     Layout and infrastructure.
                                                                (line  6)
-* LFS (large file support):              --disable-largefile.  (line  6)
-* libexpat, dependency of libfontconfig: Configure options for texk/web2c.
+* LFS (large file support):              '--disable-largefile'.
+                                                               (line  6)
+* libexpat, dependency of 'libfontconfig': Configure options for 'texk/web2c'.
                                                                (line 50)
-* libfontconfig, hack for avoiding linking dependencies: Configure options for texk/web2c.
+* libfontconfig, hack for avoiding linking dependencies: Configure options for 'texk/web2c'.
                                                                (line 50)
 * libfreetype:                           Variables for configure.
                                                                (line 24)
-* libfreetype, and const:                Const.                (line 21)
-* libpng library:                        png library.          (line  6)
+* 'libfreetype', and 'const':            Const.                (line 21)
+* libpng library:                        'png' library.        (line  6)
 * library module, generic, adding:       Adding a new generic library module.
                                                                (line  6)
 * library module, TeX-specific, adding:  Adding a new TeX-specific library module.
                                                                (line  6)
 * library modules:                       Library modules.      (line  6)
-* library-specific configure options:    Library-specific configure options.
+* library-specific 'configure' options:  Library-specific configure options.
                                                                (line  6)
-* libsigsegv, required by xindy:         Prerequisites.        (line 35)
+* 'libsigsegv', required by 'xindy':     Prerequisites.        (line 35)
 * libstc++, statically linking:          Macros for compilers. (line 29)
 * Libtool:                               Overview of build system.
                                                                (line  6)
-* libtool, hack for avoiding excessive linking: Configure options for texk/web2c.
+* libtool, hack for avoiding excessive linking: Configure options for 'texk/web2c'.
                                                                (line 50)
-* libXt:                                 Configure options for texk/web2c.
+* libXt:                                 Configure options for 'texk/web2c'.
                                                                (line 22)
 * linked scripts:                        Linked scripts.       (line  6)
 * linking C++ libraries statically:      Macros for compilers. (line 29)
-* lisp.run, lisp.exe:                    Configure options for utils/xindy.
+* lisp.run, lisp.exe:                    Configure options for 'utils/xindy'.
                                                                (line 14)
-* LittleEndian architectures:            Configure options for texk/web2c.
+* LittleEndian architectures:            Configure options for 'texk/web2c'.
                                                                (line 27)
-* m4/ top-level directory:               Top-level directories.
+* 'm4/' top-level directory:             Top-level directories.
                                                                (line 14)
 * macros, for compilers:                 Macros for compilers. (line  6)
 * macros, for libraries:                 Macros for libraries. (line  6)
@@ -5462,23 +5467,23 @@
 * MAKE:                                  Variables for configure.
                                                                (line 33)
 * make -t:                               Build system tools.   (line 43)
-* make rules, verbose vs. silent:        --enable-silent-rules.
+* 'make' rules, verbose vs. silent:      '--enable-silent-rules'.
                                                                (line  6)
-* mf-nowin:                              Configure options for texk/web2c.
+* mf-nowin:                              Configure options for 'texk/web2c'.
                                                                (line 34)
-* mingw32:                               Cross configuring.    (line 27)
+* 'mingw32':                             Cross configuring.    (line 27)
 * MINGW32, Automake conditional:         Macros for Windows.   (line 20)
-* mktex.ac:                              kpathsea library.     (line 18)
-* mktextfm:                              kpathsea library.     (line 18)
+* mktex.ac:                              'kpathsea' library.   (line 18)
+* mktextfm:                              'kpathsea' library.   (line 18)
 * modules, for libraries:                Library modules.      (line  6)
 * modules, for programs:                 Program modules.      (line  6)
-* motif:                                 Configure options for texk/xdvik.
+* motif:                                 Configure options for 'texk/xdvik'.
                                                                (line  9)
 * native cross compilation:              Cross compilation.    (line 10)
 * OBJCXX=OBJC-COMPILER:                  Build one package.    (line 78)
 * one engine, building:                  Build one engine.     (line  6)
 * one package, building:                 Build one package.    (line  6)
-* OpenGL, required for Asymptote:        asymptote.            (line  6)
+* OpenGL, required for Asymptote:        'asymptote'.          (line  6)
 * operating system distribution, building for: Distro builds.  (line  6)
 * otangle:                               Cross problems.       (line 26)
 * overall build process:                 Building.             (line  6)
@@ -5485,21 +5490,23 @@
 * parallel build:                        Build in parallel.    (line  6)
 * paths, for installation:               Installation directories.
                                                                (line  6)
-* PDF files, size of:                    --disable-largefile.  (line 11)
+* PDF files, size of:                    '--disable-largefile'.
+                                                               (line 11)
 * PDFLATEX:                              Variables for configure.
                                                                (line 41)
 * PERL:                                  Variables for configure.
                                                                (line 39)
-* perl, required by web2c, etc.:         Prerequisites.        (line 23)
+* 'perl', required by 'web2c', etc.:     Prerequisites.        (line 23)
 * PKG_CONFIG:                            Variables for configure.
                                                                (line 23)
 * plain.tex, not in source tree:         Installing.           (line  8)
-* png library:                           png library.          (line  6)
-* poppler:                               Configure options for system poppler.
+* png library:                           'png' library.        (line  6)
+* poppler:                               Configure options for system 'poppler'.
                                                                (line  6)
-* PostScript files, size of:             --disable-largefile.  (line 11)
+* PostScript files, size of:             '--disable-largefile'.
+                                                               (line 11)
 * Preining, Norbert:                     Distro builds.        (line 54)
-* preloaded binaries:                    Configure options for texk/web2c.
+* preloaded binaries:                    Configure options for 'texk/web2c'.
                                                                (line 45)
 * prerequisites for building:            Prerequisites.        (line  6)
 * problems with build:                   Build problems.       (line  6)
@@ -5506,20 +5513,21 @@
 * program module, adding:                Adding a new program module.
                                                                (line  6)
 * program modules:                       Program modules.      (line  6)
-* program-specific configure options:    Program-specific configure options.
+* program-specific 'configure' options:  Program-specific configure options.
                                                                (line  6)
-* proxy build system:                    png library.          (line 36)
+* proxy build system:                    'png' library.        (line 36)
 * reautoconf:                            Build system tools.   (line 28)
 * requirements for building:             Prerequisites.        (line  6)
 * runscript.exe:                         Macros for Windows.   (line 25)
 * scripts, linked and not maintained:    Linked scripts.       (line  6)
-* scrolling, smooth:                     Configure options for texk/xdvik.
+* scrolling, smooth:                     Configure options for 'texk/xdvik'.
                                                                (line 13)
 * SED:                                   Variables for configure.
                                                                (line 34)
 * setup macros, general:                 General setup macros. (line  6)
 * shared libraries, using vs. avoiding:  Distro builds.        (line 11)
-* size of PDF and PS files:              --disable-largefile.  (line 11)
+* size of PDF and PS files:              '--disable-largefile'.
+                                                               (line 11)
 * size of source tree:                   Build one package.    (line 53)
 * source code declarations:              Declarations and definitions.
                                                                (line  6)
@@ -5527,8 +5535,8 @@
 * source tree:                           Layout and infrastructure.
                                                                (line  6)
 * squeeze:                               Cross problems.       (line 13)
-* squeeze/configure.ac:                  xdvik package.        (line 14)
-* static functions:                      Declarations and definitions.
+* squeeze/configure.ac:                  'xdvik' package.      (line 14)
+* 'static' functions:                    Declarations and definitions.
                                                                (line 35)
 * static linking for C++:                Macros for compilers. (line 29)
 * stpcpy:                                Declarations and definitions.
@@ -5536,12 +5544,12 @@
 * Subversion repository:                 Build system tools.   (line 38)
 * support files, separate from build:    Installing.           (line  8)
 * symlinks, used for scripts:            Linked scripts.       (line  6)
-* synctex:                               Configure options for texk/web2c.
+* synctex:                               Configure options for 'texk/web2c'.
                                                                (line 59)
-* synctex <1>:                           Configure options for texk/web2c.
+* synctex <1>:                           Configure options for 'texk/web2c'.
                                                                (line 64)
 * system distribution, building for:     Distro builds.        (line  6)
-* t1utils package:                       t1utils package.      (line  6)
+* t1utils package:                       't1utils' package.    (line  6)
 * tangle:                                Cross problems.       (line 26)
 * tests, running:                        Overview of build system.
                                                                (line  6)
@@ -5562,12 +5570,12 @@
 * use-commit-times, Subversion:          Build system tools.   (line 38)
 * variable declarations, in source code: Declarations and definitions.
                                                                (line 52)
-* variables for configure:               Variables for configure.
+* variables for 'configure':             Variables for configure.
                                                                (line  6)
 * warning, discards qualifiers:          Const.                (line 30)
 * WARNING_C[XX]FLAGS:                    Macros for compilers. (line  9)
 * web2c program:                         Cross problems.       (line 13)
-* web2c.ac:                              Configure options for texk/web2c.
+* web2c.ac:                              Configure options for 'texk/web2c'.
                                                                (line 37)
 * wget:                                  Linked scripts.       (line 23)
 * WIN32, Automake conditional:           Macros for Windows.   (line 16)
@@ -5576,35 +5584,35 @@
 * Windows, macros for:                   Macros for Windows.   (line  6)
 * withenable.ac, for new modules:        Adding a new program module.
                                                                (line 14)
-* Work/ top-level directory:             Top-level directories.
+* 'Work/' top-level directory:           Top-level directories.
                                                                (line 39)
 * wrapper binary for scripts on Windows: Linked scripts.       (line  6)
-* wrapper build system:                  freetype library.     (line  6)
-* X toolkit:                             Configure options for texk/web2c.
+* wrapper build system:                  'freetype' library.   (line  6)
+* X toolkit:                             Configure options for 'texk/web2c'.
                                                                (line 22)
 * X11 development, required by X clients: Prerequisites.       (line 27)
-* X11 headers, and const:                Const.                (line 21)
-* xasy:                                  asymptote.            (line  6)
-* xaw:                                   Configure options for texk/xdvik.
+* X11 headers, and 'const':              Const.                (line 21)
+* xasy:                                  'asymptote'.          (line  6)
+* xaw:                                   Configure options for 'texk/xdvik'.
                                                                (line  9)
-* xdvik:                                 xdvik package.        (line  6)
-* xdvik <1>:                             Configure options for texk/xdvik.
+* xdvik:                                 'xdvik' package.      (line  6)
+* xdvik <1>:                             Configure options for 'texk/xdvik'.
                                                                (line  6)
-* xdvipdfmx:                             Configure options for texk/dvipdfm-x.
+* xdvipdfmx:                             Configure options for 'texk/dvipdfm-x'.
                                                                (line  6)
 * xindy:                                 Linked scripts.       (line 23)
-* xindy <1>:                             xindy package.        (line  6)
-* xindy <2>:                             Configure options for utils/xindy.
+* xindy <1>:                             'xindy' package.      (line  6)
+* xindy <2>:                             Configure options for 'utils/xindy'.
                                                                (line  6)
-* xindy cross compiling requires clisp:  Cross problems.       (line 33)
-* XInput:                                Configure options for texk/xdvik.
+* 'xindy' cross compiling requires 'clisp': Cross problems.    (line 33)
+* XInput:                                Configure options for 'texk/xdvik'.
                                                                (line 13)
-* Xlib:                                  Configure options for texk/web2c.
+* Xlib:                                  Configure options for 'texk/web2c'.
                                                                (line 22)
-* xpdf as library:                       Configure options for system poppler.
+* xpdf as library:                       Configure options for system 'poppler'.
                                                                (line  6)
 * xz:                                    Linked scripts.       (line 23)
-* zlib library:                          zlib library.         (line  6)
+* zlib library:                          'zlib' library.       (line  6)
 
 
 
@@ -5619,367 +5627,362 @@
 Node: Build in parallel11487
 Node: Build distribution12091
 Node: Build one package12739
-Node: Build one engine16418
-Node: Cross compilation17467
-Node: Cross configuring18747
-Node: Cross problems20424
-Node: Installing22086
-Node: Installation directories23106
-Node: Linked scripts24924
-Node: Distro builds26415
-Node: Layout and infrastructure28791
-Node: Build system tools29622
-Node: Top-level directories31839
-Node: Autoconf macros34075
-Node: General setup macros34837
-Node: Macros for programs35712
-Node: Macros for compilers36513
-Node: Macros for libraries37921
-Node: Macros for library and header flags38347
-Node: Macros for Windows40258
-Node: Library modules41845
-Node: png library42334
-Node: zlib library44682
-Node: freetype library45197
-Node: kpathsea library45893
-Node: Program modules47272
-Node: t1utils package47700
-Node: xindy package48245
-Node: xdvik package49359
-Node: asymptote50418
-Node: Extending TeX Live50914
-Node: Adding a new program module51697
-Node: Adding a new generic library module55036
-Node: Adding a new TeX-specific library module57265
-Node: Configure options57963
-Node: Global configure options59344
-Node: --disable-native-texlive-build59886
-Node: --prefix --bindir ...60848
-Node: --disable-largefile61388
-Node: --disable-missing62089
-Node: --enable-compiler-warnings=LEVEL62490
-Node: --enable-cxx-runtime-hack63146
-Node: --enable-maintainer-mode63566
-Node: --enable-multiplatform64095
-Node: --enable-shared64668
-Node: --enable-silent-rules65039
-Node: --without-ln-s65491
-Node: --without-x65838
-Node: Program-specific configure options66026
-Node: --enable-PROG --disable-PROG66669
-Node: --disable-all-pkgs66942
-Node: Configure options for texk/web2c67725
-Node: Configure options for texk/bibtex-x70263
-Node: Configure options for texk/dvipdfm-x70806
-Node: Configure options for texk/dvisvgm71582
-Node: Configure options for texk/texlive72463
-Node: Configure options for texk/xdvik72884
-Node: Configure options for utils/xindy73505
-Node: Library-specific configure options74395
-Node: Configure options for kpathsea75397
-Node: Configure options for system poppler76146
-Node: Variables for configure76910
-Node: Coding conventions78336
-Node: Declarations and definitions79051
-Node: Const81225
-Node: Continuous integration83089
-Node: Transfer from Subversion to Github83753
-Node: Automatic update of the Git mirror85915
-Node: CI testing on Travis-CI86497
-Node: Releases on Github87206
-Node: install-tl87646
-Node: install-tl NAME88015
-Node: install-tl SYNOPSIS88173
-Node: install-tl DESCRIPTION88431
-Node: install-tl REFERENCES89498
-Node: install-tl OPTIONS90024
-Ref: install-tl *-gui* [[=]_module_]90365
-Ref: install-tl text90575
-Ref: install-tl wizard90698
-Ref: install-tl perltk90852
-Ref: install-tl *-no-gui*91283
-Ref: install-tl *-lang* _llcode_91364
-Ref: install-tl *-repository* _url|path_92051
-Ref: install-tl *-select-repository*93931
-Ref: install-tl *-all-options*94367
-Ref: install-tl *-custom-bin* _path_94622
-Ref: install-tl *-debug-translation*95454
-Ref: install-tl *-force-platform* _platform_95673
-Ref: install-tl *-help*, *--help*, *-?*95917
-Ref: install-tl *-in-place*96324
-Ref: install-tl *-init-from-profile* _profile_file_96869
-Ref: install-tl *-logfile* _file_97089
-Ref: install-tl *-no-cls*97440
-Ref: install-tl *-non-admin*97574
-Ref: install-tl *-persistent-downloads*97679
-Ref: install-tl *-no-persistent-downloads*97707
-Ref: install-tl *-no-verify-downloads*98325
-Ref: install-tl *-portable*98686
-Ref: install-tl *-print-platform*98825
-Ref: install-tl *-profile* _profile_file_99023
-Ref: install-tl *-q*99203
-Ref: install-tl *-scheme* _scheme_99265
-Ref: install-tl *-v*99739
-Ref: install-tl *-version*, *--version*99894
-Node: install-tl PROFILES100025
-Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)102675
-Ref: install-tl instopt_adjustrepo (default 1)102751
-Ref: install-tl instopt_letter (default 0)102888
-Ref: install-tl instopt_portable (default 0)102979
-Ref: install-tl instopt_write18_restricted (default 1)103075
-Node: install-tl ENVIRONMENT VARIABLES104394
-Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK104785
-Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE104987
-Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME105097
-Ref: install-tl TEXLIVE_INSTALL_PREFIX105218
-Ref: install-tl TEXLIVE_INSTALL_TEXDIR105244
-Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG105275
-Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR105303
-Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME105332
-Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL105362
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG105396
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR105427
-Ref: install-tl NOPERLDOC105798
-Node: install-tl AUTHORS AND COPYRIGHT105862
-Node: tlmgr106278
-Node: tlmgr NAME106731
-Node: tlmgr SYNOPSIS106863
-Node: tlmgr DESCRIPTION107053
-Node: tlmgr EXAMPLES108149
-Ref: tlmgr tlmgr option repository ctan108400
-Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet108472
-Ref: tlmgr tlmgr update --list108924
-Ref: tlmgr tlmgr update --all109017
-Ref: tlmgr tlmgr info _what_109174
-Node: tlmgr OPTIONS109436
-Ref: tlmgr *--repository* _url|path_109956
-Ref: tlmgr *--gui* [_action_]110681
-Ref: tlmgr *--gui-lang* _llcode_111088
-Ref: tlmgr *--debug-translation*111771
-Ref: tlmgr *--machine-readable*111974
-Ref: tlmgr *--no-execute-actions*112242
-Ref: tlmgr *--package-logfile* _file_112435
-Ref: tlmgr *--pause*112689
-Ref: tlmgr *--persistent-downloads*112844
-Ref: tlmgr *--no-persistent-downloads*112872
-Ref: tlmgr *--pin-file*113366
-Ref: tlmgr *--usermode*113584
-Ref: tlmgr *--usertree* _dir_113704
-Ref: tlmgr *--verify-repo=[none|main|all]*113830
-Node: tlmgr ACTIONS114729
-Node: tlmgr help115581
-Node: tlmgr version116057
-Node: tlmgr backup116320
-Ref: tlmgr *backup [_option_...] --all*116491
-Ref: tlmgr *backup [_option_...] _pkg_...*116524
-Ref: tlmgr *--backupdir* _directory_117379
-Ref: tlmgr *--all*117596
-Ref: tlmgr *--clean*[=_N_]117848
-Ref: tlmgr *--dry-run*118175
-Node: tlmgr candidates _pkg_118305
-Node: tlmgr check [_option_...] [files|depends|executes|runfiles|all]118651
-Ref: tlmgr *files*119024
-Ref: tlmgr *depends*119159
-Ref: tlmgr *executes*119501
-Ref: tlmgr *runfiles*119619
-Ref: tlmgr *--use-svn*119740
-Node: tlmgr conf119857
-Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*120136
-Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|delete] [_value_]*120200
-Node: tlmgr dump-tlpdb [_option_...] [--json]122545
-Ref: tlmgr *--local*122978
-Ref: tlmgr *--remote*123017
-Ref: tlmgr *--json*123055
-Node: tlmgr generate123626
-Ref: tlmgr *generate [_option_...] language*123822
-Ref: tlmgr *generate [_option_...] language.dat*123861
-Ref: tlmgr *generate [_option_...] language.def*123900
-Ref: tlmgr *generate [_option_...] language.dat.lua*123943
-Ref: tlmgr *--dest* _output_file_126269
-Ref: tlmgr *--localcfg* _local_conf_file_126845
-Ref: tlmgr *--rebuild-sys*126968
-Node: tlmgr gui127783
-Node: tlmgr info127961
-Ref: tlmgr *info [_option_...] _pkg_...*128123
-Ref: tlmgr *info [_option_...] collections*128157
-Ref: tlmgr *info [_option_...] schemes*128187
-Ref: tlmgr *--list*129717
-Ref: tlmgr *--only-installed*130031
-Ref: tlmgr *--data item1,item2,...*130230
-Ref: tlmgr *--json* 1130811
-Node: tlmgr init-usertree131194
-Node: tlmgr install [_option_...] _pkg_...131575
-Ref: tlmgr *--dry-run* 1132085
-Ref: tlmgr *--file*132202
-Ref: tlmgr *--force*132424
-Ref: tlmgr *--no-depends*132644
-Ref: tlmgr *--no-depends-at-all*132803
-Ref: tlmgr *--reinstall*133203
-Ref: tlmgr *--with-doc*133581
-Ref: tlmgr *--with-src*133594
-Node: tlmgr key134116
-Ref: tlmgr *key list*134274
-Ref: tlmgr *key add _file_*134292
-Ref: tlmgr *key remove _keyid_*134314
-Node: tlmgr list134909
-Node: tlmgr option135071
-Ref: tlmgr *option [--json] [show]*135226
-Ref: tlmgr *option [--json] showall*135252
-Ref: tlmgr *option _key_ [_value_]*135278
-Node: tlmgr paper139675
-Ref: tlmgr *paper [a4|letter]*139824
-Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*139898
-Ref: tlmgr *paper --json*139913
-Node: tlmgr path141128
-Ref: tlmgr *path [--w32mode=user|admin] add*141289
-Ref: tlmgr *path [--w32mode=user|admin] remove*141326
-Node: tlmgr pinning142666
-Ref: tlmgr pinning show142907
-Ref: tlmgr pinning add _repo_ _pkgglob_...142980
-Ref: tlmgr pinning remove _repo_ _pkgglob_...143099
-Ref: tlmgr pinning remove _repo_ --all143252
-Node: tlmgr platform143306
-Ref: tlmgr *platform list|add|remove _platform_...*143492
-Ref: tlmgr *platform set _platform_*143519
-Ref: tlmgr *platform set auto*143540
-Ref: tlmgr *--dry-run* 2144426
-Node: tlmgr postaction144545
-Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*144775
-Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*144849
-Ref: tlmgr *--w32mode=[user|admin]*145164
-Ref: tlmgr *--fileassocmode=[1|2]*145580
-Ref: tlmgr *--all* 1145865
-Node: tlmgr print-platform145920
-Node: tlmgr print-platform-info146251
-Node: tlmgr remove [_option_...] _pkg_...146551
-Ref: tlmgr *--all* 2147035
-Ref: tlmgr *--backup*147145
-Ref: tlmgr *--backupdir* _directory_ 1147171
-Ref: tlmgr *--no-depends* 1147576
-Ref: tlmgr *--no-depends-at-all* 1147638
-Ref: tlmgr *--force* 1147741
-Ref: tlmgr *--dry-run* 3148214
-Node: tlmgr repository148321
-Ref: tlmgr *repository list*148509
-Ref: tlmgr *repository list _path|tag_*148539
-Ref: tlmgr *repository add _path_ [_tag_]*148572
-Ref: tlmgr *repository remove _path|tag_*148604
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*148658
-Node: tlmgr restore149711
-Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*149890
-Ref: tlmgr *restore [_option_...] --all*149920
-Ref: tlmgr *--all* 3150620
-Ref: tlmgr *--backupdir* _directory_ 2150834
-Ref: tlmgr *--dry-run* 4151015
-Ref: tlmgr *--force* 2151147
-Ref: tlmgr *--json* 2151193
-Node: tlmgr search151520
-Ref: tlmgr *search [_option_...] _what_*151684
-Ref: tlmgr *search [_option_...] --file _what_*151721
-Ref: tlmgr *search [_option_...] --all _what_*151757
-Ref: tlmgr *--file* 1151977
-Ref: tlmgr *--all* 4152039
-Ref: tlmgr *--global*152128
-Ref: tlmgr *--word*152255
-Node: tlmgr shell152570
-Ref: tlmgr protocol153305
-Ref: tlmgr help 1153369
-Ref: tlmgr version 1153422
-Ref: tlmgr quit, end, bye, byebye, EOF153490
-Ref: tlmgr restart153511
-Ref: tlmgr load [local|remote]153634
-Ref: tlmgr save153704
-Ref: tlmgr get [_var_] =item set [_var_ [_val_]]153827
-Node: tlmgr show154428
-Node: tlmgr uninstall154595
-Node: tlmgr update [_option_...] [_pkg_...]154825
-Ref: tlmgr *--all* 5155196
-Ref: tlmgr *--self*156937
-Ref: tlmgr *--dry-run* 5157701
-Ref: tlmgr *--list* [_pkg_]157878
-Ref: tlmgr *--exclude* _pkg_158567
-Ref: tlmgr *--no-auto-remove* [_pkg_...]159367
-Ref: tlmgr *--no-auto-install* [_pkg_...]159818
-Ref: tlmgr *--reinstall-forcibly-removed*160474
-Ref: tlmgr *--backup* 1161009
-Ref: tlmgr *--backupdir* _directory_ 3161035
-Ref: tlmgr *--no-depends* 2162201
-Ref: tlmgr *--no-depends-at-all* 2162404
-Ref: tlmgr *--force* 3162507
-Node: tlmgr CONFIGURATION FILE FOR TLMGR163322
-Ref: tlmgr auto-remove, value 0 or 1 (default 1), same as command-line option.164335
-Ref: tlmgr gui-expertmode, value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.164472
-Ref: tlmgr gui-lang _llcode_, with a language code value as with the command-line option.164554
-Ref: tlmgr no-checksums, value 0 or 1 (default 0, see below).164608
-Ref: tlmgr persistent-downloads, value 0 or 1 (default 1), same as command-line option.164688
-Ref: tlmgr require-verification, value 0 or 1 (default 0), same as command-line option.164768
-Ref: tlmgr update-exclude, value: comma-separated list of packages (no space allowed). Same as the command line option --exclude for the action update.164916
-Ref: tlmgr verify-downloads, value 0 or 1 (default 1), same as command-line option.164992
-Ref: tlmgr allowed-actions _action1_ [,_action_,...] The value is a comma-separated list of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode).165261
-Node: tlmgr CRYPTOGRAPHIC VERIFICATION166347
-Node: tlmgr Configuration of GnuPG invocation168496
-Node: tlmgr USER MODE169134
-Node: tlmgr User mode install171980
-Node: tlmgr User mode backup, restore, remove, update173124
-Node: tlmgr User mode generate, option, paper173566
-Node: tlmgr MULTIPLE REPOSITORIES173942
-Node: tlmgr Pinning175671
-Node: tlmgr GUI FOR TLMGR177646
-Node: tlmgr Main display178986
-Node: tlmgr Display configuration area179238
-Ref: tlmgr Status179599
-Ref: tlmgr Category179763
-Ref: tlmgr Match179949
-Ref: tlmgr Selection180130
-Ref: tlmgr Display configuration buttons180334
-Node: tlmgr Package list area180517
-Ref: tlmgr a checkbox181101
-Ref: tlmgr package name181237
-Ref: tlmgr local revision (and version)181336
-Ref: tlmgr remote revision (and version)181711
-Ref: tlmgr short description182008
-Node: tlmgr Main display action buttons182053
-Ref: tlmgr Update all installed182319
-Ref: tlmgr Update182691
-Ref: tlmgr Install182741
-Ref: tlmgr Remove182927
-Ref: tlmgr Backup183105
-Node: tlmgr Menu bar183262
-Ref: tlmgr tlmgr menu183485
-Ref: tlmgr Options menu183793
-Ref: tlmgr Actions menu184876
-Ref: tlmgr Help menu185304
-Node: tlmgr GUI options185437
-Ref: tlmgr -background _color_185683
-Ref: tlmgr -font " _fontname_ _fontsize_ "185748
-Ref: tlmgr -foreground _color_185906
-Ref: tlmgr -geometry _geomspec_185958
-Ref: tlmgr -xrm _xresource_186150
-Node: tlmgr MACHINE-READABLE OUTPUT186418
-Node: tlmgr Machine-readable update and install output187228
-Ref: tlmgr location-url _location_188504
-Ref: tlmgr total-bytes _count_188720
-Ref: tlmgr _pkgname_189130
-Ref: tlmgr _status_189340
-Ref: tlmgr d189418
-Ref: tlmgr f189478
-Ref: tlmgr u189657
-Ref: tlmgr r189703
-Ref: tlmgr a189826
-Ref: tlmgr i190004
-Ref: tlmgr I190123
-Ref: tlmgr _localrev_190225
-Ref: tlmgr _serverrev_190332
-Ref: tlmgr _size_190444
-Ref: tlmgr _runtime_190613
-Ref: tlmgr _esttot_190683
-Node: tlmgr Machine-readable option output190716
-Node: tlmgr AUTHORS AND COPYRIGHT191228
-Node: Index191627
+Node: Build one engine16420
+Node: Cross compilation17469
+Node: Cross configuring18749
+Node: Cross problems20426
+Node: Installing22088
+Node: Installation directories23108
+Node: Linked scripts24926
+Node: Distro builds26417
+Node: Layout and infrastructure28793
+Node: Build system tools29624
+Node: Top-level directories31841
+Node: Autoconf macros34077
+Node: General setup macros34839
+Node: Macros for programs35714
+Node: Macros for compilers36515
+Node: Macros for libraries37923
+Node: Macros for library and header flags38349
+Node: Macros for Windows40260
+Node: Library modules41847
+Node: 'png' library42344
+Node: 'zlib' library44696
+Node: 'freetype' library45217
+Node: 'kpathsea' library45919
+Node: Program modules47302
+Node: 't1utils' package47738
+Node: 'xindy' package48287
+Node: 'xdvik' package49407
+Node: 'asymptote'50472
+Node: Extending TeX Live50972
+Node: Adding a new program module51755
+Node: Adding a new generic library module55094
+Node: Adding a new TeX-specific library module57323
+Node: Configure options58021
+Node: Global configure options59402
+Node: '--disable-native-texlive-build'59970
+Node: '--prefix' '--bindir' ...60938
+Node: '--disable-largefile'61486
+Node: '--disable-missing'62195
+Node: '--enable-compiler-warnings='LEVEL62602
+Node: '--enable-cxx-runtime-hack'63264
+Node: '--enable-maintainer-mode'63690
+Node: '--enable-multiplatform'64225
+Node: '--enable-shared'64804
+Node: '--enable-silent-rules'65181
+Node: '--without-ln-s'65639
+Node: '--without-x'65992
+Node: Program-specific configure options66184
+Node: '--enable-PROG' '--disable-PROG'66847
+Node: '--disable-all-pkgs'67126
+Node: Configure options for 'texk/web2c'67917
+Node: Configure options for 'texk/bibtex-x'70461
+Node: Configure options for 'texk/dvipdfm-x'71010
+Node: Configure options for 'texk/dvisvgm'71792
+Node: Configure options for 'texk/texlive'72679
+Node: Configure options for 'texk/xdvik'73106
+Node: Configure options for 'utils/xindy'73733
+Node: Library-specific configure options74627
+Node: Configure options for 'kpathsea'75633
+Node: Configure options for system 'poppler'76388
+Node: Variables for configure77158
+Node: Coding conventions78584
+Node: Declarations and definitions79299
+Node: Const81473
+Node: Continuous integration83337
+Node: Transfer from Subversion to Github84001
+Node: Automatic update of the Git mirror86163
+Node: CI testing on Travis-CI86745
+Node: Releases on Github87454
+Node: install-tl87894
+Node: install-tl NAME88263
+Node: install-tl SYNOPSIS88421
+Node: install-tl DESCRIPTION88679
+Node: install-tl REFERENCES89746
+Node: install-tl OPTIONS90272
+Ref: install-tl *-gui* [[=]_module_]90613
+Ref: install-tl 'text'90823
+Ref: install-tl 'wizard'90946
+Ref: install-tl 'perltk'91100
+Ref: install-tl *-no-gui*91531
+Ref: install-tl *-lang* _llcode_91612
+Ref: install-tl *-repository* _url|path_92299
+Ref: install-tl *-select-repository*94179
+Ref: install-tl *-all-options*94615
+Ref: install-tl *-custom-bin* _path_94870
+Ref: install-tl *-debug-translation*95702
+Ref: install-tl *-force-platform* _platform_95921
+Ref: install-tl *-help*, *--help*, *-?*96165
+Ref: install-tl *-in-place*96572
+Ref: install-tl *-init-from-profile* _profile_file_97117
+Ref: install-tl *-logfile* _file_97337
+Ref: install-tl *-no-cls*97688
+Ref: install-tl *-non-admin*97822
+Ref: install-tl *-persistent-downloads*97927
+Ref: install-tl *-no-persistent-downloads*97955
+Ref: install-tl *-no-verify-downloads*98573
+Ref: install-tl *-portable*98934
+Ref: install-tl *-print-platform*99073
+Ref: install-tl *-profile* _profile_file_99271
+Ref: install-tl *-q*99451
+Ref: install-tl *-scheme* _scheme_99513
+Ref: install-tl *-v*99987
+Ref: install-tl *-version*, *--version*100142
+Node: install-tl PROFILES100273
+Ref: install-tl 'instopt_adjustpath' (default 0 on Unix, 1 on Windows)102923
+Ref: install-tl 'instopt_adjustrepo' (default 1)102999
+Ref: install-tl 'instopt_letter' (default 0)103136
+Ref: install-tl 'instopt_portable' (default 0)103227
+Ref: install-tl 'instopt_write18_restricted' (default 1)103323
+Node: install-tl ENVIRONMENT VARIABLES104642
+Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'105033
+Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'105235
+Ref: install-tl 'TEXLIVE_INSTALL_NO_WELCOME'105345
+Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'105466
+Ref: install-tl 'TEXLIVE_INSTALL_TEXDIR'105492
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'105523
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'105551
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'105580
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'105610
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'105644
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'105675
+Ref: install-tl 'NOPERLDOC'106046
+Node: install-tl AUTHORS AND COPYRIGHT106110
+Node: tlmgr106526
+Node: tlmgr NAME106979
+Node: tlmgr SYNOPSIS107111
+Node: tlmgr DESCRIPTION107301
+Node: tlmgr EXAMPLES108397
+Ref: tlmgr 'tlmgr option repository ctan'108648
+Ref: tlmgr 'tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet'108720
+Ref: tlmgr 'tlmgr update --list'109172
+Ref: tlmgr 'tlmgr update --all'109265
+Ref: tlmgr 'tlmgr info' _what_109422
+Node: tlmgr OPTIONS109684
+Ref: tlmgr *--repository* _url|path_110204
+Ref: tlmgr *--gui* [_action_]110929
+Ref: tlmgr *--gui-lang* _llcode_111336
+Ref: tlmgr *--debug-translation*112019
+Ref: tlmgr *--machine-readable*112222
+Ref: tlmgr *--no-execute-actions*112490
+Ref: tlmgr *--package-logfile* _file_112683
+Ref: tlmgr *--pause*112937
+Ref: tlmgr *--persistent-downloads*113092
+Ref: tlmgr *--no-persistent-downloads*113120
+Ref: tlmgr *--pin-file*113614
+Ref: tlmgr *--usermode*113832
+Ref: tlmgr *--usertree* _dir_113952
+Ref: tlmgr *--verify-repo=[none|main|all]*114078
+Node: tlmgr ACTIONS114977
+Node: tlmgr help115829
+Node: tlmgr version116305
+Node: tlmgr backup116568
+Ref: tlmgr *backup [_option_...] --all*116739
+Ref: tlmgr *backup [_option_...] _pkg_...*116772
+Ref: tlmgr *--backupdir* _directory_117627
+Ref: tlmgr *--all*117844
+Ref: tlmgr *--clean*[=_N_]118096
+Ref: tlmgr *--dry-run*118423
+Node: tlmgr candidates _pkg_118553
+Node: tlmgr check [_option_...] [files|depends|executes|runfiles|all]118899
+Ref: tlmgr *files*119272
+Ref: tlmgr *depends*119407
+Ref: tlmgr *executes*119749
+Ref: tlmgr *runfiles*119867
+Ref: tlmgr *--use-svn*119988
+Node: tlmgr conf120105
+Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*120384
+Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|delete] [_value_]*120448
+Node: tlmgr dump-tlpdb [_option_...] [--json]122793
+Ref: tlmgr *--local*123226
+Ref: tlmgr *--remote*123265
+Ref: tlmgr *--json*123303
+Node: tlmgr generate123874
+Ref: tlmgr *generate [_option_...] language*124070
+Ref: tlmgr *generate [_option_...] language.dat*124109
+Ref: tlmgr *generate [_option_...] language.def*124148
+Ref: tlmgr *generate [_option_...] language.dat.lua*124191
+Ref: tlmgr *--dest* _output_file_126517
+Ref: tlmgr *--localcfg* _local_conf_file_127093
+Ref: tlmgr *--rebuild-sys*127216
+Node: tlmgr gui128031
+Node: tlmgr info128209
+Ref: tlmgr *info [_option_...] _pkg_...*128371
+Ref: tlmgr *info [_option_...] collections*128405
+Ref: tlmgr *info [_option_...] schemes*128435
+Ref: tlmgr *--list*129965
+Ref: tlmgr *--only-installed*130279
+Ref: tlmgr *--data 'item1,item2,...'*130478
+Ref: tlmgr *--json* 1131059
+Node: tlmgr init-usertree131442
+Node: tlmgr install [_option_...] _pkg_...131823
+Ref: tlmgr *--dry-run* 1132333
+Ref: tlmgr *--file*132450
+Ref: tlmgr *--force*132672
+Ref: tlmgr *--no-depends*132892
+Ref: tlmgr *--no-depends-at-all*133051
+Ref: tlmgr *--reinstall*133451
+Ref: tlmgr *--with-doc*133829
+Ref: tlmgr *--with-src*133842
+Node: tlmgr key134364
+Ref: tlmgr *key list*134522
+Ref: tlmgr *key add _file_*134540
+Ref: tlmgr *key remove _keyid_*134562
+Node: tlmgr list135157
+Node: tlmgr option135319
+Ref: tlmgr *option [--json] [show]*135474
+Ref: tlmgr *option [--json] showall*135500
+Ref: tlmgr *option _key_ [_value_]*135526
+Node: tlmgr paper139923
+Ref: tlmgr *paper [a4|letter]*140072
+Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*140146
+Ref: tlmgr *paper --json*140161
+Node: tlmgr path141376
+Ref: tlmgr *path [--w32mode=user|admin] add*141537
+Ref: tlmgr *path [--w32mode=user|admin] remove*141574
+Node: tlmgr pinning142914
+Ref: tlmgr 'pinning show'143155
+Ref: tlmgr 'pinning add' _repo_ _pkgglob_...143228
+Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...143347
+Ref: tlmgr 'pinning remove _repo_ --all'143500
+Node: tlmgr platform143554
+Ref: tlmgr *platform list|add|remove _platform_...*143740
+Ref: tlmgr *platform set _platform_*143767
+Ref: tlmgr *platform set auto*143788
+Ref: tlmgr *--dry-run* 2144674
+Node: tlmgr postaction144793
+Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*145023
+Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*145097
+Ref: tlmgr *--w32mode=[user|admin]*145412
+Ref: tlmgr *--fileassocmode=[1|2]*145828
+Ref: tlmgr *--all* 1146113
+Node: tlmgr print-platform146168
+Node: tlmgr print-platform-info146499
+Node: tlmgr remove [_option_...] _pkg_...146799
+Ref: tlmgr *--all* 2147283
+Ref: tlmgr *--backup*147393
+Ref: tlmgr *--backupdir* _directory_ 1147419
+Ref: tlmgr *--no-depends* 1147824
+Ref: tlmgr *--no-depends-at-all* 1147886
+Ref: tlmgr *--force* 1147989
+Ref: tlmgr *--dry-run* 3148462
+Node: tlmgr repository148569
+Ref: tlmgr *repository list*148757
+Ref: tlmgr *repository list _path|tag_*148787
+Ref: tlmgr *repository add _path_ [_tag_]*148820
+Ref: tlmgr *repository remove _path|tag_*148852
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*148906
+Node: tlmgr restore149959
+Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*150138
+Ref: tlmgr *restore [_option_...] --all*150168
+Ref: tlmgr *--all* 3150868
+Ref: tlmgr *--backupdir* _directory_ 2151082
+Ref: tlmgr *--dry-run* 4151263
+Ref: tlmgr *--force* 2151395
+Ref: tlmgr *--json* 2151441
+Node: tlmgr search151768
+Ref: tlmgr *search [_option_...] _what_*151932
+Ref: tlmgr *search [_option_...] --file _what_*151969
+Ref: tlmgr *search [_option_...] --all _what_*152005
+Ref: tlmgr *--file* 1152225
+Ref: tlmgr *--all* 4152287
+Ref: tlmgr *--global*152376
+Ref: tlmgr *--word*152503
+Node: tlmgr shell152818
+Ref: tlmgr protocol153553
+Ref: tlmgr help 1153617
+Ref: tlmgr version 1153670
+Ref: tlmgr quit, end, bye, byebye, EOF153738
+Ref: tlmgr restart153759
+Ref: tlmgr load [local|remote]153882
+Ref: tlmgr save153952
+Ref: tlmgr get [_var_] =item set [_var_ [_val_]]154075
+Node: tlmgr show154676
+Node: tlmgr uninstall154843
+Node: tlmgr update [_option_...] [_pkg_...]155073
+Ref: tlmgr *--all* 5155444
+Ref: tlmgr *--self*157185
+Ref: tlmgr *--dry-run* 5157949
+Ref: tlmgr *--list* [_pkg_]158126
+Ref: tlmgr *--exclude* _pkg_158815
+Ref: tlmgr *--no-auto-remove* [_pkg_...]159615
+Ref: tlmgr *--no-auto-install* [_pkg_...]160066
+Ref: tlmgr *--reinstall-forcibly-removed*160722
+Ref: tlmgr *--backup* 1161257
+Ref: tlmgr *--backupdir* _directory_ 3161283
+Ref: tlmgr *--no-depends* 2162449
+Ref: tlmgr *--no-depends-at-all* 2162652
+Ref: tlmgr *--force* 3162755
+Node: tlmgr CONFIGURATION FILE FOR TLMGR163570
+Ref: tlmgr 'auto-remove', value 0 or 1 (default 1), same as command-line option.164583
+Ref: tlmgr 'gui-expertmode', value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.164720
+Ref: tlmgr 'gui-lang' _llcode_, with a language code value as with the command-line option.164802
+Ref: tlmgr 'no-checksums', value 0 or 1 (default 0, see below).164856
+Ref: tlmgr 'persistent-downloads', value 0 or 1 (default 1), same as command-line option.164936
+Ref: tlmgr 'require-verification', value 0 or 1 (default 0), same as command-line option.165016
+Ref: tlmgr 'update-exclude', value: comma-separated list of packages (no space allowed). Same as the command line option '--exclude' for the action 'update'.165164
+Ref: tlmgr 'verify-downloads', value 0 or 1 (default 1), same as command-line option.165240
+Ref: tlmgr 'allowed-actions' _action1_ [,_action_,...] The value is a comma-separated list of 'tlmgr' actions which are allowed to be executed when 'tlmgr' is invoked in system mode (that is, without '--usermode').165509
+Node: tlmgr CRYPTOGRAPHIC VERIFICATION166595
+Node: tlmgr Configuration of GnuPG invocation168744
+Node: tlmgr USER MODE169382
+Node: tlmgr User mode install172228
+Node: tlmgr User mode backup, restore, remove, update173372
+Node: tlmgr User mode generate, option, paper173814
+Node: tlmgr MULTIPLE REPOSITORIES174190
+Node: tlmgr Pinning175919
+Node: tlmgr GUI FOR TLMGR177894
+Node: tlmgr Main display179234
+Node: tlmgr Display configuration area179486
+Ref: tlmgr Status179847
+Ref: tlmgr Category180011
+Ref: tlmgr Match180197
+Ref: tlmgr Selection180378
+Ref: tlmgr Display configuration buttons180582
+Node: tlmgr Package list area180765
+Ref: tlmgr a checkbox181349
+Ref: tlmgr package name181485
+Ref: tlmgr local revision (and version)181584
+Ref: tlmgr remote revision (and version)181959
+Ref: tlmgr short description182256
+Node: tlmgr Main display action buttons182301
+Ref: tlmgr Update all installed182567
+Ref: tlmgr Update182939
+Ref: tlmgr Install182989
+Ref: tlmgr Remove183175
+Ref: tlmgr Backup183353
+Node: tlmgr Menu bar183510
+Ref: tlmgr 'tlmgr' menu183733
+Ref: tlmgr 'Options menu'184041
+Ref: tlmgr 'Actions menu'185124
+Ref: tlmgr 'Help menu'185552
+Node: tlmgr GUI options185685
+Ref: tlmgr '-background' _color_185931
+Ref: tlmgr '-font "' _fontname_ _fontsize_ '"'185996
+Ref: tlmgr '-foreground' _color_186154
+Ref: tlmgr '-geometry' _geomspec_186206
+Ref: tlmgr '-xrm' _xresource_186398
+Node: tlmgr MACHINE-READABLE OUTPUT186666
+Node: tlmgr Machine-readable 'update' and 'install' output187482
+Ref: tlmgr 'location-url' _location_188764
+Ref: tlmgr 'total-bytes' _count_188980
+Ref: tlmgr _pkgname_189390
+Ref: tlmgr _status_189600
+Ref: tlmgr 'd'189678
+Ref: tlmgr 'f'189738
+Ref: tlmgr 'u'189917
+Ref: tlmgr 'r'189963
+Ref: tlmgr 'a'190086
+Ref: tlmgr 'i'190264
+Ref: tlmgr 'I'190383
+Ref: tlmgr _localrev_190485
+Ref: tlmgr _serverrev_190592
+Ref: tlmgr _size_190704
+Ref: tlmgr _runtime_190873
+Ref: tlmgr _esttot_190943
+Node: tlmgr Machine-readable 'option' output190976
+Node: tlmgr AUTHORS AND COPYRIGHT191494
+Node: Index191893
 
 End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:

Modified: branches/stable/source/src/libs/README
===================================================================
--- branches/stable/source/src/libs/README	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/libs/README	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,4 +1,4 @@
-$Id: README 52576 2019-10-29 21:32:18Z kakuto $
+$Id: README 53461 2020-01-19 23:36:31Z kakuto $
 Public domain.  Originally created by Karl Berry, 2005.
 
 Libraries we compile for TeX Live.
@@ -18,7 +18,7 @@
 gd 2.2.5 - checked 30aug17
   https://github.com/libgd/libgd/releases
 
-gmp 6.1.2 - checked 16dec16
+gmp 6.2.0 - checked 20jan20
   http://ftp.gnu.org/gnu/gmp/
 
 graphite2 1.3.13 - checked 21dec18

Modified: branches/stable/source/src/libs/configure
===================================================================
--- branches/stable/source/src/libs/configure	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/libs/configure	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live libs 2020/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live libs 2020.
 #
 # Report bugs to <tex-k at tug.org>.
 #
@@ -579,8 +579,8 @@
 # Identity of this package.
 PACKAGE_NAME='TeX Live libs'
 PACKAGE_TARNAME='tex-live-libs'
-PACKAGE_VERSION='2020/dev'
-PACKAGE_STRING='TeX Live libs 2020/dev'
+PACKAGE_VERSION='2020'
+PACKAGE_STRING='TeX Live libs 2020'
 PACKAGE_BUGREPORT='tex-k at tug.org'
 PACKAGE_URL=''
 
@@ -1395,7 +1395,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live libs 2020/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live libs 2020 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1465,7 +1465,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live libs 2020/dev:";;
+     short | recursive ) echo "Configuration of TeX Live libs 2020:";;
    esac
   cat <<\_ACEOF
 
@@ -1753,7 +1753,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live libs configure 2020/dev
+TeX Live libs configure 2020
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1854,7 +1854,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live libs $as_me 2020/dev, which was
+It was created by TeX Live libs $as_me 2020, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3320,7 +3320,7 @@
   yes:no | no:*) :
     : ;; #(
   yes:*) :
-    as_fn_error $? "you can not use \`--with-x' for WIN32" "$LINENO" 5 ;; #(
+    as_fn_error $? "you can not use \`--with-x' for Windows" "$LINENO" 5 ;; #(
   *:no) :
     with_x=yes
                  { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-x'" >&5
@@ -3345,6 +3345,19 @@
      ;;
 esac ;;
 esac
+case $enable_luajithbtex in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    case $host in #(
+  alpha* | sparc* | x86_64-*-solaris* | powerpc-*-darwin* ) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajithbtex'" >&5
+$as_echo "$as_me: $host -> \`--disable-luajithbtex'" >&6;}
+                      ac_configure_args="$ac_configure_args '--disable-luajithbtex'" ;; #(
+  *) :
+     ;;
+esac ;;
+esac
 case $enable_mfluajit in #(
   yes | no) :
     : ;; #(
@@ -3358,6 +3371,19 @@
      ;;
 esac ;;
 esac
+case $enable_mfluajit_nowin in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    case $host in #(
+  alpha* | sparc* | x86_64-*-solaris* | powerpc-*-darwin* ) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit-nowin'" >&5
+$as_echo "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
+                      ac_configure_args="$ac_configure_args '--disable-mfluajit-nowin'" ;; #(
+  *) :
+     ;;
+esac ;;
+esac
 
 ## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
 ## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
@@ -3673,7 +3699,7 @@
   need_zlib=yes
 }
 
-# $Id: web2c.ac 51577 2019-07-08 06:07:11Z lscarso $
+# $Id: web2c.ac 53078 2019-12-10 18:39:13Z karl $
 # texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options for TeX and MF
 
@@ -3729,6 +3755,10 @@
 if test "${enable_etex_synctex+set}" = set; then :
   enableval=$enable_etex_synctex;
 fi
+
+test "x$enable_web2c:$enable_etex" = xyes:yes && {
+  need_zlib=yes
+}
 # Check whether --enable-ptex was given.
 if test "${enable_ptex+set}" = set; then :
   enableval=$enable_ptex;
@@ -3747,6 +3777,7 @@
 
 test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-eptex was given.
 if test "${enable_eptex+set}" = set; then :
@@ -3766,6 +3797,7 @@
 
 test "x$enable_web2c:$enable_eptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-uptex was given.
 if test "${enable_uptex+set}" = set; then :
@@ -3785,6 +3817,7 @@
 
 test "x$enable_web2c:$enable_uptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-euptex was given.
 if test "${enable_euptex+set}" = set; then :
@@ -3804,6 +3837,7 @@
 
 test "x$enable_web2c:$enable_euptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-aleph was given.
 if test "${enable_aleph+set}" = set; then :
@@ -3834,6 +3868,7 @@
 test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
+  need_zlib=yes
 }
 # Check whether --enable-luatex was given.
 if test "${enable_luatex+set}" = set; then :
@@ -6097,7 +6132,7 @@
 
 # Define the identity of the package.
  PACKAGE='tex-live-libs'
- VERSION='2020/dev'
+ VERSION='2020'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7082,7 +7117,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live libs $as_me 2020/dev, which was
+This file was extended by TeX Live libs $as_me 2020, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7139,7 +7174,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-TeX Live libs config.status 2020/dev
+TeX Live libs config.status 2020
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: branches/stable/source/src/m4/ChangeLog
===================================================================
--- branches/stable/source/src/m4/ChangeLog	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/m4/ChangeLog	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,3 +1,14 @@
+2020-01-13  Karl Berry  <karl at tug.org>
+
+	* kpse-setup.m4 (KPSE_SETUP): use AS_TR_SH on the argument when
+	disabling the jit packages, for the sake of making mfluajit-nowin
+	into mfluajit_nowin for shell usage.
+	Also change one "WIN32" to "Windows" in an error message.
+
+2020-01-12  Mojca Miklavec  <mojca.miklavec.lists at gmail.com>
+
+	* kpse-setup.m4 (KPSE_SETUP): also disable mfluajit and mfluajit-nowin.
+
 2019-06-26  Karl Berry  <karl at freefriends.org>
 
 	* kpse-harfbuzz-flags.m4 (KPSE_HARFBUZZ_FLAGS): omit KPSE_ICU_FLAGS.

Modified: branches/stable/source/src/m4/kpse-setup.m4
===================================================================
--- branches/stable/source/src/m4/kpse-setup.m4	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/m4/kpse-setup.m4	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,4 +1,4 @@
-# $Id: kpse-setup.m4 49495 2018-12-24 23:17:30Z karl $
+# $Id: kpse-setup.m4 53385 2020-01-13 00:02:12Z karl $
 # Private macros for the TeX Live (TL) tree.
 # Copyright 2017-2018 Karl Berry <tex-live at tug.org>
 # Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
@@ -77,7 +77,7 @@
 KPSE_CHECK_WIN32
 AS_CASE([$with_x:$kpse_cv_have_win32],
         [yes:no | no:*], [:],
-        [yes:*], [AC_MSG_ERROR([you can not use `--with-x' for WIN32])],
+        [yes:*], [AC_MSG_ERROR([you can not use `--with-x' for Windows])],
         [*:no], [with_x=yes
                  AC_MSG_NOTICE([Assuming `--with-x'])
                  ac_configure_args="$ac_configure_args '--with-x'"],
@@ -84,8 +84,8 @@
         [with_x=no
          AC_MSG_NOTICE([WIN32 -> `--without-x'])
          ac_configure_args="$ac_configure_args '--without-x'"])
-AC_FOREACH([Kpse_Pkg], [luajittex mfluajit], [dnl
-AS_CASE([$enable_]Kpse_Pkg,
+AC_FOREACH([Kpse_Pkg], [luajittex luajithbtex mfluajit mfluajit-nowin], [dnl
+AS_CASE([$enable_[]AS_TR_SH([Kpse_Pkg])],
         [yes | no], [:],
           [AS_CASE([$host],
                    [alpha* | sparc* | x86_64-*-solaris* | powerpc-*-darwin* ],

Modified: branches/stable/source/src/texk/README
===================================================================
--- branches/stable/source/src/texk/README	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/README	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,4 +1,4 @@
-$Id: README 50838 2019-04-07 12:59:36Z karl $
+$Id: README 53328 2020-01-05 22:16:43Z kakuto $
 Copyright 2006-2019 TeX Users Group.
 You may freely use, modify and/or distribute this file.
 
@@ -56,19 +56,18 @@
   xdvipdfmx
     old info: http://project.ktug.org/dvipdfmx/
 
-dvipng 1.16 - checked 7apr19
-  http://savannah.nongnu.org/files/?group=dvipng
-  http://mirror.ctan.org/dviware/dvipng/ (but maybe stale)
+dvipng 1.17 - checked 06jan20
+  http://mirror.ctan.org/dviware/dvipng/
 
 dvipos - maintained here, by us
 
 dvipsk - maintained here, by us
 
-dvisvgm 2.6.3 - checked 10mar19
+dvisvgm 2.8.2 - checked 10dec19
   https://dvisvgm.de/Downloads/
 
-gregorio 5.2.0 - checked 11mar19
-  CTAN/support/gregoriotex/gregorio-5.2.0.zip
+gregorio 5.2.1 - checked 19dec19
+  CTAN/support/gregoriotex/gregorio-5.2.1.zip
 
 gsftopk - from Paul Vojta's xdvi?
 

Modified: branches/stable/source/src/texk/configure
===================================================================
--- branches/stable/source/src/texk/configure	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/configure	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live texk 2020/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live texk 2020.
 #
 # Report bugs to <tex-live at tug.org>.
 #
@@ -579,8 +579,8 @@
 # Identity of this package.
 PACKAGE_NAME='TeX Live texk'
 PACKAGE_TARNAME='tex-live-texk'
-PACKAGE_VERSION='2020/dev'
-PACKAGE_STRING='TeX Live texk 2020/dev'
+PACKAGE_VERSION='2020'
+PACKAGE_STRING='TeX Live texk 2020'
 PACKAGE_BUGREPORT='tex-live at tug.org'
 PACKAGE_URL=''
 
@@ -1395,7 +1395,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live texk 2020/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live texk 2020 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1465,7 +1465,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live texk 2020/dev:";;
+     short | recursive ) echo "Configuration of TeX Live texk 2020:";;
    esac
   cat <<\_ACEOF
 
@@ -1753,7 +1753,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live texk configure 2020/dev
+TeX Live texk configure 2020
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1854,7 +1854,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live texk $as_me 2020/dev, which was
+It was created by TeX Live texk $as_me 2020, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3320,7 +3320,7 @@
   yes:no | no:*) :
     : ;; #(
   yes:*) :
-    as_fn_error $? "you can not use \`--with-x' for WIN32" "$LINENO" 5 ;; #(
+    as_fn_error $? "you can not use \`--with-x' for Windows" "$LINENO" 5 ;; #(
   *:no) :
     with_x=yes
                  { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-x'" >&5
@@ -3345,6 +3345,19 @@
      ;;
 esac ;;
 esac
+case $enable_luajithbtex in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    case $host in #(
+  alpha* | sparc* | x86_64-*-solaris* | powerpc-*-darwin* ) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajithbtex'" >&5
+$as_echo "$as_me: $host -> \`--disable-luajithbtex'" >&6;}
+                      ac_configure_args="$ac_configure_args '--disable-luajithbtex'" ;; #(
+  *) :
+     ;;
+esac ;;
+esac
 case $enable_mfluajit in #(
   yes | no) :
     : ;; #(
@@ -3358,6 +3371,19 @@
      ;;
 esac ;;
 esac
+case $enable_mfluajit_nowin in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    case $host in #(
+  alpha* | sparc* | x86_64-*-solaris* | powerpc-*-darwin* ) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit-nowin'" >&5
+$as_echo "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
+                      ac_configure_args="$ac_configure_args '--disable-mfluajit-nowin'" ;; #(
+  *) :
+     ;;
+esac ;;
+esac
 
 ## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
 ## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
@@ -3673,7 +3699,7 @@
   need_zlib=yes
 }
 
-# $Id: web2c.ac 51577 2019-07-08 06:07:11Z lscarso $
+# $Id: web2c.ac 53078 2019-12-10 18:39:13Z karl $
 # texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options for TeX and MF
 
@@ -3729,6 +3755,10 @@
 if test "${enable_etex_synctex+set}" = set; then :
   enableval=$enable_etex_synctex;
 fi
+
+test "x$enable_web2c:$enable_etex" = xyes:yes && {
+  need_zlib=yes
+}
 # Check whether --enable-ptex was given.
 if test "${enable_ptex+set}" = set; then :
   enableval=$enable_ptex;
@@ -3747,6 +3777,7 @@
 
 test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-eptex was given.
 if test "${enable_eptex+set}" = set; then :
@@ -3766,6 +3797,7 @@
 
 test "x$enable_web2c:$enable_eptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-uptex was given.
 if test "${enable_uptex+set}" = set; then :
@@ -3785,6 +3817,7 @@
 
 test "x$enable_web2c:$enable_uptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-euptex was given.
 if test "${enable_euptex+set}" = set; then :
@@ -3804,6 +3837,7 @@
 
 test "x$enable_web2c:$enable_euptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-aleph was given.
 if test "${enable_aleph+set}" = set; then :
@@ -3834,6 +3868,7 @@
 test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
+  need_zlib=yes
 }
 # Check whether --enable-luatex was given.
 if test "${enable_luatex+set}" = set; then :
@@ -6097,7 +6132,7 @@
 
 # Define the identity of the package.
  PACKAGE='tex-live-texk'
- VERSION='2020/dev'
+ VERSION='2020'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7138,7 +7173,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live texk $as_me 2020/dev, which was
+This file was extended by TeX Live texk $as_me 2020, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7195,7 +7230,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-TeX Live texk config.status 2020/dev
+TeX Live texk config.status 2020
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: branches/stable/source/src/texk/kpathsea/ChangeLog
===================================================================
--- branches/stable/source/src/texk/kpathsea/ChangeLog	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/ChangeLog	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,3 +1,71 @@
+2020-01-19  Karl Berry  <karl at freefriends.org>
+
+	* kpsewhich.c (ENSURE_NONEMPTY_STRING): new macro.
+	(read_command_line): ensure nonempty arguments to --format,
+	--safe-{in,out}-name, --var-brace-value, --var-value.
+	Empty args to the other options seem possible.
+
+	* line.c (read_line): silently drop nul (zero) bytes.
+	* tests/cnfnull.test: test for nul bytes in texmf.cnf.
+	* Makefile.am (TESTS),
+	(tests/cnfnull.test): add it.
+
+2020-01-16  Karl Berry  <karl at freefriends.org>
+
+	* doc/kpathsea.texi,
+	* version.ac (kpse_dev): no /dev.
+
+2019-12-31  Akira Kakuto  <kakuto at w32tex.org>
+
+	* access.c: not test x bit on Windows, because access() crashes.
+
+2019-12-29  Karl Berry  <karl at tug.org>
+
+	* mktexlsr,
+	* mktexmf,
+	* mktexpk,
+	* mktextfm: remove; these will now be maintained only in
+	Master/texmf-dist/scripts/texlive, with slave copies in
+	Build/source/texk/texlive/linked_scripts as usual.
+	* Makefile.am (dist_noinst_SCRIPTS): remove, nothing left.
+	(install-exec-local): likewise remove.
+	(uninstall-local): don't uninstall the dist_noinst_SCRIPTS.
+	(bin_links): remove, now also handled in linked_scripts.
+	
+	* man/Makefile.am (man_sources): remove mktex{lsr,mf,pk,tfm}.man;
+	(man1_links): remove; these man pages will now be maintained in
+	Build/source/texk/texlive/tl_scripts.
+
+2019-12-26  Karl Berry  <karl at tug.org>
+
+	* Makefile.am (install-data-local): must mkdir web2cdir here.
+
+	* mktexdir,
+	* mktexnam,
+	* mktexupd,
+	* mktex.opt,
+	* mktexdir.opt,
+	* mktexnam.opt: remove; these will now be maintained
+	 (if changes are needed) only in Master/texmf-dist/web2c.
+	* Makefile.am (dist_web2c_DATA, dist_web2c_SCRIPTS): remove.
+	(All this is primarily so that $Id$ expansions will not be lost;
+	the user-level mktex* scripts will happen in a few days.)
+	
+	* mktex.cnf: remove this unused file.
+	* Makefile.am (EXTRA_DIST): remove it here.
+
+2019-12-22  Karl Berry  <karl at freefriends.org>
+
+	* doc/kpathsea.texi (Path searching): mention translations for TL.
+	(Config files): distinguish special characters at different levels.
+	(Filename database): don't mention talking about 8.3 filenames.
+	
+2019-12-16  Karl Berry  <karl at freefriends.org>
+
+	* texmf.cnf (glob_str_size): increase from 20,000 to 200,000
+	for web2c/tests/bibtex-bigauth.test (q.v.).
+	(ent_str_size, max_strings.bibtex*): increase these while we're here.
+
 2019-11-03  Karl Berry  <karl at tug.org>
 
 	* progname.c: remove nowadays-useless register declarations.

Modified: branches/stable/source/src/texk/kpathsea/Makefile.am
===================================================================
--- branches/stable/source/src/texk/kpathsea/Makefile.am	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/Makefile.am	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,7 +1,7 @@
-## $Id: Makefile.am 51875 2019-08-13 22:43:09Z karl $
+## $Id: Makefile.am 53454 2020-01-19 17:04:02Z karl $
 ## Makefile.am for the TeX Live subdirectory texk/kpathsea/
 ##
-## Copyright 2017-2019 Karl Berry <tex-live at tug.org>
+## Copyright 2015-2019 Karl Berry <tex-live at tug.org>
 ## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 
@@ -251,26 +251,10 @@
 ## The scripts and their data
 web2cdir = $(datarootdir)/texmf-dist/web2c
 
-dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
-
-dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt
-
-dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
-
 dist_noinst_DATA = texmf.cnf
 
-install-exec-local: installdirs-am
-if !WIN32
-	@for f in $(dist_noinst_SCRIPTS); do \
-	  if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1 \
-	      || test ! -r "$(DESTDIR)$(bindir)/$$f"; then \
-	    echo " $(INSTALL_SCRIPT) '$(srcdir)/$$f' '$(DESTDIR)$(bindir)/$$f'"; \
-	    $(INSTALL_SCRIPT) "$(srcdir)/$$f" "$(DESTDIR)$(bindir)/$$f"; \
-	  else :; fi; \
-	done
-endif !WIN32
-
 install-data-local: installdirs-am
+	$(MKDIR_P) '$(DESTDIR)$(web2cdir)'
 	@for f in $(dist_noinst_DATA); do \
 	  if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1 \
 	      || test ! -r "$(DESTDIR)$(web2cdir)/$$f"; then \
@@ -280,14 +264,6 @@
 	done
 
 uninstall-local:
-if !WIN32
-	@for f in $(dist_noinst_SCRIPTS); do \
-	  if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \
-	    echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	    rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	  else :; fi; \
-	done
-endif !WIN32
 	@for f in $(dist_noinst_DATA); do \
 	  if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \
 	    echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \
@@ -295,23 +271,16 @@
 	  else :; fi; \
 	done
 
-bin_links = mktexlsr:texhash
-
-include $(top_srcdir)/../../am/bin_links.am
-
-install-exec-hook: install-bin-links
-
-uninstall-hook: uninstall-bin-links
-
 ## Tests
 AM_TESTS_ENVIRONMENT  = LN_S='$(LN_S)'; export LN_S;
 AM_TESTS_ENVIRONMENT += LT_OBJDIR='$(LT_OBJDIR)'; export LT_OBJDIR;
 #
-TESTS  = tests/cnfline.test tests/cnfnewline.test tests/cnfprog.test
+TESTS  = tests/cnfline.test tests/cnfnewline.test
+TESTS += tests/cnfnull.test tests/cnfprog.test
 TESTS += tests/kpseaccess.test
 TESTS += tests/kpsereadlink.test tests/kpsestat.test tests/kpsewhich.test
 #
-tests/cnfline.log tests/cnfnewline.log tests/cnfprog.log \
+tests/cnfline.log tests/cnfnewline.log tests/cnfnull.log tests/cnfprog.log \
   tests/kpsewhich.log: kpsewhich$(EXEEXT)
 tests/kpseaccess.log: kpseaccess$(EXEEXT)
 tests/kpsereadlink.log: kpsereadlink$(EXEEXT)
@@ -328,6 +297,3 @@
 CLEANFILES =
 
 include $(srcdir)/../../am/rebuild.am
-
-## Not used
-EXTRA_DIST += mktex.cnf

Modified: branches/stable/source/src/texk/kpathsea/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/Makefile.in	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/Makefile.in	2020-02-18 19:11:23 UTC (rev 820)
@@ -17,7 +17,6 @@
 
 
 
-
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -133,8 +132,7 @@
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(dist_noinst_SCRIPTS) \
-	$(dist_web2c_SCRIPTS) $(dist_noinst_DATA) $(dist_web2c_DATA) \
+	$(am__configure_deps) $(dist_noinst_DATA) \
 	$(kpseinclude_HEADERS) $(noinst_HEADERS) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
@@ -143,7 +141,6 @@
 CONFIG_CLEAN_FILES = kpathsea.pc
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
-	"$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" \
 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \
 	"$(DESTDIR)$(kpseincludedir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -251,7 +248,6 @@
 xdirtest_SOURCES = xdirtest.c
 xdirtest_OBJECTS = xdirtest.$(OBJEXT)
 xdirtest_DEPENDENCIES = libkpathsea.la
-SCRIPTS = $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS)
 AM_V_P = $(am__v_P_ at AM_V@)
 am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -367,7 +363,7 @@
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-DATA = $(dist_noinst_DATA) $(dist_web2c_DATA) $(pkgconfig_DATA)
+DATA = $(dist_noinst_DATA) $(pkgconfig_DATA)
 HEADERS = $(kpseinclude_HEADERS) $(nodist_kpseinclude_HEADERS) \
 	$(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
@@ -577,7 +573,6 @@
 DIST_SUBDIRS = . doc man win32
 am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
 	$(srcdir)/c-auto.in $(srcdir)/kpathsea.pc.in \
-	$(top_srcdir)/../../am/bin_links.am \
 	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/config.guess \
 	$(top_srcdir)/../../build-aux/config.sub \
@@ -760,7 +755,7 @@
 #
 EXTRA_DIST = PROJECTS putenv.c bsnl.awk cnf-to-paths.awk $(TESTS) \
 	tests/cnfline/texmf.cnf tests/cnfnewline/texmf.cnf \
-	tests/cnfprog/texmf.cnf mktex.cnf
+	tests/cnfprog/texmf.cnf
 AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
 AM_CFLAGS = $(WARNING_CFLAGS)
 lib_LTLIBRARIES = libkpathsea.la
@@ -859,17 +854,14 @@
 progname_test_LDADD = libkpathsea.la
 xdirtest_LDADD = libkpathsea.la
 web2cdir = $(datarootdir)/texmf-dist/web2c
-dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
-dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt
-dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
 dist_noinst_DATA = texmf.cnf
-bin_links = mktexlsr:texhash
 AM_TESTS_ENVIRONMENT = LN_S='$(LN_S)'; export LN_S; \
 	LT_OBJDIR='$(LT_OBJDIR)'; export LT_OBJDIR;
 #
-TESTS = tests/cnfline.test tests/cnfnewline.test tests/cnfprog.test \
-	tests/kpseaccess.test tests/kpsereadlink.test \
-	tests/kpsestat.test tests/kpsewhich.test
+TESTS = tests/cnfline.test tests/cnfnewline.test tests/cnfnull.test \
+	tests/cnfprog.test tests/kpseaccess.test \
+	tests/kpsereadlink.test tests/kpsestat.test \
+	tests/kpsewhich.test
 
 # Rebuild
 rebuild_prereq = 
@@ -882,7 +874,7 @@
 .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -904,7 +896,7 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
-$(top_srcdir)/../../am/bin_links.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/rebuild.am $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1042,42 +1034,7 @@
 xdirtest$(EXEEXT): $(xdirtest_OBJECTS) $(xdirtest_DEPENDENCIES) $(EXTRA_xdirtest_DEPENDENCIES) 
 	@rm -f xdirtest$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(xdirtest_OBJECTS) $(xdirtest_LDADD) $(LIBS)
-install-dist_web2cSCRIPTS: $(dist_web2c_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_web2c_SCRIPTS)'; test -n "$(web2cdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(web2cdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(web2cdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(web2cdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(web2cdir)$$dir" || exit $$?; \
-	     } \
-	; done
 
-uninstall-dist_web2cSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_web2c_SCRIPTS)'; test -n "$(web2cdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(web2cdir)'; $(am__uninstall_files_from_dir)
-
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -1608,27 +1565,6 @@
 
 distclean-libtool:
 	-rm -f libtool config.lt
-install-dist_web2cDATA: $(dist_web2c_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_web2c_DATA)'; test -n "$(web2cdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(web2cdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(web2cdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(web2cdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(web2cdir)" || exit $$?; \
-	done
-
-uninstall-dist_web2cDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_web2c_DATA)'; test -n "$(web2cdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(web2cdir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
@@ -2150,13 +2086,13 @@
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
-		$(HEADERS) c-auto.h
+all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(DATA) $(HEADERS) \
+		c-auto.h
 install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -2284,8 +2220,7 @@
 
 info-am:
 
-install-data-am: install-data-local install-dist_web2cDATA \
-	install-dist_web2cSCRIPTS install-kpseincludeHEADERS \
+install-data-am: install-data-local install-kpseincludeHEADERS \
 	install-nodist_kpseincludeHEADERS install-pkgconfigDATA
 
 install-dvi: install-dvi-recursive
@@ -2292,10 +2227,8 @@
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS install-exec-local \
-	install-libLTLIBRARIES
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
 install-html: install-html-recursive
 
 install-html-am:
@@ -2400,14 +2333,12 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \
-	uninstall-dist_web2cSCRIPTS uninstall-kpseincludeHEADERS \
+uninstall-am: uninstall-binPROGRAMS uninstall-kpseincludeHEADERS \
 	uninstall-libLTLIBRARIES uninstall-local \
 	uninstall-nodist_kpseincludeHEADERS uninstall-pkgconfigDATA
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
 .MAKE: $(am__recursive_targets) all check check-am install install-am \
-	install-exec-am install-strip uninstall-am
+	install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--depfiles am--refresh check check-TESTS check-am clean \
@@ -2419,11 +2350,9 @@
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
-	install-data-am install-data-local install-dist_web2cDATA \
-	install-dist_web2cSCRIPTS install-dvi install-dvi-am \
-	install-exec install-exec-am install-exec-hook \
-	install-exec-local install-html install-html-am install-info \
-	install-info-am install-kpseincludeHEADERS \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-kpseincludeHEADERS \
 	install-libLTLIBRARIES install-man \
 	install-nodist_kpseincludeHEADERS install-pdf install-pdf-am \
 	install-pkgconfigDATA install-ps install-ps-am install-strip \
@@ -2431,8 +2360,7 @@
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-dist_web2cDATA \
-	uninstall-dist_web2cSCRIPTS uninstall-hook \
+	uninstall-am uninstall-binPROGRAMS \
 	uninstall-kpseincludeHEADERS uninstall-libLTLIBRARIES \
 	uninstall-local uninstall-nodist_kpseincludeHEADERS \
 	uninstall-pkgconfigDATA
@@ -2477,16 +2405,8 @@
 	  cp kpathsea.tmp kpathsea.h; \
 	fi && rm -f kpathsea.tmp && date >$@
 
-install-exec-local: installdirs-am
- at WIN32_FALSE@	@for f in $(dist_noinst_SCRIPTS); do \
- at WIN32_FALSE@	  if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1 \
- at WIN32_FALSE@	      || test ! -r "$(DESTDIR)$(bindir)/$$f"; then \
- at WIN32_FALSE@	    echo " $(INSTALL_SCRIPT) '$(srcdir)/$$f' '$(DESTDIR)$(bindir)/$$f'"; \
- at WIN32_FALSE@	    $(INSTALL_SCRIPT) "$(srcdir)/$$f" "$(DESTDIR)$(bindir)/$$f"; \
- at WIN32_FALSE@	  else :; fi; \
- at WIN32_FALSE@	done
-
 install-data-local: installdirs-am
+	$(MKDIR_P) '$(DESTDIR)$(web2cdir)'
 	@for f in $(dist_noinst_DATA); do \
 	  if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1 \
 	      || test ! -r "$(DESTDIR)$(web2cdir)/$$f"; then \
@@ -2496,12 +2416,6 @@
 	done
 
 uninstall-local:
- at WIN32_FALSE@	@for f in $(dist_noinst_SCRIPTS); do \
- at WIN32_FALSE@	  if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \
- at WIN32_FALSE@	    echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- at WIN32_FALSE@	    rm -f "$(DESTDIR)$(bindir)/$$f"; \
- at WIN32_FALSE@	  else :; fi; \
- at WIN32_FALSE@	done
 	@for f in $(dist_noinst_DATA); do \
 	  if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \
 	    echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \
@@ -2508,33 +2422,8 @@
 	    rm -f "$(DESTDIR)$(web2cdir)/$$f"; \
 	  else :; fi; \
 	done
-
-# $Id: Makefile.in 51875 2019-08-13 22:43:09Z karl $
-# am/bin_links.am: Makefile fragment for bindir links.
-.PHONY: install-bin-links uninstall-bin-links
-
-install-bin-links:
- at WIN32_FALSE@	$(MKDIR_P) $(DESTDIR)$(bindir)
- at WIN32_FALSE@	@cd $(DESTDIR)$(bindir) && \
- at WIN32_FALSE@	  for s in $(bin_links); do \
- at WIN32_FALSE@	    link=`echo $$s | sed 's,.*:,,'`; \
- at WIN32_FALSE@	    file=`echo $$s | sed 's,:.*,,'`; \
- at WIN32_FALSE@	    rm -f $$link; \
- at WIN32_FALSE@	    echo "creating link '$$link' -> '$$file'"; \
- at WIN32_FALSE@	    $(LN_S) $$file $$link || exit 1; \
- at WIN32_FALSE@	  done
-
-uninstall-bin-links:
- at WIN32_FALSE@	@for s in $(bin_links); do \
- at WIN32_FALSE@	  link=`echo $$s | sed 's,.*:,,'`; \
- at WIN32_FALSE@	  rm -f $(DESTDIR)$(bindir)/$$link; \
- at WIN32_FALSE@	done
-
-install-exec-hook: install-bin-links
-
-uninstall-hook: uninstall-bin-links
 #
-tests/cnfline.log tests/cnfnewline.log tests/cnfprog.log \
+tests/cnfline.log tests/cnfnewline.log tests/cnfnull.log tests/cnfprog.log \
   tests/kpsewhich.log: kpsewhich$(EXEEXT)
 tests/kpseaccess.log: kpseaccess$(EXEEXT)
 tests/kpsereadlink.log: kpsereadlink$(EXEEXT)

Modified: branches/stable/source/src/texk/kpathsea/NEWS
===================================================================
--- branches/stable/source/src/texk/kpathsea/NEWS	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/NEWS	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,14 @@
-$Id: NEWS 50836 2019-04-07 01:42:55Z karl $
+$Id: NEWS 53427 2020-01-16 22:02:50Z karl $
 This file records noteworthy changes.  (Public domain.)
 
+6.3.2 (for TeX Live 2020)
+* New option --cnf-line for kpsewhich (and tex and mf) to support
+  arbitrary configuration settings on the command line.
+* Warn about unusual program name qualifiers.
+* The mktex* programs are no longer maintained or present here, but in
+  TeX Live's Master/texmf-dist/scripts/texlive (with copies in
+  Build/source/texk/texlive/linked_scripts as usual).
+
 6.3.1 (for TeX Live 2019, 7 April 2019)
 * kpsewhich --var-value does brace expansion as well as variable and
   tilde expansion.

Modified: branches/stable/source/src/texk/kpathsea/access.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/access.c	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/access.c	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,6 @@
 /* access -- test for access permissions of a file.
 
-   Copyright 2008, 2009 Karl Berry.
+   Copyright 2008, 2009-2019 Karl Berry.
    Copyright 1997-2001, 2005 Olaf Weber.
 
    This program is free software; you can redistribute it and/or modify
@@ -71,7 +71,12 @@
         switch (*i) {
         case 'r': mode |= R_OK; break;
         case 'w': mode |= W_OK; break;
+#if defined(_WIN32)
+/* access() crashes for unsupported test of x bit */
+        case 'x': break;
+#else
         case 'x': mode |= X_OK; break;
+#endif
         case '-': if (i == argv[1]) break;
         default:
             fprintf(stderr, "%s: Invalid MODE.\n", argv[0]);

Modified: branches/stable/source/src/texk/kpathsea/c-auto.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/c-auto.in	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/c-auto.in	2020-02-18 19:11:23 UTC (rev 820)
@@ -23,7 +23,7 @@
 #define KPATHSEA_C_AUTO_H
 
 /* kpathsea: the version string. */
-#define KPSEVERSION "kpathsea version 6.3.2/dev"
+#define KPSEVERSION "kpathsea version 6.3.2"
 
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID

Modified: branches/stable/source/src/texk/kpathsea/configure
===================================================================
--- branches/stable/source/src/texk/kpathsea/configure	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/configure	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Kpathsea 6.3.2/dev.
+# Generated by GNU Autoconf 2.69 for Kpathsea 6.3.2.
 #
 # Report bugs to <tex-k at tug.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='Kpathsea'
 PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.3.2/dev'
-PACKAGE_STRING='Kpathsea 6.3.2/dev'
+PACKAGE_VERSION='6.3.2'
+PACKAGE_STRING='Kpathsea 6.3.2'
 PACKAGE_BUGREPORT='tex-k at tug.org'
 PACKAGE_URL=''
 
@@ -1339,7 +1339,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Kpathsea 6.3.2/dev to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.3.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1409,7 +1409,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Kpathsea 6.3.2/dev:";;
+     short | recursive ) echo "Configuration of Kpathsea 6.3.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1537,7 +1537,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Kpathsea configure 6.3.2/dev
+Kpathsea configure 6.3.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2376,7 +2376,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Kpathsea $as_me 6.3.2/dev, which was
+It was created by Kpathsea $as_me 6.3.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2757,7 +2757,7 @@
 
 
 
-KPSEVERSION=6.3.2/dev
+KPSEVERSION=6.3.2
 
 
 KPSE_LT_VERSINFO=9:2:3
@@ -2764,7 +2764,7 @@
 
 
 
- WEB2CVERSION=" (TeX Live 2020/dev)"
+ WEB2CVERSION=" (TeX Live 2020)"
 
 
 am__api_version='1.16'
@@ -8073,7 +8073,7 @@
 
 # Define the identity of the package.
  PACKAGE='kpathsea'
- VERSION='6.3.2/dev'
+ VERSION='6.3.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14697,7 +14697,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Kpathsea $as_me 6.3.2/dev, which was
+This file was extended by Kpathsea $as_me 6.3.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14763,7 +14763,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Kpathsea config.status 6.3.2/dev
+Kpathsea config.status 6.3.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: branches/stable/source/src/texk/kpathsea/doc/kpathsea.info
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/kpathsea.info	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/doc/kpathsea.info	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,9 +1,9 @@
-This is kpathsea.info, produced by makeinfo version 6.6 from
+This is kpathsea.info, produced by makeinfo version 5.1 from
 kpathsea.texi.
 
 This file documents the Kpathsea library for path searching.
 
-   Copyright (C) 1996-2019 Karl Berry & Olaf Weber.
+   Copyright (C) 1996-2020 Karl Berry & Olaf Weber.
 
    Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -37,7 +37,7 @@
 ****************
 
 This manual documents the Kpathsea library for path searching.  It
-corresponds to version 6.3.2, released in August 2019.
+corresponds to version 6.3.2, released in January 2020.
 
 * Menu:
 
@@ -62,7 +62,7 @@
 **************
 
 This manual corresponds to version 6.3.2 of the Kpathsea library,
-released in August 2019.
+released in January 2020.
 
    The library's fundamental purpose is to return a filename from a list
 of directories specified by the user, similar to what shells do when
@@ -80,7 +80,7 @@
 Other software that we do not maintain also uses it.
 
    Kpathsea is now maintained as part of the TeX Live distribution
-(<http://tug.org/texlive>), which includes several more Kpathsea-using
+(<https://tug.org/texlive>), which includes several more Kpathsea-using
 programs.  For information on configuration, building, installing, and
 more, *note (tlbuild)::.
 
@@ -95,7 +95,7 @@
 distribute their modifications.  It does not mean you have to distribute
 the source to your program using the library, although we hope you will.
 See accompanying files for the text of the GNU licenses, or
-<http2://www.gnu.org/licenses>.
+<https://gnu.org/licenses>.
 
    If you know enough about TeX to be reading this manual, then you (or
 your institution) should consider joining the TeX Users Group (if you're
@@ -291,8 +291,8 @@
 distribution.  It conforms to both the GNU coding standards and the TeX
 directory structure (TDS) standard.  For rationale and further
 explanation, please see those documents.  The GNU document is available
-from <http://www.gnu.org/prep/standards>.  The TDS document is available
-from <http://www.mirror.ctan.org/tds> (*note unixtex.ftp::).
+from <https://gnu.org/prep/standards>.  The TDS document is available
+from <http://mirror.ctan.org/tds> (*note unixtex.ftp::).
 
    In short, here is a skeleton of the default directory structure,
 extracted from the TDS document:
@@ -374,6 +374,11 @@
 provides.  For information about searching for particular file types
 (e.g., TeX fonts), see the next chapter.
 
+   This section, with minor differences, has been translated into
+several other languages (Chinese, Spanish, Russian, Japanese, French,
+German, ...) as part of the TeX Live guide; see
+<https://tug.org/texlive/doc.html> for links.
+
 * Menu:
 
 * Searching overview::          Basic scheme for searching.
@@ -526,7 +531,7 @@
      not start a comment.  Examples:
 
           % this is a comment
-          var = a%b  % but the value of var will be "a%b".
+          var = a%b  % but the value of var will be "a%b"
 
    * Blank lines are ignored.
 
@@ -534,7 +539,7 @@
      the next line is appended.  Whitespace at the beginning of
      continuation lines is not ignored.
 
-   * Each remaining line must look like
+   * Each remaining line will look like:
 
           VARIABLE [. PROGNAME] [=] VALUE
 
@@ -550,15 +555,21 @@
      flavors of TeX to have different search paths.  The PROGNAME value
      is used literally, without variable or other expansions.
 
-   * VALUE may contain any characters except '%' and '@'.  (These
-     restrictions are only necessary because of the processing done on
-     'texmf.cnf' at build time, so you can stick those characters in
-     after installation if you have to.)  The '$VAR.PROG' feature is not
-     available on the right-hand side; instead, you must use an
-     additional variable (see below for example).  A ';' in VALUE is
-     translated to ':' if running under Unix; this is useful to write a
-     single 'texmf.cnf' which can be used under both Unix and Windows.
+   * Considered as strings, VALUE may contain any character.  However,
+     in practice most 'texmf.cnf' values are related to path expansion,
+     and since various special characters are used in expansion, such as
+     braces and commas, they cannot be used in directory names.
 
+     The '$VAR.PROG' feature is not available on the right-hand side;
+     instead, you must use an additional variable (see below for
+     example).
+
+     A ';' in VALUE is translated to ':' if running under Unix, in order
+     to have a single 'texmf.cnf' that can support both Unix and Windows
+     systems.  This translation happens with any value, not just search
+     paths, but fortunately in practice ';' is not needed in other
+     values.
+
    * All definitions are read before anything is expanded, so you can
      use variables before they are defined (like Make, unlike most other
      programs).
@@ -573,12 +584,12 @@
      TEXINPUTS.latex2e = $latex2e_inputs
      TEXINPUTS.latex = $latex2e_inputs
 
-   This format has obvious similarities to Bourne shell scripts--change
-the comment character to '#', disallow spaces around the '=', and get
-rid of the '.NAME' convention, and it could be run through the shell.
-However, there seemed little advantage in this, since all the
-information would have to passed back to Kpathsea and parsed there
-anyway, since the 'sh' process couldn't affect its parent's environment.
+   This format has some similarity to Bourne shell scripts--change the
+comment character to '#', disallow spaces around the '=', and get rid of
+the '.NAME' convention, and it could be run through the shell.  However,
+there seemed little advantage in this, since all the information would
+have to passed back to Kpathsea and parsed there anyway, since the 'sh'
+process couldn't affect its parent's environment.
 
    The combination of spaces being ignored before the '.' of a program
 name qualifer and the optional '=' for the assignment has an unexpected
@@ -590,6 +601,15 @@
 special character.  The simplest way to avoid the problem is to use the
 '='.
 
+   Exactly when a character will be considered special or act as itself
+depends on the context in which it is used.  The rules are inherent in
+the multiple levels of interpretation of the configuration (parsing,
+expansion, search, ...) and so cannot be concisely stated,
+unfortunately.  There is no general escape mechanism; in particular, '\'
+is not an "escape character" in 'texmf.cnf' files.  When it comes
+choosing directory names for installation, it is safest to avoid them
+all.
+
    The implementation of all this is in 'kpathsea/cnf.c'.
 
 
@@ -815,7 +835,7 @@
 subdirectory '.../pk', even if it is a leaf, are checked.  The reason
 cannot be explained without reference to the implementation, so read
 'kpathsea/elt-dirs.c' (search for 'may descend') if you are curious.
-And if you can find a way to _solve_ the problem, please let me know.
+And if you find a way to solve the problem, please let me know.
 
    Subdirectory expansion is implemented in the source file
 'kpathsea/elt-dirs.c'.
@@ -950,7 +970,7 @@
    Sorry that it's annoyingly lengthy, but implementing this inside
 Kpathsea would be a lot of error-prone trouble for something that is
 only useful for debugging.  If your 'find' does not support '-iname',
-you can get GNU Find from <https://www.gnu.org/software/findutils>.
+you can get GNU Find from <https://gnu.org/software/findutils>.
 
    The casefolding search is implemented in the source file
 'kpathsea/pathsearch.c'.  Two implementation points:
@@ -975,7 +995,7 @@
 
 Kpathsea goes to some lengths to minimize disk accesses for searches
 (*note Subdirectory expansion::).  Nevertheless, in practice searching
-each possible directory in typical TeX installations takes an
+every possible directory in typical TeX installations takes an
 excessively long time.
 
    Therefore, Kpathsea can use an externally-built "filename database"
@@ -983,8 +1003,7 @@
 to exhaustively search the disk.
 
    A second database file 'aliases' allows you to give additional names
-to the files listed in 'ls-R'.  This can be helpful to adapt to "8.3"
-filename conventions in source files.
+to the files listed in 'ls-R'.
 
    The 'ls-R' and 'aliases' features are implemented in the source file
 'kpathsea/db.c'.
@@ -1632,7 +1651,7 @@
 
 'bltxml'
      (BibLaTeXML bibliography files for Biber,
-     <http://ctan.org/pkg/biber>) 'BLTXMLINPUTS' suffix '.bltxml'.
+     <https://ctan.org/pkg/biber>) 'BLTXMLINPUTS' suffix '.bltxml'.
 
 'bst'
      (BibTeX style, *note Basic BibTeX style files: (web2c)Basic BibTeX
@@ -1639,7 +1658,7 @@
      style files.) 'BSTINPUTS'; suffix '.bst'.
 
 'clua'
-     (dynamic libraries for Lua, <http://ctan.org/pkg/luatex>)
+     (dynamic libraries for Lua, <https://ctan.org/pkg/luatex>)
      'CLUAINPUTS' suffixes '.dll' and '.so'.
 
 'cmap'
@@ -1771,7 +1790,7 @@
 
 'ris'
      (RIS bibliography files, primarily for Biber,
-     <http://ctan.org/pkg/biber>) 'RISINPUTS' suffix '.ris'.
+     <https://ctan.org/pkg/biber>) 'RISINPUTS' suffix '.ris'.
 
 'subfont definition files'
      (subfont definition files) 'SFDFONTS' suffix '.sfd'.
@@ -2504,7 +2523,7 @@
 different systems.  You will almost certainly want to use Autoconf and
 probably Automake for configuring and building your software if you use
 Kpathsea; I strongly recommend using Autoconf and Automake regardless.
-They are available from <http://www.gnu.org/software>.
+They are available from <https://gnu.org/software>.
 
 
 File: kpathsea.info,  Node: Program-specific files,  Next: Programming with config files,  Prev: Calling sequence,  Up: Programming
@@ -2644,7 +2663,7 @@
 
    * If the bug involved is an actual crash (i.e., core dump), it is
      easy and useful to include a stack trace from a debugger (I
-     recommend the GNU debugger GDB (<http://www.gnu.org/software/gdb>).
+     recommend the GNU debugger GDB (<https://gnu.org/software/gdb>).
      If the cause is apparent (a 'NULL' value being dereferenced, for
      example), please send the details along.  If the program involved
      is TeX or Metafont, and the crash is happening at apparently-sound
@@ -2663,7 +2682,7 @@
 
 Web2c and Kpathsea in general are discussed on the mailing list
 <tex-k at tug.org>.  You can subscribe and peruse the archives on the web
-<http://lists.tug.org/tex-k>.
+<https://lists.tug.org/tex-k>.
 
    You do not need to join to submit a report, nor will it affect
 whether you get a response.  Be aware that large data files are
@@ -2672,7 +2691,7 @@
 
    If you are looking for general TeX help, such as how to install a
 full TeX system or how to use LaTeX, please see
-<http://tug.org/begin.html>.
+<https://tug.org/begin.html>.
 
 
 File: kpathsea.info,  Node: Debugging,  Next: Logging,  Prev: Mailing lists,  Up: Reporting bugs
@@ -2959,7 +2978,7 @@
 the wrong device, most likely 'mktexpk''s built-in guess for the mode is
 wrong, and you should override it as above.
 
-   See <http://ctan.org/pkg/modes> for a list of resolutions and mode
+   See <https://ctan.org/pkg/modes> for a list of resolutions and mode
 names for most devices (additional submissions are welcome).
 
    If Metafont runs but generates fonts at a resolution of 2602dpi (and
@@ -3018,7 +3037,7 @@
 * !! and casefolding:                    Casefolding examples.
                                                               (line  57)
 * !! in path specifications:             ls-R.                (line  57)
-* !! in TEXMFDBS:                        ls-R.                (line  11)
+* !! in 'TEXMFDBS':                      ls-R.                (line  11)
 * $ expansion:                           Variable expansion.  (line   6)
 * --all:                                 Path searching options.
                                                               (line  12)
@@ -3026,7 +3045,7 @@
                                                               (line  19)
 * --cnf-line:                            Path searching options.
                                                               (line  28)
-* --cnf-line, source for path:           Path sources.        (line   9)
+* '--cnf-line', source for path:         Path sources.        (line   9)
 * --color=tty:                           ls-R.                (line  25)
 * --debug=NUM:                           Auxiliary tasks.     (line   9)
 * --dpi=NUM:                             Path searching options.
@@ -3072,12 +3091,12 @@
 * --without-mktexpk-default:             mktex configuration. (line  12)
 * --without-mktextfm-default:            mktex configuration. (line  12)
 * -1 debugging value:                    Debugging.           (line  23)
-* -A option to ls:                       ls-R.                (line  39)
+* -A option to 'ls':                     ls-R.                (line  39)
 * -D NUM:                                Path searching options.
                                                               (line  49)
 * -iname, find predicate:                Casefolding examples.
                                                               (line  78)
-* -L option to ls:                       ls-R.                (line  44)
+* -L option to 'ls':                     ls-R.                (line  44)
 * . directories, ignored:                ls-R.                (line  39)
 * . files:                               ls-R.                (line  39)
 * .2602gf:                               Unable to generate fonts.
@@ -3154,6 +3173,7 @@
                                                               (line 195)
 * .pro:                                  Supported file formats.
                                                               (line 169)
+* .PROGNAME qualifier in 'texmf.cnf':    Config files.        (line  50)
 * .rhosts, writable by TeX:              Security.            (line  10)
 * .ris:                                  Supported file formats.
                                                               (line 173)
@@ -3163,7 +3183,7 @@
                                                               (line  42)
 * .tex:                                  Supported file formats.
                                                               (line 180)
-* .tex file, included in ls-R:           ls-R.                (line  39)
+* .tex file, included in 'ls-R':         ls-R.                (line  39)
 * .tfm:                                  Supported file formats.
                                                               (line 199)
 * .ttc:                                  Supported file formats.
@@ -3191,7 +3211,9 @@
 * 8.3 filenames, using:                  mktex configuration. (line  68)
 * : may not be ::                        Searching overview.  (line  13)
 * :: expansion:                          Default expansion.   (line   6)
-* \, line continuation in texmf.cnf:     Config files.        (line  37)
+* ; translated to ':' in 'texmf.cnf':    Config files.        (line  66)
+* = omitted in 'texmf.cnf' and misparsing: Config files.      (line  93)
+* \, line continuation in 'texmf.cnf':   Config files.        (line  37)
 * \openin:                               Searching overview.  (line  31)
 * \special, suppressing warnings about:  Suppressing warnings.
                                                               (line  31)
@@ -3214,15 +3236,15 @@
 * announcement mailing list:             Mailing lists.       (line   6)
 * API, re-entrant:                       Programming overview.
                                                               (line  16)
-* append-only directories and mktexpk:   Security.            (line  36)
+* append-only directories and 'mktexpk': Security.            (line  36)
 * appendonlydir:                         mktex configuration. (line  60)
 * Apple filesystem, case-insensitive:    Casefolding rationale.
                                                               (line   6)
-* arguments to mktex:                    mktex script arguments.
+* arguments to 'mktex':                  mktex script arguments.
                                                               (line   6)
 * argv[0]:                               Calling sequence.    (line  14)
 * autoconf, recommended:                 Calling sequence.    (line 117)
-* automounter, and ls-R:                 ls-R.                (line  46)
+* automounter, and 'ls-R':               ls-R.                (line  46)
 * auxiliary tasks:                       Auxiliary tasks.     (line   6)
 * Bach, Johann Sebastian:                Default expansion.   (line  41)
 * backslash-newline:                     Config files.        (line  37)
@@ -3232,7 +3254,7 @@
                                                               (line  30)
 * BIBINPUTS <1>:                         Supported file formats.
                                                               (line 121)
-* blank lines, in texmf.cnf:             Config files.        (line  35)
+* blank lines, in 'texmf.cnf':           Config files.        (line  35)
 * BLTXMLINPUTS:                          Supported file formats.
                                                               (line  34)
 * brace expansion:                       Brace expansion.     (line   6)
@@ -3260,7 +3282,7 @@
 * checksum:                              Suppressing warnings.
                                                               (line  16)
 * circle fonts:                          Fontmap.             (line  19)
-* client_path in kpse->format_info:      Calling sequence.    (line  47)
+* client_path in 'kpse->format_info':    Calling sequence.    (line  47)
 * CLUAINPUTS:                            Supported file formats.
                                                               (line  42)
 * CMAPFONTS:                             Supported file formats.
@@ -3267,11 +3289,11 @@
                                                               (line  46)
 * cmr10, as fallback font:               Fallback font.       (line  15)
 * cmr10.vf:                              Searching overview.  (line  31)
-* cnf.c:                                 Config files.        (line  97)
+* cnf.c:                                 Config files.        (line 112)
 * cnf.h:                                 Programming with config files.
                                                               (line  27)
 * comments, in fontmap files:            Fontmap.             (line  27)
-* comments, in texmf.cnf:                Config files.        (line  27)
+* comments, in 'texmf.cnf':              Config files.        (line  27)
 * comments, making:                      Introduction.        (line  29)
 * common features in glyph lookup:       Basic glyph lookup.  (line   6)
 * common problems:                       Common problems.     (line   6)
@@ -3296,9 +3318,10 @@
 * config.status:                         Bug checklist.       (line  27)
 * configuration bugs:                    Bug checklist.       (line  27)
 * configuration file, source for path:   Path sources.        (line  20)
-* configuration files as shell scripts.: Config files.        (line  80)
-* configuration of mktex scripts:        mktex configuration. (line   6)
-* configure options for mktex scripts:   mktex configuration. (line  12)
+* configuration files as shell scripts.: Config files.        (line  86)
+* configuration of 'mktex' scripts:      mktex configuration. (line   6)
+* 'configure' options for 'mktex' scripts: mktex configuration.
+                                                              (line  12)
 * context diff:                          Bug checklist.       (line  52)
 * continuation character:                Config files.        (line  37)
 * core dumps, reporting:                 Bug checklist.       (line  58)
@@ -3322,7 +3345,7 @@
 * directory permissions:                 Security.            (line  51)
 * directory structure, for TeX files:    TeX directory structure.
                                                               (line   6)
-* disabling mktex scripts:               mktex configuration. (line   6)
+* disabling 'mktex' scripts:             mktex configuration. (line   6)
 * disk search:                           Searching overview.  (line  22)
 * disk searching, avoiding:              ls-R.                (line  57)
 * disk usage, reducing:                  Logging.             (line   6)
@@ -3349,7 +3372,7 @@
                                                               (line  41)
 * elt-dirs.c <1>:                        Subdirectory expansion.
                                                               (line  48)
-* enabling mktex scripts:                mktex configuration. (line   6)
+* enabling 'mktex' scripts:              mktex configuration. (line   6)
 * ENCFONTS:                              Supported file formats.
                                                               (line  61)
 * engine name:                           Path searching options.
@@ -3378,7 +3401,7 @@
 * extensions, filename:                  File lookup.         (line  24)
 * externally-built filename database:    Filename database.   (line   6)
 * extra colons:                          Default expansion.   (line   6)
-* failed mktex... script invocation:     mktex script names.  (line  35)
+* failed 'mktex...' script invocation:   mktex script names.  (line  35)
 * fallback font:                         Fallback font.       (line   6)
 * fallback resolutions:                  Fallback font.       (line   6)
 * FAQ, Kpathsea:                         Common problems.     (line   6)
@@ -3464,7 +3487,7 @@
                                                               (line 151)
 * interface, not frozen:                 Introduction.        (line  29)
 * introduction:                          Introduction.        (line   6)
-* kdebug::                               Debugging.           (line 105)
+* 'kdebug:':                             Debugging.           (line 105)
 * kdefault.c:                            Default expansion.   (line  48)
 * Knuth, Donald E.:                      History.             (line   6)
 * Knuth, Donald E., archive of programs by: unixtex.ftp.      (line  19)
@@ -3567,9 +3590,9 @@
                                                               (line  20)
 * mkocp:                                 mktex script names.  (line  18)
 * mkofm:                                 mktex script names.  (line  21)
-* mktex script configuration:            mktex configuration. (line   6)
-* mktex script names:                    mktex script names.  (line   6)
-* mktex scripts:                         mktex scripts.       (line   6)
+* 'mktex' script configuration:          mktex configuration. (line   6)
+* 'mktex' script names:                  mktex script names.  (line   6)
+* 'mktex' scripts:                       mktex scripts.       (line   6)
 * mktex.cnf:                             Specially-recognized files.
                                                               (line  28)
 * mktex.cnf <1>:                         mktex configuration. (line  29)
@@ -3579,7 +3602,7 @@
 * mktexfmt:                              mktex script names.  (line  10)
 * mktexmf:                               mktex script names.  (line  15)
 * mktexpk:                               mktex script names.  (line  24)
-* mktexpk can't guess mode:              Unable to generate fonts.
+* 'mktexpk' can't guess mode:            Unable to generate fonts.
                                                               (line  12)
 * mktextex:                              mktex script names.  (line  27)
 * mktextfm:                              mktex script names.  (line  30)
@@ -3600,9 +3623,9 @@
 * MT_FEATURES:                           mktex configuration. (line  39)
 * multiple TeX hierarchies:              Brace expansion.     (line  20)
 * must exist:                            Searching overview.  (line  31)
-* names for mktex scripts:               mktex script names.  (line   6)
+* names for 'mktex' scripts:             mktex script names.  (line   6)
 * Neumann, Gustaf:                       History.             (line  56)
-* NFS and ls-R:                          ls-R.                (line  46)
+* NFS and 'ls-R':                        ls-R.                (line  46)
 * nomfdrivers:                           mktex configuration. (line  92)
 * nomode:                                mktex configuration. (line  97)
 * none:                                  Suppressing warnings.
@@ -3711,11 +3734,11 @@
 * setgid scripts:                        Security.            (line  40)
 * SFDFONTS:                              Supported file formats.
                                                               (line 177)
-* shell scripts as configuration files:  Config files.        (line  80)
+* shell scripts as configuration files:  Config files.        (line  86)
 * shell variables:                       Variable expansion.  (line  17)
 * shell_escape, example for code:        Programming with config files.
                                                               (line  10)
-* site overrides for mktex...:           mktex configuration. (line  29)
+* site overrides for 'mktex...':         mktex configuration. (line  29)
 * skeleton TeX directory:                TeX directory structure.
                                                               (line   6)
 * slow startup time:                     Slow path searching. (line   6)
@@ -3750,7 +3773,7 @@
                                                               (line   6)
 * symbolic links not found:              Unable to find files.
                                                               (line  21)
-* symbolic links, and ls-R:              ls-R.                (line  44)
+* symbolic links, and 'ls-R':            ls-R.                (line  44)
 * symlinks, resolving:                   Calling sequence.    (line  31)
 * system C compiler bugs:                TeX or Metafont failing.
                                                               (line  16)
@@ -3816,7 +3839,7 @@
                                                               (line   6)
 * texmf.cnf:                             Specially-recognized files.
                                                               (line  38)
-* texmf.cnf missing, warning about:      Config files.        (line  18)
+* 'texmf.cnf' missing, warning about:    Config files.        (line  18)
 * texmf.cnf, and variable expansion:     Variable expansion.  (line   6)
 * texmf.cnf, definition for:             Config files.        (line   6)
 * texmf.cnf, source for path:            Path sources.        (line  20)
@@ -3861,8 +3884,10 @@
 * tilde.c:                               Tilde expansion.     (line  25)
 * time system call:                      Logging.             (line  15)
 * tolerance for glyph lookup:            Basic glyph lookup.  (line  15)
-* trailing / in home directory:          Tilde expansion.     (line  19)
+* trailing '/' in home directory:        Tilde expansion.     (line  19)
 * trailing colons:                       Default expansion.   (line   6)
+* translations, of path searching description: Path searching.
+                                                              (line  10)
 * TRFONTS:                               Supported file formats.
                                                               (line 203)
 * trick for detecting leaf directories:  Subdirectory expansion.
@@ -3885,7 +3910,7 @@
 * unreadable file warnings:              Suppressing warnings.
                                                               (line  27)
 * unreadable files:                      Searching overview.  (line  63)
-* unusable ls-R warning:                 ls-R.                (line  51)
+* unusable 'ls-R' warning:               ls-R.                (line  51)
 * usage patterns, finding:               Logging.             (line   6)
 * USERPROFILE, as ~ expansion:           Tilde expansion.     (line   6)
 * USE_TEXMFVAR:                          mktex configuration. (line 128)
@@ -3903,8 +3928,8 @@
                                                               (line 219)
 * Vojta, Paul:                           History.             (line  30)
 * Walsh, Norman:                         History.             (line  56)
-* warning about unusable ls-R:           ls-R.                (line  51)
-* warning, about missing texmf.cnf:      Config files.        (line  18)
+* warning about unusable 'ls-R':         ls-R.                (line  51)
+* warning, about missing 'texmf.cnf':    Config files.        (line  18)
 * warnings, file access:                 Searching overview.  (line  63)
 * warnings, suppressing:                 Suppressing warnings.
                                                               (line   6)
@@ -3931,61 +3956,61 @@
 
 Tag Table:
 Node: Top1480
-Node: Introduction2261
-Node: History4332
-Node: unixtex.ftp8928
-Node: Security10353
-Node: TeX directory structure12857
-Node: Path searching16905
-Node: Searching overview17632
-Node: Path sources21451
-Node: Config files22677
-Node: Path expansion27283
-Node: Default expansion28236
-Node: Variable expansion30306
-Node: Tilde expansion31707
-Node: Brace expansion32687
-Node: KPSE_DOT expansion33626
-Node: Subdirectory expansion34139
-Node: Casefolding search36493
-Node: Casefolding rationale37262
-Node: Casefolding examples38601
-Node: Filename database43651
-Node: ls-R44709
-Node: Filename aliases48385
-Node: Database format49563
-Node: Invoking kpsewhich50576
-Node: Path searching options51531
-Node: Specially-recognized files61129
-Node: Auxiliary tasks62484
-Node: Standard options66209
-Node: TeX support66565
-Node: Supported file formats67919
-Node: File lookup75584
-Node: Glyph lookup77333
-Node: Basic glyph lookup78457
-Node: Fontmap79337
-Node: Fallback font81866
-Node: Suppressing warnings82778
-Node: mktex scripts83905
-Node: mktex configuration85120
-Node: mktex script names90923
-Node: mktex script arguments92309
-Node: Programming93188
-Node: Programming overview93761
-Node: Calling sequence96622
-Node: Program-specific files103154
-Node: Programming with config files104177
-Node: Reporting bugs105764
-Node: Bug checklist106442
-Node: Mailing lists109914
-Node: Debugging110589
-Node: Logging115666
-Node: Common problems117533
-Node: Unable to find files118010
-Node: Slow path searching120420
-Node: Unable to generate fonts121795
-Node: TeX or Metafont failing124266
-Node: Index125468
+Node: Introduction2262
+Node: History4331
+Node: unixtex.ftp8927
+Node: Security10352
+Node: TeX directory structure12856
+Node: Path searching16897
+Node: Searching overview17855
+Node: Path sources21674
+Node: Config files22900
+Node: Path expansion28163
+Node: Default expansion29116
+Node: Variable expansion31186
+Node: Tilde expansion32587
+Node: Brace expansion33567
+Node: KPSE_DOT expansion34506
+Node: Subdirectory expansion35019
+Node: Casefolding search37367
+Node: Casefolding rationale38136
+Node: Casefolding examples39475
+Node: Filename database44521
+Node: ls-R45503
+Node: Filename aliases49179
+Node: Database format50357
+Node: Invoking kpsewhich51370
+Node: Path searching options52325
+Node: Specially-recognized files61923
+Node: Auxiliary tasks63278
+Node: Standard options67003
+Node: TeX support67359
+Node: Supported file formats68713
+Node: File lookup76381
+Node: Glyph lookup78130
+Node: Basic glyph lookup79254
+Node: Fontmap80134
+Node: Fallback font82663
+Node: Suppressing warnings83575
+Node: mktex scripts84702
+Node: mktex configuration85917
+Node: mktex script names91720
+Node: mktex script arguments93106
+Node: Programming93985
+Node: Programming overview94558
+Node: Calling sequence97419
+Node: Program-specific files103948
+Node: Programming with config files104971
+Node: Reporting bugs106558
+Node: Bug checklist107236
+Node: Mailing lists110705
+Node: Debugging111382
+Node: Logging116459
+Node: Common problems118326
+Node: Unable to find files118803
+Node: Slow path searching121213
+Node: Unable to generate fonts122588
+Node: TeX or Metafont failing125060
+Node: Index126262
 
 End Tag Table

Modified: branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi	2020-02-18 19:11:23 UTC (rev 820)
@@ -3,12 +3,12 @@
 @settitle Kpathsea: A library for path searching
 
 @set version 6.3.2
- at set month-year August 2019
+ at set month-year January 2020
 
 @copying
 This file documents the Kpathsea library for path searching.
 
-Copyright @copyright{} 1996--2019 Karl Berry & Olaf Weber.
+Copyright @copyright{} 1996--2020 Karl Berry & Olaf Weber.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -67,7 +67,7 @@
 @author Karl Berry
 @author Olaf Weber
 @author Taco Hoekwater
- at author @url{http://tug.org/kpathsea}
+ at author @url{https://tug.org/kpathsea}
 
 @page
 @vskip 0pt plus 1filll
@@ -132,7 +132,7 @@
 @noindent Other software that we do not maintain also uses it.
 
 Kpathsea is now maintained as part of the @TeX{} Live distribution
-(@url{http://tug.org/texlive}), which includes several more
+(@url{https://tug.org/texlive}), which includes several more
 Kpathsea-using programs.  For information on configuration, building,
 installing, and more, @pxref{,,,tlbuild, Building @TeX{} Live}.
 
@@ -153,7 +153,7 @@
 library source and distribute their modifications.  It does not mean
 you have to distribute the source to your program using the library,
 although we hope you will.  See accompanying files for the text of the
-GNU licenses, or @url{http2://www.gnu.org/licenses}.
+GNU licenses, or @url{https://gnu.org/licenses}.
 
 @cindex @TeX{} Users Group
 If you know enough about @TeX{} to be reading this manual, then you (or
@@ -357,8 +357,8 @@
 distribution.  It conforms to both the GNU coding standards and the
 @TeX{} directory structure (TDS) standard.  For rationale and further
 explanation, please see those documents.  The GNU document is
-available from @url{http://www.gnu.org/prep/standards}.  The TDS
-document is available from @url{http://www.mirror.ctan.org/tds}
+available from @url{https://gnu.org/prep/standards}.  The TDS
+document is available from @url{http://mirror.ctan.org/tds}
 (@pxref{unixtex.ftp}).
 
 In short, here is a skeleton of the default directory structure,
@@ -445,6 +445,12 @@
 provides.  For information about searching for particular file types
 (e.g., @TeX{} fonts), see the next chapter.
 
+ at cindex translations, of path searching description
+This section, with minor differences, has been translated into several
+other languages (Chinese, Spanish, Russian, Japanese, French, German,
+ at dots{}) as part of the @TeX{} Live guide; see
+ at url{https://tug.org/texlive/doc.html} for links.
+
 @menu
 * Searching overview::          Basic scheme for searching.
 * Path sources::                Where search paths can be defined.
@@ -652,7 +658,7 @@
 
 @example
 % this is a comment
-var = a%b  % but the value of var will be "a%b".
+var = a%b  % but the value of var will be "a%b"
 @end example
 
 @item
@@ -668,7 +674,7 @@
 the next line is appended.  Whitespace at the beginning of continuation
 lines is not ignored.
 
- at item Each remaining line must look like
+ at item Each remaining line will look like:
 
 @example
 @var{variable} @r{[}. @var{progname}@r{]} @r{[}=@r{]} @var{value}
@@ -681,6 +687,7 @@
 The @var{variable} name may contain any character other than whitespace,
 @samp{=}, or @samp{.}, but sticking to @samp{A-Za-z_} is safest.
 
+ at kindex . at var{progname} @r{qualifier in @file{texmf.cnf}}
 @item If @samp{. at var{progname}} is present (preceding spaces are
 ignored), the definition only applies if the program that is running
 is named (i.e., the last component of @code{argv[0]} is)
@@ -691,16 +698,22 @@
 
 @item
 @cindex right-hand side of variable assignments
- at var{value} may contain any characters except @samp{%} and @samp{@@}.
-(These restrictions are only necessary because of the processing done
-on @file{texmf.cnf} at build time, so you can stick those characters
-in after installation if you have to.)  The
- at samp{$@var{var}. at var{prog}} feature is not available on the
+Considered as strings, @var{value} may contain any character.
+However, in practice most @file{texmf.cnf} values are related to path
+expansion, and since various special characters are used in expansion,
+such as braces and commas, they cannot be used in directory names.
+  
+The @samp{$@var{var}. at var{prog}} feature is not available on the
 right-hand side; instead, you must use an additional variable (see
-below for example).  A @samp{;} in @var{value} is translated to
- at samp{:} if running under Unix; this is useful to write a single
- at file{texmf.cnf} which can be used under both Unix and Windows.
+below for example).
 
+ at kindex ; @r{translated to @samp{:} in @file{texmf.cnf}}
+A @samp{;} in @var{value} is translated to @samp{:} if running under
+Unix, in order to have a single @file{texmf.cnf} that can support both
+Unix and Windows systems. This translation happens with any value, not
+just search paths, but fortunately in practice @samp{;} is not needed
+in other values.
+
 @item All definitions are read before anything is expanded, so you can
 use variables before they are defined (like Make, unlike most other
 programs).
@@ -721,14 +734,15 @@
 
 @cindex shell scripts as configuration files
 @cindex configuration files as shell scripts.
-This format has obvious similarities to Bourne shell scripts---change
-the comment character to @code{#}, disallow spaces around the
- at code{=}, and get rid of the @code{. at var{name}} convention, and it
-could be run through the shell.  However, there seemed little
-advantage in this, since all the information would have to passed back
-to Kpathsea and parsed there anyway, since the @code{sh} process
-couldn't affect its parent's environment.
+This format has some similarity to Bourne shell scripts---change the
+comment character to @code{#}, disallow spaces around the @code{=},
+and get rid of the @code{. at var{name}} convention, and it could be run
+through the shell.  However, there seemed little advantage in this,
+since all the information would have to passed back to Kpathsea and
+parsed there anyway, since the @code{sh} process couldn't affect its
+parent's environment.
 
+ at kindex = @r{omitted in @file{texmf.cnf} and misparsing}
 The combination of spaces being ignored before the @code{.} of a
 program name qualifer and the optional @samp{=} for the assignment has
 an unexpected consequence: if the value begins with a literal @samp{.}
@@ -739,6 +753,15 @@
 name contains a path separator or other special character.  The
 simplest way to avoid the problem is to use the @code{=}.
 
+Exactly when a character will be considered special or act as itself
+depends on the context in which it is used. The rules are inherent in
+the multiple levels of interpretation of the configuration (parsing,
+expansion, search, @dots{}) and so cannot be concisely stated,
+unfortunately. There is no general escape mechanism; in particular,
+ at samp{\} is not an ``escape character'' in @file{texmf.cnf} files.
+When it comes choosing directory names for installation, it is safest to
+avoid them all.
+
 @flindex cnf.c
 The implementation of all this is in @file{kpathsea/cnf.c}.
 
@@ -1024,11 +1047,11 @@
 Unfortunately, in some cases files in leaf directories are
 @code{stat}'d: if the path specification is, say,
 @samp{$TEXMF/fonts//pk//}, then files in a subdirectory
- at samp{@dots{}/pk}, even if it is a leaf, are checked. The reason cannot
-be explained without reference to the implementation, so read
+ at samp{@dots{}/pk}, even if it is a leaf, are checked. The reason
+cannot be explained without reference to the implementation, so read
 @file{kpathsea/elt-dirs.c} (search for @samp{may descend}) if you are
-curious.  And if you can find a way to @emph{solve} the problem, please
-let me know.
+curious.  And if you find a way to solve the problem, please let me
+know.
 
 @flindex elt-dirs.c
 Subdirectory expansion is implemented in the source file
@@ -1185,7 +1208,7 @@
 Kpathsea would be a lot of error-prone trouble for something that is
 only useful for debugging.  If your @code{find} does not support
 @code{-iname}, you can get GNU Find from
- at url{https://www.gnu.org/software/findutils}.
+ at url{https://gnu.org/software/findutils}.
 
 The casefolding search is implemented in the source file
 @file{kpathsea/pathsearch.c}.  Two implementation points:
@@ -1217,7 +1240,7 @@
 
 Kpathsea goes to some lengths to minimize disk accesses for searches
 (@pxref{Subdirectory expansion}).  Nevertheless, in practice searching
-each possible directory in typical @TeX{} installations takes an
+every possible directory in typical @TeX{} installations takes an
 excessively long time.
 
 Therefore, Kpathsea can use an externally-built @dfn{filename
@@ -1225,8 +1248,7 @@
 avoiding the need to exhaustively search the disk.
 
 A second database file @file{aliases} allows you to give additional
-names to the files listed in @file{ls-R}.  This can be helpful to adapt
-to ``8.3'' filename conventions in source files.
+names to the files listed in @file{ls-R}.
 
 The @file{ls-R} and @file{aliases} features are implemented in the
 source file @file{kpathsea/db.c}.
@@ -2021,7 +2043,7 @@
 @item bltxml
 @flindex .bltxml
 @vindex BLTXMLINPUTS
-(Bib at LaTeX{}ML bibliography files for Biber, @url{http://ctan.org/pkg/biber})
+(Bib at LaTeX{}ML bibliography files for Biber, @url{https://ctan.org/pkg/biber})
 @code{BLTXMLINPUTS}
 suffix @samp{.bltxml}.
 
@@ -2037,7 +2059,7 @@
 @flindex .dll
 @flindex .so
 @vindex CLUAINPUTS
-(dynamic libraries for Lua, @url{http://ctan.org/pkg/luatex})
+(dynamic libraries for Lua, @url{https://ctan.org/pkg/luatex})
 @code{CLUAINPUTS}
 suffixes @samp{.dll} and @samp{.so}.
 
@@ -2293,7 +2315,7 @@
 @item ris
 @flindex .ris
 @vindex RISINPUTS
-(RIS bibliography files, primarily for Biber, @url{http://ctan.org/pkg/biber})
+(RIS bibliography files, primarily for Biber, @url{https://ctan.org/pkg/biber})
 @code{RISINPUTS}
 suffix @samp{.ris}.
 
@@ -3287,7 +3309,7 @@
 different systems.  You will almost certainly want to use Autoconf and
 probably Automake for configuring and building your software if you use
 Kpathsea; I strongly recommend using Autoconf and Automake regardless.
-They are available from @url{http://www.gnu.org/software}.
+They are available from @url{https://gnu.org/software}.
 
 
 @node Program-specific files
@@ -3462,7 +3484,7 @@
 @pindex gdb at r{, recommended}
 If the bug involved is an actual crash (i.e., core dump), it is easy
 and useful to include a stack trace from a debugger (I recommend the
-GNU debugger GDB (@url{http://www.gnu.org/software/gdb}).  If the
+GNU debugger GDB (@url{https://gnu.org/software/gdb}).  If the
 cause is apparent (a @code{NULL} value being dereferenced, for
 example), please send the details along.  If the program involved is
 @TeX{} or Metafont, and the crash is happening at apparently-sound
@@ -3486,7 +3508,7 @@
 @flindex tex-k@@tug.org
 Web2c and Kpathsea in general are discussed on the mailing list
 @email{tex-k@@tug.org}.  You can subscribe and peruse the archives on
-the web @url{http://lists.tug.org/tex-k}.
+the web @url{https://lists.tug.org/tex-k}.
 
 You do not need to join to submit a report, nor will it affect whether
 you get a response.  Be aware that large data files are sometimes
@@ -3495,7 +3517,7 @@
 
 If you are looking for general @TeX{} help, such as how to install a
 full @TeX{} system or how to use @LaTeX{}, please see
- at url{http://tug.org/begin.html}.
+ at url{https://tug.org/begin.html}.
 
 
 @node Debugging
@@ -3836,7 +3858,7 @@
 the wrong device, most likely @code{mktexpk}'s built-in guess for the
 mode is wrong, and you should override it as above.
 
-See @url{http://ctan.org/pkg/modes} for a list of resolutions and mode
+See @url{https://ctan.org/pkg/modes} for a list of resolutions and mode
 names for most devices (additional submissions are welcome).
 
 @flindex .2602gf

Modified: branches/stable/source/src/texk/kpathsea/kpsewhich.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/kpsewhich.c	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/kpsewhich.c	2020-02-18 19:11:23 UTC (rev 820)
@@ -589,6 +589,14 @@
    option table in a variable `long_options'.  */
 #define ARGUMENT_IS(a) STREQ (long_options[option_index].name, a)
 
+/* If S is NULL or the empty string, abort.  */
+#define ENSURE_NONEMPTY_STRING(s) do {                                \
+  if (!(s) || ! *(s)) {                                               \
+    fprintf (stderr, "kpsewhich: empty argument for %s\n",            \
+             long_options[option_index].name);                        \
+    fputs ("Try `kpsewhich --help' for more information.\n", stderr); \
+    exit (EXIT_FAILURE); } } while (0)
+
 /* SunOS cc can't initialize automatic structs.  */
 static struct option long_options[]
   = { { "D",                    1, 0, 0 },
@@ -634,7 +642,7 @@
       break;
 
     if (g == '?')
-      exit (1);  /* Unknown option.  */
+      exit (EXIT_FAILURE);  /* Unknown option.  */
 
     assert (g == 0); /* We have no short option names.  */
 
@@ -674,6 +682,7 @@
       var_to_expand = optarg;
 
     } else if (ARGUMENT_IS ("format")) {
+      ENSURE_NONEMPTY_STRING (optarg);
       user_format_string = optarg;
 
     } else if (ARGUMENT_IS ("help")) {
@@ -703,9 +712,11 @@
       progname = optarg;
 
     } else if (ARGUMENT_IS ("safe-in-name")) {
+      ENSURE_NONEMPTY_STRING (optarg);
       safe_in_name = optarg;
 
     } else if (ARGUMENT_IS ("safe-out-name")) {
+      ENSURE_NONEMPTY_STRING (optarg);
       safe_out_name = optarg;
 
     } else if (ARGUMENT_IS ("show-path")) {
@@ -716,14 +727,16 @@
       str_list_add (&subdir_paths, optarg);
 
     } else if (ARGUMENT_IS ("var-brace-value")) {
+      ENSURE_NONEMPTY_STRING (optarg);
       var_to_brace_value = optarg;
 
     } else if (ARGUMENT_IS ("var-value")) {
+      ENSURE_NONEMPTY_STRING (optarg);
       var_to_value = optarg;
 
     } else if (ARGUMENT_IS ("version")) {
       puts (kpathsea_version_string);
-      puts ("Copyright 2019 Karl Berry & Olaf Weber.\n\
+      puts ("Copyright 2020 Karl Berry & Olaf Weber.\n\
 License LGPLv2.1+: GNU Lesser GPL version 2.1 or later <https://gnu.org/licenses/lgpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n");
@@ -734,10 +747,11 @@
   }
 
   if (user_path && user_format_string) {
-    fprintf (stderr, "-path (%s) and -format (%s) are mutually exclusive.\n",
+    fprintf (stderr,
+            "kpsewhich: -path (%s) and -format (%s) are mutually exclusive.\n",
              user_path, user_format_string);
     fputs ("Try `kpsewhich --help' for more information.\n", stderr);
-    exit (1);
+    exit (EXIT_FAILURE);
   }
 
   if (optind == argc
@@ -746,7 +760,7 @@
       && !safe_in_name && !safe_out_name) {
     fputs ("Missing argument. Try `kpsewhich --help' for more information.\n",
            stderr);
-    exit (1);
+    exit (EXIT_FAILURE);
   }
 }
 

Modified: branches/stable/source/src/texk/kpathsea/line.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/line.c	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/line.c	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,6 @@
 /* line.c: return the next line from a file, or NULL.
 
-   Copyright 1992, 1993, 1995, 1996, 2008, 2013, 2014 Karl Berry.
+   Copyright 1992, 1993, 1995, 1996, 2008, 2013, 2014, 2020 Karl Berry.
    Copyright 1998, 1999, 2001, 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -55,6 +55,11 @@
   FLOCKFILE (f);
 
   while ((c = getc (f)) != EOF && c != '\n' && c != '\r') {
+    /* Silently drop null bytes.  */
+    if (c == 0) {
+      continue;
+    }
+    
     line[loc] = c;
     loc++;
 

Modified: branches/stable/source/src/texk/kpathsea/man/Makefile.am
===================================================================
--- branches/stable/source/src/texk/kpathsea/man/Makefile.am	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/man/Makefile.am	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,8 @@
+## $Id: Makefile.am 53254 2019-12-29 19:18:55Z karl $
 ## Makefile.am for the TeX Live subdirectory texk/kpathsea/man/
 ##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2019 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 man_sources = \
@@ -7,11 +9,7 @@
 	kpseaccess.man \
 	kpsereadlink.man \
 	kpsestat.man \
-	kpsewhich.man \
-	mktexlsr.man \
-	mktexmf.man \
-	mktexpk.man \
-	mktextfm.man
+	kpsewhich.man
 
 EXTRA_DIST = $(man_sources)
 
@@ -18,14 +16,3 @@
 KPATHSEA_PATHS_H = ${top_builddir}/..
 
 include $(top_srcdir)/../../am/man.am
-
-# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
-man1_links = \
-	mktexlsr:texhash
-
-include $(top_srcdir)/../../am/man1_links.am
-
-install-data-hook: install-man1-links
-
-uninstall-hook: uninstall-man1-links
-

Modified: branches/stable/source/src/texk/kpathsea/man/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/man/Makefile.in	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/man/Makefile.in	2020-02-18 19:11:23 UTC (rev 820)
@@ -159,8 +159,7 @@
 NROFF = nroff
 MANS = $(nodist_man1_MANS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../../am/man.am \
-	$(top_srcdir)/../../am/man1_links.am
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../../am/man.am
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -288,11 +287,7 @@
 	kpseaccess.man \
 	kpsereadlink.man \
 	kpsestat.man \
-	kpsewhich.man \
-	mktexlsr.man \
-	mktexmf.man \
-	mktexpk.man \
-	mktextfm.man
+	kpsewhich.man
 
 EXTRA_DIST = $(man_sources)
 KPATHSEA_PATHS_H = ${top_builddir}/..
@@ -303,16 +298,11 @@
 DVIS = $(man_files:.1=.dvi)
 PSS = $(man_files:.1=.ps)
 DISTCLEANFILES = sedscript $(man_files) $(DVIS) $(PSS)
-
-# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
-man1_links = \
-	mktexlsr:texhash
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .1 .man .ps .dvi
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -332,7 +322,7 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
-$(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am $(am__empty):
+$(top_srcdir)/../../am/man.am $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -488,8 +478,7 @@
 info-am:
 
 install-data-am: install-man
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
 install-dvi: install-dvi-am
 
 install-dvi-am:
@@ -533,24 +522,23 @@
 ps-am:
 
 uninstall-am: uninstall-man
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-data-am install-strip uninstall-am
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-hook install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-hook uninstall-man uninstall-man1
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-man \
+	uninstall-man1
 
 .PRECIOUS: Makefile
 
@@ -586,28 +574,7 @@
 
 .1.ps:
 	$(DITROFF) -Tps -man $< >$@
-.PHONY: install-man1-links uninstall-man1-links
 
-install-man1-links:
-	@cd $(DESTDIR)$(man1dir) && \
-	  for s in $(man1_links); do \
-	    link=`echo $$s | sed 's,.*:,,'`; \
-	    file=`echo $$s | sed 's,:.*,,'`; \
-	    rm -f $$link.1; \
-	    echo "creating link '$$link.1' -> '$$file.1'"; \
-	    echo ".so man1/$$file.1" >$$link.1; \
-	  done
-
-uninstall-man1-links:
-	@for s in $(man1_links); do \
-	  link=`echo $$s | sed 's,.*:,,'`; \
-	  rm -f $(DESTDIR)$(man1dir)/$$link.1; \
-	done
-
-install-data-hook: install-man1-links
-
-uninstall-hook: uninstall-man1-links
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Deleted: branches/stable/source/src/texk/kpathsea/man/mktexlsr.man
===================================================================
--- branches/stable/source/src/texk/kpathsea/man/mktexlsr.man	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/man/mktexlsr.man	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,44 +0,0 @@
-.TH MKTEXLSR 1 "1 March 2011" "Kpathsea @VERSION@"
-.\"=====================================================================
-.if n .ds MP MetaPost
-.if t .ds MP MetaPost
-.if n .ds MF Metafont
-.if t .ds MF M\s-2ETAFONT\s0
-.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
-.if n .ds TX TeX
-.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff
-.el .ds OX TeX for nroff
-.\" the same but obliqued
-.\" BX definition must follow TX so BX can use TX
-.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
-.if n .ds BX BibTeX
-.\" LX definition must follow TX so LX can use TX
-.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
-.if n .ds LX LaTeX
-.\"=====================================================================
-.SH NAME
-mktexlsr \- create ls-R databases
-.SH SYNOPSIS
-.B mktexlsr
-.RI [ directories ]
-.\"=====================================================================
-.SH DESCRIPTION
-This manual page is not meant to be exhaustive.  The complete
-documentation for this version of \*(TX can be found in the info file
-or manual
-.IR "Kpathsea: A library for path searching" .
-.PP
-.B mktexlsr
-is used to generate the ls-R databases used by the kpathsea library.
-It will create them for the specified directories, or for a default
-list if no directories are specified.
-.\"=====================================================================
-.SH OPTIONS
-.B mktexlsr
-accepts the following options:
-.TP
-.B --help
-Print help message and exit.
-.TP
-.B --version
-Print version information and exit.

Deleted: branches/stable/source/src/texk/kpathsea/man/mktexmf.man
===================================================================
--- branches/stable/source/src/texk/kpathsea/man/mktexmf.man	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/man/mktexmf.man	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,57 +0,0 @@
-.TH MKTEXMF 1 "1 March 2011" "Kpathsea @VERSION@"
-.\"=====================================================================
-.if n .ds MP MetaPost
-.if t .ds MP MetaPost
-.if n .ds MF Metafont
-.if t .ds MF M\s-2ETAFONT\s0
-.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
-.if n .ds TX TeX
-.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff
-.el .ds OX TeX for nroff
-.\" the same but obliqued
-.\" BX definition must follow TX so BX can use TX
-.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
-.if n .ds BX BibTeX
-.\" LX definition must follow TX so LX can use TX
-.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
-.if n .ds LX LaTeX
-.\"=====================================================================
-.SH NAME
-mktexmf \- create a Metafont source file
-.SH SYNOPSIS
-.B mktexmf
-.I font
-.\"=====================================================================
-.SH DESCRIPTION
-This manual page is not meant to be exhaustive.  The complete
-documentation for this version of \*(TX can be found in the info file
-or manual
-.IR "Kpathsea: A library for path searching" .
-.PP
-.B mktexmf
-is used to generate the \*(MF source file for
-.IR font ,
-if possible.  For example,
-.I ecrm1200
-or
-.IR cmr11 .
-.PP
-The name of the generated file is printed on standard output.
-.PP
-.B mktexmf
-is typically called by other programs, rather than from the command
-line.
-.\"=====================================================================
-.SH OPTIONS
-.B mktexmf
-accepts the following options:
-.TP
-.B --help
-Print help message and exit.
-.TP
-.B --version
-Print version information and exit.
-.\"=====================================================================
-.SH "SEE ALSO"
-.BR mktexpk (1),
-.BR mktextfm (1).

Deleted: branches/stable/source/src/texk/kpathsea/man/mktexpk.man
===================================================================
--- branches/stable/source/src/texk/kpathsea/man/mktexpk.man	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/man/mktexpk.man	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,115 +0,0 @@
-.TH MKTEXPK 1 "1 March 2011" "Kpathsea @VERSION@"
-.\"=====================================================================
-.if n .ds MP MetaPost
-.if t .ds MP MetaPost
-.if n .ds MF Metafont
-.if t .ds MF M\s-2ETAFONT\s0
-.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
-.if n .ds TX TeX
-.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff
-.el .ds OX TeX for nroff
-.\" the same but obliqued
-.\" BX definition must follow TX so BX can use TX
-.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
-.if n .ds BX BibTeX
-.\" LX definition must follow TX so LX can use TX
-.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
-.if n .ds LX LaTeX
-.\"=====================================================================
-.SH NAME
-mktexpk \- create a PK file for a font
-.SH SYNOPSIS
-.B mktexpk
-.RI [ options ]
-.I font
-.RI [ redirect ]
-.\"=====================================================================
-.SH DESCRIPTION
-This manual page is not meant to be exhaustive.  The complete
-documentation for this version of \*(TX can be found in the info file
-or manual
-.IR "Kpathsea: A library for path searching" .
-.PP
-.B mktexpk
-is used to generate a
-.I pk
-file from the \*(MF source files or type1 sources for
-.IR font ,
-if possible.
-.PP
-If
-.I redirect
-is given, it must be string of the form
-.BI >& n
-where
-.I n
-is the number of the file descriptor which is to receive, instead of
-standard output, the name of the generated file.
-.PP
-.B mktexpk
-is typically called by other programs, rather than from the command
-line.
-.\"=====================================================================
-.SH OPTIONS
-.B mktexpk
-accepts the following options:
-.TP
-.BI --bdpi \ num
-Set the base device resolution.
-.TP
-.BI --dpi \ num
-Generate the font at resolution
-.IR num .
-.TP
-.B --help
-Print help message and exit.
-.TP
-.BI --mag \ mag
-The \*(MF magnification that corresponds to the combination of
-.I bdpi
-and
-.I dpi
-that has been specified.
-.TP
-.BI --mfmode \ mode
-The \*(MF mode to use.
-.TP
-.BI --destdir \ dir
-A directory name. If the directory is absolute, it is used as-is.
-Otherwise, it is appended to the root destination directory set in the
-script.
-.TP
-.B --version
-Print version information and exit.
-.\"=====================================================================
-.SH BUGS
-If the
-.I mode
-is not specified,
-.B mktexpk
-tries to determine it from
-.IR bdpi .
-The manner in which this is done is primitive.  Since
-.I bpdi
-doesn't provide sufficient information to uniquely determine a
-.I mode
-it is strongly recommended that it be specified explicitly.
-.PP
-If the
-.I mode
-and
-.I bpdi
-don't match, the
-.I mode
-is discarded.
-.PP
-The
-.I dpi
-parameter is redundant, but is not checked for consistency.  Worse,
-the program will fail if the wrong
-.I dpi
-is specified.
-.\"=====================================================================
-.SH "SEE ALSO"
-.BR mktexmf (1),
-.BR mktextfm (1).

Deleted: branches/stable/source/src/texk/kpathsea/man/mktextfm.man
===================================================================
--- branches/stable/source/src/texk/kpathsea/man/mktextfm.man	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/man/mktextfm.man	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,65 +0,0 @@
-.TH MKTEXTFM 1 "1 March 2011" "Kpathsea @VERSION@"
-.\"=====================================================================
-.if n .ds MP MetaPost
-.if t .ds MP MetaPost
-.if n .ds MF Metafont
-.if t .ds MF M\s-2ETAFONT\s0
-.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
-.if n .ds TX TeX
-.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff
-.el .ds OX TeX for nroff
-.\" the same but obliqued
-.\" BX definition must follow TX so BX can use TX
-.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
-.if n .ds BX BibTeX
-.\" LX definition must follow TX so LX can use TX
-.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
-.if n .ds LX LaTeX
-.\"=====================================================================
-.SH NAME
-mktextfm \- create a TFM file for a font
-.SH SYNOPSIS
-.B mktextfm
-.RI [ options ]
-.I font
-.\"=====================================================================
-.SH DESCRIPTION
-This manual page is not meant to be exhaustive.  The complete
-documentation for this version of \*(TX can be found in the info file
-or manual
-.IR "Kpathsea: A library for path searching" .
-.PP
-.B mktextfm
-is used to generate a
-.I tfm
-file from the \*(MF source files for
-.IR font ,
-if possible.  If
-.I destdir
-is given, the generated file will be installed there, otherwise a
-(rather complicated) heuristic is used.
-.PP
-The name of the generated file is printed on standard output.
-.PP
-.B mktextfm
-is typically called by other programs, rather than from the command
-line.
-.\"=====================================================================
-.SH OPTIONS
-.B mktextfm
-accepts the following options:
-.TP
-.BI --destdir \ dir
-A directory name. If the directory is absolute, it is used as-is.
-Otherwise, it is appended to the root destination directory set in the
-script.
-.TP
-.B --help
-Print help message and exit.
-.TP
-.B --version
-Print version information and exit.
-.\"=====================================================================
-.SH "SEE ALSO"
-.BR mktexmf (1),
-.BR mktexpk (1).

Deleted: branches/stable/source/src/texk/kpathsea/mktex.cnf
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktex.cnf	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/mktex.cnf	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,18 +0,0 @@
-# $Id: mktex.cnf 12069 2009-02-04 00:09:54Z karl $
-# Public domain.
-# 
-# The mktex.cnf file, if it exists, can be used to tailor a setup to
-# local conditions.  If you use the mktex scripts, this file can contain
-# generic Bourne shell code.  However, the C (and other possible future)
-# implementations of the scripts do not handle anything beyond simple
-# assignment of variables, and so doing more is not recommended.
-#
-# To assign variables, use constructs like the examples below, which only
-# set unassigned variables.  The scripts may malfunction if you do
-# otherwise.
-#
-# Some examples of what you can use the mktex.cnf file for:
-# : ${MT_FEATURES=appendonlydir:varfonts}
-# : ${MODE=ljfour}
-# : ${BDPI=600}
-# : ${ps_to_pk=gsftopk}

Deleted: branches/stable/source/src/texk/kpathsea/mktex.opt
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktex.opt	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/mktex.opt	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,121 +0,0 @@
-# mktex.opt -- common mktex* options, etc.
-# Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set,
-# and optionally mt_min_args and/or mt_max_args.
-# 
-# Originally written by Thomas Esser.  Public domain.
-# $Id: mktex.opt 34656 2014-07-18 23:38:50Z karl $
- 
-if test "x$1" = x--help || test "x$1" = x-help; then
-  echo "$usage"
-  exit 0
-elif test "x$1" = x--version || test "x$1" = x-version; then
-  echo "$0 $version"
-  kpsewhich --version
-  exit 0
-elif test $# -lt ${mt_min_args-1}; then
-  echo "$0: Missing argument(s)." >&2
-  echo "Try \``basename $0` --help' for more information." >&2
-  exit 1
-elif test $# -gt ${mt_max_args-1}; then
-  num=$#
-  while test $# -gt `expr $num - ${mt_max_args-1}`; do shift; done
-  echo "$0: Extra arguments $*." >&2
-  echo "Try \``basename $0` --help' for more information." >&2
-  exit 1
-fi
-
-# MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
-# directories in path lists whereas Unix uses `:'.  Make an exception for
-# Cygwin, which pretends to be UNIX.
-# Create a variable that holds the right character to be used by the scripts.
-DOSISH=no
-case `uname -s` in
-  CYGWIN*|Cygwin*|cygwin*) ;;
-  *) if test -n "$COMSPEC" || test -n "$ComSpec"; then DOSISH=yes; fi
-esac
-if test "$DOSISH" = "no"; then SEP=':'; else SEP=';';fi
-
-# TEMPDIR needs to be unique to each process because of the possibility of two
-# people running dvips (or whatever) simultaneously.
-if test -n "$TMPDIR"; then
-  TEMPDIR="${TMPDIR}/mt$$.tmp"
-else
-  TEMPDIR="/tmp/mt$$.tmp"
-fi
-
-# We want to output only filenames to standard output, but it's too
-# error-prone to write the scripts that way, so we direct stdout here.
-STDOUT="$TEMPDIR/mt$$.out"
-
-# We will change search paths to include $KPSE_DOT. This is necessary
-# since we cd to $TEMPDIR.
-: ${KPSE_DOT=`pwd`}; export KPSE_DOT
-
-# Clean up on normal or abnormal exit.
-# The "cd /" is for MS-DOS and MS-Windows, where there is a separate
-# current directory on each drive, and therefore "cd $KPSE_DOT" might
-# still leave $TMPDIR current directory on its drive, in which case it
-# cannot be removed.
-trap 'rc=$?; cd /; cd "$KPSE_DOT"; test -f "$STDOUT" && cat "$STDOUT"; rm -rf "$TEMPDIR"; exit $rc' \
-  0 1 2 3 7 13 15
-
-(umask 077 && mkdir "$TEMPDIR") || exit 1
-cd "$TEMPDIR" || exit 1
-
-# The alternative location for fonts.  The directory need not exist,
-# so we use --expand-var here.  We also perform a sanity check.
-: ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`}
-if test -z "$MT_VARTEXFONTS"; then
-  echo "$0: VARTEXFONTS is not defined.  Defaulting to \`$KPSE_DOT'." >&2
-  MT_VARTEXFONTS='$KPSE_DOT'
-fi
-
-# The supporting scripts:
-: ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`}
-test -n "$MT_MKTEXNAM" || MT_MKTEXNAM="$MT_TEXMFMAIN/web2c/mktexnam"
-: ${MT_MKTEXNAM_OPT=`kpsewhich --format='web2c files' mktexnam.opt`}
-test -n "$MT_MKTEXNAM_OPT" || MT_MKTEXNAM_OPT="$MT_TEXMFMAIN/web2c/mktexnam.opt"
-: ${MT_MKTEXDIR=`kpsewhich --format='web2c files' mktexdir`}
-test -n "$MT_MKTEXDIR" || MT_MKTEXDIR="$MT_TEXMFMAIN/web2c/mktexdir"
-: ${MT_MKTEXDIR_OPT=`kpsewhich --format='web2c files' mktexdir.opt`}
-test -n "$MT_MKTEXDIR_OPT" || MT_MKTEXDIR_OPT="$MT_TEXMFMAIN/web2c/mktexdir.opt"
-: ${MT_MKTEXUPD=`kpsewhich --format='web2c files' mktexupd`}
-test -n "$MT_MKTEXUPD" || MT_MKTEXUPD="$MT_TEXMFMAIN/web2c/mktexupd"
-
-# mktexupd and mktexlsr make sure they're coordinated via this.  A copy of
-# the first string is found in mktexlsr.
-ls_R_magic='% ls-R -- filename database for kpathsea; do not change this line.'
-# Old ls-R files should continue to work.
-old_ls_R_magic='% ls-R -- maintained by MakeTeXls-R; do not change this line.'
-
-# Read defaults from mktex.cnf if that file exists. Can be used to
-# overwrite anything defined below. Please use the same syntax as
-# given here (e.g. ``: ${MODE=ljfour}'', not just ``MODE=ljfour'', as
-# this can cause trouble (e.g. when the mode for mktexnam is
-# already specified on the command line).
-: ${MT_MKTEX_CNF=`kpsewhich --format='web2c files' mktex.cnf`}
-test -n "$MT_MKTEX_CNF" && test -r "$MT_MKTEX_CNF" && . "$MT_MKTEX_CNF"
-
-# Possible features: appendonlydir dosnames fontmaps nomfdrivers nomode
-#                    stripsupplier striptypeface texmfvar varfonts.
-if test "$DOSISH" = "yes"; then
-  : ${MT_FEATURES=appendonlydir:dosnames}
-else
-  : ${MT_FEATURES=appendonlydir}
-fi
-: ${MODE=ljfour}
-: ${BDPI=600}
-: ${DPI=600}
-: ${MAG=1.0}
-: ${ps_to_pk=gsftopk} # some prefer ps2pk
-
-# Allow fonts to be read and written (especially in case we make
-# directories) by everyone.
-umask 0
-
-# Cache values that may be useful for recursive calls.
-export MT_MKTEX_OPT MT_MKTEX_CNF 
-export MT_MKTEXNAM MT_MKTEXNAM_OPT
-export MT_MKTEXDIR MT_MKTEXDIR_OPT
-export MT_MKTEXUPD
-export MT_TEXMFMAIN MT_VARTEXFONTS

Deleted: branches/stable/source/src/texk/kpathsea/mktexdir
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktexdir	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/mktexdir	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,76 +0,0 @@
-#!/bin/sh
-# mktexdir (was mkinstalldirs) -- make directory hierarchy.
-# Author: Noah Friedman <friedman at prep.ai.mit.edu>, created: 1993-05-16.
-# Public domain.
-# 
-# Modified for sticky directory creation, --help, --version, more,
-# by Thomas Esser, Karl Berry, Olaf Weber, et al.
-# Maintained as part of TeX Live, http://tug.org/tex-live.
-
-version='$Id: mktexdir 42425 2016-11-02 21:34:11Z karl $'
-progname=`echo $0 | sed 's%.*/%%'`
-
-# preferentially use subprograms from our own directory.
-mydir=`echo "$0" | sed 's,/[^/]*$,,'`
-mydir=`cd "$mydir" && pwd`
-PATH="$mydir:$PATH"; export PATH
-
-usage="Usage: $0 DIR...
-  Create each DIR, including any missing leading directories."
-mt_max_args=$#
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
-  echo "$0: Cannot find mktex.opt; check your installation." >&2
-  exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-test -n "$MT_MKTEXDIR_OPT" && . "$MT_MKTEXDIR_OPT"
-
-test -z "$MT_APPEND_MASK" && MT_APPEND_MASK="="
-
-errstatus=0
-
-for file
-do
-   case $file in
-     /*) cd /;;
-     *) cd $KPSE_DOT;;
-   esac
-   OLDIFS=$IFS; IFS=/; set fnord `echo "./$file"`; IFS=$OLDIFS; shift
-
-   pathcomp=
-   for d
-   do
-     test -z "$d" && continue
-     pathcomp="$pathcomp$d"
-
-     if test ! -d "./$pathcomp"; then
-        # This shell stuff is not atomic, therefore ./$pathcomp
-        # may have been created in another process and this mkdir will
-        # fail despite the above test, so do it silently:
-        mkdir "./$pathcomp" >/dev/null 2>&1
-        
-        # So, if ./$pathcomp is a directory now, call it good.
-        if test ! -d "./$pathcomp"; then
-          # Otherwise, presumably it's a real error.  Do the mkdir again
-          # and let the error be seen, and quit the loop.
-          # (Report at https://bugs.debian.org/794228.)
-          mkdir "./$pathcomp" || { errstatus=$?; break; }
-        fi
-        chmod `kpsestat ${MT_APPEND_MASK} "$pathcomp"/..` "./$pathcomp"
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# P.S. We don't want to rely on mkdir -p, because of possible
-# portability programs. See current mkinstalldirs source (in Automake).

Deleted: branches/stable/source/src/texk/kpathsea/mktexdir.opt
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktexdir.opt	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/mktexdir.opt	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,11 +0,0 @@
-# mktexdir.opt to determine various manipulations of the filenames.
-# Sourced from mktexdir.
-# 
-# Originally written by Thomas Esser.
-# Public domain.
-# $Id: mktexdir.opt 16497 2009-12-24 18:38:47Z karl $
-
-# Set append-only bit on created directories.
-case "$MT_FEATURES" in
-  *appendonlydir*) MT_APPEND_MASK=+t;;
-esac

Deleted: branches/stable/source/src/texk/kpathsea/mktexlsr
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktexlsr	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/mktexlsr	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,238 +0,0 @@
-#!/bin/sh
-# original mktexlsr -- create or rebuild ls-R.
-# 
-# (If you change or delete the word `original' on the previous line,
-# installation won't write this script over yours.)
-#
-# Suitable for calling from cron, as in:
-# 0 * * * * cd /your/texmf/root && /usr/local/texlive/bin/mktexlsr
-# 
-# Originally written as `texhash' by Thomas Esser, Okt., 1994.
-# Public domain.
-
-version='$Id: mktexlsr 46343 2018-01-17 00:55:32Z preining $'
-progname=`echo $0 | sed 's%.*/%%'`
-
-usage="Usage: $progname [OPTION]... [DIR]...
-
-Rebuild ls-R filename databases used by TeX.  If one or more arguments
-DIRS are given, these are used as the directories in which to build
-ls-R. Else all directories in the search path for ls-R files
-(\$TEXMFDBS) are used.
-
-Options:
-  --dry-run  do not actually update anything
-  --help     display this help and exit 
-  --quiet    cancel --verbose
-  --silent   same as --quiet
-  --verbose  explain what is being done
-  --version  output version information and exit
-  
-If standard input is a terminal, --verbose is on by default.
-
-For more information, see the \`Filename database' section of
-Kpathsea manual available at http://tug.org/kpathsea.
-
-Report bugs to: tex-k at tug.org
-TeX Live home page: <http://tug.org/texlive/>
-"
-
-# The simple PATH-prepending approach we take in other scripts doesn't
-# handle DOS/Windows, but we don't use the shell scripts on Windows
-# anyway, and does anyone want current TL on DOS or DJGPP?  Maybe they
-# can maintain their own changes if so.  Leaving this code though, since
-# it's always been here ...
-
-# MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
-# directories in path lists whereas Unix uses `:'.  Make an exception for
-# Cygwin, which pretends to be UNIX.
-# Create a variable that holds the right character to be used by the scripts.
-DOSISH=no
-case `uname -s` in
-  CYGWIN*|Cygwin*|cygwin*) ;;
-  *) if test -n "$COMSPEC" || test -n "$ComSpec"; then DOSISH=yes; fi
-esac
-if test "$DOSISH" = "no"; then SEP=':'; else SEP=';';fi
-
-# Add the location of the script to the PATH if necessary.  This must
-# be done before kpsewhich can be called, and thus cannot be put into
-# mktex.opt.
-dirname=`echo $0 | sed 's%/*[^/][^/]*$%%'`
-case $dirname in
-  "") # Do nothing
-      ;;
-  /* | [A-z]:/*) # Absolute name
-      PATH="$dirname$SEP$PATH"
-      export PATH ;;
-   *)  # Relative name
-      PATH="`pwd`/$dirname$SEP$PATH"
-      export PATH ;;
-esac
-
-if tty -s; then verbose=true; else verbose=false; fi
-dry_run=false
-trees=
-
-# initialize treefile by either mktemp or some random name
-# code taken from pdfjam and adjusted
-{
-  treefile=`
-    (umask 077 && mktemp "${TMPDIR-/tmp}/mktexlsrtrees.XXXXXXXXXX") 2>/dev/null
-  ` && test -n "$treefile" && test -f "$treefile"
-} || {
-  ##  We'll use awk to make random number, for portability
-  random=`awk 'END { srand(); printf ("%d\n", rand()*1000000); }' /dev/null`
-  treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.$random"
-} || exit $?
-
-trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
-      exit' 0 1 2 3 7 13 15
-
-# A copy of some stuff from mktex.opt, so we can run in the presence of
-# terminally damaged ls-R files.
-while test $# -gt 0; do
-  if test "x$1" = x--help || test "x$1" = x-help; then
-    echo "$usage"
-    exit 0
-  elif test "x$1" = x--version || test "x$1" = x-version; then
-    echo "`basename $0` $version"
-    kpsewhich --version
-    exit 0
-  elif test "x$1" = x--verbose || test "x$1" = x-verbose; then
-    verbose=true
-  elif test "x$1" = x--dry-run || test "x$1" = x-n; then
-    dry_run=true
-  elif test "x$1" = x--quiet || test "x$1" = x--silent \
-       || test "x$1" = x-quiet || test "x$1" = x-silent ; then
-    verbose=false
-  elif test "x$1" = x--; then
-    :
-  elif echo "x$1" | grep '^x-' >/dev/null; then
-    echo "$progname: unknown option \`$1', try --help if you need it." >&2
-    exit 1
-  else
-    if test ! -d "$1"; then
-      echo "$progname: $1: not a directory, skipping." >&2
-      shift
-      continue
-    fi
-    # By saving the argument in a file, we can later get it back while
-    # supporting spaces in the name.  This still doesn't support
-    # newlines in the directory names, but nobody ever complains about
-    # that, and it seems much too much trouble to use \0 terminators.
-    (umask 077
-    if echo "$1" >>"$treefile"; then :; else
-      echo "$progname: $treefile: could not append to arg file, goodbye." >&2
-      exit 1
-    fi
-    )
-  fi
-  shift
-done
-
-# mktexupd and mktexlsr make sure they're coordinated via this.  A copy
-# is found mktex.opt.
-ls_R_magic='% ls-R -- filename database for kpathsea; do not change this line.'
-# The old string, which should continue to work.
-old_ls_R_magic='% ls-R -- maintained by MakeTeXls-R; do not change this line.'
-
-{
-  # Get list of directories from the explicit arguments (now saved in
-  # $treefile), or $TEXMFDBS if no explicit args.  Eliminate duplicates.
-  saveIFS=$IFS  # break only at newline
-  IFS='
-'
-  if test -s "$treefile"; then
-    set x `sort "$treefile" | uniq`
-  else
-    set x `kpsewhich --show-path=ls-R | tr : '
-' | sort | uniq`
-  fi
-  IFS=$saveIFS
-  shift
-}
-
-for TEXMFLS_R in "$@"; do
-  # Prepend cwd if the directory was relative.
-  case "$TEXMFLS_R" in
-  "") continue ;;  # Strictly speaking, it is an error if this case is taken.
-  /* | [A-z]:/*) ;;
-  *)  TEXMFLS_R="`pwd`/$TEXMFLS_R"
-  esac
-  # Allow for either ls-R and ls-r to exist.  But create ls-R if we're
-  # working from scratch.
-  if test -f "$TEXMFLS_R/ls-R"; then
-    db_file="$TEXMFLS_R/ls-R"
-  elif test -f "$TEXMFLS_R/ls-r"; then
-    db_file="$TEXMFLS_R/ls-r"
-  else
-    db_file="$TEXMFLS_R/ls-R"
-  fi
-  # Follow a possible symlink to get the right filesystem. 
-  # The '|| true' construct prevents an sh -e aborting.
-  db_readlink=`kpsereadlink "$TEXMFLS_R/ls-R" 2>/dev/null` || true
-  case "$db_readlink" in
-  "") ;;
-  /* | [A-z]:/*) db_file="$db_readlink" ;;
-  *)  db_file="$TEXMFLS_R/$db_readlink"
-  esac
-  db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
-
-  # want to be silent if the directory doesn't exist, since the ls-R
-  # path ordinarily contains many nonexistent directories.
-  test -d "$db_dir" || continue
-  test -w "$db_dir" || { echo "$progname: $db_dir: directory not writable. Skipping..." >&2; continue; }
-
-  if test ! -f "$db_file"; then
-    cp /dev/null "$db_file"
-    # Use same permissions as parent directory, minus x,s, or t bits.
-    chmod `kpsestat -xst "$db_dir"` "$db_file"
-  elif test -s "$db_file" \
-       && test "x`sed '1s/
-$//;1q' \"$db_file\"`" != "x$ls_R_magic" \
-       && test "x`sed '1s/
-$//;1q' \"$db_file\"`" != "x$old_ls_R_magic"; then
-    echo "$progname: $db_file: no magic string, skipping..." >&2
-    continue
-  fi
-
-  # Skip if we cannot write the file:
-  kpseaccess -w "$db_file" || { echo "$progname: $db_file: no write permission, skipping..." >&2; continue; }
-
-  db_dir_tmp="$db_dir/lsR$$.tmp"
-  (umask 077 && mkdir "$db_dir_tmp" ) \
-    || { echo "$progname: $db_dir_tmp: could not create directory, skipping..." >&2; continue; }
-  db_file_tmp="$db_dir_tmp/lsR$$.tmp"
-  rm -f "$db_file_tmp"
-
-  $verbose && echo "$progname: Updating $db_file... "
-  $dry_run && continue
-  
-  echo "$ls_R_magic" >"$db_file_tmp"
-
-  # The main task. We put ./: in the output, so top-level files can be
-  # found via ls-R. Probably irrelevant in practice.  The sed command
-  # inserts the leading ./ for directory names, and removes ., .., and
-  # version control entries from the list.  Also omit contents of any
-  # the version directories; sed apparently requires that we do that
-  # operation in a separate invocation.  We do not try to support colons
-  # in directory names.
-  # 
-  echo "./:" >>"$db_file_tmp"
-  vc_dirs='\.\(bzr\|git\|hg\|svn\)\|_darcs'
-  (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) \
-   | sed -e '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^'$vc_dirs'$/d;' \
-         -e '/^[\.\/]*lsR[0-9]*\.tmp:*$/d' \
-   | sed -e /$vc_dirs'.*:$/,/^$/d' \
-   >>"$db_file_tmp"
-
-  # To be really safe, a loop.
-  until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
-  chmod $PERMS "$db_file_tmp"
-  rm -f "$db_file"
-  mv "$db_file_tmp" "$db_file"
-  rm -rf "$db_dir_tmp"
-done
-
-$verbose && echo "$progname: Done."
-exit 0

Deleted: branches/stable/source/src/texk/kpathsea/mktexmf
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktexmf	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/mktexmf	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,151 +0,0 @@
-#!/bin/sh
-# original mktexmf -- make a new MF file, because one wasn't found.
-# 
-# (If you change or delete the word `original' on the previous line,
-# installation won't write this script over yours.)
-# 
-# Originally written by Thomas Esser.
-# Public domain.
-
-version='$Id: mktexmf 34656 2014-07-18 23:38:50Z karl $'
-
-# preferentially use subprograms from our own directory.
-mydir=`echo "$0" | sed 's,/[^/]*$,,'`
-mydir=`cd "$mydir" && pwd`
-PATH="$mydir:$PATH"; export PATH
-
-usage="Usage: $0 FONT.
-
-Makes the Metafont source file for FONT, if possible. For example,
-\`ecr12' or \`cmr11'.
-
-Report bugs to: tex-k at tug.org
-TeX Live home page: <http://tug.org/texlive/>
-"
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
-  echo "$progname: Cannot find mktex.opt; check your installation." >&2
-  exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-(
-# See comments in mktexpk.
-name="`echo $1 | sed 's%.*/%%; s%\.mf$%%'`"
-rootname=`echo "$name" | sed 's/[0-9]*$//'`
-pointsize=`echo "$name" | sed "s/^$rootname//"`
-
-sauterroot=`kpsewhich b-$rootname.mf 2>/dev/null`
-if test -n "$sauterroot"; then
-  rootfile=$sauterroot
-  rootname=b-$rootname
-else
-  case $name in
-    # csso12[0-5][0-9] from CJK package; unsupported by mktexmf
-    csso12[0-5][0-9])
-      rootfile=;;
-    *)
-      case $rootname in
-        cs*|lcsss*|icscsc*|icstt*|ilcsss*)
-          rootfile=`kpsewhich cscode.mf`;;
-        wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
-          lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'`
-          rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;;
-        *)
-          rootfile=`kpsewhich $rootname.mf 2>/dev/null`;;
-      esac;;
-  esac
-fi
-{ test -z "$rootfile" || test ! -f "$rootfile"; } && exit 1
-
-#if test -z "$MT_MFNAME"; then
-OIFS=$IFS; IFS=$SEP
-set x `"$MT_MKTEXNAM" $name`; shift
-IFS=$OIFS
-MT_MFNAME="$3"
-#fi
-
-destdir=`echo "$MT_MFNAME" | sed 's%/[^/][^/]*$%%'`
-test -d "$destdir" || "$MT_MKTEXDIR" "$destdir" || exit 1
-cd "$destdir" || exit 1
-
-case "$pointsize" in
-  "") echo "$progname: no pointsize."; exit 1;;
-  11) realsize=10.95;;      # \magstephalf
-  14) realsize=14.4;;  # \magstep2
-  17) realsize=17.28;; # \magstep3
-  20) realsize=20.74;; # \magstep4
-  25) realsize=24.88;; # \magstep5
-  30) realsize=29.86;; # \magstep6
-  36) realsize=35.83;; # \magstep7
-        # The new convention is to have three or four letters for the
-        # font name and four digits for the pointsize. The number is
-        # pointsize * 100. We effectively divide by 100 by ignoring the
-        # last two digits.
-  ????|?????) realsize=`echo "$pointsize" | sed 's/\(..\)$/.\1/'`;;
-  *) realsize="$pointsize";;
-esac
-
-mfname="$name.mf"
-if test -r "$mfname"; then
-  echo "$progname: $destdir/$mfname already exists."
-  echo "$destdir/$mfname" >$STDOUT
-  "$MT_MKTEXUPD" "$destdir" "$mfname"
-  exit 0
-fi
-
-case "$name" in
-  ec*|tc*)
-    cat > "mf$$.tmp" <<END
-if unknown exbase: input exbase fi;
-gensize:=$realsize;
-generate $rootname;
-END
-    ;;
-  dc*)
-    cat > "mf$$.tmp" <<END
-if unknown dxbase: input dxbase fi;
-gensize:=$realsize;
-generate $rootname;
-END
-    ;;
-  cs*|lcsss*|icscsc*|icstt*|ilcsss*)
-    cat > "mf$$.tmp" <<END
-input cscode
-use_driver;
-END
-    ;;
-  wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]*|l[abcdhl][bcdfiorstuvx]*)
-    cat > "mf$$.tmp" <<END
-input fikparm;
-END
-    ;;
-  g[lmorst][bijmtwx][cilnoru]*)
-    # A small superset of the names of the cbgreek fonts.
-    cat > "mf$$.tmp" <<END
-% generated by mktexmf
-input cbgreek;
-END
-    ;;
-  *)
-    cat > "mf$$.tmp" <<END
-design_size := $realsize;
-input $rootname;
-END
-    ;;
-esac
-
-chmod `kpsestat -xst,go-w .` "mf$$.tmp"
-rm -f "$mfname"
-mv "mf$$.tmp" "$mfname"
-
-echo "$destdir/$mfname" >$STDOUT
-echo "$progname: $destdir/$mfname: successfully generated." >&2
-"$MT_MKTEXUPD" "$destdir" "$mfname"
-exit 0
-) 1>&2 </dev/null

Deleted: branches/stable/source/src/texk/kpathsea/mktexnam
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktexnam	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/mktexnam	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,229 +0,0 @@
-#!/bin/sh
-# maketexnam -- find PK and TFM names.
-# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
-# Public domain.
-
-version='$Id: mktexnam 34656 2014-07-18 23:38:50Z karl $'
-
-# preferentially use subprograms from our own directory.
-mydir=`echo "$0" | sed 's,/[^/]*$,,'`
-mydir=`cd "$mydir" && pwd`
-PATH="$mydir:$PATH"; export PATH
-
-usage="Usage: $0 NAME [DPI MODE] [DESTDIR].
-  Output the PK, TFM, and MF names for a font NAME.
-
-Report bugs to: tex-k at tug.org
-TeX Live home page: <http://tug.org/texlive/>
-"
-mt_max_args=4
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
-  echo "$0: Cannot find mktex.opt; check your installation." >&2
-  exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-NAME=$1
-case $# in
-  1|2) DPI=$BDPI; DEST=$2;;
-  3|4) DPI=$2; MODE=$3; DEST=$4;;
-    *) help;;
-esac
-
-: ${MT_PKDESTDIR='$MT_DESTROOT/$MT_PKDESTREL'}
-: ${MT_TFMDESTDIR='$MT_DESTROOT/$MT_TFMDESTREL'}
-: ${MT_MFDESTDIR='$MT_DESTROOT/$MT_MFDESTREL'}
-: ${MT_PKBASE='$NAME.${DPI}pk'}
-: ${MT_TFMBASE='$NAME.tfm'}
-: ${MT_MFBASE='$NAME.mf'}
-: ${MT_DEFAULT_SUPPLIER=unknown}
-: ${MT_DEFAULT_TYPEFACE=unknown}
-: ${MT_DEFAULT_NAMEPART='$MT_SUPPLIER/$MT_TYPEFACE'}
-: ${MT_DEFAULT_PKDESTREL='pk/modeless/$MT_NAMEPART'}
-: ${MT_DEFAULT_TFMDESTREL='tfm/$MT_NAMEPART'}
-: ${MT_DEFAULT_MFDESTREL='source/$MT_NAMEPART'}
-: ${MT_DEFAULT_DESTROOT=$KPSE_DOT}
-
-# Find the font: test tfm first, then mf, then possible sauterized mf.
-fullname=`kpsewhich "$NAME.tfm" 2>/dev/null`
-test -z "$fullname" && fullname=`kpsewhich "$NAME.mf" 2>/dev/null`
-if test -z "$fullname"; then
-  rootname=`echo $NAME | sed 's/[0-9]*$//'`
-  fullname=`kpsewhich "b-$rootname.mf" 2>/dev/null`
-  # LH fonts get special treatment:
-  if test -z "$fullname"; then
-    case $rootname in
-      # Czech/Slovak fonts get special treatment:
-      cs*|lcsss*|icscsc*|icstt*|ilcsss*)
-           fullname=`kpsewhich cscode.mf`
-           ;;
-      # LH fonts get special treatment:
-      wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
-           lhprefix=`echo $NAME | sed 's/^\(..\).*/\1/'`
-           fullname=`kpsewhich "${lhprefix}codes.mf" 2>/dev/null`;;
-      *)   fullname=`kpsewhich "$rootname.mf" 2>/dev/null`
-           ;;
-    esac
-  fi
-fi
-
-# After all this, do we _have_ a font?
-if test -z "$fullname"; then
-  : ${MT_DESTROOT="$MT_VARTEXFONTS"}
-else
-  # Normalize $fullname.
-  fullname=`echo "$fullname" | sed 's%//*%/%g'`
-  # See if $fullname comes from a standard location.
-  OIFS=$IFS;IFS=$SEP
-  set x `kpsewhich --expand-path='$TEXMF/fonts'"$SEP$MT_VARTEXFONTS"`
-  shift; IFS=$OIFS
-  for i
-  do
-    test -z "$i" && continue
-    case "$fullname" in
-      $i/*)
-         # We now have a preliminary value for the destination root.
-         : ${MT_DESTROOT="$i"}
-         # When we're done, relfmt contains one of these:
-         # "/source/$MT_NAMEPART/"
-         # "/$MT_NAMEPART/source/"
-         # while namepart contains the actual namepart.
-         relfmt=`echo "$fullname" | \
-           sed -e 's%^'"$i"'\(/.*/\)[^/]*$%\1%' \
-               -e 's%^/tfm/%/source/%' \
-               -e 's%/tfm/$%/source/%'`
-         namepart=`echo "$relfmt" | sed -e 's%/source/%/%'`
-         # See if namepart is empty.
-         if test "$namepart" != "/"; then
-           relfmt=`echo "$relfmt" | \
-             sed -e 's%'"$namepart"'%/$MT_NAMEPART/%'`
-         else
-           # Assume TDS.
-           relfmt='/source/$MT_NAMEPART/'
-           namepart=''
-         fi
-         # Determine supplier and typeface from namepart.  If there is
-         # only one part in the namepart, we take it to be the typeface.
-         MT_SUPPLIER=`echo $namepart | sed 's%^/\([^/]*\)/\(.*\)$%\1%'`
-         MT_TYPEFACE=`echo $namepart | sed 's%^/\([^/]*\)/\(.*\)$%\2%'`
-         if test -z "$MT_TYPEFACE"; then
-           MT_TYPEFACE="$MT_SUPPLIER";
-           MT_SUPPLIER=''
-         fi
-         # Phew.  Now we create the relative paths for pk, tfm and source.
-         : ${MT_NAMEPART='$MT_SUPPLIER/$MT_TYPEFACE'}
-         : ${MT_PKDESTREL=`echo "$relfmt" | sed 's%/source/%/pk/$MT_MODE/%'`}
-         : ${MT_TFMDESTREL=`echo "$relfmt" | sed 's%/source/%/tfm/%'`}
-         : ${MT_MFDESTREL=`echo "$relfmt"`}
-         break
-    esac
-  done
-fi
-
-# In case some variables remain unset.
-: ${MT_SUPPLIER=$MT_DEFAULT_SUPPLIER}
-: ${MT_TYPEFACE=$MT_DEFAULT_TYPEFACE}
-: ${MT_NAMEPART=$MT_DEFAULT_NAMEPART}
-: ${MT_PKDESTREL=$MT_DEFAULT_PKDESTREL}
-: ${MT_TFMDESTREL=$MT_DEFAULT_TFMDESTREL}
-: ${MT_MFDESTREL=$MT_DEFAULT_MFDESTREL}
-
-# We have found nothing, so force using the fontmaps as a last resort.
-# This also means mktexnam can be queried for advice on where to
-# place fonts.
-if test "x$MT_SUPPLIER" = xunknown \
-  || test "x$MT_TYPEFACE" = xunknown; then
-    MT_FEATURES="$MT_FEATURES:fontmaps"
-fi
-
-# Handle the options.
-test -n "$MT_MKTEXNAM_OPT" && . "$MT_MKTEXNAM_OPT"
-
-# Adjust MT_DESTROOT, if necessary.
-if test -n "${MT_DESTROOT}"; then
-  # We distinguish system trees from the rest.
-  systexmf="`kpsewhich --expand-path='{$SYSTEXMF}/fonts'`$SEP$MT_VARTEXFONTS"
-  case "$SEP$systexmf$SEP" in
-    *$SEP$MT_DESTROOT$SEP*) # A system tree.
-      # If the texmfvar option is set, use TEXMFVAR tree.
-      # Some additional uglyness handles the case where $TEXMFVAR exists
-      # but $TEXMFVAR/fonts doesn't (yet).
-      if test "x$USE_TEXMFVAR" = x1; then
-        : ${MT_TEXMFVAR=`kpsewhich --var-value=TEXMFVAR`}
-        MT_DESTROOT=$MT_TEXMFVAR/fonts
-        if test -z "$MT_TEXMFVAR"; then
-          # Path expansion of $TEXMFVAR was empty.
-          FALLBACK=1
-        elif test -d "$MT_DESTROOT"; then
-          # Do we have write access and permission?
-          kpseaccess -w "$MT_DESTROOT" || FALLBACK=1
-          test -w "$MT_DESTROOT" || FALLBACK=1
-        elif test -d "$MT_TEXMFVAR"; then
-          # De we have write access and permission?
-          kpseaccess -w "$MT_TEXMFVAR" || FALLBACK=1
-          test -w "$MT_TEXMFVAR" || FALLBACK=1
-        elif test -e "$MT_TEXMFVAR"; then
-          # TEXMFVAR defined and exists, but it is not a directory?
-          FALLBACK=1
-        else
-          # TEXMFVAR defined but does not exist, try to create it
-          MT_FEATURES=none "$MT_MKTEXDIR" "$MT_TEXMFVAR" || FALLBACK=1
-        fi
-      else
-        # Do we have write access and permission?
-        kpseaccess -w "$MT_DESTROOT" || FALLBACK=1
-        test -w "$MT_DESTROOT" || FALLBACK=1
-      fi
-      # Fall back on VARTEXFONTS if the varfonts option is set, or
-      # we cannot write in the given tree.
-      if test "x$USE_VARTEXFONTS" = x1 || test "x$FALLBACK" = x1; then
-        MT_DESTROOT=$MT_VARTEXFONTS
-      fi ;;
-    *) # A non-system tree.
-      # Do we have write access and permission?
-      kpseaccess -w "$MT_DESTROOT" || FALLBACK=1
-      test -w "$MT_DESTROOT" || FALLBACK=1
-      # If we cannot write fall back of defaults.
-      test "x$FALLBACK" = x1 && MT_DESTROOT=;;
-  esac
-fi
-
-if test -z "$MT_DESTROOT"; then
-  MT_DESTROOT=$MT_DEFAULT_DESTROOT
-  MT_PKDESTDIR=$MT_DEFAULT_DESTROOT
-  MT_TFMDESTDIR=$MT_DEFAULT_DESTROOT
-  MT_MFDESTDIR=$MT_DEFAULT_DESTROOT
-fi
-
-case "$DEST" in
-  "") ;;
-  /* | [A-z]:/*) # Absolute, explicit destdir => use it.
-      MT_PKDESTDIR=$DEST
-      MT_TFMDESTDIR=$DEST
-      MT_MFDESTDIR=$DEST
-      MT_NAMEPART=;;
-   *) # Relative destdir => append to the default.
-      MT_NAMEPART=$DEST;;
-esac
-
-eval MT_MODE=\"$MODE\"
-eval MT_NAMEPART=\"$MT_NAMEPART\"
-eval MT_DESTROOT=\"$MT_DESTROOT\"
-eval MT_PKDESTREL=\"$MT_PKDESTREL\"
-eval MT_TFMDESTREL=\"$MT_TFMDESTREL\"
-eval MT_MFDESTREL=\"$MT_MFDESTREL\"
-eval MT_PKDESTDIR=\"$MT_PKDESTDIR\"
-eval MT_TFMDESTDIR=\"$MT_TFMDESTDIR\"
-eval MT_MFDESTDIR=\"$MT_MFDESTDIR\"
-eval MT_PKNAME=\"$MT_PKDESTDIR/$MT_PKBASE\"
-eval MT_TFMNAME=\"$MT_TFMDESTDIR/$MT_TFMBASE\"
-eval MT_MFNAME=\"$MT_MFDESTDIR/$MT_MFBASE\"
-
-echo "$MT_PKNAME$SEP$MT_TFMNAME$SEP$MT_MFNAME" | sed 's%//*%/%g'
-

Deleted: branches/stable/source/src/texk/kpathsea/mktexnam.opt
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktexnam.opt	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/mktexnam.opt	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,107 +0,0 @@
-# mktexnam.opt to determine various manipulations of the filenames.
-# Sourced from mktexnam.
-# 
-# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
-# Public domain.
-# $Id: mktexnam.opt 18383 2010-05-20 18:31:24Z karl $
-
-# Get 8.3 filenames like dpiNNN/NAME.pk.
-case "$MT_FEATURES" in
-  *dosnames*) MT_PKBASE='dpi$DPI/$NAME.pk';;
-esac
-
-# Omit the mode directory (e.g., ljfour):
-case "$MT_FEATURES" in
-  *nomode*) MODE="";;
-esac
-
-###########################################################################
-# Use this feature if you wish to use the alias files from the 
-# ftp://ftp.tug.org/tex/fontname.tar.gz distribution.
-###########################################################################
-case "$MT_FEATURES" in
-*fontmaps*)
-    MT_NAMEPART='$MT_SUPPLIER/$MT_TYPEFACE'
-    MT_PKDESTREL='pk/$MT_MODE/$MT_NAMEPART'
-    MT_TFMDESTREL='tfm/$MT_NAMEPART'
-    MT_MFDESTREL='source/$MT_NAMEPART'
-    SPECIALMAP=`kpsewhich special.map`
-    TYPEFACEMAP=`kpsewhich typeface.map`
-    SUPPLIERMAP=`kpsewhich supplier.map`
-    if test -r "$SPECIALMAP"; then
-      set x `awk \
-    '{if ($1 == NAME || (substr (NAME, 1, length ($1)) == $1 \
-                      && substr (NAME, length (NAME), 1) ~ /[0-9]/ \
-                      && substr ($1, length ($1), 1) ~ /[^0-9]/)) \
-     { print $2 " " $3; exit; }}' NAME=$NAME "$SPECIALMAP"`
-      shift; SUPPLIER=$1; TYPEFACE=$2
-    
-      if test -z "$SUPPLIER"; then
-        # Try the normal case. Source first.
-        # $NAME might be raw.
-        name=`echo $NAME | sed 's/^r//'`
-        s_abbrev=`echo $name | sed 's/^\(.\).*$/\1/'`
-        SUPPLIER=`awk '{ if ($1 == s_abbrev) { print $2; exit; }}' \
-                   s_abbrev=$s_abbrev "$SUPPLIERMAP"`
-        if test -n "$SUPPLIER"; then
-          # We found the source. Try for the typeface.
-          t_abbrev=`echo $name | sed 's/^.//;s/\(..\).*$/\1/'`
-          TYPEFACE=`awk '{ if ($1 == t_abbrev) { print $2; exit; }}' \
-                       t_abbrev=$t_abbrev "$TYPEFACEMAP"`
-        fi
-      fi
-    fi
-    
-    if test -z "$SUPPLIER"; then
-      echo "$0: Could not map source abbreviation $s_abbrev for $NAME." >&2
-      echo "$0: Need to update $SPECIALMAP?" >&2
-    else
-      MT_SUPPLIER="$SUPPLIER"
-      if test -z "$TYPEFACE"; then
-        echo "$0: Could not map typeface abbreviation $t_abbrev for $NAME." >&2
-        echo "$0: Need to update $SPECIALMAP?" >&2
-      else
-        MT_TYPEFACE="$TYPEFACE"
-      fi
-    fi
-esac
-
-###########################################################################
-# Use this feature to strip the "supplier" part (e.g. ams)
-# of the target name:
-###########################################################################
-
-case "$MT_FEATURES" in
-*stripsupplier*)
-    MT_SUPPLIER=""
-esac
-
-###########################################################################
-# Use this feature to strip the "typeface" part (e.g. euler)
-# of the target name:
-###########################################################################
-
-case "$MT_FEATURES" in
-*striptypeface*)
-    MT_TYPEFACE=""
-esac
-
-# Put new fonts into the directory named by the VARTEXFONTS environment
-# variable or config file value.  (A default value for VARTEXFONTS is
-# already set in the default texmf.cnf, q.v.)
-# 
-# A user can override this setting in either direction by setting
-# USE_VARTEXFONTS to 1 or 0.
-case "$MT_FEATURES" in
-  *varfonts*) test "$USE_VARTEXFONTS" != 0 && USE_VARTEXFONTS=1;;
-esac
-
-# Force generated files that would go into a system tree (as defined by
-# SYSTEXMF) into TEXMFVAR. Starting with teTeX-3.0, the variable TEXMFVAR
-# is always set.  The varfonts feature takes precedence if also set.
-#
-# A user can override this setting in either direction by setting
-# USE_TEXMFVAR to 1 or 0.
-case "$MT_FEATURES" in
-  *texmfvar*) test "$USE_TEXMFVAR" != 0 && USE_TEXMFVAR=1;;
-esac

Deleted: branches/stable/source/src/texk/kpathsea/mktexpk
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktexpk	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/mktexpk	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,284 +0,0 @@
-#!/bin/sh
-# original mktexpk -- make a new PK font, because one wasn't found.
-# 
-# (If you change or delete the word `original' on the previous line,
-# installation won't write this script over yours.)
-# 
-# Originally written by Thomas Esser, Karl Berry, and Olaf Weber.
-# Public domain.
-
-version='$Id: mktexpk 34656 2014-07-18 23:38:50Z karl $'
-progname=`echo $0 | sed 's%.*/%%'`
-
-# preferentially use subprograms from our own directory.
-mydir=`echo "$0" | sed 's,/[^/]*$,,'`
-mydir=`cd "$mydir" && pwd`
-PATH="$mydir:$PATH"; export PATH
-
-usage="Usage: $progname [OPTIONS] NAME [REDIRECT],
-  Create a PK font.
-
---dpi DPI           use resolution DPI.
---bdpi BDPI         use base resolution BDPI.
---mag MAG           use magnificiation MAG.
---mfmode MODE       use MODE as the METAFONT mode.
---destdir DESTDIR   write fonts in DESTDIR.
-
-Try to create a bitmap PK file for NAME at resolution DPI, with an
-assumed device base resolution of BDPI, and a Metafont \`mag' of
-MAG. Use MODE for the METAFONT mode.  Use DESTDIR for the root of where
-to install into, either the absolute directory name to use (if it starts
-with a /) or relative to the default DESTDIR (if not). REDIRECT, if
-supplied, is a string of the form '>&n', where n is the number of the
-file descriptor which is to receive, instead of stdout, the name of the
-newly created pk file.
-
-If you expected the font to be available as an outline, and thus this
-script does not work and should not have been called, most likely the
-font's .tfm name is missing from the relevant map file (e.g.,
-psfonts.map for dvips, pdftex.map for pdftex).  These map files are
-typically maintained using updmap; q.v.
-
-For step-by-step instructions on making new fonts known to TeX, see
-http://tug.org/fonts/fontinstall.html.
-
-Report bugs to: tex-k at tug.org
-TeX Live home page: <http://tug.org/texlive/>
-"
-
-# Handle non-positional options, except for --version/--help
-while test $# -gt 0; do
-  case "$1" in
-    --destdir) shift; DEST="$1"; shift ;;
-    --destdir=*) DEST=`echo "$1" | sed 's/--destdir=//'`; shift ;;
-    --dpi) shift; DPI="$1"; shift ;;
-    --dpi=*) DPI=`echo "$1" | sed 's/--dpi=//'`; shift ;;
-    --bdpi) shift; BDPI="$1"; shift ;;
-    --bdpi=*) BDPI=`echo "$1" | sed 's/--bdpi=//'`; shift ;;
-    --mfmode) shift; test "x$1" != "x/" && MODE="$1"; shift ;;
-    --mfmode=*) test "x$1" != "x--mfmode/" \
-                && MODE=`echo "$1" | sed 's/--mfmode=//'`; shift ;;
-    --mag) shift; MAG="$1"; shift;;
-    --mag=*) MAG=`echo "$1" | sed '/s--mag=//'`; shift;;
-    --version|-version) break ;;
-    --help|-help) break ;;
-    *) break ;;
-  esac
-done
-
-if test "x$2" != x; then
-  tail="`echo \"x$2\" | sed 's/^x>&//' | grep '^[0-9]*$'`"
-  if test -z "$tail"; then
-    echo "$progname: argument '$2' ignored - bad file number" >&2
-  elif test "$tail" != 1; then
-      eval 'exec 1>&$tail'
-  fi
-fi
-
-mt_max_args=2
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
-  echo "$progname: Cannot find mktex.opt; check your installation." >&2
-  exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-# Where do potential driver files belong?
-case "$MT_FEATURES" in
-  *nomfdrivers*)
-     : ${MT_MFDESTDIR=`pwd`}
-     export MT_MFDESTDIR;;
-esac
-
-# Since we want to pass the generated filename and only that filename
-# back to the caller on standard output, we do some redirections so
-# regular echo's will end up on stderr, and do an echo >$STDOUT at the end.
-# Then the contents of $STDOUT will be echoed to stdout by a trap.
-
-# start of redirection stdout -> stderr, stdin <- /dev/null
-(
-
-NAME=$1
-
-if kpsewhich $NAME.mf >/dev/null 2>&1 || mktexmf $NAME >/dev/null 2>&1; then
-  # determine the progname of metafont to use; prefer mf-nowin.
-  if (mf-nowin --version) >/dev/null 2>&1; then
-    MF="mf-nowin -progname=mf"
-  else
-    MF=mf
-  fi
-
-  # Check that $BDPI and $MODE are consistent; if not, ignore the mode and
-  # hope we can correctly guess it from bdpi.  (People like to specify the
-  # resolution on the command line, not the mode so much.)
-  if test -n "$MODE"; then
-    mf_bdpi=`$MF \
-'\mode:='$MODE';mode_setup;message"BDPI= "&decimal round pixels_per_inch;end.'\
-             </dev/null \
-             | awk '/DPI=/ {print $2}'`
-    if test "x$mf_bdpi" != x$BDPI; then
-      echo "$progname: Mismatched mode $MODE and resolution $BDPI; ignoring mode." >&2
-      MODE=
-    fi
-  fi
-
-  # If an explicit mode is not supplied, try to guess. You can get a
-  # list of extant modes from ftp://ftp.tug.org/tex/modes.mf.
-  if test -z "$MODE" || test "x$MODE" = xdefault; then
-    case "$BDPI" in
-      85) MODE=sun;;
-     100) MODE=nextscrn;;
-     180) MODE=toshiba;;
-     300) MODE=cx;;
-     360) MODE=epstylus;;
-     400) MODE=nexthi;;
-     600) MODE=ljfour;;
-     720) MODE=epscszz;;
-    1200) MODE=ultre;;
-    1270) MODE=linoone;;
-    8000) MODE=dpdfezzz;;
-       *) echo "$progname: Can't guess mode for $BDPI dpi devices." >&2
-          echo "$progname: Use a config file or option to specify the mode; see:" >&2
-          echo "$progname: http://tug.org/texinfohtml/kpathsea.html#Unable-to-generate-fonts" >&2
-          exit 1
-    esac
-  fi
-
-  # Run Metafont. Always use plain Metafont, since reading cmbase.mf
-  # does not noticeably slow things down.
-  cmd="$MF \mode:=$MODE; mag:=$MAG; nonstopmode; input $NAME"
-else
-  MODE=modeless
-  # ps_to_pk is set in mktex.opt
-  case $ps_to_pk in
-    gsftopk)
-      if $ps_to_pk -t "$NAME"; then
-        cmd="$ps_to_pk $NAME $DPI"
-      fi;;
-    ps2pk)
-      # grep for the font in $PSMAPFILE.  These are base font names, such as
-      # rpplr (the original) or pplr0 (an interim step) or pplr8r (current).
-      : ${PSMAPFILE=`kpsewhich --format=map psfonts.map ps2pk.map`}
-      pattern="^$NAME"'([ 	]|$)' 
-      psline=`egrep "$pattern" $PSMAPFILE | tail -1`
-      if test -n "$psline"; then
-        set x `echo "$psline" | sed 's%[<["]%%g'`
-        shift; shift; shift;
-        encoding=; psname=; slant=; extend=
-        while test ! -z "$1"; do
-          case "$1" in
-            *.enc)       encoding="-e $1";;
-            *.pf[ab])    psname="$1";;
-            *SlantFont)  slant="-S $lastopt";;
-            *ExtendFont) extend="-E $lastopt";;
-          esac
-          lastopt="$1"
-          shift
-        done
-        # Guessing the name of the type1 font file as fallback:
-        ANAME=`echo $NAME | sed 's/8r$/8a/'`
-        for i in $NAME.pfa $NAME.pfb $ANAME.pfa $ANAME.pfb; do
-          if kpsewhich $i >/dev/null 2>&1; then
-            psname=$i
-            break
-          fi
-        done
-
-        if [ -n "$psname" ]; then
-          cmd="ps2pk -v -X$DPI -R$BDPI $slant $extend $encoding $psname $NAME.${DPI}pk"
-        else
-          if gsftopk -t "$NAME"; then
-            echo "$progname: cannot find $NAME.pfa or $NAME.pfb. Trying gsftopk." >&2
-            cmd="gsftopk $NAME $DPI"
-          fi
-        fi
-      fi;;
-  esac
-
-  # unsupported by $ps_to_pk, try other conversions:
-  if test -z "$cmd"; then
-    if (ttf2pk -t -q $NAME) >/dev/null 2>&1; then
-      cmd="ttf2pk -q $NAME $DPI"
-    elif (hbf2gf -t -q $NAME) >/dev/null 2>&1; then
-      cmd="hbf2gf -q -p $NAME $DPI"
-    else
-      echo "$progname: don't know how to create bitmap font for $NAME." >&2
-      echo "$progname: perhaps $NAME is missing from the map file." >&2
-      exit 1
-    fi
-  fi
-fi
-
-OIFS=$IFS; IFS=$SEP
-set x `"$MT_MKTEXNAM" $NAME $DPI $MODE $DEST`; shift
-IFS=$OIFS
-
-PKDEST="$1"
-PKDESTDIR=`echo "$PKDEST" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
-PKNAME=`basename "$PKDEST"`
-GFNAME=$NAME.${DPI}gf
-
-if test -r "$PKDESTDIR/$PKNAME"; then
-  echo "$progname: $PKDESTDIR/$PKNAME already exists." >&2
-  echo "$PKDESTDIR/$PKNAME" >$STDOUT
-  "$MT_MKTEXUPD" "$PKDESTDIR" $PKNAME
-  exit 0
-fi
-
-"$MT_MKTEXDIR" "$PKDESTDIR"
-if test ! -d "$PKDESTDIR"; then
-  echo "$progname: $MT_MKTEXDIR $PKDESTDIR failed." >&2
-  exit 1
-fi
-
-echo "$progname: Running $cmd"
-$cmd </dev/null || {
-  # Don't abort if only "Strange path", "bad pos" or "angle(0,0)"
-  # errors occurr.
-  grep '^!' $NAME.log | sort >$$.errs 2>/dev/null
-  grep '^! Strange path' $$.errs >$$.strange 2>/dev/null
-  grep '^! bad pos.' $$.errs >$$.badpos 2>/dev/null
-  grep '^! angle(0,0) is taken as zero.' $$.errs >$$.angle 2>/dev/null
-  cat $$.badpos $$.strange $$.angle | sort > $$.errs_accept
-  if cmp $$.errs $$.errs_accept >/dev/null 2>&1; then
-    test -s $$.strange >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused strange path errors." >&2
-    test -s $$.badpos >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused bad pos errors." >&2
-    test -s $$.angle >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused angle(0,0) errors." >&2
-  else
-    echo "$progname: \`$cmd' failed." >&2
-    test -s $NAME.log && mv -f $NAME.log "$KPSE_DOT"
-    exit 1;
-  fi
-}
-
-test -r $GFNAME && { gftopk ./$GFNAME $PKNAME || exit 1; }
-test ! -f $PKNAME && test -f $NAME.${DPI}pk && mv $NAME.${DPI}pk $PKNAME
-if test ! -s $PKNAME; then
-  echo "$progname: \`$cmd' failed to make $PKNAME." >&2
-  exit 1
-fi
-
-# Install the PK file carefully, since others may be working simultaneously.
-# Use cp when mv fails, since DOS will fail mv for deeply-nested directories.
-mv $PKNAME "$PKDESTDIR/pk$$.tmp" 2>/dev/null \
-  || cp $PKNAME "$PKDESTDIR/pk$$.tmp" || exit 1
-cd "$PKDESTDIR" || exit 1
-chmod `kpsestat -xst,go-w .` pk$$.tmp
-test -r $PKNAME || mv pk$$.tmp $PKNAME || exit 1
-
-# Update ls-R if necessary.
-"$MT_MKTEXUPD" "$PKDESTDIR" $PKNAME
-
-# If this line (or an equivalent) is not present, dvipsk/xdvik/dviljk
-# will think mktexpk failed.  Any other output to stdout will also lose.
-echo "$PKDESTDIR/$PKNAME" >$STDOUT
-echo "$progname: $PKDESTDIR/$PKNAME: successfully generated." >&2
-) 1>&2 </dev/null

Deleted: branches/stable/source/src/texk/kpathsea/mktextfm
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktextfm	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/mktextfm	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,162 +0,0 @@
-#!/bin/sh
-# original mktextfm -- make a new TFM file, because one wasn't found.
-# 
-# (If you change or delete the word `original' on the previous line,
-# installation won't write this script over yours.)
-# 
-# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
-# Public domain.
-
-version='$Id: mktextfm 34656 2014-07-18 23:38:50Z karl $'
-progname=`echo $0 | sed 's%.*/%%'`
-
-# preferentially use subprograms from our own directory.
-mydir=`echo "$0" | sed 's,/[^/]*$,,'`
-mydir=`cd "$mydir" && pwd`
-PATH="$mydir:$PATH"; export PATH
-
-usage="Usage: $progname [--destdir DESTDIR] FONT.
-
-Makes a TFM file for FONT, if possible. Use DESTDIR for the root of where
-to install into, either the absolute directory name to use (if it starts
-with a /) or relative to the default DESTDIR (if not).
-
-Report bugs to: tex-k at tug.org
-TeX Live home page: <http://tug.org/texlive/>
-"
-
-# Handle non-positional options, except for --version/--help
-while test $# -gt 0; do
-  case "$1" in
-    --destdir) shift; DEST="$1"; shift ;;
-    --destdir=*) DEST=`echo "$1" | sed 's/--destdir=//'`; shift ;;
-    --version|-version) break ;;
-    --help|-help) break ;;
-    *) break ;;
-  esac
-done
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
-  echo "$progname: Cannot find mktex.opt; check your installation." >&2
-  exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-# Where do potential mf driver files go?
-case "$MT_FEATURES" in
-  *nomfdrivers*)
-     : ${MT_MFDESTDIR=`pwd`}
-     export MT_MFDESTDIR;;
-esac
-
-# start of redirection stdout -> stderr, stdin <- /dev/null
-(
-
-NAME=`basename "$1" .tfm`
-MAG=1  # mag=0 fails with larm1000.mf
-#DEST="$2"
-DPI=$BDPI
-
-OIFS=$IFS; IFS=$SEP
-set x `"$MT_MKTEXNAM" $NAME $DPI $MODE $DEST`; shift
-IFS=$OIFS
-
-PKDEST="$1"
-TFMDEST="$2"
-PKDESTDIR=`echo "$PKDEST" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
-TFMDESTDIR=`echo "$TFMDEST" | sed 's%/[^/][^/]*$%%'`
-PKNAME=`basename "$PKDEST"`
-TFMNAME=$NAME.tfm
-GFNAME=$NAME.$DPI'gf'
-
-if test -r "$TFMDESTDIR/$TFMNAME"; then
-  echo "$progname: $TFMDESTDIR/$TFMNAME already exists." >&2
-  echo "$TFMDESTDIR/$TFMNAME" >$STDOUT
-  "$MT_MKTEXUPD" "$TFMDESTDIR" $TFMNAME
-  exit
-fi
-
-# Try to create the destdir first. Do not create fonts, if this fails.
-"$MT_MKTEXDIR" "$TFMDESTDIR"
-if test ! -d "$TFMDESTDIR"; then
-  echo "$progname: mktexdir $TFMDESTDIR failed."
-  exit 1
-fi
-
-# Check if this font is supported by hbf2gf else use metafont.
-if (hbf2gf -q -t $NAME) >/dev/null 2>&1; then
-  cmd="hbf2gf -g $NAME $DPI"
-else
-  # determine the progname of metafont to use; prefer mf-nowin.
-  if (mf-nowin --version) >/dev/null 2>&1; then
-    MF="mf-nowin -progname=mf"
-  else
-    MF=mf
-  fi
-
-  cmd="$MF \mode:=$MODE; mag:=$MAG; nonstopmode; input $NAME"
-fi
-
-echo "$progname: Running $cmd"
-$cmd </dev/null || {
-  # Don't abort if only "Strange path", "bad pos" or "angle(0,0)"
-  # errors occurr.
-  grep '^!' $NAME.log | sort >$$.errs 2>/dev/null
-  grep '^! Strange path' $$.errs >$$.strange 2>/dev/null
-  grep '^! bad pos.' $$.errs >$$.badpos 2>/dev/null
-  grep '^! angle(0,0) is taken as zero.' $$.errs >$$.angle 2>/dev/null
-  cat $$.badpos $$.strange $$.angle | sort > $$.errs_accept
-  if cmp $$.errs $$.errs_accept >/dev/null 2>&1; then
-    test -s $$.strange >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused strange path errors." >&2
-    test -s $$.badpos >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused bad pos errors." >&2
-    test -s $$.angle >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused angle(0,0) errors." >&2
-  else
-    echo "$progname: \`$cmd' failed." >&2
-    test -s $NAME.log && mv -f $NAME.log "$KPSE_DOT"
-    exit 1;
-  fi
-}
-
-# hbf2gf just produces a .pl file:
-test -r ./$NAME.pl && pltotf ./$NAME.pl $TFMNAME
-test -r $TFMNAME || { echo "$progname: \`$cmd' failed to make $TFMNAME."; exit 1; }
-
-# Install the TFM file carefully, since others may be working simultaneously.
-# Use cp when mv fails, since DOS will fail mv for deeply-nested directories.
-mv $TFMNAME "$TFMDESTDIR/tfm$$.tmp" 2>/dev/null \
-  || cp $TFMNAME "$TFMDESTDIR/tfm$$.tmp" || exit 1
-cd "$TFMDESTDIR" || exit 1
-chmod `kpsestat -xst,go-w .` tfm$$.tmp
-test -r $TFMNAME || mv tfm$$.tmp $TFMNAME || exit 1
-
-# OK, success with the TFM.
-"$MT_MKTEXUPD" "$TFMDESTDIR" $TFMNAME
-echo "$TFMDESTDIR/$TFMNAME" >$STDOUT
-echo "$progname: $TFMDESTDIR/$TFMNAME: successfully generated." >&2
-
-# Since we probably made a GF(->PK) file, too, may as well install it if
-# it's needed.
-cd $TEMPDIR
-if test -r $GFNAME && test ! -f "$PKDESTDIR/$PKNAME"; then
-  gftopk ./$GFNAME $PKNAME || exit 1
-  "$MT_MKTEXDIR" "$PKDESTDIR"
-  mv $PKNAME "$PKDESTDIR/pk$$.tmp" 2>/dev/null \
-    || cp $PKNAME "$PKDESTDIR/pk$$.tmp" || exit 1
-  cd "$PKDESTDIR" || exit 1
-  if test -f $PKNAME; then
-    rm -f pk$$.tmp
-  else
-    chmod `kpsestat -xst,go-w .` pk$$.tmp
-    mv pk$$.tmp $PKNAME
-    "$MT_MKTEXUPD" "$PKDESTDIR" $PKNAME
-  fi
-fi
-) 1>&2 </dev/null

Deleted: branches/stable/source/src/texk/kpathsea/mktexupd
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktexupd	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/mktexupd	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,69 +0,0 @@
-#!/bin/sh
-# mktexupd -- update ls-R with a new entry.
-# 
-# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
-# Public domain.
-
-version='$Id: mktexupd 34656 2014-07-18 23:38:50Z karl $'
-
-# preferentially use subprograms from our own directory.
-mydir=`echo "$0" | sed 's,/[^/]*$,,'`
-mydir=`cd "$mydir" && pwd`
-PATH="$mydir:$PATH"; export PATH
-
-usage="Usage: $0 DIR FILE.
-  Update the ls-R file with an entry for FILE in DIR.
-
-Report bugs to: tex-k at tug.org
-TeX Live home page: <http://tug.org/texlive/>
-"
-mt_min_args=2
-mt_max_args=2
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
-  echo "$0: Cannot find mktex.opt; check your installation." >&2
-  exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-dir=$1
-file=$2
-test -d "$dir" || { echo "$0: $dir not a directory." >&2; exit 1; }
-test -f "$dir/$file" || { echo "$0: $dir/$file not a file." >&2; exit 1; }
-
-OIFS=$IFS; IFS=$SEP; set x `kpsewhich  -show-path=ls-R`; shift; IFS=$OIFS
-TEXMFLS_R=
-for d in "$@"; do
-  case $dir in
-    "") continue;;
-    ${d}|${d}/*) TEXMFLS_R="$d"; break;;
-  esac
-done
-test -n "$TEXMFLS_R" || exit 0
-db_file="$TEXMFLS_R/ls-R"
-db_file_lc="$TEXMFLS_R/ls-r"
-
-test ! -f "$db_file" && test -f "$db_file_lc" && db_file="$db_file_lc"
-test -f "$db_file" || { mktexlsr "$TEXMFLS_R"; exit; }
-test -w "$db_file" || { echo "$0: $db_file unwritable." >&2; exit 1; }
-
-test "x`sed '1s/
-$//;1q' \"$db_file\"`" = "x$ls_R_magic" \
-  || test "x`sed '1s/
-$//;1q' \"$db_file\"`" = "x$old_ls_R_magic" \
-  || { echo "$0: $db_file lacks magic string \`$ls_R_magic'." >&2; exit 1; }
-
-# Change `$TEXMFLS_R/' to `./'.
-dir=`echo $dir | sed "s%^$TEXMFLS_R/%./%g"`
-
-# May as well always put in a new directory entry; presumably cron will
-# come along soon enough and clean things up.
-echo "$dir:" >>"$db_file"
-echo "$file" >>"$db_file"
-
-exit 0

Modified: branches/stable/source/src/texk/kpathsea/progname.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/progname.c	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/progname.c	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,6 @@
 /* progname.c: the executable name we were invoked as; general initialization.
 
-   Copyright 1994, 1996, 1997, 2008-2013, 2016-2018 Karl Berry.
+   Copyright 1994, 1996, 1997, 2008-2013, 2016-2019 Karl Berry.
    Copyright 1998-2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or

Added: branches/stable/source/src/texk/kpathsea/tests/cnfnull.test
===================================================================
--- branches/stable/source/src/texk/kpathsea/tests/cnfnull.test	                        (rev 0)
+++ branches/stable/source/src/texk/kpathsea/tests/cnfnull.test	2020-02-18 19:11:23 UTC (rev 820)
@@ -0,0 +1,23 @@
+#!/bin/sh -vx
+# $Id: cnfnull.test 53454 2020-01-19 17:04:02Z karl $
+# Copyright 2020 Karl Berry <tex-live at tug.org>
+# You may freely use, modify and/or distribute this file.
+# 
+# Test nul (zero) bytes in texmf.cnf.
+
+cnf_dir=cnfnull
+cnf_file=$cnf_dir/texmf.cnf
+
+# Create the texmf.cnf dynamically so we don't have to check in a file
+# containing nul bytes.
+rm -rf $cnf_dir
+mkdir $cnf_dir
+test -d $cnf_dir || exit 1
+printf 'x\0=1\n\0' >$cnf_file || exit 1
+
+val=`./kpsewhich "--cnf-line=TEXMFCNF=$cnf_dir" --var-value=x`
+test x"$val" = x1 || exit 1
+
+# Before we dropped nul bytes in 2020, kpse gave a warning:
+#   warning: cnfnull/texmf.cnf:1: (kpathsea) No cnf value on line: x.
+# and did not assign anything (since the string ended with the x).


Property changes on: branches/stable/source/src/texk/kpathsea/tests/cnfnull.test
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/stable/source/src/texk/kpathsea/texmf.cnf
===================================================================
--- branches/stable/source/src/texk/kpathsea/texmf.cnf	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/texmf.cnf	2020-02-18 19:11:23 UTC (rev 820)
@@ -4,8 +4,8 @@
 % If you modify this original file, YOUR CHANGES WILL BE LOST when it is
 % updated.  Instead, put your changes -- and only your changes, not an
 % entire copy! -- in ../../texmf.cnf.  That is, if this file is
-% installed in /some/path/to/texlive/2019/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2019/texmf.cnf.
+% installed in /some/path/to/texlive/2020/texmf-dist/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2020/texmf.cnf.
 % (Below, we use YYYY in place of the specific year.)
 % 
 % What follows is a super-summary of what this .cnf file can
@@ -84,10 +84,10 @@
 TEXMFHOME = ~/texmf
 
 % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2019/texmf-var
+TEXMFVAR = ~/.texlive2020/texmf-var
 
 % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2019/texmf-config
+TEXMFCONFIG = ~/.texlive2020/texmf-config
 
 % This is the value manipulated by tlmgr's auxtrees subcommand in the
 % root texmf.cnf. Kpathsea warns about a literally empty string for a
@@ -858,13 +858,13 @@
 screen_depth.mf = 1200
 
 % BibTeX only (max_strings also determines hash_size and hash_prime).
-ent_str_size =  250
-glob_str_size = 20000
-max_strings.bibtex  = 100000
-max_strings.bibtex8 = 100000
-max_strings.bibtexu = 100000
-max_strings.pbibtex = 100000
-max_strings.upbibtex = 100000
+ent_str_size = 500
+glob_str_size = 200000
+max_strings.bibtex  = 200000
+max_strings.bibtex8 = 200000
+max_strings.bibtexu = 200000
+max_strings.pbibtex = 200000
+max_strings.upbibtex= 200000
 
 % GFtype only.
 line_length.gftype = 500

Modified: branches/stable/source/src/texk/kpathsea/version.ac
===================================================================
--- branches/stable/source/src/texk/kpathsea/version.ac	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/version.ac	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,5 +1,5 @@
-dnl $Id: version.ac 50926 2019-05-02 22:18:34Z karl $
-dnl   Copyright 2016-2019 Karl Berry <tex-live at tug.org>
+dnl $Id: version.ac 53427 2020-01-16 22:02:50Z karl $
+dnl   Copyright 2016-2020 Karl Berry <tex-live at tug.org>
 dnl   Copyright 2011-2015 Peter Breitenlohner <tex-live at tug.org>
 dnl
 dnl   This file is free software; the copyright holder
@@ -20,4 +20,4 @@
 dnl --------------------------------------------------------
 dnl
 dnl This file is m4-included from configure.ac.
-m4_define([kpse_version], [6.3.2/dev])
+m4_define([kpse_version], [6.3.2])

Modified: branches/stable/source/src/texk/kpathsea/win32/ChangeLog
===================================================================
--- branches/stable/source/src/texk/kpathsea/win32/ChangeLog	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/win32/ChangeLog	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,3 +1,9 @@
+2020-01-31  Akira Kakuto  <kakuto at w32tex.org>
+
+	* mktextfm.c: if envvar MF_MODE_EXTRA_INFO is set, include the
+	codingscheme and other Xerox-world info in the .tfm; works
+	with modes.mf 4.0 and later.
+
 2019-02-20  Akira Kakuto  <kakuto at w32tex.org>
 
 	* mktexpk.c: Remove unused definitions.

Modified: branches/stable/source/src/texk/kpathsea/win32/mktextfm.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/win32/mktextfm.c	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/kpathsea/win32/mktextfm.c	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,6 @@
 /* mktextfm.c
 
-   Copyright 2000, 2019 Akira Kakuto.
+   Copyright 2000, 2020 Akira Kakuto.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this library; if not, see <http://www.gnu.org/licenses/>.
 
-   Assumes the cx mode in mf.base .
+   Assumes the ljfour mode in mf.base .
    Usage: mktextfm [--destdir DESTDIR] name
 */
 
@@ -39,7 +39,7 @@
 static void
 version (void)
 {
-  fprintf (stderr, "%s, (C version 1.5 --ak 2009-2012)\n", progname);
+  fprintf (stderr, "%s, (C version 1.6 --ak 2009-2020)\n", progname);
   fprintf (stderr, KPSEVERSION WEB2CVERSION "\n");
   return;
 }
@@ -91,6 +91,7 @@
 
   char texbindir[TBUF];
   char fullbin[TBUF];
+  char *extra_info;
 
   kpse_set_program_name (av[0], NULL);
   progname = kpse_program_name;
@@ -167,7 +168,7 @@
       return (100);
     }
     issetdest = 1;
-    if (strlen(av[2]) > TBUF - 1 || strlen(av[3]) > TBUF - 1) {
+    if (strlen(av[2]) > TBUF - 1 || strlen(av[3]) > TBUF - 150) {
       fprintf (stderr, "Too long a string.\n");
       return (100);
     }
@@ -180,7 +181,7 @@
         *p = '/';
     }
   } else {
-    if (strlen(av[1]) > TBUF - 1) {
+    if (strlen(av[1]) > TBUF - 150) {
       fprintf (stderr, "Too long a string.\n");
       return (100);
     }
@@ -302,8 +303,21 @@
   _dup2 (fileno (fnul), fileno (stdin));
 
 /* METAFONT command line */
+/*
+The idea here is to provide a programmatic way to get the
+codingscheme and other so-called Xerox-world information into the
+tfm: if the envvar MF_MODE_EXTRA_INFO is set, then modes.mf (as of
+the 3.9 release in January 2020) will arrange for that.  We do not
+do this by default because Knuth objected.
+*/
+  extra_info = getenv("MF_MODE_EXTRA_INFO");
   strcpy (cmd, "--progname=mf --base=mf ");
-  strcat (cmd, "\\mode:=ljfour; \\mag:=1; nonstopmode; input ");
+  strcat (cmd, "\\mode:=ljfour; mag:=1; ");
+  if (extra_info) {
+    strcat(cmd, "if known mode_include_extra_info_available: ");
+    strcat(cmd, "mode_include_extra_info fi; ");
+  }
+  strcat (cmd, "nonstopmode; input ");
   strcat (cmd, fontname);
   strcat (cmd, ";");
 

Modified: branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm
===================================================================
--- branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm	2020-02-18 19:11:23 UTC (rev 820)
@@ -5,7 +5,7 @@
 
 package TeXLive::TLConfig;
 
-my $svnrev = '$Revision: 52745 $';
+my $svnrev = '$Revision: 53076 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -29,6 +29,7 @@
     %Compressors
     $InfraLocation
     $DatabaseName
+    $DatabaseLocation
     $PackageBackupDir 
     $BlockSize
     $Archive
@@ -81,10 +82,12 @@
 # relative to a root (e.g., the Master/, or the installation path)
 our $InfraLocation = "tlpkg";
 our $DatabaseName = "texlive.tlpdb";
+our $DatabaseLocation = "$InfraLocation/$DatabaseName";
 
 # location of backups in default autobackup setting (under tlpkg)
 our $PackageBackupDir = "$InfraLocation/backups";
 
+# for computing disk usage; this is most common.
 our $BlockSize = 4096;
 
 # timeout for network connections (wget, LWP) in seconds
@@ -311,6 +314,16 @@
 tlpobj files, ...) relative to the root of the installation; currently
 C<tlpkg>.
 
+=item C<$TeXLive::TLConfig::DatabaseName>
+
+The name of our so-called database file: C<texlive.tlpdb>. It's just a
+plain text file, not any kind of relational or other database.
+
+=item C<$TeXLive::TLConfig::DatabaseLocation>
+
+Concatenation of C<InfraLocation> "/" C<DatabaseName>, i.e.,
+C<tlpkg/texlive.tlpdb>.
+
 =item C<$TeXLive::TLConfig::BlockSize>
 
 The assumed block size, currently 4k.

Modified: branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,11 +1,11 @@
 # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2019 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2020 Norbert Preining, Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 52815 $';
+my $svnrev = '$Revision: 53343 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -13,7 +13,7 @@
 
 =head1 NAME
 
-C<TeXLive::TLUtils> -- utilities used in TeX Live infrastructure
+C<TeXLive::TLUtils> - utilities used in TeX Live infrastructure
 
 =head1 SYNOPSIS
 
@@ -88,6 +88,7 @@
   TeXLive::TLUtils::log($str1, ...);     # only to log file
   TeXLive::TLUtils::tlwarn($str1, ...);  # warn on stderr and log
   TeXLive::TLUtils::tldie($str1, ...);   # tlwarn and die
+  TeXLive::TLUtils::debug_hash_str($label, HASH); # stringified HASH
   TeXLive::TLUtils::debug_hash($label, HASH);   # warn stringified HASH
   TeXLive::TLUtils::backtrace();                # return call stack as string
   TeXLive::TLUtils::process_logging_options($texdir); # handle -q -v* -logfile
@@ -215,7 +216,8 @@
     &SshURIRegex
   );
   @EXPORT = qw(setup_programs download_file process_logging_options
-               tldie tlwarn info log debug ddebug dddebug debug_hash
+               tldie tlwarn info log debug ddebug dddebug debug
+               debug_hash_str debug_hash
                win32 xchdir xsystem run_cmd system_pipe sort_archs);
 }
 
@@ -830,7 +832,7 @@
 
 Tests whether its argument is writable by trying to write to
 it. This function is necessary because the built-in C<-w> test just
-looks at mode and uid/guid, which on Windows always returns true and
+looks at mode and uid/gid, which on Windows always returns true and
 even on Unix is not always good enough for directories mounted from
 a fileserver.
 
@@ -1317,6 +1319,7 @@
 
       my $item = "$d/$dirent";  # prepend directory for comparison
       if (! exists $seen{$item}) {
+        ddebug("   no collapse of $d because of: $dirent\n");
         $ok_to_collapse = 0;
         last;  # no need to keep looking after the first.
       }
@@ -1333,21 +1336,25 @@
 
 =item C<removed_dirs(@files)>
 
-returns all the directories from which all content will be removed
+Returns all the directories from which all content will be removed.
 
+Here is the idea:
+
+=over 4
+
+=item create a hashes by_dir listing all files that should be removed
+   by directory, i.e., key = dir, value is list of files
+
+=item for each of the dirs (keys of by_dir and ordered deepest first)
+   check that all actually contained files are removed
+   and all the contained dirs are in the removal list. If this is the
+   case put that directory into the removal list
+
+=item return this removal list
+
+=back
 =cut
 
-# return all the directories from which all content will be removed
-#
-# idea:
-# - create a hashes by_dir listing all files that should be removed
-#   by directory, i.e., key = dir, value is list of files
-# - for each of the dirs (keys of by_dir and ordered deepest first)
-#   check that all actually contained files are removed
-#   and all the contained dirs are in the removal list. If this is the
-#   case put that directory into the removal list
-# - return this removal list
-#
 sub removed_dirs {
   my (@files) = @_;
   my %removed_dirs;
@@ -1512,6 +1519,7 @@
     $totalsize += $tlpsizes{$p};
   }
   my $starttime = time();
+  my @packs_again; # packages that we failed to download and should retry later
   foreach my $package (@packs) {
     my $tlpobj = $tlpobjs{$package};
     my $reloc = $tlpobj->relocated;
@@ -1524,8 +1532,22 @@
     foreach my $h (@::install_packages_hook) {
       &$h($n,$totalnr);
     }
-    # return false if something went wrong
+    # push $package to @packs_again if download failed
     if (!$fromtlpdb->install_package($package, $totlpdb)) {
+      tlwarn("TLUtils::install_packages: Failed to install $package\n"
+             ."Will be retried later.\n");
+      push @packs_again, $package;
+    } else {
+      $donesize += $tlpsizes{$package};
+    }
+  }
+  # try to download packages in @packs_again again
+  foreach my $package (@packs_again) {
+    my $infostr = sprintf("Retrying to install: $package [%dk]",
+                     int($tlpsizes{$package}/1024) + 1);
+    info("$infostr\n");
+    # return false if download failed again
+    if (!$fromtlpdb->install_package($package, $totlpdb)) {
       return 0;
     }
     $donesize += $tlpsizes{$package};
@@ -2182,7 +2204,7 @@
     if ($tlchecksum ne $checksum) {
       tlwarn("TLUtils::check_file: checksums differ for $xzfile:\n");
       tlwarn("TLUtils::check_file:   tlchecksum=$tlchecksum, arg=$checksum\n");
-      (undef,$check_file_tmpdir) = File::Temp::tempdir("tlcheckfileXXXXXXXX");
+      $check_file_tmpdir = File::Temp::tempdir("tlcheckfileXXXXXXXX");
       tlwarn("TLUtils::check_file:   removing $xzfile, "
              . "but saving copy in $check_file_tmpdir\n");
       copy($xzfile, $check_file_tmpdir);
@@ -2557,10 +2579,10 @@
 sub setup_system_one {
   my ($p, $arg) = @_;
   my $nulldev = nulldev();
-  debug("trying to set up system $p, arg $arg\n");
+  ddebug("trying to set up system $p, arg $arg\n");
   my $ret = system("$p $arg >$nulldev 2>&1");
   if ($ret == 0) {
-    debug("program $p found in the path\n");
+    debug("program $p found in path\n");
     $::progs{$p} = $p;
     return(1);
   } else {
@@ -3288,6 +3310,8 @@
 
 Logging and debugging messages.
 
+=over 4
+
 =item C<logit($out,$level, at rest)>
 
 Internal routine to write message to both C<$out> (references to
@@ -3461,14 +3485,19 @@
   }
 }
 
-=item C<debug_hash ($label, HASH)>
+=item C<debug_hash_str($label, HASH)>
 
-Write LABEL followed by HASH elements, all on one line, to stderr.
-If HASH is a reference, it is followed.
+Return LABEL followed by HASH elements, followed by a newline, as a
+single string. If HASH is a reference, it is followed (but no recursive
+derefencing).
 
+=item C<debug_hash($label, HASH)>
+
+Write the result of C<debug_hash_str> to stderr.
+
 =cut
 
-sub debug_hash {
+sub debug_hash_str {
   my ($label) = shift;
   my (%hash) = (ref $_[0] && $_[0] =~ /.*HASH.*/) ? %{$_[0]} : @_;
 
@@ -3476,6 +3505,7 @@
   my @items = ();
   for my $key (sort keys %hash) {
     my $val = $hash{$key};
+    $val = ".undef" if ! defined $val;
     $key =~ s/\n/\\n/g;
     $val =~ s/\n/\\n/g;
     push (@items, "$key:$val");
@@ -3483,9 +3513,13 @@
   $str .= join (",", @items);
   $str .= "}";
 
-  warn "$str\n";
+  return "$str\n";
 }
 
+sub debug_hash {
+  warn &debug_hash_str(@_);
+}
+
 =item C<backtrace()>
 
 Return call(er) stack, as a string.
@@ -3582,7 +3616,7 @@
 
 =head2 Miscellaneous
 
-Some ideas from Fabrice Popineau's C<FileUtils.pm>.
+A few ideas from Fabrice Popineau's C<FileUtils.pm>.
 
 =over 4
 
@@ -3610,8 +3644,9 @@
 
 =item C<push_uniq(\@list, @new_items)>
 
-The C<push_uniq> function pushes the last argument @ITEMS to the $LIST
-referenced by the first argument, if they are not already in the list.
+The C<push_uniq> function pushes each element in the last argument
+ at ITEMS to the $LIST referenced by the first argument, if it is not
+already in the list.
 
 =cut
 
@@ -3618,7 +3653,11 @@
 sub push_uniq {
   my ($l, @new_items) = @_;
   for my $e (@new_items) {
-    if (! &member($e, @$l)) {
+   # turns out this is one of the most-used functions when updating the
+   # tlpdb, with hundreds of thousands of calls. So let's write it out
+   # to eliminate the sub overhead.
+   #if (! &member($e, @$l)) {
+    if (! scalar grep($_ eq $e, @$l)) {
       push (@$l, $e);
     }
   }
@@ -3655,38 +3694,67 @@
 
 =item C<texdir_check($texdir)>
 
-Test whether installation with TEXDIR set to $texdir would succeed due to
-writing permissions.
+Test whether installation with TEXDIR set to $texdir should be ok, e.g.,
+would be a creatable directory. Return 1 if ok, 0 if not.
 
 Writable or not, we will not allow installation to the root
 directory (Unix) or the root of a drive (Windows).
 
+We also do not allow paths containing various special characters, and
+print a message about this if second argument WARN is true. (We only
+want to do this for the regular text installer, since spewing output in
+a GUI program wouldn't be good; the generic message will have to do for
+them.)
+
 =cut
 
 sub texdir_check {
-  my $texdir = shift;
-  return 0 unless defined $texdir;
+  my ($orig_texdir,$warn) = @_;
+  return 0 unless defined $orig_texdir;
+
   # convert to absolute, for safer parsing.
+  # also replaces backslashes with slashes on w32.
   # The return value may still contain symlinks,
   # but no unnecessary terminating '/'.
-  $texdir = tl_abs_path($texdir);
+  my $texdir = tl_abs_path($orig_texdir);
   return 0 unless defined $texdir;
-  # also reject the root of a drive,
+
+  # reject the root of a drive,
   # assuming that only the canonical form of the root ends with /
   return 0 if $texdir =~ m!/$!;
-  # win32: for now, reject the root of a samba share
+
+  # Unfortunately we have lots of special characters.
+  # On Windows, backslashes are normal but will already have been changed
+  # to slashes by tl_abs_path. And we should only check for : on Unix.
+  my $colon = win32() ? "" : ":";
+  if ($texdir =~ /[,$colon;\\{}\$]/) {
+    if ($warn) {
+      print "     !! TEXDIR value has problematic characters: $orig_texdir\n";
+      print "     !! (such as comma, colon, semicolon, backslash, braces\n";
+      print "     !!  and dollar sign; sorry)\n";
+    }
+    # although we could check each character individually and give a
+    # specific error, it seems plausibly useful to report all the chars
+    # that cause problems, regardless of which was there. Simpler too.
+    return 0;
+  }
+  # w32: for now, reject the root of a samba share
   return 0 if win32() && $texdir =~ m!^//[^/]+/[^/]+$!;
-  my $texdirparent;
-  my $texdirpparent;
 
+  # if texdir already exists, make sure we can write into it.
   return dir_writable($texdir) if (-d $texdir);
-  ($texdirparent = $texdir) =~ s!/[^/]*$!!;
+
+  # if texdir doesn't exist, make sure we can write the parent.
+  (my $texdirparent = $texdir) =~ s!/[^/]*$!!;
   #print STDERR "Checking $texdirparent".'[/]'."\n";
-  return  dir_creatable($texdirparent) if -d dir_slash($texdirparent);
-  # try another level up the tree
-  ($texdirpparent = $texdirparent) =~ s!/[^/]*$!!;
+  return dir_creatable($texdirparent) if -d dir_slash($texdirparent);
+  
+  # ditto for the next level up the tree
+  (my $texdirpparent = $texdirparent) =~ s!/[^/]*$!!;
   #print STDERR "Checking $texdirpparent".'[/]'."\n";
   return dir_creatable($texdirpparent) if -d dir_slash($texdirpparent);
+  
+  # doesn't look plausible.
   return 0;
 }
 
@@ -4037,17 +4105,20 @@
   return;
 }
 
-# compare_tlpobjs 
-# returns a hash
-#   $ret{'revision'} = "leftRev:rightRev"     if revision differ
-#   $ret{'removed'} = \[ list of files removed from A to B ]
-#   $ret{'added'} = \[ list of files added from A to B ]
-#
+

+=item C<< compare_tlpobjs($tlpA, $tlpB) >>
+
+Compare the two passed L<TLPOBJ> objects.  Returns a hash:
+
+  $ret{'revision'}  = "revA:revB" # if revisions differ
+  $ret{'removed'}   = \[ list of files removed from A to B ]
+  $ret{'added'}     = \[ list of files added from A to B ]
+
+=cut
+
 sub compare_tlpobjs {
   my ($tlpA, $tlpB) = @_;
   my %ret;
-  my @rem;
-  my @add;
 
   my $rA = $tlpA->revision;
   my $rB = $tlpB->revision;
@@ -4067,20 +4138,27 @@
   for my $f (@fA) { $removed{$f} = 1; }
   for my $f (@fB) { delete($removed{$f}); $added{$f} = 1; }
   for my $f (@fA) { delete($added{$f}); }
-  @rem = sort keys %removed;
-  @add = sort keys %added;
+  my @rem = sort keys %removed;
+  my @add = sort keys %added;
   $ret{'removed'} = \@rem if @rem;
   $ret{'added'} = \@add if @add;
+
   return %ret;
 }
 
-#
-# compare_tlpdbs
-# return several hashes
-# @{$ret{'removed_packages'}} = list of removed packages from A to B
-# @{$ret{'added_packages'}} = list of added packages from A to B
-# $ret{'different_packages'}->{$package} = output of compare_tlpobjs
-#
+

+=item C<< compare_tlpdbs($tlpdbA, $tlpdbB, @more_ignored_pkgs) >>
+
+Compare the two passed L<TLPDB> objects, ignoring the packages
+C<00texlive.installer>, C<00texlive.image>, and any passed
+C<@more_ignore_pkgs>. Returns a hash:
+
+  $ret{'removed_packages'} = \[ list of removed packages from A to B ]
+  $ret{'added_packages'}   = \[ list of added packages from A to B ]
+  $ret{'different_packages'}->{$package} = output of compare_tlpobjs
+
+=cut
+
 sub compare_tlpdbs {
   my ($tlpdbA, $tlpdbB, @add_ignored_packs) = @_;
   my @ignored_packs = qw/00texlive.installer 00texlive.image/;
@@ -4406,7 +4484,7 @@
     print STDERR "" .
       "$prg [ERROR]: Either -sys or -user mode is required.\n" .
       "$prg [ERROR]: In nearly all cases you should use $prg -sys.\n" .
-      "$prg [ERROR]: For special cases see http://tug.org/texlive/scripts-sys-user.html\n" ;
+      "$prg [ERROR]: For special cases see https://tug.org/texlive/scripts-sys-user.html\n" ;
     exit(1);
   }
   return ($texmfconfig, $texmfvar);
@@ -4476,6 +4554,12 @@
 }
 
 

+=back
+
+=head2 JSON
+
+=over 4
+
 =item C<encode_json($ref)>
 
 Returns the JSON representation of the object C<$ref> is pointing at.
@@ -4498,11 +4582,14 @@
 
 our $jsonmode = "";
 
+=pod
+
 =item C<True()>
+
 =item C<False()>
 
-these two function must be used to get proper JSON C<true> and C<false> 
-in the output independent of the backend used.
+These two crazy functions must be used to get proper JSON C<true> and
+C<false> in the output independent of the backend used.
 
 =cut
 
@@ -4647,9 +4734,10 @@
   return($ret);
 }
 
+=pod
 
+=back
 
-=back
 =cut
 
 1;
@@ -4657,14 +4745,14 @@
 
 =head1 SEE ALSO
 
-The modules L<TeXLive::TLConfig>, L<TeXLive::TLCrypto>,
-L<TeXLive::TLDownload>, L<TeXLive::TLWinGoo>, etc., and the
-documentation in the repository: C<Master/tlpkg/doc/>.
+The other modules in C<Master/tlpkg/TeXLive/> (L<TeXLive::TLConfig> and
+the rest), and the scripts in C<Master/tlpg/bin/> (especially
+C<tl-update-tlpdb>), the documentation in C<Master/tlpkg/doc/>, etc.
 
 =head1 AUTHORS AND COPYRIGHT
 
 This script and its documentation were written for the TeX Live
-distribution (L<http://tug.org/texlive>) and both are licensed under the
+distribution (L<https://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
 =cut

Modified: branches/stable/source/src/texk/web2c/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/ChangeLog	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/ChangeLog	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,3 +1,59 @@
+2020-02-09  Phelype Oleinik  <phe.h.o1 at gmail.com>
+
+	* tex.ch (29.256, scan_file_name): new procedure to implement
+	group-delimited filenames for \input.
+	* ptexdir/ptex-base.ch: extra end; needed.
+
+2020-02-01  Andreas Scherer  <https://ascherer.github.io>
+
+	* ctangleboot.cin: Regenerate after verbosity bugfix.
+
+2020-01-16  Karl Berry  <karl at freefriends.org>
+
+	* doc/web2c.texi: 2020.
+	* pdftexdir/pdftex.web,
+	* pdftexdir/pdftex_version.h: 1.40.21 for TL'20.
+
+2019-12-17  Karl Berry  <karl at freefriends.org>
+
+	* tex.ch (out_what [1374]): always set write_open[j]:=false
+	  if we a_close(write_file[j]), not worrying about the subtype.
+	* tests/tex-closeout.test: new test.
+	* am/texmf.am (tex_tests): add it.
+	
+	* mftraptest.test,
+	triptest.test: rm the .base/.fmt file before remaking it,
+	so we can't find one left over from a previous run.
+
+	* am/web.am (web_tests): add tests/bibtex-bigauth.test (forgot
+	yesterday).
+
+2019-12-16  Karl Berry  <karl at freefriends.org>
+
+	* bibtex.ch (overflow_buffer [46]): more comments.
+	(copy_char [251]): call overflow_buffer (to reallocate)
+	  if field_vl_str (aka ex_buf) is full instead of giving up.
+	Original report from David Williams about a lengthy author list:
+	  https://tug.org/pipermail/texhax/2019-December/024121.html
+	* tests/bibtex-bigauth.{test,tex,bib,aux}: new files.
+
+2019-12-15  Karl Berry  <karl at freefriends.org>
+
+	* bibtex.ch: somehow the WEB module numbers in comments got off
+	by one after module 30 or so. Sigh.
+
+	* bibtex.ch (Open this .aux file [141]): if -terse,
+	only log the "A level-N auxiliary file" message, instead of print.
+
+2019-12-10  Hironori KITAGAWA  <h_kitagawa2001 at yahoo.co.jp>
+
+	* ac/web2c.ac (etex, ptex, eptex, uptex, euptex, pdftex): use zlib.
+	* texmfmp.h (FMT_COMPRESS): define if pTeX || epTeX || upTeX || eupTeX
+	|| eTeX || pdfTeX || XeTeX.
+	(wopenin, do_dump, etc.) [FMT_COMPRESS]: change conditional from XeTeX.
+	* zlib-fmt.ch: new file to declare word_file as gzFile
+	instead of file of memory_word.
+
 2019-09-23  Karl Berry  <karl at freefriends.org>
 
 	* patgen.ch (trie_size),
@@ -8400,6 +8456,7 @@
 
 	* bibtex.ch (10/main program): exit with bad status if history >
 	  warning_message.
+
 Mon Feb 21 14:50:08 1994  Karl Berry  (karl at cs.umb.edu)
 
 	* Makefile.in: srcdir changes from simon.

Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/Makefile.in	2020-02-18 19:11:23 UTC (rev 820)
@@ -629,27 +629,31 @@
 libluajitmisc_a_OBJECTS = $(nodist_libluajitmisc_a_OBJECTS)
 libluajitpplib_a_AR = $(AR) $(ARFLAGS)
 libluajitpplib_a_LIBADD =
-am__objects_6 = luatexdir/luapplib/libluajitpplib_a-pparray.$(OBJEXT) \
-	luatexdir/luapplib/libluajitpplib_a-ppcrypt.$(OBJEXT) \
-	luatexdir/luapplib/libluajitpplib_a-ppdict.$(OBJEXT) \
-	luatexdir/luapplib/libluajitpplib_a-ppheap.$(OBJEXT) \
-	luatexdir/luapplib/libluajitpplib_a-ppload.$(OBJEXT) \
-	luatexdir/luapplib/libluajitpplib_a-ppstream.$(OBJEXT) \
-	luatexdir/luapplib/libluajitpplib_a-pptest1.$(OBJEXT) \
-	luatexdir/luapplib/libluajitpplib_a-pptest2.$(OBJEXT) \
-	luatexdir/luapplib/libluajitpplib_a-pptest3.$(OBJEXT) \
-	luatexdir/luapplib/libluajitpplib_a-ppxref.$(OBJEXT) \
-	luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.$(OBJEXT) \
-	luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.$(OBJEXT) \
-	luatexdir/luapplib/util/libluajitpplib_a-utilflate.$(OBJEXT) \
-	luatexdir/luapplib/util/libluajitpplib_a-utilfpred.$(OBJEXT) \
-	luatexdir/luapplib/util/libluajitpplib_a-utiliof.$(OBJEXT) \
-	luatexdir/luapplib/util/libluajitpplib_a-utillog.$(OBJEXT) \
-	luatexdir/luapplib/util/libluajitpplib_a-utillzw.$(OBJEXT) \
-	luatexdir/luapplib/util/libluajitpplib_a-utilmd5.$(OBJEXT) \
-	luatexdir/luapplib/util/libluajitpplib_a-utilmem.$(OBJEXT) \
-	luatexdir/luapplib/util/libluajitpplib_a-utilnumber.$(OBJEXT) \
-	luatexdir/luapplib/util/libluajitpplib_a-utilsha.$(OBJEXT)
+am__objects_6 =  \
+	luatexdir/luapplib/src/libluajitpplib_a-pparray.$(OBJEXT) \
+	luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.$(OBJEXT) \
+	luatexdir/luapplib/src/libluajitpplib_a-ppdict.$(OBJEXT) \
+	luatexdir/luapplib/src/libluajitpplib_a-ppheap.$(OBJEXT) \
+	luatexdir/luapplib/src/libluajitpplib_a-ppload.$(OBJEXT) \
+	luatexdir/luapplib/src/libluajitpplib_a-ppstream.$(OBJEXT) \
+	luatexdir/luapplib/src/libluajitpplib_a-pptest1.$(OBJEXT) \
+	luatexdir/luapplib/src/libluajitpplib_a-pptest2.$(OBJEXT) \
+	luatexdir/luapplib/src/libluajitpplib_a-pptest3.$(OBJEXT) \
+	luatexdir/luapplib/src/libluajitpplib_a-ppxref.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utillog.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.$(OBJEXT)
 nodist_libluajitpplib_a_OBJECTS = $(am__objects_6)
 libluajitpplib_a_OBJECTS = $(nodist_libluajitpplib_a_OBJECTS)
 libluajitsocket_a_AR = $(AR) $(ARFLAGS)
@@ -819,27 +823,31 @@
 libluamisc_a_OBJECTS = $(nodist_libluamisc_a_OBJECTS)
 libluapplib_a_AR = $(AR) $(ARFLAGS)
 libluapplib_a_LIBADD =
-am__objects_12 = luatexdir/luapplib/libluapplib_a-pparray.$(OBJEXT) \
-	luatexdir/luapplib/libluapplib_a-ppcrypt.$(OBJEXT) \
-	luatexdir/luapplib/libluapplib_a-ppdict.$(OBJEXT) \
-	luatexdir/luapplib/libluapplib_a-ppheap.$(OBJEXT) \
-	luatexdir/luapplib/libluapplib_a-ppload.$(OBJEXT) \
-	luatexdir/luapplib/libluapplib_a-ppstream.$(OBJEXT) \
-	luatexdir/luapplib/libluapplib_a-pptest1.$(OBJEXT) \
-	luatexdir/luapplib/libluapplib_a-pptest2.$(OBJEXT) \
-	luatexdir/luapplib/libluapplib_a-pptest3.$(OBJEXT) \
-	luatexdir/luapplib/libluapplib_a-ppxref.$(OBJEXT) \
-	luatexdir/luapplib/util/libluapplib_a-utilbasexx.$(OBJEXT) \
-	luatexdir/luapplib/util/libluapplib_a-utilcrypt.$(OBJEXT) \
-	luatexdir/luapplib/util/libluapplib_a-utilflate.$(OBJEXT) \
-	luatexdir/luapplib/util/libluapplib_a-utilfpred.$(OBJEXT) \
-	luatexdir/luapplib/util/libluapplib_a-utiliof.$(OBJEXT) \
-	luatexdir/luapplib/util/libluapplib_a-utillog.$(OBJEXT) \
-	luatexdir/luapplib/util/libluapplib_a-utillzw.$(OBJEXT) \
-	luatexdir/luapplib/util/libluapplib_a-utilmd5.$(OBJEXT) \
-	luatexdir/luapplib/util/libluapplib_a-utilmem.$(OBJEXT) \
-	luatexdir/luapplib/util/libluapplib_a-utilnumber.$(OBJEXT) \
-	luatexdir/luapplib/util/libluapplib_a-utilsha.$(OBJEXT)
+am__objects_12 =  \
+	luatexdir/luapplib/src/libluapplib_a-pparray.$(OBJEXT) \
+	luatexdir/luapplib/src/libluapplib_a-ppcrypt.$(OBJEXT) \
+	luatexdir/luapplib/src/libluapplib_a-ppdict.$(OBJEXT) \
+	luatexdir/luapplib/src/libluapplib_a-ppheap.$(OBJEXT) \
+	luatexdir/luapplib/src/libluapplib_a-ppload.$(OBJEXT) \
+	luatexdir/luapplib/src/libluapplib_a-ppstream.$(OBJEXT) \
+	luatexdir/luapplib/src/libluapplib_a-pptest1.$(OBJEXT) \
+	luatexdir/luapplib/src/libluapplib_a-pptest2.$(OBJEXT) \
+	luatexdir/luapplib/src/libluapplib_a-pptest3.$(OBJEXT) \
+	luatexdir/luapplib/src/libluapplib_a-ppxref.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utilflate.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utilfpred.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utiliof.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utillog.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utillzw.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utilmd5.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utilmem.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utilnumber.$(OBJEXT) \
+	luatexdir/luapplib/src/util/libluapplib_a-utilsha.$(OBJEXT)
 nodist_libluapplib_a_OBJECTS = $(am__objects_12)
 libluapplib_a_OBJECTS = $(nodist_libluapplib_a_OBJECTS)
 libluasocket_a_AR = $(AR) $(ARFLAGS)
@@ -1266,8 +1274,6 @@
 nodist_etex_OBJECTS = $(am__objects_36) etex-etex-pool.$(OBJEXT)
 etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS)
 @ETEX_SYNCTEX_TRUE at am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
-etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_4)
 am__dist_euptex_SOURCES_DIST = euptexdir/euptexextra.c \
 	euptexdir/euptexextra.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
@@ -1411,7 +1417,7 @@
 nodist_pbibtex_OBJECTS = pbibtex-pbibtex.$(OBJEXT)
 pbibtex_OBJECTS = $(am_pbibtex_OBJECTS) $(nodist_pbibtex_OBJECTS)
 am__DEPENDENCIES_10 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2)
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \
 	pdftexdir/pdftexextra.h pdftexdir/pdftex_version.h \
 	pdftexdir/etex_version.h synctexdir/synctex.c \
@@ -1527,7 +1533,7 @@
 nodist_upbibtex_OBJECTS = upbibtex-upbibtex.$(OBJEXT)
 upbibtex_OBJECTS = $(am_upbibtex_OBJECTS) $(nodist_upbibtex_OBJECTS)
 am__DEPENDENCIES_15 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2)
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 am_updvitype_OBJECTS =
 nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT)
 updvitype_OBJECTS = $(am_updvitype_OBJECTS) \
@@ -1938,48 +1944,54 @@
 	luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5lib.Po \
 	luatexdir/luapeg/$(DEPDIR)/libluajitmisc_a-lpeg.Po \
 	luatexdir/luapeg/$(DEPDIR)/libluamisc_a-lpeg.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pparray.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppdict.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppheap.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppload.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppstream.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest1.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest2.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest3.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppxref.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pparray.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppcrypt.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppdict.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppheap.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppload.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppstream.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest1.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest2.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest3.Po \
-	luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppxref.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillog.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilflate.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilfpred.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utiliof.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillog.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillzw.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmd5.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmem.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilnumber.Po \
-	luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilsha.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pparray.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppdict.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppheap.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppload.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppstream.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest1.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest2.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest3.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppxref.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pparray.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppcrypt.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppdict.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppheap.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppload.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppstream.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest1.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest2.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest3.Po \
+	luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppxref.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillog.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheap.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheapiof.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmeminfo.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilflate.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilfpred.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utiliof.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillog.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillzw.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmd5.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmem.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheap.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheapiof.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmeminfo.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilnumber.Po \
+	luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilsha.Po \
 	luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Po \
 	luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-buffer.Po \
 	luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-compat.Po \
@@ -2597,7 +2609,7 @@
 	vptovf.test weave.test
 am__EXEEXT_44 = $(am__EXEEXT_43) tests/bibtex-openout-test.pl \
 	tests/bibtex-longline-test.pl tests/bibtex-mem.test \
-	tests/bibtex-auxinclude.test
+	tests/bibtex-bigauth.test tests/bibtex-auxinclude.test
 @WEB_TRUE at am__EXEEXT_45 = $(am__EXEEXT_44)
 TEST_SUITE_LOG = test-suite.log
 am__test_logs1 = $(TESTS:=.log)
@@ -2968,16 +2980,18 @@
 	triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
 	ctangleboot.cin cwebboot.cin tangle.test $(web_programs:=.web) \
 	$(web_programs:=.ch) $(web_tests) tests/memdata1.bst \
-	tests/memdata2.bst tests/memdata3.bst tests/auxinclude.aux \
-	tests/auxinclude.bbl tests/auxinclude.bib tests/auxinclude.tex \
-	tests/auxinclude2.aux tests/auxinclude2.tex tests/allbib.aux \
-	tests/allbib.tex tests/apalike.bst tests/badpl.pl \
-	tests/badtfm.tfm tests/badvf.tfm tests/badvf.vf \
-	tests/badvpl.vpl tests/batch.tex tests/check.log \
-	tests/cmr10.600gf tests/cmr10.pk tests/cmr10.pl \
-	tests/cmr10.tfm tests/cmr7.tfm tests/cmr8.tfm tests/cmti10.tfm \
-	tests/cmtt10.tfm tests/cmtt8.tfm tests/dict tests/eight.tex \
-	tests/end.tex tests/exampl.aux tests/exampl.tex tests/gray.tfm \
+	tests/memdata2.bst tests/memdata3.bst tests/bibtex-bigauth.aux \
+	tests/bibtex-bigauth.bib tests/bibtex-bigauth.tex \
+	tests/auxinclude.aux tests/auxinclude.bbl tests/auxinclude.bib \
+	tests/auxinclude.tex tests/auxinclude2.aux \
+	tests/auxinclude2.tex tests/allbib.aux tests/allbib.tex \
+	tests/apalike.bst tests/badpl.pl tests/badtfm.tfm \
+	tests/badvf.tfm tests/badvf.vf tests/badvpl.vpl \
+	tests/batch.tex tests/check.log tests/cmr10.600gf \
+	tests/cmr10.pk tests/cmr10.pl tests/cmr10.tfm tests/cmr7.tfm \
+	tests/cmr8.tfm tests/cmti10.tfm tests/cmtt10.tfm \
+	tests/cmtt8.tfm tests/dict tests/eight.tex tests/end.tex \
+	tests/exampl.aux tests/exampl.tex tests/gray.tfm \
 	tests/hello.tex tests/io.mf tests/just.texi tests/label.mp \
 	tests/label.mpx tests/logo8.tfm tests/longline.aux \
 	tests/longline.bib tests/longline.tex tests/longtfm.tex \
@@ -3535,7 +3549,7 @@
 
 web_tests = $(web_programs:=.test) tests/bibtex-openout-test.pl \
 	tests/bibtex-longline-test.pl tests/bibtex-mem.test \
-	tests/bibtex-auxinclude.test
+	tests/bibtex-bigauth.test tests/bibtex-auxinclude.test
 nodist_bibtex_SOURCES = bibtex.c bibtex.h
 nodist_dvicopy_SOURCES = dvicopy.c dvicopy.h
 nodist_dvitype_SOURCES = dvitype.c dvitype.h
@@ -3585,7 +3599,7 @@
 
 # TeX tests
 #
-tex_tests = triptest.test tests/write18-quote-test.pl
+tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test
 call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\"
 nodist_call_mf_SOURCES = callexe.c
 call_mf_LDADD = 
@@ -3769,10 +3783,11 @@
 	mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
 	mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
 	mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_129)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_129)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_130)
+etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_130)
+etex_DEPENDENCIES = $(ZLIB_DEPEND)
 
 # e-TeX C sources
 etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
@@ -3780,7 +3795,8 @@
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
 	etexdir/etex_version.h $(am__append_132)
 
-# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
+# We must create etexd.h and etexdir/etex_version.h before building the
+# etex_OBJECTS.
 etex_prereq = etexd.h etexdir/etex_version.h $(am__append_131)
 etex_web_srcs = \
 	tex.web \
@@ -3789,6 +3805,7 @@
 etex_ch_srcs = \
 	etexdir/tex.ch0 \
 	tex.ch \
+	zlib-fmt.ch \
 	enctex.ch \
 	$(etex_ch_synctex) \
 	etexdir/tex.ch1 \
@@ -3799,9 +3816,9 @@
 # e-TeX Tests
 #
 etex_tests = etexdir/wprob.test etexdir/etriptest.test
-ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
-ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD)
-ptex_dependencies = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
+ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
+ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ZLIB_LIBS)
+ptex_dependencies = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(ZLIB_DEPEND) $(default_dependencies)
 p_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
 pweb_programs = pbibtex pdvitype ppltotf ptftopl
 pproglib = lib/libp.a
@@ -3823,7 +3840,8 @@
 ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_135)
 ptex_web_srcs = \
 	tex.web \
-	tex.ch
+	tex.ch \
+	zlib-fmt.ch
 
 ptex_ch_srcs = \
 	ptexdir/ptex-base.ch \
@@ -3861,12 +3879,12 @@
 	ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test \
 	ptexdir/skipjfmp.test
 eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
-	$(am__append_141)
+	$(ZLIB_INCLUDES) $(am__append_141)
 
 # With --enable-ipc, e-pTeX may need to link with -lsocket.
 eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(am__append_142)
-eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a
+	$(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_142)
+eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
 
 # e-pTeX C sources
 eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
@@ -3882,6 +3900,7 @@
 	etexdir/etex.ch \
 	etexdir/tex.ch0 \
 	tex.ch \
+	zlib-fmt.ch \
 	etexdir/tex.ech
 
 eptex_ch_srcs = \
@@ -3899,9 +3918,9 @@
 # e-pTeX Tests
 #
 eptex_tests = eptexdir/eptriptest.test eptexdir/pdfprimitive.test eptexdir/epver.test
-uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
-uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD)
-uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
+uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
+uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ZLIB_LIBS)
+uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(ZLIB_DEPEND) $(default_dependencies)
 up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) $(TANGLE)
 upweb_programs = upbibtex updvitype uppltotf uptftopl
 libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
@@ -3923,7 +3942,8 @@
 	uptexdir/uptex_version.h $(am__append_139)
 uptex_web_srcs = \
 	tex.web \
-	tex.ch
+	tex.ch \
+	zlib-fmt.ch
 
 uptex_ch_srcs = \
 	ptexdir/ptex-base.ch \
@@ -3965,12 +3985,12 @@
 	uptexdir/gkhuge.test
 
 euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
-	-I$(srcdir)/libmd5 $(am__append_145)
+	-I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_145)
 
 # With --enable-ipc, e-upTeX may need to link with -lsocket.
 euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(am__append_146)
-euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a
+	$(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_146)
+euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
 
 # e-upTeX C sources
 euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
@@ -3987,6 +4007,7 @@
 	etexdir/etex.ch \
 	etexdir/tex.ch0 \
 	tex.ch \
+	zlib-fmt.ch \
 	etexdir/tex.ech
 
 euptex_ch_srcs = \
@@ -4055,6 +4076,7 @@
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
 	tex.ch \
+	zlib-fmt.ch \
 	enctex.ch \
 	$(pdftex_ch_synctex) \
 	pdftexdir/pdftex.ch \
@@ -4262,12 +4284,12 @@
 LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES)
 LUA_LIBS = $(LUA53_LIBS)
 LUA_DEPEND = $(LUA53_DEPEND)
-libluatex_a_DEPENDENCIES = libff.a libluamisc.a libluaharfbuzz.a
-libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a libluajitharfbuzz.a
+libluatex_a_DEPENDENCIES = libff.a libluamisc.a 
+libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a 
 libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \
 	$(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) -I$(srcdir)/libmd5 \
 	-DpdfTeX -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/unilib \
-	-I$(srcdir)/luatexdir/luapplib/util \
+	-I$(srcdir)/luatexdir/luapplib/src/util \
 	-I$(srcdir)/luatexdir/luafontloader/fontforge/inc \
 	-DLUA_FF_LIB=1 \
 	-I$(srcdir)/luatexdir/luafontloader/fontforge/fontforge \
@@ -4615,13 +4637,13 @@
 #liblua53pplib_a_DEPENDENCIES = $(ZLIB_DEPEND)
 libluajitpplib_a_DEPENDENCIES = $(ZLIB_DEPEND)
 libluapplib_a_CPPFLAGS = \
-	-I$(top_srcdir)/luatexdir/luapplib -I$(top_srcdir)/luatexdir/luapplib/util $(ZLIB_INCLUDES) $(LUA_INCLUDES)
+	-I$(top_srcdir)/luatexdir/luapplib -I$(top_srcdir)/luatexdir/luapplib/src -I$(top_srcdir)/luatexdir/luapplib/src/util $(ZLIB_INCLUDES) $(LUA_INCLUDES)
 
 
 #liblua53pplib_a_CPPFLAGS = \
-#	-I$(top_srcdir)/luatexdir/luapplib -I$(top_srcdir)/luatexdir/luapplib/util $(ZLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
+#	-I$(top_srcdir)/luatexdir/luapplib -I$(top_srcdir)/luatexdir/luapplib/src -I$(top_srcdir)/luatexdir/luapplib/src/util $(ZLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
 libluajitpplib_a_CPPFLAGS = \
-	-I$(top_srcdir)/luatexdir/luapplib -I$(top_srcdir)/luatexdir/luapplib/util $(ZLIB_INCLUDES) $(LUAJIT_INCLUDES)
+	-I$(top_srcdir)/luatexdir/luapplib -I$(top_srcdir)/luatexdir/luapplib/src -I$(top_srcdir)/luatexdir/luapplib/src/util $(ZLIB_INCLUDES) $(LUAJIT_INCLUDES)
 
 libluapplib_a_CFLAGS = # $(WARNING_CFLAGS)
 libluajitpplib_a_CFLAGS = # $(WARNING_CFLAGS)
@@ -4629,53 +4651,60 @@
 #nodist_liblua53pplib_a_SOURCES = $(libluapplib_sources)
 nodist_libluajitpplib_a_SOURCES = $(libluapplib_sources)
 libluapplib_sources = \
-	luatexdir/luapplib/ppapi.h \
-	luatexdir/luapplib/pparray.c \
-	luatexdir/luapplib/pparray.h \
-	luatexdir/luapplib/ppconf.h \
-	luatexdir/luapplib/ppcrypt.c \
-	luatexdir/luapplib/ppcrypt.h \
-	luatexdir/luapplib/ppdict.c \
-	luatexdir/luapplib/ppdict.h \
-	luatexdir/luapplib/ppfilter.h \
-	luatexdir/luapplib/ppheap.c \
-	luatexdir/luapplib/ppheap.h \
-	luatexdir/luapplib/pplib.h \
-	luatexdir/luapplib/ppload.c \
-	luatexdir/luapplib/ppload.h \
-	luatexdir/luapplib/ppstream.c \
-	luatexdir/luapplib/ppstream.h \
-	luatexdir/luapplib/pptest1.c \
-	luatexdir/luapplib/pptest2.c \
-	luatexdir/luapplib/pptest3.c \
-	luatexdir/luapplib/ppxref.c \
-	luatexdir/luapplib/ppxref.h \
-	luatexdir/luapplib/util/utilarm.h \
-	luatexdir/luapplib/util/utilbasexx.c \
-	luatexdir/luapplib/util/utilbasexx.h \
-	luatexdir/luapplib/util/utilcrypt.c \
-	luatexdir/luapplib/util/utilcrypt.h \
-	luatexdir/luapplib/util/utilcryptdef.h \
-	luatexdir/luapplib/util/utildecl.h \
-	luatexdir/luapplib/util/utilflate.c \
-	luatexdir/luapplib/util/utilflate.h \
-	luatexdir/luapplib/util/utilfpred.c \
-	luatexdir/luapplib/util/utilfpred.h \
-	luatexdir/luapplib/util/utiliof.c \
-	luatexdir/luapplib/util/utiliof.h \
-	luatexdir/luapplib/util/utillog.c \
-	luatexdir/luapplib/util/utillog.h \
-	luatexdir/luapplib/util/utillzw.c \
-	luatexdir/luapplib/util/utillzw.h \
-	luatexdir/luapplib/util/utilmd5.c \
-	luatexdir/luapplib/util/utilmd5.h \
-	luatexdir/luapplib/util/utilmem.c \
-	luatexdir/luapplib/util/utilmem.h \
-	luatexdir/luapplib/util/utilnumber.c \
-	luatexdir/luapplib/util/utilnumber.h \
-	luatexdir/luapplib/util/utilplat.h \
-	luatexdir/luapplib/util/utilsha.c \
-	luatexdir/luapplib/util/utilsha.h
+	luatexdir/luapplib/src/ppapi.h \
+	luatexdir/luapplib/src/pparray.c \
+	luatexdir/luapplib/src/pparray.h \
+	luatexdir/luapplib/src/ppconf.h \
+	luatexdir/luapplib/src/ppcrypt.c \
+	luatexdir/luapplib/src/ppcrypt.h \
+	luatexdir/luapplib/src/ppdict.c \
+	luatexdir/luapplib/src/ppdict.h \
+	luatexdir/luapplib/src/ppfilter.h \
+	luatexdir/luapplib/src/ppheap.c \
+	luatexdir/luapplib/src/ppheap.h \
+	luatexdir/luapplib/src/pplib.h \
+	luatexdir/luapplib/src/ppload.c \
+	luatexdir/luapplib/src/ppload.h \
+	luatexdir/luapplib/src/ppstream.c \
+	luatexdir/luapplib/src/ppstream.h \
+	luatexdir/luapplib/src/pptest1.c \
+	luatexdir/luapplib/src/pptest2.c \
+	luatexdir/luapplib/src/pptest3.c \
+	luatexdir/luapplib/src/ppxref.c \
+	luatexdir/luapplib/src/ppxref.h \
+	luatexdir/luapplib/src/util/utilbasexx.c \
+	luatexdir/luapplib/src/util/utilbasexx.h \
+	luatexdir/luapplib/src/util/utilcrypt.c \
+	luatexdir/luapplib/src/util/utilcrypt.h \
+	luatexdir/luapplib/src/util/utilcryptdef.h \
+	luatexdir/luapplib/src/util/utildecl.h \
+	luatexdir/luapplib/src/util/utilflate.c \
+	luatexdir/luapplib/src/util/utilflate.h \
+	luatexdir/luapplib/src/util/utilfpred.c \
+	luatexdir/luapplib/src/util/utilfpred.h \
+	luatexdir/luapplib/src/util/utiliof.c \
+	luatexdir/luapplib/src/util/utiliof.h \
+	luatexdir/luapplib/src/util/utillog.c \
+	luatexdir/luapplib/src/util/utillog.h \
+	luatexdir/luapplib/src/util/utillzw.c \
+	luatexdir/luapplib/src/util/utillzw.h \
+	luatexdir/luapplib/src/util/utilmd5.c \
+	luatexdir/luapplib/src/util/utilmd5.h \
+	luatexdir/luapplib/src/util/utilmem.c \
+	luatexdir/luapplib/src/util/utilmem.h \
+	luatexdir/luapplib/src/util/utilmemallc.h \
+	luatexdir/luapplib/src/util/utilmemallh.h \
+	luatexdir/luapplib/src/util/utilmemheap.c \
+	luatexdir/luapplib/src/util/utilmemheap.h \
+	luatexdir/luapplib/src/util/utilmemheapiof.c \
+	luatexdir/luapplib/src/util/utilmemheapiof.h \
+	luatexdir/luapplib/src/util/utilmeminfo.c \
+	luatexdir/luapplib/src/util/utilmeminfo.h \
+	luatexdir/luapplib/src/util/utilnumber.c \
+	luatexdir/luapplib/src/util/utilnumber.h \
+	luatexdir/luapplib/src/util/utilplat.h \
+	luatexdir/luapplib/src/util/utilsha.c \
+	luatexdir/luapplib/src/util/utilsha.h 
 
 
 #liblua53pplib_sources = $(libluapplib_sources)
@@ -4722,8 +4751,8 @@
 luatex_DEPENDENCIES = $(luatex_depend) libluatex.a libluatexspecific.a
 luajittex_DEPENDENCIES = $(luatex_depend) libluajittex.a libluajittexspecific.a
 luahbtex_depend = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) libmputil.a libmd5.a
-luahbtex_DEPENDENCIES = $(luahbtex_depend) libluatex.a libluahbtexspecific.a
-luajithbtex_DEPENDENCIES = $(luatex_depend) libluajittex.a libluajithbtexspecific.a
+luahbtex_DEPENDENCIES = $(luahbtex_depend) libluatex.a libluahbtexspecific.a libluaharfbuzz.a
+luajithbtex_DEPENDENCIES = $(luatex_depend) libluajittex.a libluajithbtexspecific.a libluajitharfbuzz.a
 nodist_luatex_SOURCES = $(luatex_sources)
 nodist_luajittex_SOURCES = $(luatex_sources)
 nodist_luahbtex_SOURCES = $(luatex_sources)
@@ -5600,81 +5629,90 @@
 	$(AM_V_at)-rm -f libluajitmisc.a
 	$(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libluajitmisc.a
-luatexdir/luapplib/$(am__dirstamp):
-	@$(MKDIR_P) luatexdir/luapplib
-	@: > luatexdir/luapplib/$(am__dirstamp)
-luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) luatexdir/luapplib/$(DEPDIR)
-	@: > luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluajitpplib_a-pparray.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluajitpplib_a-ppcrypt.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluajitpplib_a-ppdict.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluajitpplib_a-ppheap.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluajitpplib_a-ppload.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluajitpplib_a-ppstream.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluajitpplib_a-pptest1.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluajitpplib_a-pptest2.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluajitpplib_a-pptest3.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluajitpplib_a-ppxref.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/$(am__dirstamp):
-	@$(MKDIR_P) luatexdir/luapplib/util
-	@: > luatexdir/luapplib/util/$(am__dirstamp)
-luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) luatexdir/luapplib/util/$(DEPDIR)
-	@: > luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluajitpplib_a-utilflate.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluajitpplib_a-utilfpred.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluajitpplib_a-utiliof.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluajitpplib_a-utillog.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluajitpplib_a-utillzw.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluajitpplib_a-utilmd5.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluajitpplib_a-utilmem.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluajitpplib_a-utilnumber.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluajitpplib_a-utilsha.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/luapplib/src
+	@: > luatexdir/luapplib/src/$(am__dirstamp)
+luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/luapplib/src/$(DEPDIR)
+	@: > luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluajitpplib_a-pparray.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluajitpplib_a-ppdict.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluajitpplib_a-ppheap.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluajitpplib_a-ppload.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluajitpplib_a-ppstream.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluajitpplib_a-pptest1.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluajitpplib_a-pptest2.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluajitpplib_a-pptest3.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluajitpplib_a-ppxref.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/luapplib/src/util
+	@: > luatexdir/luapplib/src/util/$(am__dirstamp)
+luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/luapplib/src/util/$(DEPDIR)
+	@: > luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utillog.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
 
 libluajitpplib.a: $(libluajitpplib_a_OBJECTS) $(libluajitpplib_a_DEPENDENCIES) $(EXTRA_libluajitpplib_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libluajitpplib.a
@@ -6192,69 +6230,78 @@
 	$(AM_V_at)-rm -f libluamisc.a
 	$(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libluamisc.a
-luatexdir/luapplib/libluapplib_a-pparray.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluapplib_a-ppcrypt.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluapplib_a-ppdict.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluapplib_a-ppheap.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluapplib_a-ppload.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluapplib_a-ppstream.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluapplib_a-pptest1.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluapplib_a-pptest2.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluapplib_a-pptest3.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/libluapplib_a-ppxref.$(OBJEXT):  \
-	luatexdir/luapplib/$(am__dirstamp) \
-	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluapplib_a-utilbasexx.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluapplib_a-utilcrypt.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluapplib_a-utilflate.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluapplib_a-utilfpred.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluapplib_a-utiliof.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluapplib_a-utillog.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluapplib_a-utillzw.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluapplib_a-utilmd5.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluapplib_a-utilmem.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluapplib_a-utilnumber.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-luatexdir/luapplib/util/libluapplib_a-utilsha.$(OBJEXT):  \
-	luatexdir/luapplib/util/$(am__dirstamp) \
-	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluapplib_a-pparray.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluapplib_a-ppcrypt.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluapplib_a-ppdict.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluapplib_a-ppheap.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluapplib_a-ppload.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluapplib_a-ppstream.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluapplib_a-pptest1.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluapplib_a-pptest2.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluapplib_a-pptest3.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/libluapplib_a-ppxref.$(OBJEXT):  \
+	luatexdir/luapplib/src/$(am__dirstamp) \
+	luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utilflate.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utilfpred.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utiliof.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utillog.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utillzw.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utilmd5.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utilmem.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utilnumber.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/src/util/libluapplib_a-utilsha.$(OBJEXT):  \
+	luatexdir/luapplib/src/util/$(am__dirstamp) \
+	luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
 
 libluapplib.a: $(libluapplib_a_OBJECTS) $(libluapplib_a_DEPENDENCIES) $(EXTRA_libluapplib_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libluapplib.a
@@ -7399,8 +7446,8 @@
 	-rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/*.$(OBJEXT)
 	-rm -f luatexdir/luamd5/*.$(OBJEXT)
 	-rm -f luatexdir/luapeg/*.$(OBJEXT)
-	-rm -f luatexdir/luapplib/*.$(OBJEXT)
-	-rm -f luatexdir/luapplib/util/*.$(OBJEXT)
+	-rm -f luatexdir/luapplib/src/*.$(OBJEXT)
+	-rm -f luatexdir/luapplib/src/util/*.$(OBJEXT)
 	-rm -f luatexdir/luasocket/src/*.$(OBJEXT)
 	-rm -f luatexdir/luazip/src/*.$(OBJEXT)
 	-rm -f luatexdir/luazlib/*.$(OBJEXT)
@@ -7774,48 +7821,54 @@
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5lib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapeg/$(DEPDIR)/libluajitmisc_a-lpeg.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapeg/$(DEPDIR)/libluamisc_a-lpeg.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pparray.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppdict.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppheap.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppload.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppstream.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest1.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest2.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest3.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppxref.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pparray.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppcrypt.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppdict.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppheap.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppload.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppstream.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest1.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest2.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest3.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppxref.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillog.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilflate.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilfpred.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utiliof.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillog.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillzw.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmd5.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmem.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilnumber.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilsha.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pparray.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppdict.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppheap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppload.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppstream.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest3.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppxref.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pparray.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppcrypt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppdict.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppheap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppload.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppstream.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest3.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppxref.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillog.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheapiof.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmeminfo.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilflate.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilfpred.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utiliof.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillog.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillzw.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmd5.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmem.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheapiof.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmeminfo.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilnumber.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilsha.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-buffer.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-compat.Po at am__quote@ # am--include-marker
@@ -9359,300 +9412,342 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitmisc_a_CPPFLAGS) $(CPPFLAGS) $(libluajitmisc_a_CFLAGS) $(CFLAGS) -c -o luatexdir/slnunicode/libluajitmisc_a-slnunico.obj `if test -f 'luatexdir/slnunicode/slnunico.c'; then $(CYGPATH_W) 'luatexdir/slnunicode/slnunico.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/slnunicode/slnunico.c'; fi`
 
-luatexdir/luapplib/libluajitpplib_a-pparray.o: luatexdir/luapplib/pparray.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-pparray.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pparray.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-pparray.o `test -f 'luatexdir/luapplib/pparray.c' || echo '$(srcdir)/'`luatexdir/luapplib/pparray.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pparray.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pparray.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pparray.c' object='luatexdir/luapplib/libluajitpplib_a-pparray.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-pparray.o: luatexdir/luapplib/src/pparray.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-pparray.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pparray.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-pparray.o `test -f 'luatexdir/luapplib/src/pparray.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pparray.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pparray.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pparray.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pparray.c' object='luatexdir/luapplib/src/libluajitpplib_a-pparray.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-pparray.o `test -f 'luatexdir/luapplib/pparray.c' || echo '$(srcdir)/'`luatexdir/luapplib/pparray.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-pparray.o `test -f 'luatexdir/luapplib/src/pparray.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pparray.c
 
-luatexdir/luapplib/libluajitpplib_a-pparray.obj: luatexdir/luapplib/pparray.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-pparray.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pparray.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-pparray.obj `if test -f 'luatexdir/luapplib/pparray.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pparray.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pparray.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pparray.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pparray.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pparray.c' object='luatexdir/luapplib/libluajitpplib_a-pparray.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-pparray.obj: luatexdir/luapplib/src/pparray.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-pparray.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pparray.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-pparray.obj `if test -f 'luatexdir/luapplib/src/pparray.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pparray.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pparray.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pparray.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pparray.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pparray.c' object='luatexdir/luapplib/src/libluajitpplib_a-pparray.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-pparray.obj `if test -f 'luatexdir/luapplib/pparray.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pparray.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pparray.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-pparray.obj `if test -f 'luatexdir/luapplib/src/pparray.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pparray.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pparray.c'; fi`
 
-luatexdir/luapplib/libluajitpplib_a-ppcrypt.o: luatexdir/luapplib/ppcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppcrypt.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppcrypt.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppcrypt.o `test -f 'luatexdir/luapplib/ppcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppcrypt.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppcrypt.c' object='luatexdir/luapplib/libluajitpplib_a-ppcrypt.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.o: luatexdir/luapplib/src/ppcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppcrypt.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.o `test -f 'luatexdir/luapplib/src/ppcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppcrypt.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppcrypt.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppcrypt.o `test -f 'luatexdir/luapplib/ppcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppcrypt.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.o `test -f 'luatexdir/luapplib/src/ppcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppcrypt.c
 
-luatexdir/luapplib/libluajitpplib_a-ppcrypt.obj: luatexdir/luapplib/ppcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppcrypt.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppcrypt.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppcrypt.obj `if test -f 'luatexdir/luapplib/ppcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppcrypt.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppcrypt.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppcrypt.c' object='luatexdir/luapplib/libluajitpplib_a-ppcrypt.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.obj: luatexdir/luapplib/src/ppcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppcrypt.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.obj `if test -f 'luatexdir/luapplib/src/ppcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppcrypt.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppcrypt.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppcrypt.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppcrypt.obj `if test -f 'luatexdir/luapplib/ppcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppcrypt.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppcrypt.obj `if test -f 'luatexdir/luapplib/src/ppcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppcrypt.c'; fi`
 
-luatexdir/luapplib/libluajitpplib_a-ppdict.o: luatexdir/luapplib/ppdict.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppdict.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppdict.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppdict.o `test -f 'luatexdir/luapplib/ppdict.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppdict.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppdict.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppdict.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppdict.c' object='luatexdir/luapplib/libluajitpplib_a-ppdict.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppdict.o: luatexdir/luapplib/src/ppdict.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppdict.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppdict.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppdict.o `test -f 'luatexdir/luapplib/src/ppdict.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppdict.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppdict.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppdict.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppdict.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppdict.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppdict.o `test -f 'luatexdir/luapplib/ppdict.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppdict.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppdict.o `test -f 'luatexdir/luapplib/src/ppdict.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppdict.c
 
-luatexdir/luapplib/libluajitpplib_a-ppdict.obj: luatexdir/luapplib/ppdict.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppdict.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppdict.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppdict.obj `if test -f 'luatexdir/luapplib/ppdict.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppdict.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppdict.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppdict.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppdict.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppdict.c' object='luatexdir/luapplib/libluajitpplib_a-ppdict.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppdict.obj: luatexdir/luapplib/src/ppdict.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppdict.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppdict.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppdict.obj `if test -f 'luatexdir/luapplib/src/ppdict.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppdict.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppdict.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppdict.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppdict.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppdict.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppdict.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppdict.obj `if test -f 'luatexdir/luapplib/ppdict.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppdict.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppdict.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppdict.obj `if test -f 'luatexdir/luapplib/src/ppdict.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppdict.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppdict.c'; fi`
 
-luatexdir/luapplib/libluajitpplib_a-ppheap.o: luatexdir/luapplib/ppheap.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppheap.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppheap.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppheap.o `test -f 'luatexdir/luapplib/ppheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppheap.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppheap.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppheap.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppheap.c' object='luatexdir/luapplib/libluajitpplib_a-ppheap.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppheap.o: luatexdir/luapplib/src/ppheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppheap.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppheap.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppheap.o `test -f 'luatexdir/luapplib/src/ppheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppheap.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppheap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppheap.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppheap.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppheap.o `test -f 'luatexdir/luapplib/ppheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppheap.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppheap.o `test -f 'luatexdir/luapplib/src/ppheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppheap.c
 
-luatexdir/luapplib/libluajitpplib_a-ppheap.obj: luatexdir/luapplib/ppheap.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppheap.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppheap.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppheap.obj `if test -f 'luatexdir/luapplib/ppheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppheap.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppheap.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppheap.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppheap.c' object='luatexdir/luapplib/libluajitpplib_a-ppheap.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppheap.obj: luatexdir/luapplib/src/ppheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppheap.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppheap.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppheap.obj `if test -f 'luatexdir/luapplib/src/ppheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppheap.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppheap.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppheap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppheap.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppheap.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppheap.obj `if test -f 'luatexdir/luapplib/ppheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppheap.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppheap.obj `if test -f 'luatexdir/luapplib/src/ppheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppheap.c'; fi`
 
-luatexdir/luapplib/libluajitpplib_a-ppload.o: luatexdir/luapplib/ppload.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppload.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppload.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppload.o `test -f 'luatexdir/luapplib/ppload.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppload.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppload.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppload.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppload.c' object='luatexdir/luapplib/libluajitpplib_a-ppload.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppload.o: luatexdir/luapplib/src/ppload.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppload.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppload.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppload.o `test -f 'luatexdir/luapplib/src/ppload.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppload.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppload.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppload.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppload.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppload.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppload.o `test -f 'luatexdir/luapplib/ppload.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppload.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppload.o `test -f 'luatexdir/luapplib/src/ppload.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppload.c
 
-luatexdir/luapplib/libluajitpplib_a-ppload.obj: luatexdir/luapplib/ppload.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppload.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppload.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppload.obj `if test -f 'luatexdir/luapplib/ppload.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppload.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppload.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppload.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppload.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppload.c' object='luatexdir/luapplib/libluajitpplib_a-ppload.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppload.obj: luatexdir/luapplib/src/ppload.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppload.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppload.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppload.obj `if test -f 'luatexdir/luapplib/src/ppload.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppload.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppload.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppload.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppload.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppload.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppload.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppload.obj `if test -f 'luatexdir/luapplib/ppload.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppload.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppload.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppload.obj `if test -f 'luatexdir/luapplib/src/ppload.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppload.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppload.c'; fi`
 
-luatexdir/luapplib/libluajitpplib_a-ppstream.o: luatexdir/luapplib/ppstream.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppstream.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppstream.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppstream.o `test -f 'luatexdir/luapplib/ppstream.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppstream.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppstream.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppstream.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppstream.c' object='luatexdir/luapplib/libluajitpplib_a-ppstream.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppstream.o: luatexdir/luapplib/src/ppstream.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppstream.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppstream.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppstream.o `test -f 'luatexdir/luapplib/src/ppstream.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppstream.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppstream.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppstream.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppstream.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppstream.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppstream.o `test -f 'luatexdir/luapplib/ppstream.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppstream.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppstream.o `test -f 'luatexdir/luapplib/src/ppstream.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppstream.c
 
-luatexdir/luapplib/libluajitpplib_a-ppstream.obj: luatexdir/luapplib/ppstream.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppstream.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppstream.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppstream.obj `if test -f 'luatexdir/luapplib/ppstream.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppstream.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppstream.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppstream.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppstream.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppstream.c' object='luatexdir/luapplib/libluajitpplib_a-ppstream.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppstream.obj: luatexdir/luapplib/src/ppstream.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppstream.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppstream.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppstream.obj `if test -f 'luatexdir/luapplib/src/ppstream.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppstream.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppstream.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppstream.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppstream.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppstream.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppstream.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppstream.obj `if test -f 'luatexdir/luapplib/ppstream.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppstream.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppstream.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppstream.obj `if test -f 'luatexdir/luapplib/src/ppstream.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppstream.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppstream.c'; fi`
 
-luatexdir/luapplib/libluajitpplib_a-pptest1.o: luatexdir/luapplib/pptest1.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-pptest1.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest1.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-pptest1.o `test -f 'luatexdir/luapplib/pptest1.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest1.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest1.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest1.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest1.c' object='luatexdir/luapplib/libluajitpplib_a-pptest1.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-pptest1.o: luatexdir/luapplib/src/pptest1.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-pptest1.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest1.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest1.o `test -f 'luatexdir/luapplib/src/pptest1.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest1.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest1.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest1.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest1.c' object='luatexdir/luapplib/src/libluajitpplib_a-pptest1.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-pptest1.o `test -f 'luatexdir/luapplib/pptest1.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest1.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest1.o `test -f 'luatexdir/luapplib/src/pptest1.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest1.c
 
-luatexdir/luapplib/libluajitpplib_a-pptest1.obj: luatexdir/luapplib/pptest1.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-pptest1.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest1.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-pptest1.obj `if test -f 'luatexdir/luapplib/pptest1.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest1.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest1.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest1.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest1.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest1.c' object='luatexdir/luapplib/libluajitpplib_a-pptest1.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-pptest1.obj: luatexdir/luapplib/src/pptest1.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-pptest1.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest1.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest1.obj `if test -f 'luatexdir/luapplib/src/pptest1.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest1.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest1.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest1.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest1.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest1.c' object='luatexdir/luapplib/src/libluajitpplib_a-pptest1.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-pptest1.obj `if test -f 'luatexdir/luapplib/pptest1.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest1.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest1.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest1.obj `if test -f 'luatexdir/luapplib/src/pptest1.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest1.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest1.c'; fi`
 
-luatexdir/luapplib/libluajitpplib_a-pptest2.o: luatexdir/luapplib/pptest2.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-pptest2.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest2.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-pptest2.o `test -f 'luatexdir/luapplib/pptest2.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest2.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest2.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest2.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest2.c' object='luatexdir/luapplib/libluajitpplib_a-pptest2.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-pptest2.o: luatexdir/luapplib/src/pptest2.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-pptest2.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest2.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest2.o `test -f 'luatexdir/luapplib/src/pptest2.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest2.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest2.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest2.c' object='luatexdir/luapplib/src/libluajitpplib_a-pptest2.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-pptest2.o `test -f 'luatexdir/luapplib/pptest2.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest2.o `test -f 'luatexdir/luapplib/src/pptest2.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest2.c
 
-luatexdir/luapplib/libluajitpplib_a-pptest2.obj: luatexdir/luapplib/pptest2.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-pptest2.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest2.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-pptest2.obj `if test -f 'luatexdir/luapplib/pptest2.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest2.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest2.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest2.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest2.c' object='luatexdir/luapplib/libluajitpplib_a-pptest2.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-pptest2.obj: luatexdir/luapplib/src/pptest2.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-pptest2.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest2.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest2.obj `if test -f 'luatexdir/luapplib/src/pptest2.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest2.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest2.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest2.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest2.c' object='luatexdir/luapplib/src/libluajitpplib_a-pptest2.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-pptest2.obj `if test -f 'luatexdir/luapplib/pptest2.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest2.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest2.obj `if test -f 'luatexdir/luapplib/src/pptest2.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest2.c'; fi`
 
-luatexdir/luapplib/libluajitpplib_a-pptest3.o: luatexdir/luapplib/pptest3.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-pptest3.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest3.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-pptest3.o `test -f 'luatexdir/luapplib/pptest3.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest3.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest3.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest3.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest3.c' object='luatexdir/luapplib/libluajitpplib_a-pptest3.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-pptest3.o: luatexdir/luapplib/src/pptest3.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-pptest3.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest3.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest3.o `test -f 'luatexdir/luapplib/src/pptest3.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest3.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest3.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest3.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest3.c' object='luatexdir/luapplib/src/libluajitpplib_a-pptest3.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-pptest3.o `test -f 'luatexdir/luapplib/pptest3.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest3.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest3.o `test -f 'luatexdir/luapplib/src/pptest3.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest3.c
 
-luatexdir/luapplib/libluajitpplib_a-pptest3.obj: luatexdir/luapplib/pptest3.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-pptest3.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest3.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-pptest3.obj `if test -f 'luatexdir/luapplib/pptest3.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest3.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest3.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest3.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest3.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest3.c' object='luatexdir/luapplib/libluajitpplib_a-pptest3.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-pptest3.obj: luatexdir/luapplib/src/pptest3.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-pptest3.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest3.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest3.obj `if test -f 'luatexdir/luapplib/src/pptest3.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest3.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest3.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest3.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest3.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest3.c' object='luatexdir/luapplib/src/libluajitpplib_a-pptest3.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-pptest3.obj `if test -f 'luatexdir/luapplib/pptest3.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest3.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest3.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-pptest3.obj `if test -f 'luatexdir/luapplib/src/pptest3.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest3.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest3.c'; fi`
 
-luatexdir/luapplib/libluajitpplib_a-ppxref.o: luatexdir/luapplib/ppxref.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppxref.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppxref.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppxref.o `test -f 'luatexdir/luapplib/ppxref.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppxref.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppxref.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppxref.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppxref.c' object='luatexdir/luapplib/libluajitpplib_a-ppxref.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppxref.o: luatexdir/luapplib/src/ppxref.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppxref.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppxref.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppxref.o `test -f 'luatexdir/luapplib/src/ppxref.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppxref.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppxref.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppxref.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppxref.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppxref.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppxref.o `test -f 'luatexdir/luapplib/ppxref.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppxref.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppxref.o `test -f 'luatexdir/luapplib/src/ppxref.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppxref.c
 
-luatexdir/luapplib/libluajitpplib_a-ppxref.obj: luatexdir/luapplib/ppxref.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluajitpplib_a-ppxref.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppxref.Tpo -c -o luatexdir/luapplib/libluajitpplib_a-ppxref.obj `if test -f 'luatexdir/luapplib/ppxref.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppxref.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppxref.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppxref.Tpo luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppxref.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppxref.c' object='luatexdir/luapplib/libluajitpplib_a-ppxref.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluajitpplib_a-ppxref.obj: luatexdir/luapplib/src/ppxref.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluajitpplib_a-ppxref.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppxref.Tpo -c -o luatexdir/luapplib/src/libluajitpplib_a-ppxref.obj `if test -f 'luatexdir/luapplib/src/ppxref.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppxref.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppxref.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppxref.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppxref.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppxref.c' object='luatexdir/luapplib/src/libluajitpplib_a-ppxref.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluajitpplib_a-ppxref.obj `if test -f 'luatexdir/luapplib/ppxref.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppxref.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppxref.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluajitpplib_a-ppxref.obj `if test -f 'luatexdir/luapplib/src/ppxref.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppxref.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppxref.c'; fi`
 
-luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.o: luatexdir/luapplib/util/utilbasexx.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.o `test -f 'luatexdir/luapplib/util/utilbasexx.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilbasexx.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilbasexx.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.o: luatexdir/luapplib/src/util/utilbasexx.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.o `test -f 'luatexdir/luapplib/src/util/utilbasexx.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilbasexx.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilbasexx.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.o `test -f 'luatexdir/luapplib/util/utilbasexx.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilbasexx.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.o `test -f 'luatexdir/luapplib/src/util/utilbasexx.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilbasexx.c
 
-luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.obj: luatexdir/luapplib/util/utilbasexx.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.obj `if test -f 'luatexdir/luapplib/util/utilbasexx.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilbasexx.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilbasexx.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilbasexx.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.obj: luatexdir/luapplib/src/util/utilbasexx.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.obj `if test -f 'luatexdir/luapplib/src/util/utilbasexx.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilbasexx.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilbasexx.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilbasexx.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilbasexx.obj `if test -f 'luatexdir/luapplib/util/utilbasexx.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilbasexx.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilbasexx.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilbasexx.obj `if test -f 'luatexdir/luapplib/src/util/utilbasexx.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilbasexx.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilbasexx.c'; fi`
 
-luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.o: luatexdir/luapplib/util/utilcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.o `test -f 'luatexdir/luapplib/util/utilcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilcrypt.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.o: luatexdir/luapplib/src/util/utilcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.o `test -f 'luatexdir/luapplib/src/util/utilcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilcrypt.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.o `test -f 'luatexdir/luapplib/util/utilcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilcrypt.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.o `test -f 'luatexdir/luapplib/src/util/utilcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilcrypt.c
 
-luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.obj: luatexdir/luapplib/util/utilcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.obj `if test -f 'luatexdir/luapplib/util/utilcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilcrypt.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilcrypt.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.obj: luatexdir/luapplib/src/util/utilcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.obj `if test -f 'luatexdir/luapplib/src/util/utilcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilcrypt.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilcrypt.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilcrypt.obj `if test -f 'luatexdir/luapplib/util/utilcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilcrypt.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilcrypt.obj `if test -f 'luatexdir/luapplib/src/util/utilcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilcrypt.c'; fi`
 
-luatexdir/luapplib/util/libluajitpplib_a-utilflate.o: luatexdir/luapplib/util/utilflate.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilflate.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilflate.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilflate.o `test -f 'luatexdir/luapplib/util/utilflate.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilflate.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilflate.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilflate.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilflate.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.o: luatexdir/luapplib/src/util/utilflate.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilflate.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.o `test -f 'luatexdir/luapplib/src/util/utilflate.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilflate.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilflate.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilflate.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilflate.o `test -f 'luatexdir/luapplib/util/utilflate.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilflate.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.o `test -f 'luatexdir/luapplib/src/util/utilflate.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilflate.c
 
-luatexdir/luapplib/util/libluajitpplib_a-utilflate.obj: luatexdir/luapplib/util/utilflate.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilflate.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilflate.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilflate.obj `if test -f 'luatexdir/luapplib/util/utilflate.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilflate.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilflate.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilflate.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilflate.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilflate.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.obj: luatexdir/luapplib/src/util/utilflate.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilflate.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.obj `if test -f 'luatexdir/luapplib/src/util/utilflate.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilflate.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilflate.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilflate.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilflate.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilflate.obj `if test -f 'luatexdir/luapplib/util/utilflate.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilflate.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilflate.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilflate.obj `if test -f 'luatexdir/luapplib/src/util/utilflate.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilflate.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilflate.c'; fi`
 
-luatexdir/luapplib/util/libluajitpplib_a-utilfpred.o: luatexdir/luapplib/util/utilfpred.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilfpred.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilfpred.o `test -f 'luatexdir/luapplib/util/utilfpred.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilfpred.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilfpred.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilfpred.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.o: luatexdir/luapplib/src/util/utilfpred.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.o `test -f 'luatexdir/luapplib/src/util/utilfpred.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilfpred.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilfpred.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilfpred.o `test -f 'luatexdir/luapplib/util/utilfpred.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilfpred.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.o `test -f 'luatexdir/luapplib/src/util/utilfpred.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilfpred.c
 
-luatexdir/luapplib/util/libluajitpplib_a-utilfpred.obj: luatexdir/luapplib/util/utilfpred.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilfpred.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilfpred.obj `if test -f 'luatexdir/luapplib/util/utilfpred.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilfpred.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilfpred.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilfpred.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilfpred.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.obj: luatexdir/luapplib/src/util/utilfpred.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.obj `if test -f 'luatexdir/luapplib/src/util/utilfpred.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilfpred.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilfpred.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilfpred.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilfpred.obj `if test -f 'luatexdir/luapplib/util/utilfpred.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilfpred.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilfpred.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilfpred.obj `if test -f 'luatexdir/luapplib/src/util/utilfpred.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilfpred.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilfpred.c'; fi`
 
-luatexdir/luapplib/util/libluajitpplib_a-utiliof.o: luatexdir/luapplib/util/utiliof.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utiliof.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utiliof.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utiliof.o `test -f 'luatexdir/luapplib/util/utiliof.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utiliof.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utiliof.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utiliof.c' object='luatexdir/luapplib/util/libluajitpplib_a-utiliof.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.o: luatexdir/luapplib/src/util/utiliof.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utiliof.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.o `test -f 'luatexdir/luapplib/src/util/utiliof.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utiliof.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utiliof.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utiliof.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utiliof.o `test -f 'luatexdir/luapplib/util/utiliof.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utiliof.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.o `test -f 'luatexdir/luapplib/src/util/utiliof.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utiliof.c
 
-luatexdir/luapplib/util/libluajitpplib_a-utiliof.obj: luatexdir/luapplib/util/utiliof.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utiliof.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utiliof.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utiliof.obj `if test -f 'luatexdir/luapplib/util/utiliof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utiliof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utiliof.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utiliof.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utiliof.c' object='luatexdir/luapplib/util/libluajitpplib_a-utiliof.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.obj: luatexdir/luapplib/src/util/utiliof.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utiliof.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.obj `if test -f 'luatexdir/luapplib/src/util/utiliof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utiliof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utiliof.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utiliof.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utiliof.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utiliof.obj `if test -f 'luatexdir/luapplib/util/utiliof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utiliof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utiliof.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utiliof.obj `if test -f 'luatexdir/luapplib/src/util/utiliof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utiliof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utiliof.c'; fi`
 
-luatexdir/luapplib/util/libluajitpplib_a-utillog.o: luatexdir/luapplib/util/utillog.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utillog.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillog.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utillog.o `test -f 'luatexdir/luapplib/util/utillog.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utillog.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillog.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillog.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillog.c' object='luatexdir/luapplib/util/libluajitpplib_a-utillog.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utillog.o: luatexdir/luapplib/src/util/utillog.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utillog.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillog.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utillog.o `test -f 'luatexdir/luapplib/src/util/utillog.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utillog.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillog.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillog.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utillog.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utillog.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utillog.o `test -f 'luatexdir/luapplib/util/utillog.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utillog.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utillog.o `test -f 'luatexdir/luapplib/src/util/utillog.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utillog.c
 
-luatexdir/luapplib/util/libluajitpplib_a-utillog.obj: luatexdir/luapplib/util/utillog.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utillog.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillog.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utillog.obj `if test -f 'luatexdir/luapplib/util/utillog.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utillog.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utillog.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillog.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillog.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillog.c' object='luatexdir/luapplib/util/libluajitpplib_a-utillog.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utillog.obj: luatexdir/luapplib/src/util/utillog.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utillog.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillog.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utillog.obj `if test -f 'luatexdir/luapplib/src/util/utillog.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utillog.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utillog.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillog.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillog.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utillog.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utillog.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utillog.obj `if test -f 'luatexdir/luapplib/util/utillog.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utillog.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utillog.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utillog.obj `if test -f 'luatexdir/luapplib/src/util/utillog.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utillog.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utillog.c'; fi`
 
-luatexdir/luapplib/util/libluajitpplib_a-utillzw.o: luatexdir/luapplib/util/utillzw.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utillzw.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillzw.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utillzw.o `test -f 'luatexdir/luapplib/util/utillzw.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utillzw.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillzw.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillzw.c' object='luatexdir/luapplib/util/libluajitpplib_a-utillzw.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.o: luatexdir/luapplib/src/util/utillzw.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillzw.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.o `test -f 'luatexdir/luapplib/src/util/utillzw.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utillzw.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillzw.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utillzw.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utillzw.o `test -f 'luatexdir/luapplib/util/utillzw.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utillzw.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.o `test -f 'luatexdir/luapplib/src/util/utillzw.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utillzw.c
 
-luatexdir/luapplib/util/libluajitpplib_a-utillzw.obj: luatexdir/luapplib/util/utillzw.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utillzw.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillzw.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utillzw.obj `if test -f 'luatexdir/luapplib/util/utillzw.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utillzw.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utillzw.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillzw.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillzw.c' object='luatexdir/luapplib/util/libluajitpplib_a-utillzw.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.obj: luatexdir/luapplib/src/util/utillzw.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillzw.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.obj `if test -f 'luatexdir/luapplib/src/util/utillzw.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utillzw.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utillzw.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillzw.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utillzw.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utillzw.obj `if test -f 'luatexdir/luapplib/util/utillzw.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utillzw.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utillzw.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utillzw.obj `if test -f 'luatexdir/luapplib/src/util/utillzw.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utillzw.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utillzw.c'; fi`
 
-luatexdir/luapplib/util/libluajitpplib_a-utilmd5.o: luatexdir/luapplib/util/utilmd5.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilmd5.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilmd5.o `test -f 'luatexdir/luapplib/util/utilmd5.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilmd5.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmd5.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilmd5.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.o: luatexdir/luapplib/src/util/utilmd5.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.o `test -f 'luatexdir/luapplib/src/util/utilmd5.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmd5.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmd5.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilmd5.o `test -f 'luatexdir/luapplib/util/utilmd5.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilmd5.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.o `test -f 'luatexdir/luapplib/src/util/utilmd5.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmd5.c
 
-luatexdir/luapplib/util/libluajitpplib_a-utilmd5.obj: luatexdir/luapplib/util/utilmd5.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilmd5.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilmd5.obj `if test -f 'luatexdir/luapplib/util/utilmd5.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilmd5.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilmd5.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmd5.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilmd5.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.obj: luatexdir/luapplib/src/util/utilmd5.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.obj `if test -f 'luatexdir/luapplib/src/util/utilmd5.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmd5.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmd5.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmd5.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilmd5.obj `if test -f 'luatexdir/luapplib/util/utilmd5.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilmd5.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilmd5.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmd5.obj `if test -f 'luatexdir/luapplib/src/util/utilmd5.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmd5.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmd5.c'; fi`
 
-luatexdir/luapplib/util/libluajitpplib_a-utilmem.o: luatexdir/luapplib/util/utilmem.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilmem.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmem.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilmem.o `test -f 'luatexdir/luapplib/util/utilmem.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilmem.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmem.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmem.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilmem.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.o: luatexdir/luapplib/src/util/utilmem.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmem.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.o `test -f 'luatexdir/luapplib/src/util/utilmem.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmem.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmem.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmem.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilmem.o `test -f 'luatexdir/luapplib/util/utilmem.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilmem.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.o `test -f 'luatexdir/luapplib/src/util/utilmem.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmem.c
 
-luatexdir/luapplib/util/libluajitpplib_a-utilmem.obj: luatexdir/luapplib/util/utilmem.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilmem.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmem.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilmem.obj `if test -f 'luatexdir/luapplib/util/utilmem.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilmem.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilmem.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmem.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmem.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilmem.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.obj: luatexdir/luapplib/src/util/utilmem.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmem.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.obj `if test -f 'luatexdir/luapplib/src/util/utilmem.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmem.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmem.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmem.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmem.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilmem.obj `if test -f 'luatexdir/luapplib/util/utilmem.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilmem.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilmem.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmem.obj `if test -f 'luatexdir/luapplib/src/util/utilmem.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmem.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmem.c'; fi`
 
-luatexdir/luapplib/util/libluajitpplib_a-utilnumber.o: luatexdir/luapplib/util/utilnumber.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilnumber.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilnumber.o `test -f 'luatexdir/luapplib/util/utilnumber.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilnumber.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilnumber.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilnumber.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.o: luatexdir/luapplib/src/util/utilmemheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheap.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.o `test -f 'luatexdir/luapplib/src/util/utilmemheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmemheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheap.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmemheap.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilnumber.o `test -f 'luatexdir/luapplib/util/utilnumber.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilnumber.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.o `test -f 'luatexdir/luapplib/src/util/utilmemheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmemheap.c
 
-luatexdir/luapplib/util/libluajitpplib_a-utilnumber.obj: luatexdir/luapplib/util/utilnumber.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilnumber.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilnumber.obj `if test -f 'luatexdir/luapplib/util/utilnumber.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilnumber.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilnumber.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilnumber.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilnumber.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.obj: luatexdir/luapplib/src/util/utilmemheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheap.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.obj `if test -f 'luatexdir/luapplib/src/util/utilmemheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmemheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmemheap.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheap.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmemheap.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilnumber.obj `if test -f 'luatexdir/luapplib/util/utilnumber.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilnumber.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilnumber.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheap.obj `if test -f 'luatexdir/luapplib/src/util/utilmemheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmemheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmemheap.c'; fi`
 
-luatexdir/luapplib/util/libluajitpplib_a-utilsha.o: luatexdir/luapplib/util/utilsha.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilsha.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilsha.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilsha.o `test -f 'luatexdir/luapplib/util/utilsha.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilsha.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilsha.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilsha.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilsha.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.o: luatexdir/luapplib/src/util/utilmemheapiof.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheapiof.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.o `test -f 'luatexdir/luapplib/src/util/utilmemheapiof.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmemheapiof.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheapiof.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheapiof.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmemheapiof.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilsha.o `test -f 'luatexdir/luapplib/util/utilsha.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilsha.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.o `test -f 'luatexdir/luapplib/src/util/utilmemheapiof.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmemheapiof.c
 
-luatexdir/luapplib/util/libluajitpplib_a-utilsha.obj: luatexdir/luapplib/util/utilsha.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluajitpplib_a-utilsha.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilsha.Tpo -c -o luatexdir/luapplib/util/libluajitpplib_a-utilsha.obj `if test -f 'luatexdir/luapplib/util/utilsha.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilsha.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilsha.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilsha.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilsha.c' object='luatexdir/luapplib/util/libluajitpplib_a-utilsha.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.obj: luatexdir/luapplib/src/util/utilmemheapiof.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheapiof.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.obj `if test -f 'luatexdir/luapplib/src/util/utilmemheapiof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmemheapiof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmemheapiof.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheapiof.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheapiof.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmemheapiof.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluajitpplib_a-utilsha.obj `if test -f 'luatexdir/luapplib/util/utilsha.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilsha.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilsha.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmemheapiof.obj `if test -f 'luatexdir/luapplib/src/util/utilmemheapiof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmemheapiof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmemheapiof.c'; fi`
 
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.o: luatexdir/luapplib/src/util/utilmeminfo.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmeminfo.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.o `test -f 'luatexdir/luapplib/src/util/utilmeminfo.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmeminfo.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmeminfo.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmeminfo.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmeminfo.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.o `test -f 'luatexdir/luapplib/src/util/utilmeminfo.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmeminfo.c
+
+luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.obj: luatexdir/luapplib/src/util/utilmeminfo.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmeminfo.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.obj `if test -f 'luatexdir/luapplib/src/util/utilmeminfo.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmeminfo.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmeminfo.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmeminfo.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmeminfo.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmeminfo.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilmeminfo.obj `if test -f 'luatexdir/luapplib/src/util/utilmeminfo.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmeminfo.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmeminfo.c'; fi`
+
+luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.o: luatexdir/luapplib/src/util/utilnumber.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.o `test -f 'luatexdir/luapplib/src/util/utilnumber.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilnumber.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilnumber.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.o `test -f 'luatexdir/luapplib/src/util/utilnumber.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilnumber.c
+
+luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.obj: luatexdir/luapplib/src/util/utilnumber.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.obj `if test -f 'luatexdir/luapplib/src/util/utilnumber.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilnumber.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilnumber.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilnumber.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilnumber.obj `if test -f 'luatexdir/luapplib/src/util/utilnumber.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilnumber.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilnumber.c'; fi`
+
+luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.o: luatexdir/luapplib/src/util/utilsha.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilsha.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.o `test -f 'luatexdir/luapplib/src/util/utilsha.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilsha.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilsha.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilsha.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.o `test -f 'luatexdir/luapplib/src/util/utilsha.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilsha.c
+
+luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.obj: luatexdir/luapplib/src/util/utilsha.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilsha.Tpo -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.obj `if test -f 'luatexdir/luapplib/src/util/utilsha.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilsha.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilsha.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilsha.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilsha.c' object='luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitpplib_a_CPPFLAGS) $(CPPFLAGS) $(libluajitpplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluajitpplib_a-utilsha.obj `if test -f 'luatexdir/luapplib/src/util/utilsha.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilsha.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilsha.c'; fi`
+
 luatexdir/luasocket/src/libluajitsocket_a-auxiliar.o: luatexdir/luasocket/src/auxiliar.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitsocket_a_CPPFLAGS) $(CPPFLAGS) $(libluajitsocket_a_CFLAGS) $(CFLAGS) -MT luatexdir/luasocket/src/libluajitsocket_a-auxiliar.o -MD -MP -MF luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Tpo -c -o luatexdir/luasocket/src/libluajitsocket_a-auxiliar.o `test -f 'luatexdir/luasocket/src/auxiliar.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/auxiliar.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Tpo luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Po
@@ -11641,300 +11736,342 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(libluamisc_a_CFLAGS) $(CFLAGS) -c -o luatexdir/slnunicode/libluamisc_a-slnunico.obj `if test -f 'luatexdir/slnunicode/slnunico.c'; then $(CYGPATH_W) 'luatexdir/slnunicode/slnunico.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/slnunicode/slnunico.c'; fi`
 
-luatexdir/luapplib/libluapplib_a-pparray.o: luatexdir/luapplib/pparray.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-pparray.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pparray.Tpo -c -o luatexdir/luapplib/libluapplib_a-pparray.o `test -f 'luatexdir/luapplib/pparray.c' || echo '$(srcdir)/'`luatexdir/luapplib/pparray.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pparray.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pparray.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pparray.c' object='luatexdir/luapplib/libluapplib_a-pparray.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-pparray.o: luatexdir/luapplib/src/pparray.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-pparray.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pparray.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-pparray.o `test -f 'luatexdir/luapplib/src/pparray.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pparray.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pparray.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pparray.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pparray.c' object='luatexdir/luapplib/src/libluapplib_a-pparray.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-pparray.o `test -f 'luatexdir/luapplib/pparray.c' || echo '$(srcdir)/'`luatexdir/luapplib/pparray.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-pparray.o `test -f 'luatexdir/luapplib/src/pparray.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pparray.c
 
-luatexdir/luapplib/libluapplib_a-pparray.obj: luatexdir/luapplib/pparray.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-pparray.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pparray.Tpo -c -o luatexdir/luapplib/libluapplib_a-pparray.obj `if test -f 'luatexdir/luapplib/pparray.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pparray.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pparray.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pparray.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pparray.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pparray.c' object='luatexdir/luapplib/libluapplib_a-pparray.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-pparray.obj: luatexdir/luapplib/src/pparray.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-pparray.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pparray.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-pparray.obj `if test -f 'luatexdir/luapplib/src/pparray.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pparray.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pparray.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pparray.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pparray.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pparray.c' object='luatexdir/luapplib/src/libluapplib_a-pparray.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-pparray.obj `if test -f 'luatexdir/luapplib/pparray.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pparray.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pparray.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-pparray.obj `if test -f 'luatexdir/luapplib/src/pparray.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pparray.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pparray.c'; fi`
 
-luatexdir/luapplib/libluapplib_a-ppcrypt.o: luatexdir/luapplib/ppcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppcrypt.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppcrypt.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppcrypt.o `test -f 'luatexdir/luapplib/ppcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppcrypt.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppcrypt.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppcrypt.c' object='luatexdir/luapplib/libluapplib_a-ppcrypt.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppcrypt.o: luatexdir/luapplib/src/ppcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppcrypt.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppcrypt.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppcrypt.o `test -f 'luatexdir/luapplib/src/ppcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppcrypt.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppcrypt.c' object='luatexdir/luapplib/src/libluapplib_a-ppcrypt.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppcrypt.o `test -f 'luatexdir/luapplib/ppcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppcrypt.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppcrypt.o `test -f 'luatexdir/luapplib/src/ppcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppcrypt.c
 
-luatexdir/luapplib/libluapplib_a-ppcrypt.obj: luatexdir/luapplib/ppcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppcrypt.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppcrypt.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppcrypt.obj `if test -f 'luatexdir/luapplib/ppcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppcrypt.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppcrypt.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppcrypt.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppcrypt.c' object='luatexdir/luapplib/libluapplib_a-ppcrypt.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppcrypt.obj: luatexdir/luapplib/src/ppcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppcrypt.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppcrypt.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppcrypt.obj `if test -f 'luatexdir/luapplib/src/ppcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppcrypt.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppcrypt.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppcrypt.c' object='luatexdir/luapplib/src/libluapplib_a-ppcrypt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppcrypt.obj `if test -f 'luatexdir/luapplib/ppcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppcrypt.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppcrypt.obj `if test -f 'luatexdir/luapplib/src/ppcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppcrypt.c'; fi`
 
-luatexdir/luapplib/libluapplib_a-ppdict.o: luatexdir/luapplib/ppdict.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppdict.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppdict.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppdict.o `test -f 'luatexdir/luapplib/ppdict.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppdict.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppdict.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppdict.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppdict.c' object='luatexdir/luapplib/libluapplib_a-ppdict.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppdict.o: luatexdir/luapplib/src/ppdict.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppdict.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppdict.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppdict.o `test -f 'luatexdir/luapplib/src/ppdict.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppdict.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppdict.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppdict.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppdict.c' object='luatexdir/luapplib/src/libluapplib_a-ppdict.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppdict.o `test -f 'luatexdir/luapplib/ppdict.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppdict.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppdict.o `test -f 'luatexdir/luapplib/src/ppdict.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppdict.c
 
-luatexdir/luapplib/libluapplib_a-ppdict.obj: luatexdir/luapplib/ppdict.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppdict.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppdict.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppdict.obj `if test -f 'luatexdir/luapplib/ppdict.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppdict.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppdict.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppdict.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppdict.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppdict.c' object='luatexdir/luapplib/libluapplib_a-ppdict.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppdict.obj: luatexdir/luapplib/src/ppdict.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppdict.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppdict.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppdict.obj `if test -f 'luatexdir/luapplib/src/ppdict.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppdict.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppdict.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppdict.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppdict.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppdict.c' object='luatexdir/luapplib/src/libluapplib_a-ppdict.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppdict.obj `if test -f 'luatexdir/luapplib/ppdict.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppdict.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppdict.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppdict.obj `if test -f 'luatexdir/luapplib/src/ppdict.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppdict.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppdict.c'; fi`
 
-luatexdir/luapplib/libluapplib_a-ppheap.o: luatexdir/luapplib/ppheap.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppheap.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppheap.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppheap.o `test -f 'luatexdir/luapplib/ppheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppheap.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppheap.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppheap.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppheap.c' object='luatexdir/luapplib/libluapplib_a-ppheap.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppheap.o: luatexdir/luapplib/src/ppheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppheap.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppheap.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppheap.o `test -f 'luatexdir/luapplib/src/ppheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppheap.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppheap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppheap.c' object='luatexdir/luapplib/src/libluapplib_a-ppheap.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppheap.o `test -f 'luatexdir/luapplib/ppheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppheap.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppheap.o `test -f 'luatexdir/luapplib/src/ppheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppheap.c
 
-luatexdir/luapplib/libluapplib_a-ppheap.obj: luatexdir/luapplib/ppheap.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppheap.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppheap.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppheap.obj `if test -f 'luatexdir/luapplib/ppheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppheap.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppheap.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppheap.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppheap.c' object='luatexdir/luapplib/libluapplib_a-ppheap.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppheap.obj: luatexdir/luapplib/src/ppheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppheap.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppheap.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppheap.obj `if test -f 'luatexdir/luapplib/src/ppheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppheap.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppheap.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppheap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppheap.c' object='luatexdir/luapplib/src/libluapplib_a-ppheap.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppheap.obj `if test -f 'luatexdir/luapplib/ppheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppheap.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppheap.obj `if test -f 'luatexdir/luapplib/src/ppheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppheap.c'; fi`
 
-luatexdir/luapplib/libluapplib_a-ppload.o: luatexdir/luapplib/ppload.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppload.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppload.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppload.o `test -f 'luatexdir/luapplib/ppload.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppload.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppload.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppload.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppload.c' object='luatexdir/luapplib/libluapplib_a-ppload.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppload.o: luatexdir/luapplib/src/ppload.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppload.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppload.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppload.o `test -f 'luatexdir/luapplib/src/ppload.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppload.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppload.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppload.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppload.c' object='luatexdir/luapplib/src/libluapplib_a-ppload.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppload.o `test -f 'luatexdir/luapplib/ppload.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppload.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppload.o `test -f 'luatexdir/luapplib/src/ppload.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppload.c
 
-luatexdir/luapplib/libluapplib_a-ppload.obj: luatexdir/luapplib/ppload.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppload.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppload.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppload.obj `if test -f 'luatexdir/luapplib/ppload.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppload.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppload.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppload.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppload.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppload.c' object='luatexdir/luapplib/libluapplib_a-ppload.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppload.obj: luatexdir/luapplib/src/ppload.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppload.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppload.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppload.obj `if test -f 'luatexdir/luapplib/src/ppload.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppload.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppload.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppload.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppload.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppload.c' object='luatexdir/luapplib/src/libluapplib_a-ppload.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppload.obj `if test -f 'luatexdir/luapplib/ppload.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppload.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppload.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppload.obj `if test -f 'luatexdir/luapplib/src/ppload.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppload.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppload.c'; fi`
 
-luatexdir/luapplib/libluapplib_a-ppstream.o: luatexdir/luapplib/ppstream.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppstream.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppstream.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppstream.o `test -f 'luatexdir/luapplib/ppstream.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppstream.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppstream.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppstream.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppstream.c' object='luatexdir/luapplib/libluapplib_a-ppstream.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppstream.o: luatexdir/luapplib/src/ppstream.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppstream.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppstream.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppstream.o `test -f 'luatexdir/luapplib/src/ppstream.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppstream.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppstream.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppstream.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppstream.c' object='luatexdir/luapplib/src/libluapplib_a-ppstream.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppstream.o `test -f 'luatexdir/luapplib/ppstream.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppstream.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppstream.o `test -f 'luatexdir/luapplib/src/ppstream.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppstream.c
 
-luatexdir/luapplib/libluapplib_a-ppstream.obj: luatexdir/luapplib/ppstream.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppstream.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppstream.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppstream.obj `if test -f 'luatexdir/luapplib/ppstream.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppstream.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppstream.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppstream.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppstream.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppstream.c' object='luatexdir/luapplib/libluapplib_a-ppstream.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppstream.obj: luatexdir/luapplib/src/ppstream.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppstream.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppstream.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppstream.obj `if test -f 'luatexdir/luapplib/src/ppstream.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppstream.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppstream.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppstream.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppstream.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppstream.c' object='luatexdir/luapplib/src/libluapplib_a-ppstream.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppstream.obj `if test -f 'luatexdir/luapplib/ppstream.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppstream.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppstream.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppstream.obj `if test -f 'luatexdir/luapplib/src/ppstream.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppstream.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppstream.c'; fi`
 
-luatexdir/luapplib/libluapplib_a-pptest1.o: luatexdir/luapplib/pptest1.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-pptest1.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest1.Tpo -c -o luatexdir/luapplib/libluapplib_a-pptest1.o `test -f 'luatexdir/luapplib/pptest1.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest1.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest1.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest1.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest1.c' object='luatexdir/luapplib/libluapplib_a-pptest1.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-pptest1.o: luatexdir/luapplib/src/pptest1.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-pptest1.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest1.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-pptest1.o `test -f 'luatexdir/luapplib/src/pptest1.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest1.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest1.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest1.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest1.c' object='luatexdir/luapplib/src/libluapplib_a-pptest1.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-pptest1.o `test -f 'luatexdir/luapplib/pptest1.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest1.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-pptest1.o `test -f 'luatexdir/luapplib/src/pptest1.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest1.c
 
-luatexdir/luapplib/libluapplib_a-pptest1.obj: luatexdir/luapplib/pptest1.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-pptest1.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest1.Tpo -c -o luatexdir/luapplib/libluapplib_a-pptest1.obj `if test -f 'luatexdir/luapplib/pptest1.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest1.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest1.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest1.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest1.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest1.c' object='luatexdir/luapplib/libluapplib_a-pptest1.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-pptest1.obj: luatexdir/luapplib/src/pptest1.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-pptest1.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest1.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-pptest1.obj `if test -f 'luatexdir/luapplib/src/pptest1.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest1.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest1.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest1.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest1.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest1.c' object='luatexdir/luapplib/src/libluapplib_a-pptest1.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-pptest1.obj `if test -f 'luatexdir/luapplib/pptest1.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest1.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest1.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-pptest1.obj `if test -f 'luatexdir/luapplib/src/pptest1.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest1.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest1.c'; fi`
 
-luatexdir/luapplib/libluapplib_a-pptest2.o: luatexdir/luapplib/pptest2.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-pptest2.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest2.Tpo -c -o luatexdir/luapplib/libluapplib_a-pptest2.o `test -f 'luatexdir/luapplib/pptest2.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest2.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest2.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest2.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest2.c' object='luatexdir/luapplib/libluapplib_a-pptest2.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-pptest2.o: luatexdir/luapplib/src/pptest2.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-pptest2.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest2.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-pptest2.o `test -f 'luatexdir/luapplib/src/pptest2.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest2.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest2.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest2.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest2.c' object='luatexdir/luapplib/src/libluapplib_a-pptest2.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-pptest2.o `test -f 'luatexdir/luapplib/pptest2.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest2.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-pptest2.o `test -f 'luatexdir/luapplib/src/pptest2.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest2.c
 
-luatexdir/luapplib/libluapplib_a-pptest2.obj: luatexdir/luapplib/pptest2.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-pptest2.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest2.Tpo -c -o luatexdir/luapplib/libluapplib_a-pptest2.obj `if test -f 'luatexdir/luapplib/pptest2.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest2.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest2.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest2.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest2.c' object='luatexdir/luapplib/libluapplib_a-pptest2.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-pptest2.obj: luatexdir/luapplib/src/pptest2.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-pptest2.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest2.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-pptest2.obj `if test -f 'luatexdir/luapplib/src/pptest2.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest2.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest2.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest2.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest2.c' object='luatexdir/luapplib/src/libluapplib_a-pptest2.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-pptest2.obj `if test -f 'luatexdir/luapplib/pptest2.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest2.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-pptest2.obj `if test -f 'luatexdir/luapplib/src/pptest2.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest2.c'; fi`
 
-luatexdir/luapplib/libluapplib_a-pptest3.o: luatexdir/luapplib/pptest3.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-pptest3.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest3.Tpo -c -o luatexdir/luapplib/libluapplib_a-pptest3.o `test -f 'luatexdir/luapplib/pptest3.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest3.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest3.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest3.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest3.c' object='luatexdir/luapplib/libluapplib_a-pptest3.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-pptest3.o: luatexdir/luapplib/src/pptest3.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-pptest3.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest3.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-pptest3.o `test -f 'luatexdir/luapplib/src/pptest3.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest3.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest3.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest3.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest3.c' object='luatexdir/luapplib/src/libluapplib_a-pptest3.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-pptest3.o `test -f 'luatexdir/luapplib/pptest3.c' || echo '$(srcdir)/'`luatexdir/luapplib/pptest3.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-pptest3.o `test -f 'luatexdir/luapplib/src/pptest3.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/pptest3.c
 
-luatexdir/luapplib/libluapplib_a-pptest3.obj: luatexdir/luapplib/pptest3.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-pptest3.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest3.Tpo -c -o luatexdir/luapplib/libluapplib_a-pptest3.obj `if test -f 'luatexdir/luapplib/pptest3.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest3.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest3.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest3.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest3.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pptest3.c' object='luatexdir/luapplib/libluapplib_a-pptest3.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-pptest3.obj: luatexdir/luapplib/src/pptest3.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-pptest3.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest3.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-pptest3.obj `if test -f 'luatexdir/luapplib/src/pptest3.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest3.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest3.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest3.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest3.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/pptest3.c' object='luatexdir/luapplib/src/libluapplib_a-pptest3.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-pptest3.obj `if test -f 'luatexdir/luapplib/pptest3.c'; then $(CYGPATH_W) 'luatexdir/luapplib/pptest3.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/pptest3.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-pptest3.obj `if test -f 'luatexdir/luapplib/src/pptest3.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/pptest3.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/pptest3.c'; fi`
 
-luatexdir/luapplib/libluapplib_a-ppxref.o: luatexdir/luapplib/ppxref.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppxref.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppxref.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppxref.o `test -f 'luatexdir/luapplib/ppxref.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppxref.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppxref.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppxref.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppxref.c' object='luatexdir/luapplib/libluapplib_a-ppxref.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppxref.o: luatexdir/luapplib/src/ppxref.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppxref.o -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppxref.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppxref.o `test -f 'luatexdir/luapplib/src/ppxref.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppxref.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppxref.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppxref.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppxref.c' object='luatexdir/luapplib/src/libluapplib_a-ppxref.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppxref.o `test -f 'luatexdir/luapplib/ppxref.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppxref.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppxref.o `test -f 'luatexdir/luapplib/src/ppxref.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/ppxref.c
 
-luatexdir/luapplib/libluapplib_a-ppxref.obj: luatexdir/luapplib/ppxref.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/libluapplib_a-ppxref.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppxref.Tpo -c -o luatexdir/luapplib/libluapplib_a-ppxref.obj `if test -f 'luatexdir/luapplib/ppxref.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppxref.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppxref.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppxref.Tpo luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppxref.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppxref.c' object='luatexdir/luapplib/libluapplib_a-ppxref.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/libluapplib_a-ppxref.obj: luatexdir/luapplib/src/ppxref.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/libluapplib_a-ppxref.obj -MD -MP -MF luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppxref.Tpo -c -o luatexdir/luapplib/src/libluapplib_a-ppxref.obj `if test -f 'luatexdir/luapplib/src/ppxref.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppxref.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppxref.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppxref.Tpo luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppxref.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/ppxref.c' object='luatexdir/luapplib/src/libluapplib_a-ppxref.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/libluapplib_a-ppxref.obj `if test -f 'luatexdir/luapplib/ppxref.c'; then $(CYGPATH_W) 'luatexdir/luapplib/ppxref.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/ppxref.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/libluapplib_a-ppxref.obj `if test -f 'luatexdir/luapplib/src/ppxref.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/ppxref.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/ppxref.c'; fi`
 
-luatexdir/luapplib/util/libluapplib_a-utilbasexx.o: luatexdir/luapplib/util/utilbasexx.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilbasexx.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilbasexx.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilbasexx.o `test -f 'luatexdir/luapplib/util/utilbasexx.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilbasexx.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilbasexx.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilbasexx.c' object='luatexdir/luapplib/util/libluapplib_a-utilbasexx.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.o: luatexdir/luapplib/src/util/utilbasexx.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilbasexx.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.o `test -f 'luatexdir/luapplib/src/util/utilbasexx.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilbasexx.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilbasexx.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilbasexx.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilbasexx.o `test -f 'luatexdir/luapplib/util/utilbasexx.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilbasexx.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.o `test -f 'luatexdir/luapplib/src/util/utilbasexx.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilbasexx.c
 
-luatexdir/luapplib/util/libluapplib_a-utilbasexx.obj: luatexdir/luapplib/util/utilbasexx.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilbasexx.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilbasexx.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilbasexx.obj `if test -f 'luatexdir/luapplib/util/utilbasexx.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilbasexx.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilbasexx.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilbasexx.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilbasexx.c' object='luatexdir/luapplib/util/libluapplib_a-utilbasexx.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.obj: luatexdir/luapplib/src/util/utilbasexx.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilbasexx.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.obj `if test -f 'luatexdir/luapplib/src/util/utilbasexx.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilbasexx.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilbasexx.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilbasexx.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilbasexx.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilbasexx.obj `if test -f 'luatexdir/luapplib/util/utilbasexx.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilbasexx.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilbasexx.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilbasexx.obj `if test -f 'luatexdir/luapplib/src/util/utilbasexx.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilbasexx.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilbasexx.c'; fi`
 
-luatexdir/luapplib/util/libluapplib_a-utilcrypt.o: luatexdir/luapplib/util/utilcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilcrypt.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilcrypt.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilcrypt.o `test -f 'luatexdir/luapplib/util/utilcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilcrypt.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilcrypt.c' object='luatexdir/luapplib/util/libluapplib_a-utilcrypt.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.o: luatexdir/luapplib/src/util/utilcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilcrypt.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.o `test -f 'luatexdir/luapplib/src/util/utilcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilcrypt.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilcrypt.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilcrypt.o `test -f 'luatexdir/luapplib/util/utilcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilcrypt.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.o `test -f 'luatexdir/luapplib/src/util/utilcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilcrypt.c
 
-luatexdir/luapplib/util/libluapplib_a-utilcrypt.obj: luatexdir/luapplib/util/utilcrypt.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilcrypt.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilcrypt.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilcrypt.obj `if test -f 'luatexdir/luapplib/util/utilcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilcrypt.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilcrypt.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilcrypt.c' object='luatexdir/luapplib/util/libluapplib_a-utilcrypt.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.obj: luatexdir/luapplib/src/util/utilcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilcrypt.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.obj `if test -f 'luatexdir/luapplib/src/util/utilcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilcrypt.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilcrypt.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilcrypt.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilcrypt.obj `if test -f 'luatexdir/luapplib/util/utilcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilcrypt.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilcrypt.obj `if test -f 'luatexdir/luapplib/src/util/utilcrypt.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilcrypt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilcrypt.c'; fi`
 
-luatexdir/luapplib/util/libluapplib_a-utilflate.o: luatexdir/luapplib/util/utilflate.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilflate.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilflate.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilflate.o `test -f 'luatexdir/luapplib/util/utilflate.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilflate.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilflate.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilflate.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilflate.c' object='luatexdir/luapplib/util/libluapplib_a-utilflate.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilflate.o: luatexdir/luapplib/src/util/utilflate.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilflate.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilflate.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilflate.o `test -f 'luatexdir/luapplib/src/util/utilflate.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilflate.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilflate.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilflate.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilflate.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilflate.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilflate.o `test -f 'luatexdir/luapplib/util/utilflate.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilflate.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilflate.o `test -f 'luatexdir/luapplib/src/util/utilflate.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilflate.c
 
-luatexdir/luapplib/util/libluapplib_a-utilflate.obj: luatexdir/luapplib/util/utilflate.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilflate.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilflate.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilflate.obj `if test -f 'luatexdir/luapplib/util/utilflate.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilflate.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilflate.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilflate.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilflate.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilflate.c' object='luatexdir/luapplib/util/libluapplib_a-utilflate.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilflate.obj: luatexdir/luapplib/src/util/utilflate.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilflate.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilflate.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilflate.obj `if test -f 'luatexdir/luapplib/src/util/utilflate.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilflate.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilflate.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilflate.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilflate.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilflate.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilflate.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilflate.obj `if test -f 'luatexdir/luapplib/util/utilflate.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilflate.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilflate.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilflate.obj `if test -f 'luatexdir/luapplib/src/util/utilflate.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilflate.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilflate.c'; fi`
 
-luatexdir/luapplib/util/libluapplib_a-utilfpred.o: luatexdir/luapplib/util/utilfpred.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilfpred.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilfpred.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilfpred.o `test -f 'luatexdir/luapplib/util/utilfpred.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilfpred.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilfpred.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilfpred.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilfpred.c' object='luatexdir/luapplib/util/libluapplib_a-utilfpred.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilfpred.o: luatexdir/luapplib/src/util/utilfpred.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilfpred.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilfpred.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilfpred.o `test -f 'luatexdir/luapplib/src/util/utilfpred.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilfpred.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilfpred.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilfpred.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilfpred.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilfpred.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilfpred.o `test -f 'luatexdir/luapplib/util/utilfpred.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilfpred.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilfpred.o `test -f 'luatexdir/luapplib/src/util/utilfpred.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilfpred.c
 
-luatexdir/luapplib/util/libluapplib_a-utilfpred.obj: luatexdir/luapplib/util/utilfpred.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilfpred.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilfpred.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilfpred.obj `if test -f 'luatexdir/luapplib/util/utilfpred.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilfpred.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilfpred.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilfpred.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilfpred.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilfpred.c' object='luatexdir/luapplib/util/libluapplib_a-utilfpred.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilfpred.obj: luatexdir/luapplib/src/util/utilfpred.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilfpred.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilfpred.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilfpred.obj `if test -f 'luatexdir/luapplib/src/util/utilfpred.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilfpred.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilfpred.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilfpred.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilfpred.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilfpred.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilfpred.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilfpred.obj `if test -f 'luatexdir/luapplib/util/utilfpred.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilfpred.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilfpred.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilfpred.obj `if test -f 'luatexdir/luapplib/src/util/utilfpred.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilfpred.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilfpred.c'; fi`
 
-luatexdir/luapplib/util/libluapplib_a-utiliof.o: luatexdir/luapplib/util/utiliof.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utiliof.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utiliof.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utiliof.o `test -f 'luatexdir/luapplib/util/utiliof.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utiliof.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utiliof.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utiliof.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utiliof.c' object='luatexdir/luapplib/util/libluapplib_a-utiliof.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utiliof.o: luatexdir/luapplib/src/util/utiliof.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utiliof.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utiliof.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utiliof.o `test -f 'luatexdir/luapplib/src/util/utiliof.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utiliof.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utiliof.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utiliof.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utiliof.c' object='luatexdir/luapplib/src/util/libluapplib_a-utiliof.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utiliof.o `test -f 'luatexdir/luapplib/util/utiliof.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utiliof.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utiliof.o `test -f 'luatexdir/luapplib/src/util/utiliof.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utiliof.c
 
-luatexdir/luapplib/util/libluapplib_a-utiliof.obj: luatexdir/luapplib/util/utiliof.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utiliof.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utiliof.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utiliof.obj `if test -f 'luatexdir/luapplib/util/utiliof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utiliof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utiliof.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utiliof.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utiliof.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utiliof.c' object='luatexdir/luapplib/util/libluapplib_a-utiliof.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utiliof.obj: luatexdir/luapplib/src/util/utiliof.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utiliof.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utiliof.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utiliof.obj `if test -f 'luatexdir/luapplib/src/util/utiliof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utiliof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utiliof.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utiliof.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utiliof.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utiliof.c' object='luatexdir/luapplib/src/util/libluapplib_a-utiliof.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utiliof.obj `if test -f 'luatexdir/luapplib/util/utiliof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utiliof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utiliof.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utiliof.obj `if test -f 'luatexdir/luapplib/src/util/utiliof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utiliof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utiliof.c'; fi`
 
-luatexdir/luapplib/util/libluapplib_a-utillog.o: luatexdir/luapplib/util/utillog.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utillog.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillog.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utillog.o `test -f 'luatexdir/luapplib/util/utillog.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utillog.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillog.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillog.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillog.c' object='luatexdir/luapplib/util/libluapplib_a-utillog.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utillog.o: luatexdir/luapplib/src/util/utillog.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utillog.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillog.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utillog.o `test -f 'luatexdir/luapplib/src/util/utillog.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utillog.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillog.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillog.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utillog.c' object='luatexdir/luapplib/src/util/libluapplib_a-utillog.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utillog.o `test -f 'luatexdir/luapplib/util/utillog.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utillog.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utillog.o `test -f 'luatexdir/luapplib/src/util/utillog.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utillog.c
 
-luatexdir/luapplib/util/libluapplib_a-utillog.obj: luatexdir/luapplib/util/utillog.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utillog.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillog.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utillog.obj `if test -f 'luatexdir/luapplib/util/utillog.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utillog.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utillog.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillog.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillog.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillog.c' object='luatexdir/luapplib/util/libluapplib_a-utillog.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utillog.obj: luatexdir/luapplib/src/util/utillog.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utillog.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillog.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utillog.obj `if test -f 'luatexdir/luapplib/src/util/utillog.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utillog.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utillog.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillog.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillog.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utillog.c' object='luatexdir/luapplib/src/util/libluapplib_a-utillog.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utillog.obj `if test -f 'luatexdir/luapplib/util/utillog.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utillog.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utillog.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utillog.obj `if test -f 'luatexdir/luapplib/src/util/utillog.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utillog.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utillog.c'; fi`
 
-luatexdir/luapplib/util/libluapplib_a-utillzw.o: luatexdir/luapplib/util/utillzw.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utillzw.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillzw.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utillzw.o `test -f 'luatexdir/luapplib/util/utillzw.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utillzw.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillzw.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillzw.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillzw.c' object='luatexdir/luapplib/util/libluapplib_a-utillzw.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utillzw.o: luatexdir/luapplib/src/util/utillzw.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utillzw.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillzw.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utillzw.o `test -f 'luatexdir/luapplib/src/util/utillzw.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utillzw.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillzw.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillzw.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utillzw.c' object='luatexdir/luapplib/src/util/libluapplib_a-utillzw.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utillzw.o `test -f 'luatexdir/luapplib/util/utillzw.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utillzw.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utillzw.o `test -f 'luatexdir/luapplib/src/util/utillzw.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utillzw.c
 
-luatexdir/luapplib/util/libluapplib_a-utillzw.obj: luatexdir/luapplib/util/utillzw.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utillzw.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillzw.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utillzw.obj `if test -f 'luatexdir/luapplib/util/utillzw.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utillzw.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utillzw.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillzw.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillzw.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillzw.c' object='luatexdir/luapplib/util/libluapplib_a-utillzw.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utillzw.obj: luatexdir/luapplib/src/util/utillzw.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utillzw.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillzw.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utillzw.obj `if test -f 'luatexdir/luapplib/src/util/utillzw.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utillzw.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utillzw.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillzw.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillzw.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utillzw.c' object='luatexdir/luapplib/src/util/libluapplib_a-utillzw.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utillzw.obj `if test -f 'luatexdir/luapplib/util/utillzw.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utillzw.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utillzw.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utillzw.obj `if test -f 'luatexdir/luapplib/src/util/utillzw.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utillzw.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utillzw.c'; fi`
 
-luatexdir/luapplib/util/libluapplib_a-utilmd5.o: luatexdir/luapplib/util/utilmd5.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilmd5.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmd5.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilmd5.o `test -f 'luatexdir/luapplib/util/utilmd5.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilmd5.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmd5.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmd5.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmd5.c' object='luatexdir/luapplib/util/libluapplib_a-utilmd5.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilmd5.o: luatexdir/luapplib/src/util/utilmd5.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilmd5.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmd5.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmd5.o `test -f 'luatexdir/luapplib/src/util/utilmd5.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmd5.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmd5.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmd5.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmd5.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilmd5.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilmd5.o `test -f 'luatexdir/luapplib/util/utilmd5.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilmd5.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmd5.o `test -f 'luatexdir/luapplib/src/util/utilmd5.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmd5.c
 
-luatexdir/luapplib/util/libluapplib_a-utilmd5.obj: luatexdir/luapplib/util/utilmd5.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilmd5.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmd5.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilmd5.obj `if test -f 'luatexdir/luapplib/util/utilmd5.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilmd5.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilmd5.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmd5.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmd5.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmd5.c' object='luatexdir/luapplib/util/libluapplib_a-utilmd5.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilmd5.obj: luatexdir/luapplib/src/util/utilmd5.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilmd5.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmd5.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmd5.obj `if test -f 'luatexdir/luapplib/src/util/utilmd5.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmd5.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmd5.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmd5.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmd5.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmd5.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilmd5.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilmd5.obj `if test -f 'luatexdir/luapplib/util/utilmd5.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilmd5.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilmd5.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmd5.obj `if test -f 'luatexdir/luapplib/src/util/utilmd5.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmd5.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmd5.c'; fi`
 
-luatexdir/luapplib/util/libluapplib_a-utilmem.o: luatexdir/luapplib/util/utilmem.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilmem.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmem.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilmem.o `test -f 'luatexdir/luapplib/util/utilmem.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilmem.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmem.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmem.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmem.c' object='luatexdir/luapplib/util/libluapplib_a-utilmem.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilmem.o: luatexdir/luapplib/src/util/utilmem.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilmem.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmem.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmem.o `test -f 'luatexdir/luapplib/src/util/utilmem.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmem.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmem.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmem.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmem.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilmem.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilmem.o `test -f 'luatexdir/luapplib/util/utilmem.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilmem.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmem.o `test -f 'luatexdir/luapplib/src/util/utilmem.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmem.c
 
-luatexdir/luapplib/util/libluapplib_a-utilmem.obj: luatexdir/luapplib/util/utilmem.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilmem.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmem.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilmem.obj `if test -f 'luatexdir/luapplib/util/utilmem.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilmem.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilmem.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmem.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmem.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmem.c' object='luatexdir/luapplib/util/libluapplib_a-utilmem.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilmem.obj: luatexdir/luapplib/src/util/utilmem.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilmem.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmem.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmem.obj `if test -f 'luatexdir/luapplib/src/util/utilmem.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmem.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmem.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmem.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmem.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmem.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilmem.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilmem.obj `if test -f 'luatexdir/luapplib/util/utilmem.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilmem.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilmem.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmem.obj `if test -f 'luatexdir/luapplib/src/util/utilmem.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmem.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmem.c'; fi`
 
-luatexdir/luapplib/util/libluapplib_a-utilnumber.o: luatexdir/luapplib/util/utilnumber.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilnumber.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilnumber.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilnumber.o `test -f 'luatexdir/luapplib/util/utilnumber.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilnumber.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilnumber.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilnumber.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilnumber.c' object='luatexdir/luapplib/util/libluapplib_a-utilnumber.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.o: luatexdir/luapplib/src/util/utilmemheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheap.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.o `test -f 'luatexdir/luapplib/src/util/utilmemheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmemheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheap.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmemheap.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilnumber.o `test -f 'luatexdir/luapplib/util/utilnumber.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilnumber.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.o `test -f 'luatexdir/luapplib/src/util/utilmemheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmemheap.c
 
-luatexdir/luapplib/util/libluapplib_a-utilnumber.obj: luatexdir/luapplib/util/utilnumber.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilnumber.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilnumber.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilnumber.obj `if test -f 'luatexdir/luapplib/util/utilnumber.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilnumber.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilnumber.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilnumber.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilnumber.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilnumber.c' object='luatexdir/luapplib/util/libluapplib_a-utilnumber.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.obj: luatexdir/luapplib/src/util/utilmemheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheap.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.obj `if test -f 'luatexdir/luapplib/src/util/utilmemheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmemheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmemheap.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheap.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmemheap.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilnumber.obj `if test -f 'luatexdir/luapplib/util/utilnumber.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilnumber.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilnumber.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmemheap.obj `if test -f 'luatexdir/luapplib/src/util/utilmemheap.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmemheap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmemheap.c'; fi`
 
-luatexdir/luapplib/util/libluapplib_a-utilsha.o: luatexdir/luapplib/util/utilsha.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilsha.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilsha.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilsha.o `test -f 'luatexdir/luapplib/util/utilsha.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilsha.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilsha.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilsha.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilsha.c' object='luatexdir/luapplib/util/libluapplib_a-utilsha.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.o: luatexdir/luapplib/src/util/utilmemheapiof.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheapiof.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.o `test -f 'luatexdir/luapplib/src/util/utilmemheapiof.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmemheapiof.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheapiof.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheapiof.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmemheapiof.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilsha.o `test -f 'luatexdir/luapplib/util/utilsha.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilsha.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.o `test -f 'luatexdir/luapplib/src/util/utilmemheapiof.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmemheapiof.c
 
-luatexdir/luapplib/util/libluapplib_a-utilsha.obj: luatexdir/luapplib/util/utilsha.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/libluapplib_a-utilsha.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilsha.Tpo -c -o luatexdir/luapplib/util/libluapplib_a-utilsha.obj `if test -f 'luatexdir/luapplib/util/utilsha.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilsha.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilsha.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilsha.Tpo luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilsha.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilsha.c' object='luatexdir/luapplib/util/libluapplib_a-utilsha.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.obj: luatexdir/luapplib/src/util/utilmemheapiof.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheapiof.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.obj `if test -f 'luatexdir/luapplib/src/util/utilmemheapiof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmemheapiof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmemheapiof.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheapiof.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheapiof.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmemheapiof.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/libluapplib_a-utilsha.obj `if test -f 'luatexdir/luapplib/util/utilsha.c'; then $(CYGPATH_W) 'luatexdir/luapplib/util/utilsha.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/util/utilsha.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmemheapiof.obj `if test -f 'luatexdir/luapplib/src/util/utilmemheapiof.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmemheapiof.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmemheapiof.c'; fi`
 
+luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.o: luatexdir/luapplib/src/util/utilmeminfo.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmeminfo.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.o `test -f 'luatexdir/luapplib/src/util/utilmeminfo.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmeminfo.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmeminfo.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmeminfo.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmeminfo.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.o `test -f 'luatexdir/luapplib/src/util/utilmeminfo.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilmeminfo.c
+
+luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.obj: luatexdir/luapplib/src/util/utilmeminfo.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmeminfo.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.obj `if test -f 'luatexdir/luapplib/src/util/utilmeminfo.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmeminfo.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmeminfo.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmeminfo.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmeminfo.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilmeminfo.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilmeminfo.obj `if test -f 'luatexdir/luapplib/src/util/utilmeminfo.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilmeminfo.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilmeminfo.c'; fi`
+
+luatexdir/luapplib/src/util/libluapplib_a-utilnumber.o: luatexdir/luapplib/src/util/utilnumber.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilnumber.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilnumber.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilnumber.o `test -f 'luatexdir/luapplib/src/util/utilnumber.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilnumber.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilnumber.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilnumber.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilnumber.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilnumber.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilnumber.o `test -f 'luatexdir/luapplib/src/util/utilnumber.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilnumber.c
+
+luatexdir/luapplib/src/util/libluapplib_a-utilnumber.obj: luatexdir/luapplib/src/util/utilnumber.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilnumber.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilnumber.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilnumber.obj `if test -f 'luatexdir/luapplib/src/util/utilnumber.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilnumber.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilnumber.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilnumber.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilnumber.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilnumber.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilnumber.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilnumber.obj `if test -f 'luatexdir/luapplib/src/util/utilnumber.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilnumber.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilnumber.c'; fi`
+
+luatexdir/luapplib/src/util/libluapplib_a-utilsha.o: luatexdir/luapplib/src/util/utilsha.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilsha.o -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilsha.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilsha.o `test -f 'luatexdir/luapplib/src/util/utilsha.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilsha.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilsha.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilsha.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilsha.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilsha.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilsha.o `test -f 'luatexdir/luapplib/src/util/utilsha.c' || echo '$(srcdir)/'`luatexdir/luapplib/src/util/utilsha.c
+
+luatexdir/luapplib/src/util/libluapplib_a-utilsha.obj: luatexdir/luapplib/src/util/utilsha.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/src/util/libluapplib_a-utilsha.obj -MD -MP -MF luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilsha.Tpo -c -o luatexdir/luapplib/src/util/libluapplib_a-utilsha.obj `if test -f 'luatexdir/luapplib/src/util/utilsha.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilsha.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilsha.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilsha.Tpo luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilsha.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/src/util/utilsha.c' object='luatexdir/luapplib/src/util/libluapplib_a-utilsha.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluapplib_a_CPPFLAGS) $(CPPFLAGS) $(libluapplib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/src/util/libluapplib_a-utilsha.obj `if test -f 'luatexdir/luapplib/src/util/utilsha.c'; then $(CYGPATH_W) 'luatexdir/luapplib/src/util/utilsha.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapplib/src/util/utilsha.c'; fi`
+
 luatexdir/luasocket/src/libluasocket_a-auxiliar.o: luatexdir/luasocket/src/auxiliar.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(libluasocket_a_CFLAGS) $(CFLAGS) -MT luatexdir/luasocket/src/libluasocket_a-auxiliar.o -MD -MP -MF luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-auxiliar.Tpo -c -o luatexdir/luasocket/src/libluasocket_a-auxiliar.o `test -f 'luatexdir/luasocket/src/auxiliar.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/auxiliar.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-auxiliar.Tpo luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-auxiliar.Po
@@ -17367,10 +17504,10 @@
 	-rm -f luatexdir/luamd5/$(am__dirstamp)
 	-rm -f luatexdir/luapeg/$(DEPDIR)/$(am__dirstamp)
 	-rm -f luatexdir/luapeg/$(am__dirstamp)
-	-rm -f luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
-	-rm -f luatexdir/luapplib/$(am__dirstamp)
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
-	-rm -f luatexdir/luapplib/util/$(am__dirstamp)
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f luatexdir/luapplib/src/$(am__dirstamp)
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/$(am__dirstamp)
+	-rm -f luatexdir/luapplib/src/util/$(am__dirstamp)
 	-rm -f luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
 	-rm -f luatexdir/luasocket/src/$(am__dirstamp)
 	-rm -f luatexdir/luazip/src/$(DEPDIR)/$(am__dirstamp)
@@ -17770,48 +17907,54 @@
 	-rm -f luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5lib.Po
 	-rm -f luatexdir/luapeg/$(DEPDIR)/libluajitmisc_a-lpeg.Po
 	-rm -f luatexdir/luapeg/$(DEPDIR)/libluamisc_a-lpeg.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pparray.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppdict.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppheap.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppload.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppstream.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest1.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest2.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest3.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppxref.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pparray.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppcrypt.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppdict.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppheap.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppload.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppstream.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest1.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest2.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest3.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppxref.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillog.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilflate.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilfpred.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utiliof.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillog.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillzw.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmd5.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmem.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilnumber.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilsha.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pparray.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppdict.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppheap.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppload.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppstream.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest1.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest2.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest3.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppxref.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pparray.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppcrypt.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppdict.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppheap.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppload.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppstream.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest1.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest2.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest3.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppxref.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillog.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheap.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheapiof.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmeminfo.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilflate.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilfpred.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utiliof.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillog.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillzw.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmd5.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmem.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheap.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheapiof.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmeminfo.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilnumber.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilsha.Po
 	-rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Po
 	-rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-buffer.Po
 	-rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-compat.Po
@@ -18464,48 +18607,54 @@
 	-rm -f luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5lib.Po
 	-rm -f luatexdir/luapeg/$(DEPDIR)/libluajitmisc_a-lpeg.Po
 	-rm -f luatexdir/luapeg/$(DEPDIR)/libluamisc_a-lpeg.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pparray.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppdict.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppheap.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppload.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppstream.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest1.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest2.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-pptest3.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluajitpplib_a-ppxref.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pparray.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppcrypt.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppdict.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppheap.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppload.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppstream.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest1.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest2.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-pptest3.Po
-	-rm -f luatexdir/luapplib/$(DEPDIR)/libluapplib_a-ppxref.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillog.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilflate.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilfpred.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utiliof.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillog.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utillzw.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmd5.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilmem.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilnumber.Po
-	-rm -f luatexdir/luapplib/util/$(DEPDIR)/libluapplib_a-utilsha.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pparray.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppcrypt.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppdict.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppheap.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppload.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppstream.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest1.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest2.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-pptest3.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluajitpplib_a-ppxref.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pparray.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppcrypt.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppdict.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppheap.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppload.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppstream.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest1.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest2.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-pptest3.Po
+	-rm -f luatexdir/luapplib/src/$(DEPDIR)/libluapplib_a-ppxref.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilbasexx.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilcrypt.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilflate.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilfpred.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utiliof.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillog.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utillzw.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmd5.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmem.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheap.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmemheapiof.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilmeminfo.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilnumber.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluajitpplib_a-utilsha.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilbasexx.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilcrypt.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilflate.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilfpred.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utiliof.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillog.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utillzw.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmd5.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmem.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheap.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmemheapiof.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilmeminfo.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilnumber.Po
+	-rm -f luatexdir/luapplib/src/util/$(DEPDIR)/libluapplib_a-utilsha.Po
 	-rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Po
 	-rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-buffer.Po
 	-rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-compat.Po
@@ -18915,6 +19064,7 @@
 	$(tangle) bibtex bibtex
 bibtex.log tests/bibtex-openout-test.log tests/bibtex-longline-test.log \
 	tests/bibtex-mem.log \
+	tests/bibtex-bigauth.log \
 	tests/bibtex-auxinclude.log: bibtex$(EXEEXT)
 dvicopy.c dvicopy.h: dvicopy-web2c
 	@$(web2c) dvicopy
@@ -19059,7 +19209,7 @@
 tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
 	$(tie_c) $(tex_ch_srcs)
 triptest.log: tex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
-tests/write18-quote-test.log: tex$(EXEEXT)
+tests/write18-quote-test.log tests/tex-closeout.test: tex$(EXEEXT)
 
 trip.diffs: tex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
@@ -19886,7 +20036,7 @@
 synctexdir/synctex.log: synctex$(EXEEXT)
 libmd5/md5.log: md5main$(EXEEXT)
 
-# $Id: Makefile.in 52388 2019-10-15 12:54:51Z hironobu $
+# $Id: Makefile.in 53791 2020-02-15 21:46:35Z karl $
 # am/bin_links.am: Makefile fragment for bindir links.
 .PHONY: install-bin-links uninstall-bin-links
 

Modified: branches/stable/source/src/texk/web2c/NEWS
===================================================================
--- branches/stable/source/src/texk/web2c/NEWS	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/NEWS	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,8 +1,29 @@
 This file records noteworthy changes.  (Public domain.)
 
-

+2020 (for TeX Live 2020)
+* \input now also accepts a group-delimited filename, e.g.,
+\input{foo.tex}. The usage with a standard space/token-delimited
+filename is completely unchanged.
+
+The group-delimited name was previously implemented in LuaTeX; now it is
+available in all engines. ASCII double quote characters (") are removed
+from the filename, but it is otherwise left unchanged after
+tokenization. This does not currently impact LaTeX's \input command, as
+that is a macro redefinition of the standard \input primitive.
+
 * New cross-engine option -cnf-line=STR.
 
+* All TeX engines except tex and etex now compress (with zlib) .fmt files
+  (XeTeX and LuaTeX already did so).
+
+pTeX (and all variants): new primitives \ifjfont and \iftfont.
+eptex, euptex: new primitives \Uchar, \Ucharcat, \current(x)spacingmode,
+  \ifincsname; revise \fontchar?? and \iffontchar.
+euptex only: new primitive  \currentcjktoken.
+
+BibTeX: now reallocates on large (>20k) field values instead of aborting.
+
+

 2019 (for TeX Live 2019,  7 April 2019)
 BibTeX: subsidiary .aux files are looked for in the directory of the
 main .aux file, if not found as-is (to work better with -output-directory).

Modified: branches/stable/source/src/texk/web2c/ac/web2c.ac
===================================================================
--- branches/stable/source/src/texk/web2c/ac/web2c.ac	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/ac/web2c.ac	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,4 +1,4 @@
-# $Id: web2c.ac 51577 2019-07-08 06:07:11Z lscarso $
+# $Id: web2c.ac 53078 2019-12-10 18:39:13Z karl $
 # texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 dnl
 dnl Copyright 2016-2019 Karl Berry <tex-live at tug.org>
@@ -30,13 +30,13 @@
 dnl [PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS]
 m4_define([kpse_tex_progs], [dnl
 [[tex],       [yes], [no],  [TeX],        []],
-[[etex],      [no],  [yes], [e-TeX],      []],
-[[ptex],      [yes], [yes], [pTeX],       [ptexenc]],
-[[eptex],     [yes], [yes], [e-pTeX],     [ptexenc]],
-[[uptex],     [yes], [yes], [upTeX],      [ptexenc]],
-[[euptex],    [yes], [yes], [e-upTeX],    [ptexenc]],
+[[etex],      [no],  [yes], [e-TeX],      [zlib]],
+[[ptex],      [yes], [yes], [pTeX],       [ptexenc zlib]],
+[[eptex],     [yes], [yes], [e-pTeX],     [ptexenc zlib]],
+[[uptex],     [yes], [yes], [upTeX],      [ptexenc zlib]],
+[[euptex],    [yes], [yes], [e-upTeX],    [ptexenc zlib]],
 [[aleph],     [yes], [],    [Aleph],      []],
-[[pdftex],    [yes], [yes], [pdfTeX],     [xpdf libpng]],
+[[pdftex],    [yes], [yes], [pdfTeX],     [xpdf libpng zlib]],
 [[luatex],    [yes], [],    [LuaTeX],     [libpng zziplib lua53]],
 [[luajittex], [yes], [],    [LuaJITTeX],  [libpng zziplib luajit]],
 [[luahbtex],    [yes], [],    [LuaHBTeX],     [libpng zziplib lua53 harfbuzz]],

Modified: branches/stable/source/src/texk/web2c/am/texmf.am
===================================================================
--- branches/stable/source/src/texk/web2c/am/texmf.am	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/am/texmf.am	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,8 @@
+## $Id: texmf.am 53155 2019-12-17 19:24:59Z karl $
 ## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF.
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2019 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## Common for MF and TeX
@@ -73,9 +75,9 @@
 
 # TeX tests
 #
-tex_tests = triptest.test tests/write18-quote-test.pl
+tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test
 triptest.log: tex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
-tests/write18-quote-test.log: tex$(EXEEXT)
+tests/write18-quote-test.log tests/tex-closeout.test: tex$(EXEEXT)
 EXTRA_DIST += $(tex_tests)
 EXTRA_DIST += tests/write18-quote.tex
 if TEX

Modified: branches/stable/source/src/texk/web2c/am/web.am
===================================================================
--- branches/stable/source/src/texk/web2c/am/web.am	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/am/web.am	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,8 @@
-## texk/web2c/am/web.am: Makefile fragment for normal web programs (except tangle).
+## $Id: web.am 53153 2019-12-17 19:05:32Z karl $
+## texk/web2c/am/web.am: Makefile fragment for the standard web programs --
+## except tangle.
 ##
-## Copyright 2018 Karl Berry <tex-live at tug.org>
+## Copyright 2018-2019 Karl Berry <tex-live at tug.org>
 ## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 
@@ -29,9 +31,11 @@
 	$(tangle) bibtex bibtex
 web_tests += tests/bibtex-openout-test.pl tests/bibtex-longline-test.pl
 web_tests += tests/bibtex-mem.test
+web_tests += tests/bibtex-bigauth.test
 web_tests += tests/bibtex-auxinclude.test
 bibtex.log tests/bibtex-openout-test.log tests/bibtex-longline-test.log \
 	tests/bibtex-mem.log \
+	tests/bibtex-bigauth.log \
 	tests/bibtex-auxinclude.log: bibtex$(EXEEXT)
 
 nodist_dvicopy_SOURCES = dvicopy.c dvicopy.h
@@ -184,6 +188,9 @@
 ## tests/bibtex-mem.test
 EXTRA_DIST += tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst
 DISTCLEANFILES += tests/memtest.bib tests/memtest?.*
+## tests/bibtex-bigauth.test
+EXTRA_DIST += tests/bibtex-bigauth.aux tests/bibtex-bigauth.bib
+EXTRA_DIST += tests/bibtex-bigauth.tex
 ## tests/bibtex-auxinclinde.test
 EXTRA_DIST += tests/auxinclude.aux tests/auxinclude.bbl tests/auxinclude.bib
 EXTRA_DIST += tests/auxinclude.tex tests/auxinclude2.aux tests/auxinclude2.tex

Modified: branches/stable/source/src/texk/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/configure	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/configure	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C 2020/dev.
+# Generated by GNU Autoconf 2.69 for Web2C 2020.
 #
 # Report bugs to <tex-k at tug.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='Web2C'
 PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2020/dev'
-PACKAGE_STRING='Web2C 2020/dev'
+PACKAGE_VERSION='2020'
+PACKAGE_STRING='Web2C 2020'
 PACKAGE_BUGREPORT='tex-k at tug.org'
 PACKAGE_URL=''
 
@@ -1620,7 +1620,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Web2C 2020/dev to adapt to many kinds of systems.
+\`configure' configures Web2C 2020 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1694,7 +1694,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Web2C 2020/dev:";;
+     short | recursive ) echo "Configuration of Web2C 2020:";;
    esac
   cat <<\_ACEOF
 
@@ -1917,7 +1917,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Web2C configure 2020/dev
+Web2C configure 2020
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3006,7 +3006,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Web2C $as_me 2020/dev, which was
+It was created by Web2C $as_me 2020, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3387,7 +3387,7 @@
 
 
 
-WEB2CVERSION=2020/dev
+WEB2CVERSION=2020
 
 
 am__api_version='1.16'
@@ -8696,7 +8696,7 @@
 
 # Define the identity of the package.
  PACKAGE='web2c'
- VERSION='2020/dev'
+ VERSION='2020'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18600,7 +18600,7 @@
 
 # Include additional code for web2c.
 
-# $Id: web2c.ac 51577 2019-07-08 06:07:11Z lscarso $
+# $Id: web2c.ac 53078 2019-12-10 18:39:13Z karl $
 # texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options for TeX and MF
 
@@ -18656,6 +18656,10 @@
 if test "${enable_etex_synctex+set}" = set; then :
   enableval=$enable_etex_synctex;
 fi
+
+test "x$enable_web2c:$enable_etex" = xyes:yes && {
+  need_zlib=yes
+}
 # Check whether --enable-ptex was given.
 if test "${enable_ptex+set}" = set; then :
   enableval=$enable_ptex;
@@ -18674,6 +18678,7 @@
 
 test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-eptex was given.
 if test "${enable_eptex+set}" = set; then :
@@ -18693,6 +18698,7 @@
 
 test "x$enable_web2c:$enable_eptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-uptex was given.
 if test "${enable_uptex+set}" = set; then :
@@ -18712,6 +18718,7 @@
 
 test "x$enable_web2c:$enable_uptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-euptex was given.
 if test "${enable_euptex+set}" = set; then :
@@ -18731,6 +18738,7 @@
 
 test "x$enable_web2c:$enable_euptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-aleph was given.
 if test "${enable_aleph+set}" = set; then :
@@ -18761,6 +18769,7 @@
 test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
+  need_zlib=yes
 }
 # Check whether --enable-luatex was given.
 if test "${enable_luatex+set}" = set; then :
@@ -23679,7 +23688,7 @@
 Report bugs to <bug-libtool at gnu.org>."
 
 lt_cl_version="\
-Web2C config.lt 2020/dev
+Web2C config.lt 2020
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -27125,7 +27134,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Web2C $as_me 2020/dev, which was
+This file was extended by Web2C $as_me 2020, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27195,7 +27204,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Web2C config.status 2020/dev
+Web2C config.status 2020
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: branches/stable/source/src/texk/web2c/ctangleboot.cin
===================================================================
--- branches/stable/source/src/texk/web2c/ctangleboot.cin	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/ctangleboot.cin	2020-02-18 19:11:23 UTC (rev 820)
@@ -814,7 +814,7 @@
 if((C_file= fopen(check_file_name,"wb"))==NULL)
 fatal(_("! Cannot open output file "),check_file_name);
 
-printf("\n(%s)",output_file_name);update_terminal;
+if(show_progress){printf("\n(%s)",output_file_name);update_terminal;}
 cur_line= 1;
 stack_ptr= stack+1;
 cur_name= (*an_output_file);

Modified: branches/stable/source/src/texk/web2c/cwebboot.cin
===================================================================
--- branches/stable/source/src/texk/web2c/cwebboot.cin	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/cwebboot.cin	2020-02-18 19:11:23 UTC (rev 820)
@@ -1445,7 +1445,7 @@
 
 printversionandexit(cb_banner,
 program==ctwill?"Donald E. Knuth":"Silvio Levy and Donald E. Knuth",
-NULL,NULL);
+NULL,"Contemporary development on https://github.com/ascherer/cwebbin.\n");
 
 
 /*:96*/

Modified: branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ChangeLog	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/cwebdir/ChangeLog	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,3 +1,7 @@
+2020-02-01  Andreas Scherer  <https://ascherer.github.io>
+
+	* ctang-w2c.ch: Fix verbosity bug in ctangle.
+
 2019-05-29  Andreas Scherer  <https://ascherer.github.io>
 
 	* comm-w2c.ch, comm-w2c.h: Minor changes.

Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch	2020-02-18 19:11:23 UTC (rev 820)
@@ -1378,7 +1378,7 @@
 @<Display version information and |exit|@>=
 printversionandexit(cb_banner,
   program == ctwill ? "Donald E. Knuth" : "Silvio Levy and Donald E. Knuth",
-  NULL, NULL);
+  NULL, "Contemporary development on https://github.com/ascherer/cwebbin.\n");
 @.--version@>
 
 @ But the ``banner'' is, at least the first part.

Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch	2020-02-18 19:11:23 UTC (rev 820)
@@ -315,7 +315,7 @@
     if((C_file=fopen(check_file_name,"wb"))==NULL)
       fatal(_("! Cannot open output file "),check_file_name);
 @.Cannot open output file@>
-    printf("\n(%s)",output_file_name); update_terminal;
+    if (show_progress) { printf("\n(%s)",output_file_name); update_terminal; }
     cur_line=1;
     stack_ptr=stack+1;
     cur_name= (*an_output_file);

Modified: branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot	2020-02-18 19:11:23 UTC (rev 820)
@@ -517,15 +517,15 @@
 msgstr ""
 
 #: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 3.64 [CWEBbin 2019])"
+msgid "This is CTANGLE (Version 3.64 [CWEBbin 2020])"
 msgstr ""
 
 #: cweav-i18n.ch:17
-msgid "This is CWEAVE (Version 3.64 [CWEBbin 2019])"
+msgid "This is CWEAVE (Version 3.64 [CWEBbin 2020])"
 msgstr ""
 
 #: cweav-twill.ch:68
-msgid "This is CTWILL (Version 3.64 [CWEBbin 2019])"
+msgid "This is CTWILL (Version 3.64 [CWEBbin 2020])"
 msgstr ""
 
 #: cweav-i18n.ch:301 cweav-i18n.ch:309

Modified: branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po	2020-02-18 19:11:23 UTC (rev 820)
@@ -594,16 +594,16 @@
 msgstr "Sortieren:"
 
 #: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 3.64 [CWEBbin 2019])"
-msgstr "Dies ist CTANGLE (Version 3.64 [CWEBbin 2019])"
+msgid "This is CTANGLE (Version 3.64 [CWEBbin 2020])"
+msgstr "Dies ist CTANGLE (Version 3.64 [CWEBbin 2020])"
 
 #: cweav-i18n.ch:17
-msgid "This is CWEAVE (Version 3.64 [CWEBbin 2019])"
-msgstr "Dies ist CWEAVE (Version 3.64 [CWEBbin 2019])"
+msgid "This is CWEAVE (Version 3.64 [CWEBbin 2020])"
+msgstr "Dies ist CWEAVE (Version 3.64 [CWEBbin 2020])"
 
 #: cweav-twill.ch:68
-msgid "This is CTWILL (Version 3.64 [CWEBbin 2019])"
-msgstr "Dies ist CTWILL (Version 3.64 [CWEBbin 2019])"
+msgid "This is CTWILL (Version 3.64 [CWEBbin 2020])"
+msgstr "Dies ist CTWILL (Version 3.64 [CWEBbin 2020])"
 
 #: cweav-i18n.ch:301 cweav-i18n.ch:309
 msgid "buffer"

Modified: branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po	2020-02-18 19:11:23 UTC (rev 820)
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: CWEBbin 2019\n"
+"Project-Id-Version: CWEBbin 2020\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-18 16:57+0100\n"
-"PO-Revision-Date: 2019-01-18 16:57+0100\n"
+"PO-Revision-Date: 2019-09-22 17:08+0200\n"
 "Last-Translator: Andreas Scherer <andreas_github at freenet.de>\n"
 "Language-Team: Italian\n"
 "Language: it\n"
@@ -595,16 +595,16 @@
 msgstr "Ordinamento:"
 
 #: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 3.64 [CWEBbin 2019])"
-msgstr "Questo è CTANGLE (Versione 3.64 [CWEBbin 2019])"
+msgid "This is CTANGLE (Version 3.64 [CWEBbin 2020])"
+msgstr "Questo è CTANGLE (Versione 3.64 [CWEBbin 2020])"
 
 #: cweav-i18n.ch:17
-msgid "This is CWEAVE (Version 3.64 [CWEBbin 2019])"
-msgstr "Questo è CWEAVE (Versione 3.64 [CWEBbin 2019])"
+msgid "This is CWEAVE (Version 3.64 [CWEBbin 2020])"
+msgstr "Questo è CWEAVE (Versione 3.64 [CWEBbin 2020])"
 
 #: cweav-twill.ch:68
-msgid "This is CTWILL (Version 3.64 [CWEBbin 2019])"
-msgstr "Questo è CTWILL (Versione 3.64 [CWEBbin 2019])"
+msgid "This is CTWILL (Version 3.64 [CWEBbin 2020])"
+msgstr "Questo è CTWILL (Versione 3.64 [CWEBbin 2020])"
 
 #: cweav-i18n.ch:301 cweav-i18n.ch:309
 msgid "buffer"

Modified: branches/stable/source/src/texk/web2c/doc/web2c.info
===================================================================
--- branches/stable/source/src/texk/web2c/doc/web2c.info	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/doc/web2c.info	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,4 +1,4 @@
-This is web2c.info, produced by makeinfo version 6.6 from web2c.texi.
+This is web2c.info, produced by makeinfo version 5.1 from web2c.texi.
 
 This file documents the installation and use of the programs in Web2c,
 an implementation of Donald Knuth's TeX system.
@@ -58,7 +58,7 @@
 
 This document describes how to install and use the programs in the Web2c
 implementation of the TeX system, especially for Unix systems.  It
-corresponds to Web2c version 2019, released in August 2019.
+corresponds to Web2c version 2020, released in January 2020.
 
 * Menu:
 
@@ -82,8 +82,8 @@
 1 Introduction
 **************
 
-This manual corresponds to version 2019 of Web2c, released in August
-2019.
+This manual corresponds to version 2020 of Web2c, released in January
+2020.
 
    "Web2c" is the name of a TeX implementation, originally for Unix, but
 now also running under DOS, Amiga, and other operating systems.  By "TeX
@@ -2323,9 +2323,9 @@
 
 * Menu:
 
-* tangle invocation::
-* weave invocation::
-* pooltype invocation::
+* tangle invocation::           
+* weave invocation::            
+* pooltype invocation::         
 
 
 File: web2c.info,  Node: tangle invocation,  Next: weave invocation,  Up: WEB
@@ -2564,7 +2564,7 @@
 
 * Menu:
 
-* dvitype output example::
+* dvitype output example::      
 
 
 File: web2c.info,  Node: dvitype output example,  Up: dvitype invocation
@@ -3425,7 +3425,7 @@
  [index ]
 * Menu:
 
-* #define options:                       Compile-time options.
+* '#define' options:                     Compile-time options.
                                                               (line   6)
 * $ expansion in filenames:              \input filenames.    (line  47)
 * %& magic number:                       Determining the memory dump to use.
@@ -3466,7 +3466,7 @@
 * -base=BASE:                            Determining the memory dump to use.
                                                               (line  15)
 * -base=DUMPNAME:                        Common options.      (line  34)
-* -change=CHFILE:                        mft invocation.      (line  63)
+* -change=CHFILE:                        mft invocation.      (line  62)
 * -charcode-format=TYPE:                 tftopl invocation.   (line  27)
 * -charcode-format=TYPE <1>:             vftovp invocation.   (line  30)
 * -D compiler options:                   Compile-time options.
@@ -3527,7 +3527,7 @@
 * -shell-restricted:                     tex invocation.      (line 121)
 * -show-opcodes:                         dvitype invocation.  (line  52)
 * -strict:                               tangle invocation.   (line  46)
-* -style=MFTFILE:                        mft invocation.      (line  67)
+* -style=MFTFILE:                        mft invocation.      (line  66)
 * -T:                                    mpost invocation.    (line 115)
 * -terse:                                bibtex invocation.   (line  28)
 * -tex=TEXPROGRAM:                       mpost invocation.    (line 118)
@@ -3547,7 +3547,7 @@
 * .fmt:                                  Initial TeX.         (line   6)
 * .mf:                                   mf invocation.       (line  24)
 * .mp:                                   mpost invocation.    (line  30)
-* .mps files and PDF:                    mpost invocation.    (line  86)
+* '.mps' files and PDF:                  mpost invocation.    (line  86)
 * .NNN PostScript figures:               mpost invocation.    (line  35)
 * .NNNgf generic fonts:                  mf invocation.       (line  34)
 * .tcx character translation files:      Common options.      (line  98)
@@ -3578,7 +3578,7 @@
 * \openin, and pipes:                    Shell escapes.       (line  64)
 * \openout and security:                 tex invocation.      (line  48)
 * \openout, and pipes:                   Shell escapes.       (line  64)
-* \output routine, and \write:           Shell escapes.       (line  28)
+* \output routine, and '\write':         Shell escapes.       (line  28)
 * \pdfshellescape:                       Shell escapes.       (line  64)
 * \string:                               \input filenames.    (line  59)
 * \tracingcharsubdef and MLTeX:          \tracingcharsubdef.  (line   6)
@@ -3660,7 +3660,7 @@
 * byte swapping:                         Hardware and memory dumps.
                                                               (line  13)
 * c-sources Makefile target:             Additional targets.  (line  12)
-* change files, and MFT:                 mft invocation.      (line  63)
+* change files, and MFT:                 mft invocation.      (line  62)
 * change files, and Tangle:              tangle invocation.   (line  11)
 * change files, and Weave:               weave invocation.    (line  14)
 * changing error messages style:         Common options.      (line  26)
@@ -3680,7 +3680,7 @@
                                                               (line  69)
 * cm.base:                               Initial Metafont.    (line  26)
 * cmbase.mf:                             Initial Metafont.    (line  26)
-* cmbase.mft:                            mft invocation.      (line  73)
+* cmbase.mft:                            mft invocation.      (line  72)
 * cmmf.base not recommended:             Initial Metafont.    (line  26)
 * color, in DVItoMP:                     dvitomp invocation.  (line  15)
 * comments, in TCX files:                TCX files.           (line  70)
@@ -3693,7 +3693,7 @@
                                                               (line   6)
 * Computer Modern fonts, and Troff:      mpost invocation.    (line  65)
 * Computer Modern macros:                Initial Metafont.    (line  26)
-* Computer Modern Typefaces, production of: mft invocation.   (line  73)
+* 'Computer Modern Typefaces', production of: mft invocation. (line  72)
 * configuration:                         Installation.        (line   6)
 * configuration file reading:            Path searching.      (line   6)
 * configuration file values:             Runtime options.     (line   6)
@@ -3758,12 +3758,12 @@
 * dx horizontal escapement <1>:          gftype invocation.   (line 106)
 * dy vertical escapement:                gftype invocation.   (line 106)
 * dynamic array allocation:              Runtime options.     (line  35)
-* dynamic Metafont mode definitions with smode: Modes.        (line  28)
+* dynamic Metafont mode definitions with 'smode': Modes.      (line  28)
 * dynamic packing variable:              pktype invocation.   (line  44)
 * e response at error prompt:            Editor invocation.   (line   6)
 * e-circumflex:                          \charsubdef.         (line  20)
 * e-TeX:                                 TeX extensions.      (line  10)
-* e.mft:                                 mft invocation.      (line  73)
+* e.mft:                                 mft invocation.      (line  72)
 * EC fonts:                              tex invocation.      (line  41)
 * EC fonts <1>:                          mf invocation.       (line  24)
 * editing of bitmap fonts:               Font utilities available elsewhere.
@@ -3794,7 +3794,7 @@
 * file formats for fonts:                Font file formats.   (line   6)
 * file recorder:                         Common options.      (line  84)
 * filename conventions, in input files:  \input filenames.    (line   6)
-* filenames starting with -:             Option conventions.  (line  19)
+* filenames starting with '-':           Option conventions.  (line  19)
 * first line of the main input file:     Common options.      (line  98)
 * fixed-point arithmetic:                Compile-time options.
                                                               (line  21)
@@ -3914,7 +3914,7 @@
 * install-formats Make target:           Additional targets.  (line  17)
 * install-mems Make target:              Additional targets.  (line  34)
 * installation:                          Installation.        (line   6)
-* interaction between TCX files and -8bit.: TCX files.        (line 104)
+* interaction between TCX files and '-8bit'.: TCX files.      (line 104)
 * interaction mode:                      Common options.      (line  50)
 * international characters:              TCX files.           (line   6)
 * introduction:                          Introduction.        (line   6)
@@ -4004,7 +4004,7 @@
                                                               (line  15)
 * MetaPost input files:                  mpost invocation.    (line  30)
 * MetaPost invocation:                   mpost invocation.    (line   6)
-* MetaPost source, prettyprinting:       mft invocation.      (line  79)
+* MetaPost source, prettyprinting:       mft invocation.      (line  78)
 * MetaPost, initial:                     Initial MetaPost.    (line   6)
 * MetaPost, TeX, and Metafont:           Three programs.      (line   6)
 * metatype1:                             Font utilities available elsewhere.
@@ -4081,7 +4081,7 @@
 * path searching:                        Path searching.      (line   6)
 * path searching debugging:              Common options.      (line  59)
 * PDF:                                   TeX extensions.      (line  20)
-* PDF, and .mps files:                   mpost invocation.    (line  86)
+* PDF, and '.mps' files:                 mpost invocation.    (line  86)
 * pdfTeX:                                TeX extensions.      (line  20)
 * permissions, legal:                    Legalisms.           (line   6)
 * PFA and PFB conversion:                Font utilities available elsewhere.
@@ -4114,7 +4114,7 @@
 * plain.bst:                             Basic BibTeX style files.
                                                               (line  11)
 * plain.fmt:                             Initial TeX.         (line  13)
-* plain.mft:                             mft invocation.      (line  67)
+* plain.mft:                             mft invocation.      (line  66)
 * pltotf:                                pltotf invocation.   (line   6)
 * pool file, writing:                    tangle invocation.   (line  16)
 * Poole, Simon:                          Online Metafont graphics.
@@ -4187,8 +4187,8 @@
                                                               (line  42)
 * security, and output files:            tex invocation.      (line  48)
 * security, and shell escapes:           Shell escapes.       (line   6)
-* security, and write:                   mpost invocation.    (line  92)
-* security, and \openout:                tex invocation.      (line  48)
+* security, and 'write':                 mpost invocation.    (line  92)
+* security, and '\openout':              tex invocation.      (line  48)
 * shapes:                                Metafont.            (line   6)
 * sharing memory dumps:                  Hardware and memory dumps.
                                                               (line   6)
@@ -4218,7 +4218,7 @@
 * string pool, writing:                  tangle invocation.   (line  16)
 * string representation:                 pooltype invocation. (line  30)
 * style design, for BibTeX:              bibtex invocation.   (line  49)
-* style files:                           mft invocation.      (line  67)
+* style files:                           mft invocation.      (line  66)
 * substitutions of font glyphs:          MLTeX.               (line   6)
 * sun:                                   Online Metafont graphics.
                                                               (line  42)
@@ -4271,7 +4271,7 @@
                                                               (line  79)
 * TEXMFOUTPUT, used for reading:         Output file location.
                                                               (line  25)
-* TEXMFOUTPUT, used if . unwritable:     Output file location.
+* TEXMFOUTPUT, used if '.' unwritable:   Output file location.
                                                               (line  19)
 * texput:                                tex invocation.      (line  33)
 * TFM files, converting property lists to: pltotf invocation. (line   6)
@@ -4391,74 +4391,74 @@
 
 Tag Table:
 Node: Top2754
-Node: Introduction3750
-Node: Installation6909
-Node: configure options9011
-Node: Compile-time options11033
-Node: Additional targets12135
-Node: Triptrap13412
-Node: Runtime options14939
-Node: Commonalities16697
-Node: Option conventions17298
-Node: Common options18521
-Node: Path searching22901
-Node: Output file location23873
-Node: Three programs25198
-Node: Initial and virgin25952
-Node: Memory dumps26881
-Node: Creating memory dumps27337
-Node: Determining the memory dump to use28548
-Node: Hardware and memory dumps30129
-Node: Editor invocation32579
-Node: \input filenames33446
-Node: TeX36439
-Node: tex invocation37590
-Node: Initial TeX44493
-Node: Formats45857
-Node: Languages and hyphenation48783
-Node: MLTeX49213
-Node: \charsubdef50701
-Node: \tracingcharsubdef53024
-Node: TCX files53599
-Node: patgen invocation59039
-Node: Shell escapes59745
-Node: IPC and TeX63325
-Node: TeX extensions63895
-Node: Metafont65026
-Node: mf invocation66314
-Node: Initial Metafont70151
-Node: Modes71781
-Node: Online Metafont graphics74031
-Node: gftodvi invocation77456
-Node: mft invocation80276
-Node: MetaPost84274
-Node: mpost invocation85036
-Node: Initial MetaPost90212
-Node: dvitomp invocation91134
-Node: BibTeX91799
-Node: bibtex invocation92160
-Node: Basic BibTeX style files94634
-Node: WEB95964
-Node: tangle invocation97173
-Node: weave invocation99296
-Node: pooltype invocation100703
-Node: DVI utilities101833
-Node: dvicopy invocation102765
-Node: dvitype invocation104048
-Node: dvitype output example106377
-Node: Font utilities109428
-Node: Font file formats110608
-Node: gftopk invocation113877
-Node: pktogf invocation115068
-Node: pktype invocation116234
-Node: gftype invocation119057
-Node: tftopl invocation123560
-Node: pltotf invocation128153
-Node: vftovp invocation129204
-Node: vptovf invocation131439
-Node: Font utilities available elsewhere132466
-Node: Legalisms134846
-Node: References137000
-Node: Index141567
+Node: Introduction3751
+Node: Installation6911
+Node: configure options9013
+Node: Compile-time options11035
+Node: Additional targets12137
+Node: Triptrap13414
+Node: Runtime options14941
+Node: Commonalities16699
+Node: Option conventions17300
+Node: Common options18523
+Node: Path searching22903
+Node: Output file location23875
+Node: Three programs25200
+Node: Initial and virgin25954
+Node: Memory dumps26883
+Node: Creating memory dumps27339
+Node: Determining the memory dump to use28550
+Node: Hardware and memory dumps30131
+Node: Editor invocation32581
+Node: \input filenames33448
+Node: TeX36441
+Node: tex invocation37592
+Node: Initial TeX44495
+Node: Formats45859
+Node: Languages and hyphenation48785
+Node: MLTeX49215
+Node: \charsubdef50703
+Node: \tracingcharsubdef53026
+Node: TCX files53601
+Node: patgen invocation59041
+Node: Shell escapes59747
+Node: IPC and TeX63327
+Node: TeX extensions63897
+Node: Metafont65028
+Node: mf invocation66316
+Node: Initial Metafont70153
+Node: Modes71783
+Node: Online Metafont graphics74033
+Node: gftodvi invocation77458
+Node: mft invocation80278
+Node: MetaPost84276
+Node: mpost invocation85038
+Node: Initial MetaPost90214
+Node: dvitomp invocation91136
+Node: BibTeX91801
+Node: bibtex invocation92162
+Node: Basic BibTeX style files94636
+Node: WEB95966
+Node: tangle invocation97207
+Node: weave invocation99330
+Node: pooltype invocation100737
+Node: DVI utilities101867
+Node: dvicopy invocation102799
+Node: dvitype invocation104082
+Node: dvitype output example106417
+Node: Font utilities109468
+Node: Font file formats110648
+Node: gftopk invocation113917
+Node: pktogf invocation115108
+Node: pktype invocation116274
+Node: gftype invocation119097
+Node: tftopl invocation123600
+Node: pltotf invocation128193
+Node: vftovp invocation129244
+Node: vptovf invocation131479
+Node: Font utilities available elsewhere132506
+Node: Legalisms134886
+Node: References137040
+Node: Index141607
 
 End Tag Table

Modified: branches/stable/source/src/texk/web2c/doc/web2c.texi
===================================================================
--- branches/stable/source/src/texk/web2c/doc/web2c.texi	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/doc/web2c.texi	2020-02-18 19:11:23 UTC (rev 820)
@@ -11,8 +11,8 @@
 \fi
 @end tex
 
- at set version 2019
- at set month-year August 2019
+ at set version 2020
+ at set month-year January 2020
 
 @c Define new indices for commands in auxiliary files, filenames, and options.
 @defcodeindex cm

Modified: branches/stable/source/src/texk/web2c/etexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/etexdir/ChangeLog	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/etexdir/ChangeLog	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,3 +1,10 @@
+2019-12-10  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
+
+	* am/etex.am (etex_CPPFLAGS): append $(ZLIB_INCLUDES).
+	(etex_LDADD): include $(ZLIB_LIBS.)
+	(etex_DEPENDENCIES): define as $(ZLIB_DEPEND) 
+	(etex_web_srcs): include zlib-fmt.ch.
+
 2018-03-24  Hironobu Yamashita <h.y.acetaminophen at gmail.com>
             Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
 

Modified: branches/stable/source/src/texk/web2c/etexdir/am/etex.am
===================================================================
--- branches/stable/source/src/texk/web2c/etexdir/am/etex.am	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/etexdir/am/etex.am	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,7 @@
 ## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX.
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2019 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## e-TeX
@@ -10,10 +11,11 @@
 endif ETEX
 EXTRA_PROGRAMS += etex
 
-etex_CPPFLAGS = $(AM_CPPFLAGS)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs)
+etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs)
+etex_DEPENDENCIES = $(ZLIB_DEPEND)
 
 # e-TeX C sources
 etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
@@ -20,7 +22,8 @@
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h etexdir/etex_version.h
 
-# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
+# We must create etexd.h and etexdir/etex_version.h before building the
+# etex_OBJECTS.
 etex_prereq = etexd.h etexdir/etex_version.h
 $(etex_OBJECTS): $(etex_prereq)
 
@@ -56,6 +59,7 @@
 etex_ch_srcs = \
 	etexdir/tex.ch0 \
 	tex.ch \
+	zlib-fmt.ch \
 	enctex.ch \
 	$(etex_ch_synctex) \
 	etexdir/tex.ch1 \

Modified: branches/stable/source/src/texk/web2c/lib/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/lib/ChangeLog	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/lib/ChangeLog	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,3 +1,11 @@
+2020-01-01  Akira Kakuto  <kakuto at w32tex.org>
+
+	* printversion.c: Update copyright year.
+
+2019-12-10  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
+	
+	* do_dump [FMT_COMPRESS]: change conditional from XeTeX.
+
 2019-08-10  Andreas Scherer  <https://ascherer.github.io>
 
 	* lib.h: add missing prototypes from 'openclose.c' and 'texmfmp.c'.

Modified: branches/stable/source/src/texk/web2c/lib/printversion.c
===================================================================
--- branches/stable/source/src/texk/web2c/lib/printversion.c	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/lib/printversion.c	2020-02-18 19:11:23 UTC (rev 820)
@@ -56,7 +56,7 @@
 #endif
 
   if (copyright_holder) {
-    printf ("Copyright 2019 %s.\n", copyright_holder);
+    printf ("Copyright 2020 %s.\n", copyright_holder);
     if (!author)
       author = copyright_holder;
   }

Modified: branches/stable/source/src/texk/web2c/lib/texmfmp.c
===================================================================
--- branches/stable/source/src/texk/web2c/lib/texmfmp.c	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/lib/texmfmp.c	2020-02-18 19:11:23 UTC (rev 820)
@@ -2786,7 +2786,7 @@
    OUT_FILE.  */
 
 void
-#ifdef XeTeX
+#ifdef FMT_COMPRESS
 do_dump (char *p, int item_size, int nitems,  gzFile out_file)
 #else
 do_dump (char *p, int item_size, int nitems,  FILE *out_file)
@@ -2796,7 +2796,7 @@
   swap_items (p, nitems, item_size);
 #endif
 
-#ifdef XeTeX
+#ifdef FMT_COMPRESS
   if (gzwrite (out_file, p, item_size * nitems) != item_size * nitems)
 #else
   if (fwrite (p, item_size, nitems, out_file) != nitems)
@@ -2818,13 +2818,13 @@
 /* Here is the dual of the writing routine.  */
 
 void
-#ifdef XeTeX
+#ifdef FMT_COMPRESS
 do_undump (char *p, int item_size, int nitems, gzFile in_file)
 #else
 do_undump (char *p, int item_size, int nitems, FILE *in_file)
 #endif
 {
-#ifdef XeTeX
+#ifdef FMT_COMPRESS
   if (gzread (in_file, p, item_size * nitems) != item_size * nitems)
 #else
   if (fread (p, item_size, nitems, in_file) != (size_t) nitems)

Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,3 +1,12 @@
+2019-12-30  Akira Kakuto  <kakuto at w32tex.org>
+
+	* utils.c: Not include poppler-config.h, by assuming that
+	POPPLER_VERSION is defined properly.
+
+2019-12-10  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
+
+	* am/pdftex.am (pdftex_ch_srcs): add zlib-fmt.ch.
+
 2019-11-25  Joseph Wright  <joseph.wright at morningstar2.co.uk>
 
 	* pdftex.web: New primitive \pdfmajorversion.

Modified: branches/stable/source/src/texk/web2c/pdftexdir/NEWS
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/NEWS	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/NEWS	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,3 +1,12 @@
+pdfTeX 3.14159265-2.6-1.40.21 (TeX Live 2020)
+- changes:
+  - new primitive \pdfmajorversion; this merely changes the version
+    number in the PDF output, has no effect on PDF content.
+  - new \input{...} group-delimited syntax (cross-engine).
+  - new option --cnf-line (cross-engine).
+  - have \pdfximage etc. do same search for image files as for input files, 
+  - (un)compress .fmt files with zlib (cross-engine).
+  
 pdfTeX 3.14159265-2.6-1.40.20 (TeX Live 2019)
 - changes:
   - new primitive \expanded (from unreleased pdftex 1.50 branch + luatex).
@@ -31,7 +40,8 @@
   pdftosrc-newpoppler.cc for poppler-0.59.0 upto poppler-0.70.1.
   pdftosrc-poppler0.71.0 for poppler-0.71.0.
   pdftosrc-poppler0.72.0 for poppler-0.72.0 upto poppler-0.75.0.
-  pdftosrc-poppler0.76.0 for poppler-0.76.0 and newer. 
+  pdftosrc-poppler0.76.0 for poppler-0.76.0 upto poppler-0.82.0.
+  pdftosrc-poppler0.83.0 for poppler-0.83.0 and newer. 
   pdftoepdf-poppler0.68.0.cc for poppler-0.59.0 upto poppler-0.68.0.
   pdftoepdf-poppler0.69.0.cc for poppler-0.69.0.
   pdftoepdf-poppler0.70.0.cc for poppler-0.70.0 and poppler-0.70.1.
@@ -38,10 +48,12 @@
   pdftoepdf-poppler0.71.0.cc for poppler-0.71.0.
   pdftoepdf-poppler0.72.0.cc for poppler-0.72.0 upto poppler-0.74.0.
   pdftoepdf-poppler0.75.0.cc for poppler-0.75.0.
-  pdftoepdf-poppler0.76.0.cc for poppler-0.76.0 and newer.
+  pdftoepdf-poppler0.76.0.cc for poppler-0.76.0 upto poppler-0.82.0.
+  pdftoepdf-poppler0.83.0.cc for poppler-0.83.0 and newer.
   Note that pdftosrc-*.cc and pdftoepdf-*.cc should be
   renamed as pdftosrc.cc, and pdftoepdf.cc, respectively, before
-  compilation.
+  compilation. Further, POPPLER_VERSION should be defined properly
+  like -DPOPPLER_VERSION='"0.84.0"'.
 
 ---------------------------------------------------------------
 pdfTeX 3.14159265-2.6-1.40.18 (TeX Live 2017)  (April 27, 2017)

Modified: branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am	2020-02-18 19:11:23 UTC (rev 820)
@@ -69,6 +69,7 @@
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
 	tex.ch \
+	zlib-fmt.ch \
 	enctex.ch \
 	$(pdftex_ch_synctex) \
 	pdftexdir/pdftex.ch \
@@ -79,7 +80,7 @@
 	env MKTEXFMT=0 pdftex '\nonstopmode\input pdftex.tex'
 pdftex.tex: $(srcdir)/pdftexdir/pdftex.web
 	weave $(srcdir)/pdftexdir/pdftex.web
-	
+
 ##
 EXTRA_DIST += $(pdftex_ch_srcs) pdftexdir/pdftex.defines
 

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftex.web	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,4 +1,4 @@
-% Copyright 1996-2019 Han Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh,
+% Copyright 1996-2020 Han Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh,
 % <thanh@@pdftex.org>
 
 % This file is part of pdfTeX.
@@ -306,8 +306,8 @@
   {printed when \eTeX\ starts}
 @#
 @d pdftex_version==140 { \.{\\pdftexversion} }
- at d pdftex_revision=="20" { \.{\\pdftexrevision} }
- at d pdftex_version_string=='-1.40.20' {current \pdfTeX\ version}
+ at d pdftex_revision=="21" { \.{\\pdftexrevision} }
+ at d pdftex_version_string=='-1.40.21' {current \pdfTeX\ version}
 @#
 @d pdfTeX_banner=='This is pdfTeX, Version 3.14159265',eTeX_version_string,pdftex_version_string
    {printed when \pdfTeX\ starts}

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftex_version.h
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftex_version.h	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftex_version.h	2020-02-18 19:11:23 UTC (rev 820)
@@ -1 +1 @@
-#define PDFTEX_VERSION "1.40.20"
+#define PDFTEX_VERSION "1.40.21"

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.68.0.cc	2020-02-18 19:11:23 UTC (rev 820)
@@ -710,7 +710,7 @@
 
 int
 read_pdf_info(char *image_name, char *page_name, int page_num,
-              int pagebox_spec, int minor_pdf_version_wanted,
+              int pagebox_spec, int major_pdf_version_wanted, int minor_pdf_version_wanted,
               int pdf_inclusion_errorlevel)
 {
     PdfDocument *pdf_doc;
@@ -738,16 +738,16 @@
 #ifdef POPPLER_VERSION
     pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
     pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
-    if ((pdf_major_version_found > 1)
+    if ((pdf_major_version_found > major_pdf_version_wanted)
      || (pdf_minor_version_found > minor_pdf_version_wanted)) {
         const char *msg =
-            "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
+            "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed";
         if (pdf_inclusion_errorlevel > 0) {
-            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         } else if (pdf_inclusion_errorlevel < 0) {
             ; /* do nothing */
         } else { /* = 0, give warning */
-            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         }
     }
 #else

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.69.0.cc	2020-02-18 19:11:23 UTC (rev 820)
@@ -710,7 +710,7 @@
 
 int
 read_pdf_info(char *image_name, char *page_name, int page_num,
-              int pagebox_spec, int minor_pdf_version_wanted,
+              int pagebox_spec, int major_pdf_version_wanted, int minor_pdf_version_wanted,
               int pdf_inclusion_errorlevel)
 {
     PdfDocument *pdf_doc;
@@ -738,16 +738,16 @@
 #ifdef POPPLER_VERSION
     pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
     pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
-    if ((pdf_major_version_found > 1)
+    if ((pdf_major_version_found > major_pdf_version_wanted)
      || (pdf_minor_version_found > minor_pdf_version_wanted)) {
         const char *msg =
-            "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
+            "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed";
         if (pdf_inclusion_errorlevel > 0) {
-            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         } else if (pdf_inclusion_errorlevel < 0) {
             ; /* do nothing */
         } else { /* = 0, give warning */
-            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         }
     }
 #else

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.70.0.cc	2020-02-18 19:11:23 UTC (rev 820)
@@ -710,7 +710,7 @@
 
 int
 read_pdf_info(char *image_name, char *page_name, int page_num,
-              int pagebox_spec, int minor_pdf_version_wanted,
+              int pagebox_spec, int major_pdf_version_wanted, int minor_pdf_version_wanted,
               int pdf_inclusion_errorlevel)
 {
     PdfDocument *pdf_doc;
@@ -738,16 +738,16 @@
 #ifdef POPPLER_VERSION
     pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
     pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
-    if ((pdf_major_version_found > 1)
+    if ((pdf_major_version_found > major_pdf_version_wanted)
      || (pdf_minor_version_found > minor_pdf_version_wanted)) {
         const char *msg =
-            "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
+            "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed";
         if (pdf_inclusion_errorlevel > 0) {
-            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         } else if (pdf_inclusion_errorlevel < 0) {
             ; /* do nothing */
         } else { /* = 0, give warning */
-            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         }
     }
 #else

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.71.0.cc	2020-02-18 19:11:23 UTC (rev 820)
@@ -710,7 +710,7 @@
 
 int
 read_pdf_info(char *image_name, char *page_name, int page_num,
-              int pagebox_spec, int minor_pdf_version_wanted,
+              int pagebox_spec, int major_pdf_version_wanted, int minor_pdf_version_wanted,
               int pdf_inclusion_errorlevel)
 {
     PdfDocument *pdf_doc;
@@ -738,16 +738,16 @@
 #ifdef POPPLER_VERSION
     pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
     pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
-    if ((pdf_major_version_found > 1)
+    if ((pdf_major_version_found > major_pdf_version_wanted)
      || (pdf_minor_version_found > minor_pdf_version_wanted)) {
         const char *msg =
-            "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
+            "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed";
         if (pdf_inclusion_errorlevel > 0) {
-            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         } else if (pdf_inclusion_errorlevel < 0) {
             ; /* do nothing */
         } else { /* = 0, give warning */
-            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         }
     }
 #else

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc	2020-02-18 19:11:23 UTC (rev 820)
@@ -711,7 +711,7 @@
 
 int
 read_pdf_info(char *image_name, char *page_name, int page_num,
-              int pagebox_spec, int minor_pdf_version_wanted,
+              int pagebox_spec, int major_pdf_version_wanted, int minor_pdf_version_wanted,
               int pdf_inclusion_errorlevel)
 {
     PdfDocument *pdf_doc;
@@ -739,16 +739,16 @@
 #ifdef POPPLER_VERSION
     pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
     pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
-    if ((pdf_major_version_found > 1)
+    if ((pdf_major_version_found > major_pdf_version_wanted)
      || (pdf_minor_version_found > minor_pdf_version_wanted)) {
         const char *msg =
-            "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
+            "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed";
         if (pdf_inclusion_errorlevel > 0) {
-            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         } else if (pdf_inclusion_errorlevel < 0) {
             ; /* do nothing */
         } else { /* = 0, give warning */
-            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         }
     }
 #else

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc	2020-02-18 19:11:23 UTC (rev 820)
@@ -710,7 +710,7 @@
 
 int
 read_pdf_info(char *image_name, char *page_name, int page_num,
-              int pagebox_spec, int minor_pdf_version_wanted,
+              int pagebox_spec, int major_pdf_version_wanted, int minor_pdf_version_wanted,
               int pdf_inclusion_errorlevel)
 {
     PdfDocument *pdf_doc;
@@ -738,16 +738,16 @@
 #ifdef POPPLER_VERSION
     pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
     pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
-    if ((pdf_major_version_found > 1)
+    if ((pdf_major_version_found > major_pdf_version_wanted)
      || (pdf_minor_version_found > minor_pdf_version_wanted)) {
         const char *msg =
-            "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
+            "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed";
         if (pdf_inclusion_errorlevel > 0) {
-            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         } else if (pdf_inclusion_errorlevel < 0) {
             ; /* do nothing */
         } else { /* = 0, give warning */
-            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         }
     }
 #else

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc	2020-02-18 19:11:23 UTC (rev 820)
@@ -22,7 +22,7 @@
 https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
 by Arch Linux. A little modifications are made to avoid a crash for
 some kind of pdf images, such as figure_missing.pdf in gnuplot.
-The poppler should be 0.76.0 or newer versions.
+The poppler should be 0.76.0 upto 0.82.0.
 POPPLER_VERSION should be defined.
 */
 
@@ -710,7 +710,7 @@
 
 int
 read_pdf_info(char *image_name, char *page_name, int page_num,
-              int pagebox_spec, int minor_pdf_version_wanted,
+              int pagebox_spec, int major_pdf_version_wanted, int minor_pdf_version_wanted,
               int pdf_inclusion_errorlevel)
 {
     PdfDocument *pdf_doc;
@@ -738,16 +738,16 @@
 #ifdef POPPLER_VERSION
     pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
     pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
-    if ((pdf_major_version_found > 1)
+    if ((pdf_major_version_found > major_pdf_version_wanted)
      || (pdf_minor_version_found > minor_pdf_version_wanted)) {
         const char *msg =
-            "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
+            "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed";
         if (pdf_inclusion_errorlevel > 0) {
-            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         } else if (pdf_inclusion_errorlevel < 0) {
             ; /* do nothing */
         } else { /* = 0, give warning */
-            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
         }
     }
 #else

Added: branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.83.0.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.83.0.cc	                        (rev 0)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.83.0.cc	2020-02-18 19:11:23 UTC (rev 820)
@@ -0,0 +1,1111 @@
+/*
+Copyright 1996-2017 Han The Thanh, <thanh at pdftex.org>
+
+This file is part of pdfTeX.
+
+pdfTeX is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+pdfTeX is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
+https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
+by Arch Linux. A little modifications are made to avoid a crash for
+some kind of pdf images, such as figure_missing.pdf in gnuplot.
+The poppler should be 0.83.0 or newer versions.
+POPPLER_VERSION should be defined.
+*/
+
+/* Do this early in order to avoid a conflict between
+   MINGW32 <rpcndr.h> defining 'boolean' as 'unsigned char' and
+   <kpathsea/types.h> defining Pascal's boolean as 'int'.
+*/
+#include <w2c/config.h>
+#include <kpathsea/lib.h>
+
+#include <stdlib.h>
+#include <math.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#ifdef POPPLER_VERSION
+#include <dirent.h>
+#include <poppler-config.h>
+#include <goo/GooString.h>
+#include <goo/gmem.h>
+#include <goo/gfile.h>
+#define GString GooString
+#else
+#error POPPLER_VERSION should be defined.
+#endif
+#include <assert.h>
+
+#include "Object.h"
+#include "Stream.h"
+#include "Array.h"
+#include "Dict.h"
+#include "XRef.h"
+#include "Catalog.h"
+#include "Link.h"
+#include "Page.h"
+#include "GfxFont.h"
+#include "PDFDoc.h"
+#include "GlobalParams.h"
+#include "Error.h"
+
+// This file is mostly C and not very much C++; it's just used to interface
+// the functions of xpdf, which are written in C++.
+
+extern "C" {
+#include <pdftexdir/ptexmac.h>
+#include <pdftexdir/pdftex-common.h>
+
+// These functions from pdftex.web gets declared in pdftexcoerce.h in the
+// usual web2c way, but we cannot include that file here because C++
+// does not allow it.
+extern int getpdfsuppresswarningpagegroup(void);
+extern integer getpdfsuppressptexinfo(void);
+extern integer zround(double);
+}
+
+// The prefix "PTEX" for the PDF keys is special to pdfTeX;
+// this has been registered with Adobe by Hans Hagen.
+
+#define pdfkeyprefix "PTEX"
+
+#define MASK_SUPPRESS_PTEX_FULLBANNER 0x01
+#define MASK_SUPPRESS_PTEX_FILENAME   0x02
+#define MASK_SUPPRESS_PTEX_PAGENUMBER 0x04
+#define MASK_SUPPRESS_PTEX_INFODICT   0x08
+
+// When copying the Resources of the selected page, all objects are copied
+// recusively top-down. Indirect objects however are not fetched during
+// copying, but get a new object number from pdfTeX and then will be
+// appended into a linked list. Duplicates are checked and removed from the
+// list of indirect objects during appending.
+
+enum InObjType {
+    objFont,
+    objFontDesc,
+    objOther
+};
+
+struct InObj {
+    Ref ref;                    // ref in original PDF
+    InObjType type;             // object type
+    InObj *next;                // next entry in list of indirect objects
+    int num;                    // new object number in output PDF
+    fd_entry *fd;               // pointer to /FontDescriptor object structure
+    int enc_objnum;             // Encoding for objFont
+    int written;                // has it been written to output PDF?
+};
+
+struct UsedEncoding {
+    int enc_objnum;
+    GfxFont *font;
+    UsedEncoding *next;
+};
+
+static InObj *inObjList;
+static UsedEncoding *encodingList;
+static bool isInit = false;
+
+// --------------------------------------------------------------------
+// Maintain list of open embedded PDF files
+// --------------------------------------------------------------------
+
+struct PdfDocument {
+    char *file_name;
+    PDFDoc *doc;
+    XRef *xref;
+    InObj *inObjList;
+    int occurences;             // number of references to the document; the doc can be
+    // deleted when this is negative
+    PdfDocument *next;
+};
+
+static PdfDocument *pdfDocuments = 0;
+
+static XRef *xref = 0;
+
+// Returns pointer to PdfDocument record for PDF file.
+// Creates a new record if it doesn't exist yet.
+// xref is made current for the document.
+
+static PdfDocument *find_add_document(char *file_name)
+{
+    PdfDocument *p = pdfDocuments;
+    while (p && strcmp(p->file_name, file_name) != 0)
+        p = p->next;
+    if (p) {
+        xref = p->xref;
+        (p->occurences)++;
+        return p;
+    }
+    p = new PdfDocument;
+    p->file_name = xstrdup(file_name);
+    p->xref = xref = 0;
+    p->occurences = 0;
+    GString *docName = new GString(p->file_name);
+    p->doc = new PDFDoc(docName);       // takes ownership of docName
+    if (!p->doc->isOk() || !p->doc->okToPrint()) {
+        pdftex_fail("xpdf: reading PDF image failed");
+    }
+    p->inObjList = 0;
+    p->next = pdfDocuments;
+    pdfDocuments = p;
+    return p;
+}
+
+// Deallocate a PdfDocument with all its resources
+
+static void delete_document(PdfDocument * pdf_doc)
+{
+    PdfDocument **p = &pdfDocuments;
+    while (*p && *p != pdf_doc)
+        p = &((*p)->next);
+    // should not happen:
+    if (!*p)
+        return;
+    // unlink from list
+    *p = pdf_doc->next;
+    // free pdf_doc's resources
+    InObj *r, *n;
+    for (r = pdf_doc->inObjList; r != 0; r = n) {
+        n = r->next;
+        delete r;
+    }
+    xref = pdf_doc->xref;
+    delete pdf_doc->doc;
+    xfree(pdf_doc->file_name);
+    delete pdf_doc;
+}
+
+// --------------------------------------------------------------------
+
+static int addEncoding(GfxFont * gfont)
+{
+    UsedEncoding *n;
+    n = new UsedEncoding;
+    n->next = encodingList;
+    encodingList = n;
+    n->font = gfont;
+    n->enc_objnum = pdfnewobjnum();
+    return n->enc_objnum;
+}
+
+#define addFont(ref, fd, enc_objnum) \
+        addInObj(objFont, ref, fd, enc_objnum)
+
+// addFontDesc is only used to avoid writing the original FontDescriptor
+// from the PDF file.
+
+#define addFontDesc(ref, fd) \
+        addInObj(objFontDesc, ref, fd, 0)
+
+#define addOther(ref) \
+        addInObj(objOther, ref, 0, 0)
+
+static int addInObj(InObjType type, Ref ref, fd_entry * fd, int e)
+{
+    InObj *p, *q, *n = new InObj;
+    if (ref.num == 0)
+        pdftex_fail("PDF inclusion: invalid reference");
+    n->ref = ref;
+    n->type = type;
+    n->next = 0;
+    n->fd = fd;
+    n->enc_objnum = e;
+    n->written = 0;
+    if (inObjList == 0)
+        inObjList = n;
+    else {
+        for (p = inObjList; p != 0; p = p->next) {
+            if (p->ref.num == ref.num && p->ref.gen == ref.gen) {
+                delete n;
+                return p->num;
+            }
+            q = p;
+        }
+        // it is important to add new objects at the end of the list,
+        // because new objects are being added while the list is being
+        // written out.
+        q->next = n;
+    }
+    if (type == objFontDesc)
+        n->num = get_fd_objnum(fd);
+    else
+        n->num = pdfnewobjnum();
+    return n->num;
+}
+
+#if 0 /* unusewd */
+static int getNewObjectNumber(Ref ref)
+{
+    InObj *p;
+    if (inObjList == 0) {
+        pdftex_fail("No objects copied yet");
+    } else {
+        for (p = inObjList; p != 0; p = p->next) {
+            if (p->ref.num == ref.num && p->ref.gen == ref.gen) {
+                return p->num;
+            }
+        }
+        pdftex_fail("Object not yet copied: %i %i", ref.num, ref.gen);
+    }
+#ifdef _MSC_VER
+    /* Never reached, but without __attribute__((noreturn)) for pdftex_fail()
+       MSVC 5.0 requires an int return value.  */
+    return -60000;
+#endif
+}
+#endif
+
+static void copyObject(Object *);
+
+static void copyName(char *s)
+{
+    pdf_puts("/");
+    for (; *s != 0; s++) {
+        if (isdigit(*s) || isupper(*s) || islower(*s) || *s == '_' ||
+            *s == '.' || *s == '-' || *s == '+')
+            pdfout(*s);
+        else
+            pdf_printf("#%.2X", *s & 0xFF);
+    }
+}
+
+static void copyDictEntry(Object * obj, int i)
+{
+    Object obj1;
+    copyName((char *)obj->dictGetKey(i));
+    pdf_puts(" ");
+    obj1 = obj->dictGetValNF(i).copy();
+    copyObject(&obj1);
+    pdf_puts("\n");
+}
+
+static void copyDict(Object * obj)
+{
+    int i, l;
+    if (!obj->isDict())
+        pdftex_fail("PDF inclusion: invalid dict type <%s>",
+                    obj->getTypeName());
+    for (i = 0, l = obj->dictGetLength(); i < l; ++i)
+        copyDictEntry(obj, i);
+}
+
+static void copyFontDict(Object * obj, InObj * r)
+{
+    int i, l;
+    char *key;
+    if (!obj->isDict())
+        pdftex_fail("PDF inclusion: invalid dict type <%s>",
+                    obj->getTypeName());
+    pdf_puts("<<\n");
+    assert(r->type == objFont); // FontDescriptor is in fd_tree
+    for (i = 0, l = obj->dictGetLength(); i < l; ++i) {
+        key = (char *)obj->dictGetKey(i);
+        if (strncmp("FontDescriptor", key, strlen("FontDescriptor")) == 0
+            || strncmp("BaseFont", key, strlen("BaseFont")) == 0
+            || strncmp("Encoding", key, strlen("Encoding")) == 0)
+            continue;           // skip original values
+        copyDictEntry(obj, i);
+    }
+    // write new FontDescriptor, BaseFont, and Encoding
+    pdf_printf("/FontDescriptor %d 0 R\n", get_fd_objnum(r->fd));
+    pdf_printf("/BaseFont %d 0 R\n", get_fn_objnum(r->fd));
+    pdf_printf("/Encoding %d 0 R\n", r->enc_objnum);
+    pdf_puts(">>");
+}
+
+static void copyStream(Stream * str)
+{
+    int c, c2 = 0;
+    str->reset();
+    while ((c = str->getChar()) != EOF) {
+        pdfout(c);
+        c2 = c;
+    }
+    pdflastbyte = c2;
+}
+
+static void copyProcSet(Object * obj)
+{
+    int i, l;
+    Object procset;
+    if (!obj->isArray())
+        pdftex_fail("PDF inclusion: invalid ProcSet array type <%s>",
+                    obj->getTypeName());
+    pdf_puts("/ProcSet [ ");
+    for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
+        procset = obj->arrayGetNF(i).copy();
+        if (!procset.isName())
+            pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
+                        procset.getTypeName());
+        copyName((char *)procset.getName());
+        pdf_puts(" ");
+    }
+    pdf_puts("]\n");
+}
+
+#define REPLACE_TYPE1C true
+
+static bool embeddableFont(Object * fontdesc)
+{
+    Object fontfile, ffsubtype;
+
+    if (!fontdesc->isDict())
+        return false;
+    fontfile = fontdesc->dictLookup("FontFile");
+    if (fontfile.isStream())
+        return true;
+    if (REPLACE_TYPE1C) {
+        fontfile = fontdesc->dictLookup("FontFile3");
+        if (!fontfile.isStream())
+            return false;
+        ffsubtype = fontfile.streamGetDict()->lookup("Subtype");
+        return ffsubtype.isName() && !strcmp(ffsubtype.getName(), "Type1C");
+    }
+    return false;
+}
+
+static void copyFont(char *tag, Object * fontRef)
+{
+    Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
+        stemV;
+    GfxFont *gfont;
+    fd_entry *fd;
+    fm_entry *fontmap;
+    // Check whether the font has already been embedded before analysing it.
+    InObj *p;
+    Ref ref = fontRef->getRef();
+    for (p = inObjList; p; p = p->next) {
+        if (p->ref.num == ref.num && p->ref.gen == ref.gen) {
+            copyName(tag);
+            pdf_printf(" %d 0 R ", p->num);
+            return;
+        }
+    }
+    // Only handle included Type1 (and Type1C) fonts; anything else will be copied.
+    // Type1C fonts are replaced by Type1 fonts, if REPLACE_TYPE1C is true.
+    fontdict = fontRef->fetch(xref);
+    fontdesc = Object(objNull);
+    if (fontdict.isDict()) {
+        subtype = fontdict.dictLookup("Subtype");
+        basefont = fontdict.dictLookup("BaseFont");
+        fontdescRef = fontdict.dictLookupNF("FontDescriptor").copy();
+        if (fontdescRef.isRef()) {
+            fontdesc = fontdescRef.fetch(xref);
+        }
+    }
+    if (!fixedinclusioncopyfont && fontdict.isDict()
+        && subtype.isName()
+        && !strcmp(subtype.getName(), "Type1")
+        && basefont.isName()
+        && fontdescRef.isRef()
+        && fontdesc.isDict()
+        && embeddableFont(&fontdesc)
+        && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
+        // round /StemV value, since the PDF input is a float
+        // (see Font Descriptors in PDF reference), but we only store an
+        // integer, since we don't want to change the struct.
+        stemV = fontdesc.dictLookup("StemV");
+        fd = epdf_create_fontdescriptor(fontmap, zround(stemV.getNum()));
+        charset = fontdesc.dictLookup("CharSet");
+        if (!charset.isNull() &&
+            charset.isString() && is_subsetable(fontmap))
+            epdf_mark_glyphs(fd, (char *)charset.getString()->c_str());
+        else
+            embed_whole_font(fd);
+        addFontDesc(fontdescRef.getRef(), fd);
+        copyName(tag);
+        gfont = GfxFont::makeFont(xref, tag, fontRef->getRef(),
+                                  fontdict.getDict());
+        pdf_printf(" %d 0 R ", addFont(fontRef->getRef(), fd,
+                                       addEncoding(gfont)));
+    } else {
+        copyName(tag);
+        pdf_puts(" ");
+        copyObject(fontRef);
+    }
+}
+
+static void copyFontResources(Object * obj)
+{
+    Object fontRef;
+    int i, l;
+    if (!obj->isDict())
+        pdftex_fail("PDF inclusion: invalid font resources dict type <%s>",
+                    obj->getTypeName());
+    pdf_puts("/Font << ");
+    for (i = 0, l = obj->dictGetLength(); i < l; ++i) {
+        fontRef = obj->dictGetValNF(i).copy();
+        if (fontRef.isRef())
+            copyFont((char *)obj->dictGetKey(i), &fontRef);
+        else if (fontRef.isDict()) {   // some programs generate pdf with embedded font object
+            copyName((char *)obj->dictGetKey(i));
+            pdf_puts(" ");
+            copyObject(&fontRef);
+        }
+        else
+            pdftex_fail("PDF inclusion: invalid font in reference type <%s>",
+                        fontRef.getTypeName());
+    }
+    pdf_puts(">>\n");
+}
+
+static void copyOtherResources(Object * obj, char *key)
+{
+    // copies all other resources (write_epdf handles Fonts and ProcSets),
+
+    // if Subtype is present, it must be a name
+    if (strcmp("Subtype", key) == 0) {
+        if (!obj->isName()) {
+            pdftex_warn("PDF inclusion: Subtype in Resources dict is not a name"
+                        " (key '%s', type <%s>); ignored.",
+                        key, obj->getTypeName());
+            return;
+        }
+    } else if (!obj->isDict()) {
+        //FIXME: Write the message only to the log file
+        pdftex_warn("PDF inclusion: invalid other resource which is no dict"
+                    " (key '%s', type <%s>); ignored.",
+                    key, obj->getTypeName());
+        return;
+    }
+    copyName(key);
+    pdf_puts(" ");
+    copyObject(obj);
+}
+
+// Function onverts double to string; very small and very large numbers
+// are NOT converted to scientific notation.
+// n must be a number or real conforming to the implementation limits
+// of PDF as specified in appendix C.1 of the PDF Ref.
+// These are:
+// maximum value of ints is +2^32
+// maximum value of reals is +2^15
+// smalles values of reals is 1/(2^16)
+
+static char *convertNumToPDF(double n)
+{
+    static const int precision = 6;
+    static const int fact = (int) 1E6;  // must be 10^precision
+    static const double epsilon = 0.5E-6;       // 2epsilon must be 10^-precision
+    static char buf[64];
+    // handle very small values: return 0
+    if (fabs(n) < epsilon) {
+        buf[0] = '0';
+        buf[1] = '\0';
+    } else {
+        char ints[64];
+        int bindex = 0, sindex = 0;
+        int ival, fval;
+        // handle the sign part if n is negative
+        if (n < 0) {
+            buf[bindex++] = '-';
+            n = -n;
+        }
+        n += epsilon;           // for rounding
+        // handle the integer part, simply with sprintf
+        ival = (int) floor(n);
+        n -= ival;
+        sprintf(ints, "%d", ival);
+        while (ints[sindex] != 0)
+            buf[bindex++] = ints[sindex++];
+        // handle the fractional part up to 'precision' digits
+        fval = (int) floor(n * fact);
+        if (fval) {
+            // set a dot
+            buf[bindex++] = '.';
+            sindex = bindex + precision;
+            buf[sindex--] = '\0';
+            // fill up trailing zeros with the string terminator NULL
+            while (((fval % 10) == 0) && (sindex >= bindex)) {
+                buf[sindex--] = '\0';
+                fval /= 10;
+            }
+            // fill up the fractional part back to front
+            while (sindex >= bindex) {
+                buf[sindex--] = (fval % 10) + '0';
+                fval /= 10;
+            }
+        } else
+            buf[bindex++] = 0;
+    }
+    return (char *) buf;
+}
+
+static void copyObject(Object * obj)
+{
+    Object obj1;
+    int i, l, c;
+    Ref ref;
+    char *p;
+    GString *s;
+    if (obj->isBool()) {
+        pdf_printf("%s", obj->getBool()? "true" : "false");
+    } else if (obj->isInt()) {
+        pdf_printf("%i", obj->getInt());
+    } else if (obj->isReal()) {
+        pdf_printf("%s", convertNumToPDF(obj->getReal()));
+    } else if (obj->isNum()) {
+        pdf_printf("%s", convertNumToPDF(obj->getNum()));
+    } else if (obj->isString()) {
+        s = (GooString *)obj->getString();
+        p = (char *)s->c_str();
+        l = s->getLength();
+        if (strlen(p) == (unsigned int) l) {
+            pdf_puts("(");
+            for (; *p != 0; p++) {
+                c = (unsigned char) *p;
+                if (c == '(' || c == ')' || c == '\\')
+                    pdf_printf("\\%c", c);
+                else if (c < 0x20 || c > 0x7F)
+                    pdf_printf("\\%03o", c);
+                else
+                    pdfout(c);
+            }
+            pdf_puts(")");
+        } else {
+            pdf_puts("<");
+            for (i = 0; i < l; i++) {
+                c = s->getChar(i) & 0xFF;
+                pdf_printf("%.2x", c);
+            }
+            pdf_puts(">");
+        }
+    } else if (obj->isName()) {
+        copyName((char *)obj->getName());
+    } else if (obj->isNull()) {
+        pdf_puts("null");
+    } else if (obj->isArray()) {
+        pdf_puts("[");
+        for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
+            obj1 = obj->arrayGetNF(i).copy();
+            if (!obj1.isName())
+                pdf_puts(" ");
+            copyObject(&obj1);
+        }
+        pdf_puts("]");
+    } else if (obj->isDict()) {
+        pdf_puts("<<\n");
+        copyDict(obj);
+        pdf_puts(">>");
+    } else if (obj->isStream()) {
+        pdf_puts("<<\n");
+        copyDict(obj->getStream()->getDictObject());
+        pdf_puts(">>\n");
+        pdf_puts("stream\n");
+        copyStream(obj->getStream()->getUndecodedStream());
+        pdf_puts("\nendstream");
+    } else if (obj->isRef()) {
+        ref = obj->getRef();
+        if (ref.num == 0) {
+            pdftex_fail
+                ("PDF inclusion: reference to invalid object"
+                 " (is the included pdf broken?)");
+        } else
+            pdf_printf("%d 0 R", addOther(ref));
+    } else {
+        pdftex_fail("PDF inclusion: type <%s> cannot be copied",
+                    obj->getTypeName());
+    }
+}
+
+static void writeRefs()
+{
+    InObj *r;
+    for (r = inObjList; r != 0; r = r->next) {
+        if (!r->written) {
+            r->written = 1;
+            Object obj1 = xref->fetch(r->ref.num, r->ref.gen);
+            if (r->type == objFont) {
+                assert(!obj1.isStream());
+                pdfbeginobj(r->num, 2);         // \pdfobjcompresslevel = 2 is for this
+                copyFontDict(&obj1, r);
+                pdf_puts("\n");
+                pdfendobj();
+            } else if (r->type != objFontDesc) {        // /FontDescriptor is written via write_fontdescriptor()
+                if (obj1.isStream())
+                    pdfbeginobj(r->num, 0);
+                else
+                    pdfbeginobj(r->num, 2);     // \pdfobjcompresslevel = 2 is for this
+                copyObject(&obj1);
+                pdf_puts("\n");
+                pdfendobj();
+            }
+        }
+    }
+}
+
+static void writeEncodings()
+{
+    UsedEncoding *r, *n;
+    char *glyphNames[256], *s;
+    int i;
+    for (r = encodingList; r != 0; r = r->next) {
+        for (i = 0; i < 256; i++) {
+            if (r->font->isCIDFont()) {
+                pdftex_fail
+                    ("PDF inclusion: CID fonts are not supported"
+                     " (try to disable font replacement to fix this)");
+            }
+            if ((s = (char *)((Gfx8BitFont *) r->font)->getCharName(i)) != 0)
+                glyphNames[i] = s;
+            else
+                glyphNames[i] = notdef;
+        }
+        epdf_write_enc(glyphNames, r->enc_objnum);
+    }
+    for (r = encodingList; r != 0; r = n) {
+        n = r->next;
+#ifdef POPPLER_VERSION
+        r->font->decRefCnt();
+#else
+#error POPPLER_VERSION should be defined.
+#endif
+        delete r;
+    }
+}
+
+// get the pagebox according to the pagebox_spec
+static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
+{
+    if (pagebox_spec == pdfboxspecmedia)
+        return page->getMediaBox();
+    else if (pagebox_spec == pdfboxspeccrop)
+        return page->getCropBox();
+    else if (pagebox_spec == pdfboxspecbleed)
+        return page->getBleedBox();
+    else if (pagebox_spec == pdfboxspectrim)
+        return page->getTrimBox();
+    else if (pagebox_spec == pdfboxspecart)
+        return page->getArtBox();
+    else
+        pdftex_fail("PDF inclusion: unknown value of pagebox spec (%i)",
+                    (int) pagebox_spec);
+    return page->getMediaBox(); // to make the compiler happy
+}
+
+
+// Reads various information about the PDF and sets it up for later inclusion.
+// This will fail if the PDF version of the PDF is higher than
+// minor_pdf_version_wanted or page_name is given and can not be found.
+// It makes no sense to give page_name _and_ page_num.
+// Returns the page number.
+
+int
+read_pdf_info(char *image_name, char *page_name, int page_num,
+              int pagebox_spec, int major_pdf_version_wanted, int minor_pdf_version_wanted,
+              int pdf_inclusion_errorlevel)
+{
+    PdfDocument *pdf_doc;
+    Page *page;
+    const PDFRectangle *pagebox;
+#ifdef POPPLER_VERSION
+    int pdf_major_version_found, pdf_minor_version_found;
+#else
+#error POPPLER_VERSION should be defined.
+#endif
+    // initialize
+    if (!isInit) {
+        globalParams = std::make_unique<GlobalParams>();
+        globalParams->setErrQuiet(false);
+        isInit = true;
+    }
+    // open PDF file
+    pdf_doc = find_add_document(image_name);
+    epdf_doc = (void *) pdf_doc;
+
+    // check PDF version
+    // this works only for PDF 1.x -- but since any versions of PDF newer
+    // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
+    // then have to changed drastically anyway.
+#ifdef POPPLER_VERSION
+    pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
+    pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
+    if ((pdf_major_version_found > major_pdf_version_wanted)
+     || (pdf_minor_version_found > minor_pdf_version_wanted)) {
+        const char *msg =
+            "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed";
+        if (pdf_inclusion_errorlevel > 0) {
+            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
+        } else if (pdf_inclusion_errorlevel < 0) {
+            ; /* do nothing */
+        } else { /* = 0, give warning */
+            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
+        }
+    }
+#else
+#error POPPLER_VERSION should be defined.
+#endif
+    epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
+    if (page_name) {
+        // get page by name
+        GString name(page_name);
+        LinkDest *link = pdf_doc->doc->findDest(&name);
+        if (link == 0 || !link->isOk())
+            pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
+        Ref ref = link->getPageRef();
+        page_num = pdf_doc->doc->getCatalog()->findPage(ref);
+        if (page_num == 0)
+            pdftex_fail("PDF inclusion: destination is not a page <%s>",
+                        page_name);
+        delete link;
+    } else {
+        // get page by number
+        if (page_num <= 0 || page_num > epdf_num_pages)
+            pdftex_fail("PDF inclusion: required page does not exist <%i>",
+                        epdf_num_pages);
+    }
+    // get the required page
+    page = pdf_doc->doc->getCatalog()->getPage(page_num);
+
+    // get the pagebox (media, crop...) to use.
+    pagebox = get_pagebox(page, pagebox_spec);
+    if (pagebox->x2 > pagebox->x1) {
+        epdf_orig_x = pagebox->x1;
+        epdf_width = pagebox->x2 - pagebox->x1;
+    } else {
+        epdf_orig_x = pagebox->x2;
+        epdf_width = pagebox->x1 - pagebox->x2;
+    }
+    if (pagebox->y2 > pagebox->y1) {
+        epdf_orig_y = pagebox->y1;
+        epdf_height = pagebox->y2 - pagebox->y1;
+    } else {
+        epdf_orig_y = pagebox->y2;
+        epdf_height = pagebox->y1 - pagebox->y2;
+    }
+
+    // get page rotation
+    epdf_rotate = page->getRotate() % 360;
+    if (epdf_rotate < 0)
+        epdf_rotate += 360;
+
+    // page group
+    if (page->getGroup() != NULL)
+        epdf_has_page_group = 1;    // only flag that page group is present;
+                                    // the actual object number will be
+                                    // generated in pdftex.web
+    else
+        epdf_has_page_group = 0;    // no page group present
+
+    pdf_doc->xref = pdf_doc->doc->getXRef();
+    return page_num;
+}
+
+// writes the current epf_doc.
+// Here the included PDF is copied, so most errors that can happen during PDF
+// inclusion will arise here.
+
+void write_epdf(void)
+{
+    Page *page;
+    Ref *pageRef;
+    Dict *pageDict;
+    Object contents, obj1, obj2, pageObj, dictObj;
+    Object groupDict;
+    bool writeSepGroup = false;
+    Object info;
+    char *key;
+    char s[256];
+    int i, l;
+    int rotate;
+    double scale[6] = { 0, 0, 0, 0, 0, 0 };
+    bool writematrix = false;
+    int suppress_ptex_info = getpdfsuppressptexinfo();
+    static const char *pageDictKeys[] = {
+        "LastModified",
+        "Metadata",
+        "PieceInfo",
+        "SeparationInfo",
+//         "Group",
+//         "Resources",
+        NULL
+    };
+
+    PdfDocument *pdf_doc = (PdfDocument *) epdf_doc;
+    (pdf_doc->occurences)--;
+    xref = pdf_doc->xref;
+    inObjList = pdf_doc->inObjList;
+    encodingList = 0;
+    page = pdf_doc->doc->getCatalog()->getPage(epdf_selected_page);
+    pageRef = pdf_doc->doc->getCatalog()->getPageRef(epdf_selected_page);
+    pageObj = xref->fetch(pageRef->num, pageRef->gen);
+    pageDict = pageObj.getDict();
+    rotate = page->getRotate();
+    const PDFRectangle *pagebox;
+    // write the Page header
+    pdf_puts("/Type /XObject\n");
+    pdf_puts("/Subtype /Form\n");
+    pdf_puts("/FormType 1\n");
+
+    // write additional information
+    if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_FILENAME) == 0) {
+        pdf_printf("/%s.FileName (%s)\n", pdfkeyprefix,
+                   convertStringToPDFString(pdf_doc->file_name,
+                                            strlen(pdf_doc->file_name)));
+    }
+    if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_PAGENUMBER) == 0) {
+        pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, (int) epdf_selected_page);
+    }
+    if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_INFODICT) == 0) {
+        info = pdf_doc->doc->getDocInfoNF().copy();
+        if (info.isRef()) {
+            // the info dict must be indirect (PDF Ref p. 61)
+            pdf_printf("/%s.InfoDict ", pdfkeyprefix);
+            pdf_printf("%d 0 R\n", addOther(info.getRef()));
+        }
+    }
+    // get the pagebox (media, crop...) to use.
+    pagebox = get_pagebox(page, epdf_page_box);
+
+    // handle page rotation
+    if (rotate != 0) {
+        if (rotate % 90 == 0) {
+            // this handles only the simple case: multiple of 90s but these
+            // are the only values allowed according to the reference
+            // (v1.3, p. 78).
+            // the image is rotated around its center.
+            // the /Rotate key is clockwise while the matrix is
+            // counterclockwise :-%
+            tex_printf(", page is rotated %d degrees", rotate);
+            switch (rotate) {
+            case 90:
+                scale[1] = -1;
+                scale[2] = 1;
+                scale[4] = pagebox->x1 - pagebox->y1;
+                scale[5] = pagebox->y1 + pagebox->x2;
+                writematrix = true;
+                break;
+            case 180:
+                scale[0] = scale[3] = -1;
+                scale[4] = pagebox->x1 + pagebox->x2;
+                scale[5] = pagebox->y1 + pagebox->y2;
+                writematrix = true;
+                break;          // width and height are exchanged
+            case 270:
+                scale[1] = 1;
+                scale[2] = -1;
+                scale[4] = pagebox->x1 + pagebox->y2;
+                scale[5] = pagebox->y1 - pagebox->x1;
+                writematrix = true;
+                break;
+            }
+            if (writematrix) {  // The matrix is only written if the image is rotated.
+                sprintf(s, "/Matrix [%.8f %.8f %.8f %.8f %.8f %.8f]\n",
+                        scale[0],
+                        scale[1], scale[2], scale[3], scale[4], scale[5]);
+                pdf_puts(stripzeros(s));
+            }
+        }
+    }
+
+    sprintf(s, "/BBox [%.8f %.8f %.8f %.8f]\n",
+            pagebox->x1, pagebox->y1, pagebox->x2, pagebox->y2);
+    pdf_puts(stripzeros(s));
+
+    // Metadata validity check (as a stream it must be indirect)
+    dictObj = pageDict->lookupNF("Metadata").copy();
+    if (!dictObj.isNull() && !dictObj.isRef())
+        pdftex_warn("PDF inclusion: /Metadata must be indirect object");
+
+    // copy selected items in Page dictionary except Resources & Group
+    for (i = 0; pageDictKeys[i] != NULL; i++) {
+        dictObj = pageDict->lookupNF(pageDictKeys[i]).copy();
+        if (!dictObj.isNull()) {
+            pdf_newline();
+            pdf_printf("/%s ", pageDictKeys[i]);
+            copyObject(&dictObj); // preserves indirection
+        }
+    } 
+
+    // handle page group
+    dictObj = pageDict->lookupNF("Group").copy();
+    if (!dictObj.isNull()) {
+        if (pdfpagegroupval == 0) { 
+            // another pdf with page group was included earlier on the
+            // same page; copy the Group entry as is.  See manual for
+            // info on why this is a warning.
+            if (getpdfsuppresswarningpagegroup() == 0) {
+                pdftex_warn
+    ("PDF inclusion: multiple pdfs with page group included in a single page");
+            }
+            pdf_newline();
+            pdf_puts("/Group ");
+            copyObject(&dictObj);
+        } else {
+            // write Group dict as a separate object, since the Page dict also refers to it
+            dictObj = pageDict->lookup("Group");
+            if (!dictObj.isDict())
+                pdftex_fail("PDF inclusion: /Group dict missing");
+            writeSepGroup = true;
+/*
+This part is only a single line
+            groupDict = Object(page->getGroup());
+in the original patch. In this case, however, pdftex crashes at
+"delete pdf_doc->doc" in "delete_document()" for inclusion of some
+kind of pdf images, for example, figure_missing.pdf in gnuplot.
+A change
+            groupDict = Object(page->getGroup()).copy();
+does not improve the situation.
+The changes below seem to work fine. 
+*/
+// begin modification
+            groupDict = pageDict->lookup("Group");
+            const Dict& dic1 = page->getGroup();
+            const Dict& dic2 = groupDict.getDict();
+            // replace dic2 in groupDict with dic1
+            l = dic2.getLength();
+            for (i = 0; i < l; i++) {
+                groupDict.dictRemove(dic2.getKey(i));
+            }
+            l = dic1.getLength();
+            for (i = 0; i < l; i++) {
+                groupDict.dictAdd((const char *)copyString(dic1.getKey(i)),
+                                  dic1.getValNF(i).copy());
+            }
+// end modification
+            pdf_printf("/Group %ld 0 R\n", (long)pdfpagegroupval);
+        }
+    }
+
+    // write the Resources dictionary
+    if (page->getResourceDict() == NULL) {
+        // Resources can be missing (files without them have been spotted
+        // in the wild); in which case the /Resouces of the /Page will be used.
+        // "This practice is not recommended".
+        pdftex_warn
+            ("PDF inclusion: /Resources missing. 'This practice is not recommended' (PDF Ref)");
+    } else {
+        Object *obj1 = page->getResourceDictObject();
+        if (!obj1->isDict())
+            pdftex_fail("PDF inclusion: invalid resources dict type <%s>",
+                        obj1->getTypeName());
+        pdf_newline();
+        pdf_puts("/Resources <<\n");
+        for (i = 0, l = obj1->dictGetLength(); i < l; ++i) {
+            obj2 = obj1->dictGetVal(i);
+            key = (char *)obj1->dictGetKey(i);
+            if (strcmp("Font", key) == 0)
+                copyFontResources(&obj2);
+            else if (strcmp("ProcSet", key) == 0)
+                copyProcSet(&obj2);
+            else
+                copyOtherResources(&obj2, (char *)key);
+        }
+        pdf_puts(">>\n");
+    }
+
+    // write the page contents
+    contents = page->getContents();
+    if (contents.isStream()) {
+
+        // Variant A: get stream and recompress under control
+        // of \pdfcompresslevel
+        //
+        // pdfbeginstream();
+        // copyStream(contents->getStream());
+        // pdfendstream();
+
+        // Variant B: copy stream without recompressing
+        //
+        obj1 = contents.streamGetDict()->lookup("F");
+        if (!obj1.isNull()) {
+            pdftex_fail("PDF inclusion: Unsupported external stream");
+        }
+        obj1 = contents.streamGetDict()->lookup("Length");
+        assert(!obj1.isNull());
+        pdf_puts("/Length ");
+        copyObject(&obj1);
+        pdf_puts("\n");
+        obj1 = contents.streamGetDict()->lookup("Filter");
+        if (!obj1.isNull()) {
+            pdf_puts("/Filter ");
+            copyObject(&obj1);
+            pdf_puts("\n");
+            obj1 = contents.streamGetDict()->lookup("DecodeParms");
+            if (!obj1.isNull()) {
+                pdf_puts("/DecodeParms ");
+                copyObject(&obj1);
+                pdf_puts("\n");
+            }
+        }
+        pdf_puts(">>\nstream\n");
+        copyStream(contents.getStream()->getUndecodedStream());
+        pdfendstream();
+    } else if (contents.isArray()) {
+        pdfbeginstream();
+        for (i = 0, l = contents.arrayGetLength(); i < l; ++i) {
+            Object contentsobj = contents.arrayGet(i);
+            copyStream(contentsobj.getStream());
+            if (i < l - 1)
+                pdf_newline();  // add a newline after each stream except the last
+        }
+        pdfendstream();
+    } else {                    // the contents are optional, but we need to include an empty stream
+        pdfbeginstream();
+        pdfendstream();
+    }
+
+    // write out all indirect objects
+    writeRefs();
+
+    // write out all used encodings (and delete list)
+    writeEncodings();
+
+    // write the Group dict if needed
+    if (writeSepGroup) {
+        pdfbeginobj(pdfpagegroupval, 2);
+        copyObject(&groupDict);
+        pdf_puts("\n");
+        pdfendobj();
+        pdfpagegroupval = 0;    // only the 1st included pdf on a page gets its
+                                // Group included in the Page dict
+    }
+
+    // save object list, xref
+    pdf_doc->inObjList = inObjList;
+    pdf_doc->xref = xref;
+}
+
+// Called when an image has been written and it's resources in image_tab are
+// freed and it's not referenced anymore.
+
+void epdf_delete()
+{
+    PdfDocument *pdf_doc = (PdfDocument *) epdf_doc;
+    xref = pdf_doc->xref;
+    if (pdf_doc->occurences < 0) {
+        delete_document(pdf_doc);
+    }
+}
+
+// Called when PDF embedding system is finalized.
+// Now deallocate all remaining PdfDocuments.
+
+void epdf_check_mem()
+{
+    if (isInit) {
+        PdfDocument *p, *n;
+        for (p = pdfDocuments; p; p = n) {
+            n = p->next;
+            delete_document(p);
+        }
+    }
+}


Property changes on: branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-poppler0.83.0.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc	2020-02-18 19:11:23 UTC (rev 820)
@@ -20,7 +20,7 @@
 /*
 This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
 https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
-by Arch Linux. The poppler should be 0.76.0 or newer versions.
+by Arch Linux. The poppler should be 0.76.0 upto 0.82.0.
 POPPLER_VERSION should be defined.
 */
 

Added: branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-poppler0.83.0.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-poppler0.83.0.cc	                        (rev 0)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-poppler0.83.0.cc	2020-02-18 19:11:23 UTC (rev 820)
@@ -0,0 +1,205 @@
+/*
+Copyright 1996-2017 Han The Thanh, <thanh at pdftex.org>
+
+This file is part of pdfTeX.
+
+pdfTeX is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+pdfTeX is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
+https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
+by Arch Linux. The poppler should be 0.83.0 or newer versions.
+POPPLER_VERSION should be defined.
+*/
+
+#include <w2c/config.h>
+
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#ifdef POPPLER_VERSION
+#define GString GooString
+#define xpdfVersion POPPLER_VERSION
+#include <dirent.h>
+#include <goo/GooString.h>
+#include <goo/gmem.h>
+#include <goo/gfile.h>
+#else
+#error POPPLER_VERSION should be defined.
+#endif
+#include <assert.h>
+
+#include "Object.h"
+#include "Stream.h"
+#include "Lexer.h"
+#include "Parser.h"
+#include "Array.h"
+#include "Dict.h"
+#include "XRef.h"
+#include "Catalog.h"
+#include "Page.h"
+#include "GfxFont.h"
+#include "PDFDoc.h"
+#include "GlobalParams.h"
+#include "Error.h"
+
+static XRef *xref = 0;
+
+int main(int argc, char *argv[])
+{
+    char *p, buf[1024];
+    PDFDoc *doc;
+    GString *fileName;
+    Stream *s;
+    Object srcStream, srcName, catalogDict;
+    FILE *outfile;
+    char *outname;
+    int objnum = 0, objgen = 0;
+    bool extract_xref_table = false;
+    int c;
+    fprintf(stderr, "pdftosrc version %s\n", xpdfVersion);
+    if (argc < 2) {
+        fprintf(stderr,
+                "Usage: pdftosrc <PDF-file> [<stream-object-number>]\n");
+        exit(1);
+    }
+    fileName = new GString(argv[1]);
+    globalParams = std::make_unique<GlobalParams>();
+    doc = new PDFDoc(fileName);
+    if (!doc->isOk()) {
+        fprintf(stderr, "Invalid PDF file\n");
+        exit(1);
+    }
+    if (argc >= 3) {
+        objnum = atoi(argv[2]);
+        if (argc >= 4)
+            objgen = atoi(argv[3]);
+    }
+    xref = doc->getXRef();
+    catalogDict = xref->getCatalog();
+    if (!catalogDict.isDict("Catalog")) {
+        fprintf(stderr, "No Catalog found\n");
+        exit(1);
+    }
+    srcStream = Object(objNull);
+    if (objnum == 0) {
+        srcStream = catalogDict.dictLookup("SourceObject");
+        static const char *const_SourceFile = "SourceFile";
+        if (!srcStream.isDict(const_SourceFile)) {
+            fprintf(stderr, "No SourceObject found\n");
+            exit(1);
+        }
+        srcName = srcStream.getStream()->getDict()->lookup("SourceName");
+        if (!srcName.isString()) {
+            fprintf(stderr, "No SourceName found\n");
+            exit(1);
+        }
+        outname = (char *)srcName.getString()->c_str();
+        // We cannot free srcName, as objname shares its string.
+        // srcName.free();
+    } else if (objnum > 0) {
+        srcStream = xref->fetch(objnum, objgen);
+        if (!srcStream.isStream()) {
+            fprintf(stderr, "Not a Stream object\n");
+            exit(1);
+        }
+        sprintf(buf, "%s", fileName->c_str());
+        if ((p = strrchr(buf, '.')) == 0)
+            p = strchr(buf, 0);
+        if (objgen == 0)
+            sprintf(p, ".%i", objnum);
+        else
+            sprintf(p, ".%i+%i", objnum, objgen);
+        outname = buf;
+    } else {                    // objnum < 0 means we are extracting the XRef table
+        extract_xref_table = true;
+        sprintf(buf, "%s", fileName->c_str());
+        if ((p = strrchr(buf, '.')) == 0)
+            p = strchr(buf, 0);
+        sprintf(p, ".xref");
+        outname = buf;
+    }
+    if (!(outfile = fopen(outname, "wb"))) {
+        fprintf(stderr, "Cannot open file \"%s\" for writing\n", outname);
+        exit(1);
+    }
+    if (extract_xref_table) {
+        int size = xref->getNumObjects();
+        int i;
+        for (i = 0; i < size; i++) {
+            if (xref->getEntry(i)->offset == 0xffffffff)
+                break;
+        }
+        size = i;
+        fprintf(outfile, "xref\n");
+        fprintf(outfile, "0 %i\n", size);
+        for (i = 0; i < size; i++) {
+            XRefEntry *e = xref->getEntry(i);
+            if (e->type != xrefEntryCompressed)
+                fprintf(outfile, "%.10lu %.5i %s\n",
+                        (long unsigned) e->offset, e->gen,
+                        (e->type == xrefEntryFree ? "f" : "n"));
+            else {              // e->offset is the object number of the object stream
+                Stream *str;
+                Lexer *lexer;
+                Parser *parser;
+                Object objStr, obj1, obj2;
+                int nObjects, first, n;
+                int localOffset = 0;
+                unsigned int firstOffset;
+
+                objStr = xref->fetch(e->offset, 0);
+                assert(objStr.isStream());
+                obj1 = objStr.streamGetDict()->lookup("N");
+                nObjects = obj1.getInt();
+                obj1 = objStr.streamGetDict()->lookup("First");
+                first = obj1.getInt();
+                firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
+
+                // parse the header: object numbers and offsets
+                objStr.streamReset();
+                str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
+                parser = new Parser(xref, str, false);
+                for (n = 0; n < nObjects; ++n) {
+                    obj1 = parser->getObj();
+                    obj2 = parser->getObj();
+                    if (n == e->gen)
+                        localOffset = obj2.getInt();
+                }
+                while (str->getChar() != EOF) ;
+                delete parser;
+
+                fprintf(outfile, "%.10lu 00000 n\n",
+                        (long unsigned)(firstOffset + localOffset));
+            }
+        }
+    } else {
+        s = srcStream.getStream();
+        s->reset();
+        while ((c = s->getChar()) != EOF)
+            fputc(c, outfile);
+    }
+    if (objnum == 0)
+        fprintf(stderr, "Source file extracted to %s\n", outname);
+    else if (objnum > 0)
+        fprintf(stderr, "Stream object extracted to %s\n", outname);
+    else
+        fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
+    fclose(outfile);
+    delete doc;
+}


Property changes on: branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-poppler0.83.0.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/texk/web2c/pdftexdir/utils.c
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/utils.c	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/pdftexdir/utils.c	2020-02-18 19:11:23 UTC (rev 820)
@@ -33,7 +33,7 @@
 #include "ptexlib.h"
 #include <png.h>
 #ifdef POPPLER_VERSION
-#include <poppler-config.h>
+/* POPPLER_VERSION should be a proper version string */
 #define xpdfVersion POPPLER_VERSION
 #define xpdfString "poppler"
 #else

Added: branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.bib
===================================================================
--- branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.bib	                        (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.bib	2020-02-18 19:11:23 UTC (rev 820)
@@ -0,0 +1,1092 @@
+ at ARTICLE{2017ApJ...848L..12A,
+       author = {{Abbott}, B.~P. and {Abbott}, R. and {Abbott}, T.~D. and {Acernese}, F. and
+         {Ackley}, K. and {Adams}, C. and {Adams}, T. and {Addesso}, P. and
+         {Adhikari}, R.~X. and {Adya}, V.~B. and {Affeldt}, C. and
+         {Afrough}, M. and {Agarwal}, B. and {Agathos}, M. and {Agatsuma}, K. and
+         {Aggarwal}, N. and {Aguiar}, O.~D. and {Aiello}, L. and {Ain}, A. and
+         {Ajith}, P. and {Allen}, B. and {Allen}, G. and {Allocca}, A. and
+         {Altin}, P.~A. and {Amato}, A. and {Ananyeva}, A. and
+         {Anderson}, S.~B. and {Anderson}, W.~G. and {Angelova}, S.~V. and
+         {Antier}, S. and {Appert}, S. and {Arai}, K. and {Araya}, M.~C. and
+         {Areeda}, J.~S. and {Arnaud}, N. and {Arun}, K.~G. and {Ascenzi}, S. and
+         {Ashton}, G. and {Ast}, M. and {Aston}, S.~M. and {Astone}, P. and
+         {Atallah}, D.~V. and {Aufmuth}, P. and {Aulbert}, C. and
+         {AultONeal}, K. and {Austin}, C. and {Avila-Alvarez}, A. and
+         {Babak}, S. and {Bacon}, P. and {Bader}, M.~K.~M. and {Bae}, S. and
+         {Baker}, P.~T. and {Baldaccini}, F. and {Ballardin}, G. and
+         {Ballmer}, S.~W. and {Banagiri}, S. and {Barayoga}, J.~C. and
+         {Barclay}, S.~E. and {Barish}, B.~C. and {Barker}, D. and
+         {Barkett}, K. and {Barone}, F. and {Barr}, B. and {Barsotti}, L. and
+         {Barsuglia}, M. and {Barta}, D. and {Barthelmy}, S.~D. and
+         {Bartlett}, J. and {Bartos}, I. and {Bassiri}, R. and {Basti}, A. and
+         {Batch}, J.~C. and {Bawaj}, M. and {Bayley}, J.~C. and {Bazzan}, M. and
+         {B{\'e}csy}, B. and {Beer}, C. and {Bejger}, M. and {Belahcene}, I. and
+         {Bell}, A.~S. and {Berger}, B.~K. and {Bergmann}, G. and {Bero}, J.~J. and
+         {Berry}, C.~P.~L. and {Bersanetti}, D. and {Bertolini}, A. and
+         {Betzwieser}, J. and {Bhagwat}, S. and {Bhandare}, R. and
+         {Bilenko}, I.~A. and {Billingsley}, G. and {Billman}, C.~R. and
+         {Birch}, J. and {Birney}, R. and {Birnholtz}, O. and {Biscans}, S. and
+         {Biscoveanu}, S. and {Bisht}, A. and {Bitossi}, M. and {Biwer}, C. and
+         {Bizouard}, M.~A. and {Blackburn}, J.~K. and {Blackman}, J. and
+         {Blair}, C.~D. and {Blair}, D.~G. and {Blair}, R.~M. and {Bloemen}, S. and
+         {Bock}, O. and {Bode}, N. and {Boer}, M. and {Bogaert}, G. and
+         {Bohe}, A. and {Bondu}, F. and {Bonilla}, E. and {Bonnand}, R. and
+         {Boom}, B.~A. and {Bork}, R. and {Boschi}, V. and {Bose}, S. and
+         {Bossie}, K. and {Bouffanais}, Y. and {Bozzi}, A. and {Bradaschia}, C. and
+         {Brady}, P.~R. and {Branchesi}, M. and {Brau}, J.~E. and {Briant}, T. and
+         {Brillet}, A. and {Brinkmann}, M. and {Brisson}, V. and {Brockill}, P. and
+         {Broida}, J.~E. and {Brooks}, A.~F. and {Brown}, D.~A. and
+         {Brown}, D.~D. and {Brunett}, S. and {Buchanan}, C.~C. and
+         {Buikema}, A. and {Bulik}, T. and {Bulten}, H.~J. and {Buonanno}, A. and
+         {Buskulic}, D. and {Buy}, C. and {Byer}, R.~L. and {Cabero}, M. and
+         {Cadonati}, L. and {Cagnoli}, G. and {Cahillane}, C. and
+         {Calder{\'o}n Bustillo}, J. and {Callister}, T.~A. and {Calloni}, E. and
+         {Camp}, J.~B. and {Canepa}, M. and {Canizares}, P. and {Cannon}, K.~C. and
+         {Cao}, H. and {Cao}, J. and {Capano}, C.~D. and {Capocasa}, E. and
+         {Carbognani}, F. and {Caride}, S. and {Carney}, M.~F. and
+         {Casanueva Diaz}, J. and {Casentini}, C. and {Caudill}, S. and
+         {Cavagli{\`a}}, M. and {Cavalier}, F. and {Cavalieri}, R. and
+         {Cella}, G. and {Cepeda}, C.~B. and {Cerd{\'a}-Dur{\'a}n}, P. and
+         {Cerretani}, G. and {Cesarini}, E. and {Chamberlin}, S.~J. and
+         {Chan}, M. and {Chao}, S. and {Charlton}, P. and {Chase}, E. and {Chassand
+        e-Mottin}, E. and {Chatterjee}, D. and {Chatziioannou}, K. and
+         {Cheeseboro}, B.~D. and {Chen}, H.~Y. and {Chen}, X. and {Chen}, Y. and
+         {Cheng}, H. -P. and {Chia}, H. and {Chincarini}, A. and {Chiummo}, A. and
+         {Chmiel}, T. and {Cho}, H.~S. and {Cho}, M. and {Chow}, J.~H. and
+         {Christensen}, N. and {Chu}, Q. and {Chua}, A.~J.~K. and {Chua}, S. and
+         {Chung}, A.~K.~W. and {Chung}, S. and {Ciani}, G. and {Ciolfi}, R. and
+         {Cirelli}, C.~E. and {Cirone}, A. and {Clara}, F. and {Clark}, J.~A. and
+         {Clearwater}, P. and {Cleva}, F. and {Cocchieri}, C. and {Coccia}, E. and
+         {Cohadon}, P. -F. and {Cohen}, D. and {Colla}, A. and
+         {Collette}, C.~G. and {Cominsky}, L.~R. and {Constancio}, M., Jr. and
+         {Conti}, L. and {Cooper}, S.~J. and {Corban}, P. and {Corbitt}, T.~R. and
+         {Cordero-Carri{\'o}n}, I. and {Corley}, K.~R. and {Cornish}, N. and
+         {Corsi}, A. and {Cortese}, S. and {Costa}, C.~A. and {Coughlin}, M.~W. and
+         {Coughlin}, S.~B. and {Coulon}, J. -P. and {Countryman}, S.~T. and
+         {Couvares}, P. and {Covas}, P.~B. and {Cowan}, E.~E. and
+         {Coward}, D.~M. and {Cowart}, M.~J. and {Coyne}, D.~C. and {Coyne}, R. and
+         {Creighton}, J.~D.~E. and {Creighton}, T.~D. and {Cripe}, J. and
+         {Crowder}, S.~G. and {Cullen}, T.~J. and {Cumming}, A. and
+         {Cunningham}, L. and {Cuoco}, E. and {Dal Canton}, T. and
+         {D{\'a}lya}, G. and {Danilishin}, S.~L. and {D'Antonio}, S. and
+         {Danzmann}, K. and {Dasgupta}, A. and {Da Silva Costa}, C.~F. and
+         {Dattilo}, V. and {Dave}, I. and {Davier}, M. and {Davis}, D. and
+         {Daw}, E.~J. and {Day}, B. and {De}, S. and {DeBra}, D. and
+         {Degallaix}, J. and {De Laurentis}, M. and {Del{\'e}glise}, S. and
+         {Del Pozzo}, W. and {Demos}, N. and {Denker}, T. and {Dent}, T. and
+         {De Pietri}, R. and {Dergachev}, V. and {De Rosa}, R. and
+         {DeRosa}, R.~T. and {De Rossi}, C. and {DeSalvo}, R. and
+         {de Varona}, O. and {Devenson}, J. and {Dhurandhar}, S. and
+         {D{\'\i}az}, M.~C. and {Di Fiore}, L. and {Di Giovanni}, M. and
+         {Di Girolamo}, T. and {Di Lieto}, A. and {Di Pace}, S. and
+         {Di Palma}, I. and {Di Renzo}, F. and {Doctor}, Z. and {Dolique}, V. and
+         {Donovan}, F. and {Dooley}, K.~L. and {Doravari}, S. and
+         {Dorrington}, I. and {Douglas}, R. and {Dovale {\'A}lvarez}, M. and
+         {Downes}, T.~P. and {Drago}, M. and {Dreissigacker}, C. and
+         {Driggers}, J.~C. and {Du}, Z. and {Ducrot}, M. and {Dupej}, P. and
+         {Dwyer}, S.~E. and {Edo}, T.~B. and {Edwards}, M.~C. and {Effler}, A. and
+         {Ehrens}, P. and {Eichholz}, J. and {Eikenberry}, S.~S. and
+         {Eisenstein}, R.~A. and {Essick}, R.~C. and {Estevez}, D. and
+         {Etienne}, Z.~B. and {Etzel}, T. and {Evans}, M. and {Evans}, T.~M. and
+         {Factourovich}, M. and {Fafone}, V. and {Fair}, H. and {Fairhurst}, S. and
+         {Fan}, X. and {Farinon}, S. and {Farr}, B. and {Farr}, W.~M. and
+         {Fauchon-Jones}, E.~J. and {Favata}, M. and {Fays}, M. and {Fee}, C. and
+         {Fehrmann}, H. and {Feicht}, J. and {Fejer}, M.~M. and {Fernand
+        ez-Galiana}, A. and {Ferrante}, I. and {Ferreira}, E.~C. and
+         {Ferrini}, F. and {Fidecaro}, F. and {Finstad}, D. and {Fiori}, I. and
+         {Fiorucci}, D. and {Fishbach}, M. and {Fisher}, R.~P. and
+         {Fitz-Axen}, M. and {Flaminio}, R. and {Fletcher}, M. and {Fong}, H. and
+         {Font}, J.~A. and {Forsyth}, P.~W.~F. and {Forsyth}, S.~S. and
+         {Fournier}, J. -D. and {Frasca}, S. and {Frasconi}, F. and {Frei}, Z. and
+         {Freise}, A. and {Frey}, R. and {Frey}, V. and {Fries}, E.~M. and
+         {Fritschel}, P. and {Frolov}, V.~V. and {Fulda}, P. and {Fyffe}, M. and
+         {Gabbard}, H. and {Gadre}, B.~U. and {Gaebel}, S.~M. and {Gair}, J.~R. and
+         {Gammaitoni}, L. and {Ganija}, M.~R. and {Gaonkar}, S.~G. and
+         {Garcia-Quiros}, C. and {Garufi}, F. and {Gateley}, B. and
+         {Gaudio}, S. and {Gaur}, G. and {Gayathri}, V. and {Gehrels}, N. and
+         {Gemme}, G. and {Genin}, E. and {Gennai}, A. and {George}, D. and
+         {George}, J. and {Gergely}, L. and {Germain}, V. and {Ghonge}, S. and
+         {Ghosh}, Abhirup and {Ghosh}, Archisman and {Ghosh}, S. and
+         {Giaime}, J.~A. and {Giardina}, K.~D. and {Giazotto}, A. and
+         {Gill}, K. and {Glover}, L. and {Goetz}, E. and {Goetz}, R. and
+         {Gomes}, S. and {Goncharov}, B. and {Gonz{\'a}lez}, G. and
+         {Gonzalez Castro}, J.~M. and {Gopakumar}, A. and {Gorodetsky}, M.~L. and
+         {Gossan}, S.~E. and {Gosselin}, M. and {Gouaty}, R. and {Grado}, A. and
+         {Graef}, C. and {Granata}, M. and {Grant}, A. and {Gras}, S. and
+         {Gray}, C. and {Greco}, G. and {Green}, A.~C. and {Gretarsson}, E.~M. and
+         {Griswold}, B. and {Groot}, P. and {Grote}, H. and {Grunewald}, S. and
+         {Gruning}, P. and {Guidi}, G.~M. and {Guo}, X. and {Gupta}, A. and
+         {Gupta}, M.~K. and {Gushwa}, K.~E. and {Gustafson}, E.~K. and
+         {Gustafson}, R. and {Halim}, O. and {Hall}, B.~R. and {Hall}, E.~D. and
+         {Hamilton}, E.~Z. and {Hammond}, G. and {Haney}, M. and {Hanke}, M.~M. and
+         {Hanks}, J. and {Hanna}, C. and {Hannam}, M.~D. and
+         {Hannuksela}, O.~A. and {Hanson}, J. and {Hardwick}, T. and
+         {Harms}, J. and {Harry}, G.~M. and {Harry}, I.~W. and {Hart}, M.~J. and
+         {Haster}, C. -J. and {Haughian}, K. and {Healy}, J. and {Heidmann}, A. and
+         {Heintze}, M.~C. and {Heitmann}, H. and {Hello}, P. and {Hemming}, G. and
+         {Hendry}, M. and {Heng}, I.~S. and {Hennig}, J. and
+         {Heptonstall}, A.~W. and {Heurs}, M. and {Hild}, S. and {Hinderer}, T. and
+         {Hoak}, D. and {Hofman}, D. and {Holt}, K. and {Holz}, D.~E. and
+         {Hopkins}, P. and {Horst}, C. and {Hough}, J. and {Houston}, E.~A. and
+         {Howell}, E.~J. and {Hreibi}, A. and {Hu}, Y.~M. and {Huerta}, E.~A. and
+         {Huet}, D. and {Hughey}, B. and {Husa}, S. and {Huttner}, S.~H. and
+         {Huynh-Dinh}, T. and {Indik}, N. and {Inta}, R. and {Intini}, G. and
+         {Isa}, H.~N. and {Isac}, J. -M. and {Isi}, M. and {Iyer}, B.~R. and
+         {Izumi}, K. and {Jacqmin}, T. and {Jani}, K. and {Jaranowski}, P. and
+         {Jawahar}, S. and {Jim{\'e}nez-Forteza}, F. and {Johnson}, W.~W. and
+         {Jones}, D.~I. and {Jones}, R. and {Jonker}, R.~J.~G. and {Ju}, L. and
+         {Junker}, J. and {Kalaghatgi}, C.~V. and {Kalogera}, V. and
+         {Kamai}, B. and {Kandhasamy}, S. and {Kang}, G. and {Kanner}, J.~B. and
+         {Kapadia}, S.~J. and {Karki}, S. and {Karvinen}, K.~S. and
+         {Kasprzack}, M. and {Katolik}, M. and {Katsavounidis}, E. and
+         {Katzman}, W. and {Kaufer}, S. and {Kawabe}, K. and
+         {K{\'e}f{\'e}lian}, F. and {Keitel}, D. and {Kemball}, A.~J. and
+         {Kennedy}, R. and {Kent}, C. and {Key}, J.~S. and {Khalili}, F.~Y. and
+         {Khan}, I. and {Khan}, S. and {Khan}, Z. and {Khazanov}, E.~A. and
+         {Kijbunchoo}, N. and {Kim}, Chunglee and {Kim}, J.~C. and {Kim}, K. and
+         {Kim}, W. and {Kim}, W.~S. and {Kim}, Y. -M. and {Kimbrell}, S.~J. and
+         {King}, E.~J. and {King}, P.~J. and {Kinley-Hanlon}, M. and
+         {Kirchhoff}, R. and {Kissel}, J.~S. and {Kleybolte}, L. and
+         {Klimenko}, S. and {Knowles}, T.~D. and {Koch}, P. and
+         {Koehlenbeck}, S.~M. and {Koley}, S. and {Kondrashov}, V. and
+         {Kontos}, A. and {Korobko}, M. and {Korth}, W.~Z. and {Kowalska}, I. and
+         {Kozak}, D.~B. and {Kr{\"a}mer}, C. and {Kringel}, V. and
+         {Krishnan}, B. and {Kr{\'o}lak}, A. and {Kuehn}, G. and {Kumar}, P. and
+         {Kumar}, R. and {Kumar}, S. and {Kuo}, L. and {Kutynia}, A. and
+         {Kwang}, S. and {Lackey}, B.~D. and {Lai}, K.~H. and {Landry}, M. and
+         {Lang}, R.~N. and {Lange}, J. and {Lantz}, B. and {Lanza}, R.~K. and
+         {Larson}, S.~L. and {Lartaux-Vollard}, A. and {Lasky}, P.~D. and
+         {Laxen}, M. and {Lazzarini}, A. and {Lazzaro}, C. and {Leaci}, P. and
+         {Leavey}, S. and {Lee}, C.~H. and {Lee}, H.~K. and {Lee}, H.~M. and
+         {Lee}, H.~W. and {Lee}, K. and {Lehmann}, J. and {Lenon}, A. and
+         {Leonardi}, M. and {Leroy}, N. and {Letendre}, N. and {Levin}, Y. and
+         {Li}, T.~G.~F. and {Linker}, S.~D. and {Littenberg}, T.~B. and
+         {Liu}, J. and {Lo}, R.~K.~L. and {Lockerbie}, N.~A. and
+         {London}, L.~T. and {Lord}, J.~E. and {Lorenzini}, M. and
+         {Loriette}, V. and {Lormand}, M. and {Losurdo}, G. and {Lough}, J.~D. and
+         {Lousto}, C.~O. and {Lovelace}, G. and {L{\"u}ck}, H. and {Lumaca}, D. and
+         {Lundgren}, A.~P. and {Lynch}, R. and {Ma}, Y. and {Macas}, R. and
+         {Macfoy}, S. and {Machenschalk}, B. and {MacInnis}, M. and
+         {Macleod}, D.~M. and {Maga{\~n}a Hernandez}, I. and {Maga{\~n}a-Sand
+        oval}, F. and {Maga{\~n}a Zertuche}, L. and {Magee}, R.~M. and
+         {Majorana}, E. and {Maksimovic}, I. and {Man}, N. and {Mandic}, V. and
+         {Mangano}, V. and {Mansell}, G.~L. and {Manske}, M. and
+         {Mantovani}, M. and {Marchesoni}, F. and {Marion}, F. and
+         {M{\'a}rka}, S. and {M{\'a}rka}, Z. and {Markakis}, C. and
+         {Markosyan}, A.~S. and {Markowitz}, A. and {Maros}, E. and
+         {Marquina}, A. and {Marsh}, P. and {Martelli}, F. and {Martellini}, L. and
+         {Martin}, I.~W. and {Martin}, R.~M. and {Martynov}, D.~V. and
+         {Mason}, K. and {Massera}, E. and {Masserot}, A. and
+         {Massinger}, T.~J. and {Masso-Reid}, M. and {Mastrogiovanni}, S. and
+         {Matas}, A. and {Matichard}, F. and {Matone}, L. and {Mavalvala}, N. and
+         {Mazumder}, N. and {McCarthy}, R. and {McClelland}, D.~E. and
+         {McCormick}, S. and {McCuller}, L. and {McGuire}, S.~C. and
+         {McIntyre}, G. and {McIver}, J. and {McManus}, D.~J. and {McNeill}, L. and
+         {McRae}, T. and {McWilliams}, S.~T. and {Meacher}, D. and
+         {Meadors}, G.~D. and {Mehmet}, M. and {Meidam}, J. and
+         {Mejuto-Villa}, E. and {Melatos}, A. and {Mendell}, G. and
+         {Mercer}, R.~A. and {Merilh}, E.~L. and {Merzougui}, M. and
+         {Meshkov}, S. and {Messenger}, C. and {Messick}, C. and
+         {Metzdorff}, R. and {Meyers}, P.~M. and {Miao}, H. and {Michel}, C. and
+         {Middleton}, H. and {Mikhailov}, E.~E. and {Milano}, L. and
+         {Miller}, A.~L. and {Miller}, B.~B. and {Miller}, J. and
+         {Millhouse}, M. and {Milovich-Goff}, M.~C. and {Minazzoli}, O. and
+         {Minenkov}, Y. and {Ming}, J. and {Mishra}, C. and {Mitra}, S. and
+         {Mitrofanov}, V.~P. and {Mitselmakher}, G. and {Mittleman}, R. and
+         {Moffa}, D. and {Moggi}, A. and {Mogushi}, K. and {Mohan}, M. and
+         {Mohapatra}, S.~R.~P. and {Montani}, M. and {Moore}, C.~J. and
+         {Moraru}, D. and {Moreno}, G. and {Morriss}, S.~R. and {Mours}, B. and
+         {Mow-Lowry}, C.~M. and {Mueller}, G. and {Muir}, A.~W. and
+         {Mukherjee}, Arunava and {Mukherjee}, D. and {Mukherjee}, S. and
+         {Mukund}, N. and {Mullavey}, A. and {Munch}, J. and {Mu{\~n}iz}, E.~A. and
+         {Muratore}, M. and {Murray}, P.~G. and {Napier}, K. and
+         {Nardecchia}, I. and {Naticchioni}, L. and {Nayak}, R.~K. and
+         {Neilson}, J. and {Nelemans}, G. and {Nelson}, T.~J.~N. and {Nery}, M. and
+         {Neunzert}, A. and {Nevin}, L. and {Newport}, J.~M. and {Newton}, G. and
+         {Ng}, K.~K.~Y. and {Nguyen}, P. and {Nguyen}, T.~T. and {Nichols}, D. and
+         {Nielsen}, A.~B. and {Nissanke}, S. and {Nitz}, A. and {Noack}, A. and
+         {Nocera}, F. and {Nolting}, D. and {North}, C. and {Nuttall}, L.~K. and
+         {Oberling}, J. and {O'Dea}, G.~D. and {Ogin}, G.~H. and {Oh}, J.~J. and
+         {Oh}, S.~H. and {Ohme}, F. and {Okada}, M.~A. and {Oliver}, M. and
+         {Oppermann}, P. and {Oram}, Richard J. and {O'Reilly}, B. and
+         {Ormiston}, R. and {Ortega}, L.~F. and {O'Shaughnessy}, R. and
+         {Ossokine}, S. and {Ottaway}, D.~J. and {Overmier}, H. and
+         {Owen}, B.~J. and {Pace}, A.~E. and {Page}, J. and {Page}, M.~A. and
+         {Pai}, A. and {Pai}, S.~A. and {Palamos}, J.~R. and {Palashov}, O. and
+         {Palomba}, C. and {Pal-Singh}, A. and {Pan}, Howard and
+         {Pan}, Huang-Wei and {Pang}, B. and {Pang}, P.~T.~H. and {Pankow}, C. and
+         {Pannarale}, F. and {Pant}, B.~C. and {Paoletti}, F. and {Paoli}, A. and
+         {Papa}, M.~A. and {Parida}, A. and {Parker}, W. and {Pascucci}, D. and
+         {Pasqualetti}, A. and {Passaquieti}, R. and {Passuello}, D. and
+         {Patil}, M. and {Patricelli}, B. and {Pearlstone}, B.~L. and
+         {Pedraza}, M. and {Pedurand}, R. and {Pekowsky}, L. and {Pele}, A. and
+         {Penn}, S. and {Perez}, C.~J. and {Perreca}, A. and {Perri}, L.~M. and
+         {Pfeiffer}, H.~P. and {Phelps}, M. and {Piccinni}, O.~J. and
+         {Pichot}, M. and {Piergiovanni}, F. and {Pierro}, V. and {Pillant}, G. and
+         {Pinard}, L. and {Pinto}, I.~M. and {Pirello}, M. and {Pitkin}, M. and
+         {Poe}, M. and {Poggiani}, R. and {Popolizio}, P. and {Porter}, E.~K. and
+         {Post}, A. and {Powell}, J. and {Prasad}, J. and {Pratt}, J.~W.~W. and
+         {Pratten}, G. and {Predoi}, V. and {Prestegard}, T. and {Price}, L.~R. and
+         {Prijatelj}, M. and {Principe}, M. and {Privitera}, S. and
+         {Prodi}, G.~A. and {Prokhorov}, L.~G. and {Puncken}, O. and
+         {Punturo}, M. and {Puppo}, P. and {P{\"u}rrer}, M. and {Qi}, H. and
+         {Quetschke}, V. and {Quintero}, E.~A. and {Quitzow-James}, R. and
+         {Raab}, F.~J. and {Rabeling}, D.~S. and {Radkins}, H. and {Raffai}, P. and
+         {Raja}, S. and {Rajan}, C. and {Rajbhandari}, B. and {Rakhmanov}, M. and
+         {Ramirez}, K.~E. and {Ramos-Buades}, A. and {Rapagnani}, P. and
+         {Raymond}, V. and {Razzano}, M. and {Read}, J. and {Regimbau}, T. and
+         {Rei}, L. and {Reid}, S. and {Reitze}, D.~H. and {Ren}, W. and
+         {Reyes}, S.~D. and {Ricci}, F. and {Ricker}, P.~M. and {Rieger}, S. and
+         {Riles}, K. and {Rizzo}, M. and {Robertson}, N.~A. and {Robie}, R. and
+         {Robinet}, F. and {Rocchi}, A. and {Rolland}, L. and {Rollins}, J.~G. and
+         {Roma}, V.~J. and {Romano}, R. and {Romel}, C.~L. and {Romie}, J.~H. and
+         {Rosi{\'n}ska}, D. and {Ross}, M.~P. and {Rowan}, S. and
+         {R{\"u}diger}, A. and {Ruggi}, P. and {Rutins}, G. and {Ryan}, K. and
+         {Sachdev}, S. and {Sadecki}, T. and {Sadeghian}, L. and
+         {Sakellariadou}, M. and {Salconi}, L. and {Saleem}, M. and
+         {Salemi}, F. and {Samajdar}, A. and {Sammut}, L. and {Sampson}, L.~M. and
+         {Sanchez}, E.~J. and {Sanchez}, L.~E. and {Sanchis-Gual}, N. and {Sand
+        berg}, V. and {Sanders}, J.~R. and {Sassolas}, B. and
+         {Sathyaprakash}, B.~S. and {Saulson}, P.~R. and {Sauter}, O. and
+         {Savage}, R.~L. and {Sawadsky}, A. and {Schale}, P. and {Scheel}, M. and
+         {Scheuer}, J. and {Schmidt}, J. and {Schmidt}, P. and {Schnabel}, R. and
+         {Schofield}, R.~M.~S. and {Sch{\"o}nbeck}, A. and {Schreiber}, E. and
+         {Schuette}, D. and {Schulte}, B.~W. and {Schutz}, B.~F. and
+         {Schwalbe}, S.~G. and {Scott}, J. and {Scott}, S.~M. and {Seidel}, E. and
+         {Sellers}, D. and {Sengupta}, A.~S. and {Sentenac}, D. and
+         {Sequino}, V. and {Sergeev}, A. and {Shaddock}, D.~A. and
+         {Shaffer}, T.~J. and {Shah}, A.~A. and {Shahriar}, M.~S. and
+         {Shaner}, M.~B. and {Shao}, L. and {Shapiro}, B. and {Shawhan}, P. and
+         {Sheperd}, A. and {Shoemaker}, D.~H. and {Shoemaker}, D.~M. and
+         {Siellez}, K. and {Siemens}, X. and {Sieniawska}, M. and {Sigg}, D. and
+         {Silva}, A.~D. and {Singer}, L.~P. and {Singh}, A. and {Singhal}, A. and
+         {Sintes}, A.~M. and {Slagmolen}, B.~J.~J. and {Smith}, B. and
+         {Smith}, J.~R. and {Smith}, R.~J.~E. and {Somala}, S. and {Son}, E.~J. and
+         {Sonnenberg}, J.~A. and {Sorazu}, B. and {Sorrentino}, F. and
+         {Souradeep}, T. and {Spencer}, A.~P. and {Srivastava}, A.~K. and
+         {Staats}, K. and {Staley}, A. and {Steinke}, M. and {Steinlechner}, J. and
+         {Steinlechner}, S. and {Steinmeyer}, D. and {Stevenson}, S.~P. and
+         {Stone}, R. and {Stops}, D.~J. and {Strain}, K.~A. and {Stratta}, G. and
+         {Strigin}, S.~E. and {Strunk}, A. and {Sturani}, R. and
+         {Stuver}, A.~L. and {Summerscales}, T.~Z. and {Sun}, L. and
+         {Sunil}, S. and {Suresh}, J. and {Sutton}, P.~J. and {Swinkels}, B.~L. and
+         {Szczepa{\'n}czyk}, M.~J. and {Tacca}, M. and {Tait}, S.~C. and
+         {Talbot}, C. and {Talukder}, D. and {Tanner}, D.~B. and
+         {T{\'a}pai}, M. and {Taracchini}, A. and {Tasson}, J.~D. and
+         {Taylor}, J.~A. and {Taylor}, R. and {Tewari}, S.~V. and {Theeg}, T. and
+         {Thies}, F. and {Thomas}, E.~G. and {Thomas}, M. and {Thomas}, P. and
+         {Thorne}, K.~A. and {Thorne}, K.~S. and {Thrane}, E. and {Tiwari}, S. and
+         {Tiwari}, V. and {Tokmakov}, K.~V. and {Toland}, K. and {Tonelli}, M. and
+         {Tornasi}, Z. and {Torres-Forn{\'e}}, A. and {Torrie}, C.~I. and
+         {T{\"o}yr{\"a}}, D. and {Travasso}, F. and {Traylor}, G. and
+         {Trinastic}, J. and {Tringali}, M.~C. and {Trozzo}, L. and
+         {Tsang}, K.~W. and {Tse}, M. and {Tso}, R. and {Tsukada}, L. and
+         {Tsuna}, D. and {Tuyenbayev}, D. and {Ueno}, K. and {Ugolini}, D. and
+         {Unnikrishnan}, C.~S. and {Urban}, A.~L. and {Usman}, S.~A. and
+         {Vahlbruch}, H. and {Vajente}, G. and {Valdes}, G. and {van Bakel}, N. and
+         {van Beuzekom}, M. and {van den Brand}, J.~F.~J. and
+         {Van Den Broeck}, C. and {Vander-Hyde}, D.~C. and {van der Schaaf}, L. and
+         {van Heijningen}, J.~V. and {van Veggel}, A.~A. and {Vardaro}, M. and
+         {Varma}, V. and {Vass}, S. and {Vas{\'u}th}, M. and {Vecchio}, A. and
+         {Vedovato}, G. and {Veitch}, J. and {Veitch}, P.~J. and
+         {Venkateswara}, K. and {Venugopalan}, G. and {Verkindt}, D. and
+         {Vetrano}, F. and {Vicer{\'e}}, A. and {Viets}, A.~D. and
+         {Vinciguerra}, S. and {Vine}, D.~J. and {Vinet}, J. -Y. and
+         {Vitale}, S. and {Vo}, T. and {Vocca}, H. and {Vorvick}, C. and
+         {Vyatchanin}, S.~P. and {Wade}, A.~R. and {Wade}, L.~E. and {Wade}, M. and
+         {Walet}, R. and {Walker}, M. and {Wallace}, L. and {Walsh}, S. and
+         {Wang}, G. and {Wang}, H. and {Wang}, J.~Z. and {Wang}, W.~H. and
+         {Wang}, Y.~F. and {Ward}, R.~L. and {Warner}, J. and {Was}, M. and
+         {Watchi}, J. and {Weaver}, B. and {Wei}, L. -W. and {Weinert}, M. and
+         {Weinstein}, A.~J. and {Weiss}, R. and {Wen}, L. and {Wessel}, E.~K. and
+         {Wessels}, P. and {Westerweck}, J. and {Westphal}, T. and {Wette}, K. and
+         {Whelan}, J.~T. and {Whitcomb}, S.~E. and {Whiting}, B.~F. and
+         {Whittle}, C. and {Wilken}, D. and {Williams}, D. and
+         {Williams}, R.~D. and {Williamson}, A.~R. and {Willis}, J.~L. and
+         {Willke}, B. and {Wimmer}, M.~H. and {Winkler}, W. and {Wipf}, C.~C. and
+         {Wittel}, H. and {Woan}, G. and {Woehler}, J. and {Wofford}, J. and
+         {Wong}, K.~W.~K. and {Worden}, J. and {Wright}, J.~L. and {Wu}, D.~S. and
+         {Wysocki}, D.~M. and {Xiao}, S. and {Yamamoto}, H. and {Yancey}, C.~C. and
+         {Yang}, L. and {Yap}, M.~J. and {Yazback}, M. and {Yu}, Hang and
+         {Yu}, Haocun and {Yvert}, M. and {Zadro{\.z}ny}, A. and {Zanolin}, M. and
+         {Zelenova}, T. and {Zendri}, J. -P. and {Zevin}, M. and {Zhang}, L. and
+         {Zhang}, M. and {Zhang}, T. and {Zhang}, Y. -H. and {Zhao}, C. and
+         {Zhou}, M. and {Zhou}, Z. and {Zhu}, S.~J. and {Zhu}, X.~J. and
+         {Zimmerman}, A.~B. and {Zucker}, M.~E. and {Zweizig}, J. and
+         {LIGO Scientific Collaboration} and {Virgo Collaboration} and
+         {Wilson-Hodge}, C.~A. and {Bissaldi}, E. and {Blackburn}, L. and
+         {Briggs}, M.~S. and {Burns}, E. and {Cleveland}, W.~H. and
+         {Connaughton}, V. and {Gibby}, M.~H. and {Giles}, M.~M. and
+         {Goldstein}, A. and {Hamburg}, R. and {Jenke}, P. and {Hui}, C.~M. and
+         {Kippen}, R.~M. and {Kocevski}, D. and {McBreen}, S. and
+         {Meegan}, C.~A. and {Paciesas}, W.~S. and {Poolakkil}, S. and
+         {Preece}, R.~D. and {Racusin}, J. and {Roberts}, O.~J. and
+         {Stanbro}, M. and {Veres}, P. and {von Kienlin}, A. and {GBM}, Fermi and
+         {Savchenko}, V. and {Ferrigno}, C. and {Kuulkers}, E. and
+         {Bazzano}, A. and {Bozzo}, E. and {Brandt}, S. and {Chenevez}, J. and
+         {Courvoisier}, T.~J. -L. and {Diehl}, R. and {Domingo}, A. and
+         {Hanlon}, L. and {Jourdain}, E. and {Laurent}, P. and {Lebrun}, F. and
+         {Lutovinov}, A. and {Martin-Carrillo}, A. and {Mereghetti}, S. and
+         {Natalucci}, L. and {Rodi}, J. and {Roques}, J. -P. and {Sunyaev}, R. and
+         {Ubertini}, P. and {INTEGRAL} and {Aartsen}, M.~G. and {Ackermann}, M. and
+         {Adams}, J. and {Aguilar}, J.~A. and {Ahlers}, M. and {Ahrens}, M. and
+         {Samarai}, I. Al and {Altmann}, D. and {Andeen}, K. and {Anderson}, T. and
+         {Ansseau}, I. and {Anton}, G. and {Arg{\"u}elles}, C. and
+         {Auffenberg}, J. and {Axani}, S. and {Bagherpour}, H. and {Bai}, X. and
+         {Barron}, J.~P. and {Barwick}, S.~W. and {Baum}, V. and {Bay}, R. and
+         {Beatty}, J.~J. and {Becker Tjus}, J. and {Bernardini}, E. and
+         {Besson}, D.~Z. and {Binder}, G. and {Bindig}, D. and {Blaufuss}, E. and
+         {Blot}, S. and {Bohm}, C. and {B{\"o}rner}, M. and {Bos}, F. and
+         {Bose}, D. and {B{\"o}ser}, S. and {Botner}, O. and {Bourbeau}, E. and
+         {Bourbeau}, J. and {Bradascio}, F. and {Braun}, J. and {Brayeur}, L. and
+         {Brenzke}, M. and {Bretz}, H. -P. and {Bron}, S. and
+         {Brostean-Kaiser}, J. and {Burgman}, A. and {Carver}, T. and
+         {Casey}, J. and {Casier}, M. and {Cheung}, E. and {Chirkin}, D. and
+         {Christov}, A. and {Clark}, K. and {Classen}, L. and {Coenders}, S. and
+         {Collin}, G.~H. and {Conrad}, J.~M. and {Cowen}, D.~F. and {Cross}, R. and
+         {Day}, M. and {de Andr{\'e}}, J.~P.~A.~M. and {De Clercq}, C. and
+         {DeLaunay}, J.~J. and {Dembinski}, H. and {De Ridder}, S. and
+         {Desiati}, P. and {de Vries}, K.~D. and {de Wasseige}, G. and
+         {de With}, M. and {DeYoung}, T. and {D{\'\i}az-V{\'e}lez}, J.~C. and
+         {di Lorenzo}, V. and {Dujmovic}, H. and {Dumm}, J.~P. and
+         {Dunkman}, M. and {Dvorak}, E. and {Eberhardt}, B. and {Ehrhardt}, T. and
+         {Eichmann}, B. and {Eller}, P. and {Evenson}, P.~A. and {Fahey}, S. and
+         {Fazely}, A.~R. and {Felde}, J. and {Filimonov}, K. and {Finley}, C. and
+         {Flis}, S. and {Franckowiak}, A. and {Friedman}, E. and {Fuchs}, T. and
+         {Gaisser}, T.~K. and {Gallagher}, J. and {Gerhardt}, L. and
+         {Ghorbani}, K. and {Giang}, W. and {Glauch}, T. and
+         {Gl{\"u}senkamp}, T. and {Goldschmidt}, A. and {Gonzalez}, J.~G. and
+         {Grant}, D. and {Griffith}, Z. and {Haack}, C. and {Hallgren}, A. and
+         {Halzen}, F. and {Hanson}, K. and {Hebecker}, D. and {Heereman}, D. and
+         {Helbing}, K. and {Hellauer}, R. and {Hickford}, S. and {Hignight}, J. and
+         {Hill}, G.~C. and {Hoffman}, K.~D. and {Hoffmann}, R. and
+         {Hokanson-Fasig}, B. and {Hoshina}, K. and {Huang}, F. and {Huber}, M. and
+         {Hultqvist}, K. and {H{\"u}nnefeld}, M. and {In}, S. and
+         {Ishihara}, A. and {Jacobi}, E. and {Japaridze}, G.~S. and {Jeong}, M. and
+         {Jero}, K. and {Jones}, B.~J.~P. and {Kalaczynski}, P. and {Kang}, W. and
+         {Kappes}, A. and {Karg}, T. and {Karle}, A. and {Kauer}, M. and
+         {Keivani}, A. and {Kelley}, J.~L. and {Kheirandish}, A. and {Kim}, J. and
+         {Kim}, M. and {Kintscher}, T. and {Kiryluk}, J. and {Kittler}, T. and
+         {Klein}, S.~R. and {Kohnen}, G. and {Koirala}, R. and {Kolanoski}, H. and
+         {K{\"o}pke}, L. and {Kopper}, C. and {Kopper}, S. and
+         {Koschinsky}, J.~P. and {Koskinen}, D.~J. and {Kowalski}, M. and
+         {Krings}, K. and {Kroll}, M. and {Kr{\"u}ckl}, G. and {Kunnen}, J. and
+         {Kunwar}, S. and {Kurahashi}, N. and {Kuwabara}, T. and {Kyriacou}, A. and
+         {Labare}, M. and {Lanfranchi}, J.~L. and {Larson}, M.~J. and
+         {Lauber}, F. and {Lesiak-Bzdak}, M. and {Leuermann}, M. and
+         {Liu}, Q.~R. and {Lu}, L. and {L{\"u}nemann}, J. and {Luszczak}, W. and
+         {Madsen}, J. and {Maggi}, G. and {Mahn}, K.~B.~M. and {Mancina}, S. and
+         {Maruyama}, R. and {Mase}, K. and {Maunu}, R. and {McNally}, F. and
+         {Meagher}, K. and {Medici}, M. and {Meier}, M. and {Menne}, T. and
+         {Merino}, G. and {Meures}, T. and {Miarecki}, S. and {Micallef}, J. and
+         {Moment{\'e}}, G. and {Montaruli}, T. and {Moore}, R.~W. and
+         {Moulai}, M. and {Nahnhauer}, R. and {Nakarmi}, P. and {Naumann}, U. and
+         {Neer}, G. and {Niederhausen}, H. and {Nowicki}, S.~C. and
+         {Nygren}, D.~R. and {Obertacke Pollmann}, A. and {Olivas}, A. and
+         {O'Murchadha}, A. and {Palczewski}, T. and {Pandya}, H. and
+         {Pankova}, D.~V. and {Peiffer}, P. and {Pepper}, J.~A. and
+         {P{\'e}rez de los Heros}, C. and {Pieloth}, D. and {Pinat}, E. and
+         {Price}, P.~B. and {Przybylski}, G.~T. and {Raab}, C. and
+         {R{\"a}del}, L. and {Rameez}, M. and {Rawlins}, K. and {Rea}, I.~C. and
+         {Reimann}, R. and {Relethford}, B. and {Relich}, M. and {Resconi}, E. and
+         {Rhode}, W. and {Richman}, M. and {Robertson}, S. and {Rongen}, M. and
+         {Rott}, C. and {Ruhe}, T. and {Ryckbosch}, D. and {Rysewyk}, D. and
+         {S{\"a}lzer}, T. and {Sanchez Herrera}, S.~E. and {Sandrock}, A. and {Sand
+        roos}, J. and {Santander}, M. and {Sarkar}, S. and {Sarkar}, S. and
+         {Satalecka}, K. and {Schlunder}, P. and {Schmidt}, T. and
+         {Schneider}, A. and {Schoenen}, S. and {Sch{\"o}neberg}, S. and
+         {Schumacher}, L. and {Seckel}, D. and {Seunarine}, S. and
+         {Soedingrekso}, J. and {Soldin}, D. and {Song}, M. and
+         {Spiczak}, G.~M. and {Spiering}, C. and {Stachurska}, J. and
+         {Stamatikos}, M. and {Stanev}, T. and {Stasik}, A. and {Stettner}, J. and
+         {Steuer}, A. and {Stezelberger}, T. and {Stokstad}, R.~G. and
+         {St{\"o}ssl}, A. and {Strotjohann}, N.~L. and {Stuttard}, T. and
+         {Sullivan}, G.~W. and {Sutherland}, M. and {Taboada}, I. and
+         {Tatar}, J. and {Tenholt}, F. and {Ter-Antonyan}, S. and {Terliuk}, A. and
+         {Te{\v{s}}i{\'c}}, G. and {Tilav}, S. and {Toale}, P.~A. and
+         {Tobin}, M.~N. and {Toscano}, S. and {Tosi}, D. and {Tselengidou}, M. and
+         {Tung}, C.~F. and {Turcati}, A. and {Turley}, C.~F. and {Ty}, B. and
+         {Unger}, E. and {Usner}, M. and {Vandenbroucke}, J. and
+         {Van Driessche}, W. and {van Eijndhoven}, N. and {Vanheule}, S. and
+         {van Santen}, J. and {Vehring}, M. and {Vogel}, E. and {Vraeghe}, M. and
+         {Walck}, C. and {Wallace}, A. and {Wallraff}, M. and {Wandler}, F.~D. and
+         {Wandkowsky}, N. and {Waza}, A. and {Weaver}, C. and {Weiss}, M.~J. and
+         {Wendt}, C. and {Werthebach}, J. and {Whelan}, B.~J. and {Wiebe}, K. and
+         {Wiebusch}, C.~H. and {Wille}, L. and {Williams}, D.~R. and
+         {Wills}, L. and {Wolf}, M. and {Wood}, T.~R. and {Woolsey}, E. and
+         {Woschnagg}, K. and {Xu}, D.~L. and {Xu}, X.~W. and {Xu}, Y. and
+         {Yanez}, J.~P. and {Yodh}, G. and {Yoshida}, S. and {Yuan}, T. and
+         {Zoll}, M. and {IceCube Collaboration} and {Balasubramanian}, A. and
+         {Mate}, S. and {Bhalerao}, V. and {Bhattacharya}, D. and {Vibhute}, A. and
+         {Dewangan}, G.~C. and {Rao}, A.~R. and {Vadawale}, S.~V. and
+         {AstroSat Cadmium Zinc Telluride Imager Team} and {Svinkin}, D.~S. and
+         {Hurley}, K. and {Aptekar}, R.~L. and {Frederiks}, D.~D. and
+         {Golenetskii}, S.~V. and {Kozlova}, A.~V. and {Lysenko}, A.~L. and
+         {Oleynik}, Ph. P. and {Tsvetkova}, A.~E. and {Ulanov}, M.~V. and
+         {Cline}, T. and {IPN Collaboration} and {Li}, T.~P. and {Xiong}, S.~L. and
+         {Zhang}, S.~N. and {Lu}, F.~J. and {Song}, L.~M. and {Cao}, X.~L. and
+         {Chang}, Z. and {Chen}, G. and {Chen}, L. and {Chen}, T.~X. and
+         {Chen}, Y. and {Chen}, Y.~B. and {Chen}, Y.~P. and {Cui}, W. and
+         {Cui}, W.~W. and {Deng}, J.~K. and {Dong}, Y.~W. and {Du}, Y.~Y. and
+         {Fu}, M.~X. and {Gao}, G.~H. and {Gao}, H. and {Gao}, M. and
+         {Ge}, M.~Y. and {Gu}, Y.~D. and {Guan}, J. and {Guo}, C.~C. and
+         {Han}, D.~W. and {Hu}, W. and {Huang}, Y. and {Huo}, J. and
+         {Jia}, S.~M. and {Jiang}, L.~H. and {Jiang}, W.~C. and {Jin}, J. and
+         {Jin}, Y.~J. and {Li}, B. and {Li}, C.~K. and {Li}, G. and {Li}, M.~S. and
+         {Li}, W. and {Li}, X. and {Li}, X.~B. and {Li}, X.~F. and {Li}, Y.~G. and
+         {Li}, Z.~J. and {Li}, Z.~W. and {Liang}, X.~H. and {Liao}, J.~Y. and
+         {Liu}, C.~Z. and {Liu}, G.~Q. and {Liu}, H.~W. and {Liu}, S.~Z. and
+         {Liu}, X.~J. and {Liu}, Y. and {Liu}, Y.~N. and {Lu}, B. and
+         {Lu}, X.~F. and {Luo}, T. and {Ma}, X. and {Meng}, B. and {Nang}, Y. and
+         {Nie}, J.~Y. and {Ou}, G. and {Qu}, J.~L. and {Sai}, N. and {Sun}, L. and
+         {Tan}, Y. and {Tao}, L. and {Tao}, W.~H. and {Tuo}, Y.~L. and
+         {Wang}, G.~F. and {Wang}, H.~Y. and {Wang}, J. and {Wang}, W.~S. and
+         {Wang}, Y.~S. and {Wen}, X.~Y. and {Wu}, B.~B. and {Wu}, M. and
+         {Xiao}, G.~C. and {Xu}, H. and {Xu}, Y.~P. and {Yan}, L.~L. and
+         {Yang}, J.~W. and {Yang}, S. and {Yang}, Y.~J. and {Zhang}, A.~M. and
+         {Zhang}, C.~L. and {Zhang}, C.~M. and {Zhang}, F. and {Zhang}, H.~M. and
+         {Zhang}, J. and {Zhang}, Q. and {Zhang}, S. and {Zhang}, T. and
+         {Zhang}, W. and {Zhang}, W.~C. and {Zhang}, W.~Z. and {Zhang}, Y. and
+         {Zhang}, Y. and {Zhang}, Y.~F. and {Zhang}, Y.~J. and {Zhang}, Z. and
+         {Zhang}, Z.~L. and {Zhao}, H.~S. and {Zhao}, J.~L. and {Zhao}, X.~F. and
+         {Zheng}, S.~J. and {Zhu}, Y. and {Zhu}, Y.~X. and {Zou}, C.~L. and
+         {Insight-HXMT Collaboration} and {Albert}, A. and {Andr{\'e}}, M. and
+         {Anghinolfi}, M. and {Ardid}, M. and {Aubert}, J. -J. and {Aublin}, J. and
+         {Avgitas}, T. and {Baret}, B. and {Barrios-Mart{\'\i}}, J. and
+         {Basa}, S. and {Belhorma}, B. and {Bertin}, V. and {Biagi}, S. and
+         {Bormuth}, R. and {Bourret}, S. and {Bouwhuis}, M.~C. and
+         {Br{\^a}nza{\textcommabelow s}}, H. and {Bruijn}, R. and {Brunner}, J. and
+         {Busto}, J. and {Capone}, A. and {Caramete}, L. and {Carr}, J. and
+         {Celli}, S. and {Cherkaoui El Moursli}, R. and {Chiarusi}, T. and
+         {Circella}, M. and {Coelho}, J.~A.~B. and {Coleiro}, A. and
+         {Coniglione}, R. and {Costantini}, H. and {Coyle}, P. and
+         {Creusot}, A. and {D{\'\i}az}, A.~F. and {Deschamps}, A. and
+         {De Bonis}, G. and {Distefano}, C. and {Di Palma}, I. and {Domi}, A. and
+         {Donzaud}, C. and {Dornic}, D. and {Drouhin}, D. and {Eberl}, T. and
+         {El Bojaddaini}, I. and {El Khayati}, N. and {Els{\"a}sser}, D. and
+         {Enzenh{\"o}fer}, A. and {Ettahiri}, A. and {Fassi}, F. and
+         {Felis}, I. and {Fusco}, L.~A. and {Gay}, P. and {Giordano}, V. and
+         {Glotin}, H. and {Gr{\'e}goire}, T. and {Ruiz}, R. Gracia and
+         {Graf}, K. and {Hallmann}, S. and {van Haren}, H. and
+         {Heijboer}, A.~J. and {Hello}, Y. and {Hern{\'a}ndez-Rey}, J.~J. and
+         {H{\"o}ssl}, J. and {Hofest{\"a}dt}, J. and {Hugon}, C. and
+         {Illuminati}, G. and {James}, C.~W. and {de Jong}, M. and {Jongen}, M. and
+         {Kadler}, M. and {Kalekin}, O. and {Katz}, U. and {Kiessling}, D. and
+         {Kouchner}, A. and {Kreter}, M. and {Kreykenbohm}, I. and
+         {Kulikovskiy}, V. and {Lachaud}, C. and {Lahmann}, R. and
+         {Lef{\`e}vre}, D. and {Leonora}, E. and {Lotze}, M. and {Loucatos}, S. and
+         {Marcelin}, M. and {Margiotta}, A. and {Marinelli}, A. and
+         {Mart{\'\i}nez-Mora}, J.~A. and {Mele}, R. and {Melis}, K. and
+         {Michael}, T. and {Migliozzi}, P. and {Moussa}, A. and {Navas}, S. and
+         {Nezri}, E. and {Organokov}, M. and
+         {P{\u{a}}v{\u{a}}la{\textcommabelow s}}, G.~E. and {Pellegrino}, C. and
+         {Perrina}, C. and {Piattelli}, P. and {Popa}, V. and {Pradier}, T. and
+         {Quinn}, L. and {Racca}, C. and {Riccobene}, G. and
+         {S{\'a}nchez-Losa}, A. and {Salda{\~n}a}, M. and {Salvadori}, I. and
+         {Samtleben}, D.~F.~E. and {Sanguineti}, M. and {Sapienza}, P. and
+         {Sieger}, C. and {Spurio}, M. and {Stolarczyk}, Th. and {Taiuti}, M. and
+         {Tayalati}, Y. and {Trovato}, A. and {Turpin}, D. and {T{\"o}nnis}, C. and
+         {Vallage}, B. and {Van Elewyck}, V. and {Versari}, F. and {Vivolo}, D. and
+         {Vizzoca}, A. and {Wilms}, J. and {Zornoza}, J.~D. and
+         {Z{\'u}{\~n}iga}, J. and {ANTARES Collaboration} and
+         {Beardmore}, A.~P. and {Breeveld}, A.~A. and {Burrows}, D.~N. and
+         {Cenko}, S.~B. and {Cusumano}, G. and {D'A{\`\i}}, A. and
+         {de Pasquale}, M. and {Emery}, S.~W.~K. and {Evans}, P.~A. and
+         {Giommi}, P. and {Gronwall}, C. and {Kennea}, J.~A. and {Krimm}, H.~A. and
+         {Kuin}, N.~P.~M. and {Lien}, A. and {Marshall}, F.~E. and {Meland
+        ri}, A. and {Nousek}, J.~A. and {Oates}, S.~R. and {Osborne}, J.~P. and
+         {Pagani}, C. and {Page}, K.~L. and {Palmer}, D.~M. and {Perri}, M. and
+         {Siegel}, M.~H. and {Sbarufatti}, B. and {Tagliaferri}, G. and
+         {Tohuvavohu}, A. and {Swift Collaboration} and {Tavani}, M. and
+         {Verrecchia}, F. and {Bulgarelli}, A. and {Evangelista}, Y. and
+         {Pacciani}, L. and {Feroci}, M. and {Pittori}, C. and {Giuliani}, A. and
+         {Del Monte}, E. and {Donnarumma}, I. and {Argan}, A. and {Trois}, A. and
+         {Ursi}, A. and {Cardillo}, M. and {Piano}, G. and {Longo}, F. and
+         {Lucarelli}, F. and {Munar-Adrover}, P. and {Fuschino}, F. and
+         {Labanti}, C. and {Marisaldi}, M. and {Minervini}, G. and
+         {Fioretti}, V. and {Parmiggiani}, N. and {Gianotti}, F. and
+         {Trifoglio}, M. and {Di Persio}, G. and {Antonelli}, L.~A. and
+         {Barbiellini}, G. and {Caraveo}, P. and {Cattaneo}, P.~W. and
+         {Costa}, E. and {Colafrancesco}, S. and {D'Amico}, F. and
+         {Ferrari}, A. and {Morselli}, A. and {Paoletti}, F. and {Picozza}, P. and
+         {Pilia}, M. and {Rappoldi}, A. and {Soffitta}, P. and {Vercellone}, S. and
+         {AGILE Team} and {Foley}, R.~J. and {Coulter}, D.~A. and
+         {Kilpatrick}, C.~D. and {Drout}, M.~R. and {Piro}, A.~L. and
+         {Shappee}, B.~J. and {Siebert}, M.~R. and {Simon}, J.~D. and
+         {Ulloa}, N. and {Kasen}, D. and {Madore}, B.~F. and
+         {Murguia-Berthier}, A. and {Pan}, Y. -C. and {Prochaska}, J.~X. and
+         {Ramirez-Ruiz}, E. and {Rest}, A. and {Rojas-Bravo}, C. and
+         {1M2H Team} and {Berger}, E. and {Soares-Santos}, M. and {Annis}, J. and
+         {Alexander}, K.~D. and {Allam}, S. and {Balbinot}, E. and
+         {Blanchard}, P. and {Brout}, D. and {Butler}, R.~E. and {Chornock}, R. and
+         {Cook}, E.~R. and {Cowperthwaite}, P. and {Diehl}, H.~T. and
+         {Drlica-Wagner}, A. and {Drout}, M.~R. and {Durret}, F. and
+         {Eftekhari}, T. and {Finley}, D.~A. and {Fong}, W. and
+         {Frieman}, J.~A. and {Fryer}, C.~L. and {Garc{\'\i}a-Bellido}, J. and
+         {Gruendl}, R.~A. and {Hartley}, W. and {Herner}, K. and {Kessler}, R. and
+         {Lin}, H. and {Lopes}, P.~A.~A. and {Louren{\c{c}}o}, A.~C.~C. and
+         {Margutti}, R. and {Marshall}, J.~L. and {Matheson}, T. and
+         {Medina}, G.~E. and {Metzger}, B.~D. and {Mu{\~n}oz}, R.~R. and
+         {Muir}, J. and {Nicholl}, M. and {Nugent}, P. and {Palmese}, A. and
+         {Paz-Chinch{\'o}n}, F. and {Quataert}, E. and {Sako}, M. and
+         {Sauseda}, M. and {Schlegel}, D.~J. and {Scolnic}, D. and
+         {Secco}, L.~F. and {Smith}, N. and {Sobreira}, F. and {Villar}, V.~A. and
+         {Vivas}, A.~K. and {Wester}, W. and {Williams}, P.~K.~G. and
+         {Yanny}, B. and {Zenteno}, A. and {Zhang}, Y. and {Abbott}, T.~M.~C. and
+         {Banerji}, M. and {Bechtol}, K. and {Benoit-L{\'e}vy}, A. and
+         {Bertin}, E. and {Brooks}, D. and {Buckley-Geer}, E. and
+         {Burke}, D.~L. and {Capozzi}, D. and {Carnero Rosell}, A. and
+         {Carrasco Kind}, M. and {Castander}, F.~J. and {Crocce}, M. and
+         {Cunha}, C.~E. and {D'Andrea}, C.~B. and {da Costa}, L.~N. and
+         {Davis}, C. and {DePoy}, D.~L. and {Desai}, S. and {Dietrich}, J.~P. and
+         {Eifler}, T.~F. and {Fernandez}, E. and {Flaugher}, B. and
+         {Fosalba}, P. and {Gaztanaga}, E. and {Gerdes}, D.~W. and
+         {Giannantonio}, T. and {Goldstein}, D.~A. and {Gruen}, D. and
+         {Gschwend}, J. and {Gutierrez}, G. and {Honscheid}, K. and
+         {James}, D.~J. and {Jeltema}, T. and {Johnson}, M.~W.~G. and
+         {Johnson}, M.~D. and {Kent}, S. and {Krause}, E. and {Kron}, R. and
+         {Kuehn}, K. and {Lahav}, O. and {Lima}, M. and {Maia}, M.~A.~G. and
+         {March}, M. and {Martini}, P. and {McMahon}, R.~G. and {Menanteau}, F. and
+         {Miller}, C.~J. and {Miquel}, R. and {Mohr}, J.~J. and {Nichol}, R.~C. and
+         {Ogando}, R.~L.~C. and {Plazas}, A.~A. and {Romer}, A.~K. and
+         {Roodman}, A. and {Rykoff}, E.~S. and {Sanchez}, E. and {Scarpine}, V. and
+         {Schindler}, R. and {Schubnell}, M. and {Sevilla-Noarbe}, I. and
+         {Sheldon}, E. and {Smith}, M. and {Smith}, R.~C. and {Stebbins}, A. and
+         {Suchyta}, E. and {Swanson}, M.~E.~C. and {Tarle}, G. and
+         {Thomas}, R.~C. and {Troxel}, M.~A. and {Tucker}, D.~L. and
+         {Vikram}, V. and {Walker}, A.~R. and {Wechsler}, R.~H. and
+         {Weller}, J. and {Carlin}, J.~L. and {Gill}, M.~S.~S. and {Li}, T.~S. and
+         {Marriner}, J. and {Neilsen}, E. and
+         {Dark Energy Camera GW-EM Collaboration} and {DES Collaboration} and
+         {Haislip}, J.~B. and {Kouprianov}, V.~V. and {Reichart}, D.~E. and {Sand
+        }, D.~J. and {Tartaglia}, L. and {Valenti}, S. and {Yang}, S. and
+         {DLT40 Collaboration} and {Benetti}, S. and {Brocato}, E. and
+         {Campana}, S. and {Cappellaro}, E. and {Covino}, S. and {D'Avanzo}, P. and
+         {D'Elia}, V. and {Getman}, F. and {Ghirlanda}, G. and {Ghisellini}, G. and
+         {Limatola}, L. and {Nicastro}, L. and {Palazzi}, E. and {Pian}, E. and
+         {Piranomonte}, S. and {Possenti}, A. and {Rossi}, A. and
+         {Salafia}, O.~S. and {Tomasella}, L. and {Amati}, L. and
+         {Antonelli}, L.~A. and {Bernardini}, M.~G. and {Bufano}, F. and
+         {Capaccioli}, M. and {Casella}, P. and {Dadina}, M. and
+         {De Cesare}, G. and {Di Paola}, A. and {Giuffrida}, G. and
+         {Giunta}, A. and {Israel}, G.~L. and {Lisi}, M. and {Maiorano}, E. and
+         {Mapelli}, M. and {Masetti}, N. and {Pescalli}, A. and {Pulone}, L. and
+         {Salvaterra}, R. and {Schipani}, P. and {Spera}, M. and {Stamerra}, A. and
+         {Stella}, L. and {Testa}, V. and {Turatto}, M. and {Vergani}, D. and
+         {Aresu}, G. and {Bachetti}, M. and {Buffa}, F. and {Burgay}, M. and
+         {Buttu}, M. and {Caria}, T. and {Carretti}, E. and {Casasola}, V. and
+         {Castangia}, P. and {Carboni}, G. and {Casu}, S. and {Concu}, R. and
+         {Corongiu}, A. and {Deiana}, G.~L. and {Egron}, E. and {Fara}, A. and
+         {Gaudiomonte}, F. and {Gusai}, V. and {Ladu}, A. and {Loru}, S. and
+         {Leurini}, S. and {Marongiu}, L. and {Melis}, A. and {Melis}, G. and
+         {Migoni}, Carlo and {Milia}, Sabrina and {Navarrini}, Alessandro and
+         {Orlati}, A. and {Ortu}, P. and {Palmas}, S. and {Pellizzoni}, A. and
+         {Perrodin}, D. and {Pisanu}, T. and {Poppi}, S. and {Righini}, S. and
+         {Saba}, A. and {Serra}, G. and {Serrau}, M. and {Stagni}, M. and
+         {Surcis}, G. and {Vacca}, V. and {Vargiu}, G.~P. and {Hunt}, L.~K. and
+         {Jin}, Z.~P. and {Klose}, S. and {Kouveliotou}, C. and
+         {Mazzali}, P.~A. and {M{\o}ller}, P. and {Nava}, L. and {Piran}, T. and
+         {Selsing}, J. and {Vergani}, S.~D. and {Wiersema}, K. and {Toma}, K. and
+         {Higgins}, A.~B. and {Mundell}, C.~G. and {di Serego Alighieri}, S. and
+         {G{\'o}tz}, D. and {Gao}, W. and {Gomboc}, A. and {Kaper}, L. and
+         {Kobayashi}, S. and {Kopac}, D. and {Mao}, J. and {Starling}, R.~L.~C. and
+         {Steele}, I. and {van der Horst}, A.~J. and
+         {GRAWITA: GRAvitational Wave Inaf TeAm} and {Acero}, F. and
+         {Atwood}, W.~B. and {Baldini}, L. and {Barbiellini}, G. and
+         {Bastieri}, D. and {Berenji}, B. and {Bellazzini}, R. and
+         {Bissaldi}, E. and {Blandford}, R.~D. and {Bloom}, E.~D. and
+         {Bonino}, R. and {Bottacini}, E. and {Bregeon}, J. and {Buehler}, R. and
+         {Buson}, S. and {Cameron}, R.~A. and {Caputo}, R. and {Caraveo}, P.~A. and
+         {Cavazzuti}, E. and {Chekhtman}, A. and {Cheung}, C.~C. and
+         {Chiang}, J. and {Ciprini}, S. and {Cohen-Tanugi}, J. and
+         {Cominsky}, L.~R. and {Costantin}, D. and {Cuoco}, A. and {D'Ammand
+        o}, F. and {de Palma}, F. and {Digel}, S.~W. and {Di Lalla}, N. and
+         {Di Mauro}, M. and {Di Venere}, L. and {Dubois}, R. and {Fegan}, S.~J. and
+         {Focke}, W.~B. and {Franckowiak}, A. and {Fukazawa}, Y. and {Funk}, S. and
+         {Fusco}, P. and {Gargano}, F. and {Gasparrini}, D. and {Giglietto}, N. and
+         {Giordano}, F. and {Giroletti}, M. and {Glanzman}, T. and {Green}, D. and
+         {Grondin}, M. -H. and {Guillemot}, L. and {Guiriec}, S. and
+         {Harding}, A.~K. and {Horan}, D. and {J{\'o}hannesson}, G. and
+         {Kamae}, T. and {Kensei}, S. and {Kuss}, M. and {La Mura}, G. and
+         {Latronico}, L. and {Lemoine-Goumard}, M. and {Longo}, F. and
+         {Loparco}, F. and {Lovellette}, M.~N. and {Lubrano}, P. and
+         {Magill}, J.~D. and {Maldera}, S. and {Manfreda}, A. and
+         {Mazziotta}, M.~N. and {McEnery}, J.~E. and {Meyer}, M. and
+         {Michelson}, P.~F. and {Mirabal}, N. and {Monzani}, M.~E. and
+         {Moretti}, E. and {Morselli}, A. and {Moskalenko}, I.~V. and
+         {Negro}, M. and {Nuss}, E. and {Ojha}, R. and {Omodei}, N. and
+         {Orienti}, M. and {Orlando}, E. and {Palatiello}, M. and
+         {Paliya}, V.~S. and {Paneque}, D. and {Pesce-Rollins}, M. and
+         {Piron}, F. and {Porter}, T.~A. and {Principe}, G. and {Rain{\`o}}, S. and
+         {Rando}, R. and {Razzano}, M. and {Razzaque}, S. and {Reimer}, A. and
+         {Reimer}, O. and {Reposeur}, T. and {Rochester}, L.~S. and
+         {Saz Parkinson}, P.~M. and {Sgr{\`o}}, C. and {Siskind}, E.~J. and
+         {Spada}, F. and {Spandre}, G. and {Suson}, D.~J. and {Takahashi}, M. and
+         {Tanaka}, Y. and {Thayer}, J.~G. and {Thayer}, J.~B. and
+         {Thompson}, D.~J. and {Tibaldo}, L. and {Torres}, D.~F. and
+         {Torresi}, E. and {Troja}, E. and {Venters}, T.~M. and {Vianello}, G. and
+         {Zaharijas}, G. and {Fermi Large Area Telescope Collaboration} and
+         {Allison}, J.~R. and {Bannister}, K.~W. and {Dobie}, D. and
+         {Kaplan}, D.~L. and {Lenc}, E. and {Lynch}, C. and {Murphy}, T. and
+         {Sadler}, E.~M. and {Australia Telescope Compact Array}, ATCA: and
+         {Hotan}, A. and {James}, C.~W. and {Oslowski}, S. and {Raja}, W. and
+         {Shannon}, R.~M. and {Whiting}, M. and
+         {Australian SKA Pathfinder}, ASKAP: and {Arcavi}, I. and
+         {Howell}, D.~A. and {McCully}, C. and {Hosseinzadeh}, G. and
+         {Hiramatsu}, D. and {Poznanski}, D. and {Barnes}, J. and
+         {Zaltzman}, M. and {Vasylyev}, S. and {Maoz}, D. and
+         {Las Cumbres Observatory Group} and {Cooke}, J. and {Bailes}, M. and
+         {Wolf}, C. and {Deller}, A.~T. and {Lidman}, C. and {Wang}, L. and
+         {Gendre}, B. and {Andreoni}, I. and {Ackley}, K. and
+         {Pritchard}, T.~A. and {Bessell}, M.~S. and {Chang}, S. -W. and
+         {M{\"o}ller}, A. and {Onken}, C.~A. and {Scalzo}, R.~A. and
+         {Ridden-Harper}, R. and {Sharp}, R.~G. and {Tucker}, B.~E. and
+         {Farrell}, T.~J. and {Elmer}, E. and {Johnston}, S. and
+         {Venkatraman Krishnan}, V. and {Keane}, E.~F. and {Green}, J.~A. and
+         {Jameson}, A. and {Hu}, L. and {Ma}, B. and {Sun}, T. and {Wu}, X. and
+         {Wang}, X. and {Shang}, Z. and {Hu}, Y. and {Ashley}, M.~C.~B. and
+         {Yuan}, X. and {Li}, X. and {Tao}, C. and {Zhu}, Z. and {Zhang}, H. and
+         {Suntzeff}, N.~B. and {Zhou}, J. and {Yang}, J. and {Orange}, B. and
+         {Morris}, D. and {Cucchiara}, A. and {Giblin}, T. and {Klotz}, A. and
+         {Staff}, J. and {Thierry}, P. and {Schmidt}, B.~P. and {OzGrav} and
+         {(Deeper}, DWF and {Wider} and {program}, Faster and {AST3} and
+         {CAASTRO Collaborations} and {Tanvir}, N.~R. and {Levan}, A.~J. and
+         {Cano}, Z. and {de Ugarte-Postigo}, A. and
+         {Gonz{\'a}lez-Fern{\'a}ndez}, C. and {Greiner}, J. and {Hjorth}, J. and
+         {Irwin}, M. and {Kr{\"u}hler}, T. and {Mandel}, I. and
+         {Milvang-Jensen}, B. and {O'Brien}, P. and {Rol}, E. and {Rosetti}, S. and
+         {Rosswog}, S. and {Rowlinson}, A. and {Steeghs}, D.~T.~H. and
+         {Th{\"o}ne}, C.~C. and {Ulaczyk}, K. and {Watson}, D. and
+         {Bruun}, S.~H. and {Cutter}, R. and {Figuera Jaimes}, R. and
+         {Fujii}, Y.~I. and {Fruchter}, A.~S. and {Gompertz}, B. and
+         {Jakobsson}, P. and {Hodosan}, G. and {J{\`e}rgensen}, U.~G. and
+         {Kangas}, T. and {Kann}, D.~A. and {Rabus}, M. and
+         {Schr{\o}der}, S.~L. and {Stanway}, E.~R. and {Wijers}, R.~A.~M.~J. and
+         {VINROUGE Collaboration} and {Lipunov}, V.~M. and {Gorbovskoy}, E.~S. and
+         {Kornilov}, V.~G. and {Tyurina}, N.~V. and {Balanutsa}, P.~V. and
+         {Kuznetsov}, A.~S. and {Vlasenko}, D.~M. and {Podesta}, R.~C. and
+         {Lopez}, C. and {Podesta}, F. and {Levato}, H.~O. and {Saffe}, C. and
+         {Mallamaci}, C.~C. and {Budnev}, N.~M. and {Gress}, O.~A. and
+         {Kuvshinov}, D.~A. and {Gorbunov}, I.~A. and {Vladimirov}, V.~V. and
+         {Zimnukhov}, D.~S. and {Gabovich}, A.~V. and {Yurkov}, V.~V. and
+         {Sergienko}, Yu. P. and {Rebolo}, R. and {Serra-Ricart}, M. and
+         {Tlatov}, A.~G. and {Ishmuhametova}, Yu. V. and {MASTER Collaboration} and
+         {Abe}, F. and {Aoki}, K. and {Aoki}, W. and {Asakura}, Y. and
+         {Baar}, S. and {Barway}, S. and {Bond}, I.~A. and {Doi}, M. and
+         {Finet}, F. and {Fujiyoshi}, T. and {Furusawa}, H. and {Honda}, S. and
+         {Itoh}, R. and {Kanda}, N. and {Kawabata}, K.~S. and {Kawabata}, M. and
+         {Kim}, J.~H. and {Koshida}, S. and {Kuroda}, D. and {Lee}, C. -H. and
+         {Liu}, W. and {Matsubayashi}, K. and {Miyazaki}, S. and {Morihana}, K. and
+         {Morokuma}, T. and {Motohara}, K. and {Murata}, K.~L. and {Nagai}, H. and
+         {Nagashima}, H. and {Nagayama}, T. and {Nakaoka}, T. and {Nakata}, F. and
+         {Ohsawa}, R. and {Ohshima}, T. and {Ohta}, K. and {Okita}, H. and
+         {Saito}, T. and {Saito}, Y. and {Sako}, S. and {Sekiguchi}, Y. and
+         {Sumi}, T. and {Tajitsu}, A. and {Takahashi}, J. and {Takayama}, M. and
+         {Tamura}, Y. and {Tanaka}, I. and {Tanaka}, M. and {Terai}, T. and
+         {Tominaga}, N. and {Tristram}, P.~J. and {Uemura}, M. and {Utsumi}, Y. and
+         {Yamaguchi}, M.~S. and {Yasuda}, N. and {Yoshida}, M. and {Zenko}, T. and
+         {J-GEM} and {Adams}, S.~M. and {Anupama}, G.~C. and {Bally}, J. and
+         {Barway}, S. and {Bellm}, E. and {Blagorodnova}, N. and {Cannella}, C. and
+         {Chandra}, P. and {Chatterjee}, D. and {Clarke}, T.~E. and
+         {Cobb}, B.~E. and {Cook}, D.~O. and {Copperwheat}, C. and {De}, K. and
+         {Emery}, S.~W.~K. and {Feindt}, U. and {Foster}, K. and {Fox}, O.~D. and
+         {Frail}, D.~A. and {Fremling}, C. and {Frohmaier}, C. and
+         {Garcia}, J.~A. and {Ghosh}, S. and {Giacintucci}, S. and {Goobar}, A. and
+         {Gottlieb}, O. and {Grefenstette}, B.~W. and {Hallinan}, G. and
+         {Harrison}, F. and {Heida}, M. and {Helou}, G. and {Ho}, A.~Y.~Q. and
+         {Horesh}, A. and {Hotokezaka}, K. and {Ip}, W. -H. and {Itoh}, R. and
+         {Jacobs}, Bob and {Jencson}, J.~E. and {Kasen}, D. and
+         {Kasliwal}, M.~M. and {Kassim}, N.~E. and {Kim}, H. and {Kiran}, B.~S. and
+         {Kuin}, N.~P.~M. and {Kulkarni}, S.~R. and {Kupfer}, T. and
+         {Lau}, R.~M. and {Madsen}, K. and {Mazzali}, P.~A. and {Miller}, A.~A. and
+         {Miyasaka}, H. and {Mooley}, K. and {Myers}, S.~T. and {Nakar}, E. and
+         {Ngeow}, C. -C. and {Nugent}, P. and {Ofek}, E.~O. and
+         {Palliyaguru}, N. and {Pavana}, M. and {Perley}, D.~A. and
+         {Peters}, W.~M. and {Pike}, S. and {Piran}, T. and {Qi}, H. and
+         {Quimby}, R.~M. and {Rana}, J. and {Rosswog}, S. and {Rusu}, F. and
+         {Sadler}, E.~M. and {Van Sistine}, A. and {Sollerman}, J. and {Xu}, Y. and
+         {Yan}, L. and {Yatsu}, Y. and {Yu}, P. -C. and {Zhang}, C. and
+         {Zhao}, W. and {GROWTH} and {JAGWAR} and {Caltech-NRAO} and {TTU-NRAO} and
+         {NuSTAR Collaborations} and {Chambers}, K.~C. and {Huber}, M.~E. and
+         {Schultz}, A.~S.~B. and {Bulger}, J. and {Flewelling}, H. and
+         {Magnier}, E.~A. and {Lowe}, T.~B. and {Wainscoat}, R.~J. and
+         {Waters}, C. and {Willman}, M. and {Pan-STARRS} and {Ebisawa}, K. and
+         {Hanyu}, C. and {Harita}, S. and {Hashimoto}, T. and {Hidaka}, K. and
+         {Hori}, T. and {Ishikawa}, M. and {Isobe}, N. and {Iwakiri}, W. and
+         {Kawai}, H. and {Kawai}, N. and {Kawamuro}, T. and {Kawase}, T. and
+         {Kitaoka}, Y. and {Makishima}, K. and {Matsuoka}, M. and {Mihara}, T. and
+         {Morita}, T. and {Morita}, K. and {Nakahira}, S. and {Nakajima}, M. and
+         {Nakamura}, Y. and {Negoro}, H. and {Oda}, S. and {Sakamaki}, A. and
+         {Sasaki}, R. and {Serino}, M. and {Shidatsu}, M. and {Shimomukai}, R. and
+         {Sugawara}, Y. and {Sugita}, S. and {Sugizaki}, M. and {Tachibana}, Y. and
+         {Takao}, Y. and {Tanimoto}, A. and {Tomida}, H. and {Tsuboi}, Y. and
+         {Tsunemi}, H. and {Ueda}, Y. and {Ueno}, S. and {Yamada}, S. and
+         {Yamaoka}, K. and {Yamauchi}, M. and {Yatabe}, F. and {Yoneyama}, T. and
+         {Yoshii}, T. and {MAXI Team} and {Coward}, D.~M. and {Crisp}, H. and
+         {Macpherson}, D. and {Andreoni}, I. and {Laugier}, R. and
+         {Noysena}, K. and {Klotz}, A. and {Gendre}, B. and {Thierry}, P. and
+         {Turpin}, D. and {Consortium}, TZAC and {Im}, M. and {Choi}, C. and
+         {Kim}, J. and {Yoon}, Y. and {Lim}, G. and {Lee}, S. -K. and
+         {Lee}, C. -U. and {Kim}, S. -L. and {Ko}, S. -W. and {Joe}, J. and
+         {Kwon}, M. -K. and {Kim}, P. -J. and {Lim}, S. -K. and {Choi}, J. -S. and
+         {KU Collaboration} and {Fynbo}, J.~P.~U. and {Malesani}, D. and
+         {Xu}, D. and {Optical Telescope}, Nordic and {Smartt}, S.~J. and
+         {Jerkstrand}, A. and {Kankare}, E. and {Sim}, S.~A. and {Fraser}, M. and
+         {Inserra}, C. and {Maguire}, K. and {Leloudas}, G. and {Magee}, M. and
+         {Shingles}, L.~J. and {Smith}, K.~W. and {Young}, D.~R. and
+         {Kotak}, R. and {Gal-Yam}, A. and {Lyman}, J.~D. and {Homan}, D.~S. and
+         {Agliozzo}, C. and {Anderson}, J.~P. and {Angus}, C.~R. and
+         {Ashall}, C. and {Barbarino}, C. and {Bauer}, F.~E. and {Berton}, M. and
+         {Botticella}, M.~T. and {Bulla}, M. and {Cannizzaro}, G. and
+         {Cartier}, R. and {Cikota}, A. and {Clark}, P. and {De Cia}, A. and
+         {Della Valle}, M. and {Dennefeld}, M. and {Dessart}, L. and
+         {Dimitriadis}, G. and {Elias-Rosa}, N. and {Firth}, R.~E. and
+         {Fl{\"o}rs}, A. and {Frohmaier}, C. and {Galbany}, L. and
+         {Gonz{\'a}lez-Gait{\'a}n}, S. and {Gromadzki}, M. and
+         {Guti{\'e}rrez}, C.~P. and {Hamanowicz}, A. and {Harmanen}, J. and
+         {Heintz}, K.~E. and {Hernandez}, M. -S. and {Hodgkin}, S.~T. and
+         {Hook}, I.~M. and {Izzo}, L. and {James}, P.~A. and {Jonker}, P.~G. and
+         {Kerzendorf}, W.~E. and {Kostrzewa-Rutkowska}, Z. and {Kromer}, M. and
+         {Kuncarayakti}, H. and {Lawrence}, A. and {Manulis}, I. and
+         {Mattila}, S. and {McBrien}, O. and {M{\"u}ller}, A. and {Nordin}, J. and
+         {O'Neill}, D. and {Onori}, F. and {Palmerio}, J.~T. and
+         {Pastorello}, A. and {Patat}, F. and {Pignata}, G. and
+         {Podsiadlowski}, P. and {Razza}, A. and {Reynolds}, T. and {Roy}, R. and
+         {Ruiter}, A.~J. and {Rybicki}, K.~A. and {Salmon}, L. and
+         {Pumo}, M.~L. and {Prentice}, S.~J. and {Seitenzahl}, I.~R. and
+         {Smith}, M. and {Sollerman}, J. and {Sullivan}, M. and {Szegedi}, H. and
+         {Taddia}, F. and {Taubenberger}, S. and {Terreran}, G. and
+         {Van Soelen}, B. and {Vos}, J. and {Walton}, N.~A. and {Wright}, D.~E. and
+         {Wyrzykowski}, {\L}. and {Yaron}, O. and {pre=''(''>ePESSTO}, <author and
+         {Chen}, T. -W. and {Kr{\"u}hler}, T. and {Schady}, P. and
+         {Wiseman}, P. and {Greiner}, J. and {Rau}, A. and {Schweyer}, T. and
+         {Klose}, S. and {Nicuesa Guelbenzu}, A. and {GROND} and
+         {Palliyaguru}, N.~T. and {Tech University}, Texas and {Shara}, M.~M. and
+         {Williams}, T. and {Vaisanen}, P. and {Potter}, S.~B. and
+         {Romero Colmenero}, E. and {Crawford}, S. and {Buckley}, D.~A.~H. and
+         {Mao}, J. and {SALT Group} and {D{\'\i}az}, M.~C. and {Macri}, L.~M. and
+         {Garc{\'\i}a Lambas}, D. and {Mendes de Oliveira}, C. and
+         {Nilo Castell{\'o}n}, J.~L. and {Ribeiro}, T. and {S{\'a}nchez}, B. and
+         {Schoenell}, W. and {Abramo}, L.~R. and {Akras}, S. and
+         {Alcaniz}, J.~S. and {Artola}, R. and {Beroiz}, M. and {Bonoli}, S. and
+         {Cabral}, J. and {Camuccio}, R. and {Chavushyan}, V. and {Coelho}, P. and
+         {Colazo}, C. and {Costa-Duarte}, M.~V. and {Cuevas Larenas}, H. and
+         {Dom{\'\i}nguez Romero}, M. and {Dultzin}, D. and {Fern{\'a}ndez}, D. and
+         {Garc{\'\i}a}, J. and {Girardini}, C. and {Gon{\c{c}}alves}, D.~R. and
+         {Gon{\c{c}}alves}, T.~S. and {Gurovich}, S. and {Jim{\'e}nez-Teja}, Y. and
+         {Kanaan}, A. and {Lares}, M. and {Lopes de Oliveira}, R. and
+         {L{\'o}pez-Cruz}, O. and {Melia}, R. and {Molino}, A. and
+         {Padilla}, N. and {Pe{\~n}uela}, T. and {Placco}, V.~M. and
+         {Qui{\~n}ones}, C. and {Ram{\'\i}rez Rivera}, A. and {Renzi}, V. and
+         {Riguccini}, L. and {R{\'\i}os-L{\'o}pez}, E. and {Rodriguez}, H. and
+         {Sampedro}, L. and {Schneiter}, M. and {Sodr{\'e}}, L. and
+         {Starck}, M. and {Torres-Flores}, S. and {Tornatore}, M. and
+         {Zadro{\.z}ny}, A. and {Castillo}, M. and
+         {TOROS: Transient Robotic Observatory of the South Collaboration} and
+         {Castro-Tirado}, A.~J. and {Tello}, J.~C. and {Hu}, Y. -D. and
+         {Zhang}, B. -B. and {Cunniffe}, R. and {Castell{\'o}n}, A. and
+         {Hiriart}, D. and {Caballero-Garc{\'\i}a}, M.~D. and
+         {Jel{\'\i}nek}, M. and {Kub{\'a}nek}, P. and
+         {P{\'e}rez del Pulgar}, C. and {Park}, I.~H. and {Jeong}, S. and
+         {Castro Cer{\'o}n}, J.~M. and {Pandey}, S.~B. and {Yock}, P.~C. and
+         {Querel}, R. and {Fan}, Y. and {Wang}, C. and {BOOTES Collaboration} and
+         {Beardsley}, A. and {Brown}, I.~S. and {Crosse}, B. and {Emrich}, D. and
+         {Franzen}, T. and {Gaensler}, B.~M. and {Horsley}, L. and
+         {Johnston-Hollitt}, M. and {Kenney}, D. and {Morales}, M.~F. and
+         {Pallot}, D. and {Sokolowski}, M. and {Steele}, K. and {Tingay}, S.~J. and
+         {Trott}, C.~M. and {Walker}, M. and {Wayth}, R. and {Williams}, A. and
+         {Wu}, C. and {Murchison Widefield Array}, MWA: and {Yoshida}, A. and
+         {Sakamoto}, T. and {Kawakubo}, Y. and {Yamaoka}, K. and
+         {Takahashi}, I. and {Asaoka}, Y. and {Ozawa}, S. and {Torii}, S. and
+         {Shimizu}, Y. and {Tamura}, T. and {Ishizaki}, W. and {Cherry}, M.~L. and
+         {Ricciarini}, S. and {Penacchioni}, A.~V. and {Marrocchesi}, P.~S. and
+         {CALET Collaboration} and {Pozanenko}, A.~S. and {Volnova}, A.~A. and
+         {Mazaeva}, E.~D. and {Minaev}, P. Yu. and {Krugov}, M.~A. and
+         {Kusakin}, A.~V. and {Reva}, I.~V. and {Moskvitin}, A.~S. and
+         {Rumyantsev}, V.~V. and {Inasaridze}, R. and {Klunko}, E.~V. and
+         {Tungalag}, N. and {Schmalz}, S.~E. and {Burhonov}, O. and
+         {IKI-GW Follow-up Collaboration} and {Abdalla}, H. and
+         {Abramowski}, A. and {Aharonian}, F. and {Ait Benkhali}, F. and
+         {Ang{\"u}ner}, E.~O. and {Arakawa}, M. and {Arrieta}, M. and
+         {Aubert}, P. and {Backes}, M. and {Balzer}, A. and {Barnard}, M. and
+         {Becherini}, Y. and {Becker Tjus}, J. and {Berge}, D. and
+         {Bernhard}, S. and {Bernl{\"o}hr}, K. and {Blackwell}, R. and
+         {B{\"o}ttcher}, M. and {Boisson}, C. and {Bolmont}, J. and
+         {Bonnefoy}, S. and {Bordas}, P. and {Bregeon}, J. and {Brun}, F. and
+         {Brun}, P. and {Bryan}, M. and {B{\"u}chele}, M. and {Bulik}, T. and
+         {Capasso}, M. and {Caroff}, S. and {Carosi}, A. and {Casanova}, S. and
+         {Cerruti}, M. and {Chakraborty}, N. and {Chaves}, R.~C.~G. and
+         {Chen}, A. and {Chevalier}, J. and {Colafrancesco}, S. and
+         {Condon}, B. and {Conrad}, J. and {Davids}, I.~D. and {Decock}, J. and
+         {Deil}, C. and {Devin}, J. and {deWilt}, P. and {Dirson}, L. and
+         {Djannati-Ata{\"\i}}, A. and {Donath}, A. and {O'C. Drury}, L. and
+         {Dutson}, K. and {Dyks}, J. and {Edwards}, T. and {Egberts}, K. and
+         {Emery}, G. and {Ernenwein}, J. -P. and {Eschbach}, S. and
+         {Farnier}, C. and {Fegan}, S. and {Fernandes}, M.~V. and {Fiasson}, A. and
+         {Fontaine}, G. and {Funk}, S. and {F{\"u}ssling}, M. and {Gabici}, S. and
+         {Gallant}, Y.~A. and {Garrigoux}, T. and {Gat{\'e}}, F. and
+         {Giavitto}, G. and {Giebels}, B. and {Glawion}, D. and
+         {Glicenstein}, J.~F. and {Gottschall}, D. and {Grondin}, M. -H. and
+         {Hahn}, J. and {Haupt}, M. and {Hawkes}, J. and {Heinzelmann}, G. and
+         {Henri}, G. and {Hermann}, G. and {Hinton}, J.~A. and {Hofmann}, W. and
+         {Hoischen}, C. and {Holch}, T.~L. and {Holler}, M. and {Horns}, D. and
+         {Ivascenko}, A. and {Iwasaki}, H. and {Jacholkowska}, A. and
+         {Jamrozy}, M. and {Jankowsky}, D. and {Jankowsky}, F. and {Jingo}, M. and
+         {Jouvin}, L. and {Jung-Richardt}, I. and {Kastendieck}, M.~A. and
+         {Katarzy{\'n}ski}, K. and {Katsuragawa}, M. and {Kerszberg}, D. and
+         {Khangulyan}, D. and {Kh{\'e}lifi}, B. and {King}, J. and
+         {Klepser}, S. and {Klochkov}, D. and {Klu{\'z}niak}, W. and
+         {Komin}, Nu. and {Kosack}, K. and {Krakau}, S. and {Kraus}, M. and
+         {Kr{\"u}ger}, P.~P. and {Laffon}, H. and {Lamanna}, G. and {Lau}, J. and
+         {Lees}, J. -P. and {Lefaucheur}, J. and {Lemi{\`e}re}, A. and
+         {Lemoine-Goumard}, M. and {Lenain}, J. -P. and {Leser}, E. and
+         {Lohse}, T. and {Lorentz}, M. and {Liu}, R. and {Lypova}, I. and
+         {Malyshev}, D. and {Marandon}, V. and {Marcowith}, A. and
+         {Mariaud}, C. and {Marx}, R. and {Maurin}, G. and {Maxted}, N. and
+         {Mayer}, M. and {Meintjes}, P.~J. and {Meyer}, M. and
+         {Mitchell}, A.~M.~W. and {Moderski}, R. and {Mohamed}, M. and
+         {Mohrmann}, L. and {Mor{\r{a}}}, K. and {Moulin}, E. and {Murach}, T. and
+         {Nakashima}, S. and {de Naurois}, M. and {Ndiyavala}, H. and
+         {Niederwanger}, F. and {Niemiec}, J. and {Oakes}, L. and {O'Brien}, P. and
+         {Odaka}, H. and {Ohm}, S. and {Ostrowski}, M. and {Oya}, I. and
+         {Padovani}, M. and {Panter}, M. and {Parsons}, R.~D. and
+         {Pekeur}, N.~W. and {Pelletier}, G. and {Perennes}, C. and
+         {Petrucci}, P. -O. and {Peyaud}, B. and {Piel}, Q. and {Pita}, S. and
+         {Poireau}, V. and {Poon}, H. and {Prokhorov}, D. and {Prokoph}, H. and
+         {P{\"u}hlhofer}, G. and {Punch}, M. and {Quirrenbach}, A. and
+         {Raab}, S. and {Rauth}, R. and {Reimer}, A. and {Reimer}, O. and
+         {Renaud}, M. and {de los Reyes}, R. and {Rieger}, F. and
+         {Rinchiuso}, L. and {Romoli}, C. and {Rowell}, G. and {Rudak}, B. and
+         {Rulten}, C.~B. and {Sahakian}, V. and {Saito}, S. and
+         {Sanchez}, D.~A. and {Santangelo}, A. and {Sasaki}, M. and
+         {Schlickeiser}, R. and {Sch{\"u}ssler}, F. and {Schulz}, A. and
+         {Schwanke}, U. and {Schwemmer}, S. and {Seglar-Arroyo}, M. and
+         {Settimo}, M. and {Seyffert}, A.~S. and {Shafi}, N. and {Shilon}, I. and
+         {Shiningayamwe}, K. and {Simoni}, R. and {Sol}, H. and {Spanier}, F. and
+         {Spir-Jacob}, M. and {Stawarz}, {\L}. and {Steenkamp}, R. and
+         {Stegmann}, C. and {Steppa}, C. and {Sushch}, I. and {Takahashi}, T. and
+         {Tavernet}, J. -P. and {Tavernier}, T. and {Taylor}, A.~M. and
+         {Terrier}, R. and {Tibaldo}, L. and {Tiziani}, D. and {Tluczykont}, M. and
+         {Trichard}, C. and {Tsirou}, M. and {Tsuji}, N. and {Tuffs}, R. and
+         {Uchiyama}, Y. and {van der Walt}, D.~J. and {van Eldik}, C. and
+         {van Rensburg}, C. and {van Soelen}, B. and {Vasileiadis}, G. and
+         {Veh}, J. and {Venter}, C. and {Viana}, A. and {Vincent}, P. and
+         {Vink}, J. and {Voisin}, F. and {V{\"o}lk}, H.~J. and {Vuillaume}, T. and
+         {Wadiasingh}, Z. and {Wagner}, S.~J. and {Wagner}, P. and
+         {Wagner}, R.~M. and {White}, R. and {Wierzcholska}, A. and
+         {Willmann}, P. and {W{\"o}rnlein}, A. and {Wouters}, D. and {Yang}, R. and
+         {Zaborov}, D. and {Zacharias}, M. and {Zanin}, R. and
+         {Zdziarski}, A.~A. and {Zech}, A. and {Zefi}, F. and {Ziegler}, A. and
+         {Zorn}, J. and {{\.Z}ywucka}, N. and {H.~E.~S.~S. Collaboration} and
+         {Fender}, R.~P. and {Broderick}, J.~W. and {Rowlinson}, A. and
+         {Wijers}, R.~A.~M.~J. and {Stewart}, A.~J. and {ter Veen}, S. and
+         {Shulevski}, A. and {LOFAR Collaboration} and {Kavic}, M. and
+         {Simonetti}, J.~H. and {League}, C. and {Tsai}, J. and
+         {Obenberger}, K.~S. and {Nathaniel}, K. and {Taylor}, G.~B. and
+         {Dowell}, J.~D. and {Liebling}, S.~L. and {Estes}, J.~A. and
+         {Lippert}, M. and {Sharma}, I. and {Vincent}, P. and {Farella}, B. and
+         {Wavelength Array}, LWA: Long and {Abeysekara}, A.~U. and {Albert}, A. and
+         {Alfaro}, R. and {Alvarez}, C. and {Arceo}, R. and
+         {Arteaga-Vel{\'a}zquez}, J.~C. and {Avila Rojas}, D. and
+         {Ayala Solares}, H.~A. and {Barber}, A.~S. and {Becerra Gonzalez}, J. and
+         {Becerril}, A. and {Belmont-Moreno}, E. and {BenZvi}, S.~Y. and
+         {Berley}, D. and {Bernal}, A. and {Braun}, J. and {Brisbois}, C. and
+         {Caballero-Mora}, K.~S. and {Capistr{\'a}n}, T. and
+         {Carrami{\~n}ana}, A. and {Casanova}, S. and {Castillo}, M. and
+         {Cotti}, U. and {Cotzomi}, J. and {Couti{\~n}o de Le{\'o}n}, S. and
+         {De Le{\'o}n}, C. and {De la Fuente}, E. and {Diaz Hernandez}, R. and
+         {Dichiara}, S. and {Dingus}, B.~L. and {DuVernois}, M.~A. and
+         {D{\'\i}az-V{\'e}lez}, J.~C. and {Ellsworth}, R.~W. and {Engel}, K. and
+         {Enr{\'\i}quez-Rivera}, O. and {Fiorino}, D.~W. and {Fleischhack}, H. and
+         {Fraija}, N. and {Garc{\'\i}a-Gonz{\'a}lez}, J.~A. and {Garfias}, F. and
+         {Gerhardt}, M. and {Gonz{\~o}lez Mu{\~n}oz}, A. and
+         {Gonz{\'a}lez}, M.~M. and {Goodman}, J.~A. and {Hampel-Arias}, Z. and
+         {Harding}, J.~P. and {Hernandez}, S. and {Hernandez-Almada}, A. and
+         {Hona}, B. and {H{\"u}ntemeyer}, P. and {Iriarte}, A. and
+         {Jardin-Blicq}, A. and {Joshi}, V. and {Kaufmann}, S. and {Kieda}, D. and
+         {Lara}, A. and {Lauer}, R.~J. and {Lennarz}, D. and
+         {Le{\'o}n Vargas}, H. and {Linnemann}, J.~T. and {Longinotti}, A.~L. and
+         {Raya}, G. Luis and {Luna-Garc{\'\i}a}, R. and {L{\'o}pez-Coto}, R. and
+         {Malone}, K. and {Marinelli}, S.~S. and {Martinez}, O. and
+         {Martinez-Castellanos}, I. and {Mart{\'\i}nez-Castro}, J. and
+         {Mart{\'\i}nez-Huerta}, H. and {Matthews}, J.~A. and {Mirand
+        a-Romagnoli}, P. and {Moreno}, E. and {Mostaf{\'a}}, M. and
+         {Nellen}, L. and {Newbold}, M. and {Nisa}, M.~U. and
+         {Noriega-Papaqui}, R. and {Pelayo}, R. and {Pretz}, J. and
+         {P{\'e}rez-P{\'e}rez}, E.~G. and {Ren}, Z. and {Rho}, C.~D. and
+         {Rivi{\`e}re}, C. and {Rosa-Gonz{\'a}lez}, D. and {Rosenberg}, M. and
+         {Ruiz-Velasco}, E. and {Salazar}, H. and {Salesa Greus}, F. and {Sand
+        oval}, A. and {Schneider}, M. and {Schoorlemmer}, H. and {Sinnis}, G. and
+         {Smith}, A.~J. and {Springer}, R.~W. and {Surajbali}, P. and
+         {Tibolla}, O. and {Tollefson}, K. and {Torres}, I. and
+         {Ukwatta}, T.~N. and {Weisgarber}, T. and {Westerhoff}, S. and
+         {Wisher}, I.~G. and {Wood}, J. and {Yapici}, T. and {Yodh}, G.~B. and
+         {Younk}, P.~W. and {Zhou}, H. and {{\'A}lvarez}, J.~D. and
+         {HAWC Collaboration} and {Aab}, A. and {Abreu}, P. and {Aglietta}, M. and
+         {Albuquerque}, I.~F.~M. and {Albury}, J.~M. and {Allekotte}, I. and
+         {Almela}, A. and {Alvarez Castillo}, J. and {Alvarez-Mu{\~n}iz}, J. and
+         {Anastasi}, G.~A. and {Anchordoqui}, L. and {Andrada}, B. and
+         {Andringa}, S. and {Aramo}, C. and {Arsene}, N. and {Asorey}, H. and
+         {Assis}, P. and {Avila}, G. and {Badescu}, A.~M. and {Balaceanu}, A. and
+         {Barbato}, F. and {Barreira Luz}, R.~J. and {Becker}, K.~H. and
+         {Bellido}, J.~A. and {Berat}, C. and {Bertaina}, M.~E. and
+         {Bertou}, X. and {Biermann}, P.~L. and {Biteau}, J. and
+         {Blaess}, S.~G. and {Blanco}, A. and {Blazek}, J. and {Bleve}, C. and
+         {Boh{\'a}{\v{c}}ov{\'a}}, M. and {Bonifazi}, C. and {Borodai}, N. and
+         {Botti}, A.~M. and {Brack}, J. and {Brancus}, I. and {Bretz}, T. and
+         {Bridgeman}, A. and {Briechle}, F.~L. and {Buchholz}, P. and
+         {Bueno}, A. and {Buitink}, S. and {Buscemi}, M. and
+         {Caballero-Mora}, K.~S. and {Caccianiga}, L. and {Cancio}, A. and
+         {Canfora}, F. and {Caruso}, R. and {Castellina}, A. and {Catalani}, F. and
+         {Cataldi}, G. and {Cazon}, L. and {Chavez}, A.~G. and
+         {Chinellato}, J.~A. and {Chudoba}, J. and {Clay}, R.~W. and
+         {Cobos Cerutti}, A.~C. and {Colalillo}, R. and {Coleman}, A. and
+         {Collica}, L. and {Coluccia}, M.~R. and {Concei{\c{c}}{\~a}o}, R. and
+         {Consolati}, G. and {Contreras}, F. and {Cooper}, M.~J. and
+         {Coutu}, S. and {Covault}, C.~E. and {Cronin}, J. and {D'Amico}, S. and
+         {Daniel}, B. and {Dasso}, S. and {Daumiller}, K. and {Dawson}, B.~R. and
+         {Day}, J.~A. and {de Almeida}, R.~M. and {de Jong}, S.~J. and
+         {De Mauro}, G. and {de Mello Neto}, J.~R.~T. and {De Mitri}, I. and
+         {de Oliveira}, J. and {de Souza}, V. and {Debatin}, J. and
+         {Deligny}, O. and {D{\'\i}az Castro}, M.~L. and {Diogo}, F. and
+         {Dobrigkeit}, C. and {D'Olivo}, J.~C. and {Dorosti}, Q. and
+         {Dos Anjos}, R.~C. and {Dova}, M.~T. and {Dundovic}, A. and {Ebr}, J. and
+         {Engel}, R. and {Erdmann}, M. and {Erfani}, M. and {Escobar}, C.~O. and
+         {Espadanal}, J. and {Etchegoyen}, A. and {Falcke}, H. and {Farmer}, J. and
+         {Farrar}, G. and {Fauth}, A.~C. and {Fazzini}, N. and {Feldbusch}, F. and
+         {Fenu}, F. and {Fick}, B. and {Figueira}, J.~M. and
+         {Filip{\v{c}}i{\v{c}}}, A. and {Freire}, M.~M. and {Fujii}, T. and
+         {Fuster}, A. and {Ga{\"\i}or}, R. and {Garc{\'\i}a}, B. and
+         {Gat{\'e}}, F. and {Gemmeke}, H. and {Gherghel-Lascu}, A. and
+         {Ghia}, P.~L. and {Giaccari}, U. and {Giammarchi}, M. and {Giller}, M. and
+         {G{\l}as}, D. and {Glaser}, C. and {Golup}, G. and
+         {G{\'o}mez Berisso}, M. and {G{\'o}mez Vitale}, P.~F. and
+         {Gonz{\'a}lez}, N. and {Gorgi}, A. and {Gottowik}, M. and
+         {Grillo}, A.~F. and {Grubb}, T.~D. and {Guarino}, F. and
+         {Guedes}, G.~P. and {Halliday}, R. and {Hampel}, M.~R. and
+         {Hansen}, P. and {Harari}, D. and {Harrison}, T.~A. and
+         {Harvey}, V.~M. and {Haungs}, A. and {Hebbeker}, T. and {Heck}, D. and
+         {Heimann}, P. and {Herve}, A.~E. and {Hill}, G.~C. and {Hojvat}, C. and
+         {Holt}, E. and {Homola}, P. and {H{\"o}randel}, J.~R. and
+         {Horvath}, P. and {Hrabovsk{\'y}}, M. and {Huege}, T. and
+         {Hulsman}, J. and {Insolia}, A. and {Isar}, P.~G. and {Jandt}, I. and
+         {Johnsen}, J.~A. and {Josebachuili}, M. and {Jurysek}, J. and
+         {K{\"a}{\"a}p{\"a}}, A. and {Kampert}, K.~H. and {Keilhauer}, B. and
+         {Kemmerich}, N. and {Kemp}, J. and {Kieckhafer}, R.~M. and
+         {Klages}, H.~O. and {Kleifges}, M. and {Kleinfeller}, J. and
+         {Krause}, R. and {Krohm}, N. and {Kuempel}, D. and {Kukec Mezek}, G. and
+         {Kunka}, N. and {Kuotb Awad}, A. and {Lago}, B.~L. and {LaHurd}, D. and
+         {Lang}, R.~G. and {Lauscher}, M. and {Legumina}, R. and
+         {Leigui de Oliveira}, M.~A. and {Letessier-Selvon}, A. and
+         {Lhenry-Yvon}, I. and {Link}, K. and {Lo Presti}, D. and {Lopes}, L. and
+         {L{\'o}pez}, R. and {L{\'o}pez Casado}, A. and {Lorek}, R. and
+         {Luce}, Q. and {Lucero}, A. and {Malacari}, M. and {Mallamaci}, M. and
+         {Mandat}, D. and {Mantsch}, P. and {Mariazzi}, A.~G. and
+         {Maris}, I.~C. and {Marsella}, G. and {Martello}, D. and
+         {Martinez}, H. and {Mart{\'\i}nez Bravo}, O. and
+         {Mas{\'\i}as Meza}, J.~J. and {Mathes}, H.~J. and {Mathys}, S. and
+         {Matthews}, J. and {Matthiae}, G. and {Mayotte}, E. and {Mazur}, P.~O. and
+         {Medina}, C. and {Medina-Tanco}, G. and {Melo}, D. and {Menshikov}, A. and
+         {Merenda}, K. -D. and {Michal}, S. and {Micheletti}, M.~I. and
+         {Middendorf}, L. and {Miramonti}, L. and {Mitrica}, B. and
+         {Mockler}, D. and {Mollerach}, S. and {Montanet}, F. and {Morello}, C. and
+         {Morlino}, G. and {M{\"u}ller}, A.~L. and {M{\"u}ller}, G. and
+         {Muller}, M.~A. and {M{\"u}ller}, S. and {Mussa}, R. and {Naranjo}, I. and
+         {Nguyen}, P.~H. and {Niculescu-Oglinzanu}, M. and {Niechciol}, M. and
+         {Niemietz}, L. and {Niggemann}, T. and {Nitz}, D. and {Nosek}, D. and
+         {Novotny}, V. and {No{\v{z}}ka}, L. and {N{\'u}{\~n}ez}, L.~A. and
+         {Oikonomou}, F. and {Olinto}, A. and {Palatka}, M. and {Pallotta}, J. and
+         {Papenbreer}, P. and {Parente}, G. and {Parra}, A. and {Paul}, T. and
+         {Pech}, M. and {Pedreira}, F. and {P{\c{e}}kala}, J. and
+         {Pe{\~n}a-Rodriguez}, J. and {Pereira}, L.~A.~S. and {Perlin}, M. and
+         {Perrone}, L. and {Peters}, C. and {Petrera}, S. and {Phuntsok}, J. and
+         {Pierog}, T. and {Pimenta}, M. and {Pirronello}, V. and {Platino}, M. and
+         {Plum}, M. and {Poh}, J. and {Porowski}, C. and {Prado}, R.~R. and
+         {Privitera}, P. and {Prouza}, M. and {Quel}, E.~J. and
+         {Querchfeld}, S. and {Quinn}, S. and {Ramos-Pollan}, R. and
+         {Rautenberg}, J. and {Ravignani}, D. and {Ridky}, J. and {Riehn}, F. and
+         {Risse}, M. and {Ristori}, P. and {Rizi}, V. and
+         {Rodrigues de Carvalho}, W. and {Rodriguez Fernandez}, G. and
+         {Rodriguez Rojo}, J. and {Roncoroni}, M.~J. and {Roth}, M. and
+         {Roulet}, E. and {Rovero}, A.~C. and {Ruehl}, P. and {Saffi}, S.~J. and
+         {Saftoiu}, A. and {Salamida}, F. and {Salazar}, H. and {Saleh}, A. and
+         {Salina}, G. and {S{\'a}nchez}, F. and {Sanchez-Lucas}, P. and
+         {Santos}, E.~M. and {Santos}, E. and {Sarazin}, F. and {Sarmento}, R. and
+         {Sarmiento-Cano}, C. and {Sato}, R. and {Schauer}, M. and
+         {Scherini}, V. and {Schieler}, H. and {Schimp}, M. and {Schmidt}, D. and
+         {Scholten}, O. and {Schov{\'a}nek}, P. and {Schr{\"o}der}, F.~G. and
+         {Schr{\"o}der}, S. and {Schulz}, A. and {Schumacher}, J. and
+         {Sciutto}, S.~J. and {Segreto}, A. and {Shadkam}, A. and
+         {Shellard}, R.~C. and {Sigl}, G. and {Silli}, G. and
+         {{\v{S}}m{\'\i}da}, R. and {Snow}, G.~R. and {Sommers}, P. and
+         {Sonntag}, S. and {Soriano}, J.~F. and {Squartini}, R. and
+         {Stanca}, D. and {Stani{\v{c}}}, S. and {Stasielak}, J. and
+         {Stassi}, P. and {Stolpovskiy}, M. and {Strafella}, F. and
+         {Streich}, A. and {Suarez}, F. and {Suarez-Dur{\'a}n}, M. and
+         {Sudholz}, T. and {Suomij{\"a}rvi}, T. and {Supanitsky}, A.~D. and
+         {{\v{S}}up{\'\i}k}, J. and {Swain}, J. and {Szadkowski}, Z. and
+         {Taboada}, A. and {Taborda}, O.~A. and {Timmermans}, C. and
+         {Todero Peixoto}, C.~J. and {Tomankova}, L. and {Tom{\'e}}, B. and
+         {Torralba Elipe}, G. and {Travnicek}, P. and {Trini}, M. and
+         {Tueros}, M. and {Ulrich}, R. and {Unger}, M. and {Urban}, M. and
+         {Vald{\'e}s Galicia}, J.~F. and {Vali{\~n}o}, I. and {Valore}, L. and
+         {van Aar}, G. and {van Bodegom}, P. and {van den Berg}, A.~M. and
+         {van Vliet}, A. and {Varela}, E. and {Vargas C{\'a}rdenas}, B. and
+         {V{\'a}zquez}, R.~A. and {Veberi{\v{c}}}, D. and {Ventura}, C. and
+         {Vergara Quispe}, I.~D. and {Verzi}, V. and {Vicha}, J. and
+         {Villase{\~n}or}, L. and {Vorobiov}, S. and {Wahlberg}, H. and
+         {Wainberg}, O. and {Walz}, D. and {Watson}, A.~A. and {Weber}, M. and
+         {Weindl}, A. and {Wiede{\'n}ski}, M. and {Wiencke}, L. and
+         {Wilczy{\'n}ski}, H. and {Wirtz}, M. and {Wittkowski}, D. and
+         {Wundheiler}, B. and {Yang}, L. and {Yushkov}, A. and {Zas}, E. and
+         {Zavrtanik}, D. and {Zavrtanik}, M. and {Zepeda}, A. and
+         {Zimmermann}, B. and {Ziolkowski}, M. and {Zong}, Z. and
+         {Zuccarello}, F. and {Pierre Auger Collaboration} and {Kim}, S. and
+         {Schulze}, S. and {Bauer}, F.~E. and {Corral-Santana}, J.~M. and
+         {de Gregorio-Monsalvo}, I. and {Gonz{\'a}lez-L{\'o}pez}, J. and
+         {Hartmann}, D.~H. and {Ishwara-Chandra}, C.~H. and {Mart{\'\i}n}, S. and
+         {Mehner}, A. and {Misra}, K. and {Micha{\l}owski}, M.~J. and
+         {Resmi}, L. and {ALMA Collaboration} and {Paragi}, Z. and {Agudo}, I. and
+         {An}, T. and {Beswick}, R. and {Casadio}, C. and {Frey}, S. and
+         {Jonker}, P. and {Kettenis}, M. and {Marcote}, B. and {Moldon}, J. and
+         {Szomoru}, A. and {van Langevelde}, H.~J. and {Yang}, J. and
+         {Euro VLBI Team} and {Cwiek}, A. and {Cwiok}, M. and {Czyrkowski}, H. and
+         {Dabrowski}, R. and {Kasprowicz}, G. and {Mankiewicz}, L. and
+         {Nawrocki}, K. and {Opiela}, R. and {Piotrowski}, L.~W. and
+         {Wrochna}, G. and {Zaremba}, M. and {{\.Z}arnecki}, A.~F. and
+         {Pi of the Sky Collaboration} and {Haggard}, D. and {Nynka}, M. and
+         {Ruan}, J.~J. and {Chandra Team at McGill University} and {Bland
+        }, P.~A. and {Booler}, T. and {Devillepoix}, H.~A.~R. and
+         {de Gois}, J.~S. and {Hancock}, P.~J. and {Howie}, R.~M. and
+         {Paxman}, J. and {Sansom}, E.~K. and {Towner}, M.~C. and
+         {Desert Fireball Network}, DFN: and {Tonry}, J. and {Coughlin}, M. and
+         {Stubbs}, C.~W. and {Denneau}, L. and {Heinze}, A. and {Stalder}, B. and
+         {Weiland}, H. and {ATLAS} and {Eatough}, R.~P. and {Kramer}, M. and
+         {Kraus}, A. and {Time Resolution Universe Survey}, High and
+         {Troja}, E. and {Piro}, L. and {Becerra Gonz{\'a}lez}, J. and
+         {Butler}, N.~R. and {Fox}, O.~D. and {Khandrika}, H.~G. and
+         {Kutyrev}, A. and {Lee}, W.~H. and {Ricci}, R. and {Ryan}, R.~E., Jr. and
+         {S{\'a}nchez-Ram{\'\i}rez}, R. and {Veilleux}, S. and {Watson}, A.~M. and
+         {Wieringa}, M.~H. and {Burgess}, J.~M. and {van Eerten}, H. and
+         {Fontes}, C.~J. and {Fryer}, C.~L. and {Korobkin}, O. and
+         {Wollaeger}, R.~T. and {RIMAS} and {RATIR} and {Camilo}, F. and
+         {Foley}, A.~R. and {Goedhart}, S. and {Makhathini}, S. and
+         {Oozeer}, N. and {Smirnov}, O.~M. and {Fender}, R.~P. and
+         {Woudt}, P.~A. and {South Africa/MeerKAT}, SKA},
+        title = "{Multi-messenger Observations of a Binary Neutron Star Merger}",
+      journal = {\apjl},
+     keywords = {gravitational waves, stars: neutron, Astrophysics - High Energy Astrophysical Phenomena, General Relativity and Quantum Cosmology},
+         year = "2017",
+        month = "Oct",
+       volume = {848},
+       number = {2},
+          eid = {L12},
+        pages = {L12},
+          doi = {10.3847/2041-8213/aa91c9},
+archivePrefix = {arXiv},
+       eprint = {1710.05833},
+ primaryClass = {astro-ph.HE},
+       adsurl = {https://ui.adsabs.harvard.edu/abs/2017ApJ...848L..12A},
+      adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+}
+


Property changes on: branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.test
===================================================================
--- branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.test	                        (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.test	2020-02-18 19:11:23 UTC (rev 820)
@@ -0,0 +1,27 @@
+#! /bin/sh -vx
+# $Id: bibtex-bigauth.test 53153 2019-12-17 19:05:32Z karl $
+# Copyright 2019 Karl Berry <tex-live at tug.org>
+# You may freely use, modify and/or distribute this file.
+
+test -d tests || mkdir -p tests
+
+# in case we're invoked standalone instead of from make.
+test -z "$srcdir" && srcdir=`cd \`dirname $0\`/.. && pwd` # web2c/
+
+cp $srcdir/tests/bibtex-bigauth.aux tests/xbigauth.aux || exit 1
+
+# Error was:
+# Your field is more than 20000 characters---line 303 of file bibtex-bigauth.bib
+# :          {Whelan}, J.~T. and {Whitcom
+# Original report from David Williams:
+#   https://tug.org/pipermail/texhax/2019-December/024121.html
+# Per his message, BibTeX entry comes from "Export Citation" at:
+#   https://ui.adsabs.harvard.edu/abs/2017ApJ...848L..12A/abstract
+
+TEXMFCNF=$srcdir/../kpathsea \
+  BSTINPUTS=$srcdir/../tests/texmf \
+  BIBINPUTS=$srcdir/tests \
+  ./bibtex tests/xbigauth || exit 1
+
+# the final author, in case glob_str_size is insufficient.
+grep MeerKAT tests/xbigauth.bbl >/dev/null || exit 1


Property changes on: branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.test
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.tex
===================================================================
--- branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.tex	                        (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.tex	2020-02-18 19:11:23 UTC (rev 820)
@@ -0,0 +1,6 @@
+\input btxmac.tex
+\nocite{*}
+\bibliographystyle{plain}
+\bibliography{bibtex-bigauth}
+\end
+


Property changes on: branches/stable/source/src/texk/web2c/tests/bibtex-bigauth.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/tex-closeout.test
===================================================================
--- branches/stable/source/src/texk/web2c/tests/tex-closeout.test	                        (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/tex-closeout.test	2020-02-18 19:11:23 UTC (rev 820)
@@ -0,0 +1,19 @@
+#! /bin/sh -vx
+# $Id: tex-closeout.test 53155 2019-12-17 19:24:59Z karl $
+# Copyright 2019 Karl Berry <tex-live at tug.org>
+# You may freely use, modify and/or distribute this file.
+
+# in case we're invoked standalone instead of from make.
+test -z "$srcdir" && srcdir=`cd \`dirname $0\`/.. && pwd` # web2c/
+TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF
+
+# Resulted in a double free with glibc on x86_64-linux.
+fail=2
+./tex -ini '\batchmode \immediate\openout1=b \openout1=/tmp/a \end'
+
+# If TeX crashed, we won't get here. The exit status will be something
+# like 134 on GNU/Linux, but we don't want to rely on that.
+fail=0
+
+exit $fail
+


Property changes on: branches/stable/source/src/texk/web2c/tests/tex-closeout.test
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/stable/source/src/texk/web2c/tex.ch
===================================================================
--- branches/stable/source/src/texk/web2c/tex.ch	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/tex.ch	2020-02-18 19:11:23 UTC (rev 820)
@@ -1892,6 +1892,27 @@
   area_delimiter:=save_area_delimiter; ext_delimiter:=save_ext_delimiter;
 @z
 
+ at x [29.526] l.10193 - look for a left_brace when scanning a file name
+ at p procedure scan_file_name;
+label done;
+ at y
+ at p procedure scan_file_name;
+label done;
+var
+  @!save_warning_index: pointer;
+begin
+  save_warning_index := warning_index;
+  warning_index := cur_cs; {store |cur_cs| here to remember until later}
+  @<Get the next non-blank non-relax non-call...@>; {here the program expands
+    tokens and removes spaces and \.{\\relax}es from the input. The \.{\\relax}
+    removal follows LuaTeX''s implementation, and other cases of
+    balanced text scanning.}
+  back_input; {return the last token to be read by either code path}
+  if cur_cmd=left_brace then
+    scan_file_name_braced
+  else
+ at z
+
 @x [29.526] l.10194 - stop scanning file name if we're at end-of-line.
   if not more_name(cur_chr) then goto done;
 @y
@@ -1902,6 +1923,63 @@
   if not more_name(cur_chr) then goto done;
 @z
 
+ at x [29.526] l.10203 - scan a bgroup/egroup-delimited file name
+done: end_name; name_in_progress:=false;
+end;
+ at y
+  end;
+done: end_name; name_in_progress:=false;
+warning_index := save_warning_index; {restore |warning_index|}
+end;
+
+@ When |scan_file_name| starts it looks for a |left_brace|
+(skipping \.{\\relax}es, as other \.{\\toks}-like primitives).
+If a |left_brace| is found, then the procedure scans a file
+name contained in a balanced token list, expanding tokens as
+it goes. When the scanner finds the balanced token list, it
+is converted into a string and fed character-by-character to
+|more_name| to do its job the same as in the ``normal'' file
+name scanning.
+
+ at p procedure scan_file_name_braced;
+var
+  @!save_scanner_status: small_number; {|scanner_status| upon entry}
+  @!save_def_ref: pointer; {|def_ref| upon entry, important if inside `\.{\\message}}
+  @!save_cur_cs: pointer;
+  @!s: str_number; {temp string}
+  @!p: pointer; {temp pointer}
+  @!i: integer; {loop tally}
+  @!save_stop_at_space: boolean; {this should be in tex.ch}
+  @!dummy: boolean;
+    {Initialising}
+begin save_scanner_status := scanner_status; {|scan_toks| sets |scanner_status| to |absorbing|}
+  save_def_ref := def_ref; {|scan_toks| uses |def_ref| to point to the token list just read}
+  save_cur_cs := cur_cs; {we set |cur_cs| back a few tokens to use in runaway errors}
+    {Scanning a token list}
+  cur_cs := warning_index; {for possible runaway error}
+  {mimick |call_func| from pdfTeX}
+  if scan_toks(false, true) <> 0 then do_nothing; {actually do the scanning}
+  {s := tokens_to_string(def_ref);}
+  old_setting := selector; selector:=new_string;
+  show_token_list(link(def_ref),null,pool_size-pool_ptr);
+  selector := old_setting;
+  s := make_string;
+  {turns the token list read in a string to input}
+    {Restoring some variables}
+  delete_token_ref(def_ref); {remove the token list from memory}
+  def_ref := save_def_ref; {and restore |def_ref|}
+  cur_cs := save_cur_cs; {restore |cur_cs|}
+  scanner_status := save_scanner_status; {restore |scanner_status|}
+    {Passing the read string to the input machinery}
+  save_stop_at_space := stop_at_space; {save |stop_at_space|}
+  stop_at_space := false; {set |stop_at_space| to false to allow spaces in file names}
+  begin_name;
+  for i:=str_start[s] to str_start[s+1]-1 do
+    dummy := more_name(str_pool[i]); {add each read character to the current file name}
+  stop_at_space := save_stop_at_space; {restore |stop_at_space|}
+end;
+ at z
+
 @x [29.530] l.10245 - prompt_file_name: prevent empty filenames.
 var k:0..buf_size; {index into |buffer|}
 @y
@@ -4381,7 +4459,16 @@
     @!old_setting:0..max_selector;
 @z
 
- at x [53.1374] Disallow certain \openout filenames, and log results.
+ at x [53.1374]
+  else  begin if write_open[j] then a_close(write_file[j]);
+    if subtype(p)=close_node then write_open[j]:=false
+ at y
+  else  begin if write_open[j] then begin a_close(write_file[j]);
+                                          write_open[j]:=false; end;
+    if subtype(p)=close_node then do_nothing {already closed}
+ at z
+
+ at x [still 53.1374] Disallow certain \openout filenames, and log results.
       while not a_open_out(write_file[j]) do
         prompt_file_name("output file name",".tex");
       write_open[j]:=true;

Modified: branches/stable/source/src/texk/web2c/texmfmp.h
===================================================================
--- branches/stable/source/src/texk/web2c/texmfmp.h	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/texmfmp.h	2020-02-18 19:11:23 UTC (rev 820)
@@ -248,6 +248,14 @@
 #define aclose(f)     close_file_or_pipe(f)
 #endif
 
+/* define FMT_COMPRESS for engines which compress formats */
+#if defined(pTeX) || defined(epTeX) || defined(upTeX) || defined(eupTeX)
+#define FMT_COMPRESS 1
+#endif
+#if defined(eTeX) || defined(pdfTeX) || defined(XeTeX)
+#define FMT_COMPRESS 1
+#endif
+
 /* `bopenin' (and out) is used only for reading (and writing) .tfm
    files; `wopenin' (and out) only for dump files.  The filenames are
    passed in as a global variable, `nameoffile'.  */
@@ -257,7 +265,7 @@
 
 #define bopenout(f)	open_output (&(f), FOPEN_WBIN_MODE)
 #define bclose		aclose
-#ifdef XeTeX
+#ifdef FMT_COMPRESS
 /* f is declared as gzFile, but we temporarily use it for a FILE *
    so that we can use the standard open calls */
 #define wopenin(f)	(open_input ((FILE**)&(f), DUMP_FORMAT, FOPEN_RBIN_MODE) \
@@ -352,7 +360,7 @@
   } while (0)
 
 /* We define the routines to do the actual work in texmfmp.c.  */
-#ifdef XeTeX
+#ifdef FMT_COMPRESS
 #include <zlib.h>
 extern void do_dump (char *, int, int, gzFile);
 extern void do_undump (char *, int, int, gzFile);

Modified: branches/stable/source/src/texk/web2c/web2c/common.defines
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/common.defines	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/web2c/common.defines	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,4 +1,5 @@
-{common.defines.  Public domain.
+{$Id: common.defines 53078 2019-12-10 18:39:13Z karl $
+ common.defines.  Public domain.
 
  This file is concatenated by ./convert to the beginning of the Pascal
  code that tangle outputs.  The idea is to put all these symbols, which
@@ -206,6 +207,7 @@
 @define type cstring;
 @define type char = 0..255;
 @define type getoptstruct;
+ at define type gzFile;
 @define type integer;
 @define type integer64;
 @define type longinteger;

Modified: branches/stable/source/src/texk/web2c/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/configure	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/texk/web2c/web2c/configure	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C Tools 2020/dev.
+# Generated by GNU Autoconf 2.69 for Web2C Tools 2020.
 #
 # Report bugs to <tex-k at tug.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='Web2C Tools'
 PACKAGE_TARNAME='web2c-tools'
-PACKAGE_VERSION='2020/dev'
-PACKAGE_STRING='Web2C Tools 2020/dev'
+PACKAGE_VERSION='2020'
+PACKAGE_STRING='Web2C Tools 2020'
 PACKAGE_BUGREPORT='tex-k at tug.org'
 PACKAGE_URL=''
 
@@ -1328,7 +1328,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Web2C Tools 2020/dev to adapt to many kinds of systems.
+\`configure' configures Web2C Tools 2020 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1398,7 +1398,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Web2C Tools 2020/dev:";;
+     short | recursive ) echo "Configuration of Web2C Tools 2020:";;
    esac
   cat <<\_ACEOF
 
@@ -1521,7 +1521,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Web2C Tools configure 2020/dev
+Web2C Tools configure 2020
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2360,7 +2360,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Web2C Tools $as_me 2020/dev, which was
+It was created by Web2C Tools $as_me 2020, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8047,7 +8047,7 @@
 
 # Define the identity of the package.
  PACKAGE='web2c-tools'
- VERSION='2020/dev'
+ VERSION='2020'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14576,7 +14576,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Web2C Tools $as_me 2020/dev, which was
+This file was extended by Web2C Tools $as_me 2020, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14642,7 +14642,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Web2C Tools config.status 2020/dev
+Web2C Tools config.status 2020
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Added: branches/stable/source/src/texk/web2c/zlib-fmt.ch
===================================================================
--- branches/stable/source/src/texk/web2c/zlib-fmt.ch	                        (rev 0)
+++ branches/stable/source/src/texk/web2c/zlib-fmt.ch	2020-02-18 19:11:23 UTC (rev 820)
@@ -0,0 +1,6 @@
+% public domain.
+ at x [8] compress format file by zlib
+@!word_file = file of memory_word;
+ at y
+@!word_file = gzFile;
+ at z


Property changes on: branches/stable/source/src/texk/web2c/zlib-fmt.ch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/utils/README
===================================================================
--- branches/stable/source/src/utils/README	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/utils/README	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,15 +1,15 @@
-$Id: README 52856 2019-11-19 00:04:10Z karl $
+$Id: README 53703 2020-02-06 23:29:37Z kakuto $
 Public domain.  Originally written 2005 by Karl Berry.
 
 Extra utilities we (optionally) compile for TeX Live.
 See comments in ../texk/README.
 
-asymptote 2.61 - checked 19nov19
+asymptote 2.62 - checked 16jan20
   update to TL from CTAN, to include prebuilt doc.
   see http://tug.org/texlive/build.html#asymptote
   and tlpkg/bin/tl-update-asy
 
-autosp 2019-08-26 - checked 29aug19
+autosp 2020-02-06 - checked 07feb20
   http://ctan.org/pkg/autosp
 
 devnag - from devanagari package installed in texmf-dist.
@@ -19,7 +19,7 @@
 m-tx 0.63a - checked 29apr18
   http://ctan.org/pkg/m-tx/
 
-pmx 2.8.4 - checked 14feb18
+pmx 2.9.4 - checked 07feb20
   http://ctan.org/pkg/pmx/
 
 ps2eps 1.68 - checked 10may12

Modified: branches/stable/source/src/utils/configure
===================================================================
--- branches/stable/source/src/utils/configure	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/utils/configure	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live utils 2020/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live utils 2020.
 #
 # Report bugs to <tex-k at tug.org>.
 #
@@ -579,8 +579,8 @@
 # Identity of this package.
 PACKAGE_NAME='TeX Live utils'
 PACKAGE_TARNAME='tex-live-utils'
-PACKAGE_VERSION='2020/dev'
-PACKAGE_STRING='TeX Live utils 2020/dev'
+PACKAGE_VERSION='2020'
+PACKAGE_STRING='TeX Live utils 2020'
 PACKAGE_BUGREPORT='tex-k at tug.org'
 PACKAGE_URL=''
 
@@ -1395,7 +1395,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live utils 2020/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live utils 2020 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1465,7 +1465,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live utils 2020/dev:";;
+     short | recursive ) echo "Configuration of TeX Live utils 2020:";;
    esac
   cat <<\_ACEOF
 
@@ -1753,7 +1753,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live utils configure 2020/dev
+TeX Live utils configure 2020
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1854,7 +1854,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live utils $as_me 2020/dev, which was
+It was created by TeX Live utils $as_me 2020, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3320,7 +3320,7 @@
   yes:no | no:*) :
     : ;; #(
   yes:*) :
-    as_fn_error $? "you can not use \`--with-x' for WIN32" "$LINENO" 5 ;; #(
+    as_fn_error $? "you can not use \`--with-x' for Windows" "$LINENO" 5 ;; #(
   *:no) :
     with_x=yes
                  { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-x'" >&5
@@ -3345,6 +3345,19 @@
      ;;
 esac ;;
 esac
+case $enable_luajithbtex in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    case $host in #(
+  alpha* | sparc* | x86_64-*-solaris* | powerpc-*-darwin* ) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajithbtex'" >&5
+$as_echo "$as_me: $host -> \`--disable-luajithbtex'" >&6;}
+                      ac_configure_args="$ac_configure_args '--disable-luajithbtex'" ;; #(
+  *) :
+     ;;
+esac ;;
+esac
 case $enable_mfluajit in #(
   yes | no) :
     : ;; #(
@@ -3358,6 +3371,19 @@
      ;;
 esac ;;
 esac
+case $enable_mfluajit_nowin in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    case $host in #(
+  alpha* | sparc* | x86_64-*-solaris* | powerpc-*-darwin* ) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit-nowin'" >&5
+$as_echo "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;}
+                      ac_configure_args="$ac_configure_args '--disable-mfluajit-nowin'" ;; #(
+  *) :
+     ;;
+esac ;;
+esac
 
 ## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir
 ## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $
@@ -3673,7 +3699,7 @@
   need_zlib=yes
 }
 
-# $Id: web2c.ac 51577 2019-07-08 06:07:11Z lscarso $
+# $Id: web2c.ac 53078 2019-12-10 18:39:13Z karl $
 # texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options for TeX and MF
 
@@ -3729,6 +3755,10 @@
 if test "${enable_etex_synctex+set}" = set; then :
   enableval=$enable_etex_synctex;
 fi
+
+test "x$enable_web2c:$enable_etex" = xyes:yes && {
+  need_zlib=yes
+}
 # Check whether --enable-ptex was given.
 if test "${enable_ptex+set}" = set; then :
   enableval=$enable_ptex;
@@ -3747,6 +3777,7 @@
 
 test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-eptex was given.
 if test "${enable_eptex+set}" = set; then :
@@ -3766,6 +3797,7 @@
 
 test "x$enable_web2c:$enable_eptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-uptex was given.
 if test "${enable_uptex+set}" = set; then :
@@ -3785,6 +3817,7 @@
 
 test "x$enable_web2c:$enable_uptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-euptex was given.
 if test "${enable_euptex+set}" = set; then :
@@ -3804,6 +3837,7 @@
 
 test "x$enable_web2c:$enable_euptex" = xyes:yes && {
   need_ptexenc=yes
+  need_zlib=yes
 }
 # Check whether --enable-aleph was given.
 if test "${enable_aleph+set}" = set; then :
@@ -3834,6 +3868,7 @@
 test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
+  need_zlib=yes
 }
 # Check whether --enable-luatex was given.
 if test "${enable_luatex+set}" = set; then :
@@ -6097,7 +6132,7 @@
 
 # Define the identity of the package.
  PACKAGE='tex-live-utils'
- VERSION='2020/dev'
+ VERSION='2020'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7062,7 +7097,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live utils $as_me 2020/dev, which was
+This file was extended by TeX Live utils $as_me 2020, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7119,7 +7154,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-TeX Live utils config.status 2020/dev
+TeX Live utils config.status 2020
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: branches/stable/source/src/version.ac
===================================================================
--- branches/stable/source/src/version.ac	2019-12-25 19:23:17 UTC (rev 819)
+++ branches/stable/source/src/version.ac	2020-02-18 19:11:23 UTC (rev 820)
@@ -1,5 +1,5 @@
-dnl $Id: version.ac 50926 2019-05-02 22:18:34Z karl $
-dnl   Copyright 2016-2019 Karl Berry <tex-live at tug.org>
+dnl $Id: version.ac 53427 2020-01-16 22:02:50Z karl $
+dnl   Copyright 2016-2020 Karl Berry <tex-live at tug.org>
 dnl   Copyright 2010-2015 Peter Breitenlohner <tex-live at tug.org>
 dnl
 dnl   This file is free software; the copyright holder
@@ -9,4 +9,4 @@
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current TeX Live version
-m4_define([tex_live_version], [2020/dev])
+m4_define([tex_live_version], [2020])



More information about the pdftex-commits mailing list.