pdftex[807] branches/stable/source: sync with tl r49136

commits+karl at tug.org commits+karl at tug.org
Mon Nov 12 20:12:53 CET 2018


Revision: 807
          http://tug.org/svn/pdftex?view=revision&revision=807
Author:   karl
Date:     2018-11-12 20:12:53 +0100 (Mon, 12 Nov 2018)
Log Message:
-----------
sync with tl r49136

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

Modified Paths:
--------------
    branches/stable/source/Makefile
    branches/stable/source/src/Makefile.in
    branches/stable/source/src/aclocal.m4
    branches/stable/source/src/build-aux/config.guess
    branches/stable/source/src/build-aux/config.sub
    branches/stable/source/src/build-aux/texinfo.tex
    branches/stable/source/src/configure
    branches/stable/source/src/doc/Makefile.in
    branches/stable/source/src/doc/build-tools.txt
    branches/stable/source/src/doc/tlbuild.info
    branches/stable/source/src/doc/tlbuild.texi
    branches/stable/source/src/libs/ChangeLog
    branches/stable/source/src/libs/Makefile.in
    branches/stable/source/src/libs/README
    branches/stable/source/src/libs/aclocal.m4
    branches/stable/source/src/libs/configure
    branches/stable/source/src/libs/libpng/ChangeLog
    branches/stable/source/src/libs/libpng/README
    branches/stable/source/src/libs/libpng/TLpatches/ChangeLog
    branches/stable/source/src/libs/libpng/TLpatches/TL-Changes
    branches/stable/source/src/libs/libpng/configure
    branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE
    branches/stable/source/src/libs/libpng/libpng-src/CHANGES
    branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt
    branches/stable/source/src/libs/libpng/libpng-src/INSTALL
    branches/stable/source/src/libs/libpng/libpng-src/LICENSE
    branches/stable/source/src/libs/libpng/libpng-src/README
    branches/stable/source/src/libs/libpng/libpng-src/autogen.sh
    branches/stable/source/src/libs/libpng/libpng-src/configure.ac
    branches/stable/source/src/libs/libpng/libpng-src/contrib/conftest/pngcp.dfa
    branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/iccfrompng.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/makepng.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/readpng.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/tarith.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/Dockerfile
    branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt
    branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh
    branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/README
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.bat
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.sh
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.bat
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.sh
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/README
    branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/README
    branches/stable/source/src/libs/libpng/libpng-src/contrib/testpngs/makepngs.sh
    branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt
    branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/PngFile.c
    branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/PngFile.h
    branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/VisualPng.c
    branches/stable/source/src/libs/libpng/libpng-src/example.c
    branches/stable/source/src/libs/libpng/libpng-src/intel/filter_sse2_intrinsics.c
    branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt
    branches/stable/source/src/libs/libpng/libpng-src/libpng.3
    branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3
    branches/stable/source/src/libs/libpng/libpng-src/mips/filter_msa_intrinsics.c
    branches/stable/source/src/libs/libpng/libpng-src/png.c
    branches/stable/source/src/libs/libpng/libpng-src/png.h
    branches/stable/source/src/libs/libpng/libpng-src/pngconf.h
    branches/stable/source/src/libs/libpng/libpng-src/pngget.c
    branches/stable/source/src/libs/libpng/libpng-src/pnginfo.h
    branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h
    branches/stable/source/src/libs/libpng/libpng-src/pngpread.c
    branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h
    branches/stable/source/src/libs/libpng/libpng-src/pngread.c
    branches/stable/source/src/libs/libpng/libpng-src/pngrio.c
    branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c
    branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c
    branches/stable/source/src/libs/libpng/libpng-src/pngset.c
    branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h
    branches/stable/source/src/libs/libpng/libpng-src/pngtest.c
    branches/stable/source/src/libs/libpng/libpng-src/pngtrans.c
    branches/stable/source/src/libs/libpng/libpng-src/pngwio.c
    branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c
    branches/stable/source/src/libs/libpng/libpng-src/pngwtran.c
    branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c
    branches/stable/source/src/libs/libpng/libpng-src/powerpc/filter_vsx_intrinsics.c
    branches/stable/source/src/libs/libpng/libpng-src/projects/owatcom/pngconfig.mak
    branches/stable/source/src/libs/libpng/libpng-src/projects/visualc71/README.txt
    branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt
    branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib.props
    branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt
    branches/stable/source/src/libs/libpng/libpng-src/scripts/def.c
    branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in
    branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in
    branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc
    branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux
    branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux-opt
    branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys
    branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ne12bsd
    branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd
    branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd
    branches/stable/source/src/libs/libpng/libpng-src/scripts/options.awk
    branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa
    branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt
    branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.def
    branches/stable/source/src/libs/libpng/version.ac
    branches/stable/source/src/libs/poppler/ChangeLog
    branches/stable/source/src/libs/poppler/Makefile.am
    branches/stable/source/src/libs/poppler/TLpatches/ChangeLog
    branches/stable/source/src/libs/poppler/TLpatches/TL-Changes
    branches/stable/source/src/libs/poppler/TLpatches/patch-03-time
    branches/stable/source/src/libs/poppler/configure
    branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt
    branches/stable/source/src/libs/poppler/poppler-src/ChangeLog
    branches/stable/source/src/libs/poppler/poppler-src/NEWS
    branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiType1C.cc
    branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiType1C.h
    branches/stable/source/src/libs/poppler/poppler-src/goo/JpegWriter.cc
    branches/stable/source/src/libs/poppler/poppler-src/goo/JpegWriter.h
    branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h
    branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.h
    branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/JBIG2Stream.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/Parser.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureHandler.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureInfo.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureInfo.h
    branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.cc
    branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.h
    branches/stable/source/src/libs/poppler/version.ac
    branches/stable/source/src/libs/xpdf/ChangeLog
    branches/stable/source/src/libs/xpdf/TLpatches/ChangeLog
    branches/stable/source/src/libs/xpdf/TLpatches/patch-bunched
    branches/stable/source/src/libs/xpdf/xpdf-src/goo/gfile.cc
    branches/stable/source/src/libs/xpdf/xpdf-src/xpdf/PDFDoc.cc
    branches/stable/source/src/m4/ChangeLog
    branches/stable/source/src/m4/kpse-pkgs.m4
    branches/stable/source/src/texk/Makefile.in
    branches/stable/source/src/texk/README
    branches/stable/source/src/texk/aclocal.m4
    branches/stable/source/src/texk/configure
    branches/stable/source/src/texk/kpathsea/Makefile.in
    branches/stable/source/src/texk/web2c/ChangeLog
    branches/stable/source/src/texk/web2c/Makefile.am
    branches/stable/source/src/texk/web2c/Makefile.in
    branches/stable/source/src/texk/web2c/ac/web2c.ac
    branches/stable/source/src/texk/web2c/configure
    branches/stable/source/src/texk/web2c/configure.ac
    branches/stable/source/src/texk/web2c/ctangleboot.cin
    branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
    branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch
    branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch
    branches/stable/source/src/texk/web2c/doc/Makefile.in
    branches/stable/source/src/texk/web2c/lib/ChangeLog
    branches/stable/source/src/texk/web2c/lib/Makefile.in
    branches/stable/source/src/texk/web2c/lib/openclose.c
    branches/stable/source/src/texk/web2c/man/Makefile.in
    branches/stable/source/src/texk/web2c/omegafonts/Makefile.in
    branches/stable/source/src/texk/web2c/otps/Makefile.in
    branches/stable/source/src/texk/web2c/otps/win32/Makefile.in
    branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
    branches/stable/source/src/texk/web2c/pdftexdir/NEWS
    branches/stable/source/src/texk/web2c/pdftexdir/expanded.test
    branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf.cc
    branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
    branches/stable/source/src/texk/web2c/pdftexdir/ttf2afm.test
    branches/stable/source/src/texk/web2c/pdftexdir/writet1.c
    branches/stable/source/src/texk/web2c/synctexdir/ChangeLog
    branches/stable/source/src/texk/web2c/synctexdir/ac/synctex.ac
    branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am
    branches/stable/source/src/texk/web2c/synctexdir/synctex.c
    branches/stable/source/src/texk/web2c/web2c/ChangeLog
    branches/stable/source/src/texk/web2c/web2c/fixwrites.c
    branches/stable/source/src/texk/web2c/window/Makefile.in
    branches/stable/source/src/utils/Makefile.in
    branches/stable/source/src/utils/README
    branches/stable/source/src/utils/aclocal.m4
    branches/stable/source/src/utils/configure
    branches/stable/source/sync-pdftex.sh

Added Paths:
-----------
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/bad_interlace_conversions.txt
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g16.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c16.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn3p08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a16.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a16.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn2c16.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn3p08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn2c16.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn3p08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbrn2c08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn0g16.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn3p08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbyn3p08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n0g08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n2c08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n3p08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp1n3p08.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/README
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g01.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g02.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g04.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p01.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p02.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p04.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g01.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g02.png
    branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g04.png
    branches/stable/source/src/libs/xpdf/aconf-w32.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/pdftosrc-poppler0.71.0.cc
    branches/stable/source/src/texk/web2c/synctexdir/synctex_parser_api_level.txt

Removed Paths:
-------------
    branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/newcc
    branches/stable/source/src/m4/kpse-potrace-flags.m4
    branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc

Modified: branches/stable/source/Makefile
===================================================================
--- branches/stable/source/Makefile	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/Makefile	2018-11-12 19:12:53 UTC (rev 807)
@@ -35,7 +35,7 @@
 	./sync-pdftex.sh  # does not actually change anything.
 
 syncreal:
-	./sync-pdftex.sh --real # read the trailing info!
+	./sync-pdftex.sh --real | tee /tmp/pdfsync.out # read trailing info!
 
 # The idea is to run this, do the needed svn adds and svn removes,
 # then (if something fails, which usually happens), deal with it, then

Modified: branches/stable/source/src/Makefile.in
===================================================================
--- branches/stable/source/src/Makefile.in	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/Makefile.in	2018-11-12 19:12:53 UTC (rev 807)
@@ -108,7 +108,6 @@
 	$(top_srcdir)/m4/kpse-pixman-flags.m4 \
 	$(top_srcdir)/m4/kpse-pkgs.m4 \
 	$(top_srcdir)/m4/kpse-poppler-flags.m4 \
-	$(top_srcdir)/m4/kpse-potrace-flags.m4 \
 	$(top_srcdir)/m4/kpse-ptexenc-flags.m4 \
 	$(top_srcdir)/m4/kpse-setup.m4 \
 	$(top_srcdir)/m4/kpse-teckit-flags.m4 \
@@ -148,6 +147,7 @@
 	$(top_srcdir)/texk/dvi2tty/ac/withenable.ac \
 	$(top_srcdir)/texk/dvidvi/ac/withenable.ac \
 	$(top_srcdir)/texk/dviljk/ac/withenable.ac \
+	$(top_srcdir)/texk/dviout-util/ac/withenable.ac \
 	$(top_srcdir)/texk/dvipdfm-x/ac/withenable.ac \
 	$(top_srcdir)/texk/dvipng/ac/withenable.ac \
 	$(top_srcdir)/texk/dvipng/ac/dvipng.ac \
@@ -184,7 +184,6 @@
 	$(top_srcdir)/libs/gmp/ac/withenable.ac \
 	$(top_srcdir)/libs/cairo/ac/withenable.ac \
 	$(top_srcdir)/libs/pixman/ac/withenable.ac \
-	$(top_srcdir)/libs/potrace/ac/withenable.ac \
 	$(top_srcdir)/libs/gd/ac/withenable.ac \
 	$(top_srcdir)/libs/freetype2/ac/withenable.ac \
 	$(top_srcdir)/libs/libpng/ac/withenable.ac \
@@ -203,7 +202,6 @@
 	$(top_srcdir)/libs/libpng/ac/libpng.ac \
 	$(top_srcdir)/libs/freetype2/ac/freetype2.ac \
 	$(top_srcdir)/libs/gd/ac/gd.ac \
-	$(top_srcdir)/libs/potrace/ac/potrace.ac \
 	$(top_srcdir)/libs/pixman/ac/pixman.ac \
 	$(top_srcdir)/libs/cairo/ac/cairo.ac \
 	$(top_srcdir)/libs/gmp/ac/gmp.ac \
@@ -495,7 +493,7 @@
 recurse_this = 
 recurse_top = 
 
-# $Id: Makefile.in 47714 2018-05-14 18:07:32Z karl $
+# $Id: Makefile.in 48948 2018-10-19 22:06:48Z karl $
 #
 # Requires $(recurse_this) and $(recurse_top).
 # Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).

Modified: branches/stable/source/src/aclocal.m4
===================================================================
--- branches/stable/source/src/aclocal.m4	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/aclocal.m4	2018-11-12 19:12:53 UTC (rev 807)
@@ -1188,7 +1188,6 @@
 m4_include([m4/kpse-pixman-flags.m4])
 m4_include([m4/kpse-pkgs.m4])
 m4_include([m4/kpse-poppler-flags.m4])
-m4_include([m4/kpse-potrace-flags.m4])
 m4_include([m4/kpse-ptexenc-flags.m4])
 m4_include([m4/kpse-setup.m4])
 m4_include([m4/kpse-teckit-flags.m4])

Modified: branches/stable/source/src/build-aux/config.guess
===================================================================
--- branches/stable/source/src/build-aux/config.guess	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/build-aux/config.guess	2018-11-12 19:12:53 UTC (rev 807)
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-07-06'
+timestamp='2018-08-29'
 
 # 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
@@ -84,8 +84,6 @@
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
-
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -96,34 +94,39 @@
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp 2>/dev/null) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
- ,,)    echo "int x;" > "$dummy.c" ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
+trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
 
+set_cc_for_build() {
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD="$driver"
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
+
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi at noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
@@ -138,7 +141,7 @@
 	# We could probably try harder.
 	LIBC=gnu
 
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
@@ -199,7 +202,7 @@
 		os=netbsdelf
 		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval "$set_cc_for_build"
+		set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -389,20 +392,15 @@
 	echo i386-pc-auroraux"$UNAME_RELEASE"
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval "$set_cc_for_build"
-	SUN_ARCH=i386
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH=x86_64
-	    fi
-	fi
-	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+	case `isainfo -b` in
+	    32)
+		echo i386-pc-solaris2"$UNAME_REL"
+		;;
+	    64)
+		echo x86_64-pc-solaris2"$UNAME_REL"
+		;;
+	esac
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -482,7 +480,7 @@
 	echo clipper-intergraph-clix"$UNAME_RELEASE"
 	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -579,7 +577,7 @@
 	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval "$set_cc_for_build"
+		set_cc_for_build
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
@@ -660,7 +658,7 @@
 		    esac
 		fi
 		if [ "$HP_ARCH" = "" ]; then
-		    eval "$set_cc_for_build"
+		    set_cc_for_build
 		    sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
@@ -700,7 +698,7 @@
 	esac
 	if [ "$HP_ARCH" = hppa2.0w ]
 	then
-	    eval "$set_cc_for_build"
+	    set_cc_for_build
 
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -726,7 +724,7 @@
 	echo ia64-hp-hpux"$HPUX_REV"
 	exit ;;
     3050*:HI-UX:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
@@ -840,6 +838,17 @@
     *:BSD/OS:*:*)
 	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 	exit ;;
+    arm:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
+	else
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
+	fi
+	exit ;;
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case "$UNAME_PROCESSOR" in
@@ -881,7 +890,7 @@
 	echo "$UNAME_MACHINE"-pc-uwin
 	exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
+	echo x86_64-pc-cygwin
 	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
@@ -922,7 +931,7 @@
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     arm*:Linux:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
@@ -971,7 +980,7 @@
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
 	#undef ${UNAME_MACHINE}
@@ -1285,7 +1294,7 @@
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	if test "$UNAME_PROCESSOR" = unknown ; then
 	    UNAME_PROCESSOR=powerpc
 	fi
@@ -1358,6 +1367,7 @@
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
+	# shellcheck disable=SC2154
 	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else

Modified: branches/stable/source/src/build-aux/config.sub
===================================================================
--- branches/stable/source/src/build-aux/config.sub	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/build-aux/config.sub	2018-11-12 19:12:53 UTC (rev 807)
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-07-03'
+timestamp='2018-08-29'
 
 # 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
@@ -89,7 +89,7 @@
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
     *local*)
@@ -149,29 +149,39 @@
 		esac
 		;;
 	*-*)
-		# Second component is usually, but not always the OS
-		case $field2 in
-			# Prevent following clause from handling this valid os
-			sun*os*)
-				basic_machine=$field1
-				os=$field2
-				;;
-			# Manufacturers
-			dec* | mips* | sequent* | encore* | pc532* | sgi* | sony* \
-			| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
-			| unicom* | ibm* | next | hp | isi* | apollo | altos* \
-			| convergent* | ncr* | news | 32* | 3600* | 3100* | hitachi* \
-			| c[123]* | convex* | sun | crds | omron* | dg | ultra | tti* \
-			| harris | dolphin | highlevel | gould | cbm | ns | masscomp \
-			| apple | axis | knuth | cray | microblaze* \
-			| sim | cisco | oki | wec | wrs | winbond)
-				basic_machine=$field1-$field2
+		# A lone config we happen to match not fitting any pattern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
 				os=
 				;;
-			*)
-				basic_machine=$field1
-				os=$field2
-				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
+					| convergent* | ncr* | news | 32* | 3600* | 3100* \
+					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+					| ultra | tti* | harris | dolphin | highlevel | gould \
+					| cbm | ns | masscomp | apple | axis | knuth | cray \
+					| microblaze* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						os=
+						;;
+					*)
+						basic_machine=$field1
+						os=$field2
+						;;
+				esac
+			;;
 		esac
 		;;
 	*)
@@ -190,6 +200,14 @@
 				basic_machine=m68010-adobe
 				os=scout
 				;;
+			alliant)
+				basic_machine=fx80-alliant
+				os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				os=
+				;;
 			am29k)
 				basic_machine=a29k-none
 				os=bsd
@@ -198,6 +216,10 @@
 				basic_machine=580-amdahl
 				os=sysv
 				;;
+			amiga)
+				basic_machine=m68k-unknown
+				os=
+				;;
 			amigaos | amigados)
 				basic_machine=m68k-unknown
 				os=amigaos
@@ -234,14 +256,42 @@
 				basic_machine=arm-unknown
 				os=cegcc
 				;;
+			convex-c1)
+				basic_machine=c1-convex
+				os=bsd
+				;;
+			convex-c2)
+				basic_machine=c2-convex
+				os=bsd
+				;;
+			convex-c32)
+				basic_machine=c32-convex
+				os=bsd
+				;;
+			convex-c34)
+				basic_machine=c34-convex
+				os=bsd
+				;;
+			convex-c38)
+				basic_machine=c38-convex
+				os=bsd
+				;;
 			cray)
 				basic_machine=j90-cray
 				os=unicos
 				;;
-			craynv)
-				basic_machine=craynv-cray
-				os=unicosmp
+			crds | unos)
+				basic_machine=m68k-crds
+				os=
 				;;
+			da30)
+				basic_machine=m68k-da30
+				os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				os=
+				;;
 			delta88)
 				basic_machine=m88k-motorola
 				os=sysv3
@@ -286,6 +336,9 @@
 				basic_machine=m88k-harris
 				os=sysv3
 				;;
+			hp300)
+				basic_machine=m68k-hp
+				;;
 			hp300bsd)
 				basic_machine=m68k-hp
 				os=bsd
@@ -307,7 +360,7 @@
 				os=mach
 				;;
 			vsta)
-				basic_machine=i386-unknown
+				basic_machine=i386-pc
 				os=vsta
 				;;
 			isi68 | isi)
@@ -371,7 +424,7 @@
 				os=sysv4
 				;;
 			netbsd386)
-				basic_machine=i386-unknown
+				basic_machine=i386-pc
 				os=netbsd
 				;;
 			netwinder)
@@ -454,14 +507,26 @@
 				basic_machine=mips-sei
 				os=seiux
 				;;
+			sequent)
+				basic_machine=i386-sequent
+				os=
+				;;
 			sps7)
 				basic_machine=m68k-bull
 				os=sysv2
 				;;
+			st2000)
+				basic_machine=m68k-tandem
+				os=
+				;;
 			stratus)
 				basic_machine=i860-stratus
 				os=sysv4
 				;;
+			sun2)
+				basic_machine=m68000-sun
+				os=
+				;;
 			sun2os3)
 				basic_machine=m68000-sun
 				os=sunos3
@@ -470,6 +535,10 @@
 				basic_machine=m68000-sun
 				os=sunos4
 				;;
+			sun3)
+				basic_machine=m68k-sun
+				os=
+				;;
 			sun3os3)
 				basic_machine=m68k-sun
 				os=sunos3
@@ -478,6 +547,10 @@
 				basic_machine=m68k-sun
 				os=sunos4
 				;;
+			sun4)
+				basic_machine=sparc-sun
+				os=
+				;;
 			sun4os3)
 				basic_machine=sparc-sun
 				os=sunos3
@@ -490,6 +563,10 @@
 				basic_machine=sparc-sun
 				os=solaris2
 				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				os=
+				;;
 			sv1)
 				basic_machine=sv1-cray
 				os=unicos
@@ -562,417 +639,162 @@
 		;;
 esac
 
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
 case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper | csky \
-	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia16 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nfp \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pru \
-	| pyramid \
-	| riscv | riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| wasm32 \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
+	# Here we handle the default manufacturer of certain CPU types.  It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		cpu=hppa1.1
+		vendor=winbond
 		;;
-	c54x)
-		basic_machine=tic54x-unknown
+	op50n)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	c55x)
-		basic_machine=tic55x-unknown
+	op60c)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	c6x)
-		basic_machine=tic6x-unknown
+	ibm*)
+		cpu=i370
+		vendor=ibm
 		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
+	orion105)
+		cpu=clipper
+		vendor=highlevel
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=${os:-none}
+	mac | mpw | mac-mpw)
+		cpu=m68k
+		vendor=apple
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+	pmac | pmac-mpw)
+		cpu=powerpc
+		vendor=apple
 		;;
-	m9s12z | m68hcs12z | hcs12z | s12z)
-		basic_machine=s12z-unknown
-		os=${os:-none}
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=${os:-none}
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
 
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| ba-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | csky-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nfp-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pru-* \
-	| pyramid-* \
-	| riscv-* | riscv32-* | riscv64-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| wasm32-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
+		cpu=m68000
+		vendor=att
 		;;
 	3b*)
-		basic_machine=we32k-att
+		cpu=we32k
+		vendor=att
 		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=linux
-		;;
 	bluegene*)
-		basic_machine=powerpc-ibm
+		cpu=powerpc
+		vendor=ibm
 		os=cnk
 		;;
-	c54x-*)
-		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=${os:-unicos}
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=bsd
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=${os:-elf}
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=${os:-elf}
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
 	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
+		cpu=pdp10
+		vendor=dec
 		os=tops10
 		;;
 	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
+		cpu=pdp10
+		vendor=dec
 		os=tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
+		cpu=m68k
+		vendor=motorola
 		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=${os:-bosx}
-		;;
 	dpx2*)
-		basic_machine=m68k-bull
+		cpu=m68k
+		vendor=bull
 		os=sysv3
 		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
 	encore | umax | mmax)
-		basic_machine=ns32k-encore
+		cpu=ns32k
+		vendor=encore
 		;;
 	elxsi)
-		basic_machine=elxsi-elxsi
+		cpu=elxsi
+		vendor=elxsi
 		os=${os:-bsd}
 		;;
 	fx2800)
-		basic_machine=i860-alliant
+		cpu=i860
+		vendor=alliant
 		;;
 	genix)
-		basic_machine=ns32k-ns
+		cpu=ns32k
+		vendor=ns
 		;;
 	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
+		cpu=hppa1.1
+		vendor=hitachi
 		os=hiuxwe2
 		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
+		cpu=m68000
+		vendor=hp
 		;;
 	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
+		cpu=m68k
+		vendor=hp
 		;;
 	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k78[0-9] | hp78[0-9])
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
 	i*86v32)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
 		os=sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
 		os=sysv4
 		;;
 	i*86v)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
 		os=sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
 		os=solaris2
 		;;
 	j90 | j90-cray)
-		basic_machine=j90-cray
+		cpu=j90
+		vendor=cray
 		os=${os:-unicos}
 		;;
 	iris | iris4d)
-		basic_machine=mips-sgi
+		cpu=mips
+		vendor=sgi
 		case $os in
 		    irix*)
 			;;
@@ -981,38 +803,23 @@
 			;;
 		esac
 		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=linux
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
 	miniframe)
-		basic_machine=m68000-convergent
+		cpu=m68000
+		vendor=convergent
 		;;
 	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
+		cpu=m68k
+		vendor=atari
 		os=mint
 		;;
-	mips3*-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	ms1-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
-		;;
 	news-3600 | risc-news)
-		basic_machine=mips-sony
+		cpu=mips
+		vendor=sony
 		os=newsos
 		;;
 	next | m*-next)
-		basic_machine=m68k-next
+		cpu=m68k
+		vendor=next
 		case $os in
 		    nextstep* )
 			;;
@@ -1025,260 +832,437 @@
 		esac
 		;;
 	np1)
-		basic_machine=np1-gould
+		cpu=np1
+		vendor=gould
 		;;
-	neo-tandem)
-		basic_machine=neo-tandem
+	op50n-* | op60c-*)
+		cpu=hppa1.1
+		vendor=oki
+		os=proelf
 		;;
-	nse-tandem)
-		basic_machine=nse-tandem
+	pa-hitachi)
+		cpu=hppa1.1
+		vendor=hitachi
+		os=hiuxwe2
 		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
+	pbd)
+		cpu=sparc
+		vendor=tti
 		;;
-	nsv-tandem)
-		basic_machine=nsv-tandem
+	pbb)
+		cpu=m68k
+		vendor=tti
 		;;
-	nsx-tandem)
-		basic_machine=nsx-tandem
+	pc532)
+		cpu=ns32k
+		vendor=pc532
 		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=proelf
+	pn)
+		cpu=pn
+		vendor=gould
 		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
+	power)
+		cpu=power
+		vendor=ibm
 		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=hiuxwe2
+	ps2)
+		cpu=i386
+		vendor=ibm
 		;;
-	parisc-*)
-		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=linux
+	rm[46]00)
+		cpu=mips
+		vendor=siemens
 		;;
-	pbd)
-		basic_machine=sparc-tti
+	rtpc | rtpc-*)
+		cpu=romp
+		vendor=ibm
 		;;
-	pbb)
-		basic_machine=m68k-tti
+	sde)
+		cpu=mipsisa32
+		vendor=sde
+		os=${os:-elf}
 		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
+	simso-wrs)
+		cpu=sparclite
+		vendor=wrs
+		os=vxworks
 		;;
-	pc98)
-		basic_machine=i386-pc
+	tower | tower-32)
+		cpu=m68k
+		vendor=ncr
 		;;
-	pc98-*)
-		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	vpp*|vx|vx-*)
+		cpu=f301
+		vendor=fujitsu
 		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
+	w65)
+		cpu=w65
+		vendor=wdc
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
+	w89k-*)
+		cpu=hppa1.1
+		vendor=winbond
+		os=proelf
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
+	none)
+		cpu=none
+		vendor=none
 		;;
-	pentium4)
-		basic_machine=i786-pc
+	leon|leon[3-9])
+		cpu=sparc
+		vendor=$basic_machine
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	leon-*|leon[3-9]-*)
+		cpu=sparc
+		vendor=`echo "$basic_machine" | sed 's/-.*//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+
+	*-*)
+		IFS="-" read -r cpu vendor <<EOF
+$basic_machine
+EOF
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+		cpu=$basic_machine
+		vendor=pc
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
+	pc98)
+		cpu=i386
+		vendor=pc
 		;;
-	pn)
-		basic_machine=pn-gould
+	x64 | amd64)
+		cpu=x86_64
+		vendor=pc
 		;;
-	power)	basic_machine=power-ibm
+	# Recognize the basic CPU types without company name.
+	*)
+		cpu=$basic_machine
+		vendor=unknown
 		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	craynv-unknown)
+		vendor=cray
+		os=${os:-unicosmp}
 		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	c90-unknown | c90-cray)
+		vendor=cray
+		os=${os:-unicos}
 		;;
-	ppcle | powerpclittle)
-		basic_machine=powerpcle-unknown
+	fx80-unknown)
+		vendor=alliant
 		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	romp-unknown)
+		vendor=ibm
 		;;
-	ppc64)	basic_machine=powerpc64-unknown
+	mmix-unknown)
+		vendor=knuth
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	microblaze-unknown | microblazeel-unknown)
+		vendor=xilinx
 		;;
-	ppc64le | powerpc64little)
-		basic_machine=powerpc64le-unknown
+	rs6000-unknown)
+		vendor=ibm
 		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	vax-unknown)
+		vendor=dec
 		;;
-	ps2)
-		basic_machine=i386-ibm
+	pdp11-unknown)
+		vendor=dec
 		;;
-	rm[46]00)
-		basic_machine=mips-siemens
+	we32k-unknown)
+		vendor=att
 		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
+	cydra-unknown)
+		vendor=cydrome
 		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
+	i370-ibm*)
+		vendor=ibm
 		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
+	orion-unknown)
+		vendor=highlevel
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
+	xps-unknown | xps100-unknown)
+		cpu=xps100
+		vendor=honeywell
 		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
+
+	# Here we normalize CPU types with a missing or matching vendor
+	dpx20-unknown | dpx20-bull)
+		cpu=rs6000
+		vendor=bull
+		os=${os:-bosx}
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=${os:-elf}
+
+	# Here we normalize CPU types irrespective of the vendor
+	amd64-*)
+		cpu=x86_64
 		;;
-	sequent)
-		basic_machine=i386-sequent
+	blackfin-*)
+		cpu=bfin
+		os=linux
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
+	c54x-*)
+		cpu=tic54x
 		;;
-	simso-wrs)
-		basic_machine=sparclite-wrs
-		os=vxworks
+	c55x-*)
+		cpu=tic55x
 		;;
-	spur)
-		basic_machine=spur-unknown
+	c6x-*)
+		cpu=tic6x
 		;;
-	st2000)
-		basic_machine=m68k-tandem
+	e500v[12]-*)
+		cpu=powerpc
+		os=$os"spe"
 		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	mips3*-*)
+		cpu=mips64
 		;;
-	sun2)
-		basic_machine=m68000-sun
+	ms1-*)
+		cpu=mt
 		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
+	m68knommu-*)
+		cpu=m68k
+		os=linux
 		;;
-	sun4)
-		basic_machine=sparc-sun
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		cpu=s12z
 		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
+	openrisc-*)
+		cpu=or32
 		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=linux-gnu
+	parisc-*)
+		cpu=hppa
+		os=linux
 		;;
-	tx39)
-		basic_machine=mipstx39-unknown
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		cpu=i586
 		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+		cpu=i686
 		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		cpu=i686
 		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
+	pentium4-*)
+		cpu=i786
 		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=none
+	pc98-*)
+		cpu=i386
 		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=proelf
+	ppc-* | ppcbe-*)
+		cpu=powerpc
 		;;
-	x64)
-		basic_machine=x86_64-pc
+	ppcle-* | powerpclittle-*)
+		cpu=powerpcle
 		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
+	ppc64-*)
+		cpu=powerpc64
 		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
+	ppc64le-* | powerpc64little-*)
+		cpu=powerpc64le
 		;;
-	none)
-		basic_machine=none-none
-		os=${os:-none}
+	sb1-*)
+		cpu=mipsisa64sb1
 		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
+	sb1el-*)
+		cpu=mipsisa64sb1el
 		;;
-	op50n)
-		basic_machine=hppa1.1-oki
+	sh5e[lb]-*)
+		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
 		;;
-	op60c)
-		basic_machine=hppa1.1-oki
+	spur-*)
+		cpu=spur
 		;;
-	romp)
-		basic_machine=romp-ibm
+	strongarm-* | thumb-*)
+		cpu=arm
 		;;
-	mmix)
-		basic_machine=mmix-knuth
+	tx39-*)
+		cpu=mipstx39
 		;;
-	rs6000)
-		basic_machine=rs6000-ibm
+	tx39el-*)
+		cpu=mipstx39el
 		;;
-	vax)
-		basic_machine=vax-dec
+	x64-*)
+		cpu=x86_64
 		;;
-	pdp11)
-		basic_machine=pdp11-dec
+	xscale-* | xscalee[bl]-*)
+		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
-	we32k)
-		basic_machine=we32k-att
+
+	# Recognize the canonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	cr16-*)
+		os=${os:-elf}
 		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
+	crisv32-* | etraxfs*-*)
+		cpu=crisv32
+		vendor=axis
 		;;
-	cydra)
-		basic_machine=cydra-cydrome
+	cris-* | etrax*-*)
+		cpu=cris
+		vendor=axis
 		;;
-	orion)
-		basic_machine=orion-highlevel
+	crx-*)
+		os=${os:-elf}
 		;;
-	orion105)
-		basic_machine=clipper-highlevel
+	neo-tandem)
+		cpu=neo
+		vendor=tandem
 		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
+	nse-tandem)
+		cpu=nse
+		vendor=tandem
 		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
+	nsr-tandem)
+		cpu=nsr
+		vendor=tandem
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
+	nsv-tandem)
+		cpu=nsv
+		vendor=tandem
 		;;
+	nsx-tandem)
+		cpu=nsx
+		vendor=tandem
+		;;
+	s390-*)
+		cpu=s390
+		vendor=ibm
+		;;
+	s390x-*)
+		cpu=s390x
+		vendor=ibm
+		;;
+	tile*-*)
+		os=${os:-linux-gnu}
+		;;
+
 	*)
-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
-		exit 1
+		# Recognize the canonical CPU types that are allowed with any
+		# company name.
+		case $cpu in
+			1750a | 580 \
+			| a29k \
+			| aarch64 | aarch64_be \
+			| abacus \
+			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+			| alphapca5[67] | alpha64pca5[67] \
+			| am33_2.0 \
+			| arc | arceb \
+			| arm  | arm[lb]e | arme[lb] | armv* \
+			| avr | avr32 \
+			| asmjs \
+			| ba \
+			| be32 | be64 \
+			| bfin | bs2000 \
+			| c[123]* | c30 | [cjt]90 | c4x \
+			| c8051 | clipper | craynv | csky | cydra \
+			| d10v | d30v | dlx | dsp16xx \
+			| e2k | elxsi | epiphany \
+			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| h8300 | h8500 \
+			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+			| hexagon \
+			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
+			| ip2k | iq2000 \
+			| k1om \
+			| le32 | le64 \
+			| lm32 \
+			| m32c | m32r | m32rle \
+			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \
+			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
+			| m88110 | m88k | maxq | mb | mcore | mep | metag \
+			| microblaze | microblazeel \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64el \
+			| mips64octeon | mips64octeonel \
+			| mips64orion | mips64orionel \
+			| mips64r5900 | mips64r5900el \
+			| mips64vr | mips64vrel \
+			| mips64vr4100 | mips64vr4100el \
+			| mips64vr4300 | mips64vr4300el \
+			| mips64vr5000 | mips64vr5000el \
+			| mips64vr5900 | mips64vr5900el \
+			| mipsisa32 | mipsisa32el \
+			| mipsisa32r2 | mipsisa32r2el \
+			| mipsisa32r6 | mipsisa32r6el \
+			| mipsisa64 | mipsisa64el \
+			| mipsisa64r2 | mipsisa64r2el \
+			| mipsisa64r6 | mipsisa64r6el \
+			| mipsisa64sb1 | mipsisa64sb1el \
+			| mipsisa64sr71k | mipsisa64sr71kel \
+			| mipsr5900 | mipsr5900el \
+			| mipstx39 | mipstx39el \
+			| mmix \
+			| mn10200 | mn10300 \
+			| moxie \
+			| mt \
+			| msp430 \
+			| nds32 | nds32le | nds32be \
+			| nfp \
+			| nios | nios2 | nios2eb | nios2el \
+			| none | np1 | ns16k | ns32k \
+			| open8 \
+			| or1k* \
+			| or32 \
+			| orion \
+			| pdp10 | pdp11 | pj | pjl | pn | power \
+			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pru \
+			| pyramid \
+			| riscv | riscv32 | riscv64 \
+			| rl78 | romp | rs6000 | rx \
+			| score \
+			| sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sparclite \
+			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| spu \
+			| tahoe \
+			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tron \
+			| ubicom32 \
+			| v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| vax \
+			| visium \
+			| wasm32 \
+			| we32k \
+			| x86 | x86_64 | xc16x | xgate | xps100 \
+			| xstormy16 | xtensa* \
+			| ymp \
+			| z8k | z80)
+				;;
+
+			*)
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				exit 1
+				;;
+		esac
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
+case $vendor in
+	digital*)
+		vendor=dec
 		;;
-	*-commodore*)
-		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+	commodore*)
+		vendor=cbm
 		;;
 	*)
 		;;
@@ -1356,7 +1340,7 @@
 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
 	     | aos* | aros* | cloudabi* | sortix* \
 	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
-	     | clix* | riscos* | uniplus* | iris* | rtu* | xenix* \
+	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
 	     | knetbsd* | mirbsd* | netbsd* \
 	     | bitrig* | openbsd* | solidbsd* | libertybsd* \
 	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
@@ -1380,8 +1364,8 @@
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
+		case $cpu in
+		    x86 | i*86)
 			;;
 		    *)
 			os=nto-$os
@@ -1507,7 +1491,7 @@
 		# Until real need of OS specific support for
 		# particular features comes up, bare metal
 		# configurations are quite functional.
-		case $basic_machine in
+		case $cpu in
 		    arm*)
 			os=eabi
 			;;
@@ -1541,7 +1525,7 @@
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-case $basic_machine in
+case $cpu-$vendor in
 	score-*)
 		os=elf
 		;;
@@ -1722,9 +1706,8 @@
 
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
+case $vendor in
+	unknown)
 		case $os in
 			riscix*)
 				vendor=acorn
@@ -1793,11 +1776,10 @@
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo "$basic_machine-$os"
+echo "$cpu-$vendor-$os"
 exit
 
 # Local variables:

Modified: branches/stable/source/src/build-aux/texinfo.tex
===================================================================
--- branches/stable/source/src/build-aux/texinfo.tex	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/build-aux/texinfo.tex	2018-11-12 19:12:53 UTC (rev 807)
@@ -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{2018-06-02.09}
+\def\texinfoversion{2018-09-21.20}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -8004,6 +8004,7 @@
   \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
   \gdef\magicamp{\let&=\amprm}
 }
+\let\ampchar\&
 
 \newcount\parencount
 

Modified: branches/stable/source/src/configure
===================================================================
--- branches/stable/source/src/configure	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/configure	2018-11-12 19:12:53 UTC (rev 807)
@@ -858,6 +858,7 @@
 enable_dvi2tty
 enable_dvidvi
 enable_dviljk
+enable_dviout_util
 enable_dvipdfm_x
 enable_dvipng
 enable_debug
@@ -911,9 +912,6 @@
 with_gmp_libdir
 with_system_cairo
 with_system_pixman
-with_system_potrace
-with_potrace_includes
-with_potrace_libdir
 with_system_gd
 with_gd_includes
 with_gd_libdir
@@ -1668,6 +1666,7 @@
   --disable-dvi2tty       do not build the dvi2tty package
   --disable-dvidvi        do not build the dvidvi package
   --disable-dviljk        do not build the dviljk package
+  --disable-dviout-util   do not build the dviout-util package
   --disable-dvipdfm-x     do not build the dvipdfm-x package
   --disable-dvipng        do not build the dvipng package
   --disable-debug           Compile without debug (-d) option
@@ -1775,11 +1774,6 @@
                           pkg-config)
   --with-system-pixman    use installed pixman headers and library (requires
                           pkg-config)
-  --with-system-potrace   use installed potrace headers and library
-  --with-potrace-includes=DIR
-                          potrace headers installed in DIR
-  --with-potrace-libdir=DIR
-                          potrace library installed in DIR
   --with-system-gd        use installed gd headers and library
   --with-gd-includes=DIR  gd headers installed in DIR
   --with-gd-libdir=DIR    gd library installed in DIR
@@ -4678,8 +4672,6 @@
 esac
 
 test "x$enable_web2c:$enable_luatex" = xyes:yes && {
-  need_poppler=yes
-  need_mpfr=yes
   need_libpng=yes
   need_zziplib=yes
   need_lua52=yes
@@ -4696,8 +4688,6 @@
 esac
 
 test "x$enable_web2c:$enable_luatex53" = xyes:yes && {
-  need_poppler=yes
-  need_mpfr=yes
   need_libpng=yes
   need_zziplib=yes
   need_lua53=yes
@@ -4714,8 +4704,6 @@
 esac
 
 test "x$enable_web2c:$enable_luajittex" = xyes:yes && {
-  need_poppler=yes
-  need_mpfr=yes
   need_libpng=yes
   need_zziplib=yes
   need_luajit=yes
@@ -5139,6 +5127,28 @@
   need_kpathsea=yes
 }
 
+## texk/dviout-util/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviout-util/
+## configure options and TL libraries required for dviout-util
+# Check whether --enable-dviout-util was given.
+if test "${enable_dviout_util+set}" = set; then :
+  enableval=$enable_dviout_util;
+fi
+case $enable_dviout_util in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviout_util=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&5
+$as_echo "$as_me: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviout-util=$enable_dviout_util'"
+    ;;
+esac
+
+test "x$enable_dviout_util" = xno || {
+  need_ptexenc=yes
+}
+
 ## texk/dvipdfm-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/
 ## configure options and TL libraries required for dvipdfm-x
 # Check whether --enable-dvipdfm-x was given.
@@ -6164,46 +6174,6 @@
   fi
 fi
 
-## libs/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
-## configure options and TL libraries required for potrace
-
-# Check whether --with-system-potrace was given.
-if test "${with_system_potrace+set}" = set; then :
-  withval=$with_system_potrace;
-fi
-
-# Check whether --with-potrace-includes was given.
-if test "${with_potrace_includes+set}" = set; then :
-  withval=$with_potrace_includes;
-fi
-
-# Check whether --with-potrace-libdir was given.
-if test "${with_potrace_libdir+set}" = set; then :
-  withval=$with_potrace_libdir;
-fi
-if test "x$with_system_potrace" = x; then
-  if test -f $srcdir/libs/potrace/configure; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`potrace' headers and library from TL tree" >&5
-$as_echo "$as_me: Assuming \`potrace' headers and library from TL tree" >&6;}
-    with_system_potrace=no
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`potrace' headers and library" >&5
-$as_echo "$as_me: Assuming installed \`potrace' headers and library" >&6;}
-    with_system_potrace=yes
-  fi
-  ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
-elif test "x$with_system_potrace" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`potrace' headers and library" >&5
-$as_echo "$as_me: Using installed \`potrace' headers and library" >&6;}
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`potrace' headers and library from TL tree" >&5
-$as_echo "$as_me: Using \`potrace' headers and library from TL tree" >&6;}
-  if test "x$with_system_potrace" != xno; then
-    with_system_potrace=no
-    ac_configure_args="$ac_configure_args '--without-system-potrace'"
-  fi
-fi
-
 ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
 ## configure options and TL libraries required for gd
 
@@ -21376,14 +21346,6 @@
   GD_LIBS="-L$with_gd_libdir $GD_LIBS"
 fi
 
-if test "x$with_potrace_includes" != x && test "x$with_potrace_includes" != xyes; then
-  POTRACE_INCLUDES="-I$with_potrace_includes"
-fi
-POTRACE_LIBS="-lpotrace"
-if test "x$with_potrace_libdir" != x && test "x$with_potrace_libdir" != xyes; then
-  POTRACE_LIBS="-L$with_potrace_libdir $POTRACE_LIBS"
-fi
-
 if $PKG_CONFIG pixman-1 --atleast-version=0.18; then
   PIXMAN_INCLUDES=`$PKG_CONFIG pixman-1 --cflags`
   PIXMAN_LIBS=`$PKG_CONFIG pixman-1 --libs`
@@ -21870,37 +21832,6 @@
 $as_echo "$kpse_res" >&6; }
 fi
 
-## libs/potrace/ac/potrace.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
-## basic check of system potrace
-if test "x$need_potrace:$with_system_potrace" = xyes:yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`potrace' library" >&5
-$as_echo_n "checking requested system \`potrace' library... " >&6; }
-  CPPFLAGS="$POTRACE_INCLUDES $CPPFLAGS"
-  LIBS="$POTRACE_LIBS $LIBS"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <potracelib.h>
-int
-main ()
-{
-potrace_state_t st;
-const char *version = potrace_version();
-potrace_state_free(&st);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  syslib_used=yes kpse_res=ok
-else
-  syslib_status=no kpse_res=failed
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
-$as_echo "$kpse_res" >&6; }
-fi
-
 ## libs/pixman/ac/pixman.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/
 ## basic check of system pixman
 if test "x$need_pixman:$with_system_pixman" = xyes:yes; then

Modified: branches/stable/source/src/doc/Makefile.in
===================================================================
--- branches/stable/source/src/doc/Makefile.in	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/doc/Makefile.in	2018-11-12 19:12:53 UTC (rev 807)
@@ -108,7 +108,6 @@
 	$(top_srcdir)/m4/kpse-pixman-flags.m4 \
 	$(top_srcdir)/m4/kpse-pkgs.m4 \
 	$(top_srcdir)/m4/kpse-poppler-flags.m4 \
-	$(top_srcdir)/m4/kpse-potrace-flags.m4 \
 	$(top_srcdir)/m4/kpse-ptexenc-flags.m4 \
 	$(top_srcdir)/m4/kpse-setup.m4 \
 	$(top_srcdir)/m4/kpse-teckit-flags.m4 \
@@ -148,6 +147,7 @@
 	$(top_srcdir)/texk/dvi2tty/ac/withenable.ac \
 	$(top_srcdir)/texk/dvidvi/ac/withenable.ac \
 	$(top_srcdir)/texk/dviljk/ac/withenable.ac \
+	$(top_srcdir)/texk/dviout-util/ac/withenable.ac \
 	$(top_srcdir)/texk/dvipdfm-x/ac/withenable.ac \
 	$(top_srcdir)/texk/dvipng/ac/withenable.ac \
 	$(top_srcdir)/texk/dvipng/ac/dvipng.ac \
@@ -184,7 +184,6 @@
 	$(top_srcdir)/libs/gmp/ac/withenable.ac \
 	$(top_srcdir)/libs/cairo/ac/withenable.ac \
 	$(top_srcdir)/libs/pixman/ac/withenable.ac \
-	$(top_srcdir)/libs/potrace/ac/withenable.ac \
 	$(top_srcdir)/libs/gd/ac/withenable.ac \
 	$(top_srcdir)/libs/freetype2/ac/withenable.ac \
 	$(top_srcdir)/libs/libpng/ac/withenable.ac \
@@ -203,7 +202,6 @@
 	$(top_srcdir)/libs/libpng/ac/libpng.ac \
 	$(top_srcdir)/libs/freetype2/ac/freetype2.ac \
 	$(top_srcdir)/libs/gd/ac/gd.ac \
-	$(top_srcdir)/libs/potrace/ac/potrace.ac \
 	$(top_srcdir)/libs/pixman/ac/pixman.ac \
 	$(top_srcdir)/libs/cairo/ac/cairo.ac \
 	$(top_srcdir)/libs/gmp/ac/gmp.ac \

Modified: branches/stable/source/src/doc/build-tools.txt
===================================================================
--- branches/stable/source/src/doc/build-tools.txt	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/doc/build-tools.txt	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,6 +1,6 @@
 autoconf (GNU Autoconf) 2.69
 automake (GNU automake) 1.16.1
-bison (GNU Bison) 3.0.5
+bison (GNU Bison) 3.2.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	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/doc/tlbuild.info	2018-11-12 19:12:53 UTC (rev 807)
@@ -59,7 +59,8 @@
 1 Introduction
 **************
 
-This manual (dated April 2018) corresponds to the TeX Live 2018 release.
+This manual (dated August 2018) corresponds to the TeX Live 2018
+release.
 
    This manual is aimed at system installers and programmers, and
 focuses on how to configure, build, and develop the TeX Live (TL)
@@ -337,7 +338,7 @@
 
      mkdir mydir && cd mydir  # new working directory
 
-     # Get sources (<http://tug.org/texlive/svn>)
+     # Get sources (<http://tug.org/texlive/svn>), e.g.:
      rsync -a --delete --exclude=.svn --exclude=Work \
            tug.org::tldevsrc/Build/source/ .
 
@@ -356,7 +357,8 @@
      make check
 
    Then you modify source files in 'mydir/texk/dvipdfm-x' and rerun
-'make' in 'mydir/Work/texk/dvipdfm-x' to rebuild.
+'make' in 'mydir/Work/texk/dvipdfm-x' to rebuild (that build directory
+is where the binaries end up).
 
    The second line of the 'configure' invocation shows examples of extra
 things you likely want to specify if you intend to hack the sources (and
@@ -375,14 +377,13 @@
 'configure' flags to individually disable using system versions of
 libraries, or the intricacies of the dependencies (such as 'teckit'
 requiring 'zlib') will have undesired side effects.  For an example, see
-the 'build-pdftex.sh' script in the 'pdftex' development source
-(<http://pdftex.org>), which is indeed a cut-down TL source tree.
+the 'build-pdftex.sh' script in the 'pdftex' development source (details
+at <http://pdftex.org>), which is indeed a cut-down TL source tree.
 
    Even with '--disable-all-pkgs', dependencies will be checked.  For
 instance, if a non-MacOSX system does not have 'fontconfig', XeTeX
 cannot be built (*note Prerequisites::) and 'configure' will terminate.
 To proceed without such dependencies, specify '--enable-missing' also.
-(Arguably this should happen automatically.)
 
    By default, the 'gcc' compilers will be used if present; otherwise,
 individual packages may use something different.  You can explicitly
@@ -517,7 +518,7 @@
 
    The main consideration is that 'make install' is not enough to make a
 usable TeX installation.  Beyond the compiled binaries, (thousands of)
-support files are needed; just as a first example 'plain.tex' is not in
+support files are needed; just as a first example, 'plain.tex' is not in
 the source tree.
 
    These support files are maintained completely independently and are
@@ -711,7 +712,7 @@
 
      autoconf (GNU Autoconf) 2.69
      automake (GNU automake) 1.16.1
-     bison (GNU Bison) 3.0.5
+     bison (GNU Bison) 3.2.1
      flex 2.6.0
      ltmain.sh (GNU libtool) 2.4.6
      m4 (GNU M4) 1.4.18
@@ -5045,7 +5046,7 @@
 * --enable-maintainer-mode:              Build system tools.   (line 28)
 * --enable-maintainer-mode <1>:          --enable-maintainer-mode.
                                                                (line  6)
-* --enable-missing to ignore dependencies: Build one package.  (line 67)
+* --enable-missing to ignore dependencies: Build one package.  (line 68)
 * --enable-mktextfm-default:             kpathsea library.     (line 20)
 * --enable-multiplatform:                --enable-multiplatform.
                                                                (line  6)
@@ -5261,6 +5262,7 @@
                                                                (line 24)
 * FT2_CONFIG:                            Variables for configure.
                                                                (line 21)
+* gcc, default compilers:                Build one package.    (line 73)
 * general setup macros:                  General setup macros. (line  6)
 * generic library module, adding:        Adding a new generic library module.
                                                                (line  6)
@@ -5451,7 +5453,7 @@
 * 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 10)
-* size of source tree:                   Build one package.    (line 57)
+* size of source tree:                   Build one package.    (line 58)
 * source code declarations:              Declarations and definitions.
                                                                (line  6)
 * source directory building, not supported: Building.          (line 17)
@@ -5539,368 +5541,368 @@
 Tag Table:
 Node: Top1208
 Node: Introduction2118
-Node: Overview of build system3838
-Node: Prerequisites5881
-Node: Building8279
-Node: Build iteration9584
-Node: Build problems10656
-Node: Build in parallel11059
-Node: Build distribution11651
-Node: Build one package12222
-Node: Cross compilation15600
-Node: Cross configuring16881
-Node: Cross problems18558
-Node: Installing20209
-Node: Installation directories21224
-Node: Linked scripts23040
-Node: Distro builds24521
-Node: Layout and infrastructure26911
-Node: Build system tools27739
-Node: Top-level directories29750
-Node: Autoconf macros32164
-Node: General setup macros32865
-Node: Macros for programs33732
-Node: Macros for compilers34544
-Node: Macros for libraries35978
-Node: Macros for library and header flags36404
-Node: Macros for Windows38284
-Node: Library modules39861
-Node: png library40350
-Node: zlib library42624
-Node: freetype library43139
-Node: kpathsea library43667
-Node: Program modules45066
-Node: t1utils package45494
-Node: xindy package46045
-Node: xdvik package47195
-Node: asymptote48268
-Node: Extending TeX Live48719
-Node: Adding a new program module49496
-Node: Adding a new generic library module52791
-Node: Adding a new TeX-specific library module55004
-Node: Configure options55691
-Node: Global configure options57074
-Node: --disable-native-texlive-build57616
-Node: --prefix --bindir ...58606
-Node: --disable-largefile59146
-Node: --disable-missing59831
-Node: --enable-compiler-warnings=LEVEL60232
-Node: --enable-cxx-runtime-hack60971
-Node: --enable-maintainer-mode61398
-Node: --enable-multiplatform61927
-Node: --enable-shared62465
-Node: --enable-silent-rules62836
-Node: --without-ln-s63292
-Node: --without-x63643
-Node: Program-specific configure options63831
-Node: --enable-PROG --disable-PROG64474
-Node: --disable-all-pkgs64751
-Node: Configure options for texk/web2c65737
-Node: Configure options for texk/bibtex-x68255
-Node: Configure options for texk/dvipdfm-x68798
-Node: Configure options for texk/dvisvgm69571
-Node: Configure options for texk/texlive70457
-Node: Configure options for texk/xdvik70878
-Node: Configure options for utils/xindy71482
-Node: Library-specific configure options72383
-Node: Configure options for kpathsea73394
-Node: Configure options for system poppler74103
-Node: Variables for configure74894
-Node: Coding conventions76322
-Node: Declarations and definitions77061
-Node: Const79243
-Node: Continuous integration81106
-Node: Transfer from Subversion to Github81760
-Node: Automatic update of the Git mirror83942
-Node: CI testing on Travis-CI84530
-Node: install-tl85210
-Node: install-tl NAME85579
-Node: install-tl SYNOPSIS85737
-Node: install-tl DESCRIPTION85995
-Node: install-tl REFERENCES87062
-Node: install-tl OPTIONS87588
-Ref: install-tl *-gui* [[=]_module_]87929
-Ref: install-tl text88139
-Ref: install-tl wizard88262
-Ref: install-tl perltk88416
-Ref: install-tl *-no-gui*88847
-Ref: install-tl *-lang* _llcode_88928
-Ref: install-tl *-repository* _url|path_89615
-Ref: install-tl *-select-repository*91495
-Ref: install-tl *-all-options*91931
-Ref: install-tl *-custom-bin* _path_92186
-Ref: install-tl *-debug-translation*93017
-Ref: install-tl *-force-platform* _platform_93236
-Ref: install-tl *-help*, *--help*, *-?*93480
-Ref: install-tl *-in-place*93887
-Ref: install-tl *-init-from-profile* _profile_file_94432
-Ref: install-tl *-logfile* _file_94652
-Ref: install-tl *-no-cls*95003
-Ref: install-tl *-non-admin*95137
-Ref: install-tl *-persistent-downloads*95242
-Ref: install-tl *-no-persistent-downloads*95270
-Ref: install-tl *-no-verify-downloads*95888
-Ref: install-tl *-portable*96249
-Ref: install-tl *-print-platform*96388
-Ref: install-tl *-profile* _profile_file_96586
-Ref: install-tl *-q*96766
-Ref: install-tl *-scheme* _scheme_96828
-Ref: install-tl *-v*97302
-Ref: install-tl *-version*, *--version*97457
-Node: install-tl PROFILES97588
-Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)100238
-Ref: install-tl instopt_adjustrepo (default 1)100314
-Ref: install-tl instopt_letter (default 0)100451
-Ref: install-tl instopt_portable (default 0)100542
-Ref: install-tl instopt_write18_restricted (default 1)100638
-Node: install-tl ENVIRONMENT VARIABLES101957
-Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK102348
-Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE102550
-Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME102660
-Ref: install-tl TEXLIVE_INSTALL_PREFIX102781
-Ref: install-tl TEXLIVE_INSTALL_TEXDIR102807
-Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG102838
-Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR102866
-Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME102895
-Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL102925
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG102959
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR102990
-Ref: install-tl NOPERLDOC103361
-Node: install-tl AUTHORS AND COPYRIGHT103425
-Node: tlmgr103841
-Node: tlmgr NAME104294
-Node: tlmgr SYNOPSIS104426
-Node: tlmgr DESCRIPTION104616
-Node: tlmgr EXAMPLES105712
-Ref: tlmgr tlmgr option repository ctan105963
-Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet106035
-Ref: tlmgr tlmgr update --list106487
-Ref: tlmgr tlmgr update --all106580
-Ref: tlmgr tlmgr info _what_106737
-Node: tlmgr OPTIONS106999
-Ref: tlmgr *--repository* _url|path_107519
-Ref: tlmgr *--gui* [_action_]108244
-Ref: tlmgr *--gui-lang* _llcode_108651
-Ref: tlmgr *--debug-translation*109334
-Ref: tlmgr *--machine-readable*109537
-Ref: tlmgr *--no-execute-actions*109805
-Ref: tlmgr *--package-logfile* _file_109998
-Ref: tlmgr *--pause*110252
-Ref: tlmgr *--persistent-downloads*110407
-Ref: tlmgr *--no-persistent-downloads*110435
-Ref: tlmgr *--pin-file*110929
-Ref: tlmgr *--usermode*111147
-Ref: tlmgr *--usertree* _dir_111267
-Ref: tlmgr *--verify-repo=[none|main|all]*111393
-Node: tlmgr ACTIONS112292
-Node: tlmgr help113144
-Node: tlmgr version113620
-Node: tlmgr backup113883
-Ref: tlmgr *backup [_option_...] --all*114054
-Ref: tlmgr *backup [_option_...] _pkg_...*114087
-Ref: tlmgr *--backupdir* _directory_114942
-Ref: tlmgr *--all*115159
-Ref: tlmgr *--clean*[=_N_]115411
-Ref: tlmgr *--dry-run*115738
-Node: tlmgr candidates _pkg_115868
-Node: tlmgr check [_option_...] [files|depends|executes|runfiles|all]116214
-Ref: tlmgr *files*116587
-Ref: tlmgr *depends*116722
-Ref: tlmgr *executes*117064
-Ref: tlmgr *runfiles*117182
-Ref: tlmgr *--use-svn*117303
-Node: tlmgr conf117420
-Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*117699
-Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|delete] [_value_]*117763
-Node: tlmgr dump-tlpdb [_option_...] [--json]120108
-Ref: tlmgr *--local*120541
-Ref: tlmgr *--remote*120580
-Ref: tlmgr *--json*120618
-Node: tlmgr generate121189
-Ref: tlmgr *generate [_option_...] language*121385
-Ref: tlmgr *generate [_option_...] language.dat*121424
-Ref: tlmgr *generate [_option_...] language.def*121463
-Ref: tlmgr *generate [_option_...] language.dat.lua*121506
-Ref: tlmgr *--dest* _output_file_123832
-Ref: tlmgr *--localcfg* _local_conf_file_124408
-Ref: tlmgr *--rebuild-sys*124531
-Node: tlmgr gui125346
-Node: tlmgr info125524
-Ref: tlmgr *info [_option_...] _pkg_...*125686
-Ref: tlmgr *info [_option_...] collections*125720
-Ref: tlmgr *info [_option_...] schemes*125750
-Ref: tlmgr *--list*127280
-Ref: tlmgr *--only-installed*127594
-Ref: tlmgr *--data item1,item2,...*127793
-Ref: tlmgr *--json* 1128374
-Node: tlmgr init-usertree128757
-Node: tlmgr install [_option_...] _pkg_...129138
-Ref: tlmgr *--dry-run* 1129648
-Ref: tlmgr *--file*129765
-Ref: tlmgr *--force*129987
-Ref: tlmgr *--no-depends*130207
-Ref: tlmgr *--no-depends-at-all*130366
-Ref: tlmgr *--reinstall*130766
-Ref: tlmgr *--with-doc*131144
-Ref: tlmgr *--with-src*131157
-Node: tlmgr key131679
-Ref: tlmgr *key list*131837
-Ref: tlmgr *key add _file_*131855
-Ref: tlmgr *key remove _keyid_*131877
-Node: tlmgr list132472
-Node: tlmgr option132634
-Ref: tlmgr *option [--json] [show]*132789
-Ref: tlmgr *option [--json] showall*132815
-Ref: tlmgr *option _key_ [_value_]*132841
-Node: tlmgr paper137238
-Ref: tlmgr *paper [a4|letter]*137387
-Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*137461
-Ref: tlmgr *paper --json*137476
-Node: tlmgr path138691
-Ref: tlmgr *path [--w32mode=user|admin] add*138852
-Ref: tlmgr *path [--w32mode=user|admin] remove*138889
-Node: tlmgr pinning140229
-Ref: tlmgr pinning show140470
-Ref: tlmgr pinning add _repo_ _pkgglob_...140543
-Ref: tlmgr pinning remove _repo_ _pkgglob_...140662
-Ref: tlmgr pinning remove _repo_ --all140815
-Node: tlmgr platform140869
-Ref: tlmgr *platform list|add|remove _platform_...*141055
-Ref: tlmgr *platform set _platform_*141082
-Ref: tlmgr *platform set auto*141103
-Ref: tlmgr *--dry-run* 2141989
-Node: tlmgr postaction142108
-Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*142338
-Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*142412
-Ref: tlmgr *--w32mode=[user|admin]*142727
-Ref: tlmgr *--fileassocmode=[1|2]*143143
-Ref: tlmgr *--all* 1143428
-Node: tlmgr print-platform143483
-Node: tlmgr print-platform-info143814
-Node: tlmgr remove [_option_...] _pkg_...144114
-Ref: tlmgr *--all* 2144598
-Ref: tlmgr *--backup*144708
-Ref: tlmgr *--backupdir* _directory_ 1144734
-Ref: tlmgr *--no-depends* 1145139
-Ref: tlmgr *--no-depends-at-all* 1145201
-Ref: tlmgr *--force* 1145304
-Ref: tlmgr *--dry-run* 3145777
-Node: tlmgr repository145884
-Ref: tlmgr *repository list*146072
-Ref: tlmgr *repository list _path|tag_*146102
-Ref: tlmgr *repository add _path_ [_tag_]*146135
-Ref: tlmgr *repository remove _path|tag_*146167
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*146221
-Node: tlmgr restore147274
-Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*147453
-Ref: tlmgr *restore [_option_...] --all*147483
-Ref: tlmgr *--all* 3148183
-Ref: tlmgr *--backupdir* _directory_ 2148397
-Ref: tlmgr *--dry-run* 4148578
-Ref: tlmgr *--force* 2148710
-Ref: tlmgr *--json* 2148756
-Node: tlmgr search149083
-Ref: tlmgr *search [_option_...] _what_*149247
-Ref: tlmgr *search [_option_...] --file _what_*149284
-Ref: tlmgr *search [_option_...] --all _what_*149320
-Ref: tlmgr *--file* 1149540
-Ref: tlmgr *--all* 4149602
-Ref: tlmgr *--global*149691
-Ref: tlmgr *--word*149818
-Node: tlmgr shell150133
-Ref: tlmgr protocol150868
-Ref: tlmgr help 1150932
-Ref: tlmgr version 1150985
-Ref: tlmgr quit, end, bye, byebye, EOF151053
-Ref: tlmgr restart151074
-Ref: tlmgr load [local|remote]151197
-Ref: tlmgr save151267
-Ref: tlmgr get [_var_] =item set [_var_ [_val_]]151390
-Node: tlmgr show151991
-Node: tlmgr uninstall152158
-Node: tlmgr update [_option_...] [_pkg_...]152388
-Ref: tlmgr *--all* 5152759
-Ref: tlmgr *--self*154500
-Ref: tlmgr *--dry-run* 5155264
-Ref: tlmgr *--list* [_pkg_]155441
-Ref: tlmgr *--exclude* _pkg_156130
-Ref: tlmgr *--no-auto-remove* [_pkg_...]156930
-Ref: tlmgr *--no-auto-install* [_pkg_...]157381
-Ref: tlmgr *--reinstall-forcibly-removed*158037
-Ref: tlmgr *--backup* 1158572
-Ref: tlmgr *--backupdir* _directory_ 3158598
-Ref: tlmgr *--no-depends* 2159764
-Ref: tlmgr *--no-depends-at-all* 2159967
-Ref: tlmgr *--force* 3160070
-Node: tlmgr CONFIGURATION FILE FOR TLMGR160885
-Ref: tlmgr auto-remove, value 0 or 1 (default 1), same as command-line option.161898
-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.162035
-Ref: tlmgr gui-lang _llcode_, with a language code value as with the command-line option.162117
-Ref: tlmgr no-checksums, value 0 or 1 (default 0, see below).162171
-Ref: tlmgr persistent-downloads, value 0 or 1 (default 1), same as command-line option.162251
-Ref: tlmgr require-verification, value 0 or 1 (default 0), same as command-line option.162331
-Ref: tlmgr update-exclude, value: comma-separated list of packages (no space allowed). Same as the command line option --exclude for the action update.162479
-Ref: tlmgr verify-downloads, value 0 or 1 (default 1), same as command-line option.162555
-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).162824
-Node: tlmgr CRYPTOGRAPHIC VERIFICATION163910
-Node: tlmgr Configuration of GnuPG invocation166059
-Node: tlmgr USER MODE166697
-Node: tlmgr User mode install169543
-Node: tlmgr User mode backup, restore, remove, update170687
-Node: tlmgr User mode generate, option, paper171129
-Node: tlmgr MULTIPLE REPOSITORIES171505
-Node: tlmgr Pinning173234
-Node: tlmgr GUI FOR TLMGR175209
-Node: tlmgr Main display176549
-Node: tlmgr Display configuration area176801
-Ref: tlmgr Status177162
-Ref: tlmgr Category177326
-Ref: tlmgr Match177512
-Ref: tlmgr Selection177693
-Ref: tlmgr Display configuration buttons177897
-Node: tlmgr Package list area178080
-Ref: tlmgr a checkbox178664
-Ref: tlmgr package name178800
-Ref: tlmgr local revision (and version)178899
-Ref: tlmgr remote revision (and version)179274
-Ref: tlmgr short description179571
-Node: tlmgr Main display action buttons179616
-Ref: tlmgr Update all installed179882
-Ref: tlmgr Update180254
-Ref: tlmgr Install180304
-Ref: tlmgr Remove180490
-Ref: tlmgr Backup180668
-Node: tlmgr Menu bar180825
-Ref: tlmgr tlmgr menu181048
-Ref: tlmgr Options menu181356
-Ref: tlmgr Actions menu182439
-Ref: tlmgr Help menu182867
-Node: tlmgr GUI options183000
-Ref: tlmgr -background _color_183246
-Ref: tlmgr -font " _fontname_ _fontsize_ "183311
-Ref: tlmgr -foreground _color_183469
-Ref: tlmgr -geometry _geomspec_183521
-Ref: tlmgr -xrm _xresource_183713
-Node: tlmgr MACHINE-READABLE OUTPUT183981
-Node: tlmgr Machine-readable update and install output184791
-Ref: tlmgr location-url _location_186067
-Ref: tlmgr total-bytes _count_186283
-Ref: tlmgr _pkgname_186693
-Ref: tlmgr _status_186903
-Ref: tlmgr d186981
-Ref: tlmgr f187041
-Ref: tlmgr u187220
-Ref: tlmgr r187266
-Ref: tlmgr a187389
-Ref: tlmgr i187567
-Ref: tlmgr I187686
-Ref: tlmgr _localrev_187788
-Ref: tlmgr _serverrev_187895
-Ref: tlmgr _size_188007
-Ref: tlmgr _runtime_188176
-Ref: tlmgr _esttot_188246
-Node: tlmgr Machine-readable option output188279
-Node: tlmgr AUTHORS AND COPYRIGHT188791
-Node: Index189190
+Node: Overview of build system3839
+Node: Prerequisites5882
+Node: Building8280
+Node: Build iteration9585
+Node: Build problems10657
+Node: Build in parallel11060
+Node: Build distribution11652
+Node: Build one package12223
+Node: Cross compilation15626
+Node: Cross configuring16907
+Node: Cross problems18584
+Node: Installing20235
+Node: Installation directories21251
+Node: Linked scripts23067
+Node: Distro builds24548
+Node: Layout and infrastructure26938
+Node: Build system tools27766
+Node: Top-level directories29777
+Node: Autoconf macros32191
+Node: General setup macros32892
+Node: Macros for programs33759
+Node: Macros for compilers34571
+Node: Macros for libraries36005
+Node: Macros for library and header flags36431
+Node: Macros for Windows38311
+Node: Library modules39888
+Node: png library40377
+Node: zlib library42651
+Node: freetype library43166
+Node: kpathsea library43694
+Node: Program modules45093
+Node: t1utils package45521
+Node: xindy package46072
+Node: xdvik package47222
+Node: asymptote48295
+Node: Extending TeX Live48746
+Node: Adding a new program module49523
+Node: Adding a new generic library module52818
+Node: Adding a new TeX-specific library module55031
+Node: Configure options55718
+Node: Global configure options57101
+Node: --disable-native-texlive-build57643
+Node: --prefix --bindir ...58633
+Node: --disable-largefile59173
+Node: --disable-missing59858
+Node: --enable-compiler-warnings=LEVEL60259
+Node: --enable-cxx-runtime-hack60998
+Node: --enable-maintainer-mode61425
+Node: --enable-multiplatform61954
+Node: --enable-shared62492
+Node: --enable-silent-rules62863
+Node: --without-ln-s63319
+Node: --without-x63670
+Node: Program-specific configure options63858
+Node: --enable-PROG --disable-PROG64501
+Node: --disable-all-pkgs64778
+Node: Configure options for texk/web2c65764
+Node: Configure options for texk/bibtex-x68282
+Node: Configure options for texk/dvipdfm-x68825
+Node: Configure options for texk/dvisvgm69598
+Node: Configure options for texk/texlive70484
+Node: Configure options for texk/xdvik70905
+Node: Configure options for utils/xindy71509
+Node: Library-specific configure options72410
+Node: Configure options for kpathsea73421
+Node: Configure options for system poppler74130
+Node: Variables for configure74921
+Node: Coding conventions76349
+Node: Declarations and definitions77088
+Node: Const79270
+Node: Continuous integration81133
+Node: Transfer from Subversion to Github81787
+Node: Automatic update of the Git mirror83969
+Node: CI testing on Travis-CI84557
+Node: install-tl85237
+Node: install-tl NAME85606
+Node: install-tl SYNOPSIS85764
+Node: install-tl DESCRIPTION86022
+Node: install-tl REFERENCES87089
+Node: install-tl OPTIONS87615
+Ref: install-tl *-gui* [[=]_module_]87956
+Ref: install-tl text88166
+Ref: install-tl wizard88289
+Ref: install-tl perltk88443
+Ref: install-tl *-no-gui*88874
+Ref: install-tl *-lang* _llcode_88955
+Ref: install-tl *-repository* _url|path_89642
+Ref: install-tl *-select-repository*91522
+Ref: install-tl *-all-options*91958
+Ref: install-tl *-custom-bin* _path_92213
+Ref: install-tl *-debug-translation*93044
+Ref: install-tl *-force-platform* _platform_93263
+Ref: install-tl *-help*, *--help*, *-?*93507
+Ref: install-tl *-in-place*93914
+Ref: install-tl *-init-from-profile* _profile_file_94459
+Ref: install-tl *-logfile* _file_94679
+Ref: install-tl *-no-cls*95030
+Ref: install-tl *-non-admin*95164
+Ref: install-tl *-persistent-downloads*95269
+Ref: install-tl *-no-persistent-downloads*95297
+Ref: install-tl *-no-verify-downloads*95915
+Ref: install-tl *-portable*96276
+Ref: install-tl *-print-platform*96415
+Ref: install-tl *-profile* _profile_file_96613
+Ref: install-tl *-q*96793
+Ref: install-tl *-scheme* _scheme_96855
+Ref: install-tl *-v*97329
+Ref: install-tl *-version*, *--version*97484
+Node: install-tl PROFILES97615
+Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)100265
+Ref: install-tl instopt_adjustrepo (default 1)100341
+Ref: install-tl instopt_letter (default 0)100478
+Ref: install-tl instopt_portable (default 0)100569
+Ref: install-tl instopt_write18_restricted (default 1)100665
+Node: install-tl ENVIRONMENT VARIABLES101984
+Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK102375
+Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE102577
+Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME102687
+Ref: install-tl TEXLIVE_INSTALL_PREFIX102808
+Ref: install-tl TEXLIVE_INSTALL_TEXDIR102834
+Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG102865
+Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR102893
+Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME102922
+Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL102952
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG102986
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR103017
+Ref: install-tl NOPERLDOC103388
+Node: install-tl AUTHORS AND COPYRIGHT103452
+Node: tlmgr103868
+Node: tlmgr NAME104321
+Node: tlmgr SYNOPSIS104453
+Node: tlmgr DESCRIPTION104643
+Node: tlmgr EXAMPLES105739
+Ref: tlmgr tlmgr option repository ctan105990
+Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet106062
+Ref: tlmgr tlmgr update --list106514
+Ref: tlmgr tlmgr update --all106607
+Ref: tlmgr tlmgr info _what_106764
+Node: tlmgr OPTIONS107026
+Ref: tlmgr *--repository* _url|path_107546
+Ref: tlmgr *--gui* [_action_]108271
+Ref: tlmgr *--gui-lang* _llcode_108678
+Ref: tlmgr *--debug-translation*109361
+Ref: tlmgr *--machine-readable*109564
+Ref: tlmgr *--no-execute-actions*109832
+Ref: tlmgr *--package-logfile* _file_110025
+Ref: tlmgr *--pause*110279
+Ref: tlmgr *--persistent-downloads*110434
+Ref: tlmgr *--no-persistent-downloads*110462
+Ref: tlmgr *--pin-file*110956
+Ref: tlmgr *--usermode*111174
+Ref: tlmgr *--usertree* _dir_111294
+Ref: tlmgr *--verify-repo=[none|main|all]*111420
+Node: tlmgr ACTIONS112319
+Node: tlmgr help113171
+Node: tlmgr version113647
+Node: tlmgr backup113910
+Ref: tlmgr *backup [_option_...] --all*114081
+Ref: tlmgr *backup [_option_...] _pkg_...*114114
+Ref: tlmgr *--backupdir* _directory_114969
+Ref: tlmgr *--all*115186
+Ref: tlmgr *--clean*[=_N_]115438
+Ref: tlmgr *--dry-run*115765
+Node: tlmgr candidates _pkg_115895
+Node: tlmgr check [_option_...] [files|depends|executes|runfiles|all]116241
+Ref: tlmgr *files*116614
+Ref: tlmgr *depends*116749
+Ref: tlmgr *executes*117091
+Ref: tlmgr *runfiles*117209
+Ref: tlmgr *--use-svn*117330
+Node: tlmgr conf117447
+Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*117726
+Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|delete] [_value_]*117790
+Node: tlmgr dump-tlpdb [_option_...] [--json]120135
+Ref: tlmgr *--local*120568
+Ref: tlmgr *--remote*120607
+Ref: tlmgr *--json*120645
+Node: tlmgr generate121216
+Ref: tlmgr *generate [_option_...] language*121412
+Ref: tlmgr *generate [_option_...] language.dat*121451
+Ref: tlmgr *generate [_option_...] language.def*121490
+Ref: tlmgr *generate [_option_...] language.dat.lua*121533
+Ref: tlmgr *--dest* _output_file_123859
+Ref: tlmgr *--localcfg* _local_conf_file_124435
+Ref: tlmgr *--rebuild-sys*124558
+Node: tlmgr gui125373
+Node: tlmgr info125551
+Ref: tlmgr *info [_option_...] _pkg_...*125713
+Ref: tlmgr *info [_option_...] collections*125747
+Ref: tlmgr *info [_option_...] schemes*125777
+Ref: tlmgr *--list*127307
+Ref: tlmgr *--only-installed*127621
+Ref: tlmgr *--data item1,item2,...*127820
+Ref: tlmgr *--json* 1128401
+Node: tlmgr init-usertree128784
+Node: tlmgr install [_option_...] _pkg_...129165
+Ref: tlmgr *--dry-run* 1129675
+Ref: tlmgr *--file*129792
+Ref: tlmgr *--force*130014
+Ref: tlmgr *--no-depends*130234
+Ref: tlmgr *--no-depends-at-all*130393
+Ref: tlmgr *--reinstall*130793
+Ref: tlmgr *--with-doc*131171
+Ref: tlmgr *--with-src*131184
+Node: tlmgr key131706
+Ref: tlmgr *key list*131864
+Ref: tlmgr *key add _file_*131882
+Ref: tlmgr *key remove _keyid_*131904
+Node: tlmgr list132499
+Node: tlmgr option132661
+Ref: tlmgr *option [--json] [show]*132816
+Ref: tlmgr *option [--json] showall*132842
+Ref: tlmgr *option _key_ [_value_]*132868
+Node: tlmgr paper137265
+Ref: tlmgr *paper [a4|letter]*137414
+Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*137488
+Ref: tlmgr *paper --json*137503
+Node: tlmgr path138718
+Ref: tlmgr *path [--w32mode=user|admin] add*138879
+Ref: tlmgr *path [--w32mode=user|admin] remove*138916
+Node: tlmgr pinning140256
+Ref: tlmgr pinning show140497
+Ref: tlmgr pinning add _repo_ _pkgglob_...140570
+Ref: tlmgr pinning remove _repo_ _pkgglob_...140689
+Ref: tlmgr pinning remove _repo_ --all140842
+Node: tlmgr platform140896
+Ref: tlmgr *platform list|add|remove _platform_...*141082
+Ref: tlmgr *platform set _platform_*141109
+Ref: tlmgr *platform set auto*141130
+Ref: tlmgr *--dry-run* 2142016
+Node: tlmgr postaction142135
+Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*142365
+Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*142439
+Ref: tlmgr *--w32mode=[user|admin]*142754
+Ref: tlmgr *--fileassocmode=[1|2]*143170
+Ref: tlmgr *--all* 1143455
+Node: tlmgr print-platform143510
+Node: tlmgr print-platform-info143841
+Node: tlmgr remove [_option_...] _pkg_...144141
+Ref: tlmgr *--all* 2144625
+Ref: tlmgr *--backup*144735
+Ref: tlmgr *--backupdir* _directory_ 1144761
+Ref: tlmgr *--no-depends* 1145166
+Ref: tlmgr *--no-depends-at-all* 1145228
+Ref: tlmgr *--force* 1145331
+Ref: tlmgr *--dry-run* 3145804
+Node: tlmgr repository145911
+Ref: tlmgr *repository list*146099
+Ref: tlmgr *repository list _path|tag_*146129
+Ref: tlmgr *repository add _path_ [_tag_]*146162
+Ref: tlmgr *repository remove _path|tag_*146194
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*146248
+Node: tlmgr restore147301
+Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*147480
+Ref: tlmgr *restore [_option_...] --all*147510
+Ref: tlmgr *--all* 3148210
+Ref: tlmgr *--backupdir* _directory_ 2148424
+Ref: tlmgr *--dry-run* 4148605
+Ref: tlmgr *--force* 2148737
+Ref: tlmgr *--json* 2148783
+Node: tlmgr search149110
+Ref: tlmgr *search [_option_...] _what_*149274
+Ref: tlmgr *search [_option_...] --file _what_*149311
+Ref: tlmgr *search [_option_...] --all _what_*149347
+Ref: tlmgr *--file* 1149567
+Ref: tlmgr *--all* 4149629
+Ref: tlmgr *--global*149718
+Ref: tlmgr *--word*149845
+Node: tlmgr shell150160
+Ref: tlmgr protocol150895
+Ref: tlmgr help 1150959
+Ref: tlmgr version 1151012
+Ref: tlmgr quit, end, bye, byebye, EOF151080
+Ref: tlmgr restart151101
+Ref: tlmgr load [local|remote]151224
+Ref: tlmgr save151294
+Ref: tlmgr get [_var_] =item set [_var_ [_val_]]151417
+Node: tlmgr show152018
+Node: tlmgr uninstall152185
+Node: tlmgr update [_option_...] [_pkg_...]152415
+Ref: tlmgr *--all* 5152786
+Ref: tlmgr *--self*154527
+Ref: tlmgr *--dry-run* 5155291
+Ref: tlmgr *--list* [_pkg_]155468
+Ref: tlmgr *--exclude* _pkg_156157
+Ref: tlmgr *--no-auto-remove* [_pkg_...]156957
+Ref: tlmgr *--no-auto-install* [_pkg_...]157408
+Ref: tlmgr *--reinstall-forcibly-removed*158064
+Ref: tlmgr *--backup* 1158599
+Ref: tlmgr *--backupdir* _directory_ 3158625
+Ref: tlmgr *--no-depends* 2159791
+Ref: tlmgr *--no-depends-at-all* 2159994
+Ref: tlmgr *--force* 3160097
+Node: tlmgr CONFIGURATION FILE FOR TLMGR160912
+Ref: tlmgr auto-remove, value 0 or 1 (default 1), same as command-line option.161925
+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.162062
+Ref: tlmgr gui-lang _llcode_, with a language code value as with the command-line option.162144
+Ref: tlmgr no-checksums, value 0 or 1 (default 0, see below).162198
+Ref: tlmgr persistent-downloads, value 0 or 1 (default 1), same as command-line option.162278
+Ref: tlmgr require-verification, value 0 or 1 (default 0), same as command-line option.162358
+Ref: tlmgr update-exclude, value: comma-separated list of packages (no space allowed). Same as the command line option --exclude for the action update.162506
+Ref: tlmgr verify-downloads, value 0 or 1 (default 1), same as command-line option.162582
+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).162851
+Node: tlmgr CRYPTOGRAPHIC VERIFICATION163937
+Node: tlmgr Configuration of GnuPG invocation166086
+Node: tlmgr USER MODE166724
+Node: tlmgr User mode install169570
+Node: tlmgr User mode backup, restore, remove, update170714
+Node: tlmgr User mode generate, option, paper171156
+Node: tlmgr MULTIPLE REPOSITORIES171532
+Node: tlmgr Pinning173261
+Node: tlmgr GUI FOR TLMGR175236
+Node: tlmgr Main display176576
+Node: tlmgr Display configuration area176828
+Ref: tlmgr Status177189
+Ref: tlmgr Category177353
+Ref: tlmgr Match177539
+Ref: tlmgr Selection177720
+Ref: tlmgr Display configuration buttons177924
+Node: tlmgr Package list area178107
+Ref: tlmgr a checkbox178691
+Ref: tlmgr package name178827
+Ref: tlmgr local revision (and version)178926
+Ref: tlmgr remote revision (and version)179301
+Ref: tlmgr short description179598
+Node: tlmgr Main display action buttons179643
+Ref: tlmgr Update all installed179909
+Ref: tlmgr Update180281
+Ref: tlmgr Install180331
+Ref: tlmgr Remove180517
+Ref: tlmgr Backup180695
+Node: tlmgr Menu bar180852
+Ref: tlmgr tlmgr menu181075
+Ref: tlmgr Options menu181383
+Ref: tlmgr Actions menu182466
+Ref: tlmgr Help menu182894
+Node: tlmgr GUI options183027
+Ref: tlmgr -background _color_183273
+Ref: tlmgr -font " _fontname_ _fontsize_ "183338
+Ref: tlmgr -foreground _color_183496
+Ref: tlmgr -geometry _geomspec_183548
+Ref: tlmgr -xrm _xresource_183740
+Node: tlmgr MACHINE-READABLE OUTPUT184008
+Node: tlmgr Machine-readable update and install output184818
+Ref: tlmgr location-url _location_186094
+Ref: tlmgr total-bytes _count_186310
+Ref: tlmgr _pkgname_186720
+Ref: tlmgr _status_186930
+Ref: tlmgr d187008
+Ref: tlmgr f187068
+Ref: tlmgr u187247
+Ref: tlmgr r187293
+Ref: tlmgr a187416
+Ref: tlmgr i187594
+Ref: tlmgr I187713
+Ref: tlmgr _localrev_187815
+Ref: tlmgr _serverrev_187922
+Ref: tlmgr _size_188034
+Ref: tlmgr _runtime_188203
+Ref: tlmgr _esttot_188273
+Node: tlmgr Machine-readable option output188306
+Node: tlmgr AUTHORS AND COPYRIGHT188818
+Node: Index189217
 
 End Tag Table

Modified: branches/stable/source/src/doc/tlbuild.texi
===================================================================
--- branches/stable/source/src/doc/tlbuild.texi	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/doc/tlbuild.texi	2018-11-12 19:12:53 UTC (rev 807)
@@ -2,7 +2,7 @@
 @setfilename tlbuild.info
 
 @set version 2018
- at set month-year April 2018
+ at set month-year August 2018
 
 @set mytitle Building @TeX{} Live (@value{version})
 @settitle @value{mytitle}
@@ -454,7 +454,7 @@
 @example
 mkdir mydir && cd mydir  # new working directory
 
-# Get sources (@url{http://tug.org/texlive/svn})
+# Get sources (@url{http://tug.org/texlive/svn}), e.g.:
 rsync -a --delete --exclude=.svn --exclude=Work \
       tug.org::tldevsrc/Build/source/ .
 
@@ -504,12 +504,12 @@
 For instance, if a non-MacOSX system does not have @code{fontconfig},
 Xe at TeX{} cannot be built (@pxref{Prerequisites}) and @code{configure}
 will terminate.  To proceed without such dependencies, specify
- at code{--enable-missing} also.  (Arguably this should happen
-automatically.)
+ at code{--enable-missing} also.
 
 @vindex CC=@var{c-compiler}
 @vindex CXX=@var{c++-compiler}
 @vindex OBJCXX=@var{objc-compiler}
+ at pindex gcc at r{, default compilers}
 By default, the @code{gcc} compilers will be used if present;
 otherwise, individual packages may use something different.  You can
 explicitly specify the compilers to be used with the environment

Modified: branches/stable/source/src/libs/ChangeLog
===================================================================
--- branches/stable/source/src/libs/ChangeLog	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/ChangeLog	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,3 +1,7 @@
+2018-08-30  Karl Berry  <karl at freefriends.org>
+
+	* potrace: remove, now bundled with dvisvgm (its only user).
+
 2015-02-16  Peter Breitenlohner  <peb at mppmu.mpg.de>
 
 	* Makefile.am: Use the fragment ../am/dist_hook.am.

Modified: branches/stable/source/src/libs/Makefile.in
===================================================================
--- branches/stable/source/src/libs/Makefile.in	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/Makefile.in	2018-11-12 19:12:53 UTC (rev 807)
@@ -108,7 +108,6 @@
 	$(top_srcdir)/../m4/kpse-pixman-flags.m4 \
 	$(top_srcdir)/../m4/kpse-pkgs.m4 \
 	$(top_srcdir)/../m4/kpse-poppler-flags.m4 \
-	$(top_srcdir)/../m4/kpse-potrace-flags.m4 \
 	$(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
 	$(top_srcdir)/../m4/kpse-setup.m4 \
 	$(top_srcdir)/../m4/kpse-teckit-flags.m4 \
@@ -146,6 +145,7 @@
 	$(top_srcdir)/../texk/dvi2tty/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvidvi/ac/withenable.ac \
 	$(top_srcdir)/../texk/dviljk/ac/withenable.ac \
+	$(top_srcdir)/../texk/dviout-util/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvipdfm-x/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvipng/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvipng/ac/dvipng.ac \
@@ -182,7 +182,6 @@
 	$(top_srcdir)/../libs/gmp/ac/withenable.ac \
 	$(top_srcdir)/../libs/cairo/ac/withenable.ac \
 	$(top_srcdir)/../libs/pixman/ac/withenable.ac \
-	$(top_srcdir)/../libs/potrace/ac/withenable.ac \
 	$(top_srcdir)/../libs/gd/ac/withenable.ac \
 	$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
 	$(top_srcdir)/../libs/libpng/ac/withenable.ac \

Modified: branches/stable/source/src/libs/README
===================================================================
--- branches/stable/source/src/libs/README	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/README	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,4 +1,4 @@
-$Id: README 48132 2018-07-04 07:14:37Z kakuto $
+$Id: README 49090 2018-11-06 07:32:02Z kakuto $
 Public domain.  Originally created by Karl Berry, 2005.
 
 Libraries we compile for TeX Live.
@@ -9,7 +9,7 @@
 
 See also comments in ../texk/README.
 
-cairo 1.14.12 - checked 07dec17
+cairo 1.16.0 - checked 20oct18
   http://cairographics.org/releases/
 
 freetype2 2.9.1 - checked 04may18
@@ -21,10 +21,11 @@
 gmp 6.1.2 - checked 16dec16
   http://ftp.gnu.org/gnu/gmp/
 
-graphite2 1.3.11 - checked 05mar18
+graphite2 1.3.12 - checked 16aug18
   http://sourceforge.net/projects/silgraphite/files/graphite2/
+  (requires C++11)
 
-harfbuzz 1.8.2 - checked 05jul18
+harfbuzz 2.1.1 - checked 06nov18
   http://www.freedesktop.org/software/harfbuzz/release/
 
 icu 61.1 - checked 29mar18
@@ -33,9 +34,8 @@
 libpaper 1.1.24+nmu2 - checked 24oct13
   ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/
 
-libpng 1.6.34 - checked 29Sep17
-  http://www.libpng.org/ - used by many
-  http://www.libpng.org/pub/png/pngcode.html
+libpng 1.6.35 - checked 17jul18
+  https://sourceforge.net/projects/libpng/files/ - used by many
 
 lua 5.2.3 - checked 11mar15
   http://www.lua.org/ftp/
@@ -49,7 +49,7 @@
 pixman 0.34.0 - checked 04feb16
   http://cairographics.org/releases/
 
-poppler 0.66.0 - checked 20jun18
+poppler 0.68.0 - checked 20aug18
   http://poppler.freedesktop.org/ - used by luatex and xetex
   (requires C++11)
 
@@ -56,8 +56,8 @@
 potrace 1.15 - checked 07aug17
   http://potrace.sourceforge.net
 
-teckit 2.5.7 - checked 27jun17
-  https://github.com/silnrsi/teckit/archive/2.5.7.tar.gz
+teckit 2.5.8 - checked 24jul18
+  https://github.com/silnrsi/teckit/archive/2.5.8.tar.gz
 
 xpdf 4.00 - checked 13aug17
   http://www.xpdfreader.com/download.html

Modified: branches/stable/source/src/libs/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/aclocal.m4	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/aclocal.m4	2018-11-12 19:12:53 UTC (rev 807)
@@ -1188,7 +1188,6 @@
 m4_include([../m4/kpse-pixman-flags.m4])
 m4_include([../m4/kpse-pkgs.m4])
 m4_include([../m4/kpse-poppler-flags.m4])
-m4_include([../m4/kpse-potrace-flags.m4])
 m4_include([../m4/kpse-ptexenc-flags.m4])
 m4_include([../m4/kpse-setup.m4])
 m4_include([../m4/kpse-teckit-flags.m4])

Modified: branches/stable/source/src/libs/configure
===================================================================
--- branches/stable/source/src/libs/configure	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/configure	2018-11-12 19:12:53 UTC (rev 807)
@@ -767,6 +767,7 @@
 enable_dvi2tty
 enable_dvidvi
 enable_dviljk
+enable_dviout_util
 enable_dvipdfm_x
 enable_dvipng
 enable_debug
@@ -820,9 +821,6 @@
 with_gmp_libdir
 with_system_cairo
 with_system_pixman
-with_system_potrace
-with_potrace_includes
-with_potrace_libdir
 with_system_gd
 with_gd_includes
 with_gd_libdir
@@ -1555,6 +1553,7 @@
   --disable-dvi2tty       do not build the dvi2tty package
   --disable-dvidvi        do not build the dvidvi package
   --disable-dviljk        do not build the dviljk package
+  --disable-dviout-util   do not build the dviout-util package
   --disable-dvipdfm-x     do not build the dvipdfm-x package
   --disable-dvipng        do not build the dvipng package
   --disable-debug           Compile without debug (-d) option
@@ -1656,11 +1655,6 @@
                           pkg-config)
   --with-system-pixman    use installed pixman headers and library (requires
                           pkg-config)
-  --with-system-potrace   use installed potrace headers and library
-  --with-potrace-includes=DIR
-                          potrace headers installed in DIR
-  --with-potrace-libdir=DIR
-                          potrace library installed in DIR
   --with-system-gd        use installed gd headers and library
   --with-gd-includes=DIR  gd headers installed in DIR
   --with-gd-libdir=DIR    gd library installed in DIR
@@ -3858,8 +3852,6 @@
 esac
 
 test "x$enable_web2c:$enable_luatex" = xyes:yes && {
-  need_poppler=yes
-  need_mpfr=yes
   need_libpng=yes
   need_zziplib=yes
   need_lua52=yes
@@ -3876,8 +3868,6 @@
 esac
 
 test "x$enable_web2c:$enable_luatex53" = xyes:yes && {
-  need_poppler=yes
-  need_mpfr=yes
   need_libpng=yes
   need_zziplib=yes
   need_lua53=yes
@@ -3894,8 +3884,6 @@
 esac
 
 test "x$enable_web2c:$enable_luajittex" = xyes:yes && {
-  need_poppler=yes
-  need_mpfr=yes
   need_libpng=yes
   need_zziplib=yes
   need_luajit=yes
@@ -4319,6 +4307,28 @@
   need_kpathsea=yes
 }
 
+## texk/dviout-util/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviout-util/
+## configure options and TL libraries required for dviout-util
+# Check whether --enable-dviout-util was given.
+if test "${enable_dviout_util+set}" = set; then :
+  enableval=$enable_dviout_util;
+fi
+case $enable_dviout_util in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviout_util=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&5
+$as_echo "$as_me: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviout-util=$enable_dviout_util'"
+    ;;
+esac
+
+test "x$enable_dviout_util" = xno || {
+  need_ptexenc=yes
+}
+
 ## texk/dvipdfm-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/
 ## configure options and TL libraries required for dvipdfm-x
 # Check whether --enable-dvipdfm-x was given.
@@ -5234,36 +5244,6 @@
   ac_configure_args="$ac_configure_args '--with-system-pixman=$with_system_pixman'"
 fi
 
-## libs/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
-## configure options and TL libraries required for potrace
-
-# Check whether --with-system-potrace was given.
-if test "${with_system_potrace+set}" = set; then :
-  withval=$with_system_potrace;
-fi
-
-# Check whether --with-potrace-includes was given.
-if test "${with_potrace_includes+set}" = set; then :
-  withval=$with_potrace_includes;
-fi
-
-# Check whether --with-potrace-libdir was given.
-if test "${with_potrace_libdir+set}" = set; then :
-  withval=$with_potrace_libdir;
-fi
-if test "x$with_system_potrace" = x; then
-  if test -f $srcdir/../libs/potrace/configure; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`potrace' headers and library from TL tree" >&5
-$as_echo "$as_me: Assuming \`potrace' headers and library from TL tree" >&6;}
-    with_system_potrace=no
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`potrace' headers and library" >&5
-$as_echo "$as_me: Assuming installed \`potrace' headers and library" >&6;}
-    with_system_potrace=yes
-  fi
-  ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
-fi
-
 ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
 ## configure options and TL libraries required for gd
 
@@ -6486,10 +6466,6 @@
   test "x$with_system_pixman" != xyes && test "x$need_pixman" = xyes && MAKE_SUBDIRS="pixman $MAKE_SUBDIRS"
   CONF_SUBDIRS="pixman $CONF_SUBDIRS"
 fi
-if test -x $srcdir/potrace/configure; then
-  test "x$with_system_potrace" != xyes && test "x$need_potrace" = xyes && MAKE_SUBDIRS="potrace $MAKE_SUBDIRS"
-  CONF_SUBDIRS="potrace $CONF_SUBDIRS"
-fi
 if test -x $srcdir/gd/configure; then
   test "x$with_system_gd" != xyes && test "x$need_gd" = xyes && MAKE_SUBDIRS="gd $MAKE_SUBDIRS"
   CONF_SUBDIRS="gd $CONF_SUBDIRS"

Modified: branches/stable/source/src/libs/libpng/ChangeLog
===================================================================
--- branches/stable/source/src/libs/libpng/ChangeLog	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/ChangeLog	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,3 +1,8 @@
+2018-07-17 Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	Import libpng-1.6.35.
+	* version.ac: Adjust.
+
 2018-01-14  Karl Berry  <karl at freefriends.org>
 
 	* configure.ac (-std=c89): reinstate check, now copying configure

Modified: branches/stable/source/src/libs/libpng/README
===================================================================
--- branches/stable/source/src/libs/libpng/README	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/README	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,4 +1,4 @@
-	Building libpng-1.6.34 as part of the TL tree
+	Building libpng-1.6.35 as part of the TL tree
 	=============================================
 
 This directory libs/libpng/ uses a proxy Makefile.am to build the libpng library
@@ -14,4 +14,4 @@
 =============================
 
 2009-07-23	Peter Breitenlohner <peb at mppmu.mpg.de>
-2017-09-29	Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+2018-07-17	Akira Kakuto <kakuto at fuk.kindai.ac.jp>

Modified: branches/stable/source/src/libs/libpng/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/libpng/TLpatches/ChangeLog	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/TLpatches/ChangeLog	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,3 +1,7 @@
+2018-07-17  Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+	Import libpng-1.6.35.
+
 2017-09-29  Akira Kakuto <kakuto at fuk.kindai.ac.jp>
 
 	Import libpng-1.6.34.

Modified: branches/stable/source/src/libs/libpng/TLpatches/TL-Changes
===================================================================
--- branches/stable/source/src/libs/libpng/TLpatches/TL-Changes	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/TLpatches/TL-Changes	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,5 +1,5 @@
-Changes applied to the libpng-1.6.34/ tree as obtained from:
-	http://www.libpng.org/ libpng-1.6.34.tar.xz
+Changes applied to the libpng-1.6.35/ tree as obtained from:
+	https://sourceforge.net/projects/libpng/files/libpng16/1.6.35/
 
 Copied:
 	scripts/pnglibconf.h.prebuilt -> pnglibconf.h

Modified: branches/stable/source/src/libs/libpng/configure
===================================================================
--- branches/stable/source/src/libs/libpng/configure	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/configure	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libpng (TeX Live) 1.6.34.
+# Generated by GNU Autoconf 2.69 for libpng (TeX Live) 1.6.35.
 #
 # Report bugs to <tex-k at tug.org>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='libpng (TeX Live)'
 PACKAGE_TARNAME='libpng--tex-live-'
-PACKAGE_VERSION='1.6.34'
-PACKAGE_STRING='libpng (TeX Live) 1.6.34'
+PACKAGE_VERSION='1.6.35'
+PACKAGE_STRING='libpng (TeX Live) 1.6.35'
 PACKAGE_BUGREPORT='tex-k at tug.org'
 PACKAGE_URL=''
 
@@ -1297,7 +1297,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 libpng (TeX Live) 1.6.34 to adapt to many kinds of systems.
+\`configure' configures libpng (TeX Live) 1.6.35 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1364,7 +1364,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.34:";;
+     short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.35:";;
    esac
   cat <<\_ACEOF
 
@@ -1478,7 +1478,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpng (TeX Live) configure 1.6.34
+libpng (TeX Live) configure 1.6.35
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1901,7 +1901,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libpng (TeX Live) $as_me 1.6.34, which was
+It was created by libpng (TeX Live) $as_me 1.6.35, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3824,7 +3824,7 @@
 
 # Define the identity of the package.
  PACKAGE='libpng--tex-live-'
- VERSION='1.6.34'
+ VERSION='1.6.35'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6578,7 +6578,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpng (TeX Live) $as_me 1.6.34, which was
+This file was extended by libpng (TeX Live) $as_me 1.6.35, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6644,7 +6644,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libpng (TeX Live) config.status 1.6.34
+libpng (TeX Live) config.status 1.6.35
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,35 +1,48 @@
-Libpng 1.6.34 - September 29, 2017
+Libpng 1.6.35 - July 15, 2018
 
-This is a public release of libpng, intended for use in production codes.
+This is a public release of libpng, intended for use in production code.
 
 Files available for download:
 
-Source files with LF line endings (for Unix/Linux) and with a
-"configure" script
+Source files with LF line endings (for Unix/Linux):
 
-   libpng-1.6.34.tar.xz (LZMA-compressed, recommended)
-   libpng-1.6.34.tar.gz
+   libpng-1.6.35.tar.xz (LZMA-compressed, recommended)
+   libpng-1.6.35.tar.gz
 
-Source files with CRLF line endings (for Windows), without the
-"configure" script
+Source files with CRLF line endings (for Windows):
 
-   lpng1634.7z  (LZMA-compressed, recommended)
-   lpng1634.zip
+   lp1635.7z  (LZMA-compressed, recommended)
+   lp1635.zip
 
 Other information:
 
-   libpng-1.6.34-README.txt
-   libpng-1.6.34-LICENSE.txt
-   libpng-1.6.34-*.asc (armored detached GPG signatures)
+   libpng-1.6.35-README.txt
+   libpng-1.6.35-LICENSE.txt
 
-Changes since the last public release (1.6.33):
-  Removed contrib/pngsuite/i*.png; some of these were incorrect and caused
-    test failures.
+Changes since the last public release (1.6.34):
 
+  Restored 21 of the contrib/pngsuite/i*.png, which do not cause test
+    failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png.
+  Added calls to png_set_*() transforms commonly used by browsers to
+    the fuzzer.
+  Removed some unnecessary brackets in pngrtran.c
+  Fixed miscellaneous typos (Patch by github user "luzpaz").
+  Change "ASM C" to "C ASM" in CMakeLists.txt
+  Fixed incorrect handling of bKGD chunk in sub-8-bit files (Cosmin)
+  Added hardware optimization directories to zip and 7z distributions.
+  Fixed incorrect bitmask for options.
+  Fixed many spelling typos.
+  Make png_get_iCCP consistent with man page (allow compression-type argument
+    to be NULL, bug report by Lenard Szolnoki).
+  Replaced the remaining uses of png_size_t with size_t (Cosmin)
+  Fixed the calculation of row_factor in png_check_chunk_length
+    (reported by Thuan Pham in SourceForge issue #278)
+  Added missing parentheses to a macro definition
+    (suggested by "irwir" in GitHub issue #216)
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe)
-or to glennrp at users.sourceforge.net
+to subscribe).
 
 Glenn R-P

Modified: branches/stable/source/src/libs/libpng/libpng-src/CHANGES
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/CHANGES	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/CHANGES	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,4 +1,3 @@
-#if 0
 CHANGES - changes for libpng
 
 version 0.1 [March 29, 1995]
@@ -1454,7 +1453,7 @@
     sequential read support.
   Added some "#if PNG_WRITE_SUPPORTED" blocks.
   Added #ifdef to remove some redundancy in png_malloc_default().
-  Use png_malloc instead of png_zalloc to allocate the pallete.
+  Use png_malloc instead of png_zalloc to allocate the palette.
 
 Version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]
   Fixed buffer overflow vulnerability (CVE-2004-0597) in png_handle_tRNS().
@@ -3259,7 +3258,7 @@
   Revised PNG_EXPORTA macro to not use an empty parameter, to accommodate the
     old VisualC++ preprocessor.
   Turned on interlace handling in png_read_png().
-  Fixed gcc pendantic warnings.
+  Fixed gcc pedantic warnings.
   Handle longjmp in Cygwin.
   Fixed png_get_current_row_number() in the interlaced case.
   Cleaned up ALPHA flags and transformations.
@@ -3359,7 +3358,7 @@
   Pass "" instead of '\0' to png_default_error() in png_err().  This mistake
     was introduced in libpng-1.2.20beta01.  This fixes CVE-2011-2691.
   Added PNG_WRITE_OPTIMIZE_CMF_SUPPORTED macro to make the zlib "CMF" byte
-    optimization configureable.
+    optimization configurable.
   IDAT compression failed if preceded by a compressed text chunk (bug
     introduced in libpng-1.5.3beta01-02).  This was because the attempt to
     reset the zlib stream in png_write_IDAT happened after the first IDAT
@@ -3643,7 +3642,7 @@
   Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6beta01.
 
 Version 1.5.6beta06 [October 17, 2011]
-  Removed two redundant tests for unitialized row.
+  Removed two redundant tests for uninitialized row.
   Fixed a relatively harmless memory overwrite in compressed text writing
     with a 1 byte zlib buffer.
   Add ability to call png_read_update_info multiple times to pngvalid.c.
@@ -3689,7 +3688,7 @@
     crash.  The pngmem.c implementation of png_malloc() included a cast
     to png_size_t which would fail on large allocations on 16-bit systems.
   Fix for the preprocessor of the Intel C compiler. The preprocessor
-    splits adjacent @ signs with a space; this changes the concatentation
+    splits adjacent @ signs with a space; this changes the concatenation
     token from @- at -@ to PNG_JOIN; that should work with all compiler
     preprocessors.
   Paeth filter speed improvements from work by Siarhei Siamashka. This
@@ -3735,7 +3734,7 @@
     gray (on palette) itself.
   Fixes for C++ compilation using g++ When libpng source is compiled
     using g++. The compiler imposes C++ rules on the C source; thus it
-    is desireable to make the source work with either C or C++ rules
+    is desirable to make the source work with either C or C++ rules
     without throwing away useful error information.  This change adds
     png_voidcast to allow C semantic (void*) cases or the corresponding
     C++ static_cast operation, as appropriate.
@@ -4061,7 +4060,7 @@
     possible to call png_inflate() incrementally.  A warning is no longer
     issued if the language tag or translated keyword in the iTXt chunk
     has zero length.
-  If benign errors are disabled use maximum window on ancilliary inflate.
+  If benign errors are disabled use maximum window on ancillary inflate.
     This works round a bug introduced in 1.5.4 where compressed ancillary
     chunks could end up with a too-small windowBits value in the deflate
     header.
@@ -4176,7 +4175,7 @@
     declared even though the functions are never actually defined.  This
     change provides a dummy definition so that the declarations work, yet any
     implementation will fail to compile because of an incomplete type.
-  Re-eliminated the use of strcpy() in pngtest.c.  An unncessary use of
+  Re-eliminated the use of strcpy() in pngtest.c.  An unnecessary use of
     strcpy() was accidentally re-introduced in libpng16; this change replaces
     it with strncpy().
   Eliminated use of png_sizeof(); use sizeof() instead.
@@ -4309,7 +4308,7 @@
     resulting in VS2010 having to update the files.
   Removed non-working ICC profile support code that was mostly added to
     libpng-1.6.0beta29 and beta30. There was too much code for too little
-    gain; implementing full ICC color correction may be desireable but is left
+    gain; implementing full ICC color correction may be desirable but is left
     up to applications.
 
 Version 1.6.0beta32 [November 25, 2012]
@@ -4592,7 +4591,7 @@
     the optimizations ('check' vs 'api') are exposed in the public header files
     except that the new setting PNG_ARM_NEON_OPT documents how libpng makes the
     decision about whether or not to use the optimizations.
-  Protect symbol prefixing against CC/CPPFLAGS/CFLAGS useage.
+  Protect symbol prefixing against CC/CPPFLAGS/CFLAGS usage.
     Previous iOS/Xcode fixes for the ARM NEON optimizations moved the test
     on __ARM_NEON__ from configure time to compile time.  This breaks symbol
     prefixing because the definition of the special png_init_filter_functions
@@ -5635,7 +5634,7 @@
     to All and adds a list of the warnings that need to be turned off.  This is
     semi-documentary; the intent is to tell libpng users which warnings have
     been examined and judged non-fixable at present.  The warning about
-    structure padding is fixable, but it would be a signficant change (moving
+    structure padding is fixable, but it would be a significant change (moving
     structure members around).
 
 Version 1.6.24beta03 [July 4, 2016]
@@ -5781,7 +5780,7 @@
   Added option to Cmake build allowing a custom location of zlib to be
     specified in a scenario where libpng is being built as a subproject
     alongside zlib by another project (Sam Serrels).
-  Changed png_ptr->options from a png_byte to png_uint_32, to accomodate
+  Changed png_ptr->options from a png_byte to png_uint_32, to accommodate
     up to 16 options.
 
 Version 1.6.28rc02 [January 4, 2017]
@@ -5932,7 +5931,7 @@
   Update libpng.3 and libpng-manual.txt about eXIf functions.
 
 Version 1.6.32beta05 [August 2, 2017]
-  Restored png_get_eXIf() and png_set_eXIf() to maintain API compatability.
+  Restored png_get_eXIf() and png_set_eXIf() to maintain API compatibility.
 
 Version 1.6.32beta06 [August 2, 2017]
   Removed png_get_eXIf_1() and png_set_eXIf_1().
@@ -6038,14 +6037,35 @@
   Add end_info structure and png_read_end() to the libpng fuzzer.
 
 Version 1.6.34 [September 29, 2017]
-  Removed contrib/pngsuite/i*.png; some of these were incorrect and caused
-    test failures.
+  Removed contrib/pngsuite/i*.png; some of them caused test failures.
 
+Version 1.6.35beta01 [March 6, 2018]
+  Restored 21 of the contrib/pngsuite/i*.png, which do not cause test
+    failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png.
+  Added calls to png_set_*() transforms commonly used by browsers to
+    the fuzzer.
+  Removed some unnecessary brackets in pngrtran.c
+  Fixed miscellaneous typos (Patch by github user "luzpaz").
+  Change "ASM C" to "C ASM" in CMakeLists.txt
+  Fixed incorrect handling of bKGD chunk in sub-8-bit files (Cosmin)
+  Added hardware optimization directories to zip and 7z distributions.
+  Fixed incorrect bitmask for options.
+  Fixed many spelling typos.
+
+Version 1.6.35beta02 [March 28, 2018]
+  Make png_get_iCCP consistent with man page (allow compression-type argument
+  to be NULL, bug report by Lenard Szolnoki).
+
+Version 1.6.35 [July 15, 2018]
+  Replaced the remaining uses of png_size_t with size_t (Cosmin)
+  Fixed the calculation of row_factor in png_check_chunk_length
+    (reported by Thuan Pham in SourceForge issue #278)
+  Added missing parentheses to a macro definition
+    (suggested by "irwir" in GitHub issue #216)
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe)
-or to glennrp at users.sourceforge.net
+to subscribe).
 
 Glenn R-P
-#endif

Modified: branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,6 +1,6 @@
 # CMakeLists.txt
 
-# Copyright (C) 2007,2009-2017 Glenn Randers-Pehrson
+# Copyright (C) 2007,2009-2018 Glenn Randers-Pehrson
 # Written by Christian Ehrlicher, 2007
 # Revised by Roger Lowman, 2009-2010
 # Revised by Clifford Yapp, 2011-2012
@@ -31,12 +31,12 @@
 
 set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo")
 
-project(libpng ASM C)
+project(libpng C ASM)
 enable_testing()
 
 set(PNGLIB_MAJOR 1)
 set(PNGLIB_MINOR 6)
-set(PNGLIB_RELEASE 34)
+set(PNGLIB_RELEASE 35)
 set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
 set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
 
@@ -424,7 +424,7 @@
                     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 
   # A single target handles generation of all generated files.  If
-  # they are dependend upon separately by multiple targets, this
+  # they are depended upon separately by multiple targets, this
   # confuses parallel make (it would require a separate top-level
   # target for each file to track the dependencies properly).
   add_custom_target(genfiles DEPENDS
@@ -844,7 +844,7 @@
 # SET UP LINKS
 if(PNG_SHARED)
   set_target_properties(png PROPERTIES
-#   VERSION 16.${PNGLIB_RELEASE}.1.6.34
+#   VERSION 16.${PNGLIB_RELEASE}.1.6.35
     VERSION 16.${PNGLIB_RELEASE}.0
     SOVERSION 16
     CLEAN_DIRECT_OUTPUT 1)

Modified: branches/stable/source/src/libs/libpng/libpng-src/INSTALL
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/INSTALL	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/INSTALL	2018-11-12 19:12:53 UTC (rev 807)
@@ -284,7 +284,7 @@
 
 XIV. Enabling or disabling hardware optimizations
 
-Certain hardware capabilites, such as the Intel SSE instructions,
+Certain hardware capabilities, such as the Intel SSE instructions,
 are normally detected at run time. Enable them with configure options
 such as one of
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/LICENSE
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/LICENSE	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/LICENSE	2018-11-12 19:12:53 UTC (rev 807)
@@ -10,8 +10,8 @@
 
 This code is released under the libpng license.
 
-libpng versions 1.0.7, July 1, 2000 through 1.6.34, September 29, 2017 are
-Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
+libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
 derived from libpng-1.0.6, and are distributed according to the same
 disclaimer and license as libpng-1.0.6 with the following individuals
 added to the list of Contributing Authors:
@@ -130,4 +130,4 @@
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-September 29, 2017
+July 15, 2018

Modified: branches/stable/source/src/libs/libpng/libpng-src/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/README	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/README	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,4 +1,4 @@
-README for libpng version 1.6.34 - September 29, 2017 (shared library 16.0)
+README for libpng version 1.6.35 - July 15, 2018 (shared library 16.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
@@ -118,7 +118,7 @@
 Send comments/corrections/commendations to png-mng-implement at
 lists.sourceforge.net (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe) or to glennrp at users.sourceforge.net
+to subscribe).
 
 You can't reach Guy, the original libpng author, at the addresses
 given in previous versions of this document.  He and Andreas will

Modified: branches/stable/source/src/libs/libpng/libpng-src/autogen.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/autogen.sh	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/autogen.sh	2018-11-12 19:12:53 UTC (rev 807)
@@ -194,7 +194,7 @@
       if test -d .git
       then
          exec >&2
-         echo "ERROR: running autoreconf on an initialized sytem"
+         echo "ERROR: running autoreconf on an initialized system"
          echo "  This is not necessary; it is only necessary to remake the"
          echo "  autotools generated files if Makefile.am or configure.ac"
          echo "  change and make does the right thing with:"

Modified: branches/stable/source/src/libs/libpng/libpng-src/configure.ac
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/configure.ac	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/configure.ac	2018-11-12 19:12:53 UTC (rev 807)
@@ -25,7 +25,7 @@
 
 dnl Version number stuff here:
 
-AC_INIT([libpng],[1.6.34],[png-mng-implement at lists.sourceforge.net])
+AC_INIT([libpng],[1.6.35],[png-mng-implement at lists.sourceforge.net])
 AC_CONFIG_MACRO_DIR([scripts])
 
 # libpng does not follow GNU file name conventions (hence 'foreign')
@@ -46,10 +46,10 @@
 dnl AM_PREREQ([1.11.2])
 dnl stop configure from automagically running automake
 
-PNGLIB_VERSION=1.6.34
+PNGLIB_VERSION=1.6.35
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=6
-PNGLIB_RELEASE=34
+PNGLIB_RELEASE=35
 
 dnl End of version number stuff
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/conftest/pngcp.dfa
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/conftest/pngcp.dfa	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/conftest/pngcp.dfa	2018-11-12 19:12:53 UTC (rev 807)
@@ -33,7 +33,7 @@
 option WRITE_FILTER on
 
 # pngcp needs this to preserve unknown chunks, switching all these on means that
-# pngcp can work without explicit known chunk reading suppport
+# pngcp can work without explicit known chunk reading support
 option UNKNOWN_CHUNKS on
 option SET_UNKNOWN_CHUNKS on
 option HANDLE_AS_UNKNOWN on

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/iccfrompng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/iccfrompng.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/iccfrompng.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -10,7 +10,7 @@
  * without processing the image.  Notice that some header information may occur
  * after the image data. Textual data and comments are an example; the approach
  * in this file won't work reliably for such data because it only looks for the
- * information in the section of the file that preceeds the image data.
+ * information in the section of the file that precedes the image data.
  *
  * Compile and link against libpng and zlib, plus anything else required on the
  * system you use.

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/makepng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/makepng.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/makepng.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -950,7 +950,7 @@
             int passes = 1;
 #        endif /* !WRITE_INTERLACING */
          int pass;
-         png_size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+         size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
 
          row = malloc(rowbytes);
 
@@ -1094,7 +1094,7 @@
    return 0;
 }
 
-static png_size_t
+static size_t
 load_fake(png_charp param, png_bytepp profile)
 {
    char *endptr = NULL;
@@ -1164,7 +1164,7 @@
    {
       case '<':
          {
-            png_size_t filelen = load_file(params[1]+1, &profile);
+            size_t filelen = load_file(params[1]+1, &profile);
             if (filelen > 0xfffffffc) /* Maximum profile length */
             {
                fprintf(stderr, "%s: file too long (%lu) for an ICC profile\n",
@@ -1179,7 +1179,7 @@
       case '0': case '1': case '2': case '3': case '4':
       case '5': case '6': case '7': case '8': case '9':
          {
-            png_size_t fake_len = load_fake(params[1], &profile);
+            size_t fake_len = load_fake(params[1], &profile);
 
             if (fake_len > 0) /* else a simple parameter */
             {
@@ -1274,7 +1274,7 @@
       case '5': case '6': case '7': case '8': case '9':
          {
             png_bytep data = NULL;
-            png_size_t fake_len = load_fake(param, &data);
+            size_t fake_len = load_fake(param, &data);
 
             if (fake_len > 0) /* else a simple parameter */
             {

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -551,7 +551,7 @@
    png_structp    original_pp;       /* used on the original read */
    png_infop      original_ip;       /* set by the original read */
 
-   png_size_t     original_rowbytes; /* of the original rows: */
+   size_t         original_rowbytes; /* of the original rows: */
    png_bytepp     original_rows;     /* from the original read */
 
    /* Original chunks valid */
@@ -807,7 +807,7 @@
 
 static void
 buffer_read(struct display *dp, struct buffer *bp, png_bytep data,
-   png_size_t size)
+   size_t size)
 {
    struct buffer_list *last = bp->current;
    size_t read_count = bp->read_count;
@@ -855,7 +855,7 @@
 }
 
 static void PNGCBAPI
-read_function(png_structp pp, png_bytep data, png_size_t size)
+read_function(png_structp pp, png_bytep data, size_t size)
 {
    buffer_read(get_dp(pp), get_buffer(pp), data, size);
 }
@@ -927,7 +927,7 @@
    png_structp pp;
    png_infop   ip;
 
-   /* Now perform the initial read with a 0 tranform. */
+   /* Now perform the initial read with a 0 transform. */
    read_png(dp, &dp->original_file, "original read", 0/*no transform*/);
 
    /* Move the result to the 'original' fields */
@@ -1267,7 +1267,7 @@
 #ifdef PNG_WRITE_PNG_SUPPORTED
 static void
 buffer_write(struct display *dp, struct buffer *buffer, png_bytep data,
-   png_size_t size)
+   size_t size)
    /* Generic write function used both from the write callback provided to
     * libpng and from the generic read code.
     */
@@ -1311,7 +1311,7 @@
 }
 
 static void PNGCBAPI
-write_function(png_structp pp, png_bytep data, png_size_t size)
+write_function(png_structp pp, png_bytep data, size_t size)
 {
    buffer_write(get_dp(pp), get_buffer(pp), data, size);
 }

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -578,11 +578,11 @@
    int         stride_extra;
    FILE       *input_file;
    png_voidp   input_memory;
-   png_size_t  input_memory_size;
+   size_t      input_memory_size;
    png_bytep   buffer;
    ptrdiff_t   stride;
-   png_size_t  bufsize;
-   png_size_t  allocsize;
+   size_t      bufsize;
+   size_t      allocsize;
    char        tmpfile_name[32];
    png_uint_16 colormap[256*4];
 }
@@ -665,7 +665,7 @@
 static void
 allocbuffer(Image *image)
 {
-   png_size_t size = PNG_IMAGE_BUFFER_SIZE(image->image, image->stride);
+   size_t size = PNG_IMAGE_BUFFER_SIZE(image->image, image->stride);
 
    if (size+32 > image->bufsize)
    {
@@ -1142,7 +1142,7 @@
    }
 }
 
-/* Convertion between pixel formats.  The code above effectively eliminates the
+/* Conversion between pixel formats.  The code above effectively eliminates the
  * component ordering changes leaving three basic changes:
  *
  * 1) Remove an alpha channel by pre-multiplication or compositing on a
@@ -2036,7 +2036,7 @@
    /* Precalculated values: */
    int          in_opaque;   /* Value of input alpha that is opaque */
    int          is_palette;  /* Sample values come from the palette */
-   int          accumulate;  /* Accumlate component errors (don't log) */
+   int          accumulate;  /* Accumulate component errors (don't log) */
    int          output_8bit; /* Output is 8-bit (else 16-bit) */
 
    void (*in_gp)(Pixel*, png_const_voidp);

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -85,7 +85,7 @@
 #define PNG_WRITE_16BIT_SUPPORTED
 #define PNG_READ_16BIT_SUPPORTED
 
-/* This comes from pnglibconf.h afer 1.5: */
+/* This comes from pnglibconf.h after 1.5: */
 #define PNG_FP_1 100000
 #define PNG_GAMMA_THRESHOLD_FIXED\
    ((png_fixed_point)(PNG_GAMMA_THRESHOLD * PNG_FP_1))

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -102,7 +102,7 @@
 #define PNG_WRITE_16BIT_SUPPORTED
 #define PNG_READ_16BIT_SUPPORTED
 
-/* This comes from pnglibconf.h afer 1.5: */
+/* This comes from pnglibconf.h after 1.5: */
 #define PNG_FP_1 100000
 #define PNG_GAMMA_THRESHOLD_FIXED\
    ((png_fixed_point)(PNG_GAMMA_THRESHOLD * PNG_FP_1))
@@ -711,7 +711,7 @@
    unsigned int            IDAT_bits; /* Number of bits in IDAT size */
    png_uint_32             IDAT_size; /* Total size of IDAT data */
    png_uint_32             id;        /* must be correct (see FILEID) */
-   png_size_t              datacount; /* In this (the last) buffer */
+   size_t                  datacount; /* In this (the last) buffer */
    png_store_buffer        data;      /* Last buffer in file */
    int                     npalette;  /* Number of entries in palette */
    store_palette_entry*    palette;   /* May be NULL */
@@ -777,10 +777,10 @@
    png_infop          piread;
    png_store_file*    current;  /* Set when reading */
    png_store_buffer*  next;     /* Set when reading */
-   png_size_t         readpos;  /* Position in *next */
+   size_t             readpos;  /* Position in *next */
    png_byte*          image;    /* Buffer for reading interlaced images */
-   png_size_t         cb_image; /* Size of this buffer */
-   png_size_t         cb_row;   /* Row size of the image(s) */
+   size_t             cb_image; /* Size of this buffer */
+   size_t             cb_row;   /* Row size of the image(s) */
    uLong              IDAT_crc;
    png_uint_32        IDAT_len; /* Used when re-chunking IDAT chunks */
    png_uint_32        IDAT_pos; /* Used when re-chunking IDAT chunks */
@@ -791,7 +791,7 @@
    png_store_file*    saved;
    png_structp        pwrite;   /* Used when writing a new file */
    png_infop          piwrite;
-   png_size_t         writepos; /* Position in .new */
+   size_t             writepos; /* Position in .new */
    char               wname[FILE_NAME_SIZE];
    png_store_buffer   new;      /* The end of the new PNG file being written. */
    store_pool         write_memory_pool;
@@ -1125,7 +1125,7 @@
 store_image_row(const png_store* ps, png_const_structp pp, int nImage,
    png_uint_32 y)
 {
-   png_size_t coffset = (nImage * ps->image_h + y) * (ps->cb_row + 5) + 2;
+   size_t coffset = (nImage * ps->image_h + y) * (ps->cb_row + 5) + 2;
 
    if (ps->image == NULL)
       png_error(pp, "no allocated image");
@@ -1160,9 +1160,9 @@
 
 static void
 store_ensure_image(png_store *ps, png_const_structp pp, int nImages,
-   png_size_t cbRow, png_uint_32 cRows)
+   size_t cbRow, png_uint_32 cRows)
 {
-   png_size_t cb = nImages * cRows * (cbRow + 5);
+   size_t cb = nImages * cRows * (cbRow + 5);
 
    if (ps->cb_image < cb)
    {
@@ -1234,7 +1234,7 @@
       png_error(pp, "image overwrite");
    else
    {
-      png_size_t cbRow = ps->cb_row;
+      size_t cbRow = ps->cb_row;
       png_uint_32 rows = ps->image_h;
 
       image += iImage * (cbRow+5) * ps->image_h;
@@ -1278,7 +1278,7 @@
 }
 
 static void PNGCBAPI
-store_write(png_structp ppIn, png_bytep pb, png_size_t st)
+store_write(png_structp ppIn, png_bytep pb, size_t st)
 {
    png_const_structp pp = ppIn;
    png_store *ps = voidcast(png_store*, png_get_io_ptr(pp));
@@ -1346,13 +1346,13 @@
 
       else /* chunkpos >= 8 */
       {
-         png_size_t cb = st;
+         size_t cb = st;
 
          if (cb > STORE_BUFFER_SIZE - writepos)
             cb = STORE_BUFFER_SIZE - writepos;
 
          if (cb  > chunklen - chunkpos/* bytes left in chunk*/)
-            cb = (png_size_t)/*SAFE*/(chunklen - chunkpos);
+            cb = (size_t)/*SAFE*/(chunklen - chunkpos);
 
          memcpy(ps->new.buffer + writepos, pb, cb);
          chunkpos += (png_uint_32)/*SAFE*/cb;
@@ -1440,7 +1440,7 @@
  * during progressive read, where the io_ptr is set internally by libpng.
  */
 static void
-store_read_imp(png_store *ps, png_bytep pb, png_size_t st)
+store_read_imp(png_store *ps, png_bytep pb, size_t st)
 {
    if (ps->current == NULL || ps->next == NULL)
       png_error(ps->pread, "store state damaged");
@@ -1463,14 +1463,13 @@
    }
 }
 
-static png_size_t
-store_read_chunk(png_store *ps, png_bytep pb, const png_size_t max,
-      const png_size_t min)
+static size_t
+store_read_chunk(png_store *ps, png_bytep pb, size_t max, size_t min)
 {
    png_uint_32 chunklen = ps->chunklen;
    png_uint_32 chunktype = ps->chunktype;
    png_uint_32 chunkpos = ps->chunkpos;
-   png_size_t st = max;
+   size_t st = max;
 
    if (st > 0) do
    {
@@ -1601,8 +1600,8 @@
 
                store_read_imp(ps, pb, avail);
                ps->IDAT_crc = crc32(ps->IDAT_crc, pb, avail);
-               pb += (png_size_t)/*SAFE*/avail;
-               st -= (png_size_t)/*SAFE*/avail;
+               pb += (size_t)/*SAFE*/avail;
+               st -= (size_t)/*SAFE*/avail;
                chunkpos += (png_uint_32)/*SAFE*/avail;
                IDAT_size -= (png_uint_32)/*SAFE*/avail;
                IDAT_pos += (png_uint_32)/*SAFE*/avail;
@@ -1669,10 +1668,10 @@
 
          else /* Return chunk bytes, including the CRC */
          {
-            png_size_t avail = st;
+            size_t avail = st;
 
             if (avail > chunklen - chunkpos)
-               avail = (png_size_t)/*SAFE*/(chunklen - chunkpos);
+               avail = (size_t)/*SAFE*/(chunklen - chunkpos);
 
             store_read_imp(ps, pb, avail);
             pb += avail;
@@ -1698,7 +1697,7 @@
 }
 
 static void PNGCBAPI
-store_read(png_structp ppIn, png_bytep pb, png_size_t st)
+store_read(png_structp ppIn, png_bytep pb, size_t st)
 {
    png_const_structp pp = ppIn;
    png_store *ps = voidcast(png_store*, png_get_io_ptr(pp));
@@ -1724,7 +1723,7 @@
    while (store_read_buffer_avail(ps) > 0)
    {
       static png_uint_32 noise = 2;
-      png_size_t cb;
+      size_t cb;
       png_byte buffer[512];
 
       /* Generate 15 more bits of stuff: */
@@ -2991,7 +2990,7 @@
  * png_struct.
  */
 static void
-modifier_read_imp(png_modifier *pm, png_bytep pb, png_size_t st)
+modifier_read_imp(png_modifier *pm, png_bytep pb, size_t st)
 {
    while (st > 0)
    {
@@ -3137,7 +3136,7 @@
              */
             if (len+12 <= sizeof pm->buffer)
             {
-               png_size_t s = len+12-pm->buffer_count;
+               size_t s = len+12-pm->buffer_count;
                store_read_chunk(&pm->this, pm->buffer+pm->buffer_count, s, s);
                pm->buffer_count = len+12;
 
@@ -3196,7 +3195,7 @@
 
 /* The callback: */
 static void PNGCBAPI
-modifier_read(png_structp ppIn, png_bytep pb, png_size_t st)
+modifier_read(png_structp ppIn, png_bytep pb, size_t st)
 {
    png_const_structp pp = ppIn;
    png_modifier *pm = voidcast(png_modifier*, png_get_io_ptr(pp));
@@ -3226,7 +3225,7 @@
    for (;;)
    {
       static png_uint_32 noise = 1;
-      png_size_t cb, cbAvail;
+      size_t cb, cbAvail;
       png_byte buffer[512];
 
       /* Generate 15 more bits of stuff: */
@@ -5001,7 +5000,7 @@
    dp->npalette = 0;
    /* Preset the transparent color to black: */
    memset(&dp->transparent, 0, sizeof dp->transparent);
-   /* Preset the palette to full intensity/opaque througout: */
+   /* Preset the palette to full intensity/opaque throughout: */
    memset(dp->palette, 0xff, sizeof dp->palette);
 }
 
@@ -5270,7 +5269,7 @@
     */
    standard_palette_validate(dp, pp, pi);
 
-   /* In any case always check for a tranparent color (notice that the
+   /* In any case always check for a transparent color (notice that the
     * colour type 3 case must not give a successful return on the get_tRNS call
     * with these arguments!)
     */
@@ -6780,7 +6779,7 @@
    store_image_check(dp->this.ps, pp, 0);
 
    /* Read the palette corresponding to the output if the output colour type
-    * indicates a palette, othewise set out_palette to garbage.
+    * indicates a palette, otherwise set out_palette to garbage.
     */
    if (out_ct == PNG_COLOR_TYPE_PALETTE)
    {
@@ -7991,7 +7990,7 @@
          /* Now calculate the actual gray values.  Although the error in the
           * coefficients depends on whether they were specified on the command
           * line (in which case truncation to 15 bits happened) or not (rounding
-          * was used) the maxium error in an individual coefficient is always
+          * was used) the maximum error in an individual coefficient is always
           * 2/32768, because even in the rounding case the requirement that
           * coefficients add up to 32768 can cause a larger rounding error.
           *
@@ -8207,7 +8206,7 @@
       that->bluef = that->greenf = that->redf = gray;
       that->bluee = that->greene = that->rede = err;
 
-      /* The sBIT is the minium of the three colour channel sBITs. */
+      /* The sBIT is the minimum of the three colour channel sBITs. */
       if (that->red_sBIT > that->green_sBIT)
          that->red_sBIT = that->green_sBIT;
       if (that->red_sBIT > that->blue_sBIT)
@@ -9746,7 +9745,7 @@
        *
        * pngvalid calculations:
        *  input_sample: linear result; i linearized and composed, range 0..1
-       *  encoded_sample: encoded result; input_sample scaled to ouput bit depth
+       *  encoded_sample: encoded result; input_sample scaled to output bit depth
        *
        * libpng calculations:
        *  output: linear result; od scaled to 0..1 and linearized
@@ -10183,10 +10182,10 @@
     * Since the library must quantize the output to 8 or 16 bits there is
     * a fundamental limit on the accuracy of the output of +/-.5 - this
     * quantization limit is included in addition to the other limits
-    * specified by the paramaters to the API.  (Effectively, add .5
+    * specified by the parameters to the API.  (Effectively, add .5
     * everywhere.)
     *
-    * The behavior of the 'sbit' paramter is defined by section 12.5
+    * The behavior of the 'sbit' parameter is defined by section 12.5
     * (sample depth scaling) of the PNG spec.  That section forces the
     * decoder to assume that the PNG values have been scaled if sBIT is
     * present:
@@ -11729,7 +11728,7 @@
 
    /* Some default values (set the behavior for 'make check' here).
     * These values simply control the maximum error permitted in the gamma
-    * transformations.  The practial limits for human perception are described
+    * transformations.  The practical limits for human perception are described
     * below (the setting for maxpc16), however for 8 bit encodings it isn't
     * possible to meet the accepted capabilities of human vision - i.e. 8 bit
     * images can never be good enough, regardless of encoding.

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/readpng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/readpng.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/readpng.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -60,7 +60,7 @@
    png_read_info(png_ptr, info_ptr);
 
    {
-      png_size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+      size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
 
       /* Failure to initialize these is harmless */
       row = malloc(rowbytes);

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/tarith.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/tarith.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/tarith.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -108,7 +108,7 @@
 
    do
    {
-      png_size_t index;
+      size_t index;
       int state, failed = 0;
       char buffer[64];
 
@@ -176,7 +176,7 @@
       }
       else if (PNG_FP_IS_POSITIVE(state) && !(test > 0))
       {
-         fprintf(stderr, "%g[%d] -> '%s' but postive value not so reported\n",
+         fprintf(stderr, "%g[%d] -> '%s' but positive value not so reported\n",
             test, precision, buffer);
          failed = 1;
          assert(!PNG_FP_IS_NEGATIVE(state));
@@ -329,7 +329,7 @@
 {
    /* Test this character (ch) to ensure the parser does the correct thing.
     */
-   png_size_t index = 0;
+   size_t index = 0;
    const char test = (char)ch;
    const int number_is_valid = png_check_fp_number(&test, 1, &c.state, &index);
    const int character_accepted = (index == 1);

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -65,7 +65,7 @@
 }  io_data;
 
 static PNG_CALLBACK(void, read_and_copy,
-      (png_structp png_ptr, png_bytep buffer, png_size_t cb))
+      (png_structp png_ptr, png_bytep buffer, size_t cb))
 {
    io_data *io = (io_data*)png_get_io_ptr(png_ptr);
 
@@ -100,7 +100,7 @@
    png_read_info(png_ptr, info_ptr);
 
    {
-      png_size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+      size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
 
       row = voidcast(png_bytep,malloc(rowbytes));
       display = voidcast(png_bytep,malloc(rowbytes));

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/Dockerfile
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/Dockerfile	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/Dockerfile	2018-11-12 19:12:53 UTC (rev 807)
@@ -16,9 +16,10 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER glennrp at gmail.com
-RUN apt-get update && apt-get install -y make autoconf automake libtool zlib1g-dev
+RUN apt-get update && \
+    apt-get install -y make autoconf automake libtool
 
+RUN git clone --depth 1 https://github.com/madler/zlib.git
 RUN git clone --depth 1 https://github.com/glennrp/libpng.git
-RUN (cd libpng; git log | head -1)
+RUN cp libpng/contrib/oss-fuzz/build.sh $SRC
 WORKDIR libpng
-COPY build.sh $SRC/

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt	2018-11-12 19:12:53 UTC (rev 807)
@@ -24,13 +24,13 @@
  Filename                   or derived   Copyright          License
  =========================  ==========   ================   ==========
  Dockerfile*                derived      2017, Glenn R-P    Apache 2.0
- build.sh*                  derived      2017, Glenn R-P    Apache 2.0
+ build.sh                   derived      2017, Glenn R-P    Apache 2.0
  libpng_read_fuzzer.cc      derived      2017, Glenn R-P    Chromium
  libpng_read_fuzzer.options original     2015, Chrome Devs  Chromium
  png.dict                   original     2015, Chrome Devs  Chromium
  README.txt (this file)     original     2017, Glenn R-P    libpng
 
- * Dockerfile and build.sh are copies of the files used by oss-fuzz.
+ * Dockerfile is a copy of the file used by oss-fuzz. build.sh,
    png.dict and libpng_read_fuzzer.* are the actual files used by oss-fuzz,
    which retrieves them from the libpng repository at Github.
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,5 +1,5 @@
 #!/bin/bash -eu
-# Copyright 2017 Glenn Randers-Pehrson
+# Copyright 2017-2018 Glenn Randers-Pehrson
 # Copyright 2016 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Last changed in libpng 1.6.33 [September 28, 2017]
+# Last changed in libpng 1.6.35 [July 15, 2018]
 #
-# Revisions by Glenn Randers-Pehson, 2017:
+# Revisions by Glenn Randers-Pehrson, 2017:
 # 1. Build only the library, not the tools (changed "make -j$(nproc) all" to
 #     "make -j$(nproc) libpng16.la").
 # 2. Disabled WARNING and WRITE options in pnglibconf.dfa.
+# 3. Build zlib alongside libpng
 ################################################################################
 
 # Disable logging via library build configuration control.
@@ -30,9 +31,9 @@
 > scripts/pnglibconf.dfa.temp
 mv scripts/pnglibconf.dfa.temp scripts/pnglibconf.dfa
 
-# build the library.
+# build the libpng library.
 autoreconf -f -i
-./configure
+./configure --with-libpng-prefix=OSS_FUZZ_
 make -j$(nproc) clean
 make -j$(nproc) libpng16.la
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,11 +1,11 @@
 
 // libpng_read_fuzzer.cc
-// Copyright 2017 Glenn Randers-Pehrson
+// Copyright 2017-2018 Glenn Randers-Pehrson
 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that may
 // be found in the LICENSE file https://cs.chromium.org/chromium/src/LICENSE
 
-// Last changed in libpng 1.6.32 [August 24, 2017]
+// Last changed in libpng 1.6.35 [July 15, 2018]
 
 // The modifications in 2017 by Glenn Randers-Pehrson include
 // 1. addition of a PNG_CLEANUP macro,
@@ -13,6 +13,7 @@
 // 3. adding "#include <string.h>" which is needed on some platforms
 //    to provide memcpy().
 // 4. adding read_end_info() and creating an end_info structure.
+// 5. adding calls to png_set_*() transforms commonly used by browsers.
 
 #include <stddef.h>
 #include <stdint.h>
@@ -67,7 +68,7 @@
   }
 };
 
-void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) {
+void user_read_data(png_structp png_ptr, png_bytep data, size_t length) {
   BufState* buf_state = static_cast<BufState*>(png_get_io_ptr(png_ptr));
   if (length > buf_state->bytes_left) {
     png_error(png_ptr, "read error");
@@ -136,9 +137,6 @@
 
   // Reading.
   png_read_info(png_handler.png_ptr, png_handler.info_ptr);
-  png_handler.row_ptr = png_malloc(
-      png_handler.png_ptr, png_get_rowbytes(png_handler.png_ptr,
-                                               png_handler.info_ptr));
 
   // reset error handler to put png_deleter into scope.
   if (setjmp(png_jmpbuf(png_handler.png_ptr))) {
@@ -163,9 +161,21 @@
     return 0;
   }
 
+  // Set several transforms that browsers typically use:
+  png_set_gray_to_rgb(png_handler.png_ptr);
+  png_set_expand(png_handler.png_ptr);
+  png_set_packing(png_handler.png_ptr);
+  png_set_scale_16(png_handler.png_ptr);
+  png_set_tRNS_to_alpha(png_handler.png_ptr);
+
   int passes = png_set_interlace_handling(png_handler.png_ptr);
-  png_start_read_image(png_handler.png_ptr);
 
+  png_read_update_info(png_handler.png_ptr, png_handler.info_ptr);
+
+  png_handler.row_ptr = png_malloc(
+      png_handler.png_ptr, png_get_rowbytes(png_handler.png_ptr,
+                                            png_handler.info_ptr));
+
   for (int pass = 0; pass < passes; ++pass) {
     for (png_uint_32 y = 0; y < height; ++y) {
       png_read_row(png_handler.png_ptr,

Deleted: branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/newcc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/newcc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/newcc	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,190 +0,0 @@
-
-// libpng_read_fuzzer.cc
-// Copyright 2017 Glenn Randers-Pehrson
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that may
-// be found in the LICENSE file https://cs.chromium.org/chromium/src/LICENSE
-
-// Last changed in libpng 1.6.33beta03 [September 27, 2017]
-
-// The modifications in 2017 by Glenn Randers-Pehrson include
-// 1. addition of a PNG_CLEANUP macro,
-// 2. setting the option to ignore ADLER32 checksums,
-// 3. adding "#include <string.h>" which is needed on some platforms
-//    to provide memcpy().
-// 4. adding read_end_info() and creating an end_info structure.
-
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <vector>
-
-#define PNG_INTERNAL
-#include "png.h"
-
-struct BufState {
-  const uint8_t* data;
-  size_t bytes_left;
-};
-
-struct PngObjectHandler {
-  png_infop info_ptr = nullptr;
-  png_structp png_ptr = nullptr;
-  png_infop end_info_ptr = nullptr;
-  png_voidp row_ptr = nullptr;
-  BufState* buf_state = nullptr;
-
-  ~PngObjectHandler() {
-    if (row_ptr)
-      png_free(png_ptr, row_ptr);
-    if (end_info_ptr)
-      png_destroy_read_struct(&png_ptr, &info_ptr, &end_info_ptr);
-    else if (info_ptr) 
-      png_destroy_read_struct(&png_ptr, &info_ptr, nullptr);
-    else
-      png_destroy_read_struct(&png_ptr, nullptr, nullptr);
-    delete buf_state;
-  }
-};
-
-void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) {
-  BufState* buf_state = static_cast<BufState*>(png_get_io_ptr(png_ptr));
-  if (length > buf_state->bytes_left) {
-    png_error(png_ptr, "read error");
-  }
-  memcpy(data, buf_state->data, length);
-  buf_state->bytes_left -= length;
-  buf_state->data += length;
-}
-
-static const int kPngHeaderSize = 8;
-
-// Entry point for LibFuzzer.
-// Roughly follows the libpng book example:
-// http://www.libpng.org/pub/png/book/chapter13.html
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-  if (size < kPngHeaderSize) {
-    return 0;
-  }
-
-  std::vector<unsigned char> v(data, data + size);
-  if (png_sig_cmp(v.data(), 0, kPngHeaderSize)) {
-    // not a PNG.
-    return 0;
-  }
-
-  PngObjectHandler png_handler;
-  png_handler.png_ptr = nullptr;
-  png_handler.row_ptr = nullptr;
-  png_handler.info_ptr = nullptr;
-  png_handler.end_info_ptr = nullptr;
-
-  png_handler.png_ptr = png_create_read_struct
-    (PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
-  if (!png_handler.png_ptr) {
-    return 0;
-  }
-
-#define PNG_CLEANUP \
-  if(png_handler.png_ptr) \
-  { \
-    if (png_handler.row_ptr) \
-      png_free(png_handler.png_ptr, png_handler.row_ptr); \
-    if (png_handler.end_info_ptr) \
-      png_destroy_read_struct(&png_handler.png_ptr, &png_handler.info_ptr,\
-        &png_handler.end_info_ptr); \
-    else if (png_handler.info_ptr) \
-      png_destroy_read_struct(&png_handler.png_ptr, &png_handler.info_ptr,\
-        nullptr); \
-    else \
-      png_destroy_read_struct(&png_handler.png_ptr, nullptr, nullptr); \
-    png_handler.png_ptr = nullptr; \
-    png_handler.row_ptr = nullptr; \
-    png_handler.info_ptr = nullptr; \
-    png_handler.end_info_ptr = nullptr; \
-  }
-
-  png_handler.info_ptr = png_create_info_struct(png_handler.png_ptr);
-  if (!png_handler.info_ptr) {
-    PNG_CLEANUP
-    return 0;
-  }
-
-  png_handler.end_info_ptr = png_create_info_struct(png_handler.png_ptr);
-  if (!png_handler.end_info_ptr) {
-    PNG_CLEANUP
-    return 0;
-  }
-
-  /* Treat benign errors as warnings */
-  png_set_benign_errors(png_handler.png_ptr, 1);
-
-  png_set_crc_action(png_handler.png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE);
-
-#ifdef PNG_IGNORE_ADLER32
-  png_set_option(png_handler.png_ptr, PNG_IGNORE_ADLER32, PNG_OPTION_ON);
-#endif
-
-  // Setting up reading from buffer.
-  png_handler.buf_state = new BufState();
-  png_handler.buf_state->data = data + kPngHeaderSize;
-  png_handler.buf_state->bytes_left = size - kPngHeaderSize;
-  png_set_read_fn(png_handler.png_ptr, png_handler.buf_state, user_read_data);
-  png_set_sig_bytes(png_handler.png_ptr, kPngHeaderSize);
-
-  if (setjmp(png_jmpbuf(png_handler.png_ptr))) {
-    PNG_CLEANUP
-    return 0;
-  }
-
-  // Reading.
-  png_read_info(png_handler.png_ptr, png_handler.info_ptr);
-  png_read_update_info(png_handler.png_ptr, png_handler.info_ptr);
-  png_handler.row_ptr = png_malloc(
-      png_handler.png_ptr, png_get_rowbytes(png_handler.png_ptr,
-                                               png_handler.info_ptr));
-
-  // reset error handler to put png_deleter into scope.
-  if (setjmp(png_jmpbuf(png_handler.png_ptr))) {
-    PNG_CLEANUP
-    return 0;
-  }
-
-  png_uint_32 width, height;
-  int bit_depth, color_type, interlace_type, compression_type;
-  int filter_type;
-
-  if (!png_get_IHDR(png_handler.png_ptr, png_handler.info_ptr, &width,
-                    &height, &bit_depth, &color_type, &interlace_type,
-                    &compression_type, &filter_type)) {
-    PNG_CLEANUP
-    return 0;
-  }
-
-  // This is going to be too slow.
-  if (width && height > 100000000 / width) {
-    PNG_CLEANUP
-    return 0;
-  }
-
-  int passes = png_set_interlace_handling(png_handler.png_ptr);
-  png_start_read_image(png_handler.png_ptr);
-
-  /* To do: prevent the optimizer from removing this code entirely */
-  for (int pass = 0; pass < passes; ++pass) {
-    for (png_uint_32 y = 0; y < height; ++y) {
-      png_read_row(png_handler.png_ptr,
-                   static_cast<png_bytep>(png_handler.row_ptr), nullptr);
-    }
-  }
-
-  png_read_end(png_handler.png_ptr, png_handler.end_info_ptr);
-
-  PNG_CLEANUP
-
-  /* TO do: exercise the progressive reader here */
-
-  return 0;
-}

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/README	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/README	2018-11-12 19:12:53 UTC (rev 807)
@@ -17,7 +17,7 @@
 Some history
 ------------
 Soon after the creation of PNG in 1995, the need was felt for a set of
-pnmtopng / pngtopnm utilities. Independantly Alexander Lehmann and I
+pnmtopng / pngtopnm utilities. Independently Alexander Lehmann and I
 (Willem van Schaik) started such a project. Luckily we discovered this
 and merged the two together into pnmtopng.tar.gz, which is available
 from a/o ftp://ftp.simplesystems.org/pub/libpng/png/.

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.bat
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.bat	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.bat	2018-11-12 19:12:53 UTC (rev 807)
@@ -7,7 +7,7 @@
 REM -- full-color
 png2pnm.exe -noraw ..\pngsuite\basn2c08.png basn2c08.ppm
 png2pnm.exe -noraw ..\pngsuite\basn2c16.png basn2c16.ppm
-REM -- palletted
+REM -- paletted
 png2pnm.exe -noraw ..\pngsuite\basn3p01.png basn3p01.ppm
 png2pnm.exe -noraw ..\pngsuite\basn3p02.png basn3p02.ppm
 png2pnm.exe -noraw ..\pngsuite\basn3p04.png basn3p04.ppm
@@ -27,7 +27,7 @@
 REM -- full-color
 png2pnm.exe -raw ..\pngsuite\basn2c08.png rawn2c08.ppm
 png2pnm.exe -raw ..\pngsuite\basn2c16.png rawn2c16.ppm
-REM -- palletted
+REM -- paletted
 png2pnm.exe -raw ..\pngsuite\basn3p01.png rawn3p01.ppm
 png2pnm.exe -raw ..\pngsuite\basn3p02.png rawn3p02.ppm
 png2pnm.exe -raw ..\pngsuite\basn3p04.png rawn3p04.ppm

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.sh	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.sh	2018-11-12 19:12:53 UTC (rev 807)
@@ -8,7 +8,7 @@
 # -- full-color
 ./png2pnm -noraw ../pngsuite/basn2c08.png basn2c08.ppm
 ./png2pnm -noraw ../pngsuite/basn2c16.png basn2c16.ppm
-# -- palletted
+# -- paletted
 ./png2pnm -noraw ../pngsuite/basn3p01.png basn3p01.ppm
 ./png2pnm -noraw ../pngsuite/basn3p02.png basn3p02.ppm
 ./png2pnm -noraw ../pngsuite/basn3p04.png basn3p04.ppm
@@ -28,7 +28,7 @@
 # -- full-color
 ./png2pnm -raw ../pngsuite/basn2c08.png rawn2c08.ppm
 ./png2pnm -raw ../pngsuite/basn2c16.png rawn2c16.ppm
-# -- palletted
+# -- paletted
 ./png2pnm -raw ../pngsuite/basn3p01.png rawn3p01.ppm
 ./png2pnm -raw ../pngsuite/basn3p02.png rawn3p02.ppm
 ./png2pnm -raw ../pngsuite/basn3p04.png rawn3p04.ppm

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.bat
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.bat	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.bat	2018-11-12 19:12:53 UTC (rev 807)
@@ -7,7 +7,7 @@
 REM -- full-color
 pnm2png.exe basn2c08.ppm basn2c08.png
 pnm2png.exe basn2c16.ppm basn2c16.png
-REM -- palletted
+REM -- paletted
 pnm2png.exe basn3p01.ppm basn3p01.png
 pnm2png.exe basn3p02.ppm basn3p02.png
 pnm2png.exe basn3p04.ppm basn3p04.png
@@ -27,7 +27,7 @@
 REM -- full-color
 pnm2png.exe rawn2c08.ppm rawn2c08.png
 pnm2png.exe rawn2c16.ppm rawn2c16.png
-REM -- palletted
+REM -- paletted
 pnm2png.exe rawn3p01.ppm rawn3p01.png
 pnm2png.exe rawn3p02.ppm rawn3p02.png
 pnm2png.exe rawn3p04.ppm rawn3p04.png

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.sh	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.sh	2018-11-12 19:12:53 UTC (rev 807)
@@ -8,7 +8,7 @@
 # -- full-color
 ./pnm2png basn2c08.ppm basn2c08.png
 ./pnm2png basn2c16.ppm basn2c16.png
-# -- palletted
+# -- paletted
 ./pnm2png basn3p01.ppm basn3p01.png
 ./pnm2png basn3p02.ppm basn3p02.png
 ./pnm2png basn3p04.ppm basn3p04.png
@@ -28,7 +28,7 @@
 # -- full-color
 ./pnm2png rawn2c08.ppm rawn2c08.png
 ./pnm2png rawn2c16.ppm rawn2c16.png
-# -- palletted
+# -- paletted
 ./pnm2png rawn3p01.ppm rawn3p01.png
 ./pnm2png rawn3p02.ppm rawn3p02.png
 ./pnm2png rawn3p04.ppm rawn3p04.png

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/README	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/README	2018-11-12 19:12:53 UTC (rev 807)
@@ -16,6 +16,8 @@
 The "ft*.png" images are "free/libre" replacements for the transparent
 corresponding t*.png images in the PngSuite.
 
+The "i*.png" images are the same images, but interlaced.
+
 The images in this directory represent the basic PNG color-types:
 grayscale (1-16 bit deep), full color (8 or 16 bit), paletted
 (1-8 bit) and grayscale or color images with alpha channel. You

Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/bad_interlace_conversions.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/bad_interlace_conversions.txt	                        (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/bad_interlace_conversions.txt	2018-11-12 19:12:53 UTC (rev 807)
@@ -0,0 +1,9 @@
+basn0g01.png
+basn0g02.png
+basn0g04.png
+basn3p01.png
+basn3p02.png
+basn3p04.png
+ftbbn0g01.png
+ftbbn0g02.png
+ftbbn0g04.png


Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/bad_interlace_conversions.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g16.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g16.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g16.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g16.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn0g16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c16.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c16.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c16.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c16.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn2c16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn3p08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn3p08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn3p08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn3p08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn3p08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a16.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a16.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a16.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a16.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn4a16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a16.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a16.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a16.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a16.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/ibasn6a16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn2c16.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn2c16.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn2c16.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn2c16.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn2c16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn3p08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn3p08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn3p08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn3p08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbbn3p08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn2c16.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn2c16.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn2c16.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn2c16.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn2c16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn3p08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn3p08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn3p08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn3p08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbgn3p08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbrn2c08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbrn2c08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbrn2c08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbrn2c08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbrn2c08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn0g16.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn0g16.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn0g16.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn0g16.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn0g16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn3p08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn3p08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn3p08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn3p08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbwn3p08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbyn3p08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbyn3p08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbyn3p08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbyn3p08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftbyn3p08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n0g08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n0g08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n0g08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n0g08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n0g08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n2c08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n2c08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n2c08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n2c08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n2c08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n3p08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n3p08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n3p08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n3p08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp0n3p08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp1n3p08.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp1n3p08.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp1n3p08.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp1n3p08.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/iftp1n3p08.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/README	                        (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/README	2018-11-12 19:12:53 UTC (rev 807)
@@ -0,0 +1,2 @@
+
+These images fail the "pngimage-quick" and "pngimage-full" tests.


Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g01.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g01.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g01.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g01.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g01.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g02.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g02.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g02.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g02.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g02.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g04.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g04.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g04.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g04.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn0g04.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p01.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p01.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p01.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p01.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p01.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p02.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p02.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p02.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p02.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p02.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p04.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p04.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p04.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p04.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/ibasn3p04.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g01.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g01.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g01.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g01.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g01.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g02.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g02.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g02.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g02.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g02.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g04.png
===================================================================
(Binary files differ)

Index: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g04.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g04.png	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g04.png	2018-11-12 19:12:53 UTC (rev 807)

Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/interlaced/iftbbn0g04.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/README	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/README	2018-11-12 19:12:53 UTC (rev 807)
@@ -46,7 +46,7 @@
 
 static int png_have_vsx(png_structp png_ptr);
 
-That function must return 1 if ARM NEON instructions are supported, 0 if not.
+That function must return 1 if POWERPC_VSX instructions are supported, 0 if not.
 It must not execute png_error unless it detects a bug.  A png_error will prevent
 the reading of the PNG and in the future, writing too.
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/testpngs/makepngs.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/testpngs/makepngs.sh	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/testpngs/makepngs.sh	2018-11-12 19:12:53 UTC (rev 807)
@@ -74,7 +74,7 @@
    --coverage)
       # Comments below indicate cases known to be required and not duplicated
       # in other (required) cases; the aim is to get a minimal set that gives
-      # the maxium code coverage.
+      # the maximum code coverage.
       mpg none gray-alpha 8 # required: code coverage, sRGB opaque component
       mpg none palette 8 # required: basic palette read
       mpg 1.8 gray 2 # required: tests gamma threshold code

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt	2018-11-12 19:12:53 UTC (rev 807)
@@ -54,7 +54,7 @@
 }
 
 # In beta versions the version string which appears in files can be a little
-# long and cause spuriously overlong lines.  To avoid this subtitute the version
+# long and cause spuriously overlong lines.  To avoid this substitute the version
 # string with a 'standard' version a.b.cc before checking for long lines.
 if test -r png.h
 then

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -191,7 +191,7 @@
    /* This controls the order of search. */
    { "huffman", Z_HUFFMAN_ONLY },
    { "RLE", Z_RLE },
-   { "fixed", Z_FIXED }, /* the remainder do window searchs */
+   { "fixed", Z_FIXED }, /* the remainder do window searches */
    { "filtered", Z_FILTERED },
    { "default", Z_DEFAULT_STRATEGY },
    { all, 0 }
@@ -336,7 +336,7 @@
 #  define VLC(name) VLCIDAT(name) VLCiCCP(name) VLCzTXt(name)
 
 #  ifdef PNG_SW_COMPRESS_png_level
-      /* The libpng compression level isn't searched beause it justs sets the
+      /* The libpng compression level isn't searched because it justs sets the
        * other things that are searched!
        */
       VLO("compression", compression, 0)
@@ -1725,7 +1725,7 @@
 }
 
 static void PNGCBAPI
-read_function(png_structp pp, png_bytep data, png_size_t size)
+read_function(png_structp pp, png_bytep data, size_t size)
 {
    struct display *dp = get_dp(pp);
 
@@ -1881,7 +1881,7 @@
 }
 
 static void PNGCBAPI
-write_function(png_structp pp, png_bytep data, png_size_t size)
+write_function(png_structp pp, png_bytep data, size_t size)
 {
    struct display *dp = get_dp(pp);
 
@@ -2117,7 +2117,7 @@
     *
     * This function looks through the stack from the bottom up looking for an
     * option that does not match the current best value.  When it finds one it
-    * checks to see if it is more or less desireable and returns true or false
+    * checks to see if it is more or less desirable and returns true or false
     * as appropriate.
     *
     * Notice that this means that the order options are pushed onto the stack

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -2363,7 +2363,7 @@
       flush = Z_NO_FLUSH;
       out_bytes = 0;
 
-      /* NOTE: expression 3 is only evaluted on 'continue', because of the
+      /* NOTE: expression 3 is only evaluated on 'continue', because of the
        * 'break' at the end of this loop below.
        */
       for (;endrc == ZLIB_OK;
@@ -2664,7 +2664,7 @@
              * this case, so do the optimization anyway.
              */
             if (zlib.cksum)
-               chunk_message(zlib.chunk, "zlib checkum");
+               chunk_message(zlib.chunk, "zlib checksum");
             break;
 
 
@@ -3678,7 +3678,7 @@
    size_t i;
    static const char *usage_string[] = {
 "  Tests, optimizes and optionally fixes the zlib header in PNG files.",
-"  Optionally, when fixing, strips ancilliary chunks from the file.",
+"  Optionally, when fixing, strips ancillary chunks from the file.",
 0,
 "OPTIONS",
 "  OPERATION",

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/PngFile.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/PngFile.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/PngFile.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -410,15 +410,14 @@
 #ifndef PNG_STDIO_SUPPORTED
 
 static void
-png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+png_read_data(png_structp png_ptr, png_bytep data, size_t length)
 {
-   png_size_t check;
+   size_t check;
 
-   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+   /* fread() returns 0 on error, so it is OK to store this in a size_t
     * instead of an int, which is what fread() actually returns.
     */
-   check = (png_size_t)fread(data, (png_size_t)1, length,
-      (FILE *)png_ptr->io_ptr);
+   check = fread(data, 1, length, (FILE *)png_ptr->io_ptr);
 
    if (check != length)
    {
@@ -427,7 +426,7 @@
 }
 
 static void
-png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+png_write_data(png_structp png_ptr, png_bytep data, size_t length)
 {
    png_uint_32 check;
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/PngFile.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/PngFile.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/PngFile.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -23,8 +23,8 @@
                    int iWidth, int iHeight, png_color BkgColor);
 
 #ifndef PNG_STDIO_SUPPORTED
-static void png_read_data(png_structp png_ptr, png_bytep data, png_size_t length);
-static void png_write_data(png_structp png_ptr, png_bytep data, png_size_t length);
+static void png_read_data(png_structp png_ptr, png_bytep data, size_t length);
+static void png_write_data(png_structp png_ptr, png_bytep data, size_t length);
 static void png_flush(png_structp png_ptr);
 #endif
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/VisualPng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/VisualPng.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/visupng/VisualPng.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -716,7 +716,7 @@
     png_color                   bkgGray  = {127, 127, 127};
     png_color                   bkgWhite = {255, 255, 255};
 
-    /* allocate memory for the Device Independant bitmap */
+    /* allocate memory for the Device Independent bitmap */
 
     wDIRowBytes = (WORD) ((3 * cxWinSize + 3L) >> 2) << 2;
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/example.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/example.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/example.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -2,13 +2,14 @@
 #if 0 /* in case someone actually tries to compile this */
 
 /* example.c - an example of using libpng
- * Last changed in libpng 1.6.24 [August 4, 2016]
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Maintained 2018 Cosmin Truta
  * Maintained 1998-2016 Glenn Randers-Pehrson
  * Maintained 1996, 1997 Andreas Dilger)
  * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  * To the extent possible under law, the authors have waived
  * all copyright and related or neighboring rights to this file.
- * This work is published from: United States.
+ * This work is published from: United States, Canada.
  */
 
 /* This is an example of how to use libpng to read and write PNG files.
@@ -257,7 +258,7 @@
    /* Compare the first PNG_BYTES_TO_CHECK bytes of the signature.
       Return nonzero (true) if they match */
 
-   return(!png_sig_cmp(buf, (png_size_t)0, PNG_BYTES_TO_CHECK));
+   return(!png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK));
 }
 
 /* Read a PNG file.  You may want to return an error code if the read

Modified: branches/stable/source/src/libs/libpng/libpng-src/intel/filter_sse2_intrinsics.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/intel/filter_sse2_intrinsics.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/intel/filter_sse2_intrinsics.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -71,7 +71,7 @@
     * There is no pixel to the left of the first pixel.  It's encoded directly.
     * That works with our main loop if we just say that left pixel was zero.
     */
-   png_size_t rb;
+   size_t rb;
 
    __m128i a, d = _mm_setzero_si128();
 
@@ -104,7 +104,7 @@
     * There is no pixel to the left of the first pixel.  It's encoded directly.
     * That works with our main loop if we just say that left pixel was zero.
     */
-   png_size_t rb;
+   size_t rb;
 
    __m128i a, d = _mm_setzero_si128();
 
@@ -131,7 +131,7 @@
     * perfectly with our loop if we make sure a starts at zero.
     */
 
-   png_size_t rb;
+   size_t rb;
 
    const __m128i zero = _mm_setzero_si128();
 
@@ -185,7 +185,7 @@
     * predicted to be half of the pixel above it.  So again, this works
     * perfectly with our loop if we make sure a starts at zero.
     */
-   png_size_t rb;
+   size_t rb;
    const __m128i zero = _mm_setzero_si128();
    __m128i    b;
    __m128i a, d = zero;
@@ -257,7 +257,7 @@
     * Here we zero b and d, which become c and a respectively at the start of
     * the loop.
     */
-   png_size_t rb;
+   size_t rb;
    const __m128i zero = _mm_setzero_si128();
    __m128i c, b = zero,
            a, d = zero;
@@ -356,7 +356,7 @@
     * Here we zero b and d, which become c and a respectively at the start of
     * the loop.
     */
-   png_size_t rb;
+   size_t rb;
    const __m128i zero = _mm_setzero_si128();
    __m128i pa,pb,pc,smallest,nearest;
    __m128i c, b = zero,

Modified: branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,9 +1,8 @@
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.34 - September 29, 2017
+ libpng version 1.6.35 - July 15, 2018
  Updated and distributed by Glenn Randers-Pehrson
- <glennrp at users.sourceforge.net>
- Copyright (c) 1998-2017 Glenn Randers-Pehrson
+ Copyright (c) 1998-2018 Glenn Randers-Pehrson
 
  This document is released under the libpng license.
  For conditions of distribution and use, see the disclaimer
@@ -11,7 +10,7 @@
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.34 - September 29, 2017
+ libpng versions 0.97, January 1998, through 1.6.35 - July 15, 2018
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2017 Glenn Randers-Pehrson
 
@@ -348,18 +347,18 @@
     FILE *fp = fopen(file_name, "rb");
     if (!fp)
     {
-       return (ERROR);
+       return ERROR;
     }
 
     if (fread(header, 1, number, fp) != number)
     {
-       return (ERROR);
+       return ERROR;
     }
 
     is_png = !png_sig_cmp(header, 0, number);
     if (!is_png)
     {
-       return (NOT_PNG);
+       return NOT_PNG;
     }
 
 Next, png_struct and png_info need to be allocated and initialized.  In
@@ -378,7 +377,7 @@
         user_error_fn, user_warning_fn);
 
     if (!png_ptr)
-       return (ERROR);
+       return ERROR;
 
     png_infop info_ptr = png_create_info_struct(png_ptr);
 
@@ -386,7 +385,7 @@
     {
        png_destroy_read_struct(&png_ptr,
            (png_infopp)NULL, (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
 If you want to use your own memory allocation routines,
@@ -421,7 +420,7 @@
        png_destroy_read_struct(&png_ptr, &info_ptr,
            &end_info);
        fclose(fp);
-       return (ERROR);
+       return ERROR;
     }
 
 Pass (png_infopp)NULL instead of &end_info if you didn't create
@@ -503,7 +502,7 @@
 
            png_byte name[5];
            png_byte *data;
-           png_size_t size;
+           size_t size;
 
        /* Note that libpng has already taken care of
           the CRC handling */
@@ -512,9 +511,9 @@
           unknown chunk structure, process it, and return one
           of the following: */
 
-       return (-n); /* chunk had an error */
-       return (0); /* did not recognize */
-       return (n); /* success */
+       return -n; /* chunk had an error */
+       return 0; /* did not recognize */
+       return n; /* success */
     }
 
 (You can give your function another name that you like instead of
@@ -1003,7 +1002,7 @@
     png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
 
 In this case the output is assumed to be something like an sRGB conformant
-display preceeded by a power-law lookup table of power 1.45.  This is how
+display preceded by a power-law lookup table of power 1.45.  This is how
 early Mac systems behaved.
 
     png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR);
@@ -1055,7 +1054,7 @@
 
 When the default gamma of PNG files doesn't match the output gamma.
 If you have PNG files with no gamma information png_set_alpha_mode allows
-you to provide a default gamma, but it also sets the ouput gamma to the
+you to provide a default gamma, but it also sets the output gamma to the
 matching value.  If you know your PNG files have a gamma that doesn't
 match the output you can take advantage of the fact that
 png_set_alpha_mode always sets the output gamma but only sets the PNG
@@ -2409,7 +2408,7 @@
     {
        png_destroy_read_struct(&png_ptr, &info_ptr,
            (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
    png_read_end(png_ptr, end_info);
@@ -2549,7 +2548,7 @@
          user_error_fn, user_warning_fn);
 
     if (!png_ptr)
-        return (ERROR);
+        return ERROR;
 
     info_ptr = png_create_info_struct(png_ptr);
 
@@ -2557,7 +2556,7 @@
     {
        png_destroy_read_struct(&png_ptr,
           (png_infopp)NULL, (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
     if (setjmp(png_jmpbuf(png_ptr)))
@@ -2564,7 +2563,7 @@
     {
        png_destroy_read_struct(&png_ptr, &info_ptr,
           (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
     /* This one's new.  You can provide functions
@@ -2598,7 +2597,7 @@
     {
        png_destroy_read_struct(&png_ptr, &info_ptr,
            (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
     /* This one's new also.  Simply give it a chunk
@@ -2742,7 +2741,7 @@
     FILE *fp = fopen(file_name, "wb");
 
     if (!fp)
-       return (ERROR);
+       return ERROR;
 
 Next, png_struct and png_info need to be allocated and initialized.
 As these can be both relatively large, you may not want to store these
@@ -2757,7 +2756,7 @@
         user_error_fn, user_warning_fn);
 
     if (!png_ptr)
-       return (ERROR);
+       return ERROR;
 
     png_infop info_ptr = png_create_info_struct(png_ptr);
     if (!info_ptr)
@@ -2764,7 +2763,7 @@
     {
        png_destroy_write_struct(&png_ptr,
            (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
 If you want to use your own memory allocation routines,
@@ -2791,7 +2790,7 @@
     {
     png_destroy_write_struct(&png_ptr, &info_ptr);
        fclose(fp);
-       return (ERROR);
+       return ERROR;
     }
     ...
     return;
@@ -3779,7 +3778,7 @@
 formats do not accommodate your needs then you can, and should, use the more
 sophisticated APIs above - these support a wide variety of in-memory formats
 and a wide variety of sophisticated transformations to those formats as well
-as a wide variety of APIs to manipulate ancilliary information.
+as a wide variety of APIs to manipulate ancillary information.
 
 To read a PNG file using the simplified API:
 
@@ -4102,7 +4101,7 @@
       The PNG header is read from the stdio FILE object.
 
    int png_image_begin_read_from_memory(png_imagep image,
-      png_const_voidp memory, png_size_t size)
+      png_const_voidp memory, size_t size)
 
       The PNG header is read from the given memory buffer.
 
@@ -4255,10 +4254,10 @@
 The replacement I/O functions must have prototypes as follows:
 
     void user_read_data(png_structp png_ptr,
-        png_bytep data, png_size_t length);
+        png_bytep data, size_t length);
 
     void user_write_data(png_structp png_ptr,
-        png_bytep data, png_size_t length);
+        png_bytep data, size_t length);
 
     void user_flush_data(png_structp png_ptr);
 
@@ -4784,7 +4783,7 @@
 the process.
 
 We changed the prototypes of png_get_compression_buffer_size() and
-png_set_compression_buffer_size() to work with png_size_t instead of
+png_set_compression_buffer_size() to work with size_t instead of
 png_uint_32.
 
 Support for numbered error messages was removed by default, since we
@@ -5255,9 +5254,8 @@
     https://github.com/glennrp/libpng or
     https://sourceforge.net/p/libpng/code/ci/libpng16/tree/
 
-Patches can be sent to glennrp at users.sourceforge.net or to
-png-mng-implement at lists.sourceforge.net or you can upload them to
-the libpng bug tracker at
+Patches can be sent to png-mng-implement at lists.sourceforge.net or
+you can upload them to the libpng bug tracker at
 
     https://libpng.sourceforge.io/
 
@@ -5266,9 +5264,9 @@
     https://github.com/glennrp/libpng/pulls
 
 We also accept patches built from the tar or zip distributions, and
-simple verbal discriptions of bug fixes, reported either to the
+simple verbal descriptions of bug fixes, reported either to the
 SourceForge bug tracker, to the png-mng-implement at lists.sf.net
-mailing list, as github issues, or directly to glennrp.
+mailing list, as github issues.
 
 XV. Coding style
 
@@ -5289,7 +5287,7 @@
 The braces can be omitted from simple one-line actions:
 
     if (condition)
-       return (0);
+       return 0;
 
 We use 3-space indentation, except for continued statements which
 are usually indented the same as the first line of the statement
@@ -5414,7 +5412,7 @@
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.6.34 are Y2K compliant.  It is my belief that earlier
+upward through 1.6.35 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has two year fields.  One is a 2-byte unsigned integer

Modified: branches/stable/source/src/libs/libpng/libpng-src/libpng.3
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpng.3	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpng.3	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "September 29, 2017"
+.TH LIBPNG 3 "July 15, 2018"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.34
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.35
 .SH SYNOPSIS
 \fB
 #include <png.h>\fP
@@ -225,7 +225,7 @@
 
 \fBint png_image_begin_read_from_stdio (png_imagep \fP\fIimage\fP\fB, FILE* \fIfile\fP\fB);\fP
 
-\fBint, png_image_begin_read_from_memory (png_imagep \fP\fIimage\fP\fB, png_const_voidp \fP\fImemory\fP\fB, png_size_t \fIsize\fP\fB);\fP
+\fBint, png_image_begin_read_from_memory (png_imagep \fP\fIimage\fP\fB, png_const_voidp \fP\fImemory\fP\fB, size_t \fIsize\fP\fB);\fP
 
 \fBint png_image_finish_read (png_imagep \fP\fIimage\fP\fB, png_colorp \fP\fIbackground\fP\fB, void \fP\fI*buffer\fP\fB, png_int_32 \fP\fIrow_stride\fP\fB, void \fI*colormap\fP\fB);\fP
 
@@ -237,7 +237,7 @@
 
 \fBint png_image_write_to_stdio (png_imagep \fP\fIimage\fP\fB, FILE \fP\fI*file\fP\fB, int \fP\fIconvert_to_8_bit\fP\fB, const void \fP\fI*buffer\fP\fB, png_int_32 \fP\fIrow_stride\fP\fB, void \fI*colormap)\fP\fB);\fP
 
-\fBvoid png_info_init_3 (png_infopp \fP\fIinfo_ptr\fP\fB, png_size_t \fIpng_info_struct_size\fP\fB);\fP
+\fBvoid png_info_init_3 (png_infopp \fP\fIinfo_ptr\fP\fB, size_t \fIpng_info_struct_size\fP\fB);\fP
 
 \fBvoid png_init_io (png_structp \fP\fIpng_ptr\fP\fB, FILE \fI*fp\fP\fB);\fP
 
@@ -251,9 +251,9 @@
 
 \fBpng_uint_32 png_permit_mng_features (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fImng_features_permitted\fP\fB);\fP
 
-\fBvoid png_process_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_size\fP\fB);\fP
+\fBvoid png_process_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, size_t \fIbuffer_size\fP\fB);\fP
 
-\fBpng_size_t png_process_data_pause \fP\fI(png_structp\fP\fB, int \fIsave\fP\fB);\fP
+\fBsize_t png_process_data_pause \fP\fI(png_structp\fP\fB, int \fIsave\fP\fB);\fP
 
 \fBpng_uint_32 png_process_data_skip \fI(png_structp\fP\fB);\fP
 
@@ -475,15 +475,15 @@
 
 \fBvoid png_set_write_user_transform_fn (png_structp \fP\fIpng_ptr\fP\fB, png_user_transform_ptr \fIwrite_user_transform_fn\fP\fB);\fP
 
-\fBint png_sig_cmp (png_bytep \fP\fIsig\fP\fB, png_size_t \fP\fIstart\fP\fB, png_size_t \fInum_to_check\fP\fB);\fP
+\fBint png_sig_cmp (png_bytep \fP\fIsig\fP\fB, size_t \fP\fIstart\fP\fB, size_t \fInum_to_check\fP\fB);\fP
 
 \fBvoid png_start_read_image (png_structp \fIpng_ptr\fP\fB);\fP
 
 \fBvoid png_warning (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fImessage\fP\fB);\fP
 
-\fBvoid png_write_chunk (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIchunk_name\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+\fBvoid png_write_chunk (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIchunk_name\fP\fB, png_bytep \fP\fIdata\fP\fB, size_t \fIlength\fP\fB);\fP
 
-\fBvoid png_write_chunk_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+\fBvoid png_write_chunk_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, size_t \fIlength\fP\fB);\fP
 
 \fBvoid png_write_chunk_end (png_structp \fIpng_ptr\fP\fB);\fP
 
@@ -518,10 +518,9 @@
 .SH LIBPNG.TXT
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.34 - September 29, 2017
+ libpng version 1.6.35 - July 15, 2018
  Updated and distributed by Glenn Randers-Pehrson
- <glennrp at users.sourceforge.net>
- Copyright (c) 1998-2017 Glenn Randers-Pehrson
+ Copyright (c) 1998-2018 Glenn Randers-Pehrson
 
  This document is released under the libpng license.
  For conditions of distribution and use, see the disclaimer
@@ -529,7 +528,7 @@
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.34 - September 29, 2017
+ libpng versions 0.97, January 1998, through 1.6.35 - July 15, 2018
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2017 Glenn Randers-Pehrson
 
@@ -866,18 +865,18 @@
     FILE *fp = fopen(file_name, "rb");
     if (!fp)
     {
-       return (ERROR);
+       return ERROR;
     }
 
     if (fread(header, 1, number, fp) != number)
     {
-       return (ERROR);
+       return ERROR;
     }
 
     is_png = !png_sig_cmp(header, 0, number);
     if (!is_png)
     {
-       return (NOT_PNG);
+       return NOT_PNG;
     }
 
 Next, png_struct and png_info need to be allocated and initialized.  In
@@ -896,7 +895,7 @@
         user_error_fn, user_warning_fn);
 
     if (!png_ptr)
-       return (ERROR);
+       return ERROR;
 
     png_infop info_ptr = png_create_info_struct(png_ptr);
 
@@ -904,7 +903,7 @@
     {
        png_destroy_read_struct(&png_ptr,
            (png_infopp)NULL, (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
 If you want to use your own memory allocation routines,
@@ -939,7 +938,7 @@
        png_destroy_read_struct(&png_ptr, &info_ptr,
            &end_info);
        fclose(fp);
-       return (ERROR);
+       return ERROR;
     }
 
 Pass (png_infopp)NULL instead of &end_info if you didn't create
@@ -1021,7 +1020,7 @@
 
            png_byte name[5];
            png_byte *data;
-           png_size_t size;
+           size_t size;
 
        /* Note that libpng has already taken care of
           the CRC handling */
@@ -1030,9 +1029,9 @@
           unknown chunk structure, process it, and return one
           of the following: */
 
-       return (\-n); /* chunk had an error */
-       return (0); /* did not recognize */
-       return (n); /* success */
+       return \-n; /* chunk had an error */
+       return 0; /* did not recognize */
+       return n; /* success */
     }
 
 (You can give your function another name that you like instead of
@@ -1521,7 +1520,7 @@
     png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
 
 In this case the output is assumed to be something like an sRGB conformant
-display preceeded by a power-law lookup table of power 1.45.  This is how
+display preceded by a power-law lookup table of power 1.45.  This is how
 early Mac systems behaved.
 
     png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR);
@@ -1573,7 +1572,7 @@
 
 When the default gamma of PNG files doesn't match the output gamma.
 If you have PNG files with no gamma information png_set_alpha_mode allows
-you to provide a default gamma, but it also sets the ouput gamma to the
+you to provide a default gamma, but it also sets the output gamma to the
 matching value.  If you know your PNG files have a gamma that doesn't
 match the output you can take advantage of the fact that
 png_set_alpha_mode always sets the output gamma but only sets the PNG
@@ -2927,7 +2926,7 @@
     {
        png_destroy_read_struct(&png_ptr, &info_ptr,
            (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
    png_read_end(png_ptr, end_info);
@@ -3067,7 +3066,7 @@
          user_error_fn, user_warning_fn);
 
     if (!png_ptr)
-        return (ERROR);
+        return ERROR;
 
     info_ptr = png_create_info_struct(png_ptr);
 
@@ -3075,7 +3074,7 @@
     {
        png_destroy_read_struct(&png_ptr,
           (png_infopp)NULL, (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
     if (setjmp(png_jmpbuf(png_ptr)))
@@ -3082,7 +3081,7 @@
     {
        png_destroy_read_struct(&png_ptr, &info_ptr,
           (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
     /* This one's new.  You can provide functions
@@ -3116,7 +3115,7 @@
     {
        png_destroy_read_struct(&png_ptr, &info_ptr,
            (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
     /* This one's new also.  Simply give it a chunk
@@ -3260,7 +3259,7 @@
     FILE *fp = fopen(file_name, "wb");
 
     if (!fp)
-       return (ERROR);
+       return ERROR;
 
 Next, png_struct and png_info need to be allocated and initialized.
 As these can be both relatively large, you may not want to store these
@@ -3275,7 +3274,7 @@
         user_error_fn, user_warning_fn);
 
     if (!png_ptr)
-       return (ERROR);
+       return ERROR;
 
     png_infop info_ptr = png_create_info_struct(png_ptr);
     if (!info_ptr)
@@ -3282,7 +3281,7 @@
     {
        png_destroy_write_struct(&png_ptr,
            (png_infopp)NULL);
-       return (ERROR);
+       return ERROR;
     }
 
 If you want to use your own memory allocation routines,
@@ -3309,7 +3308,7 @@
     {
     png_destroy_write_struct(&png_ptr, &info_ptr);
        fclose(fp);
-       return (ERROR);
+       return ERROR;
     }
     ...
     return;
@@ -4297,7 +4296,7 @@
 formats do not accommodate your needs then you can, and should, use the more
 sophisticated APIs above - these support a wide variety of in-memory formats
 and a wide variety of sophisticated transformations to those formats as well
-as a wide variety of APIs to manipulate ancilliary information.
+as a wide variety of APIs to manipulate ancillary information.
 
 To read a PNG file using the simplified API:
 
@@ -4620,7 +4619,7 @@
       The PNG header is read from the stdio FILE object.
 
    int png_image_begin_read_from_memory(png_imagep image,
-      png_const_voidp memory, png_size_t size)
+      png_const_voidp memory, size_t size)
 
       The PNG header is read from the given memory buffer.
 
@@ -4773,10 +4772,10 @@
 The replacement I/O functions must have prototypes as follows:
 
     void user_read_data(png_structp png_ptr,
-        png_bytep data, png_size_t length);
+        png_bytep data, size_t length);
 
     void user_write_data(png_structp png_ptr,
-        png_bytep data, png_size_t length);
+        png_bytep data, size_t length);
 
     void user_flush_data(png_structp png_ptr);
 
@@ -5302,7 +5301,7 @@
 the process.
 
 We changed the prototypes of png_get_compression_buffer_size() and
-png_set_compression_buffer_size() to work with png_size_t instead of
+png_set_compression_buffer_size() to work with size_t instead of
 png_uint_32.
 
 Support for numbered error messages was removed by default, since we
@@ -5773,9 +5772,8 @@
     https://github.com/glennrp/libpng or
     https://sourceforge.net/p/libpng/code/ci/libpng16/tree/
 
-Patches can be sent to glennrp at users.sourceforge.net or to
-png-mng-implement at lists.sourceforge.net or you can upload them to
-the libpng bug tracker at
+Patches can be sent to png-mng-implement at lists.sourceforge.net or
+uploaded to the libpng bug tracker at
 
     https://libpng.sourceforge.io/
 
@@ -5784,9 +5782,9 @@
     https://github.com/glennrp/libpng/pulls
 
 We also accept patches built from the tar or zip distributions, and
-simple verbal discriptions of bug fixes, reported either to the
+simple verbal descriptions of bug fixes, reported either to the
 SourceForge bug tracker, to the png-mng-implement at lists.sf.net
-mailing list, as github issues, or directly to glennrp.
+mailing list, as github issues.
 
 .SH XV. Coding style
 
@@ -5807,7 +5805,7 @@
 The braces can be omitted from simple one-line actions:
 
     if (condition)
-       return (0);
+       return 0;
 
 We use 3-space indentation, except for continued statements which
 are usually indented the same as the first line of the statement
@@ -5932,7 +5930,7 @@
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.6.34 are Y2K compliant.  It is my belief that earlier
+upward through 1.6.35 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has two year fields.  One is a 2-byte unsigned integer
@@ -6034,7 +6032,7 @@
  ...
  1.5.30                  15    10530  15.so.15.30[.0]
  ...
- 1.6.34                  16    10634  16.so.16.34[.0]
+ 1.6.35                  16    10635  16.so.16.35[.0]
 
 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -6090,9 +6088,9 @@
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.6.34 - September 29, 2017:
+Libpng version 1.6.35 - July 15, 2018:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
-Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
+Maintained by Glenn Randers-Pehrson.
 
 Supported by the PNG development group
 .br
@@ -6115,8 +6113,8 @@
 
 This code is released under the libpng license.
 
-libpng versions 1.0.7, July 1, 2000 through 1.6.34, September 29, 2017 are
-Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
+libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
 derived from libpng-1.0.6, and are distributed according to the same
 disclaimer and license as libpng-1.0.6 with the following individuals
 added to the list of Contributing Authors:
@@ -6242,8 +6240,6 @@
 files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
 
 Glenn Randers-Pehrson
-glennrp at users.sourceforge.net
-September 29, 2017
+July 15, 2018
 
 .\" end of man page
-

Modified: branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,11 +1,15 @@
-.TH LIBPNGPF 3 "April 1, 2017"
+.TH LIBPNGPF 3 "July 15, 2018"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.34
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.35
 (private functions)
 .SH SYNOPSIS
-\fB\fB#include \fI\fI"pngpriv.h"
+\fB#include \fI"pngpriv.h"
 
-\fB\fBAs of libpng version \fP\fI\fP\fI1.5.1\fP\fB\fP\fB, this section is no longer \fP\fI\fP\fImaintained\fP\fB\fP\fB, now that the private function prototypes are hidden in pngpriv.h and not accessible to applications. Look in pngpriv.h for the prototypes and a short description of each \fI\fIfunction.
+\fBAs of libpng version \fP\fI1.5.1\fP\fB, this section is no longer
+\fP\fImaintained\fP\fB, now that the private function prototypes are hidden in
+\fP\fIpngpriv.h\fP\fB and not accessible to applications. Look in
+\fP\fIpngpriv.h\fP\fB for the prototypes and a short description of each
+function.
 
 .SH DESCRIPTION
 The functions previously listed here are used privately by libpng and are not

Modified: branches/stable/source/src/libs/libpng/libpng-src/mips/filter_msa_intrinsics.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/mips/filter_msa_intrinsics.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/mips/filter_msa_intrinsics.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -366,8 +366,8 @@
 void png_read_filter_row_up_msa(png_row_infop row_info, png_bytep row,
                                 png_const_bytep prev_row)
 {
-   png_size_t i, cnt, cnt16, cnt32;
-   png_size_t istop = row_info->rowbytes;
+   size_t i, cnt, cnt16, cnt32;
+   size_t istop = row_info->rowbytes;
    png_bytep rp = row;
    png_const_bytep pp = prev_row;
    v16u8 src0, src1, src2, src3, src4, src5, src6, src7;
@@ -457,8 +457,8 @@
 void png_read_filter_row_sub4_msa(png_row_infop row_info, png_bytep row,
                                   png_const_bytep prev_row)
 {
-   png_size_t count;
-   png_size_t istop = row_info->rowbytes;
+   size_t count;
+   size_t istop = row_info->rowbytes;
    png_bytep src = row;
    png_bytep nxt = row + 4;
    int32_t inp0;
@@ -496,8 +496,8 @@
 void png_read_filter_row_sub3_msa(png_row_infop row_info, png_bytep row,
                                   png_const_bytep prev_row)
 {
-   png_size_t count;
-   png_size_t istop = row_info->rowbytes;
+   size_t count;
+   size_t istop = row_info->rowbytes;
    png_bytep src = row;
    png_bytep nxt = row + 3;
    int64_t out0;
@@ -541,11 +541,11 @@
 void png_read_filter_row_avg4_msa(png_row_infop row_info, png_bytep row,
                                   png_const_bytep prev_row)
 {
-   png_size_t i;
+   size_t i;
    png_bytep src = row;
    png_bytep nxt = row;
    png_const_bytep pp = prev_row;
-   png_size_t istop = row_info->rowbytes - 4;
+   size_t istop = row_info->rowbytes - 4;
    int32_t inp0, inp1, out0;
    v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9, dst0, dst1;
    v16u8 zero = { 0 };
@@ -592,11 +592,11 @@
 void png_read_filter_row_avg3_msa(png_row_infop row_info, png_bytep row,
                                   png_const_bytep prev_row)
 {
-   png_size_t i;
+   size_t i;
    png_bytep src = row;
    png_bytep nxt = row;
    png_const_bytep pp = prev_row;
-   png_size_t istop = row_info->rowbytes - 3;
+   size_t istop = row_info->rowbytes - 3;
    int64_t out0;
    int32_t inp0, inp1, out1;
    int16_t out2;

Modified: branches/stable/source/src/libs/libpng/libpng-src/png.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/png.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/png.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * Last changed in libpng 1.6.33 [September 28, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -14,7 +14,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_34 Your_png_h_is_not_version_1_6_34;
+typedef png_libpng_version_1_6_35 Your_png_h_is_not_version_1_6_35;
 
 #ifdef __GNUC__
 /* The version tests may need to be added to, but the problem warning has
@@ -71,7 +71,7 @@
  * PNG signature (this is the same behavior as strcmp, memcmp, etc).
  */
 int PNGAPI
-png_sig_cmp(png_const_bytep sig, png_size_t start, png_size_t num_to_check)
+png_sig_cmp(png_const_bytep sig, size_t start, size_t num_to_check)
 {
    png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
 
@@ -136,7 +136,7 @@
  * trouble of calculating it.
  */
 void /* PRIVATE */
-png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length)
+png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, size_t length)
 {
    int need_crc = 1;
 
@@ -421,7 +421,7 @@
  * those cases where it does anything other than a memset.
  */
 PNG_FUNCTION(void,PNGAPI
-png_info_init_3,(png_infopp ptr_ptr, png_size_t png_info_struct_size),
+png_info_init_3,(png_infopp ptr_ptr, size_t png_info_struct_size),
     PNG_DEPRECATED)
 {
    png_inforp info_ptr = *ptr_ptr;
@@ -816,15 +816,15 @@
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.34 - September 29, 2017" PNG_STRING_NEWLINE \
-      "Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \
+      "libpng version 1.6.35 - July 15, 2018" PNG_STRING_NEWLINE \
+      "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
       PNG_STRING_NEWLINE \
       "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
       "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
       PNG_STRING_NEWLINE;
 #  else
-   return "libpng version 1.6.34 - September 29, 2017\
-      Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\
+   return "libpng version 1.6.35 - July 15, 2018\
+      Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
 #  endif
@@ -942,7 +942,7 @@
 
    /* The code is the fifth byte after each four byte string.  Historically this
     * code was always searched from the end of the list, this is no longer
-    * necessary because the 'set' routine handles duplicate entries correcty.
+    * necessary because the 'set' routine handles duplicate entries correctly.
     */
    do /* num_chunk_list > 0, so at least one */
    {
@@ -2067,7 +2067,7 @@
     */
 
    /* Data checks (could be skipped).  These checks must be independent of the
-    * version number; however, the version number doesn't accomodate changes in
+    * version number; however, the version number doesn't accommodate changes in
     * the header fields (just the known tags and the interpretation of the
     * data.)
     */
@@ -2707,7 +2707,7 @@
 
 #if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)
 /* ASCII to fp functions */
-/* Check an ASCII formated floating point value, see the more detailed
+/* Check an ASCII formatted floating point value, see the more detailed
  * comments in pngpriv.h
  */
 /* The following is used internally to preserve the sticky flags */
@@ -2715,11 +2715,11 @@
 #define png_fp_set(state, value) ((state) = (value) | ((state) & PNG_FP_STICKY))
 
 int /* PRIVATE */
-png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
+png_check_fp_number(png_const_charp string, size_t size, int *statep,
     png_size_tp whereami)
 {
    int state = *statep;
-   png_size_t i = *whereami;
+   size_t i = *whereami;
 
    while (i < size)
    {
@@ -2842,10 +2842,10 @@
 
 /* The same but for a complete string. */
 int
-png_check_fp_string(png_const_charp string, png_size_t size)
+png_check_fp_string(png_const_charp string, size_t size)
 {
    int        state=0;
-   png_size_t char_index=0;
+   size_t char_index=0;
 
    if (png_check_fp_number(string, size, &state, &char_index) != 0 &&
       (char_index == size || string[char_index] == 0))
@@ -2906,7 +2906,7 @@
 #pragma GCC diagnostic warning "-Wstrict-overflow=2"
 #endif /* GCC_STRICT_OVERFLOW */
 void /* PRIVATE */
-png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, png_size_t size,
+png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, size_t size,
     double fp, unsigned int precision)
 {
    /* We use standard functions from math.h, but not printf because
@@ -3237,7 +3237,7 @@
  */
 void /* PRIVATE */
 png_ascii_from_fixed(png_const_structrp png_ptr, png_charp ascii,
-    png_size_t size, png_fixed_point fp)
+    size_t size, png_fixed_point fp)
 {
    /* Require space for 10 decimal digits, a decimal point, a minus sign and a
     * trailing \0, 13 characters:
@@ -4344,7 +4344,7 @@
       png_uint_32 setting = (2U + (onoff != 0)) << option;
       png_uint_32 current = png_ptr->options;
 
-      png_ptr->options = (png_uint_32)(((current & ~mask) | setting) & 0xff);
+      png_ptr->options = (png_uint_32)((current & ~mask) | setting);
 
       return (int)(current & mask) >> option;
    }

Modified: branches/stable/source/src/libs/libpng/libpng-src/png.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/png.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/png.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,9 +1,9 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.34, September 29, 2017
+ * libpng version 1.6.35, July 15, 2018
  *
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -12,7 +12,7 @@
  * Authors and maintainers:
  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.6.34, September 29, 2017:
+ *   libpng versions 0.97, January 1998, through 1.6.35, July 15, 2018:
  *     Glenn Randers-Pehrson.
  *   See also "Contributing Authors", below.
  */
@@ -25,8 +25,8 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.0.7, July 1, 2000 through 1.6.34, September 29, 2017 are
- * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
+ * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
  * derived from libpng-1.0.6, and are distributed according to the same
  * disclaimer and license as libpng-1.0.6 with the following individuals
  * added to the list of Contributing Authors:
@@ -213,7 +213,7 @@
  *    ...
  *    1.5.30                  15    10527  15.so.15.30[.0]
  *    ...
- *    1.6.34                  16    10633  16.so.16.34[.0]
+ *    1.6.35                  16    10635  16.so.16.35[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
@@ -241,13 +241,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    September 29, 2017
+ *    July 15, 2018
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.6.34 are Y2K compliant.  It is my belief that
+ *    upward through 1.6.35 are Y2K compliant.  It is my belief that
  *    earlier versions were also Y2K compliant.
  *
  *    Libpng only has two year fields.  One is a 2-byte unsigned integer
@@ -309,8 +309,8 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.34"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.34 - September 29, 2017\n"
+#define PNG_LIBPNG_VER_STRING "1.6.35"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.35 - July 15, 2018\n"
 
 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16
@@ -318,13 +318,13 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 34
+#define PNG_LIBPNG_VER_RELEASE 35
 
 /* This should match the numeric part of the final component of
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
  */
 
-#define PNG_LIBPNG_VER_BUILD  0
+#define PNG_LIBPNG_VER_BUILD  02
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -341,7 +341,7 @@
 #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
                                        PNG_LIBPNG_BUILD_PRIVATE */
 
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
 
 /* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
  * We must not include leading zeros.
@@ -349,7 +349,7 @@
  * version 1.0.0 was mis-numbered 100 instead of 10000).  From
  * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
  */
-#define PNG_LIBPNG_VER 10634 /* 1.6.34 */
+#define PNG_LIBPNG_VER 10635 /* 1.6.35 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -459,7 +459,7 @@
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_6_34;
+typedef char* png_libpng_version_1_6_35;
 
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
  *
@@ -600,8 +600,8 @@
    png_charp key;          /* keyword, 1-79 character description of "text" */
    png_charp text;         /* comment, may be an empty string (ie "")
                               or a NULL pointer */
-   png_size_t text_length; /* length of the text string */
-   png_size_t itxt_length; /* length of the itxt string */
+   size_t text_length;     /* length of the text string */
+   size_t itxt_length;     /* length of the itxt string */
    png_charp lang;         /* language code, 0-79 characters
                               or a NULL pointer */
    png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
@@ -654,7 +654,7 @@
 {
    png_byte name[5]; /* Textual chunk name with '\0' terminator */
    png_byte *data;   /* Data, should not be modified on read! */
-   png_size_t size;
+   size_t size;
 
    /* On write 'location' must be set using the flag values listed below.
     * Notice that on read it is set by libpng however the values stored have
@@ -679,7 +679,7 @@
 /* Maximum positive integer used in PNG is (2^31)-1 */
 #define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
 #define PNG_UINT_32_MAX ((png_uint_32)(-1))
-#define PNG_SIZE_MAX ((png_size_t)(-1))
+#define PNG_SIZE_MAX ((size_t)(-1))
 
 /* These are constants for fixed point values encoded in the
  * PNG specification manner (x100000)
@@ -785,7 +785,7 @@
 typedef struct png_row_info_struct
 {
    png_uint_32 width;    /* width of row */
-   png_size_t rowbytes;  /* number of bytes in row */
+   size_t rowbytes;      /* number of bytes in row */
    png_byte color_type;  /* color type of row */
    png_byte bit_depth;   /* bit depth of row */
    png_byte channels;    /* number of channels (1, 2, 3, or 4) */
@@ -804,7 +804,7 @@
  * expected to return the read data in the buffer.
  */
 typedef PNG_CALLBACK(void, *png_error_ptr, (png_structp, png_const_charp));
-typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep, png_size_t));
+typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep, size_t));
 typedef PNG_CALLBACK(void, *png_flush_ptr, (png_structp));
 typedef PNG_CALLBACK(void, *png_read_status_ptr, (png_structp, png_uint_32,
     int));
@@ -941,8 +941,8 @@
  * signature, and non-zero otherwise.  Having num_to_check == 0 or
  * start > 7 will always fail (ie return non-zero).
  */
-PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, png_size_t start,
-    png_size_t num_to_check));
+PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, size_t start,
+    size_t num_to_check));
 
 /* Simple signature checking function.  This is the same as calling
  * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
@@ -961,11 +961,11 @@
     png_error_ptr warn_fn),
     PNG_ALLOCATED);
 
-PNG_EXPORT(6, png_size_t, png_get_compression_buffer_size,
+PNG_EXPORT(6, size_t, png_get_compression_buffer_size,
     (png_const_structrp png_ptr));
 
 PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structrp png_ptr,
-    png_size_t size));
+    size_t size));
 
 /* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp
  * match up.
@@ -1018,7 +1018,7 @@
 
 /* Write a PNG chunk - size, type, (optional) data, CRC. */
 PNG_EXPORT(14, void, png_write_chunk, (png_structrp png_ptr, png_const_bytep
-    chunk_name, png_const_bytep data, png_size_t length));
+    chunk_name, png_const_bytep data, size_t length));
 
 /* Write the start of a PNG chunk - length and chunk name. */
 PNG_EXPORT(15, void, png_write_chunk_start, (png_structrp png_ptr,
@@ -1026,7 +1026,7 @@
 
 /* Write the data of a PNG chunk started with png_write_chunk_start(). */
 PNG_EXPORT(16, void, png_write_chunk_data, (png_structrp png_ptr,
-    png_const_bytep data, png_size_t length));
+    png_const_bytep data, size_t length));
 
 /* Finish a chunk started with png_write_chunk_start() (includes CRC). */
 PNG_EXPORT(17, void, png_write_chunk_end, (png_structrp png_ptr));
@@ -1040,7 +1040,7 @@
  * the API will be removed in the future.
  */
 PNG_EXPORTA(19, void, png_info_init_3, (png_infopp info_ptr,
-    png_size_t png_info_struct_size), PNG_DEPRECATED);
+    size_t png_info_struct_size), PNG_DEPRECATED);
 
 /* Writes all the PNG information before the image. */
 PNG_EXPORT(20, void, png_write_info_before_PLTE,
@@ -1137,7 +1137,7 @@
  * corresponding composited pixel, and the color channels are unassociated
  * (not premultiplied).  The gamma encoded color channels must be scaled
  * according to the contribution and to do this it is necessary to undo
- * the encoding, scale the color values, perform the composition and reencode
+ * the encoding, scale the color values, perform the composition and re-encode
  * the values.  This is the 'PNG' mode.
  *
  * The alternative is to 'associate' the alpha with the color information by
@@ -1193,7 +1193,7 @@
  *
  * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
  *    In this case the output is assumed to be something like an sRGB conformant
- *    display preceeded by a power-law lookup table of power 1.45.  This is how
+ *    display preceded by a power-law lookup table of power 1.45.  This is how
  *    early Mac systems behaved.
  *
  * png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR);
@@ -1240,7 +1240,7 @@
  *
  * When the default gamma of PNG files doesn't match the output gamma.
  *    If you have PNG files with no gamma information png_set_alpha_mode allows
- *    you to provide a default gamma, but it also sets the ouput gamma to the
+ *    you to provide a default gamma, but it also sets the output gamma to the
  *    matching value.  If you know your PNG files have a gamma that doesn't
  *    match the output you can take advantage of the fact that
  *    png_set_alpha_mode always sets the output gamma but only sets the PNG
@@ -1691,7 +1691,7 @@
  *           chunk will cause an error at this point unless it is to be saved.
  * positive: The chunk was handled, libpng will ignore/discard it.
  *
- * See "INTERACTION WTIH USER CHUNK CALLBACKS" below for important notes about
+ * See "INTERACTION WITH USER CHUNK CALLBACKS" below for important notes about
  * how this behavior will change in libpng 1.7
  */
 PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structrp png_ptr,
@@ -1716,7 +1716,7 @@
 
 /* Function to be called when data becomes available */
 PNG_EXPORT(92, void, png_process_data, (png_structrp png_ptr,
-    png_inforp info_ptr, png_bytep buffer, png_size_t buffer_size));
+    png_inforp info_ptr, png_bytep buffer, size_t buffer_size));
 
 /* A function which may be called *only* within png_process_data to stop the
  * processing of any more data.  The function returns the number of bytes
@@ -1725,7 +1725,7 @@
  * 'save' is set to true the routine will first save all the pending data and
  * will always return 0.
  */
-PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structrp, int save));
+PNG_EXPORT(219, size_t, png_process_data_pause, (png_structrp, int save));
 
 /* A function which may be called *only* outside (after) a call to
  * png_process_data.  It returns the number of bytes of data to skip in the
@@ -1870,7 +1870,7 @@
     png_const_inforp info_ptr, png_uint_32 flag));
 
 /* Returns number of bytes needed to hold a transformed row. */
-PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structrp png_ptr,
+PNG_EXPORT(111, size_t, png_get_rowbytes, (png_const_structrp png_ptr,
     png_const_inforp info_ptr));
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
@@ -2239,7 +2239,7 @@
  * to specifying "NEVER", however when "AS_DEFAULT" is used for specific chunks
  * it simply resets the behavior to the libpng default.
  *
- * INTERACTION WTIH USER CHUNK CALLBACKS:
+ * INTERACTION WITH USER CHUNK CALLBACKS:
  * The per-chunk handling is always used when there is a png_user_chunk_ptr
  * callback and the callback returns 0; the chunk is then always stored *unless*
  * it is critical and the per-chunk setting is other than ALWAYS.  Notice that
@@ -2658,7 +2658,7 @@
  * The simplified API hides the details of both libpng and the PNG file format
  * itself.  It allows PNG files to be read into a very limited number of
  * in-memory bitmap formats or to be written from the same formats.  If these
- * formats do not accomodate your needs then you can, and should, use the more
+ * formats do not accommodate your needs then you can, and should, use the more
  * sophisticated APIs above - these support a wide variety of in-memory formats
  * and a wide variety of sophisticated transformations to those formats as well
  * as a wide variety of APIs to manipulate ancillary information.
@@ -3020,7 +3020,7 @@
 #endif /* STDIO */
 
 PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
-   png_const_voidp memory, png_size_t size));
+   png_const_voidp memory, size_t size));
    /* The PNG header is read from the given memory buffer. */
 
 PNG_EXPORT(237, int, png_image_finish_read, (png_imagep image,
@@ -3133,7 +3133,7 @@
     * than or equal to the original value.
     *
     * If the function returns false and *memory_bytes was not changed an error
-    * occured during write.  If *memory_bytes was changed, or is not 0 if
+    * occurred during write.  If *memory_bytes was changed, or is not 0 if
     * 'memory' was NULL, the write would have succeeded but for the memory
     * buffer being too small.  *memory_bytes contains the required number of
     * bytes and will be bigger that the original value.
@@ -3217,7 +3217,7 @@
  * option and 'onoff' is 0 (off) or non-0 (on).  The value returned is given
  * by the PNG_OPTION_ defines below.
  *
- * HARDWARE: normally hardware capabilites, such as the Intel SSE instructions,
+ * HARDWARE: normally hardware capabilities, such as the Intel SSE instructions,
  *           are detected at run time, however sometimes it may be impossible
  *           to do this in user mode, in which case it is necessary to discover
  *           the capabilities in an OS specific way.  Such capabilities are

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngconf.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngconf.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngconf.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,9 +1,9 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.6.34, September 29, 2017
+ * libpng version 1.6.35, July 15, 2018
  *
- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -127,7 +127,7 @@
  *
  * These cases only differ if the operating system does not use the C
  * calling convention, at present this just means the above cases
- * (x86 DOS/Windows sytems) and, even then, this does not apply to
+ * (x86 DOS/Windows systems) and, even then, this does not apply to
  * Cygwin running on those systems.
  *
  * Note that the value must be defined in pnglibconf.h so that what
@@ -515,8 +515,10 @@
 #  error "libpng requires an unsigned 32-bit (or more) type"
 #endif
 
-/* Prior to 1.6.0 it was possible to disable the use of size_t, 1.6.0, however,
- * requires an ISOC90 compiler and relies on consistent behavior of sizeof.
+/* Prior to 1.6.0, it was possible to disable the use of size_t and ptrdiff_t.
+ * From 1.6.0 onwards, an ISO C90 compiler, as well as a standard-compliant
+ * behavior of sizeof and ptrdiff_t are required.
+ * The legacy typedefs are provided here for backwards compatibility.
  */
 typedef size_t png_size_t;
 typedef ptrdiff_t png_ptrdiff_t;
@@ -537,13 +539,12 @@
 #  endif
 #endif
 
-/* png_alloc_size_t is guaranteed to be no smaller than png_size_t, and no
- * smaller than png_uint_32.  Casts from png_size_t or png_uint_32 to
- * png_alloc_size_t are not necessary; in fact, it is recommended not to use
- * them at all so that the compiler can complain when something turns out to be
- * problematic.
+/* png_alloc_size_t is guaranteed to be no smaller than size_t, and no smaller
+ * than png_uint_32.  Casts from size_t or png_uint_32 to png_alloc_size_t are
+ * not necessary; in fact, it is recommended not to use them at all, so that
+ * the compiler can complain when something turns out to be problematic.
  *
- * Casts in the other direction (from png_alloc_size_t to png_size_t or
+ * Casts in the other direction (from png_alloc_size_t to size_t or
  * png_uint_32) should be explicitly applied; however, we do not expect to
  * encounter practical situations that require such conversions.
  *
@@ -553,7 +554,7 @@
 #ifdef PNG_SMALL_SIZE_T
    typedef png_uint_32 png_alloc_size_t;
 #else
-   typedef png_size_t png_alloc_size_t;
+   typedef size_t png_alloc_size_t;
 #endif
 
 /* Prior to 1.6.0 libpng offered limited support for Microsoft C compiler
@@ -589,8 +590,8 @@
 typedef const char            * png_const_charp;
 typedef png_fixed_point       * png_fixed_point_p;
 typedef const png_fixed_point * png_const_fixed_point_p;
-typedef png_size_t            * png_size_tp;
-typedef const png_size_t      * png_const_size_tp;
+typedef size_t                * png_size_tp;
+typedef const size_t          * png_const_size_tp;
 
 #ifdef PNG_STDIO_SUPPORTED
 typedef FILE            * png_FILE_p;

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngget.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngget.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngget.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -26,7 +26,7 @@
    return(0);
 }
 
-png_size_t PNGAPI
+size_t PNGAPI
 png_get_rowbytes(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
@@ -367,7 +367,7 @@
 static png_fixed_point
 png_fixed_inches_from_microns(png_const_structrp png_ptr, png_int_32 microns)
 {
-   /* Convert from metres * 1,000,000 to inches * 100,000, meters to
+   /* Convert from meters * 1,000,000 to inches * 100,000, meters to
     * inches is simply *(100/2.54), so we want *(10/2.54) == 500/127.
     * Notice that this can overflow - a warning is output and 0 is
     * returned.
@@ -741,8 +741,7 @@
 
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_iCCP) != 0 &&
-       name != NULL && compression_type != NULL && profile != NULL &&
-           proflen != NULL)
+       name != NULL && profile != NULL && proflen != NULL)
    {
       *name = info_ptr->iccp_name;
       *profile = info_ptr->iccp_profile;
@@ -750,11 +749,13 @@
       /* This is somewhat irrelevant since the profile data returned has
        * actually been uncompressed.
        */
-      *compression_type = PNG_COMPRESSION_TYPE_BASE;
+      if (compression_type != NULL)
+         *compression_type = PNG_COMPRESSION_TYPE_BASE;
       return (PNG_INFO_iCCP);
    }
 
    return (0);
+
 }
 #endif
 
@@ -1164,7 +1165,7 @@
 }
 #endif
 
-png_size_t PNGAPI
+size_t PNGAPI
 png_get_compression_buffer_size(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)

Modified: branches/stable/source/src/libs/libpng/libpng-src/pnginfo.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pnginfo.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pnginfo.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pnginfo.h - header file for PNG reference library
  *
- * Last changed in libpng 1.6.1 [March 28, 2013]
- * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2013,2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -55,10 +55,10 @@
 struct png_info_def
 {
    /* The following are necessary for every PNG file */
-   png_uint_32 width;  /* width of image in pixels (from IHDR) */
-   png_uint_32 height; /* height of image in pixels (from IHDR) */
-   png_uint_32 valid;  /* valid chunk data (see PNG_INFO_ below) */
-   png_size_t rowbytes; /* bytes needed to hold an untransformed row */
+   png_uint_32 width;       /* width of image in pixels (from IHDR) */
+   png_uint_32 height;      /* height of image in pixels (from IHDR) */
+   png_uint_32 valid;       /* valid chunk data (see PNG_INFO_ below) */
+   size_t rowbytes;         /* bytes needed to hold an untransformed row */
    png_colorp palette;      /* array of color values (valid & PNG_INFO_PLTE) */
    png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */
    png_uint_16 num_trans;   /* number of transparent palette color (tRNS) */
@@ -247,7 +247,7 @@
    /* The sCAL chunk describes the actual physical dimensions of the
     * subject matter of the graphic.  The chunk contains a unit specification
     * a byte value, and two ASCII strings representing floating-point
-    * values.  The values are width and height corresponsing to one pixel
+    * values.  The values are width and height corresponding to one pixel
     * in the image.  Data values are valid if (valid & PNG_INFO_sCAL) is
     * non-zero.
     */

Modified: branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,10 +1,10 @@
-/* libpng 1.6.34 STANDARD API DEFINITION */
+/* libpng 1.6.35 STANDARD API DEFINITION */
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.6.34 - September 29, 2017 */
+/* Libpng version 1.6.35 - July 15, 2018 */
 
-/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */
+/* Copyright (c) 1998-2018 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */
 /* For conditions of distribution and use, see the disclaimer */

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngpread.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngpread.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngpread.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -34,7 +34,7 @@
 
 void PNGAPI
 png_process_data(png_structrp png_ptr, png_inforp info_ptr,
-    png_bytep buffer, png_size_t buffer_size)
+    png_bytep buffer, size_t buffer_size)
 {
    if (png_ptr == NULL || info_ptr == NULL)
       return;
@@ -47,7 +47,7 @@
    }
 }
 
-png_size_t PNGAPI
+size_t PNGAPI
 png_process_data_pause(png_structrp png_ptr, int save)
 {
    if (png_ptr != NULL)
@@ -60,7 +60,7 @@
       else
       {
          /* This includes any pending saved bytes: */
-         png_size_t remaining = png_ptr->buffer_size;
+         size_t remaining = png_ptr->buffer_size;
          png_ptr->buffer_size = 0;
 
          /* So subtract the saved buffer size, unless all the data
@@ -133,8 +133,8 @@
 void /* PRIVATE */
 png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr)
 {
-   png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */
-       num_to_check = 8 - num_checked;
+   size_t num_checked = png_ptr->sig_bytes; /* SAFE, does not exceed 8 */
+   size_t num_to_check = 8 - num_checked;
 
    if (png_ptr->buffer_size < num_to_check)
    {
@@ -418,7 +418,7 @@
 }
 
 void PNGCBAPI
-png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
+png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, size_t length)
 {
    png_bytep ptr;
 
@@ -428,7 +428,7 @@
    ptr = buffer;
    if (png_ptr->save_buffer_size != 0)
    {
-      png_size_t save_size;
+      size_t save_size;
 
       if (length < png_ptr->save_buffer_size)
          save_size = length;
@@ -445,7 +445,7 @@
    }
    if (length != 0 && png_ptr->current_buffer_size != 0)
    {
-      png_size_t save_size;
+      size_t save_size;
 
       if (length < png_ptr->current_buffer_size)
          save_size = length;
@@ -467,7 +467,7 @@
    {
       if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
       {
-         png_size_t i, istop;
+         size_t i, istop;
          png_bytep sp;
          png_bytep dp;
 
@@ -482,7 +482,7 @@
    if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
        png_ptr->save_buffer_max)
    {
-      png_size_t new_max;
+      size_t new_max;
       png_bytep old_buffer;
 
       if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
@@ -494,7 +494,7 @@
       new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
       old_buffer = png_ptr->save_buffer;
       png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr,
-          (png_size_t)new_max);
+          (size_t)new_max);
 
       if (png_ptr->save_buffer == NULL)
       {
@@ -522,7 +522,7 @@
 
 void /* PRIVATE */
 png_push_restore_buffer(png_structrp png_ptr, png_bytep buffer,
-    png_size_t buffer_length)
+    size_t buffer_length)
 {
    png_ptr->current_buffer = buffer;
    png_ptr->current_buffer_size = buffer_length;
@@ -562,7 +562,7 @@
 
    if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0)
    {
-      png_size_t save_size = png_ptr->save_buffer_size;
+      size_t save_size = png_ptr->save_buffer_size;
       png_uint_32 idat_size = png_ptr->idat_size;
 
       /* We want the smaller of 'idat_size' and 'current_buffer_size', but they
@@ -572,7 +572,7 @@
        * will break on either 16-bit or 64-bit platforms.
        */
       if (idat_size < save_size)
-         save_size = (png_size_t)idat_size;
+         save_size = (size_t)idat_size;
 
       else
          idat_size = (png_uint_32)save_size;
@@ -589,7 +589,7 @@
 
    if (png_ptr->idat_size != 0 && png_ptr->current_buffer_size != 0)
    {
-      png_size_t save_size = png_ptr->current_buffer_size;
+      size_t save_size = png_ptr->current_buffer_size;
       png_uint_32 idat_size = png_ptr->idat_size;
 
       /* We want the smaller of 'idat_size' and 'current_buffer_size', but they
@@ -598,7 +598,7 @@
        * larger - this cannot overflow.
        */
       if (idat_size < save_size)
-         save_size = (png_size_t)idat_size;
+         save_size = (size_t)idat_size;
 
       else
          idat_size = (png_uint_32)save_size;
@@ -625,7 +625,7 @@
 
 void /* PRIVATE */
 png_process_IDAT_data(png_structrp png_ptr, png_bytep buffer,
-    png_size_t buffer_length)
+    size_t buffer_length)
 {
    /* The caller checks for a non-zero buffer length. */
    if (!(buffer_length > 0) || buffer == NULL)

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngpriv.h - private declarations for use inside libpng
  *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -210,7 +210,11 @@
        defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \
        (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
 #         define PNG_INTEL_SSE_OPT 1
+#      else
+#         define PNG_INTEL_SSE_OPT 0
 #      endif
+#   else
+#      define PNG_INTEL_SSE_OPT 0
 #   endif
 #endif
 
@@ -234,6 +238,8 @@
 #   if PNG_INTEL_SSE_IMPLEMENTATION > 0
 #      define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_sse2
 #   endif
+#else
+#   define PNG_INTEL_SSE_IMPLEMENTATION 0
 #endif
 
 #if PNG_MIPS_MSA_OPT > 0
@@ -728,8 +734,8 @@
 /* Added to libpng-1.2.6 JB */
 #define PNG_ROWBYTES(pixel_bits, width) \
     ((pixel_bits) >= 8 ? \
-    ((png_size_t)(width) * (((png_size_t)(pixel_bits)) >> 3)) : \
-    (( ((png_size_t)(width) * ((png_size_t)(pixel_bits))) + 7) >> 3) )
+    ((size_t)(width) * (((size_t)(pixel_bits)) >> 3)) : \
+    (( ((size_t)(width) * ((size_t)(pixel_bits))) + 7) >> 3) )
 
 /* This returns the number of trailing bits in the last byte of a row, 0 if the
  * last byte is completely full of pixels.  It is, in principle, (pixel_bits x
@@ -917,7 +923,7 @@
     * PNG files the -I directives must match.
     *
     * The most likely explanation is that you passed a -I in CFLAGS. This will
-    * not work; all the preprocessor directories and in particular all the -I
+    * not work; all the preprocessor directives and in particular all the -I
     * directives must be in CPPFLAGS.
     */
 #endif
@@ -1046,15 +1052,15 @@
  */
 
 PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_read_data,(png_structp png_ptr,
-    png_bytep data, png_size_t length),PNG_EMPTY);
+    png_bytep data, size_t length),PNG_EMPTY);
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
 PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_push_fill_buffer,(png_structp png_ptr,
-    png_bytep buffer, png_size_t length),PNG_EMPTY);
+    png_bytep buffer, size_t length),PNG_EMPTY);
 #endif
 
 PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_write_data,(png_structp png_ptr,
-    png_bytep data, png_size_t length),PNG_EMPTY);
+    png_bytep data, size_t length),PNG_EMPTY);
 
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
 #  ifdef PNG_STDIO_SUPPORTED
@@ -1068,7 +1074,7 @@
 
 /* Write the "data" buffer to whatever output you are using */
 PNG_INTERNAL_FUNCTION(void,png_write_data,(png_structrp png_ptr,
-    png_const_bytep data, png_size_t length),PNG_EMPTY);
+    png_const_bytep data, size_t length),PNG_EMPTY);
 
 /* Read and check the PNG file signature */
 PNG_INTERNAL_FUNCTION(void,png_read_sig,(png_structrp png_ptr,
@@ -1080,7 +1086,7 @@
 
 /* Read data from whatever input you are using into the "data" buffer */
 PNG_INTERNAL_FUNCTION(void,png_read_data,(png_structrp png_ptr, png_bytep data,
-    png_size_t length),PNG_EMPTY);
+    size_t length),PNG_EMPTY);
 
 /* Read bytes into buf, and update png_ptr->crc */
 PNG_INTERNAL_FUNCTION(void,png_crc_read,(png_structrp png_ptr, png_bytep buf,
@@ -1098,7 +1104,7 @@
  * since this is the maximum buffer size we can specify.
  */
 PNG_INTERNAL_FUNCTION(void,png_calculate_crc,(png_structrp png_ptr,
-   png_const_bytep ptr, png_size_t length),PNG_EMPTY);
+   png_const_bytep ptr, size_t length),PNG_EMPTY);
 
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
 PNG_INTERNAL_FUNCTION(void,png_flush,(png_structrp png_ptr),PNG_EMPTY);
@@ -1181,7 +1187,7 @@
 /* Chunks that have keywords */
 #ifdef PNG_WRITE_tEXt_SUPPORTED
 PNG_INTERNAL_FUNCTION(void,png_write_tEXt,(png_structrp png_ptr,
-   png_const_charp key, png_const_charp text, png_size_t text_len),PNG_EMPTY);
+   png_const_charp key, png_const_charp text, size_t text_len),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_zTXt_SUPPORTED
@@ -1574,10 +1580,10 @@
 PNG_INTERNAL_FUNCTION(void,png_push_save_buffer,(png_structrp png_ptr),
     PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_push_restore_buffer,(png_structrp png_ptr,
-    png_bytep buffer, png_size_t buffer_length),PNG_EMPTY);
+    png_bytep buffer, size_t buffer_length),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_push_read_IDAT,(png_structrp png_ptr),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_process_IDAT_data,(png_structrp png_ptr,
-    png_bytep buffer, png_size_t buffer_length),PNG_EMPTY);
+    png_bytep buffer, size_t buffer_length),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_push_process_row,(png_structrp png_ptr),
     PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_push_handle_unknown,(png_structrp png_ptr,
@@ -1847,13 +1853,13 @@
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 PNG_INTERNAL_FUNCTION(void,png_ascii_from_fp,(png_const_structrp png_ptr,
-   png_charp ascii, png_size_t size, double fp, unsigned int precision),
+   png_charp ascii, size_t size, double fp, unsigned int precision),
    PNG_EMPTY);
 #endif /* FLOATING_POINT */
 
 #ifdef PNG_FIXED_POINT_SUPPORTED
 PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr,
-   png_charp ascii, png_size_t size, png_fixed_point fp),PNG_EMPTY);
+   png_charp ascii, size_t size, png_fixed_point fp),PNG_EMPTY);
 #endif /* FIXED_POINT */
 #endif /* sCAL */
 
@@ -1946,7 +1952,7 @@
  * the problem character.)  This has not been tested within libpng.
  */
 PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string,
-   png_size_t size, int *statep, png_size_tp whereami),PNG_EMPTY);
+   size_t size, int *statep, png_size_tp whereami),PNG_EMPTY);
 
 /* This is the same but it checks a complete string and returns true
  * only if it just contains a floating point number.  As of 1.5.4 this
@@ -1955,7 +1961,7 @@
  * for negative or zero values using the sticky flag.
  */
 PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string,
-   png_size_t size),PNG_EMPTY);
+   size_t size),PNG_EMPTY);
 #endif /* pCAL || sCAL */
 
 #if defined(PNG_GAMMA_SUPPORTED) ||\
@@ -2030,7 +2036,7 @@
    png_voidp   error_buf;           /* Always a jmp_buf at present. */
 
    png_const_bytep memory;          /* Memory buffer. */
-   png_size_t      size;            /* Size of the memory buffer. */
+   size_t          size;            /* Size of the memory buffer. */
 
    unsigned int for_write       :1; /* Otherwise it is a read structure */
    unsigned int owned_file      :1; /* We own the file in io_ptr */

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngread.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngread.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngread.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngread.c - read a PNG file
  *
- * Last changed in libpng 1.6.33 [September 28, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -1532,7 +1532,7 @@
 #endif /* STDIO */
 
 static void PNGCBAPI
-png_image_memory_read(png_structp png_ptr, png_bytep out, png_size_t need)
+png_image_memory_read(png_structp png_ptr, png_bytep out, size_t need)
 {
    if (png_ptr != NULL)
    {
@@ -1543,7 +1543,7 @@
          if (cp != NULL)
          {
             png_const_bytep memory = cp->memory;
-            png_size_t size = cp->size;
+            size_t size = cp->size;
 
             if (memory != NULL && size >= need)
             {
@@ -1562,7 +1562,7 @@
 }
 
 int PNGAPI png_image_begin_read_from_memory(png_imagep image,
-    png_const_voidp memory, png_size_t size)
+    png_const_voidp memory, size_t size)
 {
    if (image != NULL && image->version == PNG_IMAGE_VERSION)
    {
@@ -4150,7 +4150,7 @@
              *
              * NOTE: this will be changed in 1.7 because PNG_IMAGE_BUFFER_SIZE
              * will be changed to use png_alloc_size_t; bigger images can be
-             * accomodated on 64-bit systems.
+             * accommodated on 64-bit systems.
              */
             if (image->height <=
                 0xffffffffU/PNG_IMAGE_PIXEL_COMPONENT_SIZE(image->format)/check)

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngrio.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngrio.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngrio.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngrio.c - functions for data input
  *
- * Last changed in libpng 1.6.24 [August 4, 2016]
- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -29,7 +29,7 @@
  * to read more than 64K on a 16-bit machine.
  */
 void /* PRIVATE */
-png_read_data(png_structrp png_ptr, png_bytep data, png_size_t length)
+png_read_data(png_structrp png_ptr, png_bytep data, size_t length)
 {
    png_debug1(4, "reading %d bytes", (int)length);
 
@@ -47,14 +47,14 @@
  * than changing the library.
  */
 void PNGCBAPI
-png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+png_default_read_data(png_structp png_ptr, png_bytep data, size_t length)
 {
-   png_size_t check;
+   size_t check;
 
    if (png_ptr == NULL)
       return;
 
-   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+   /* fread() returns 0 on error, so it is OK to store this in a size_t
     * instead of an int, which is what fread() actually returns.
     */
    check = fread(data, 1, length, png_voidcast(png_FILE_p, png_ptr->io_ptr));

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Last changed in libpng 1.6.33 [September 28, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -292,7 +292,7 @@
     * who use the inverse of the gamma value accidentally!  Since some of these
     * values are reasonable this may have to be changed:
     *
-    * 1.6.x: changed from 0.07..3 to 0.01..100 (to accomodate the optimal 16-bit
+    * 1.6.x: changed from 0.07..3 to 0.01..100 (to accommodate the optimal 16-bit
     * gamma of 36, and its reciprocal.)
     */
    if (output_gamma < 1000 || output_gamma > 10000000)
@@ -747,7 +747,7 @@
       int num_red = (1 << PNG_QUANTIZE_RED_BITS);
       int num_green = (1 << PNG_QUANTIZE_GREEN_BITS);
       int num_blue = (1 << PNG_QUANTIZE_BLUE_BITS);
-      png_size_t num_entries = ((png_size_t)1 << total_bits);
+      size_t num_entries = ((size_t)1 << total_bits);
 
       png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr,
           (png_alloc_size_t)(num_entries * (sizeof (png_byte))));
@@ -1317,7 +1317,7 @@
 
       else if (png_ptr->screen_gamma != 0)
          /* The converse - assume the file matches the screen, note that this
-          * perhaps undesireable default can (from 1.5.4) be changed by calling
+          * perhaps undesirable default can (from 1.5.4) be changed by calling
           * png_set_alpha_mode (even if the alpha handling mode isn't required
           * or isn't changed from the default.)
           */
@@ -1885,7 +1885,7 @@
 
       png_ptr->transformations &= ~PNG_SHIFT;
 
-      /* significant bits can be in the range 1 to 7 for a meaninful result, if
+      /* significant bits can be in the range 1 to 7 for a meaningful result, if
        * the number of significant bits is 0 then no shift is done (this is an
        * error condition which is silently ignored.)
        */
@@ -2151,8 +2151,8 @@
       {
          case 1:
          {
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 3);
-            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_bytep sp = row + (size_t)((row_width - 1) >> 3);
+            png_bytep dp = row + (size_t)row_width - 1;
             png_uint_32 shift = 7U - ((row_width + 7U) & 0x07);
             for (i = 0; i < row_width; i++)
             {
@@ -2175,8 +2175,8 @@
          case 2:
          {
 
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 2);
-            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_bytep sp = row + (size_t)((row_width - 1) >> 2);
+            png_bytep dp = row + (size_t)row_width - 1;
             png_uint_32 shift = ((3U - ((row_width + 3U) & 0x03)) << 1);
             for (i = 0; i < row_width; i++)
             {
@@ -2198,8 +2198,8 @@
 
          case 4:
          {
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 1);
-            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_bytep sp = row + (size_t)((row_width - 1) >> 1);
+            png_bytep dp = row + (size_t)row_width - 1;
             png_uint_32 shift = ((1U - ((row_width + 1U) & 0x01)) << 2);
             for (i = 0; i < row_width; i++)
             {
@@ -2463,95 +2463,94 @@
 static void
 png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
 {
+   png_uint_32 row_width = row_info->width;
+
    png_debug(1, "in png_do_read_swap_alpha");
 
+   if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
    {
-      png_uint_32 row_width = row_info->width;
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      /* This converts from RGBA to ARGB */
+      if (row_info->bit_depth == 8)
       {
-         /* This converts from RGBA to ARGB */
-         if (row_info->bit_depth == 8)
+         png_bytep sp = row + row_info->rowbytes;
+         png_bytep dp = sp;
+         png_byte save;
+         png_uint_32 i;
+
+         for (i = 0; i < row_width; i++)
          {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save;
-            }
+            save = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = save;
          }
+      }
 
 #ifdef PNG_READ_16BIT_SUPPORTED
-         /* This converts from RRGGBBAA to AARRGGBB */
-         else
+      /* This converts from RRGGBBAA to AARRGGBB */
+      else
+      {
+         png_bytep sp = row + row_info->rowbytes;
+         png_bytep dp = sp;
+         png_byte save[2];
+         png_uint_32 i;
+
+         for (i = 0; i < row_width; i++)
          {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save[2];
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save[0] = *(--sp);
-               save[1] = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save[0];
-               *(--dp) = save[1];
-            }
+            save[0] = *(--sp);
+            save[1] = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = save[0];
+            *(--dp) = save[1];
          }
+      }
 #endif
-      }
+   }
 
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+   {
+      /* This converts from GA to AG */
+      if (row_info->bit_depth == 8)
       {
-         /* This converts from GA to AG */
-         if (row_info->bit_depth == 8)
+         png_bytep sp = row + row_info->rowbytes;
+         png_bytep dp = sp;
+         png_byte save;
+         png_uint_32 i;
+
+         for (i = 0; i < row_width; i++)
          {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save;
-            }
+            save = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = save;
          }
+      }
 
 #ifdef PNG_READ_16BIT_SUPPORTED
-         /* This converts from GGAA to AAGG */
-         else
+      /* This converts from GGAA to AAGG */
+      else
+      {
+         png_bytep sp = row + row_info->rowbytes;
+         png_bytep dp = sp;
+         png_byte save[2];
+         png_uint_32 i;
+
+         for (i = 0; i < row_width; i++)
          {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save[2];
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save[0] = *(--sp);
-               save[1] = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save[0];
-               *(--dp) = save[1];
-            }
+            save[0] = *(--sp);
+            save[1] = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = *(--sp);
+            *(--dp) = save[0];
+            *(--dp) = save[1];
          }
+      }
 #endif
-      }
    }
 }
 #endif
@@ -2681,8 +2680,8 @@
          if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
          {
             /* This changes the data from G to GX */
-            png_bytep sp = row + (png_size_t)row_width;
-            png_bytep dp =  sp + (png_size_t)row_width;
+            png_bytep sp = row + (size_t)row_width;
+            png_bytep dp =  sp + (size_t)row_width;
             for (i = 1; i < row_width; i++)
             {
                *(--dp) = lo_filler;
@@ -2697,8 +2696,8 @@
          else
          {
             /* This changes the data from G to XG */
-            png_bytep sp = row + (png_size_t)row_width;
-            png_bytep dp = sp  + (png_size_t)row_width;
+            png_bytep sp = row + (size_t)row_width;
+            png_bytep dp = sp  + (size_t)row_width;
             for (i = 0; i < row_width; i++)
             {
                *(--dp) = *(--sp);
@@ -2716,8 +2715,8 @@
          if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
          {
             /* This changes the data from GG to GGXX */
-            png_bytep sp = row + (png_size_t)row_width * 2;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            png_bytep sp = row + (size_t)row_width * 2;
+            png_bytep dp = sp  + (size_t)row_width * 2;
             for (i = 1; i < row_width; i++)
             {
                *(--dp) = lo_filler;
@@ -2735,8 +2734,8 @@
          else
          {
             /* This changes the data from GG to XXGG */
-            png_bytep sp = row + (png_size_t)row_width * 2;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            png_bytep sp = row + (size_t)row_width * 2;
+            png_bytep dp = sp  + (size_t)row_width * 2;
             for (i = 0; i < row_width; i++)
             {
                *(--dp) = *(--sp);
@@ -2758,8 +2757,8 @@
          if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
          {
             /* This changes the data from RGB to RGBX */
-            png_bytep sp = row + (png_size_t)row_width * 3;
-            png_bytep dp = sp  + (png_size_t)row_width;
+            png_bytep sp = row + (size_t)row_width * 3;
+            png_bytep dp = sp  + (size_t)row_width;
             for (i = 1; i < row_width; i++)
             {
                *(--dp) = lo_filler;
@@ -2776,8 +2775,8 @@
          else
          {
             /* This changes the data from RGB to XRGB */
-            png_bytep sp = row + (png_size_t)row_width * 3;
-            png_bytep dp = sp + (png_size_t)row_width;
+            png_bytep sp = row + (size_t)row_width * 3;
+            png_bytep dp = sp + (size_t)row_width;
             for (i = 0; i < row_width; i++)
             {
                *(--dp) = *(--sp);
@@ -2797,8 +2796,8 @@
          if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
          {
             /* This changes the data from RRGGBB to RRGGBBXX */
-            png_bytep sp = row + (png_size_t)row_width * 6;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            png_bytep sp = row + (size_t)row_width * 6;
+            png_bytep dp = sp  + (size_t)row_width * 2;
             for (i = 1; i < row_width; i++)
             {
                *(--dp) = lo_filler;
@@ -2820,8 +2819,8 @@
          else
          {
             /* This changes the data from RRGGBB to XXRRGGBB */
-            png_bytep sp = row + (png_size_t)row_width * 6;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            png_bytep sp = row + (size_t)row_width * 6;
+            png_bytep dp = sp  + (size_t)row_width * 2;
             for (i = 0; i < row_width; i++)
             {
                *(--dp) = *(--sp);
@@ -2862,8 +2861,8 @@
          if (row_info->bit_depth == 8)
          {
             /* This changes G to RGB */
-            png_bytep sp = row + (png_size_t)row_width - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            png_bytep sp = row + (size_t)row_width - 1;
+            png_bytep dp = sp  + (size_t)row_width * 2;
             for (i = 0; i < row_width; i++)
             {
                *(dp--) = *sp;
@@ -2875,8 +2874,8 @@
          else
          {
             /* This changes GG to RRGGBB */
-            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 4;
+            png_bytep sp = row + (size_t)row_width * 2 - 1;
+            png_bytep dp = sp  + (size_t)row_width * 4;
             for (i = 0; i < row_width; i++)
             {
                *(dp--) = *sp;
@@ -2894,8 +2893,8 @@
          if (row_info->bit_depth == 8)
          {
             /* This changes GA to RGBA */
-            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            png_bytep sp = row + (size_t)row_width * 2 - 1;
+            png_bytep dp = sp  + (size_t)row_width * 2;
             for (i = 0; i < row_width; i++)
             {
                *(dp--) = *(sp--);
@@ -2908,8 +2907,8 @@
          else
          {
             /* This changes GGAA to RRGGBBAA */
-            png_bytep sp = row + (png_size_t)row_width * 4 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 4;
+            png_bytep sp = row + (size_t)row_width * 4 - 1;
+            png_bytep dp = sp  + (size_t)row_width * 4;
             for (i = 0; i < row_width; i++)
             {
                *(dp--) = *(sp--);
@@ -2980,7 +2979,7 @@
  *  values this results in an implicit assumption that the original PNG RGB
  *  values were linear.
  *
- *  Other integer coefficents can be used via png_set_rgb_to_gray().  Because
+ *  Other integer coefficients can be used via png_set_rgb_to_gray().  Because
  *  the API takes just red and green coefficients the blue coefficient is
  *  calculated to make the sum 32768.  This will result in different rounding
  *  to that used above.
@@ -3209,286 +3208,188 @@
 
    png_debug(1, "in png_do_compose");
 
+   switch (row_info->color_type)
    {
-      switch (row_info->color_type)
+      case PNG_COLOR_TYPE_GRAY:
       {
-         case PNG_COLOR_TYPE_GRAY:
+         switch (row_info->bit_depth)
          {
-            switch (row_info->bit_depth)
+            case 1:
             {
-               case 1:
+               sp = row;
+               shift = 7;
+               for (i = 0; i < row_width; i++)
                {
+                  if ((png_uint_16)((*sp >> shift) & 0x01)
+                     == png_ptr->trans_color.gray)
+                  {
+                     unsigned int tmp = *sp & (0x7f7f >> (7 - shift));
+                     tmp |=
+                         (unsigned int)(png_ptr->background.gray << shift);
+                     *sp = (png_byte)(tmp & 0xff);
+                  }
+
+                  if (shift == 0)
+                  {
+                     shift = 7;
+                     sp++;
+                  }
+
+                  else
+                     shift--;
+               }
+               break;
+            }
+
+            case 2:
+            {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+               if (gamma_table != NULL)
+               {
                   sp = row;
-                  shift = 7;
+                  shift = 6;
                   for (i = 0; i < row_width; i++)
                   {
-                     if ((png_uint_16)((*sp >> shift) & 0x01)
-                        == png_ptr->trans_color.gray)
+                     if ((png_uint_16)((*sp >> shift) & 0x03)
+                         == png_ptr->trans_color.gray)
                      {
-                        unsigned int tmp = *sp & (0x7f7f >> (7 - shift));
+                        unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
                         tmp |=
-                            (unsigned int)(png_ptr->background.gray << shift);
+                           (unsigned int)png_ptr->background.gray << shift;
                         *sp = (png_byte)(tmp & 0xff);
                      }
 
+                     else
+                     {
+                        unsigned int p = (*sp >> shift) & 0x03;
+                        unsigned int g = (gamma_table [p | (p << 2) |
+                            (p << 4) | (p << 6)] >> 6) & 0x03;
+                        unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
+                        tmp |= (unsigned int)(g << shift);
+                        *sp = (png_byte)(tmp & 0xff);
+                     }
+
                      if (shift == 0)
                      {
-                        shift = 7;
+                        shift = 6;
                         sp++;
                      }
 
                      else
-                        shift--;
+                        shift -= 2;
                   }
-                  break;
                }
 
-               case 2:
+               else
+#endif
                {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
+                  sp = row;
+                  shift = 6;
+                  for (i = 0; i < row_width; i++)
                   {
-                     sp = row;
-                     shift = 6;
-                     for (i = 0; i < row_width; i++)
+                     if ((png_uint_16)((*sp >> shift) & 0x03)
+                         == png_ptr->trans_color.gray)
                      {
-                        if ((png_uint_16)((*sp >> shift) & 0x03)
-                            == png_ptr->trans_color.gray)
-                        {
-                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
-                           tmp |=
-                              (unsigned int)png_ptr->background.gray << shift;
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
-
-                        else
-                        {
-                           unsigned int p = (*sp >> shift) & 0x03;
-                           unsigned int g = (gamma_table [p | (p << 2) |
-                               (p << 4) | (p << 6)] >> 6) & 0x03;
-                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
-                           tmp |= (unsigned int)(g << shift);
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
-
-                        if (shift == 0)
-                        {
-                           shift = 6;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 2;
+                        unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
+                        tmp |=
+                            (unsigned int)png_ptr->background.gray << shift;
+                        *sp = (png_byte)(tmp & 0xff);
                      }
-                  }
 
-                  else
-#endif
-                  {
-                     sp = row;
-                     shift = 6;
-                     for (i = 0; i < row_width; i++)
+                     if (shift == 0)
                      {
-                        if ((png_uint_16)((*sp >> shift) & 0x03)
-                            == png_ptr->trans_color.gray)
-                        {
-                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
-                           tmp |=
-                               (unsigned int)png_ptr->background.gray << shift;
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
+                        shift = 6;
+                        sp++;
+                     }
 
-                        if (shift == 0)
-                        {
-                           shift = 6;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 2;
-                     }
+                     else
+                        shift -= 2;
                   }
-                  break;
                }
+               break;
+            }
 
-               case 4:
+            case 4:
+            {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+               if (gamma_table != NULL)
                {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
+                  sp = row;
+                  shift = 4;
+                  for (i = 0; i < row_width; i++)
                   {
-                     sp = row;
-                     shift = 4;
-                     for (i = 0; i < row_width; i++)
+                     if ((png_uint_16)((*sp >> shift) & 0x0f)
+                         == png_ptr->trans_color.gray)
                      {
-                        if ((png_uint_16)((*sp >> shift) & 0x0f)
-                            == png_ptr->trans_color.gray)
-                        {
-                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
-                           tmp |=
-                              (unsigned int)(png_ptr->background.gray << shift);
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
+                        unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
+                        tmp |=
+                           (unsigned int)(png_ptr->background.gray << shift);
+                        *sp = (png_byte)(tmp & 0xff);
+                     }
 
-                        else
-                        {
-                           unsigned int p = (*sp >> shift) & 0x0f;
-                           unsigned int g = (gamma_table[p | (p << 4)] >> 4) &
-                              0x0f;
-                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
-                           tmp |= (unsigned int)(g << shift);
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
-
-                        if (shift == 0)
-                        {
-                           shift = 4;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 4;
+                     else
+                     {
+                        unsigned int p = (*sp >> shift) & 0x0f;
+                        unsigned int g = (gamma_table[p | (p << 4)] >> 4) &
+                           0x0f;
+                        unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
+                        tmp |= (unsigned int)(g << shift);
+                        *sp = (png_byte)(tmp & 0xff);
                      }
-                  }
 
-                  else
-#endif
-                  {
-                     sp = row;
-                     shift = 4;
-                     for (i = 0; i < row_width; i++)
+                     if (shift == 0)
                      {
-                        if ((png_uint_16)((*sp >> shift) & 0x0f)
-                            == png_ptr->trans_color.gray)
-                        {
-                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
-                           tmp |=
-                              (unsigned int)(png_ptr->background.gray << shift);
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
+                        shift = 4;
+                        sp++;
+                     }
 
-                        if (shift == 0)
-                        {
-                           shift = 4;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 4;
-                     }
+                     else
+                        shift -= 4;
                   }
-                  break;
                }
 
-               case 8:
+               else
+#endif
                {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
+                  sp = row;
+                  shift = 4;
+                  for (i = 0; i < row_width; i++)
                   {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp++)
+                     if ((png_uint_16)((*sp >> shift) & 0x0f)
+                         == png_ptr->trans_color.gray)
                      {
-                        if (*sp == png_ptr->trans_color.gray)
-                           *sp = (png_byte)png_ptr->background.gray;
-
-                        else
-                           *sp = gamma_table[*sp];
+                        unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
+                        tmp |=
+                           (unsigned int)(png_ptr->background.gray << shift);
+                        *sp = (png_byte)(tmp & 0xff);
                      }
-                  }
-                  else
-#endif
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp++)
-                     {
-                        if (*sp == png_ptr->trans_color.gray)
-                           *sp = (png_byte)png_ptr->background.gray;
-                     }
-                  }
-                  break;
-               }
 
-               case 16:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_16 != NULL)
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp += 2)
+                     if (shift == 0)
                      {
-                        png_uint_16 v;
-
-                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                        if (v == png_ptr->trans_color.gray)
-                        {
-                           /* Background is already in screen gamma */
-                           *sp = (png_byte)((png_ptr->background.gray >> 8)
-                                & 0xff);
-                           *(sp + 1) = (png_byte)(png_ptr->background.gray
-                                & 0xff);
-                        }
-
-                        else
-                        {
-                           v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                           *sp = (png_byte)((v >> 8) & 0xff);
-                           *(sp + 1) = (png_byte)(v & 0xff);
-                        }
+                        shift = 4;
+                        sp++;
                      }
-                  }
-                  else
-#endif
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp += 2)
-                     {
-                        png_uint_16 v;
 
-                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                        if (v == png_ptr->trans_color.gray)
-                        {
-                           *sp = (png_byte)((png_ptr->background.gray >> 8)
-                                & 0xff);
-                           *(sp + 1) = (png_byte)(png_ptr->background.gray
-                                & 0xff);
-                        }
-                     }
+                     else
+                        shift -= 4;
                   }
-                  break;
                }
-
-               default:
-                  break;
+               break;
             }
-            break;
-         }
 
-         case PNG_COLOR_TYPE_RGB:
-         {
-            if (row_info->bit_depth == 8)
+            case 8:
             {
 #ifdef PNG_READ_GAMMA_SUPPORTED
                if (gamma_table != NULL)
                {
                   sp = row;
-                  for (i = 0; i < row_width; i++, sp += 3)
+                  for (i = 0; i < row_width; i++, sp++)
                   {
-                     if (*sp == png_ptr->trans_color.red &&
-                         *(sp + 1) == png_ptr->trans_color.green &&
-                         *(sp + 2) == png_ptr->trans_color.blue)
-                     {
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
+                     if (*sp == png_ptr->trans_color.gray)
+                        *sp = (png_byte)png_ptr->background.gray;
 
                      else
-                     {
                         *sp = gamma_table[*sp];
-                        *(sp + 1) = gamma_table[*(sp + 1)];
-                        *(sp + 2) = gamma_table[*(sp + 2)];
-                     }
                   }
                }
                else
@@ -3495,434 +3396,530 @@
 #endif
                {
                   sp = row;
-                  for (i = 0; i < row_width; i++, sp += 3)
+                  for (i = 0; i < row_width; i++, sp++)
                   {
-                     if (*sp == png_ptr->trans_color.red &&
-                         *(sp + 1) == png_ptr->trans_color.green &&
-                         *(sp + 2) == png_ptr->trans_color.blue)
-                     {
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
+                     if (*sp == png_ptr->trans_color.gray)
+                        *sp = (png_byte)png_ptr->background.gray;
                   }
                }
+               break;
             }
-            else /* if (row_info->bit_depth == 16) */
+
+            case 16:
             {
 #ifdef PNG_READ_GAMMA_SUPPORTED
                if (gamma_16 != NULL)
                {
                   sp = row;
-                  for (i = 0; i < row_width; i++, sp += 6)
+                  for (i = 0; i < row_width; i++, sp += 2)
                   {
-                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                     png_uint_16 v;
 
-                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
+                     v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
 
-                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                         + *(sp + 5));
-
-                     if (r == png_ptr->trans_color.red &&
-                         g == png_ptr->trans_color.green &&
-                         b == png_ptr->trans_color.blue)
+                     if (v == png_ptr->trans_color.gray)
                      {
                         /* Background is already in screen gamma */
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-                                & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green
-                                & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-                                & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
+                        *sp = (png_byte)((png_ptr->background.gray >> 8)
+                             & 0xff);
+                        *(sp + 1) = (png_byte)(png_ptr->background.gray
+                             & 0xff);
                      }
 
                      else
                      {
-                        png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
                         *sp = (png_byte)((v >> 8) & 0xff);
                         *(sp + 1) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(v & 0xff);
                      }
                   }
                }
-
                else
 #endif
                {
                   sp = row;
-                  for (i = 0; i < row_width; i++, sp += 6)
+                  for (i = 0; i < row_width; i++, sp += 2)
                   {
-                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                     png_uint_16 v;
 
-                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
+                     v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
 
-                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                         + *(sp + 5));
-
-                     if (r == png_ptr->trans_color.red &&
-                         g == png_ptr->trans_color.green &&
-                         b == png_ptr->trans_color.blue)
+                     if (v == png_ptr->trans_color.gray)
                      {
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-                                & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green
-                                & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-                                & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
+                        *sp = (png_byte)((png_ptr->background.gray >> 8)
+                             & 0xff);
+                        *(sp + 1) = (png_byte)(png_ptr->background.gray
+                             & 0xff);
                      }
                   }
                }
+               break;
             }
-            break;
+
+            default:
+               break;
          }
+         break;
+      }
 
-         case PNG_COLOR_TYPE_GRAY_ALPHA:
+      case PNG_COLOR_TYPE_RGB:
+      {
+         if (row_info->bit_depth == 8)
          {
-            if (row_info->bit_depth == 8)
+#ifdef PNG_READ_GAMMA_SUPPORTED
+            if (gamma_table != NULL)
             {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
-                   gamma_table != NULL)
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 3)
                {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 2)
+                  if (*sp == png_ptr->trans_color.red &&
+                      *(sp + 1) == png_ptr->trans_color.green &&
+                      *(sp + 2) == png_ptr->trans_color.blue)
                   {
-                     png_uint_16 a = *(sp + 1);
+                     *sp = (png_byte)png_ptr->background.red;
+                     *(sp + 1) = (png_byte)png_ptr->background.green;
+                     *(sp + 2) = (png_byte)png_ptr->background.blue;
+                  }
 
-                     if (a == 0xff)
-                        *sp = gamma_table[*sp];
+                  else
+                  {
+                     *sp = gamma_table[*sp];
+                     *(sp + 1) = gamma_table[*(sp + 1)];
+                     *(sp + 2) = gamma_table[*(sp + 2)];
+                  }
+               }
+            }
+            else
+#endif
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 3)
+               {
+                  if (*sp == png_ptr->trans_color.red &&
+                      *(sp + 1) == png_ptr->trans_color.green &&
+                      *(sp + 2) == png_ptr->trans_color.blue)
+                  {
+                     *sp = (png_byte)png_ptr->background.red;
+                     *(sp + 1) = (png_byte)png_ptr->background.green;
+                     *(sp + 2) = (png_byte)png_ptr->background.blue;
+                  }
+               }
+            }
+         }
+         else /* if (row_info->bit_depth == 16) */
+         {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+            if (gamma_16 != NULL)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 6)
+               {
+                  png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
 
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)png_ptr->background.gray;
-                     }
+                  png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
+                      + *(sp + 3));
 
-                     else
-                     {
-                        png_byte v, w;
+                  png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
+                      + *(sp + 5));
 
-                        v = gamma_to_1[*sp];
-                        png_composite(w, v, a, png_ptr->background_1.gray);
-                        if (optimize == 0)
-                           w = gamma_from_1[w];
-                        *sp = w;
-                     }
+                  if (r == png_ptr->trans_color.red &&
+                      g == png_ptr->trans_color.green &&
+                      b == png_ptr->trans_color.blue)
+                  {
+                     /* Background is already in screen gamma */
+                     *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
+                     *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
+                     *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
+                             & 0xff);
+                     *(sp + 3) = (png_byte)(png_ptr->background.green
+                             & 0xff);
+                     *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
+                             & 0xff);
+                     *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
                   }
+
+                  else
+                  {
+                     png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                     *sp = (png_byte)((v >> 8) & 0xff);
+                     *(sp + 1) = (png_byte)(v & 0xff);
+
+                     v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                     *(sp + 2) = (png_byte)((v >> 8) & 0xff);
+                     *(sp + 3) = (png_byte)(v & 0xff);
+
+                     v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                     *(sp + 4) = (png_byte)((v >> 8) & 0xff);
+                     *(sp + 5) = (png_byte)(v & 0xff);
+                  }
                }
-               else
+            }
+
+            else
 #endif
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 6)
                {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 2)
+                  png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+
+                  png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
+                      + *(sp + 3));
+
+                  png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
+                      + *(sp + 5));
+
+                  if (r == png_ptr->trans_color.red &&
+                      g == png_ptr->trans_color.green &&
+                      b == png_ptr->trans_color.blue)
                   {
-                     png_byte a = *(sp + 1);
+                     *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
+                     *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
+                     *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
+                             & 0xff);
+                     *(sp + 3) = (png_byte)(png_ptr->background.green
+                             & 0xff);
+                     *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
+                             & 0xff);
+                     *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
+                  }
+               }
+            }
+         }
+         break;
+      }
 
-                     if (a == 0)
-                        *sp = (png_byte)png_ptr->background.gray;
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+      {
+         if (row_info->bit_depth == 8)
+         {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+            if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+                gamma_table != NULL)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 2)
+               {
+                  png_uint_16 a = *(sp + 1);
 
-                     else if (a < 0xff)
-                        png_composite(*sp, *sp, a, png_ptr->background.gray);
+                  if (a == 0xff)
+                     *sp = gamma_table[*sp];
+
+                  else if (a == 0)
+                  {
+                     /* Background is already in screen gamma */
+                     *sp = (png_byte)png_ptr->background.gray;
                   }
+
+                  else
+                  {
+                     png_byte v, w;
+
+                     v = gamma_to_1[*sp];
+                     png_composite(w, v, a, png_ptr->background_1.gray);
+                     if (optimize == 0)
+                        w = gamma_from_1[w];
+                     *sp = w;
+                  }
                }
             }
-            else /* if (png_ptr->bit_depth == 16) */
+            else
+#endif
             {
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 2)
+               {
+                  png_byte a = *(sp + 1);
+
+                  if (a == 0)
+                     *sp = (png_byte)png_ptr->background.gray;
+
+                  else if (a < 0xff)
+                     png_composite(*sp, *sp, a, png_ptr->background.gray);
+               }
+            }
+         }
+         else /* if (png_ptr->bit_depth == 16) */
+         {
 #ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
-                   gamma_16_to_1 != NULL)
+            if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+                gamma_16_to_1 != NULL)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 4)
                {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
+                  png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)
+                      + *(sp + 3));
+
+                  if (a == (png_uint_16)0xffff)
                   {
-                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
+                     png_uint_16 v;
 
-                     if (a == (png_uint_16)0xffff)
-                     {
-                        png_uint_16 v;
+                     v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                     *sp = (png_byte)((v >> 8) & 0xff);
+                     *(sp + 1) = (png_byte)(v & 0xff);
+                  }
 
-                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-                     }
+                  else if (a == 0)
+                  {
+                     /* Background is already in screen gamma */
+                     *sp = (png_byte)((png_ptr->background.gray >> 8)
+                             & 0xff);
+                     *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
+                  }
 
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)((png_ptr->background.gray >> 8)
-                                & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
-                     }
+                  else
+                  {
+                     png_uint_16 g, v, w;
 
+                     g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+                     png_composite_16(v, g, a, png_ptr->background_1.gray);
+                     if (optimize != 0)
+                        w = v;
                      else
-                     {
-                        png_uint_16 g, v, w;
-
-                        g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
-                        png_composite_16(v, g, a, png_ptr->background_1.gray);
-                        if (optimize != 0)
-                           w = v;
-                        else
-                           w = gamma_16_from_1[(v & 0xff) >>
-                               gamma_shift][v >> 8];
-                        *sp = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(w & 0xff);
-                     }
+                        w = gamma_16_from_1[(v & 0xff) >>
+                            gamma_shift][v >> 8];
+                     *sp = (png_byte)((w >> 8) & 0xff);
+                     *(sp + 1) = (png_byte)(w & 0xff);
                   }
                }
-               else
+            }
+            else
 #endif
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 4)
                {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
+                  png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)
+                      + *(sp + 3));
+
+                  if (a == 0)
                   {
-                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
+                     *sp = (png_byte)((png_ptr->background.gray >> 8)
+                             & 0xff);
+                     *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
+                  }
 
-                     if (a == 0)
-                     {
-                        *sp = (png_byte)((png_ptr->background.gray >> 8)
-                                & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
-                     }
+                  else if (a < 0xffff)
+                  {
+                     png_uint_16 g, v;
 
-                     else if (a < 0xffff)
-                     {
-                        png_uint_16 g, v;
-
-                        g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-                        png_composite_16(v, g, a, png_ptr->background.gray);
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-                     }
+                     g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                     png_composite_16(v, g, a, png_ptr->background.gray);
+                     *sp = (png_byte)((v >> 8) & 0xff);
+                     *(sp + 1) = (png_byte)(v & 0xff);
                   }
                }
             }
-            break;
          }
+         break;
+      }
 
-         case PNG_COLOR_TYPE_RGB_ALPHA:
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+      {
+         if (row_info->bit_depth == 8)
          {
-            if (row_info->bit_depth == 8)
+#ifdef PNG_READ_GAMMA_SUPPORTED
+            if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+                gamma_table != NULL)
             {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
-                   gamma_table != NULL)
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 4)
                {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
+                  png_byte a = *(sp + 3);
+
+                  if (a == 0xff)
                   {
-                     png_byte a = *(sp + 3);
+                     *sp = gamma_table[*sp];
+                     *(sp + 1) = gamma_table[*(sp + 1)];
+                     *(sp + 2) = gamma_table[*(sp + 2)];
+                  }
 
-                     if (a == 0xff)
-                     {
-                        *sp = gamma_table[*sp];
-                        *(sp + 1) = gamma_table[*(sp + 1)];
-                        *(sp + 2) = gamma_table[*(sp + 2)];
-                     }
+                  else if (a == 0)
+                  {
+                     /* Background is already in screen gamma */
+                     *sp = (png_byte)png_ptr->background.red;
+                     *(sp + 1) = (png_byte)png_ptr->background.green;
+                     *(sp + 2) = (png_byte)png_ptr->background.blue;
+                  }
 
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
+                  else
+                  {
+                     png_byte v, w;
 
-                     else
-                     {
-                        png_byte v, w;
+                     v = gamma_to_1[*sp];
+                     png_composite(w, v, a, png_ptr->background_1.red);
+                     if (optimize == 0) w = gamma_from_1[w];
+                     *sp = w;
 
-                        v = gamma_to_1[*sp];
-                        png_composite(w, v, a, png_ptr->background_1.red);
-                        if (optimize == 0) w = gamma_from_1[w];
-                        *sp = w;
+                     v = gamma_to_1[*(sp + 1)];
+                     png_composite(w, v, a, png_ptr->background_1.green);
+                     if (optimize == 0) w = gamma_from_1[w];
+                     *(sp + 1) = w;
 
-                        v = gamma_to_1[*(sp + 1)];
-                        png_composite(w, v, a, png_ptr->background_1.green);
-                        if (optimize == 0) w = gamma_from_1[w];
-                        *(sp + 1) = w;
-
-                        v = gamma_to_1[*(sp + 2)];
-                        png_composite(w, v, a, png_ptr->background_1.blue);
-                        if (optimize == 0) w = gamma_from_1[w];
-                        *(sp + 2) = w;
-                     }
+                     v = gamma_to_1[*(sp + 2)];
+                     png_composite(w, v, a, png_ptr->background_1.blue);
+                     if (optimize == 0) w = gamma_from_1[w];
+                     *(sp + 2) = w;
                   }
                }
-               else
+            }
+            else
 #endif
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 4)
                {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
+                  png_byte a = *(sp + 3);
+
+                  if (a == 0)
                   {
-                     png_byte a = *(sp + 3);
+                     *sp = (png_byte)png_ptr->background.red;
+                     *(sp + 1) = (png_byte)png_ptr->background.green;
+                     *(sp + 2) = (png_byte)png_ptr->background.blue;
+                  }
 
-                     if (a == 0)
-                     {
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
+                  else if (a < 0xff)
+                  {
+                     png_composite(*sp, *sp, a, png_ptr->background.red);
 
-                     else if (a < 0xff)
-                     {
-                        png_composite(*sp, *sp, a, png_ptr->background.red);
+                     png_composite(*(sp + 1), *(sp + 1), a,
+                         png_ptr->background.green);
 
-                        png_composite(*(sp + 1), *(sp + 1), a,
-                            png_ptr->background.green);
-
-                        png_composite(*(sp + 2), *(sp + 2), a,
-                            png_ptr->background.blue);
-                     }
+                     png_composite(*(sp + 2), *(sp + 2), a,
+                         png_ptr->background.blue);
                   }
                }
             }
-            else /* if (row_info->bit_depth == 16) */
+         }
+         else /* if (row_info->bit_depth == 16) */
+         {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+            if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+                gamma_16_to_1 != NULL)
             {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
-                   gamma_16_to_1 != NULL)
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 8)
                {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 8)
+                  png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+                      << 8) + (png_uint_16)(*(sp + 7)));
+
+                  if (a == (png_uint_16)0xffff)
                   {
-                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
-                         << 8) + (png_uint_16)(*(sp + 7)));
+                     png_uint_16 v;
 
-                     if (a == (png_uint_16)0xffff)
-                     {
-                        png_uint_16 v;
+                     v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                     *sp = (png_byte)((v >> 8) & 0xff);
+                     *(sp + 1) = (png_byte)(v & 0xff);
 
-                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
+                     v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                     *(sp + 2) = (png_byte)((v >> 8) & 0xff);
+                     *(sp + 3) = (png_byte)(v & 0xff);
 
-                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(v & 0xff);
+                     v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                     *(sp + 4) = (png_byte)((v >> 8) & 0xff);
+                     *(sp + 5) = (png_byte)(v & 0xff);
+                  }
 
-                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(v & 0xff);
-                     }
+                  else if (a == 0)
+                  {
+                     /* Background is already in screen gamma */
+                     *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
+                     *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
+                     *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
+                             & 0xff);
+                     *(sp + 3) = (png_byte)(png_ptr->background.green
+                             & 0xff);
+                     *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
+                             & 0xff);
+                     *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
+                  }
 
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-                                & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green
-                                & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-                                & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
-                     }
+                  else
+                  {
+                     png_uint_16 v, w;
 
-                     else
-                     {
-                        png_uint_16 v, w;
+                     v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+                     png_composite_16(w, v, a, png_ptr->background_1.red);
+                     if (optimize == 0)
+                        w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
+                             8];
+                     *sp = (png_byte)((w >> 8) & 0xff);
+                     *(sp + 1) = (png_byte)(w & 0xff);
 
-                        v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
-                        png_composite_16(w, v, a, png_ptr->background_1.red);
-                        if (optimize == 0)
-                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
-                                8];
-                        *sp = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(w & 0xff);
+                     v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                     png_composite_16(w, v, a, png_ptr->background_1.green);
+                     if (optimize == 0)
+                        w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
+                             8];
 
-                        v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        png_composite_16(w, v, a, png_ptr->background_1.green);
-                        if (optimize == 0)
-                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
-                                8];
+                     *(sp + 2) = (png_byte)((w >> 8) & 0xff);
+                     *(sp + 3) = (png_byte)(w & 0xff);
 
-                        *(sp + 2) = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(w & 0xff);
+                     v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                     png_composite_16(w, v, a, png_ptr->background_1.blue);
+                     if (optimize == 0)
+                        w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
+                             8];
 
-                        v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        png_composite_16(w, v, a, png_ptr->background_1.blue);
-                        if (optimize == 0)
-                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
-                                8];
-
-                        *(sp + 4) = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(w & 0xff);
-                     }
+                     *(sp + 4) = (png_byte)((w >> 8) & 0xff);
+                     *(sp + 5) = (png_byte)(w & 0xff);
                   }
                }
+            }
 
-               else
+            else
 #endif
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++, sp += 8)
                {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 8)
+                  png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+                      << 8) + (png_uint_16)(*(sp + 7)));
+
+                  if (a == 0)
                   {
-                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
-                         << 8) + (png_uint_16)(*(sp + 7)));
+                     *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
+                     *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
+                     *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
+                             & 0xff);
+                     *(sp + 3) = (png_byte)(png_ptr->background.green
+                             & 0xff);
+                     *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
+                             & 0xff);
+                     *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
+                  }
 
-                     if (a == 0)
-                     {
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-                                & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green
-                                & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-                                & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
-                     }
+                  else if (a < 0xffff)
+                  {
+                     png_uint_16 v;
 
-                     else if (a < 0xffff)
-                     {
-                        png_uint_16 v;
+                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
+                         + *(sp + 3));
+                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
+                         + *(sp + 5));
 
-                        png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-                        png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                            + *(sp + 3));
-                        png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                            + *(sp + 5));
+                     png_composite_16(v, r, a, png_ptr->background.red);
+                     *sp = (png_byte)((v >> 8) & 0xff);
+                     *(sp + 1) = (png_byte)(v & 0xff);
 
-                        png_composite_16(v, r, a, png_ptr->background.red);
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
+                     png_composite_16(v, g, a, png_ptr->background.green);
+                     *(sp + 2) = (png_byte)((v >> 8) & 0xff);
+                     *(sp + 3) = (png_byte)(v & 0xff);
 
-                        png_composite_16(v, g, a, png_ptr->background.green);
-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(v & 0xff);
-
-                        png_composite_16(v, b, a, png_ptr->background.blue);
-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(v & 0xff);
-                     }
+                     png_composite_16(v, b, a, png_ptr->background.blue);
+                     *(sp + 4) = (png_byte)((v >> 8) & 0xff);
+                     *(sp + 5) = (png_byte)(v & 0xff);
                   }
                }
             }
-            break;
          }
+         break;
+      }
 
-         default:
-            break;
-      }
+      default:
+         break;
    }
 }
 #endif /* READ_BACKGROUND || READ_ALPHA_MODE */
@@ -4220,8 +4217,8 @@
          {
             case 1:
             {
-               sp = row + (png_size_t)((row_width - 1) >> 3);
-               dp = row + (png_size_t)row_width - 1;
+               sp = row + (size_t)((row_width - 1) >> 3);
+               dp = row + (size_t)row_width - 1;
                shift = 7 - (int)((row_width + 7) & 0x07);
                for (i = 0; i < row_width; i++)
                {
@@ -4247,8 +4244,8 @@
 
             case 2:
             {
-               sp = row + (png_size_t)((row_width - 1) >> 2);
-               dp = row + (png_size_t)row_width - 1;
+               sp = row + (size_t)((row_width - 1) >> 2);
+               dp = row + (size_t)row_width - 1;
                shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
                for (i = 0; i < row_width; i++)
                {
@@ -4270,8 +4267,8 @@
 
             case 4:
             {
-               sp = row + (png_size_t)((row_width - 1) >> 1);
-               dp = row + (png_size_t)row_width - 1;
+               sp = row + (size_t)((row_width - 1) >> 1);
+               dp = row + (size_t)row_width - 1;
                shift = (int)((row_width & 0x01) << 2);
                for (i = 0; i < row_width; i++)
                {
@@ -4304,8 +4301,8 @@
          {
             if (num_trans > 0)
             {
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + ((png_size_t)row_width << 2) - 1;
+               sp = row + (size_t)row_width - 1;
+               dp = row + ((size_t)row_width << 2) - 1;
 
                for (i = 0; i < row_width; i++)
                {
@@ -4329,8 +4326,8 @@
 
             else
             {
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + (png_size_t)(row_width * 3) - 1;
+               sp = row + (size_t)row_width - 1;
+               dp = row + (size_t)(row_width * 3) - 1;
 
                for (i = 0; i < row_width; i++)
                {
@@ -4365,167 +4362,111 @@
 
    png_debug(1, "in png_do_expand");
 
+   if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
    {
-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+      unsigned int gray = trans_color != NULL ? trans_color->gray : 0;
+
+      if (row_info->bit_depth < 8)
       {
-         unsigned int gray = trans_color != NULL ? trans_color->gray : 0;
-
-         if (row_info->bit_depth < 8)
+         switch (row_info->bit_depth)
          {
-            switch (row_info->bit_depth)
+            case 1:
             {
-               case 1:
+               gray = (gray & 0x01) * 0xff;
+               sp = row + (size_t)((row_width - 1) >> 3);
+               dp = row + (size_t)row_width - 1;
+               shift = 7 - (int)((row_width + 7) & 0x07);
+               for (i = 0; i < row_width; i++)
                {
-                  gray = (gray & 0x01) * 0xff;
-                  sp = row + (png_size_t)((row_width - 1) >> 3);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = 7 - (int)((row_width + 7) & 0x07);
-                  for (i = 0; i < row_width; i++)
-                  {
-                     if ((*sp >> shift) & 0x01)
-                        *dp = 0xff;
+                  if ((*sp >> shift) & 0x01)
+                     *dp = 0xff;
 
-                     else
-                        *dp = 0;
+                  else
+                     *dp = 0;
 
-                     if (shift == 7)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
-
-                     else
-                        shift++;
-
-                     dp--;
-                  }
-                  break;
-               }
-
-               case 2:
-               {
-                  gray = (gray & 0x03) * 0x55;
-                  sp = row + (png_size_t)((row_width - 1) >> 2);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
-                  for (i = 0; i < row_width; i++)
+                  if (shift == 7)
                   {
-                     value = (*sp >> shift) & 0x03;
-                     *dp = (png_byte)(value | (value << 2) | (value << 4) |
-                        (value << 6));
-                     if (shift == 6)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
-
-                     else
-                        shift += 2;
-
-                     dp--;
+                     shift = 0;
+                     sp--;
                   }
-                  break;
-               }
 
-               case 4:
-               {
-                  gray = (gray & 0x0f) * 0x11;
-                  sp = row + (png_size_t)((row_width - 1) >> 1);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
-                  for (i = 0; i < row_width; i++)
-                  {
-                     value = (*sp >> shift) & 0x0f;
-                     *dp = (png_byte)(value | (value << 4));
-                     if (shift == 4)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
+                  else
+                     shift++;
 
-                     else
-                        shift = 4;
-
-                     dp--;
-                  }
-                  break;
+                  dp--;
                }
-
-               default:
-                  break;
+               break;
             }
 
-            row_info->bit_depth = 8;
-            row_info->pixel_depth = 8;
-            row_info->rowbytes = row_width;
-         }
-
-         if (trans_color != NULL)
-         {
-            if (row_info->bit_depth == 8)
+            case 2:
             {
-               gray = gray & 0xff;
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + ((png_size_t)row_width << 1) - 1;
-
+               gray = (gray & 0x03) * 0x55;
+               sp = row + (size_t)((row_width - 1) >> 2);
+               dp = row + (size_t)row_width - 1;
+               shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
                for (i = 0; i < row_width; i++)
                {
-                  if ((*sp & 0xffU) == gray)
-                     *dp-- = 0;
+                  value = (*sp >> shift) & 0x03;
+                  *dp = (png_byte)(value | (value << 2) | (value << 4) |
+                     (value << 6));
+                  if (shift == 6)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
 
                   else
-                     *dp-- = 0xff;
+                     shift += 2;
 
-                  *dp-- = *sp--;
+                  dp--;
                }
+               break;
             }
 
-            else if (row_info->bit_depth == 16)
+            case 4:
             {
-               unsigned int gray_high = (gray >> 8) & 0xff;
-               unsigned int gray_low = gray & 0xff;
-               sp = row + row_info->rowbytes - 1;
-               dp = row + (row_info->rowbytes << 1) - 1;
+               gray = (gray & 0x0f) * 0x11;
+               sp = row + (size_t)((row_width - 1) >> 1);
+               dp = row + (size_t)row_width - 1;
+               shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
                for (i = 0; i < row_width; i++)
                {
-                  if ((*(sp - 1) & 0xffU) == gray_high &&
-                      (*(sp) & 0xffU) == gray_low)
+                  value = (*sp >> shift) & 0x0f;
+                  *dp = (png_byte)(value | (value << 4));
+                  if (shift == 4)
                   {
-                     *dp-- = 0;
-                     *dp-- = 0;
+                     shift = 0;
+                     sp--;
                   }
 
                   else
-                  {
-                     *dp-- = 0xff;
-                     *dp-- = 0xff;
-                  }
+                     shift = 4;
 
-                  *dp-- = *sp--;
-                  *dp-- = *sp--;
+                  dp--;
                }
+               break;
             }
 
-            row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-            row_info->channels = 2;
-            row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);
-            row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
-                row_width);
+            default:
+               break;
          }
+
+         row_info->bit_depth = 8;
+         row_info->pixel_depth = 8;
+         row_info->rowbytes = row_width;
       }
-      else if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
-          trans_color != NULL)
+
+      if (trans_color != NULL)
       {
          if (row_info->bit_depth == 8)
          {
-            png_byte red = (png_byte)(trans_color->red & 0xff);
-            png_byte green = (png_byte)(trans_color->green & 0xff);
-            png_byte blue = (png_byte)(trans_color->blue & 0xff);
-            sp = row + (png_size_t)row_info->rowbytes - 1;
-            dp = row + ((png_size_t)row_width << 2) - 1;
+            gray = gray & 0xff;
+            sp = row + (size_t)row_width - 1;
+            dp = row + ((size_t)row_width << 1) - 1;
+
             for (i = 0; i < row_width; i++)
             {
-               if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue)
+               if ((*sp & 0xffU) == gray)
                   *dp-- = 0;
 
                else
@@ -4532,28 +4473,19 @@
                   *dp-- = 0xff;
 
                *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
             }
          }
+
          else if (row_info->bit_depth == 16)
          {
-            png_byte red_high = (png_byte)((trans_color->red >> 8) & 0xff);
-            png_byte green_high = (png_byte)((trans_color->green >> 8) & 0xff);
-            png_byte blue_high = (png_byte)((trans_color->blue >> 8) & 0xff);
-            png_byte red_low = (png_byte)(trans_color->red & 0xff);
-            png_byte green_low = (png_byte)(trans_color->green & 0xff);
-            png_byte blue_low = (png_byte)(trans_color->blue & 0xff);
+            unsigned int gray_high = (gray >> 8) & 0xff;
+            unsigned int gray_low = gray & 0xff;
             sp = row + row_info->rowbytes - 1;
-            dp = row + ((png_size_t)row_width << 3) - 1;
+            dp = row + (row_info->rowbytes << 1) - 1;
             for (i = 0; i < row_width; i++)
             {
-               if (*(sp - 5) == red_high &&
-                   *(sp - 4) == red_low &&
-                   *(sp - 3) == green_high &&
-                   *(sp - 2) == green_low &&
-                   *(sp - 1) == blue_high &&
-                   *(sp    ) == blue_low)
+               if ((*(sp - 1) & 0xffU) == gray_high &&
+                   (*(sp) & 0xffU) == gray_low)
                {
                   *dp-- = 0;
                   *dp-- = 0;
@@ -4567,18 +4499,81 @@
 
                *dp-- = *sp--;
                *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
             }
          }
-         row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-         row_info->channels = 4;
-         row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2);
-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+
+         row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+         row_info->channels = 2;
+         row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+             row_width);
       }
    }
+   else if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
+       trans_color != NULL)
+   {
+      if (row_info->bit_depth == 8)
+      {
+         png_byte red = (png_byte)(trans_color->red & 0xff);
+         png_byte green = (png_byte)(trans_color->green & 0xff);
+         png_byte blue = (png_byte)(trans_color->blue & 0xff);
+         sp = row + (size_t)row_info->rowbytes - 1;
+         dp = row + ((size_t)row_width << 2) - 1;
+         for (i = 0; i < row_width; i++)
+         {
+            if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue)
+               *dp-- = 0;
+
+            else
+               *dp-- = 0xff;
+
+            *dp-- = *sp--;
+            *dp-- = *sp--;
+            *dp-- = *sp--;
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         png_byte red_high = (png_byte)((trans_color->red >> 8) & 0xff);
+         png_byte green_high = (png_byte)((trans_color->green >> 8) & 0xff);
+         png_byte blue_high = (png_byte)((trans_color->blue >> 8) & 0xff);
+         png_byte red_low = (png_byte)(trans_color->red & 0xff);
+         png_byte green_low = (png_byte)(trans_color->green & 0xff);
+         png_byte blue_low = (png_byte)(trans_color->blue & 0xff);
+         sp = row + row_info->rowbytes - 1;
+         dp = row + ((size_t)row_width << 3) - 1;
+         for (i = 0; i < row_width; i++)
+         {
+            if (*(sp - 5) == red_high &&
+                *(sp - 4) == red_low &&
+                *(sp - 3) == green_high &&
+                *(sp - 2) == green_low &&
+                *(sp - 1) == blue_high &&
+                *(sp    ) == blue_low)
+            {
+               *dp-- = 0;
+               *dp-- = 0;
+            }
+
+            else
+            {
+               *dp-- = 0xff;
+               *dp-- = 0xff;
+            }
+
+            *dp-- = *sp--;
+            *dp-- = *sp--;
+            *dp-- = *sp--;
+            *dp-- = *sp--;
+            *dp-- = *sp--;
+            *dp-- = *sp--;
+         }
+      }
+      row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+      row_info->channels = 4;
+      row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+   }
 }
 #endif
 
@@ -4760,8 +4755,7 @@
                 &(png_ptr->trans_color));
 
          else
-            png_do_expand(row_info, png_ptr->row_buf + 1,
-                NULL);
+            png_do_expand(row_info, png_ptr->row_buf + 1, NULL);
       }
    }
 #endif
@@ -4985,7 +4979,7 @@
              (png_ptr,     /* png_ptr */
              row_info,     /* row_info: */
                 /*  png_uint_32 width;       width of row */
-                /*  png_size_t rowbytes;     number of bytes in row */
+                /*  size_t rowbytes;         number of bytes in row */
                 /*  png_byte color_type;     color type of pixels */
                 /*  png_byte bit_depth;      bit depth of samples */
                 /*  png_byte channels;       number of channels (1-4) */

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.6.33 [September 28, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -102,7 +102,7 @@
 png_uint_16 (PNGAPI
 png_get_uint_16)(png_const_bytep buf)
 {
-   /* ANSI-C requires an int value to accomodate at least 16 bits so this
+   /* ANSI-C requires an int value to accommodate at least 16 bits so this
     * works and allows the compiler not to worry about possible narrowing
     * on 32-bit systems.  (Pre-ANSI systems did not make integers smaller
     * than 16 bits either.)
@@ -120,7 +120,7 @@
 void /* PRIVATE */
 png_read_sig(png_structrp png_ptr, png_inforp info_ptr)
 {
-   png_size_t num_checked, num_to_check;
+   size_t num_checked, num_to_check;
 
    /* Exit if the user application does not expect a signature. */
    if (png_ptr->sig_bytes >= 8)
@@ -1648,7 +1648,7 @@
    int entry_size, i;
    png_uint_32 skip = 0;
    png_uint_32 dl;
-   png_size_t max_dl;
+   size_t max_dl;
 
    png_debug(1, "in png_handle_sPLT");
 
@@ -1997,6 +1997,15 @@
 
    else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0) /* GRAY */
    {
+      if (png_ptr->bit_depth <= 8)
+      {
+         if (buf[0] != 0 || buf[1] >= (unsigned int)(1 << png_ptr->bit_depth))
+         {
+            png_chunk_benign_error(png_ptr, "invalid gray level");
+            return;
+         }
+      }
+
       background.index = 0;
       background.red =
       background.green =
@@ -2006,6 +2015,15 @@
 
    else
    {
+      if (png_ptr->bit_depth <= 8)
+      {
+         if (buf[0] != 0 || buf[2] != 0 || buf[4] != 0)
+         {
+            png_chunk_benign_error(png_ptr, "invalid color");
+            return;
+         }
+      }
+
       background.index = 0;
       background.red = png_get_uint_16(buf);
       background.green = png_get_uint_16(buf + 2);
@@ -2359,7 +2377,7 @@
 png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_bytep buffer;
-   png_size_t i;
+   size_t i;
    int state;
 
    png_debug(1, "in png_handle_sCAL");
@@ -2429,7 +2447,7 @@
 
    else
    {
-      png_size_t heighti = i;
+      size_t heighti = i;
 
       state = 0;
       if (png_check_fp_number((png_const_charp)buffer, length,
@@ -2867,7 +2885,7 @@
    {
       PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
       /* The following is safe because of the PNG_SIZE_MAX init above */
-      png_ptr->unknown_chunk.size = (png_size_t)length/*SAFE*/;
+      png_ptr->unknown_chunk.size = (size_t)length/*SAFE*/;
       /* 'mode' is a flag array, only the bottom four bits matter here */
       png_ptr->unknown_chunk.location = (png_byte)png_ptr->mode/*SAFE*/;
 
@@ -3149,10 +3167,13 @@
    {
       png_alloc_size_t idat_limit = PNG_UINT_31_MAX;
       size_t row_factor =
-         (png_ptr->width * png_ptr->channels * (png_ptr->bit_depth > 8? 2: 1)
-          + 1 + (png_ptr->interlaced? 6: 0));
+         (size_t)png_ptr->width
+         * (size_t)png_ptr->channels
+         * (png_ptr->bit_depth > 8? 2: 1)
+         + 1
+         + (png_ptr->interlaced? 6: 0);
       if (png_ptr->height > PNG_UINT_32_MAX/row_factor)
-         idat_limit=PNG_UINT_31_MAX;
+         idat_limit = PNG_UINT_31_MAX;
       else
          idat_limit = png_ptr->height * row_factor;
       row_factor = row_factor > 32566? 32566 : row_factor;
@@ -3679,8 +3700,8 @@
       {
          case 1:
          {
-            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);
-            png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);
+            png_bytep sp = row + (size_t)((row_info->width - 1) >> 3);
+            png_bytep dp = row + (size_t)((final_width - 1) >> 3);
             unsigned int sshift, dshift;
             unsigned int s_start, s_end;
             int s_inc;
@@ -3806,8 +3827,8 @@
 
          case 4:
          {
-            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);
-            png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);
+            png_bytep sp = row + (size_t)((row_info->width - 1) >> 1);
+            png_bytep dp = row + (size_t)((final_width - 1) >> 1);
             unsigned int sshift, dshift;
             unsigned int s_start, s_end;
             int s_inc;
@@ -3869,12 +3890,12 @@
 
          default:
          {
-            png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
+            size_t pixel_bytes = (row_info->pixel_depth >> 3);
 
-            png_bytep sp = row + (png_size_t)(row_info->width - 1)
+            png_bytep sp = row + (size_t)(row_info->width - 1)
                 * pixel_bytes;
 
-            png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;
+            png_bytep dp = row + (size_t)(final_width - 1) * pixel_bytes;
 
             int jstop = (int)png_pass_inc[pass];
             png_uint_32 i;
@@ -3911,8 +3932,8 @@
 png_read_filter_row_sub(png_row_infop row_info, png_bytep row,
     png_const_bytep prev_row)
 {
-   png_size_t i;
-   png_size_t istop = row_info->rowbytes;
+   size_t i;
+   size_t istop = row_info->rowbytes;
    unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
    png_bytep rp = row + bpp;
 
@@ -3929,8 +3950,8 @@
 png_read_filter_row_up(png_row_infop row_info, png_bytep row,
     png_const_bytep prev_row)
 {
-   png_size_t i;
-   png_size_t istop = row_info->rowbytes;
+   size_t i;
+   size_t istop = row_info->rowbytes;
    png_bytep rp = row;
    png_const_bytep pp = prev_row;
 
@@ -3945,11 +3966,11 @@
 png_read_filter_row_avg(png_row_infop row_info, png_bytep row,
     png_const_bytep prev_row)
 {
-   png_size_t i;
+   size_t i;
    png_bytep rp = row;
    png_const_bytep pp = prev_row;
    unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-   png_size_t istop = row_info->rowbytes - bpp;
+   size_t istop = row_info->rowbytes - bpp;
 
    for (i = 0; i < bpp; i++)
    {
@@ -4385,7 +4406,7 @@
    static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
 
    unsigned int max_pixel_depth;
-   png_size_t row_bytes;
+   size_t row_bytes;
 
    png_debug(1, "in png_read_start_row");
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngset.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngset.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngset.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -313,7 +313,7 @@
     png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,
     int nparams, png_const_charp units, png_charpp params)
 {
-   png_size_t length;
+   size_t length;
    int i;
 
    png_debug1(1, "in %s storage function", "pCAL");
@@ -390,7 +390,7 @@
    memcpy(info_ptr->pcal_units, units, length);
 
    info_ptr->pcal_params = png_voidcast(png_charpp, png_malloc_warn(png_ptr,
-       (png_size_t)(((unsigned int)nparams + 1) * (sizeof (png_charp)))));
+       (size_t)(((unsigned int)nparams + 1) * (sizeof (png_charp)))));
 
    if (info_ptr->pcal_params == NULL)
    {
@@ -430,7 +430,7 @@
 png_set_sCAL_s(png_const_structrp png_ptr, png_inforp info_ptr,
     int unit, png_const_charp swidth, png_const_charp sheight)
 {
-   png_size_t lengthw = 0, lengthh = 0;
+   size_t lengthw = 0, lengthh = 0;
 
    png_debug1(1, "in %s storage function", "sCAL");
 
@@ -691,7 +691,7 @@
 {
    png_charp new_iccp_name;
    png_bytep new_iccp_profile;
-   png_size_t length;
+   size_t length;
 
    png_debug1(1, "in %s storage function", "iCCP");
 
@@ -1018,7 +1018,7 @@
          /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
           info_ptr->trans_alpha = png_voidcast(png_bytep,
               png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH));
-          memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);
+          memcpy(info_ptr->trans_alpha, trans_alpha, (size_t)num_trans);
        }
        png_ptr->trans_alpha = info_ptr->trans_alpha;
    }
@@ -1098,7 +1098,7 @@
 
    do
    {
-      png_size_t length;
+      size_t length;
 
       /* Skip invalid input entries */
       if (entries->name == NULL || entries->entries == NULL)
@@ -1563,7 +1563,7 @@
 #endif
 
 void PNGAPI
-png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size)
+png_set_compression_buffer_size(png_structrp png_ptr, size_t size)
 {
    if (png_ptr == NULL)
       return;

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngstruct.h - header file for PNG reference library
  *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -47,7 +47,7 @@
 /* zlib.h declares a magic type 'uInt' that limits the amount of data that zlib
  * can handle at once.  This type need be no larger than 16 bits (so maximum of
  * 65535), this define allows us to discover how big it is, but limited by the
- * maximuum for png_size_t.  The value can be overriden in a library build
+ * maximum for size_t.  The value can be overridden in a library build
  * (pngusr.h, or set it in CPPFLAGS) and it works to set it to a considerably
  * lower value (e.g. 255 works).  A lower value may help memory usage (slightly)
  * and may even improve performance on some systems (and degrade it on others.)
@@ -214,7 +214,7 @@
    png_uint_32 height;        /* height of image in pixels */
    png_uint_32 num_rows;      /* number of rows in current pass */
    png_uint_32 usr_width;     /* width of row at start of write */
-   png_size_t rowbytes;       /* size of row in bytes */
+   size_t rowbytes;           /* size of row in bytes */
    png_uint_32 iwidth;        /* width of current interlaced row in pixels */
    png_uint_32 row_number;    /* current row in interlace pass */
    png_uint_32 chunk_name;    /* PNG_CHUNK() id of current chunk */
@@ -232,7 +232,7 @@
    png_bytep try_row;    /* buffer to save trial row when filtering */
    png_bytep tst_row;    /* buffer to save best trial row when filtering */
 #endif
-   png_size_t info_rowbytes;  /* Added in 1.5.4: cache of updated row bytes */
+   size_t info_rowbytes;      /* Added in 1.5.4: cache of updated row bytes */
 
    png_uint_32 idat_size;     /* current IDAT size for read */
    png_uint_32 crc;           /* current chunk CRC value */
@@ -307,7 +307,7 @@
 #endif
 
 #if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-   png_color_8 shift;         /* shift for significant bit tranformation */
+   png_color_8 shift;         /* shift for significant bit transformation */
 #endif
 
 #if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \
@@ -328,10 +328,10 @@
    png_bytep current_buffer;         /* buffer for recently used data */
    png_uint_32 push_length;          /* size of current input chunk */
    png_uint_32 skip_length;          /* bytes to skip in input data */
-   png_size_t save_buffer_size;      /* amount of data now in save_buffer */
-   png_size_t save_buffer_max;       /* total size of save_buffer */
-   png_size_t buffer_size;           /* total amount of available input data */
-   png_size_t current_buffer_size;   /* amount of data now in current_buffer */
+   size_t save_buffer_size;          /* amount of data now in save_buffer */
+   size_t save_buffer_max;           /* total size of save_buffer */
+   size_t buffer_size;               /* total amount of available input data */
+   size_t current_buffer_size;       /* amount of data now in current_buffer */
    int process_mode;                 /* what push library is currently doing */
    int cur_palette;                  /* current push library palette index */
 
@@ -451,7 +451,7 @@
 #endif
 
 /* New member added in libpng-1.2.26 */
-  png_size_t old_big_row_buf_size;
+   size_t old_big_row_buf_size;
 
 #ifdef PNG_READ_SUPPORTED
 /* New member added in libpng-1.2.30 */

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngtest.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngtest.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngtest.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngtest.c - a simple test program to test libpng
  *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -345,10 +345,10 @@
 
 #ifdef PNG_IO_STATE_SUPPORTED
 void
-pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,
+pngtest_check_io_state(png_structp png_ptr, size_t data_length,
     png_uint_32 io_op);
 void
-pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,
+pngtest_check_io_state(png_structp png_ptr, size_t data_length,
     png_uint_32 io_op)
 {
    png_uint_32 io_state = png_get_io_state(png_ptr);
@@ -386,12 +386,12 @@
 #endif
 
 static void PNGCBAPI
-pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+pngtest_read_data(png_structp png_ptr, png_bytep data, size_t length)
 {
-   png_size_t check = 0;
+   size_t check = 0;
    png_voidp io_ptr;
 
-   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+   /* fread() returns 0 on error, so it is OK to store this in a size_t
     * instead of an int, which is what fread() actually returns.
     */
    io_ptr = png_get_io_ptr(png_ptr);
@@ -425,9 +425,9 @@
  * than changing the library.
  */
 static void PNGCBAPI
-pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+pngtest_write_data(png_structp png_ptr, png_bytep data, size_t length)
 {
-   png_size_t check;
+   size_t check;
 
    check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));
 
@@ -705,7 +705,7 @@
     * The unknown chunk structure contains the chunk data:
     * png_byte name[5];
     * png_byte *data;
-    * png_size_t size;
+    * size_t size;
     *
     * Note that libpng has already taken care of the CRC handling.
     */
@@ -1726,7 +1726,7 @@
       for (;;)
       {
          static int wrote_question = 0;
-         png_size_t num_in, num_out;
+         size_t num_in, num_out;
          char inbuf[256], outbuf[256];
 
          num_in = fread(inbuf, 1, sizeof inbuf, fpin);
@@ -2153,4 +2153,4 @@
 #endif
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_34 Your_png_h_is_not_version_1_6_34;
+typedef png_libpng_version_1_6_35 Your_png_h_is_not_version_1_6_35;

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngtrans.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngtrans.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngtrans.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
- * Last changed in libpng 1.6.33 [September 28, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -269,8 +269,8 @@
    if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
    {
       png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
+      size_t i;
+      size_t istop = row_info->rowbytes;
 
       for (i = 0; i < istop; i++)
       {
@@ -283,8 +283,8 @@
       row_info->bit_depth == 8)
    {
       png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
+      size_t i;
+      size_t istop = row_info->rowbytes;
 
       for (i = 0; i < istop; i += 2)
       {
@@ -298,8 +298,8 @@
       row_info->bit_depth == 16)
    {
       png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
+      size_t i;
+      size_t istop = row_info->rowbytes;
 
       for (i = 0; i < istop; i += 4)
       {
@@ -609,7 +609,7 @@
       return; /* The filler channel has gone already */
 
    /* Fix the rowbytes value. */
-   row_info->rowbytes = (png_size_t)(dp-row);
+   row_info->rowbytes = (size_t)(dp-row);
 }
 #endif
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngwio.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngwio.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngwio.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngwio.c - functions for data output
  *
- * Last changed in libpng 1.6.24 [August 4, 2016]
- * Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2014,2016,2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -30,7 +30,7 @@
  */
 
 void /* PRIVATE */
-png_write_data(png_structrp png_ptr, png_const_bytep data, png_size_t length)
+png_write_data(png_structrp png_ptr, png_const_bytep data, size_t length)
 {
    /* NOTE: write_data_fn must not change the buffer! */
    if (png_ptr->write_data_fn != NULL )
@@ -48,9 +48,9 @@
  * than changing the library.
  */
 void PNGCBAPI
-png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+png_default_write_data(png_structp png_ptr, png_bytep data, size_t length)
 {
-   png_size_t check;
+   size_t check;
 
    if (png_ptr == NULL)
       return;

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -1636,7 +1636,7 @@
  * calculation can be done to 15 bits of accuracy; however, the output needs to
  * be scaled in the range 0..255*65535, so include that scaling here.
  */
-#   define UNP_RECIPROCAL(alpha) ((((0xffff*0xff)<<7)+(alpha>>1))/alpha)
+#   define UNP_RECIPROCAL(alpha) ((((0xffff*0xff)<<7)+((alpha)>>1))/(alpha))
 
 static png_byte
 png_unpremultiply(png_uint_32 component, png_uint_32 alpha,
@@ -2162,8 +2162,7 @@
 
 
 static void (PNGCBAPI
-image_memory_write)(png_structp png_ptr, png_bytep/*const*/ data,
-    png_size_t size)
+image_memory_write)(png_structp png_ptr, png_bytep/*const*/ data, size_t size)
 {
    png_image_write_control *display = png_voidcast(png_image_write_control*,
        png_ptr->io_ptr/*backdoor: png_get_io_ptr(png_ptr)*/);

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngwtran.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngwtran.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngwtran.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngwtran.c - transforms the data in a row for PNG writers
  *
- * Last changed in libpng 1.6.26 [October 20, 2016]
- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -212,9 +212,9 @@
       if (row_info->bit_depth < 8)
       {
          png_bytep bp = row;
-         png_size_t i;
+         size_t i;
          unsigned int mask;
-         png_size_t row_bytes = row_info->rowbytes;
+         size_t row_bytes = row_info->rowbytes;
 
          if (bit_depth->gray == 1 && row_info->bit_depth == 2)
             mask = 0x55;
@@ -514,7 +514,7 @@
              (png_ptr,  /* png_ptr */
              row_info,  /* row_info: */
                 /*  png_uint_32 width;       width of row */
-                /*  png_size_t rowbytes;     number of bytes in row */
+                /*  size_t rowbytes;         number of bytes in row */
                 /*  png_byte color_type;     color type of pixels */
                 /*  png_byte bit_depth;      bit depth of samples */
                 /*  png_byte channels;       number of channels (1-4) */

Modified: branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,8 +1,8 @@
 
 /* pngwutil.c - utilities to write a PNG file
  *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -59,7 +59,7 @@
 
    /* Write the rest of the 8 byte signature */
    png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes],
-       (png_size_t)(8 - png_ptr->sig_bytes));
+       (size_t)(8 - png_ptr->sig_bytes));
 
    if (png_ptr->sig_bytes < 3)
       png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
@@ -124,8 +124,7 @@
  * given to png_write_chunk_header().
  */
 void PNGAPI
-png_write_chunk_data(png_structrp png_ptr, png_const_bytep data,
-    png_size_t length)
+png_write_chunk_data(png_structrp png_ptr, png_const_bytep data, size_t length)
 {
    /* Write the data, and run the CRC over it */
    if (png_ptr == NULL)
@@ -160,7 +159,7 @@
    /* Write the crc in a single operation */
    png_save_uint_32(buf, png_ptr->crc);
 
-   png_write_data(png_ptr, buf, (png_size_t)4);
+   png_write_data(png_ptr, buf, 4);
 }
 
 /* Write a PNG chunk all at once.  The type is an array of ASCII characters
@@ -174,7 +173,7 @@
  */
 static void
 png_write_complete_chunk(png_structrp png_ptr, png_uint_32 chunk_name,
-    png_const_bytep data, png_size_t length)
+    png_const_bytep data, size_t length)
 {
    if (png_ptr == NULL)
       return;
@@ -191,7 +190,7 @@
 /* This is the API that calls the internal function above. */
 void PNGAPI
 png_write_chunk(png_structrp png_ptr, png_const_bytep chunk_string,
-    png_const_bytep data, png_size_t length)
+    png_const_bytep data, size_t length)
 {
    png_write_complete_chunk(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), data,
        length);
@@ -820,7 +819,7 @@
    buf[12] = (png_byte)interlace_type;
 
    /* Write the chunk */
-   png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
+   png_write_complete_chunk(png_ptr, png_IHDR, buf, 13);
 
    if ((png_ptr->do_filter) == PNG_NO_FILTERS)
    {
@@ -889,7 +888,7 @@
       buf[0] = pal_ptr->red;
       buf[1] = pal_ptr->green;
       buf[2] = pal_ptr->blue;
-      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
+      png_write_chunk_data(png_ptr, buf, 3);
    }
 
 #else
@@ -903,7 +902,7 @@
       buf[0] = pal_ptr[i].red;
       buf[1] = pal_ptr[i].green;
       buf[2] = pal_ptr[i].blue;
-      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
+      png_write_chunk_data(png_ptr, buf, 3);
    }
 
 #endif
@@ -1075,7 +1074,7 @@
 {
    png_debug(1, "in png_write_IEND");
 
-   png_write_complete_chunk(png_ptr, png_IEND, NULL, (png_size_t)0);
+   png_write_complete_chunk(png_ptr, png_IEND, NULL, 0);
    png_ptr->mode |= PNG_HAVE_IEND;
 }
 
@@ -1090,7 +1089,7 @@
 
    /* file_gamma is saved in 1/100,000ths */
    png_save_uint_32(buf, (png_uint_32)file_gamma);
-   png_write_complete_chunk(png_ptr, png_gAMA, buf, (png_size_t)4);
+   png_write_complete_chunk(png_ptr, png_gAMA, buf, 4);
 }
 #endif
 
@@ -1108,7 +1107,7 @@
           "Invalid sRGB rendering intent specified");
 
    buf[0]=(png_byte)srgb_intent;
-   png_write_complete_chunk(png_ptr, png_sRGB, buf, (png_size_t)1);
+   png_write_complete_chunk(png_ptr, png_sRGB, buf, 1);
 }
 #endif
 
@@ -1182,8 +1181,8 @@
    png_uint_32 name_len;
    png_byte new_name[80];
    png_byte entrybuf[10];
-   png_size_t entry_size = (spalette->depth == 8 ? 6 : 10);
-   png_size_t palette_size = entry_size * (png_size_t)spalette->nentries;
+   size_t entry_size = (spalette->depth == 8 ? 6 : 10);
+   size_t palette_size = entry_size * (size_t)spalette->nentries;
    png_sPLT_entryp ep;
 #ifndef PNG_POINTER_INDEXING_SUPPORTED
    int i;
@@ -1200,10 +1199,9 @@
    png_write_chunk_header(png_ptr, png_sPLT,
        (png_uint_32)(name_len + 2 + palette_size));
 
-   png_write_chunk_data(png_ptr, (png_bytep)new_name,
-       (png_size_t)(name_len + 1));
+   png_write_chunk_data(png_ptr, (png_bytep)new_name, (size_t)(name_len + 1));
 
-   png_write_chunk_data(png_ptr, &spalette->depth, (png_size_t)1);
+   png_write_chunk_data(png_ptr, &spalette->depth, 1);
 
    /* Loop through each palette entry, writing appropriately */
 #ifdef PNG_POINTER_INDEXING_SUPPORTED
@@ -1265,7 +1263,7 @@
 png_write_sBIT(png_structrp png_ptr, png_const_color_8p sbit, int color_type)
 {
    png_byte buf[4];
-   png_size_t size;
+   size_t size;
 
    png_debug(1, "in png_write_sBIT");
 
@@ -1365,7 +1363,7 @@
 
       /* Write the chunk out as it is */
       png_write_complete_chunk(png_ptr, png_tRNS, trans_alpha,
-          (png_size_t)num_trans);
+          (size_t)num_trans);
    }
 
    else if (color_type == PNG_COLOR_TYPE_GRAY)
@@ -1380,7 +1378,7 @@
       }
 
       png_save_uint_16(buf, tran->gray);
-      png_write_complete_chunk(png_ptr, png_tRNS, buf, (png_size_t)2);
+      png_write_complete_chunk(png_ptr, png_tRNS, buf, 2);
    }
 
    else if (color_type == PNG_COLOR_TYPE_RGB)
@@ -1400,7 +1398,7 @@
          return;
       }
 
-      png_write_complete_chunk(png_ptr, png_tRNS, buf, (png_size_t)6);
+      png_write_complete_chunk(png_ptr, png_tRNS, buf, 6);
    }
 
    else
@@ -1433,7 +1431,7 @@
       }
 
       buf[0] = back->index;
-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);
+      png_write_complete_chunk(png_ptr, png_bKGD, buf, 1);
    }
 
    else if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
@@ -1454,7 +1452,7 @@
          return;
       }
 
-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)6);
+      png_write_complete_chunk(png_ptr, png_bKGD, buf, 6);
    }
 
    else
@@ -1468,7 +1466,7 @@
       }
 
       png_save_uint_16(buf, back->gray);
-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)2);
+      png_write_complete_chunk(png_ptr, png_bKGD, buf, 2);
    }
 }
 #endif
@@ -1488,7 +1486,7 @@
    for (i = 0; i < num_exif; i++)
    {
       buf[0] = exif[i];
-      png_write_chunk_data(png_ptr, buf, (png_size_t)1);
+      png_write_chunk_data(png_ptr, buf, 1);
    }
 
    png_write_chunk_end(png_ptr);
@@ -1519,7 +1517,7 @@
    for (i = 0; i < num_hist; i++)
    {
       png_save_uint_16(buf, hist[i]);
-      png_write_chunk_data(png_ptr, buf, (png_size_t)2);
+      png_write_chunk_data(png_ptr, buf, 2);
    }
 
    png_write_chunk_end(png_ptr);
@@ -1530,7 +1528,7 @@
 /* Write a tEXt chunk */
 void /* PRIVATE */
 png_write_tEXt(png_structrp png_ptr, png_const_charp key, png_const_charp text,
-    png_size_t text_len)
+    size_t text_len)
 {
    png_uint_32 key_len;
    png_byte new_key[80];
@@ -1627,7 +1625,7 @@
     png_const_charp lang, png_const_charp lang_key, png_const_charp text)
 {
    png_uint_32 key_len, prefix_len;
-   png_size_t lang_len, lang_key_len;
+   size_t lang_len, lang_key_len;
    png_byte new_key[82];
    compression_state comp;
 
@@ -1737,7 +1735,7 @@
    png_save_int_32(buf + 4, y_offset);
    buf[8] = (png_byte)unit_type;
 
-   png_write_complete_chunk(png_ptr, png_oFFs, buf, (png_size_t)9);
+   png_write_complete_chunk(png_ptr, png_oFFs, buf, 9);
 }
 #endif
 #ifdef PNG_WRITE_pCAL_SUPPORTED
@@ -1748,7 +1746,7 @@
     png_charpp params)
 {
    png_uint_32 purpose_len;
-   png_size_t units_len, total_len;
+   size_t units_len, total_len;
    png_size_tp params_len;
    png_byte buf[10];
    png_byte new_purpose[80];
@@ -1772,7 +1770,7 @@
    total_len = purpose_len + units_len + 10;
 
    params_len = (png_size_tp)png_malloc(png_ptr,
-       (png_alloc_size_t)((png_alloc_size_t)nparams * (sizeof (png_size_t))));
+       (png_alloc_size_t)((png_alloc_size_t)nparams * (sizeof (size_t))));
 
    /* Find the length of each parameter, making sure we don't count the
     * null terminator for the last parameter.
@@ -1792,8 +1790,8 @@
    png_save_int_32(buf + 4, X1);
    buf[8] = (png_byte)type;
    buf[9] = (png_byte)nparams;
-   png_write_chunk_data(png_ptr, buf, (png_size_t)10);
-   png_write_chunk_data(png_ptr, (png_const_bytep)units, (png_size_t)units_len);
+   png_write_chunk_data(png_ptr, buf, 10);
+   png_write_chunk_data(png_ptr, (png_const_bytep)units, (size_t)units_len);
 
    for (i = 0; i < nparams; i++)
    {
@@ -1812,7 +1810,7 @@
     png_const_charp height)
 {
    png_byte buf[64];
-   png_size_t wlen, hlen, total_len;
+   size_t wlen, hlen, total_len;
 
    png_debug(1, "in png_write_sCAL_s");
 
@@ -1853,7 +1851,7 @@
    png_save_uint_32(buf + 4, y_pixels_per_unit);
    buf[8] = (png_byte)unit_type;
 
-   png_write_complete_chunk(png_ptr, png_pHYs, buf, (png_size_t)9);
+   png_write_complete_chunk(png_ptr, png_pHYs, buf, 9);
 }
 #endif
 
@@ -1883,7 +1881,7 @@
    buf[5] = mod_time->minute;
    buf[6] = mod_time->second;
 
-   png_write_complete_chunk(png_ptr, png_tIME, buf, (png_size_t)7);
+   png_write_complete_chunk(png_ptr, png_tIME, buf, 7);
 }
 #endif
 
@@ -2073,8 +2071,8 @@
       {
          if (png_ptr->prev_row != NULL)
             memset(png_ptr->prev_row, 0,
-                (png_size_t)(PNG_ROWBYTES(png_ptr->usr_channels*
-                png_ptr->usr_bit_depth, png_ptr->width)) + 1);
+                PNG_ROWBYTES(png_ptr->usr_channels *
+                png_ptr->usr_bit_depth, png_ptr->width) + 1);
 
          return;
       }
@@ -2130,7 +2128,7 @@
             for (i = png_pass_start[pass]; i < row_width;
                i += png_pass_inc[pass])
             {
-               sp = row + (png_size_t)(i >> 3);
+               sp = row + (size_t)(i >> 3);
                value = (int)(*sp >> (7 - (int)(i & 0x07))) & 0x01;
                d |= (value << shift);
 
@@ -2168,7 +2166,7 @@
             for (i = png_pass_start[pass]; i < row_width;
                i += png_pass_inc[pass])
             {
-               sp = row + (png_size_t)(i >> 2);
+               sp = row + (size_t)(i >> 2);
                value = (*sp >> ((3 - (int)(i & 0x03)) << 1)) & 0x03;
                d |= (value << shift);
 
@@ -2204,7 +2202,7 @@
             for (i = png_pass_start[pass]; i < row_width;
                 i += png_pass_inc[pass])
             {
-               sp = row + (png_size_t)(i >> 1);
+               sp = row + (size_t)(i >> 1);
                value = (*sp >> ((1 - (int)(i & 0x01)) << 2)) & 0x0f;
                d |= (value << shift);
 
@@ -2230,7 +2228,7 @@
             png_bytep dp;
             png_uint_32 i;
             png_uint_32 row_width = row_info->width;
-            png_size_t pixel_bytes;
+            size_t pixel_bytes;
 
             /* Start at the beginning */
             dp = row;
@@ -2243,7 +2241,7 @@
                i += png_pass_inc[pass])
             {
                /* Find out where the original pixel is */
-               sp = row + (png_size_t)i * pixel_bytes;
+               sp = row + (size_t)i * pixel_bytes;
 
                /* Move the pixel */
                if (dp != sp)
@@ -2274,16 +2272,16 @@
  */
 static void /* PRIVATE */
 png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
-    png_size_t row_bytes);
+    size_t row_bytes);
 
 #ifdef PNG_WRITE_FILTER_SUPPORTED
-static png_size_t /* PRIVATE */
+static size_t /* PRIVATE */
 png_setup_sub_row(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes, const png_size_t lmins)
+    size_t row_bytes, size_t lmins)
 {
    png_bytep rp, dp, lp;
-   png_size_t i;
-   png_size_t sum = 0;
+   size_t i;
+   size_t sum = 0;
    unsigned int v;
 
    png_ptr->try_row[0] = PNG_FILTER_VALUE_SUB;
@@ -2318,10 +2316,10 @@
 
 static void /* PRIVATE */
 png_setup_sub_row_only(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes)
+    size_t row_bytes)
 {
    png_bytep rp, dp, lp;
-   png_size_t i;
+   size_t i;
 
    png_ptr->try_row[0] = PNG_FILTER_VALUE_SUB;
 
@@ -2338,13 +2336,12 @@
    }
 }
 
-static png_size_t /* PRIVATE */
-png_setup_up_row(png_structrp png_ptr, const png_size_t row_bytes,
-    const png_size_t lmins)
+static size_t /* PRIVATE */
+png_setup_up_row(png_structrp png_ptr, size_t row_bytes, size_t lmins)
 {
    png_bytep rp, dp, pp;
-   png_size_t i;
-   png_size_t sum = 0;
+   size_t i;
+   size_t sum = 0;
    unsigned int v;
 
    png_ptr->try_row[0] = PNG_FILTER_VALUE_UP;
@@ -2367,10 +2364,10 @@
    return (sum);
 }
 static void /* PRIVATE */
-png_setup_up_row_only(png_structrp png_ptr, const png_size_t row_bytes)
+png_setup_up_row_only(png_structrp png_ptr, size_t row_bytes)
 {
    png_bytep rp, dp, pp;
-   png_size_t i;
+   size_t i;
 
    png_ptr->try_row[0] = PNG_FILTER_VALUE_UP;
 
@@ -2382,13 +2379,13 @@
    }
 }
 
-static png_size_t /* PRIVATE */
+static size_t /* PRIVATE */
 png_setup_avg_row(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes, const png_size_t lmins)
+    size_t row_bytes, size_t lmins)
 {
    png_bytep rp, dp, pp, lp;
    png_uint_32 i;
-   png_size_t sum = 0;
+   size_t sum = 0;
    unsigned int v;
 
    png_ptr->try_row[0] = PNG_FILTER_VALUE_AVG;
@@ -2424,7 +2421,7 @@
 }
 static void /* PRIVATE */
 png_setup_avg_row_only(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes)
+    size_t row_bytes)
 {
    png_bytep rp, dp, pp, lp;
    png_uint_32 i;
@@ -2444,13 +2441,13 @@
    }
 }
 
-static png_size_t /* PRIVATE */
+static size_t /* PRIVATE */
 png_setup_paeth_row(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes, const png_size_t lmins)
+    size_t row_bytes, size_t lmins)
 {
    png_bytep rp, dp, pp, cp, lp;
-   png_size_t i;
-   png_size_t sum = 0;
+   size_t i;
+   size_t sum = 0;
    unsigned int v;
 
    png_ptr->try_row[0] = PNG_FILTER_VALUE_PAETH;
@@ -2507,10 +2504,10 @@
 }
 static void /* PRIVATE */
 png_setup_paeth_row_only(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes)
+    size_t row_bytes)
 {
    png_bytep rp, dp, pp, cp, lp;
-   png_size_t i;
+   size_t i;
 
    png_ptr->try_row[0] = PNG_FILTER_VALUE_PAETH;
 
@@ -2559,8 +2556,8 @@
    png_bytep row_buf;
    png_bytep best_row;
    png_uint_32 bpp;
-   png_size_t mins;
-   png_size_t row_bytes = row_info->rowbytes;
+   size_t mins;
+   size_t row_bytes = row_info->rowbytes;
 
    png_debug(1, "in png_write_find_filter");
 
@@ -2615,8 +2612,8 @@
        * 'none' filter.
        */
       png_bytep rp;
-      png_size_t sum = 0;
-      png_size_t i;
+      size_t sum = 0;
+      size_t i;
       unsigned int v;
 
       {
@@ -2644,8 +2641,8 @@
 
    else if ((filter_to_do & PNG_FILTER_SUB) != 0)
    {
-      png_size_t sum;
-      png_size_t lmins = mins;
+      size_t sum;
+      size_t lmins = mins;
 
       sum = png_setup_sub_row(png_ptr, bpp, row_bytes, lmins);
 
@@ -2670,8 +2667,8 @@
 
    else if ((filter_to_do & PNG_FILTER_UP) != 0)
    {
-      png_size_t sum;
-      png_size_t lmins = mins;
+      size_t sum;
+      size_t lmins = mins;
 
       sum = png_setup_up_row(png_ptr, row_bytes, lmins);
 
@@ -2696,8 +2693,8 @@
 
    else if ((filter_to_do & PNG_FILTER_AVG) != 0)
    {
-      png_size_t sum;
-      png_size_t lmins = mins;
+      size_t sum;
+      size_t lmins = mins;
 
       sum= png_setup_avg_row(png_ptr, bpp, row_bytes, lmins);
 
@@ -2722,8 +2719,8 @@
 
    else if ((filter_to_do & PNG_FILTER_PAETH) != 0)
    {
-      png_size_t sum;
-      png_size_t lmins = mins;
+      size_t sum;
+      size_t lmins = mins;
 
       sum = png_setup_paeth_row(png_ptr, bpp, row_bytes, lmins);
 
@@ -2748,7 +2745,7 @@
 /* Do the actual writing of a previously filtered row. */
 static void
 png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
-    png_size_t full_row_length/*includes filter byte*/)
+    size_t full_row_length/*includes filter byte*/)
 {
    png_debug(1, "in png_write_filtered_row");
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/powerpc/filter_vsx_intrinsics.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/powerpc/filter_vsx_intrinsics.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/powerpc/filter_vsx_intrinsics.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -42,8 +42,8 @@
    png_byte i;\
    png_bytep rp = row + offset;\
    png_const_bytep pp = prev_row;\
-   png_size_t unaligned_top = 16 - (((png_size_t)rp % 16));\
-   png_size_t istop;\
+   size_t unaligned_top = 16 - (((size_t)rp % 16));\
+   size_t istop;\
    if(unaligned_top == 16)\
       unaligned_top = 0;\
    istop = row_info->rowbytes;\

Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/owatcom/pngconfig.mak
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/owatcom/pngconfig.mak	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/owatcom/pngconfig.mak	2018-11-12 19:12:53 UTC (rev 807)
@@ -117,7 +117,7 @@
 <<
  @$(COPY) << pngconfig.dfa
 $# pngconfig.dfa: this file contains configuration options for libpng.
-$# If emtpy the standard configuration will be built.  For this file to be
+$# If empty the standard configuration will be built.  For this file to be
 $# used a working version of the program 'awk' is required and the program
 $# must be identified in the 'before' rule of the project.
 $#
@@ -144,7 +144,7 @@
 $#
 $# If awk isn't set then this file is bypassed.  If you just want the standard
 $# configuration it is automatically produced from the distributed version
-$# (scripts\pnglibconf.h.prebuilt) by editting PNG_API_RULE to 2 (to force use
+$# (scripts\pnglibconf.h.prebuilt) by editing PNG_API_RULE to 2 (to force use
 $# of the OpenWatcom library calling convention.)
 $#
 <<

Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/visualc71/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/visualc71/README.txt	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/visualc71/README.txt	2018-11-12 19:12:53 UTC (rev 807)
@@ -12,7 +12,7 @@
 * The libpng source files are in ..\..
 * The zlib source files are in ..\..\..\zlib
 * The zlib project file is in . /* Warning: This is until the zlib project
-  files get intergrated into the next zlib release. The final zlib project
+  files get integrated into the next zlib release. The final zlib project
   directory will then be ..\..\..\zlib\projects\visualc71. */
 
 To use:

Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.6.34 - September 29, 2017
+libpng version 1.6.35 - July 15, 2018
 
 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
 

Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib.props
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib.props	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib.props	2018-11-12 19:12:53 UTC (rev 807)
@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.6.34 - September 29, 2017
+ * libpng version 1.6.35 - July 15, 2018
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,11 +1,11 @@
 
-Makefiles for  libpng version 1.6.34 - September 29, 2017
+Makefiles for libpng version 1.6.35 - July 15, 2018
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng16.so.16.1.6.34)
+                       (gcc, creates libpng16.so.16.1.6.35)
  makefile.linux-opt=>  Linux/ELF makefile with hardware optimizations on
-                       (gcc, creates libpng16.so.16.1.6.34)
+                       (gcc, creates libpng16.so.16.1.6.35)
  makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
  makefile.knr      =>  Archaic UNIX Makefile that converts files with
                        ansi2knr (Requires ansi2knr.c from
@@ -35,12 +35,12 @@
  makefile.os2      =>  OS/2 Makefile (gcc and emx, requires libpng.def)
  makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
  makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng16.so.16.1.6.34)
+                       creates libpng16.so.16.1.6.35)
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
  makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng16.so.16.1.6.34)
+                       creates libpng16.so.16.1.6.35)
  makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng16.so.16.1.6.34)
+                       creates libpng16.so.16.1.6.35)
  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
  makefile.sunos    =>  Sun makefile
  makefile.32sunu   =>  Sun Ultra 32-bit makefile

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/def.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/def.c	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/def.c	2018-11-12 19:12:53 UTC (rev 807)
@@ -21,7 +21,7 @@
 PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE"
 PNG_DFN ""
 PNG_DFN "EXPORTS"
-PNG_DFN ";Version 1.6.34"
+PNG_DFN ";Version 1.6.35"
 
 #define PNG_EXPORTA(ordinal, type, name, args, attributes)\
         PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in	2018-11-12 19:12:53 UTC (rev 807)
@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version=1.6.34
+version=1.6.35
 prefix=""
 libdir=""
 libs=""

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in	2018-11-12 19:12:53 UTC (rev 807)
@@ -5,6 +5,6 @@
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.6.34
+Version: 1.6.35
 Libs: -L${libdir} -lpng16
 Cflags: -I${includedir}

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc	2018-11-12 19:12:53 UTC (rev 807)
@@ -23,7 +23,7 @@
 
 VERMAJ = 1
 VERMIN = 6
-VERMIC = 34
+VERMIC = 35
 VER = $(VERMAJ).$(VERMIN).$(VERMIC)
 NAME = libpng
 PACKAGE = $(NAME)-$(VER)

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux	2018-11-12 19:12:53 UTC (rev 807)
@@ -10,7 +10,7 @@
 # Library name:
 LIBNAME = libpng16
 PNGMAJ = 16
-RELEASE = 34
+RELEASE = 35
 
 # Shared library names:
 LIBSO=$(LIBNAME).so

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux-opt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux-opt	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux-opt	2018-11-12 19:12:53 UTC (rev 807)
@@ -10,7 +10,7 @@
 # Library name:
 LIBNAME = libpng16
 PNGMAJ = 16
-RELEASE = 34
+RELEASE = 35
 
 # Shared library names:
 LIBSO=$(LIBNAME).so

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys	2018-11-12 19:12:53 UTC (rev 807)
@@ -18,7 +18,7 @@
 # Library name:
 LIBNAME = libpng16
 PNGMAJ = 16
-RELEASE = 34
+RELEASE = 35
 
 # Shared library names:
 LIBSO=$(LIBNAME).dll

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ne12bsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ne12bsd	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ne12bsd	2018-11-12 19:12:53 UTC (rev 807)
@@ -17,7 +17,7 @@
 
 LIB=	png16
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.6.34
+SHLIB_MINOR=	1.6.35
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd	2018-11-12 19:12:53 UTC (rev 807)
@@ -17,7 +17,7 @@
 
 LIB=	png
 SHLIB_MAJOR=	16
-SHLIB_MINOR=	1.6.34
+SHLIB_MINOR=	1.6.35
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd	2018-11-12 19:12:53 UTC (rev 807)
@@ -11,7 +11,7 @@
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	16
-SHLIB_MINOR=	1.6.34
+SHLIB_MINOR=	1.6.35
 
 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/options.awk
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/options.awk	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/options.awk	2018-11-12 19:12:53 UTC (rev 807)
@@ -40,7 +40,7 @@
    # the lines, for example by inserting spaces around operators, and all
    # C preprocessors notice lines that start with '#', most remove comments.
    # The technique adopted here is to make the final output lines into
-   # C strings (enclosed in double quotes), preceeded by PNG_DFN.  As a
+   # C strings (enclosed in double quotes), preceded by PNG_DFN.  As a
    # consequence the output cannot contain a 'raw' double quote - instead put
    # @' in, this will be replaced by a single " afterward.  See the parser
    # script dfn.awk for more capabilities (not required here).  Note that if
@@ -336,7 +336,7 @@
 
 # chunk NAME [requires OPT] [enables LIST] [on|off|disabled]
 #   Expands to the 'option' settings appropriate to the reading and
-#   writing of an ancilliary PNG chunk 'NAME':
+#   writing of an ancillary PNG chunk 'NAME':
 #
 #   option READ_NAME requires READ_ANCILLARY_CHUNKS [READ_OPT]
 #   option READ_NAME enables NAME LIST
@@ -805,8 +805,8 @@
    print comment, "end of options", cend >out
 
    # Do the 'setting' values second, the algorithm the standard
-   # tree walk (O(1)) done in an O(2) while/for loop; interations
-   # settings x depth, outputing the deepest required macros
+   # tree walk (O(1)) done in an O(2) while/for loop; iterations
+   # settings x depth, outputting the deepest required macros
    # first.
    print "" >out
    print "/* SETTINGS */" >out

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa	2018-11-12 19:12:53 UTC (rev 807)
@@ -189,7 +189,7 @@
 
 setting API_RULE default 0
 
-# This allows a prefix to be added to the front of every API functon name (and
+# This allows a prefix to be added to the front of every API function name (and
 # therefore every symbol) by redefining all the function names with the prefix
 # at the end of pnglibconf.h.  It also turns on similar internal symbol renaming
 # by causing a similar build-time only file, pngprefix.h, to be generated.
@@ -324,7 +324,7 @@
 #     By default recoverable errors on write should just generate warnings,
 #     not generally safe because this allows the application to write invalid
 #     PNG files.  Applications should enable this themselves; it's useful
-#     because it means that a failure to write an ancilliary chunk can often be
+#     because it means that a failure to write an ancillary chunk can often be
 #     ignored.
 
 option WARNINGS
@@ -395,7 +395,7 @@
 option USER_LIMITS requires READ
 
 # The default settings given below for the limits mean that libpng will
-# limit the size of images or the size of data in ancilliary chunks to less
+# limit the size of images or the size of data in ancillary chunks to less
 # than the specification or implementation limits. Settings have the
 # following interpretations:
 #
@@ -559,7 +559,7 @@
 option WRITE_CUSTOMIZE_COMPRESSION requires WRITE
 
 # Any chunks you are not interested in, you can undef here.  The
-# ones that allocate memory may be expecially important (hIST,
+# ones that allocate memory may be especially important (hIST,
 # tEXt, zTXt, tRNS, pCAL).  Others will just save time and make png_info
 # a bit smaller.
 
@@ -715,7 +715,7 @@
 setting ZBUF_SIZE default 8192
 
 # This is the size of the decompression buffer used when counting or checking
-# the decompressed size of an LZ stream from a compressed ancilliary chunk; the
+# the decompressed size of an LZ stream from a compressed ancillary chunk; the
 # decompressed data is never used so a different size may be optimal.  This size
 # was determined using contrib/libtests/timepng.c with compressed zTXt data
 # around 11MByte in size.  Slight speed improvements (up to about 14% in

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,10 +1,10 @@
-/* libpng 1.6.34 STANDARD API DEFINITION */
+/* libpng 1.6.35 STANDARD API DEFINITION */
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.6.34 - September 29, 2017 */
+/* Libpng version 1.6.35 - July 15, 2018 */
 
-/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */
+/* Copyright (c) 1998-2018 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */
 /* For conditions of distribution and use, see the disclaimer */

Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.def
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.def	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.def	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,4 +1,4 @@
-;Version 1.6.34
+;Version 1.6.35
 ;--------------------------------------------------------------
 ; LIBPNG symbol list as a Win32 DEF file
 ; Contains all the symbols that can be exported from libpng

Modified: branches/stable/source/src/libs/libpng/version.ac
===================================================================
--- branches/stable/source/src/libs/libpng/version.ac	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/libpng/version.ac	2018-11-12 19:12:53 UTC (rev 807)
@@ -8,4 +8,4 @@
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current libpng version
-m4_define([libpng_version], [1.6.34])
+m4_define([libpng_version], [1.6.35])

Modified: branches/stable/source/src/libs/poppler/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/ChangeLog	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/ChangeLog	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,3 +1,13 @@
+2018-08-20  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	Import poppler-0.68.0.
+	* version.ac: Adjust.
+
+2018-07-21  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	Import poppler-0.67.0.
+	* version.ac: Adjust.
+
 2018-06-20  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	Import poppler-0.66.0.

Modified: branches/stable/source/src/libs/poppler/Makefile.am
===================================================================
--- branches/stable/source/src/libs/poppler/Makefile.am	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/Makefile.am	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 47788 2018-05-21 04:55:02Z kakuto $
+## $Id: Makefile.am 48731 2018-09-22 08:15:42Z kakuto $
 ## Proxy Makefile.am to build poppler for TeX Live.
 ##
 ##   Copyright 2016-2018 Karl Berry <tex-live at tug.org>

Modified: branches/stable/source/src/libs/poppler/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/ChangeLog	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/TLpatches/ChangeLog	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,3 +1,11 @@
+2018-08-20  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* patch-03-time: Adapted.
+
+2018-07-21  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* patch-03-time: Adapted.
+
 2018-06-20  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* patch-03-time: Adapted.

Modified: branches/stable/source/src/libs/poppler/TLpatches/TL-Changes
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/TL-Changes	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/TLpatches/TL-Changes	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.66.0 tree as obtained from:
+Changes applied to the poppler-0.68.0 tree as obtained from:
 	http://poppler.freedesktop.org/
 
 Removed unused dirs:
@@ -11,7 +11,7 @@
 update version.ac
 mv poppler-src poppler-prev
 tar xf poppler-*.tar.gz
-mv poppler-0.66.0 poppler-src
+mv poppler-0.67.0 poppler-src
 cd poppler-src
 svn status >/tmp/s
 svn add # the ? lines

Modified: branches/stable/source/src/libs/poppler/TLpatches/patch-03-time
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/patch-03-time	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/TLpatches/patch-03-time	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,6 +1,6 @@
-diff -ur poppler-0.66.0/goo/gfile.h poppler-src/goo/gfile.h
---- poppler-0.66.0/goo/gfile.h	Wed Jun 20 06:16:47 2018
-+++ poppler-src/goo/gfile.h	Wed Jun 20 14:32:44 2018
+diff -ur poppler-0.68.0/goo/gfile.h poppler-src/goo/gfile.h
+--- poppler-0.68.0/goo/gfile.h	Mon Aug 20 06:37:51 2018
++++ poppler-src/goo/gfile.h	Mon Aug 20 11:17:15 2018
 @@ -51,8 +51,6 @@
  #    include <windows.h>
  #  endif
@@ -10,9 +10,9 @@
  #else
  #  include <unistd.h>
  #  include <sys/types.h>
-diff -ur poppler-0.66.0/poppler/Form.h poppler-src/poppler/Form.h
---- poppler-0.66.0/poppler/Form.h	Wed Jun 20 06:16:47 2018
-+++ poppler-src/poppler/Form.h	Wed Jun 20 14:31:47 2018
+diff -ur poppler-0.68.0/poppler/Form.h poppler-src/poppler/Form.h
+--- poppler-0.68.0/poppler/Form.h	Mon Aug 20 06:37:51 2018
++++ poppler-src/poppler/Form.h	Mon Aug 20 11:18:08 2018
 @@ -36,6 +36,7 @@
  
  #include <set>

Modified: branches/stable/source/src/libs/poppler/configure
===================================================================
--- branches/stable/source/src/libs/poppler/configure	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/configure	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.66.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.68.0.
 #
 # Report bugs to <tex-k at tug.org>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='poppler (TeX Live)'
 PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.66.0'
-PACKAGE_STRING='poppler (TeX Live) 0.66.0'
+PACKAGE_VERSION='0.68.0'
+PACKAGE_STRING='poppler (TeX Live) 0.68.0'
 PACKAGE_BUGREPORT='tex-k at tug.org'
 PACKAGE_URL=''
 
@@ -1307,7 +1307,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 poppler (TeX Live) 0.66.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.68.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1374,7 +1374,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of poppler (TeX Live) 0.66.0:";;
+     short | recursive ) echo "Configuration of poppler (TeX Live) 0.68.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1487,7 +1487,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-poppler (TeX Live) configure 0.66.0
+poppler (TeX Live) configure 0.68.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2134,7 +2134,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by poppler (TeX Live) $as_me 0.66.0, which was
+It was created by poppler (TeX Live) $as_me 0.68.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4057,7 +4057,7 @@
 
 # Define the identity of the package.
  PACKAGE='poppler--tex-live-'
- VERSION='0.66.0'
+ VERSION='0.68.0'
 
 
 # Some tools Automake needs.
@@ -7647,7 +7647,7 @@
 
 
 cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.66.0"
+#define POPPLER_VERSION "0.68.0"
 _ACEOF
 
 
@@ -8341,7 +8341,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by poppler (TeX Live) $as_me 0.66.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.68.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8407,7 +8407,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-poppler (TeX Live) config.status 0.66.0
+poppler (TeX Live) config.status 0.68.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt	2018-11-12 19:12:53 UTC (rev 807)
@@ -30,7 +30,7 @@
 endif()
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "66")
+set(POPPLER_MINOR_VERSION "68")
 set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
@@ -201,9 +201,9 @@
 endif()
 set(WITH_OPENJPEG FALSE)
 if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
-  find_package(LIBOPENJPEG2)
-  set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
-  if(NOT LIBOPENJPEG2_FOUND)
+  find_package(OpenJPEG)
+  set(WITH_OPENJPEG ${OpenJPEG_FOUND})
+  if(NOT OpenJPEG_FOUND OR OPENJPEG_MAJOR_VERSION VERSION_LESS 2)
     message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.")
   endif()
   set(HAVE_JPX_DECODER ON)
@@ -276,8 +276,8 @@
   include_directories(${TIFF_INCLUDE_DIR})
   set(ENABLE_LIBTIFF ON)
 endif()
-if(LIBOPENJPEG2_FOUND)
-  include_directories(${LIBOPENJPEG2_INCLUDE_DIRS})
+if(OpenJPEG_FOUND)
+  include_directories(${OPENJPEG_INCLUDE_DIRS})
 endif()
 if(LCMS2_FOUND)
   include_directories(${LCMS2_INCLUDE_DIR})
@@ -457,11 +457,11 @@
   )
   set(poppler_LIBS ${poppler_LIBS} ${NSS3_LIBRARIES})
 endif()
-if (LIBOPENJPEG2_FOUND)
+if (OpenJPEG_FOUND)
   set(poppler_SRCS ${poppler_SRCS}
     poppler/JPEG2000Stream.cc
   )
-  set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG2_LIBRARIES})
+  set(poppler_LIBS ${poppler_LIBS} openjp2)
 else ()
   set(poppler_SRCS ${poppler_SRCS}
     poppler/JPXStream.cc
@@ -485,12 +485,11 @@
 
 if(MSVC)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-set(CMAKE_CXX_FLAGS "/Zc:wchar_t- ${CMAKE_CXX_FLAGS}")
 add_library(poppler STATIC ${poppler_SRCS})
 else()
 add_library(poppler ${poppler_SRCS})
 endif()
-set_target_properties(poppler PROPERTIES VERSION 77.0.0 SOVERSION 77)
+set_target_properties(poppler PROPERTIES VERSION 79.0.0 SOVERSION 79)
 if(MINGW)
     get_target_property(POPPLER_SOVERSION poppler SOVERSION)
     set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
@@ -621,7 +620,7 @@
       poppler/CurlPDFDocBuilder.h
       DESTINATION include/poppler)
   endif()
-  if(LIBOPENJPEG2_FOUND)
+  if(OpenJPEG_FOUND)
     install(FILES
       poppler/JPEG2000Stream.h
       DESTINATION include/poppler)

Modified: branches/stable/source/src/libs/poppler/poppler-src/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/ChangeLog	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/ChangeLog	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,3 +1,525 @@
+commit c666833e4163a93451eab27c675af9ca82d11593
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Sun Aug 19 23:37:51 2018 +0200
+
+    poppler 0.68
+
+ CMakeLists.txt   |  4 ++--
+ NEWS             | 25 +++++++++++++++++++++++++
+ cpp/Doxyfile     |  2 +-
+ qt5/src/Doxyfile |  2 +-
+ 4 files changed, 29 insertions(+), 4 deletions(-)
+
+commit 9492eeb6af75d691a2131fa8481556b1ac86795c
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Sun Aug 19 23:29:10 2018 +0200
+
+    Update (C)
+
+ utils/HtmlFonts.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 7a74c4071f001664c4383ea8e4e9d941bdb438b4
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Sun Aug 19 19:52:56 2018 +0200
+
+    Don't give a warning when Marked value is false
+
+    Bug #107430
+
+ poppler/Catalog.cc | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+commit ce0f124ae2a50c51cae32b8c4e7559a9223ea3d5
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Sat Aug 18 23:58:40 2018 +0200
+
+    Make sure that the openjpeg we're getting is version 2
+
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 06106d930b18a34c18e32734b73c212b852161a5
+Author: Aleksey Nikolaev <nae202 at gmail.com>
+Date:   Thu Aug 16 17:20:00 2018 +0200
+
+    Fix build with MSVC
+
+ cpp/poppler-page.cpp | 4 ++++
+ cpp/poppler-page.h   | 5 +++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 04db8bd27db154e055a0d1715c0f81d4c37d6871
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Thu Aug 16 16:06:50 2018 +0200
+
+    LONG_LONG_MAX -> LLONG_MAX
+
+ poppler/XRef.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 1b0b9e14e25494dfc08bbb9fe7232c7fca0d7f32
+Author: Hannah von Reth <vonreth at kde.org>
+Date:   Thu Aug 16 15:39:28 2018 +0200
+
+    Remove wchar_t- on MSVC
+
+    Qt is built with wchar_t so if you try to build poppler without it,
+    there are conflicting types and everything fails
+
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 12bf632489587df9da416ed8303fb8aefc26bdac
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Thu Aug 16 11:18:21 2018 +0200
+
+    Use OpenJpeg cmake config file instead of pkgconfig
+
+ CMakeLists.txt                       | 16 ++++++++--------
+ cmake/modules/FindLIBOPENJPEG2.cmake | 22 ----------------------
+ 2 files changed, 8 insertions(+), 30 deletions(-)
+
+commit 0f35c2de35efa5689e4668b76a68c76de893fe7c
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Thu Aug 9 17:04:38 2018 +0200
+
+    Fix spacing
+
+ poppler/SignatureInfo.cc | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+commit 90ace43c5bb52854b4fa1fdd224d0273b8fd6ff0
+Author: Chinmoy Ranjan Pradhan <chinmoyrp65 at protonmail.com>
+Date:   Thu Aug 9 16:39:30 2018 +0200
+
+    [qt] Add Reason and Location to SignatureInfo
+
+    Small tweaks (spacing) by Albert Astals Cid
+
+    Bug #107299
+
+ qt5/src/poppler-form.cc | 17 +++++++++++++++++
+ qt5/src/poppler-form.h  | 13 +++++++++++++
+ 2 files changed, 30 insertions(+)
+
+commit c9bf96aa99059ce0216a75ae2868b79d6e21bc3d
+Author: Chinmoy Ranjan Pradhan <chinmoyrp65 at protonmail.com>
+Date:   Thu Aug 9 16:35:14 2018 +0200
+
+    Add Reason and Location to SignatureInfo
+
+    Small tweaks (const, etc) by Albert Astals Cid
+
+    Bug #107299
+
+ poppler/Form.cc          | 10 ++++++++++
+ poppler/SignatureInfo.cc | 29 +++++++++++++++++++++++++++++
+ poppler/SignatureInfo.h  |  7 +++++++
+ 3 files changed, 46 insertions(+)
+
+commit 9f8fb7aae92268c9460434abd4d970f04a9af926
+Author: Steven Boswell <ulatekh at yahoo.com>
+Date:   Thu Aug 9 16:16:10 2018 +0200
+
+    HtmlFont: Fix possible uninitialized variable & dangling reference
+
+    Bug #107316
+
+ utils/HtmlFonts.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 1f8ab328f1440721fe7be7615a9d965a6e3d0439
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Thu Aug 9 00:40:14 2018 +0200
+
+    XRef::readXRef: Fix possible integer overflow
+
+    fixes oss-fuzz/9777
+
+ poppler/XRef.cc | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit c1e90bb19003af9ddf7a1ea88399d9ce47db233f
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Mon Jul 23 23:05:14 2018 +0200
+
+    Always initialize SplashPipe:cSrcVal
+
+    Fixes Use-of-uninitialized-value in oss-fuzz/9560
+
+ splash/Splash.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 71645d9e76f9bb075ae9b6599d281b8382e86e67
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Mon Jul 23 00:21:40 2018 +0200
+
+    Add (C) for the last commits
+
+ poppler/SignatureHandler.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f9c7d61e36bb1fb0c77681b993fe5f4c2b1cd37e
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Mon Jul 23 00:19:17 2018 +0200
+
+    Don't free signeddata nor signerinfo
+
+    They get freed as part of freeing CMSMessage
+
+ poppler/SignatureHandler.cc | 4 ----
+ 1 file changed, 4 deletions(-)
+
+commit 54a75cb091b0994290e6b398b98e3113cd61355a
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Mon Jul 23 00:18:50 2018 +0200
+
+    Don't destroy the cert, doesn't belong to us
+
+ poppler/SignatureHandler.cc | 3 ---
+ 1 file changed, 3 deletions(-)
+
+commit 36f317d488d8ce6efb69db89a2eca09a98553ab5
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Sun Jul 22 23:48:03 2018 +0200
+
+    Copy subject dn instead of storing it
+
+    It comes deep from the cert memory so it's destroyed shorting
+    after and
+    thus is invalid if we don't copy it
+
+ poppler/SignatureInfo.cc | 6 ++++--
+ poppler/SignatureInfo.h  | 4 ++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 6c4eaf5642439d87dafa03391441bb3e7f3a98c4
+Author: Zsombor Hollay-Horvath <hollay.horvath at gmail.com>
+Date:   Sat Jul 21 00:28:50 2018 +0200
+
+    cpp: Add rotation() to text_box
+
+    Bug #106562
+
+ cpp/poppler-page.cpp  | 7 +++++++
+ cpp/poppler-page.h    | 6 ++++++
+ cpp/poppler-private.h | 2 ++
+ 3 files changed, 15 insertions(+)
+
+commit bcd89bc0abb2cc05d3dc428074bb24b450ab7cf0
+Author: Thibaut Brard <thibaut.brard at gmail.com>
+Date:   Sat Jul 21 00:17:58 2018 +0200
+
+    pdftohtml: Add option to not round coordinates
+
+    when outputing as xml
+
+ utils/HtmlOutputDev.cc | 22 ++++++++++++++++++----
+ utils/pdftohtml.1      |  3 +++
+ utils/pdftohtml.cc     |  4 ++++
+ 3 files changed, 25 insertions(+), 4 deletions(-)
+
+commit 6ef17493c7d5344aba4278017724746e63659f7f
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Sat Jul 21 00:14:07 2018 +0200
+
+    JpegWriter: Use the C++11 cascading constructors
+
+ goo/JpegWriter.cc | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+commit 0b4ad184b479e24b13b0453b89859b75b699b131
+Author: Martin Packman <gzlist at googlemail.com>
+Date:   Fri Jul 20 23:34:37 2018 +0200
+
+    Add -jpegopt optimize option support to utils
+
+    New option 'optimize=y' for utils that take a -jpegopt param,
+    pdftocairo and pdftoppm. This corresponds to the cjpeg -optimize
+    flag, and slightly reduces the size of the output jpeg but uses
+    additional cpu and memory.
+
+    New jpegOptimize boolean in splash/SplashBitmap WriteImgParams.
+
+    New setOptimize method on goo/JpegWriter taking a boolean.
+
+    Update manpages for new option.
+
+ goo/JpegWriter.cc      | 12 ++++++++++++
+ goo/JpegWriter.h       |  2 ++
+ splash/SplashBitmap.cc |  2 ++
+ splash/SplashBitmap.h  |  2 ++
+ utils/pdftocairo.1     |  6 ++++++
+ utils/pdftocairo.cc    | 11 +++++++++++
+ utils/pdftoppm.1       |  6 ++++++
+ utils/pdftoppm.cc      | 11 +++++++++++
+ 8 files changed, 52 insertions(+)
+
+commit 20d89699b35397f23352d0e60a3e19da2ce6b410
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Thu Jul 19 23:20:03 2018 +0200
+
+    poppler 0.67
+
+ CMakeLists.txt   | 4 ++--
+ NEWS             | 8 ++++++++
+ cpp/Doxyfile     | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 4 files changed, 12 insertions(+), 4 deletions(-)
+
+commit 8bc5acb1c18e77e912b7d9caa7f73e6969d1dede
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Thu Jul 19 17:55:13 2018 +0200
+
+    Splash::arbitraryTransformMask: Set clipRes to splashClipPartial in
+    some if branches
+
+    If xx or yy are not in the expected bounds something went wrong so
+    don't assume we're still inside the valid area for the destination
+    either
+
+    fixes oss-fuzz/9382
+
+ splash/Splash.cc | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+commit 004e3c10df0abda214f0c293f9e269fdd979c5ee
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Wed Jul 18 20:31:27 2018 +0200
+
+    Fix crash when Object has negative number
+
+    Spec says object number has to be > 0 and gen has to be >= 0
+
+    Reported by email
+
+ poppler/Parser.cc | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 155897f3cb88db5050b9d16dc50bfd8b660077b6
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Tue Jul 17 01:05:38 2018 +0200
+
+    JBIG2Stream::readTextRegion: Fix uninitialized memory read
+
+    fixes oss-fuzz/9381
+
+ poppler/JBIG2Stream.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit eb1291f86260124071e12226294631ce685eaad6
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Wed Jul 11 00:26:01 2018 +0200
+
+    GfxPatchMeshShading::getParameterizedColor: Fix uninitialized
+    memory read
+
+    fixes oss-fuzz/9264
+
+ poppler/GfxState.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 729e212f465d015959e5a64662593e5e3f8e4924
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Fri Jul 6 17:29:46 2018 +0200
+
+    Add some easy const to XRef
+
+ poppler/XRef.cc | 26 +++++++++++++-------------
+ poppler/XRef.h  | 46 +++++++++++++++++++++++-----------------------
+ 2 files changed, 36 insertions(+), 36 deletions(-)
+
+commit e607d9c4a0057c390c59e306f6dc010aea2125ee
+Author: Stefan Brüns <stefan.bruens at rwth-aachen.de>
+Date:   Sun May 20 19:31:53 2018 +0200
+
+    Small optimization for AABGR8 pipes
+
+    Skip some computations if both src and dest alpha are zero, or if
+    src is fully opaque. Equivalent to Commit f47936af7508A
+    ("Small optimization for AAXRGB8 pipes").
+
+ splash/Splash.cc | 28 +++++++++++++++++++---------
+ 1 file changed, 19 insertions(+), 9 deletions(-)
+
+commit 1b5298ebb8d76b5eee11d9cccdfffcdceb5d064b
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Mon Jul 2 21:46:10 2018 +0200
+
+    GfxUnivariateShading::getColor: Fix uninitialized memory read
+
+    fixes oss-fuzz/9165
+
+ poppler/GfxState.cc | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+commit d8346166d5150c1673379dcb3c658b9805f99764
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Mon Jul 2 20:10:25 2018 +0200
+
+    Gfx::doRadialShFill: Don't divide by zero
+
+    fixes oss-fuzz/9133
+
+ poppler/Gfx.cc | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 0735821ee03f9d83a9817450b12f45a502f51834
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Tue Jun 26 17:09:52 2018 +0200
+
+    Form: Remove return in void function
+
+ poppler/Form.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit b317ee3ecb939b91e1f8245177defaa59f8478b7
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Tue Jun 26 15:27:48 2018 +0200
+
+    Form: Remove unused getContentCopy
+
+    it's confusing to have getContent and getContentCopy that does 99%
+    the same
+
+ poppler/Form.cc | 11 -----------
+ poppler/Form.h  |  3 ---
+ 2 files changed, 14 deletions(-)
+
+commit 664d166194bc0832fd446b354630c4c7994ae4e3
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Tue Jun 26 15:22:13 2018 +0200
+
+    Form: Add a few more const
+
+ poppler/Form.cc |  8 ++++----
+ poppler/Form.h  | 18 +++++++++---------
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+commit 5ef6a845d8872f5dbc5698260ab5e12391f01f76
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Mon Jun 25 19:21:37 2018 +0200
+
+    Splash::arbitraryTransformImage: Fix uninitialized memory read
+
+    fixes oss-fuzz/9066
+
+ splash/Splash.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 267228bb071016621c80fc8514927905164aaeea
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Sun Jun 24 18:28:22 2018 +0200
+
+    pdfsig: Use posix basename() instead of GNU one
+
+    So it builds on non GNU systems too
+
+    Bug #106783
+
+ utils/pdfsig.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 459f369145a9d8f638fe123425f0e2880487640e
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Sun Jun 24 11:51:20 2018 +0200
+
+    Move variable declarations closer to where they are used
+
+    Allows for declaring two of them as const
+
+ poppler/Stream.cc | 26 ++++++++++----------------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
+commit e8b82c4239da638ae77dfab07faaff33af4af1cc
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Sun Jun 24 11:46:36 2018 +0200
+
+    ImageStream::getLine: Fix ubsan undefined shift
+
+    I'm not totally sure this is the "correct" fix, but doesn't regress
+    any file on my test suite so seems one of those cases only happens
+    on bad files, and this helps oss-fuzz progress in its testing
+
+    Fixes oss-fuzz/8432
+
+ poppler/Stream.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit c0e87eda688351b3caf222e5525f75a3190fd87c
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Sun Jun 24 11:15:52 2018 +0200
+
+    AnnotBorder::parseDashArray: Fix correct calculation
+
+    obj not being a num also means not correct
+
+    fixes oss-fuzz/9056
+
+ poppler/Annot.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 322f8a453664fbad65c4b998034adf8df2ac0bea
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Sat Jun 23 00:41:18 2018 +0200
+
+    GfxDeviceNColorSpace::parse: Fix leak on malformed files
+
+    Fixes oss-fuzz/9036
+
+ poppler/GfxState.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit af4d5f31705dcfd65319da430f87744b5c1f3616
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Fri Jun 22 23:55:09 2018 +0200
+
+    SplashFTFont::makeGlyph: Bail out if constructor returned early
+
+    fixes oss-fuzz/8811
+
+ splash/SplashFTFont.cc | 7 +++++--
+ splash/SplashFTFont.h  | 3 ++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 0281c02b9a1cd776c45ca1fd2f5eeea15f6827a6
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Fri Jun 22 17:33:21 2018 +0200
+
+    (C) update from 2 commits ago
+
+ fofi/FoFiType1C.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 1b65f9eb1beef0d1a41a4d59c89e4acd193a1a3f
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Fri Jun 22 17:29:26 2018 +0200
+
+    Gfx:Generalize protection against a pattern drawing itself
+
+    fixes oss-fuzz/8929
+
+ poppler/CairoOutputDev.cc  |  2 +-
+ poppler/Gfx.cc             | 53
+ ++++++++++++++++++++++++++--------------------
+ poppler/Gfx.h              |  4 ++--
+ poppler/PSOutputDev.cc     |  2 +-
+ poppler/SplashOutputDev.cc |  2 +-
+ 5 files changed, 35 insertions(+), 28 deletions(-)
+
+commit da349184c61034ac5818efe90d426de6af2c74d7
+Author: Albert Astals Cid <aacid at kde.org>
+Date:   Fri Jun 22 16:48:11 2018 +0200
+
+    FoFiType1C::readPrivateDict: Fix potential uninitialized memory read
+
+    fixes oss-fuzz/8864
+
+ fofi/FoFiType1C.cc | 2 --
+ fofi/FoFiType1C.h  | 6 +++---
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
 commit 877dcec7e2357991d79508a2aefc39d1510bf235
 Author: Albert Astals Cid <aacid at kde.org>
 Date:   Tue Jun 19 23:16:47 2018 +0200

Modified: branches/stable/source/src/libs/poppler/poppler-src/NEWS
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/NEWS	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/NEWS	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,3 +1,36 @@
+Release 0.68.0
+        core:
+         * Add Reason and Location to SignatureInfo. Bug #107299
+         * Fix memory misuse on signature handling
+         * Fix security issues found by oss-fuzz
+         * Don't give a warning when Marked value is false. Bug #107430
+
+        qt5:
+         * Add Reason and Location to SignatureInfo. Bug #107299
+
+        cpp:
+         * Add rotation() to text_box. Bug #106562
+         * Fix build with MSVC
+
+        utils:
+         * pdftoppm: Add -jpegopt optimize option support
+         * pdftocairo: Add -jpegopt optimize option support
+         * pdftohtml: Add option to not round coordinates
+         * pdftohtml: Fix possible crash. Bug #107316
+
+        build system:
+         * Use OpenJpeg cmake config file instead of pkgconfig
+         * Remove wchar_t- on MSVC
+
+
+Release 0.67.0
+        core:
+         * Fix lots of security/leak issues found by oss-fuzz
+         * Splash: Optimize some files, making them 20% faster (now for AABGR8)
+
+        utils:
+         * pdfsig: Compile with libc != glibc. Bug #106783
+
 Release 0.66.0
         core:
          * Fix lots of security/leak issues found by oss-fuzz

Modified: branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiType1C.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiType1C.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiType1C.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -2564,8 +2564,6 @@
   int b0, b1, nyb0, nyb1, x, i;
 
   b0 = getU8(pos++, ok);
-  op.isNum = gTrue;
-  op.isFP = gFalse;
 
   if (b0 == 28) {
     x = getU8(pos++, ok);

Modified: branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiType1C.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiType1C.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiType1C.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -15,6 +15,7 @@
 //
 // Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
 // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
+// Copyright (C) 2018 Albert Astals Cid <aacid at kde.org>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -124,10 +125,10 @@
 };
 
 struct Type1COp {
-  GBool isNum;			// true -> number, false -> operator
-  GBool isFP;			// true -> floating point number, false -> int
+  GBool isNum = gTrue;			// true -> number, false -> operator
+  GBool isFP = gFalse;			// true -> floating point number, false -> int
   union {
-    double num;			// if num is true
+    double num = 0;			// if num is true
     int op;			// if num is false
   };
 };

Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/JpegWriter.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/JpegWriter.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/JpegWriter.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -9,7 +9,8 @@
 // Copyright (C) 2010 Harry Roberts <harry.roberts at midnight-labs.org>
 // Copyright (C) 2011 Thomas Freitag <Thomas.Freitag at alfa.de>
 // Copyright (C) 2013 Peter Breitenlohner <peb at mppmu.mpg.de>
-// Copyright (C) 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2017, 2018 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2018 Martin Packman <gzlist at googlemail.com>
 //
 //========================================================================
 
@@ -25,6 +26,7 @@
 
 struct JpegWriterPrivate {
   bool progressive;
+  bool optimize;
   int quality;
   JpegWriter::Format format;
   struct jpeg_compress_struct cinfo;
@@ -46,16 +48,14 @@
 {
   priv = new JpegWriterPrivate;
   priv->progressive = p;
+  priv->optimize = false;
   priv->quality = q;
   priv->format = formatA;
 }
 
 JpegWriter::JpegWriter(Format formatA)
+ : JpegWriter(-1, false, formatA)
 {
-  priv = new JpegWriterPrivate;
-  priv->progressive = false;
-  priv->quality = -1;
-  priv->format = formatA;
 }
 
 JpegWriter::~JpegWriter()
@@ -75,6 +75,11 @@
   priv->progressive = progressive;
 }
 
+void JpegWriter::setOptimize(bool optimize)
+{
+  priv->optimize = optimize;
+}
+
 bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
 {
   // Setup error handler
@@ -137,6 +142,9 @@
     jpeg_simple_progression(&priv->cinfo);
   }
 
+  // Set whether to compute optimal Huffman coding tables
+  priv->cinfo.optimize_coding = priv->optimize;
+
   // Get ready for data
   jpeg_start_compress(&priv->cinfo, TRUE);
 

Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/JpegWriter.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/JpegWriter.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/JpegWriter.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -11,6 +11,7 @@
 // Copyright (C) 2010 Brian Cameron <brian.cameron at oracle.com>
 // Copyright (C) 2011 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2011 Thomas Freitag <Thomas.Freitag at alfa.de>
+// Copyright (C) 2018 Martin Packman <gzlist at googlemail.com>
 //
 //========================================================================
 
@@ -41,6 +42,7 @@
 
   void setQuality(int quality);
   void setProgressive(bool progressive);
+  void setOptimize(bool optimize);
   bool init(FILE *f, int width, int height, int hDPI, int vDPI) override;
 
   bool writePointers(unsigned char **rowPointers, int rowCount) override;

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -522,16 +522,18 @@
 
 GBool AnnotBorder::parseDashArray(Object *dashObj) {
   GBool correct = gTrue;
-  int tempLength = dashObj->arrayGetLength();
+  const int tempLength = dashObj->arrayGetLength();
   double *tempDash = (double *) gmallocn (tempLength, sizeof (double));
 
   // TODO: check not all zero (Line Dash Pattern Page 217 PDF 8.1)
   for (int i = 0; i < tempLength && i < DASH_LIMIT && correct; i++) {
-    Object obj1 = dashObj->arrayGet(i);
+    const Object obj1 = dashObj->arrayGet(i);
     if (obj1.isNum()) {
       tempDash[i] = obj1.getNum();
 
       correct = tempDash[i] >= 0;
+    } else {
+      correct = gFalse;
     }
   }
 

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -960,7 +960,7 @@
   adjusted_stroke_width_tmp = adjusted_stroke_width;
   maskTmp = mask;
   mask = nullptr;
-  gfx = new Gfx(doc, this, resDict, &box, nullptr, nullptr, nullptr, gfxA->getXRef());
+  gfx = new Gfx(doc, this, resDict, &box, nullptr, nullptr, nullptr, gfxA);
   if (paintType == 2)
     inUncoloredPattern = gTrue;
   gfx->display(str);

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Kristian Høgsberg <krh at redhat.com>
-// Copyright (C) 2005-2013, 2015, 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005-2013, 2015, 2017, 2018 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2005 Jeff Muizelaar <jrmuizel at nit.ca>
 // Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
@@ -877,10 +877,13 @@
       Object markInfoDict = catDict.dictLookup("MarkInfo");
       if (markInfoDict.isDict()) {
         Object value = markInfoDict.dictLookup("Marked");
-        if (value.isBool() && value.getBool())
-          markInfo |= markInfoMarked;
-        else if (!value.isNull())
+        if (value.isBool()) {
+          if (value.getBool()) {
+            markInfo |= markInfoMarked;
+          }
+        } else if (!value.isNull()) {
           error(errSyntaxError, -1, "Marked object is wrong type ({0:s})", value.getTypeName());
+        }
 
         value = markInfoDict.dictLookup("Suspects");
         if (value.isBool() && value.getBool())

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -136,7 +136,7 @@
 
 void FormWidget::setReadOnly(bool value)
 {
-  return field->setReadOnly(value);
+  field->setReadOnly(value);
 }
 
 int FormWidget::encodeID (unsigned pageNum, unsigned fieldNum)
@@ -269,11 +269,6 @@
   return parent()->getContent();
 }
 
-GooString* FormWidgetText::getContentCopy ()
-{
-  return parent()->getContentCopy();
-}
-
 void FormWidgetText::updateWidgetAppearance()
 {
   if (widget)
@@ -330,7 +325,7 @@
   parent()->setTextFontSize(fontSize);
 }
 
-void FormWidgetText::setContent(GooString* new_content)
+void FormWidgetText::setContent(const GooString* new_content)
 {
   parent()->setContentCopy(new_content);
 }
@@ -397,7 +392,7 @@
   return parent()->isSelected(i);
 }
 
-void FormWidgetChoice::setEditChoice (GooString* new_content)
+void FormWidgetChoice::setEditChoice (const GooString* new_content)
 {
   if (!hasEdit()) {
     error(errInternal, -1, "FormFieldChoice::setEditChoice : trying to edit an non-editable choice\n");
@@ -1202,14 +1197,8 @@
 }
 #endif
 
-GooString* FormFieldText::getContentCopy ()
+void FormFieldText::setContentCopy (const GooString* new_content)
 {
-  if (!content) return nullptr;
-  return new GooString(content);
-}
-
-void FormFieldText::setContentCopy (GooString* new_content)
-{
   delete content;
   content = nullptr;
 
@@ -1563,7 +1552,7 @@
   updateSelection();
 }
 
-void FormFieldChoice::setEditChoice (GooString* new_content)
+void FormFieldChoice::setEditChoice (const GooString* new_content)
 {
   delete editedChoice;
   editedChoice = nullptr;
@@ -1646,6 +1635,16 @@
 
   byte_range = sig_dict.dictLookup("ByteRange");
 
+  const Object location_obj = sig_dict.dictLookup("Location");
+  if (location_obj.isString()) {
+    signature_info->setLocation(location_obj.getString()->copy()->getCString());
+  }
+
+  const Object reason_obj = sig_dict.dictLookup("Reason");
+  if (reason_obj.isString()) {
+    signature_info->setReason(reason_obj.getString()->copy()->getCString());
+  }
+
   // retrieve SigningTime
   Object time_of_signing = sig_dict.dictLookup("M");
   if (time_of_signing.isString()) {

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -196,11 +196,9 @@
   FormWidgetText(PDFDoc *docA, Object *dict, unsigned num, Ref ref, FormField *p);
   //return the field's content (UTF16BE)
   const GooString* getContent() const;
-  //return a copy of the field's content (UTF16BE)
-  GooString* getContentCopy();
 
-  //except a UTF16BE string
-  void setContent(GooString* new_content);
+  //expects a UTF16BE string
+  void setContent(const GooString* new_content);
 
   void updateWidgetAppearance() override;
 
@@ -244,7 +242,7 @@
 
   //except a UTF16BE string
   //only work for editable combo box, set the user-entered text as the current choice
-  void setEditChoice(GooString* new_content);
+  void setEditChoice(const GooString* new_content);
 
   const GooString* getEditChoice () const;
 
@@ -312,10 +310,10 @@
   GBool hasTextQuadding() const { return hasQuadding; }
   VariableTextQuadding getTextQuadding() const { return quadding; }
 
-  GooString *getPartialName() const { return partialName; }
+  const GooString *getPartialName() const { return partialName; }
   void setPartialName(const GooString &name);
-  GooString *getAlternateUiName() const { return alternateUiName; }
-  GooString *getMappingName() const { return mappingName; }
+  const GooString *getAlternateUiName() const { return alternateUiName; }
+  const GooString *getMappingName() const { return mappingName; }
   GooString *getFullyQualifiedName();
 
   FormWidget* findWidgetByRef (Ref aref);
@@ -420,8 +418,7 @@
   FormFieldText(PDFDoc *docA, Object *dict, const Ref& ref, FormField *parent, std::set<int> *usedParents);
   
   const GooString* getContent () const { return content; }
-  GooString* getContentCopy ();
-  void setContentCopy (GooString* new_content);
+  void setContentCopy (const GooString* new_content);
   ~FormFieldText();
 
   bool isMultiline () const { return multiline; }
@@ -485,7 +482,7 @@
   void deselectAll ();
 
   //only work for editable combo box, set the user-entered text as the current choice
-  void setEditChoice(GooString* new_content);
+  void setEditChoice(const GooString* new_content);
 
   const GooString* getEditChoice () const;
 
@@ -584,7 +581,7 @@
   GBool getNeedAppearances () const { return needAppearances; }
   int getNumFields() const { return numFields; }
   FormField* getRootField(int i) const { return rootFields[i]; }
-  GooString* getDefaultAppearance() const { return defaultAppearance; }
+  const GooString* getDefaultAppearance() const { return defaultAppearance; }
   VariableTextQuadding getTextQuadding() const { return quadding; }
   GfxResources* getDefaultResources() const { return defaultResources; }
   Object* getDefaultResourcesObj() { return &resDict; }

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -589,12 +589,18 @@
 Gfx::Gfx(PDFDoc *docA, OutputDev *outA, Dict *resDict,
 	 PDFRectangle *box, PDFRectangle *cropBox,
 	 GBool (*abortCheckCbkA)(void *data),
-	 void *abortCheckCbkDataA, XRef *xrefA)
+	 void *abortCheckCbkDataA, Gfx *gfxA)
 {
   int i;
 
   doc = docA;
-  xref = (xrefA == nullptr) ? doc->getXRef() : xrefA;
+  if (gfxA) {
+    xref = gfxA->getXRef();
+    formsDrawing = gfxA->formsDrawing;
+    charProcDrawing = gfxA->charProcDrawing;
+  } else {
+    xref = doc->getXRef();
+  }
   catalog = doc->getCatalog();
   subPage = gTrue;
   printCommands = globalParams->getPrintCommands();
@@ -2202,14 +2208,8 @@
   }
   m1[4] = m[4];
   m1[5] = m[5];
-  if (out->useTilingPatternFill() &&
-	out->tilingPatternFill(state, this, catalog, tPat->getContentStream(),
-		       tPat->getMatrix(), tPat->getPaintType(), tPat->getTilingType(),
-		       tPat->getResDict(), m1, tPat->getBBox(),
-		       xi0, yi0, xi1, yi1, xstep, ystep)) {
-    goto restore;
-  } else {
-    bool shouldDrawForm = gTrue;
+  {
+    bool shouldDrawPattern = gTrue;
     std::set<int>::iterator patternRefIt;
     const int patternRefNum = tPat->getPatternRefNum();
     if (patternRefNum != -1) {
@@ -2216,23 +2216,30 @@
       if (formsDrawing.find(patternRefNum) == formsDrawing.end()) {
 	patternRefIt = formsDrawing.insert(patternRefNum).first;
       } else {
-	shouldDrawForm = gFalse;
+	shouldDrawPattern = gFalse;
       }
     }
-
-    if (shouldDrawForm) {
-      out->updatePatternOpacity(state);
-      for (yi = yi0; yi < yi1; ++yi) {
-	for (xi = xi0; xi < xi1; ++xi) {
-	  x = xi * xstep;
-	  y = yi * ystep;
-	  m1[4] = x * m[0] + y * m[2] + m[4];
-	  m1[5] = x * m[1] + y * m[3] + m[5];
-	  drawForm(tPat->getContentStream(), tPat->getResDict(),
-		  m1, tPat->getBBox());
+    if (shouldDrawPattern) {
+      if (out->useTilingPatternFill() &&
+	  out->tilingPatternFill(state, this, catalog, tPat->getContentStream(),
+			tPat->getMatrix(), tPat->getPaintType(), tPat->getTilingType(),
+			tPat->getResDict(), m1, tPat->getBBox(),
+			xi0, yi0, xi1, yi1, xstep, ystep)) {
+	// do nothing
+      } else {
+	out->updatePatternOpacity(state);
+	for (yi = yi0; yi < yi1; ++yi) {
+	  for (xi = xi0; xi < xi1; ++xi) {
+	    x = xi * xstep;
+	    y = yi * ystep;
+	    m1[4] = x * m[0] + y * m[2] + m[4];
+	    m1[5] = x * m[1] + y * m[3] + m[5];
+	    drawForm(tPat->getContentStream(), tPat->getResDict(),
+		    m1, tPat->getBBox());
+	  }
 	}
+	out->clearPatternOpacity(state);
       }
-      out->clearPatternOpacity(state);
       if (patternRefNum != -1) {
 	formsDrawing.erase(patternRefIt);
       }
@@ -3041,7 +3048,11 @@
   if (t < 1) {
     n = 3;
   } else {
-    n = (int)(M_PI / acos(1 - 0.1 / t));
+    const double tmp = 1 - 0.1 / t;
+    if (unlikely(tmp == 1))
+      n = 200;
+    else
+      n = (int)(M_PI / acos(tmp));
     if (n < 3) {
       n = 3;
     } else if (n > 200) {

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -161,7 +161,7 @@
   Gfx(PDFDoc *docA, OutputDev *outA, Dict *resDict,
       PDFRectangle *box, PDFRectangle *cropBox,
       GBool (*abortCheckCbkA)(void *data) = NULL,
-      void *abortCheckCbkDataA = NULL, XRef *xrefA = NULL);
+      void *abortCheckCbkDataA = NULL, Gfx *gfxA = NULL);
 #ifdef USE_CMS
   void initDisplayProfile();
 #endif
@@ -236,7 +236,7 @@
 
   Parser *parser;		// parser for page content stream(s)
   
-  std::set<int> formsDrawing;	// the forms that are being drawn
+  std::set<int> formsDrawing;	// the forms/patterns that are being drawn
   std::set<int> charProcDrawing;	// the charProc that are being drawn
 
   GBool				// callback to check for an abort

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -3057,7 +3057,8 @@
     Object obj2 = obj1.arrayGet(i);
     if (!obj2.isName()) {
       error(errSyntaxWarning, -1, "Bad DeviceN color space (names)");
-      goto err1;
+      nCompsA = i;
+      goto err3;
     }
     namesA[i] = new GooString(obj2.getName());
   }
@@ -3899,10 +3900,13 @@
 
 int GfxUnivariateShading::getColor(double t, GfxColor *color) {
   double out[gfxColorMaxComps];
+  int nComps;
 
-  // NB: there can be one function with n outputs or n functions with
-  // one output each (where n = number of color components)
-  const int nComps = nFuncs * funcs[0]->getOutputSize();
+  if (likely(nFuncs >= 1)) {
+    // NB: there can be one function with n outputs or n functions with
+    // one output each (where n = number of color components)
+    nComps = nFuncs * funcs[0]->getOutputSize();
+  }
 
   if (unlikely(nFuncs < 1 || nComps > gfxColorMaxComps)) {
     for (int i = 0; i < gfxColorMaxComps; i++)
@@ -5665,7 +5669,7 @@
 }
 
 void GfxPatchMeshShading::getParameterizedColor(double t, GfxColor *color) {
-  double out[gfxColorMaxComps];
+  double out[gfxColorMaxComps] = {};
 
   for (int j = 0; j < nFuncs; ++j) {
     funcs[j]->transform(&t, &out[j]);

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/JBIG2Stream.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/JBIG2Stream.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/JBIG2Stream.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -2338,7 +2338,7 @@
   JBIG2Bitmap *bitmap;
   JBIG2Bitmap *symbolBitmap;
   Guint strips;
-  int t = 0, dt = 0, tt, s, ds = 0, sFirst, j;
+  int t = 0, dt = 0, tt, s, ds = 0, sFirst, j = 0;
   int rdw, rdh, rdx, rdy, ri = 0, refDX, refDY, bmSize;
   Guint symID, inst, bw, bh;
 

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -4526,7 +4526,7 @@
     box.y1 = bbox[1];
     box.x2 = bbox[2];
     box.y2 = bbox[3];
-    gfx = new Gfx(doc, this, resDict, &box, nullptr, nullptr, nullptr, gfxA->getXRef());
+    gfx = new Gfx(doc, this, resDict, &box, nullptr, nullptr, nullptr, gfxA);
     writePSFmt("[{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g}] cm\n", mat[0], mat[1], mat[2], mat[3], tx, ty);
     inType3Char = gTrue;
     gfx->display(str);

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Parser.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Parser.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Parser.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -154,6 +154,11 @@
       const int gen = buf1.getInt();
       shift();
       shift();
+
+      if (unlikely(num <= 0 || gen < 0)) {
+          return Object();
+      }
+
       return Object(num, gen);
     } else {
       return Object(num);

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureHandler.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureHandler.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureHandler.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -6,7 +6,7 @@
 //
 // Copyright 2015, 2016 André Guerreiro <aguerreiro1985 at gmail.com>
 // Copyright 2015 André Esser <bepandre at hotmail.com>
-// Copyright 2015, 2016 Albert Astals Cid <aacid at kde.org>
+// Copyright 2015, 2016, 2018 Albert Astals Cid <aacid at kde.org>
 // Copyright 2015 Markus Kilås <digital at markuspage.com>
 // Copyright 2017 Sebastian Rasmussen <sebras at gmail.com>
 // Copyright 2017 Hans-Ulrich Jüttner <huj at froreich-bioscientia.de>
@@ -164,10 +164,6 @@
 SignatureHandler::~SignatureHandler()
 {
   SECITEM_FreeItem(&CMSitem, PR_FALSE);
-  if (CMSSignerInfo)
-    NSS_CMSSignerInfo_Destroy(CMSSignerInfo);
-  if (CMSSignedData)
-    NSS_CMSSignedData_Destroy(CMSSignedData);
   if (CMSMessage)
     NSS_CMSMessage_Destroy(CMSMessage);
 
@@ -318,9 +314,6 @@
 
   retVal = (SECErrorCodes) PORT_GetError();
 
-  if (cert)
-    CERT_DestroyCertificate(cert);
-
   return retVal;
 }
 

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureInfo.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureInfo.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureInfo.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -7,7 +7,8 @@
 // Copyright 2015 André Guerreiro <aguerreiro1985 at gmail.com>
 // Copyright 2015 André Esser <bepandre at hotmail.com>
 // Copyright 2017 Hans-Ulrich Jüttner <huj at froreich-bioscientia.de>
-// Copyright 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright 2017, 2018 Albert Astals Cid <aacid at kde.org>
+// Copyright 2018 Chinmoy Ranjan Pradhan <chinmoyrp65 at protonmail.com>
 //
 //========================================================================
 
@@ -32,6 +33,8 @@
   cert_status = CERTIFICATE_NOT_VERIFIED;
   signer_name = nullptr;
   subject_dn = nullptr;
+  location = nullptr;
+  reason = nullptr;
   hash_type = HASH_AlgNULL;
   signing_time = 0;
   sig_subfilter_supported = false;
@@ -43,6 +46,8 @@
   cert_status = cert_val_status;
   signer_name = nullptr;
   subject_dn = nullptr;
+  location = nullptr;
+  reason = nullptr;
   hash_type = HASH_AlgNULL;
   signing_time = 0;
   sig_subfilter_supported = false;
@@ -50,7 +55,10 @@
 
 SignatureInfo::~SignatureInfo()
 {
+  free(location);
+  free(reason);
   free(signer_name);
+  free(subject_dn);
 }
 
 /* GETTERS */
@@ -75,6 +83,16 @@
   return subject_dn;
 }
 
+const char *SignatureInfo::getLocation() const
+{
+  return location;
+}
+
+const char *SignatureInfo::getReason() const
+{
+  return reason;
+}
+
 int SignatureInfo::getHashAlgorithm()
 {
   return hash_type;
@@ -105,9 +123,22 @@
 
 void SignatureInfo::setSubjectDN(const char *subjectDN)
 {
-  subject_dn = subjectDN;
+  free(subject_dn);
+  subject_dn = strdup(subjectDN);
 }
 
+void SignatureInfo::setLocation(char *loc)
+{
+  free(location);
+  location = loc;
+}
+
+void SignatureInfo::setReason(char *signingReason)
+{
+  free(reason);
+  reason = signingReason;
+}
+
 void SignatureInfo::setHashAlgorithm(int type)
 {
   hash_type = type;

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureInfo.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureInfo.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureInfo.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -6,8 +6,9 @@
 //
 // Copyright 2015 André Guerreiro <aguerreiro1985 at gmail.com>
 // Copyright 2015 André Esser <bepandre at hotmail.com>
-// Copyright 2015, 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright 2015, 2017, 2018 Albert Astals Cid <aacid at kde.org>
 // Copyright 2017 Hans-Ulrich Jüttner <huj at froreich-bioscientia.de>
+// Copyright 2018 Chinmoy Ranjan Pradhan <chinmoyrp65 at protonmail.com>
 //
 //========================================================================
 
@@ -49,6 +50,8 @@
   CertificateValidationStatus getCertificateValStatus();
   const char *getSignerName();
   const char *getSubjectDN();
+  const char *getLocation() const;
+  const char *getReason() const;
   int getHashAlgorithm(); // Returns a NSS3 HASH_HashType or -1 if compiled without NSS3
   time_t getSigningTime();
   bool isSubfilterSupported() { return sig_subfilter_supported; }
@@ -58,6 +61,8 @@
   void setCertificateValStatus(enum CertificateValidationStatus );
   void setSignerName(char *);
   void setSubjectDN(const char *);
+  void setLocation(char *);
+  void setReason(char *);
   void setHashAlgorithm(int);
   void setSigningTime(time_t);
   void setSubFilterSupport(bool isSupported) { sig_subfilter_supported = isSupported; }
@@ -69,7 +74,9 @@
   SignatureValidationStatus sig_status;
   CertificateValidationStatus cert_status;
   char *signer_name;
-  const char *subject_dn;
+  char *subject_dn;
+  char *location;
+  char *reason;
   int hash_type;
   time_t signing_time;
   bool sig_subfilter_supported;

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -4697,7 +4697,7 @@
 
   box.x1 = bbox[0]; box.y1 = bbox[1];
   box.x2 = bbox[2]; box.y2 = bbox[3];
-  gfx = new Gfx(doc, this, resDict, &box, nullptr, nullptr, nullptr, gfxA->getXRef());
+  gfx = new Gfx(doc, this, resDict, &box, nullptr, nullptr, nullptr, gfxA);
   // set pattern transformation matrix
   gfx->getState()->setCTM(m1.m[0], m1.m[1], m1.m[2], m1.m[3], m1.m[4], m1.m[5]);
   updateCTM(gfx->getState(), m1.m[0], m1.m[1], m1.m[2], m1.m[3], m1.m[4], m1.m[5]);

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -499,12 +499,6 @@
 }
 
 Guchar *ImageStream::getLine() {
-  Gulong buf, bitMask;
-  int bits;
-  int c;
-  int i;
-  Guchar *p;
-  
   if (unlikely(inputLine == nullptr)) {
       return nullptr;
   }
@@ -512,9 +506,9 @@
   int readChars = str->doGetChars(inputLineSize, inputLine);
   for ( ; readChars < inputLineSize; readChars++) inputLine[readChars] = EOF;
   if (nBits == 1) {
-    p = inputLine;
-    for (i = 0; i < nVals; i += 8) {
-      c = *p++;
+    Guchar *p = inputLine;
+    for (int i = 0; i < nVals; i += 8) {
+      const int c = *p++;
       imgLine[i+0] = (Guchar)((c >> 7) & 1);
       imgLine[i+1] = (Guchar)((c >> 6) & 1);
       imgLine[i+2] = (Guchar)((c >> 5) & 1);
@@ -531,18 +525,18 @@
     // we assume a component fits in 8 bits, with this hack
     // we treat 16 bit images as 8 bit ones until it's fixed correctly.
     // The hack has another part on GfxImageColorMap::GfxImageColorMap
-    p = inputLine;
-    for (i = 0; i < nVals; ++i) {
+    Guchar *p = inputLine;
+    for (int i = 0; i < nVals; ++i) {
       imgLine[i] = *p++;
       p++;
     }
   } else {
-    bitMask = (1 << nBits) - 1;
-    buf = 0;
-    bits = 0;
-    p = inputLine;
-    for (i = 0; i < nVals; ++i) {
-      if (bits < nBits) {
+    const Gulong bitMask = (1 << nBits) - 1;
+    Gulong buf = 0;
+    int bits = 0;
+    Guchar *p = inputLine;
+    for (int i = 0; i < nVals; ++i) {
+      while (bits < nBits) {
 	buf = (buf << 8) | (*p++ & 0xff);
 	bits += 8;
       }

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -293,7 +293,7 @@
   init();
 }
 
-XRef::XRef(Object *trailerDictA) {
+XRef::XRef(const Object *trailerDictA) {
   init();
 
   if (trailerDictA->isDict())
@@ -393,7 +393,7 @@
 #endif
 }
 
-XRef *XRef::copy() {
+XRef *XRef::copy() const {
   XRef *xref = new XRef();
   xref->str = str->copy();
   xref->strOwner = gTrue;
@@ -509,6 +509,11 @@
   Object obj;
   GBool more;
 
+  if (unlikely(start > (LLONG_MAX - *pos))) {
+    ok = gFalse;
+    return gFalse;
+  }
+
   // start up a parser, parse one token
   parser = new Parser(nullptr,
 	     new Lexer(nullptr,
@@ -1028,7 +1033,7 @@
 }
 
 void XRef::setEncryption(int permFlagsA, GBool ownerPasswordOkA,
-			 Guchar *fileKeyA, int keyLengthA,
+			 const Guchar *fileKeyA, int keyLengthA,
 			 int encVersionA, int encRevisionA,
 			 CryptAlgorithm encAlgorithmA) {
   int i;
@@ -1063,7 +1068,7 @@
   }
 }
 
-GBool XRef::okToPrint(GBool ignoreOwnerPW) {
+GBool XRef::okToPrint(GBool ignoreOwnerPW) const {
   return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permPrint);
 }
 
@@ -1070,7 +1075,7 @@
 // we can print at high res if we are only doing security handler revision
 // 2 (and we are allowed to print at all), or with security handler rev
 // 3 and we are allowed to print, and bit 12 is set.
-GBool XRef::okToPrintHighRes(GBool ignoreOwnerPW) {
+GBool XRef::okToPrintHighRes(GBool ignoreOwnerPW) const {
   if (encrypted) {
     if (2 == encRevision) {
       return (okToPrint(ignoreOwnerPW));
@@ -1085,27 +1090,27 @@
   }
 }
 
-GBool XRef::okToChange(GBool ignoreOwnerPW) {
+GBool XRef::okToChange(GBool ignoreOwnerPW) const {
   return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permChange);
 }
 
-GBool XRef::okToCopy(GBool ignoreOwnerPW) {
+GBool XRef::okToCopy(GBool ignoreOwnerPW) const {
   return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permCopy);
 }
 
-GBool XRef::okToAddNotes(GBool ignoreOwnerPW) {
+GBool XRef::okToAddNotes(GBool ignoreOwnerPW) const {
   return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permNotes);
 }
 
-GBool XRef::okToFillForm(GBool ignoreOwnerPW) {
+GBool XRef::okToFillForm(GBool ignoreOwnerPW) const {
   return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permFillForm);
 }
 
-GBool XRef::okToAccessibility(GBool ignoreOwnerPW) {
+GBool XRef::okToAccessibility(GBool ignoreOwnerPW) const {
   return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permAccessibility);
 }
 
-GBool XRef::okToAssemble(GBool ignoreOwnerPW) {
+GBool XRef::okToAssemble(GBool ignoreOwnerPW) const {
   return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permAssemble);
 }
 
@@ -1357,7 +1362,7 @@
   }
 }
 
-void XRef::setModifiedObject (Object* o, Ref r) {
+void XRef::setModifiedObject (const Object* o, Ref r) {
   xrefLocker();
   if (r.num < 0 || r.num >= size) {
     error(errInternal, -1,"XRef::setModifiedObject on unknown ref: {0:d}, {1:d}\n", r.num, r.gen);
@@ -1369,7 +1374,7 @@
   setModified();
 }
 
-Ref XRef::addIndirectObject (Object* o) {
+Ref XRef::addIndirectObject (const Object *o) {
   int entryIndexToUse = -1;
   for (int i = 1; entryIndexToUse == -1 && i < size; ++i) {
     XRefEntry *e = getEntry(i, false /* complainIfMissing */);

Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.h	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -76,7 +76,7 @@
     DontRewrite  // Entry must not be written back in case of full rewrite
   };
 
-  inline GBool getFlag(Flag flag) {
+  inline GBool getFlag(Flag flag) const {
     const int mask = (1 << (int)flag);
     return (flags & mask) != 0;
   }
@@ -97,7 +97,7 @@
   // Constructor, create an empty XRef, used for PDF writing
   XRef();
   // Constructor, create an empty XRef but with info dict, used for PDF writing
-  XRef(Object *trailerDictA);
+  XRef(const Object *trailerDictA);
   // Constructor.  Read xref table from stream.
   XRef(BaseStream *strA, Goffset pos, Goffset mainXRefEntriesOffsetA = 0, GBool *wasReconstructed = NULL, GBool reconstruct = false);
 
@@ -108,20 +108,20 @@
   XRef& operator=(const XRef &) = delete;
 
   // Copy xref but with new base stream!
-  XRef *copy();
+  XRef *copy() const;
 
   // Is xref table valid?
-  GBool isOk() { return ok; }
+  GBool isOk() const { return ok; }
 
   // Is the last XRef section a stream or a table?
-  GBool isXRefStream() { return xRefStream; }
+  GBool isXRefStream() const { return xRefStream; }
 
   // Get the error code (if isOk() returns false).
-  int getErrorCode() { return errCode; }
+  int getErrorCode() const { return errCode; }
 
   // Set the encryption parameters.
   void setEncryption(int permFlagsA, GBool ownerPasswordOkA,
-		     Guchar *fileKeyA, int keyLengthA,
+		     const Guchar *fileKeyA, int keyLengthA,
 		     int encVersionA, int encRevisionA,
 		     CryptAlgorithm encAlgorithmA);
   // Mark Encrypt entry as Unencrypted
@@ -130,18 +130,18 @@
   void getEncryptionParameters(Guchar **fileKeyA, CryptAlgorithm *encAlgorithmA, int *keyLengthA);
 
   // Is the file encrypted?
-  GBool isEncrypted() { return encrypted; }
+  GBool isEncrypted() const { return encrypted; }
 
   // Check various permissions.
-  GBool okToPrint(GBool ignoreOwnerPW = gFalse);
-  GBool okToPrintHighRes(GBool ignoreOwnerPW = gFalse);
-  GBool okToChange(GBool ignoreOwnerPW = gFalse);
-  GBool okToCopy(GBool ignoreOwnerPW = gFalse);
-  GBool okToAddNotes(GBool ignoreOwnerPW = gFalse);
-  GBool okToFillForm(GBool ignoreOwnerPW = gFalse);
-  GBool okToAccessibility(GBool ignoreOwnerPW = gFalse);
-  GBool okToAssemble(GBool ignoreOwnerPW = gFalse);
-  int getPermFlags() { return permFlags; }
+  GBool okToPrint(GBool ignoreOwnerPW = gFalse) const;
+  GBool okToPrintHighRes(GBool ignoreOwnerPW = gFalse) const;
+  GBool okToChange(GBool ignoreOwnerPW = gFalse) const;
+  GBool okToCopy(GBool ignoreOwnerPW = gFalse) const;
+  GBool okToAddNotes(GBool ignoreOwnerPW = gFalse) const;
+  GBool okToFillForm(GBool ignoreOwnerPW = gFalse) const;
+  GBool okToAccessibility(GBool ignoreOwnerPW = gFalse) const;
+  GBool okToAssemble(GBool ignoreOwnerPW = gFalse) const;
+  int getPermFlags() const { return permFlags; }
 
   // Get catalog object.
   Object getCatalog();
@@ -161,11 +161,11 @@
   void removeDocInfo();
 
   // Return the number of objects in the xref table.
-  int getNumObjects() { return size; }
+  int getNumObjects() const { return size; }
 
   // Return the catalog object reference.
-  int getRootNum() { return rootNum; }
-  int getRootGen() { return rootGen; }
+  int getRootNum() const { return rootNum; }
+  int getRootGen() const { return rootGen; }
 
   // Get end position for a stream in a damaged file.
   // Returns false if unknown or file is not damaged.
@@ -187,13 +187,13 @@
   Object *getTrailerDict() { return &trailerDict; }
 
   // Was the XRef modified?
-  GBool isModified() { return modified; }
+  GBool isModified() const { return modified; }
   // Set the modification flag for XRef to true.
   void setModified() { modified = gTrue; }
 
   // Write access
-  void setModifiedObject(Object* o, Ref r);
-  Ref addIndirectObject (Object* o);
+  void setModifiedObject(const Object* o, Ref r);
+  Ref addIndirectObject (const Object* o);
   void removeIndirectObject(Ref r);
   void add(int num, int gen,  Goffset offs, GBool used);
 

Modified: branches/stable/source/src/libs/poppler/version.ac
===================================================================
--- branches/stable/source/src/libs/poppler/version.ac	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/poppler/version.ac	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,4 +1,4 @@
-dnl $Id: version.ac 48060 2018-06-20 05:54:15Z kakuto $
+dnl $Id: version.ac 48731 2018-09-22 08:15:42Z kakuto $
 dnl   Copyright 2018 Karl Berry <tex-live at tug.org>
 dnl   Copyright 2011-2015 Peter Breitenlohner <tex-live at tug.org>
 dnl
@@ -9,4 +9,4 @@
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.66.0])
+m4_define([poppler_version], [0.68.0])

Modified: branches/stable/source/src/libs/xpdf/ChangeLog
===================================================================
--- branches/stable/source/src/libs/xpdf/ChangeLog	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/xpdf/ChangeLog	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,3 +1,7 @@
+2018-10-02  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* aconf-w32.h: Added for w32.
+
 2017-08-13  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* Import xpdf-4.00.

Modified: branches/stable/source/src/libs/xpdf/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/xpdf/TLpatches/ChangeLog	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/xpdf/TLpatches/ChangeLog	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,3 +1,7 @@
+2018-10-02  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* patch-bunched: Changed for w32.
+
 2017-08-13  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	Imported xpdf-4.00 source tree:

Modified: branches/stable/source/src/libs/xpdf/TLpatches/patch-bunched
===================================================================
--- branches/stable/source/src/libs/xpdf/TLpatches/patch-bunched	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/xpdf/TLpatches/patch-bunched	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,6 +1,6 @@
-diff -ur xpdf-4.00.orig/goo/gfile.cc xpdf-4.00/goo/gfile.cc
---- xpdf-4.00.orig/goo/gfile.cc	Wed Aug 09 08:22:50 2017
-+++ xpdf-4.00/goo/gfile.cc	Sun Aug 13 13:46:03 2017
+diff -ur xpdf-4.00/goo/gfile.cc xpdf-src/goo/gfile.cc
+--- xpdf-4.00/goo/gfile.cc	Wed Aug 09 08:22:50 2017
++++ xpdf-src/goo/gfile.cc	Wed Oct 03 00:39:16 2018
 @@ -7,6 +7,9 @@
  // Copyright 1996-2003 Glyph & Cog, LLC
  //
@@ -44,9 +44,26 @@
  #else
    return !mkdir(path, mode);
  #endif
-diff -ur xpdf-4.00.orig/xpdf/GlobalParams.cc xpdf-4.00/xpdf/GlobalParams.cc
---- xpdf-4.00.orig/xpdf/GlobalParams.cc	Wed Aug 09 08:22:50 2017
-+++ xpdf-4.00/xpdf/GlobalParams.cc	Sun Aug 13 13:51:37 2017
+@@ -571,6 +580,8 @@
+ 
+ FILE *openFile(const char *path, const char *mode) {
+ #ifdef _WIN32
++  return fopen(path, mode);
++#if 0
+   OSVERSIONINFO version;
+   wchar_t wPath[_MAX_PATH + 1];
+   char nPath[_MAX_PATH + 1];
+@@ -627,6 +638,7 @@
+     nPath[i] = '\0';
+     return fopen(nPath, mode);
+   }
++#endif /* 0 */
+ #else
+   return fopen(path, mode);
+ #endif
+diff -ur xpdf-4.00/xpdf/GlobalParams.cc xpdf-src/xpdf/GlobalParams.cc
+--- xpdf-4.00/xpdf/GlobalParams.cc	Wed Aug 09 08:22:50 2017
++++ xpdf-src/xpdf/GlobalParams.cc	Sun Aug 13 13:51:38 2017
 @@ -5,6 +5,9 @@
  // Copyright 2001-2003 Glyph & Cog, LLC
  //
@@ -100,9 +117,9 @@
        }
      }
    }
-diff -ur xpdf-4.00.orig/xpdf/GlobalParams.h xpdf-4.00/xpdf/GlobalParams.h
---- xpdf-4.00.orig/xpdf/GlobalParams.h	Wed Aug 09 08:22:50 2017
-+++ xpdf-4.00/xpdf/GlobalParams.h	Sun Aug 13 13:32:19 2017
+diff -ur xpdf-4.00/xpdf/GlobalParams.h xpdf-src/xpdf/GlobalParams.h
+--- xpdf-4.00/xpdf/GlobalParams.h	Wed Aug 09 08:22:50 2017
++++ xpdf-src/xpdf/GlobalParams.h	Sun Aug 13 16:14:54 2017
 @@ -5,6 +5,9 @@
  // Copyright 2001-2003 Glyph & Cog, LLC
  //
@@ -122,9 +139,54 @@
  
    ~GlobalParams();
  
-diff -ur xpdf-4.00.orig/xpdf/Page.cc xpdf-4.00/xpdf/Page.cc
---- xpdf-4.00.orig/xpdf/Page.cc	Wed Aug 09 08:22:50 2017
-+++ xpdf-4.00/xpdf/Page.cc	Sun Aug 13 13:24:07 2017
+diff -ur xpdf-4.00/xpdf/PDFDoc.cc xpdf-src/xpdf/PDFDoc.cc
+--- xpdf-4.00/xpdf/PDFDoc.cc	Wed Aug 09 08:22:50 2017
++++ xpdf-src/xpdf/PDFDoc.cc	Wed Oct 03 00:39:16 2018
+@@ -147,13 +147,17 @@
+ 
+   // try to open file
+   // NB: _wfopen is only available in NT
++/*
+   version.dwOSVersionInfoSize = sizeof(version);
+   GetVersionEx(&version);
+   if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+     file = _wfopen(fileNameU, L"rb");
+   } else {
++*/
+     file = fopen(fileName->getCString(), "rb");
++/*
+   }
++*/
+   if (!file) {
+     error(errIO, -1, "Couldn't open file '{0:t}'", fileName);
+     errCode = errOpenFile;
+@@ -535,6 +539,7 @@
+   GBool ret;
+ 
+   // NB: _wfopen is only available in NT
++/*
+   version.dwOSVersionInfoSize = sizeof(version);
+   GetVersionEx(&version);
+   if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+@@ -544,12 +549,15 @@
+     path2w[i] = 0;
+     f = _wfopen(path2w, L"wb");
+   } else {
++*/
+     for (i = 0; i < pathLen && i < _MAX_PATH; ++i) {
+       path2c[i] = (char)path[i];
+     }
+     path2c[i] = 0;
+     f = fopen(path2c, "wb");
++/*
+   }
++*/
+   if (!f) {
+     return gFalse;
+   }
+diff -ur xpdf-4.00/xpdf/Page.cc xpdf-src/xpdf/Page.cc
+--- xpdf-4.00/xpdf/Page.cc	Wed Aug 09 08:22:50 2017
++++ xpdf-src/xpdf/Page.cc	Sun Aug 13 13:24:08 2017
 @@ -480,9 +480,9 @@
    delete links;
  }
@@ -143,9 +205,9 @@
 -}
  #endif
 +}
-diff -ur xpdf-4.00.orig/xpdf/XFAForm.cc xpdf-4.00/xpdf/XFAForm.cc
---- xpdf-4.00.orig/xpdf/XFAForm.cc	Wed Aug 09 08:22:50 2017
-+++ xpdf-4.00/xpdf/XFAForm.cc	Sun Aug 13 14:28:34 2017
+diff -ur xpdf-4.00/xpdf/XFAForm.cc xpdf-src/xpdf/XFAForm.cc
+--- xpdf-4.00/xpdf/XFAForm.cc	Wed Aug 09 08:22:50 2017
++++ xpdf-src/xpdf/XFAForm.cc	Sun Aug 13 14:28:34 2017
 @@ -27,8 +27,10 @@
  #include "XFAForm.h"
  
@@ -159,9 +221,9 @@
  #endif
  
  //------------------------------------------------------------------------
-diff -ur xpdf-4.00.orig/xpdf/config.h xpdf-4.00/xpdf/config.h
---- xpdf-4.00.orig/xpdf/config.h	Wed Aug 09 08:22:50 2017
-+++ xpdf-4.00/xpdf/config.h	Sun Aug 13 13:42:04 2017
+diff -ur xpdf-4.00/xpdf/config.h xpdf-src/xpdf/config.h
+--- xpdf-4.00/xpdf/config.h	Wed Aug 09 08:22:50 2017
++++ xpdf-src/xpdf/config.h	Sun Aug 13 16:14:54 2017
 @@ -78,11 +78,6 @@
  // popen
  //------------------------------------------------------------------------

Added: branches/stable/source/src/libs/xpdf/aconf-w32.h
===================================================================
--- branches/stable/source/src/libs/xpdf/aconf-w32.h	                        (rev 0)
+++ branches/stable/source/src/libs/xpdf/aconf-w32.h	2018-11-12 19:12:53 UTC (rev 807)
@@ -0,0 +1,142 @@
+/*
+ * aconf-w32.h
+ *
+ * Copyright 2002-2003 Glyph & Cog, LLC
+ * Copyright 2018 A. Kakuto
+ */
+
+#ifndef ACONF_H
+#define ACONF_H
+
+#include <aconf2.h>
+
+/*
+ * Use A4 paper size instead of Letter for PostScript output.
+ */
+#define A4_PAPER 1
+
+/*
+ * Do not allow text selection.
+ */
+#undef NO_TEXT_SELECT
+
+/*
+ * Include support for OPI comments.
+ */
+#undef OPI_SUPPORT
+
+/*
+ * Enable multithreading support.
+ */
+#define MULTITHREADED 1
+
+/*
+ * Enable C++ exceptions.
+ */
+#define USE_EXCEPTIONS 1
+
+/*
+ * Use fixed point (instead of floating point) arithmetic.
+ */
+#undef USE_FIXEDPOINT
+
+/*
+ * Directory with the Xpdf app-defaults file.
+ */
+#undef APPDEFDIR
+
+/*
+ * Full path for the system-wide xpdfrc file.
+ */
+#undef SYSTEM_XPDFRC
+
+/*
+ * Various include files and functions.
+ */
+#undef HAVE_DIRENT_H
+#undef HAVE_SYS_NDIR_H
+#undef HAVE_SYS_DIR_H
+#undef HAVE_NDIR_H
+#undef HAVE_SYS_SELECT_H
+#undef HAVE_SYS_BSDTYPES_H
+#undef HAVE_STRINGS_H
+#undef HAVE_BSTRING_H
+#define HAVE_POPEN 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <kpathsea/config.h>
+#ifdef __cplusplus
+}
+#endif
+
+#undef index
+
+#undef HAVE_MKSTEMP
+#undef HAVE_MKSTEMPS
+#undef SELECT_TAKES_INT
+#define HAVE_STD_SORT 1
+#undef HAVE_FSEEKO
+#undef HAVE_FSEEK64
+#define HAVE_FSEEKI64 1
+#undef _FILE_OFFSET_BITS
+#undef _LARGE_FILES
+#undef _LARGEFILE_SOURCE
+#undef HAVE_XTAPPSETEXITFLAG
+
+/*
+ * This is defined if using libXpm.
+ */
+#undef HAVE_X11_XPM_H
+
+/*
+ * One of these is defined if using FreeType (version 1 or 2).
+ */
+#undef HAVE_FREETYPE_H
+#define HAVE_FREETYPE_FREETYPE_H 1
+
+/*
+ * This is defined if using FreeType version 2.
+ */
+#define FREETYPE2 1
+
+/*
+ * This is defined if using libpaper.
+ */
+#undef HAVE_PAPER_H
+
+/*
+ * Enable support for loading plugins.
+ */
+#undef ENABLE_PLUGINS
+
+/*
+ * Defined if the Splash library is avaiable.
+ */
+#define HAVE_SPLASH 1
+
+/*
+ * Enable support for CMYK output.
+ */
+#define SPLASH_CMYK 1
+
+#ifdef _WIN32
+#ifdef LINKDLL
+#define XPDFDLL __declspec(dllimport)
+#else
+#define XPDFDLL extern
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+XPDFDLL
+FILE *fsyscp_fopen (const char *filename, const char *mode);
+#ifdef __cplusplus
+}
+#endif
+#undef fopen
+#define fopen fsyscp_fopen
+#endif /* _WIN32 */
+
+#endif


Property changes on: branches/stable/source/src/libs/xpdf/aconf-w32.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/libs/xpdf/xpdf-src/goo/gfile.cc
===================================================================
--- branches/stable/source/src/libs/xpdf/xpdf-src/goo/gfile.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/xpdf/xpdf-src/goo/gfile.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -580,6 +580,8 @@
 
 FILE *openFile(const char *path, const char *mode) {
 #ifdef _WIN32
+  return fopen(path, mode);
+#if 0
   OSVERSIONINFO version;
   wchar_t wPath[_MAX_PATH + 1];
   char nPath[_MAX_PATH + 1];
@@ -636,6 +638,7 @@
     nPath[i] = '\0';
     return fopen(nPath, mode);
   }
+#endif /* 0 */
 #else
   return fopen(path, mode);
 #endif

Modified: branches/stable/source/src/libs/xpdf/xpdf-src/xpdf/PDFDoc.cc
===================================================================
--- branches/stable/source/src/libs/xpdf/xpdf-src/xpdf/PDFDoc.cc	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/libs/xpdf/xpdf-src/xpdf/PDFDoc.cc	2018-11-12 19:12:53 UTC (rev 807)
@@ -147,13 +147,17 @@
 
   // try to open file
   // NB: _wfopen is only available in NT
+/*
   version.dwOSVersionInfoSize = sizeof(version);
   GetVersionEx(&version);
   if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) {
     file = _wfopen(fileNameU, L"rb");
   } else {
+*/
     file = fopen(fileName->getCString(), "rb");
+/*
   }
+*/
   if (!file) {
     error(errIO, -1, "Couldn't open file '{0:t}'", fileName);
     errCode = errOpenFile;
@@ -535,6 +539,7 @@
   GBool ret;
 
   // NB: _wfopen is only available in NT
+/*
   version.dwOSVersionInfoSize = sizeof(version);
   GetVersionEx(&version);
   if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) {
@@ -544,12 +549,15 @@
     path2w[i] = 0;
     f = _wfopen(path2w, L"wb");
   } else {
+*/
     for (i = 0; i < pathLen && i < _MAX_PATH; ++i) {
       path2c[i] = (char)path[i];
     }
     path2c[i] = 0;
     f = fopen(path2c, "wb");
+/*
   }
+*/
   if (!f) {
     return gFalse;
   }

Modified: branches/stable/source/src/m4/ChangeLog
===================================================================
--- branches/stable/source/src/m4/ChangeLog	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/m4/ChangeLog	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,3 +1,9 @@
+2018-08-27  Karl Berry  <karl at freefriends.org>
+
+	* kpse-potrace-flags.m4: remove file, again bundled with dvisvgm.
+	* kpse-pkgs.m4 (KPSE_ALL_SYSTEM_FLAGS),
+	(kpse_libs_pkgs): no more potrace.
+
 2018-02-09  Karl Berry  <karl at freefriends.org>
 
 	* kpse-pkgs.m4 (kpse_utils_pkgs): add axodraw2.

Modified: branches/stable/source/src/m4/kpse-pkgs.m4
===================================================================
--- branches/stable/source/src/m4/kpse-pkgs.m4	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/m4/kpse-pkgs.m4	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,4 +1,4 @@
-# $Id: kpse-pkgs.m4 46590 2018-02-10 23:30:32Z karl $
+# $Id: kpse-pkgs.m4 48839 2018-10-06 11:20:00Z hironobu $
 # Private Autoconf macros for the TeX Live (TL) tree.
 # Copyright 2016-2018 Karl Berry <tex-live at tug.org>
 # Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
@@ -36,7 +36,6 @@
 gmp
 cairo
 pixman
-potrace
 gd
 freetype2
 libpng
@@ -64,7 +63,6 @@
 AC_REQUIRE([KPSE_LIBPNG_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_FREETYPE2_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_GD_SYSTEM_FLAGS])[]dnl
-AC_REQUIRE([KPSE_POTRACE_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_PIXMAN_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_CAIRO_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_GMP_SYSTEM_FLAGS])[]dnl
@@ -114,6 +112,7 @@
 dvi2tty
 dvidvi
 dviljk
+dviout-util
 dvipdfm-x
 dvipng
 dvipos

Deleted: branches/stable/source/src/m4/kpse-potrace-flags.m4
===================================================================
--- branches/stable/source/src/m4/kpse-potrace-flags.m4	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/m4/kpse-potrace-flags.m4	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,27 +0,0 @@
-# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live at tug.org>
-#
-# This file is free software; the copyright holder
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# KPSE_POTRACE_FLAGS
-# ------------------
-# Provide the configure options '--with-system-potrace' (if in the TL tree),
-# '--with-potrace-includes', and '--with-potrace-libdir'.
-#
-# Set the make variables POTRACE_INCLUDES and POTRACE_LIBS to the CPPFLAGS and
-# LIBS required for the `-lpotrace' library in libs/potrace/ of the TL tree.
-AC_DEFUN([KPSE_POTRACE_FLAGS], [dnl
-_KPSE_LIB_FLAGS([potrace], [potrace], [],
-                [-IBLD/libs/potrace/include], [BLD/libs/potrace/libpotrace.a], [],
-                [], [${top_builddir}/../../libs/potrace/include/potracelib.h])[]dnl
-]) # KPSE_POTRACE_FLAGS
-
-# KPSE_POTRACE_OPTIONS([WITH-SYSTEM])
-# -----------------------------------
-AC_DEFUN([KPSE_POTRACE_OPTIONS], [_KPSE_LIB_OPTIONS([potrace], [$1])])
-
-# KPSE_POTRACE_SYSTEM_FLAGS
-# -------------------------
-AC_DEFUN([KPSE_POTRACE_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([potrace], [potrace])])

Modified: branches/stable/source/src/texk/Makefile.in
===================================================================
--- branches/stable/source/src/texk/Makefile.in	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/texk/Makefile.in	2018-11-12 19:12:53 UTC (rev 807)
@@ -108,7 +108,6 @@
 	$(top_srcdir)/../m4/kpse-pixman-flags.m4 \
 	$(top_srcdir)/../m4/kpse-pkgs.m4 \
 	$(top_srcdir)/../m4/kpse-poppler-flags.m4 \
-	$(top_srcdir)/../m4/kpse-potrace-flags.m4 \
 	$(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
 	$(top_srcdir)/../m4/kpse-setup.m4 \
 	$(top_srcdir)/../m4/kpse-teckit-flags.m4 \
@@ -146,6 +145,7 @@
 	$(top_srcdir)/../texk/dvi2tty/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvidvi/ac/withenable.ac \
 	$(top_srcdir)/../texk/dviljk/ac/withenable.ac \
+	$(top_srcdir)/../texk/dviout-util/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvipdfm-x/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvipng/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvipng/ac/dvipng.ac \
@@ -182,7 +182,6 @@
 	$(top_srcdir)/../libs/gmp/ac/withenable.ac \
 	$(top_srcdir)/../libs/cairo/ac/withenable.ac \
 	$(top_srcdir)/../libs/pixman/ac/withenable.ac \
-	$(top_srcdir)/../libs/potrace/ac/withenable.ac \
 	$(top_srcdir)/../libs/gd/ac/withenable.ac \
 	$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
 	$(top_srcdir)/../libs/libpng/ac/withenable.ac \

Modified: branches/stable/source/src/texk/README
===================================================================
--- branches/stable/source/src/texk/README	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/texk/README	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,4 +1,4 @@
-$Id: README 48164 2018-07-08 08:06:14Z kakuto $
+$Id: README 49020 2018-10-29 22:11:07Z karl $
 Copyright 2006-2018 TeX Users Group.
 You may freely use, modify and/or distribute this file.
 
@@ -34,7 +34,7 @@
 cjkutils 4.8.4 - checked 18apr15
   http://cjk.ffii.org/cjk-4.8.4.tar.gz
 
-detex 2.8.3 - checked 20jun18
+detex 2.8.4 - checked 16oct18
   https://github.com/pkubowicz/opendetex
     old info: http://www.cs.purdue.edu/homes/trinkle/detex/
 
@@ -47,6 +47,10 @@
 
 dviljk - maintained here, by Joachim Schrod
 
+dviout-util - by Japanese TeX Development Community (Hironobu, Takuji et al.)
+  https://github.com/texjporg/tex-jp-build
+  but also: https://github.com/aminophen/dviout-util
+
 dvipdfm-x - maintained here, by us, contains
   dvipdfmx
   xdvipdfmx
@@ -60,8 +64,8 @@
 
 dvipsk - maintained here, by us
 
-dvisvgm 2.4.1 - checked 08jul18
-  http://dvisvgm.bplaced.net/Downloads
+dvisvgm 2.6.1 - checked 29oct18
+  https://dvisvgm.de/Downloads/
 
 gregorio 5.1.1 - checked 25mar18
   CTAN/support/gregoriotex/gregorio-5.1.1.zip

Modified: branches/stable/source/src/texk/aclocal.m4
===================================================================
--- branches/stable/source/src/texk/aclocal.m4	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/texk/aclocal.m4	2018-11-12 19:12:53 UTC (rev 807)
@@ -1188,7 +1188,6 @@
 m4_include([../m4/kpse-pixman-flags.m4])
 m4_include([../m4/kpse-pkgs.m4])
 m4_include([../m4/kpse-poppler-flags.m4])
-m4_include([../m4/kpse-potrace-flags.m4])
 m4_include([../m4/kpse-ptexenc-flags.m4])
 m4_include([../m4/kpse-setup.m4])
 m4_include([../m4/kpse-teckit-flags.m4])

Modified: branches/stable/source/src/texk/configure
===================================================================
--- branches/stable/source/src/texk/configure	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/texk/configure	2018-11-12 19:12:53 UTC (rev 807)
@@ -767,6 +767,7 @@
 enable_dvi2tty
 enable_dvidvi
 enable_dviljk
+enable_dviout_util
 enable_dvipdfm_x
 enable_dvipng
 enable_debug
@@ -820,9 +821,6 @@
 with_gmp_libdir
 with_system_cairo
 with_system_pixman
-with_system_potrace
-with_potrace_includes
-with_potrace_libdir
 with_system_gd
 with_gd_includes
 with_gd_libdir
@@ -1555,6 +1553,7 @@
   --disable-dvi2tty       do not build the dvi2tty package
   --disable-dvidvi        do not build the dvidvi package
   --disable-dviljk        do not build the dviljk package
+  --disable-dviout-util   do not build the dviout-util package
   --disable-dvipdfm-x     do not build the dvipdfm-x package
   --disable-dvipng        do not build the dvipng package
   --disable-debug           Compile without debug (-d) option
@@ -1656,11 +1655,6 @@
                           pkg-config)
   --with-system-pixman    use installed pixman headers and library (requires
                           pkg-config)
-  --with-system-potrace   use installed potrace headers and library
-  --with-potrace-includes=DIR
-                          potrace headers installed in DIR
-  --with-potrace-libdir=DIR
-                          potrace library installed in DIR
   --with-system-gd        use installed gd headers and library
   --with-gd-includes=DIR  gd headers installed in DIR
   --with-gd-libdir=DIR    gd library installed in DIR
@@ -3858,8 +3852,6 @@
 esac
 
 test "x$enable_web2c:$enable_luatex" = xyes:yes && {
-  need_poppler=yes
-  need_mpfr=yes
   need_libpng=yes
   need_zziplib=yes
   need_lua52=yes
@@ -3876,8 +3868,6 @@
 esac
 
 test "x$enable_web2c:$enable_luatex53" = xyes:yes && {
-  need_poppler=yes
-  need_mpfr=yes
   need_libpng=yes
   need_zziplib=yes
   need_lua53=yes
@@ -3894,8 +3884,6 @@
 esac
 
 test "x$enable_web2c:$enable_luajittex" = xyes:yes && {
-  need_poppler=yes
-  need_mpfr=yes
   need_libpng=yes
   need_zziplib=yes
   need_luajit=yes
@@ -4319,6 +4307,28 @@
   need_kpathsea=yes
 }
 
+## texk/dviout-util/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviout-util/
+## configure options and TL libraries required for dviout-util
+# Check whether --enable-dviout-util was given.
+if test "${enable_dviout_util+set}" = set; then :
+  enableval=$enable_dviout_util;
+fi
+case $enable_dviout_util in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_dviout_util=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&5
+$as_echo "$as_me: Assuming \`--enable-dviout-util=$enable_dviout_util'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviout-util=$enable_dviout_util'"
+    ;;
+esac
+
+test "x$enable_dviout_util" = xno || {
+  need_ptexenc=yes
+}
+
 ## texk/dvipdfm-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/
 ## configure options and TL libraries required for dvipdfm-x
 # Check whether --enable-dvipdfm-x was given.
@@ -5234,36 +5244,6 @@
   ac_configure_args="$ac_configure_args '--with-system-pixman=$with_system_pixman'"
 fi
 
-## libs/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
-## configure options and TL libraries required for potrace
-
-# Check whether --with-system-potrace was given.
-if test "${with_system_potrace+set}" = set; then :
-  withval=$with_system_potrace;
-fi
-
-# Check whether --with-potrace-includes was given.
-if test "${with_potrace_includes+set}" = set; then :
-  withval=$with_potrace_includes;
-fi
-
-# Check whether --with-potrace-libdir was given.
-if test "${with_potrace_libdir+set}" = set; then :
-  withval=$with_potrace_libdir;
-fi
-if test "x$with_system_potrace" = x; then
-  if test -f $srcdir/../libs/potrace/configure; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`potrace' headers and library from TL tree" >&5
-$as_echo "$as_me: Assuming \`potrace' headers and library from TL tree" >&6;}
-    with_system_potrace=no
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`potrace' headers and library" >&5
-$as_echo "$as_me: Assuming installed \`potrace' headers and library" >&6;}
-    with_system_potrace=yes
-  fi
-  ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
-fi
-
 ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
 ## configure options and TL libraries required for gd
 
@@ -6482,6 +6462,10 @@
   test "x$enable_dviljk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
   CONF_SUBDIRS="$CONF_SUBDIRS dviljk"
 fi
+if test -x $srcdir/dviout-util/configure; then
+  test "x$enable_dviout_util" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dviout-util"
+  CONF_SUBDIRS="$CONF_SUBDIRS dviout-util"
+fi
 if test -x $srcdir/dvipdfm-x/configure; then
   test "x$enable_dvipdfm_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdfm-x"
   CONF_SUBDIRS="$CONF_SUBDIRS dvipdfm-x"

Modified: branches/stable/source/src/texk/kpathsea/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/Makefile.in	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/texk/kpathsea/Makefile.in	2018-11-12 19:12:53 UTC (rev 807)
@@ -2508,7 +2508,7 @@
 	  else :; fi; \
 	done
 
-# $Id: Makefile.in 47973 2018-06-10 06:12:41Z takuji $
+# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
 # am/bin_links.am: Makefile fragment for bindir links.
 .PHONY: install-bin-links uninstall-bin-links
 

Modified: branches/stable/source/src/texk/web2c/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/ChangeLog	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/texk/web2c/ChangeLog	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,3 +1,18 @@
+2018-09-09  Karl Berry  <karl at tug.org>
+
+	* mftraptest.test,
+	* triptest.test: LC_ALL=LANGUAGE=C.
+
+2018-07-24  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* synctexdir/am/synctex.am: Add synctex_version.h.
+	Report by Johannes:
+	https://tug.org/pipermail/tex-live/2018-July/042089.html
+
+2018-07-17  Karl Berry  <karl at freefriends.org>
+
+	* dvicopy.web: typos.
+
 2018-06-14  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* help.h, texmfmp-help.h: remove sjisterminal (w32 only).

Modified: branches/stable/source/src/texk/web2c/Makefile.am
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.am	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/texk/web2c/Makefile.am	2018-11-12 19:12:53 UTC (rev 807)
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 46348 2018-01-17 18:00:12Z lscarso $
+## $Id: Makefile.am 48591 2018-09-05 21:30:41Z lscarso $
 ## Makefile.am for the TeX Live subdirectory texk/web2c/.
 ##
 ## Copyright 2017      Karl Berry <tex-live at tug.org>
@@ -237,6 +237,7 @@
 include $(srcdir)/luatexdir/am/luafontforge.am
 include $(srcdir)/luatexdir/am/libluatex.am
 include $(srcdir)/luatexdir/am/luaffi.am
+include $(srcdir)/luatexdir/am/luapplib.am 
 include $(srcdir)/luatexdir/am/luatex.am
 
 ## XeTeX

Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in	2018-07-10 17:26:48 UTC (rev 806)
+++ branches/stable/source/src/texk/web2c/Makefile.in	2018-11-12 19:12:53 UTC (rev 807)
@@ -385,7 +385,7 @@
 	$(top_srcdir)/../../m4/lt~obsolete.m4 \
 	$(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \
 	$(top_srcdir)/synctexdir/ac/synctex.ac \
-	$(top_srcdir)/synctexdir/synctex_parser_version.txt \
+	$(top_srcdir)/synctexdir/synctex_parser_api_level.txt \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -559,9 +559,31 @@
 	luatexdir/slnunicode/liblua53misc_a-slnunico.$(OBJEXT)
 nodist_liblua53misc_a_OBJECTS = $(am__objects_2)
 liblua53misc_a_OBJECTS = $(nodist_liblua53misc_a_OBJECTS)
+liblua53pplib_a_AR = $(AR) $(ARFLAGS)
+liblua53pplib_a_LIBADD =
+am__objects_3 = luatexdir/luapplib/liblua53pplib_a-pparray.$(OBJEXT) \
+	luatexdir/luapplib/liblua53pplib_a-ppcrypt.$(OBJEXT) \
+	luatexdir/luapplib/liblua53pplib_a-ppdict.$(OBJEXT) \
+	luatexdir/luapplib/liblua53pplib_a-ppheap.$(OBJEXT) \
+	luatexdir/luapplib/liblua53pplib_a-ppload.$(OBJEXT) \
+	luatexdir/luapplib/liblua53pplib_a-ppstream.$(OBJEXT) \
+	luatexdir/luapplib/liblua53pplib_a-ppxref.$(OBJEXT) \
+	luatexdir/luapplib/util/liblua53pplib_a-utilbasexx.$(OBJEXT) \
+	luatexdir/luapplib/util/liblua53pplib_a-utilcrypt.$(OBJEXT) \
+	luatexdir/luapplib/util/liblua53pplib_a-utilflate.$(OBJEXT) \
+	luatexdir/luapplib/util/liblua53pplib_a-utilfpred.$(OBJEXT) \
+	luatexdir/luapplib/util/liblua53pplib_a-utiliof.$(OBJEXT) \
+	luatexdir/luapplib/util/liblua53pplib_a-utillog.$(OBJEXT) \
+	luatexdir/luapplib/util/liblua53pplib_a-utillzw.$(OBJEXT) \
+	luatexdir/luapplib/util/liblua53pplib_a-utilmd5.$(OBJEXT) \
+	luatexdir/luapplib/util/liblua53pplib_a-utilmem.$(OBJEXT) \
+	luatexdir/luapplib/util/liblua53pplib_a-utilnumber.$(OBJEXT) \
+	luatexdir/luapplib/util/liblua53pplib_a-utilsha.$(OBJEXT)
+nodist_liblua53pplib_a_OBJECTS = $(am__objects_3)
+liblua53pplib_a_OBJECTS = $(nodist_liblua53pplib_a_OBJECTS)
 liblua53socket_a_AR = $(AR) $(ARFLAGS)
 liblua53socket_a_LIBADD =
-am__objects_3 =  \
+am__objects_4 =  \
 	luatexdir/luasocket/src/liblua53socket_a-auxiliar.$(OBJEXT) \
 	luatexdir/luasocket/src/liblua53socket_a-buffer.$(OBJEXT) \
 	luatexdir/luasocket/src/liblua53socket_a-compat.$(OBJEXT) \
@@ -578,24 +600,55 @@
 	luatexdir/luasocket/src/liblua53socket_a-tcp.$(OBJEXT) \
 	luatexdir/luasocket/src/liblua53socket_a-timeout.$(OBJEXT) \
 	luatexdir/luasocket/src/liblua53socket_a-udp.$(OBJEXT)
-nodist_liblua53socket_a_OBJECTS = $(am__objects_3)
+nodist_liblua53socket_a_OBJECTS = $(am__objects_4)
 liblua53socket_a_OBJECTS = $(nodist_liblua53socket_a_OBJECTS)
 liblua53tex_a_AR = $(AR) $(ARFLAGS)
 liblua53tex_a_LIBADD =
 dist_liblua53tex_a_OBJECTS =  \
-	luatexdir/lua/liblua53tex_a-lstrlibext.$(OBJEXT)
-am__objects_4 =  \
+	luatexdir/lua/liblua53tex_a-lstrlibext.$(OBJEXT) \
+	luatexdir/lua/liblua53tex_a-helpers.$(OBJEXT) \
+	luatexdir/lua/liblua53tex_a-texluac.$(OBJEXT)
+am__objects_5 =  \
 	luatexdir/luafontloader/src/liblua53tex_a-ffdummies.$(OBJEXT) \
 	luatexdir/luafontloader/src/liblua53tex_a-luafflib.$(OBJEXT) \
+	luatexdir/dvi/liblua53tex_a-dvigen.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-dofont.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-luafont.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-mapfile.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-pkin.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-sfnt.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-texfont.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-tfmofm.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-tounicode.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-tt_glyf.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-tt_table.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-vfovf.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-vfpacket.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-writecff.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-writeenc.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-writefont.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-writet1.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-writet3.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-writettf.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-writetype0.$(OBJEXT) \
+	luatexdir/font/liblua53tex_a-writetype2.$(OBJEXT) \
+	luatexdir/image/liblua53tex_a-pdftoepdf.$(OBJEXT) \
+	luatexdir/image/liblua53tex_a-writeimg.$(OBJEXT) \
+	luatexdir/image/liblua53tex_a-writejbig2.$(OBJEXT) \
+	luatexdir/image/liblua53tex_a-writejp2.$(OBJEXT) \
+	luatexdir/image/liblua53tex_a-writejpg.$(OBJEXT) \
+	luatexdir/image/liblua53tex_a-writepng.$(OBJEXT) \
+	luatexdir/lang/liblua53tex_a-hnjalloc.$(OBJEXT) \
+	luatexdir/lang/liblua53tex_a-hyphen.$(OBJEXT) \
+	luatexdir/lang/liblua53tex_a-texlang.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-lcallbacklib.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-lfontlib.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-limglib.$(OBJEXT) \
+	luatexdir/lua/liblua53tex_a-lpdfelib.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-lpdfscannerlib.$(OBJEXT) \
-	luatexdir/lua/liblua53tex_a-lepdflib.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-lkpselib.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-llanglib.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-llualib.$(OBJEXT) \
-	luatexdir/lua/liblua53tex_a-llfslibext.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-lnodelib.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-liolibext.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-loslibext.$(OBJEXT) \
@@ -605,108 +658,88 @@
 	luatexdir/lua/liblua53tex_a-ltexlib.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-lnewtokenlib.$(OBJEXT) \
 	luatexdir/lua/liblua53tex_a-luatex-core.$(OBJEXT) \
+	luatexdir/lua/liblua53tex_a-helpers.$(OBJEXT) \
+	luatexdir/lua/liblua53tex_a-luainit.$(OBJEXT) \
+	luatexdir/lua/liblua53tex_a-luanode.$(OBJEXT) \
+	luatexdir/lua/liblua53tex_a-luastuff.$(OBJEXT) \
+	luatexdir/lua/liblua53tex_a-luatoken.$(OBJEXT) \
+	luatexdir/lua/liblua53tex_a-mplibstuff.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfaction.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfannot.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfcolorstack.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfdest.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdffont.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfgen.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfglyph.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfimage.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdflink.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdflistout.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfliteral.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfobj.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfoutline.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfpage.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfpagetree.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfrule.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfsaverestore.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfsetmatrix.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfshipout.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdftables.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfthread.$(OBJEXT) \
+	luatexdir/pdf/liblua53tex_a-pdfxform.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-backend.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-align.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-arithmetic.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-buildpage.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-commands.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-conditional.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-directions.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-dumpdata.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-equivalents.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-errors.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-expand.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-extensions.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-filename.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-inputstack.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-linebreak.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-mainbody.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-maincontrol.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-mathcodes.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-memoryword.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-mlist.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-nesting.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-packaging.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-postlinebreak.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-primitive.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-printing.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-scanning.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-stringpool.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-texdeffont.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-texfileio.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-texmath.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-texnodes.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-textcodes.$(OBJEXT) \
+	luatexdir/tex/liblua53tex_a-textoken.$(OBJEXT) \
 	luatexdir/utils/liblua53tex_a-avl.$(OBJEXT) \
+	luatexdir/utils/liblua53tex_a-avlstuff.$(OBJEXT) \
+	luatexdir/utils/liblua53tex_a-managed-sa.$(OBJEXT) \
+	luatexdir/utils/liblua53tex_a-unistring.$(OBJEXT) \
+	luatexdir/utils/liblua53tex_a-utils.$(OBJEXT) \
 	synctexdir/liblua53tex_a-synctex.$(OBJEXT)
-am__objects_5 = liblua53tex_a-dvigen.$(OBJEXT) \
-	liblua53tex_a-dofont.$(OBJEXT) liblua53tex_a-luafont.$(OBJEXT) \
-	liblua53tex_a-mapfile.$(OBJEXT) liblua53tex_a-pkin.$(OBJEXT) \
-	liblua53tex_a-sfnt.$(OBJEXT) liblua53tex_a-texfont.$(OBJEXT) \
-	liblua53tex_a-tfmofm.$(OBJEXT) \
-	liblua53tex_a-tounicode.$(OBJEXT) \
-	liblua53tex_a-tt_glyf.$(OBJEXT) \
-	liblua53tex_a-tt_table.$(OBJEXT) liblua53tex_a-vfovf.$(OBJEXT) \
-	liblua53tex_a-vfpacket.$(OBJEXT) \
-	liblua53tex_a-writecff.$(OBJEXT) \
-	liblua53tex_a-writeenc.$(OBJEXT) \
-	liblua53tex_a-writefont.$(OBJEXT) \
-	liblua53tex_a-writet1.$(OBJEXT) \
-	liblua53tex_a-writet3.$(OBJEXT) \
-	liblua53tex_a-writettf.$(OBJEXT) \
-	liblua53tex_a-writetype0.$(OBJEXT) \
-	liblua53tex_a-writetype2.$(OBJEXT) \
-	liblua53tex_a-writeimg.$(OBJEXT) \
-	liblua53tex_a-writejbig2.$(OBJEXT) \
-	liblua53tex_a-writejpg.$(OBJEXT) \
-	liblua53tex_a-writejp2.$(OBJEXT) \
-	liblua53tex_a-writepng.$(OBJEXT) \
-	liblua53tex_a-pdftoepdf.$(OBJEXT) \
-	liblua53tex_a-texlang.$(OBJEXT) liblua53tex_a-hyphen.$(OBJEXT) \
-	liblua53tex_a-hnjalloc.$(OBJEXT) \
-	liblua53tex_a-luainit.$(OBJEXT) \
-	liblua53tex_a-luanode.$(OBJEXT) \
-	liblua53tex_a-luatoken.$(OBJEXT) \
-	liblua53tex_a-mplibstuff.$(OBJEXT) \
-	liblua53tex_a-pdfpagetree.$(OBJEXT) \
-	liblua53tex_a-pdfaction.$(OBJEXT) \
-	liblua53tex_a-pdfannot.$(OBJEXT) \
-	liblua53tex_a-pdfcolorstack.$(OBJEXT) \
-	liblua53tex_a-pdfdest.$(OBJEXT) \
-	liblua53tex_a-pdffont.$(OBJEXT) liblua53tex_a-pdfgen.$(OBJEXT) \
-	liblua53tex_a-pdfglyph.$(OBJEXT) \
-	liblua53tex_a-pdfimage.$(OBJEXT) \
-	liblua53tex_a-pdflink.$(OBJEXT) \
-	liblua53tex_a-pdflistout.$(OBJEXT) \
-	liblua53tex_a-pdfliteral.$(OBJEXT) \
-	liblua53tex_a-pdfobj.$(OBJEXT) \
-	liblua53tex_a-pdfoutline.$(OBJEXT) \
-	liblua53tex_a-pdfpage.$(OBJEXT) \
-	liblua53tex_a-pdfrule.$(OBJEXT) \
-	liblua53tex_a-pdfsaverestore.$(OBJEXT) \
-	liblua53tex_a-pdfsetmatrix.$(OBJEXT) \
-	liblua53tex_a-pdfshipout.$(OBJEXT) \
-	liblua53tex_a-pdftables.$(OBJEXT) \
-	liblua53tex_a-pdfthread.$(OBJEXT) \
-	liblua53tex_a-pdfxform.$(OBJEXT) liblua53tex_a-align.$(OBJEXT) \
-	liblua53tex_a-arithmetic.$(OBJEXT) \
-	liblua53tex_a-buildpage.$(OBJEXT) \
-	liblua53tex_a-commands.$(OBJEXT) \
-	liblua53tex_a-conditional.$(OBJEXT) \
-	liblua53tex_a-directions.$(OBJEXT) \
-	liblua53tex_a-dumpdata.$(OBJEXT) \
-	liblua53tex_a-equivalents.$(OBJEXT) \
-	liblua53tex_a-errors.$(OBJEXT) liblua53tex_a-expand.$(OBJEXT) \
-	liblua53tex_a-extensions.$(OBJEXT) \
-	liblua53tex_a-filename.$(OBJEXT) \
-	liblua53tex_a-inputstack.$(OBJEXT) \
-	liblua53tex_a-linebreak.$(OBJEXT) \
-	liblua53tex_a-mainbody.$(OBJEXT) \
-	liblua53tex_a-maincontrol.$(OBJEXT) \
-	liblua53tex_a-mathcodes.$(OBJEXT) \
-	liblua53tex_a-memoryword.$(OBJEXT) \
-	liblua53tex_a-mlist.$(OBJEXT) liblua53tex_a-nesting.$(OBJEXT) \
-	liblua53tex_a-packaging.$(OBJEXT) \
-	liblua53tex_a-postlinebreak.$(OBJEXT) \
-	liblua53tex_a-primitive.$(OBJEXT) \
-	liblua53tex_a-printing.$(OBJEXT) \
-	liblua53tex_a-scanning.$(OBJEXT) \
-	liblua53tex_a-stringpool.$(OBJEXT) \
-	liblua53tex_a-texdeffont.$(OBJEXT) \
-	liblua53tex_a-texfileio.$(OBJEXT) \
-	liblua53tex_a-texmath.$(OBJEXT) \
-	liblua53tex_a-texnodes.$(OBJEXT) \
-	liblua53tex_a-textcodes.$(OBJEXT) \
-	liblua53tex_a-textoken.$(OBJEXT) \
-	liblua53tex_a-avlstuff.$(OBJEXT) \
-	liblua53tex_a-managed-sa.$(OBJEXT) \
-	liblua53tex_a-utils.$(OBJEXT) \
-	liblua53tex_a-unistring.$(OBJEXT)
-nodist_liblua53tex_a_OBJECTS = liblua53tex_a-helpers.$(OBJEXT) \
-	liblua53tex_a-luastuff.$(OBJEXT) \
-	liblua53tex_a-texluac.$(OBJEXT) $(am__objects_4) \
-	$(am__objects_5)
+am__objects_6 =
+nodist_liblua53tex_a_OBJECTS = $(am__objects_5) $(am__objects_6)
 liblua53tex_a_OBJECTS = $(dist_liblua53tex_a_OBJECTS) \
 	$(nodist_liblua53tex_a_OBJECTS)
 libluaffi_a_AR = $(AR) $(ARFLAGS)
 libluaffi_a_LIBADD =
-am__objects_6 = luatexdir/luaffi/libluaffi_a-call.$(OBJEXT) \
+am__objects_7 = luatexdir/luaffi/libluaffi_a-call.$(OBJEXT) \
 	luatexdir/luaffi/libluaffi_a-ctype.$(OBJEXT) \
 	luatexdir/luaffi/libluaffi_a-ffi.$(OBJEXT) \
 	luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT)
-nodist_libluaffi_a_OBJECTS = $(am__objects_6)
+nodist_libluaffi_a_OBJECTS = $(am__objects_7)
 libluaffi_a_OBJECTS = $(nodist_libluaffi_a_OBJECTS)
 libluajitmisc_a_AR = $(AR) $(ARFLAGS)
 libluajitmisc_a_LIBADD =
-am__objects_7 =  \
+am__objects_8 =  \
 	luatexdir/luafilesystem/src/libluajitmisc_a-lfs.$(OBJEXT) \
 	luatexdir/luamd5/libluajitmisc_a-md5.$(OBJEXT) \
 	luatexdir/luamd5/libluajitmisc_a-md5lib.$(OBJEXT) \
@@ -715,11 +748,33 @@
 	luatexdir/luazlib/libluajitmisc_a-lgzip.$(OBJEXT) \
 	luatexdir/luazlib/libluajitmisc_a-lzlib.$(OBJEXT) \
 	luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT)
-nodist_libluajitmisc_a_OBJECTS = $(am__objects_7)
+nodist_libluajitmisc_a_OBJECTS = $(am__objects_8)
 libluajitmisc_a_OBJECTS = $(nodist_libluajitmisc_a_OBJECTS)
+libluajitpplib_a_AR = $(AR) $(ARFLAGS)
+libluajitpplib_a_LIBADD =
+am__objects_9 = 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-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)
+nodist_libluajitpplib_a_OBJECTS = $(am__objects_9)
+libluajitpplib_a_OBJECTS = $(nodist_libluajitpplib_a_OBJECTS)
 libluajitsocket_a_AR = $(AR) $(ARFLAGS)
 libluajitsocket_a_LIBADD =
-am__objects_8 =  \
+am__objects_10 =  \
 	luatexdir/luasocket/src/libluajitsocket_a-auxiliar.$(OBJEXT) \
 	luatexdir/luasocket/src/libluajitsocket_a-buffer.$(OBJEXT) \
 	luatexdir/luasocket/src/libluajitsocket_a-compat.$(OBJEXT) \
@@ -736,23 +791,53 @@
 	luatexdir/luasocket/src/libluajitsocket_a-tcp.$(OBJEXT) \
 	luatexdir/luasocket/src/libluajitsocket_a-timeout.$(OBJEXT) \
 	luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT)
-nodist_libluajitsocket_a_OBJECTS = $(am__objects_8)
+nodist_libluajitsocket_a_OBJECTS = $(am__objects_10)
 libluajitsocket_a_OBJECTS = $(nodist_libluajitsocket_a_OBJECTS)
 libluajittex_a_AR = $(AR) $(ARFLAGS)
 libluajittex_a_LIBADD =
 dist_libluajittex_a_OBJECTS =  \
-	luatexdir/lua/libluajittex_a-lstrlibext.$(OBJEXT)
-am__objects_9 = luatexdir/luafontloader/src/libluajittex_a-ffdummies.$(OBJEXT) \
+	luatexdir/lua/libluajittex_a-lstrlibext.$(OBJEXT) \
+	luatexdir/lua/libluajittex_a-texluajitc.$(OBJEXT)
+am__objects_11 = luatexdir/luafontloader/src/libluajittex_a-ffdummies.$(OBJEXT) \
 	luatexdir/luafontloader/src/libluajittex_a-luafflib.$(OBJEXT) \
+	luatexdir/dvi/libluajittex_a-dvigen.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-dofont.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-luafont.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-mapfile.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-pkin.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-sfnt.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-texfont.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-tfmofm.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-tounicode.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-tt_glyf.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-tt_table.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-vfovf.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-vfpacket.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-writecff.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-writeenc.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-writefont.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-writet1.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-writet3.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-writettf.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-writetype0.$(OBJEXT) \
+	luatexdir/font/libluajittex_a-writetype2.$(OBJEXT) \
+	luatexdir/image/libluajittex_a-pdftoepdf.$(OBJEXT) \
+	luatexdir/image/libluajittex_a-writeimg.$(OBJEXT) \
+	luatexdir/image/libluajittex_a-writejbig2.$(OBJEXT) \
+	luatexdir/image/libluajittex_a-writejp2.$(OBJEXT) \
+	luatexdir/image/libluajittex_a-writejpg.$(OBJEXT) \
+	luatexdir/image/libluajittex_a-writepng.$(OBJEXT) \
+	luatexdir/lang/libluajittex_a-hnjalloc.$(OBJEXT) \
+	luatexdir/lang/libluajittex_a-hyphen.$(OBJEXT) \
+	luatexdir/lang/libluajittex_a-texlang.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-lcallbacklib.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-lfontlib.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-limglib.$(OBJEXT) \
+	luatexdir/lua/libluajittex_a-lpdfelib.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-lpdfscannerlib.$(OBJEXT) \
-	luatexdir/lua/libluajittex_a-lepdflib.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-lkpselib.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-llanglib.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-llualib.$(OBJEXT) \
-	luatexdir/lua/libluajittex_a-llfslibext.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-lnodelib.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-liolibext.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-loslibext.$(OBJEXT) \
@@ -762,106 +847,79 @@
 	luatexdir/lua/libluajittex_a-ltexlib.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-lnewtokenlib.$(OBJEXT) \
 	luatexdir/lua/libluajittex_a-luatex-core.$(OBJEXT) \
+	luatexdir/lua/libluajittex_a-helpers.$(OBJEXT) \
+	luatexdir/lua/libluajittex_a-luainit.$(OBJEXT) \
+	luatexdir/lua/libluajittex_a-luanode.$(OBJEXT) \
+	luatexdir/lua/libluajittex_a-luastuff.$(OBJEXT) \
+	luatexdir/lua/libluajittex_a-luatoken.$(OBJEXT) \
+	luatexdir/lua/libluajittex_a-mplibstuff.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfaction.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfannot.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfcolorstack.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfdest.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdffont.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfgen.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfglyph.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfimage.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdflink.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdflistout.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfliteral.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfobj.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfoutline.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfpage.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfpagetree.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfrule.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfsaverestore.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfsetmatrix.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfshipout.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdftables.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfthread.$(OBJEXT) \
+	luatexdir/pdf/libluajittex_a-pdfxform.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-backend.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-align.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-arithmetic.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-buildpage.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-commands.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-conditional.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-directions.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-dumpdata.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-equivalents.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-errors.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-expand.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-extensions.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-filename.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-inputstack.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-linebreak.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-mainbody.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-maincontrol.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-mathcodes.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-memoryword.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-mlist.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-nesting.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-packaging.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-postlinebreak.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-primitive.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-printing.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-scanning.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-stringpool.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-texdeffont.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-texfileio.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-texmath.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-texnodes.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-textcodes.$(OBJEXT) \
+	luatexdir/tex/libluajittex_a-textoken.$(OBJEXT) \
 	luatexdir/utils/libluajittex_a-avl.$(OBJEXT) \
+	luatexdir/utils/libluajittex_a-avlstuff.$(OBJEXT) \
+	luatexdir/utils/libluajittex_a-managed-sa.$(OBJEXT) \
+	luatexdir/utils/libluajittex_a-unistring.$(OBJEXT) \
+	luatexdir/utils/libluajittex_a-utils.$(OBJEXT) \
 	synctexdir/libluajittex_a-synctex.$(OBJEXT)
-am__objects_10 = libluajittex_a-dvigen.$(OBJEXT) \
-	libluajittex_a-dofont.$(OBJEXT) \
-	libluajittex_a-luafont.$(OBJEXT) \
-	libluajittex_a-mapfile.$(OBJEXT) libluajittex_a-pkin.$(OBJEXT) \
-	libluajittex_a-sfnt.$(OBJEXT) libluajittex_a-texfont.$(OBJEXT) \
-	libluajittex_a-tfmofm.$(OBJEXT) \
-	libluajittex_a-tounicode.$(OBJEXT) \
-	libluajittex_a-tt_glyf.$(OBJEXT) \
-	libluajittex_a-tt_table.$(OBJEXT) \
-	libluajittex_a-vfovf.$(OBJEXT) \
-	libluajittex_a-vfpacket.$(OBJEXT) \
-	libluajittex_a-writecff.$(OBJEXT) \
-	libluajittex_a-writeenc.$(OBJEXT) \
-	libluajittex_a-writefont.$(OBJEXT) \
-	libluajittex_a-writet1.$(OBJEXT) \
-	libluajittex_a-writet3.$(OBJEXT) \
-	libluajittex_a-writettf.$(OBJEXT) \
-	libluajittex_a-writetype0.$(OBJEXT) \
-	libluajittex_a-writetype2.$(OBJEXT) \
-	libluajittex_a-writeimg.$(OBJEXT) \
-	libluajittex_a-writejbig2.$(OBJEXT) \
-	libluajittex_a-writejpg.$(OBJEXT) \
-	libluajittex_a-writejp2.$(OBJEXT) \
-	libluajittex_a-writepng.$(OBJEXT) \
-	libluajittex_a-pdftoepdf.$(OBJEXT) \
-	libluajittex_a-texlang.$(OBJEXT) \
-	libluajittex_a-hyphen.$(OBJEXT) \
-	libluajittex_a-hnjalloc.$(OBJEXT) \
-	libluajittex_a-luainit.$(OBJEXT) \
-	libluajittex_a-luanode.$(OBJEXT) \
-	libluajittex_a-luatoken.$(OBJEXT) \
-	libluajittex_a-mplibstuff.$(OBJEXT) \
-	libluajittex_a-pdfpagetree.$(OBJEXT) \
-	libluajittex_a-pdfaction.$(OBJEXT) \
-	libluajittex_a-pdfannot.$(OBJEXT) \
-	libluajittex_a-pdfcolorstack.$(OBJEXT) \
-	libluajittex_a-pdfdest.$(OBJEXT) \
-	libluajittex_a-pdffont.$(OBJEXT) \
-	libluajittex_a-pdfgen.$(OBJEXT) \
-	libluajittex_a-pdfglyph.$(OBJEXT) \
-	libluajittex_a-pdfimage.$(OBJEXT) \
-	libluajittex_a-pdflink.$(OBJEXT) \
-	libluajittex_a-pdflistout.$(OBJEXT) \
-	libluajittex_a-pdfliteral.$(OBJEXT) \
-	libluajittex_a-pdfobj.$(OBJEXT) \
-	libluajittex_a-pdfoutline.$(OBJEXT) \
-	libluajittex_a-pdfpage.$(OBJEXT) \
-	libluajittex_a-pdfrule.$(OBJEXT) \
-	libluajittex_a-pdfsaverestore.$(OBJEXT) \
-	libluajittex_a-pdfsetmatrix.$(OBJEXT) \
-	libluajittex_a-pdfshipout.$(OBJEXT) \
-	libluajittex_a-pdftables.$(OBJEXT) \
-	libluajittex_a-pdfthread.$(OBJEXT) \
-	libluajittex_a-pdfxform.$(OBJEXT) \
-	libluajittex_a-align.$(OBJEXT) \
-	libluajittex_a-arithmetic.$(OBJEXT) \
-	libluajittex_a-buildpage.$(OBJEXT) \
-	libluajittex_a-commands.$(OBJEXT) \
-	libluajittex_a-conditional.$(OBJEXT) \
-	libluajittex_a-directions.$(OBJEXT) \
-	libluajittex_a-dumpdata.$(OBJEXT) \
-	libluajittex_a-equivalents.$(OBJEXT) \
-	libluajittex_a-errors.$(OBJEXT) \
-	libluajittex_a-expand.$(OBJEXT) \
-	libluajittex_a-extensions.$(OBJEXT) \
-	libluajittex_a-filename.$(OBJEXT) \
-	libluajittex_a-inputstack.$(OBJEXT) \
-	libluajittex_a-linebreak.$(OBJEXT) \
-	libluajittex_a-mainbody.$(OBJEXT) \
-	libluajittex_a-maincontrol.$(OBJEXT) \
-	libluajittex_a-mathcodes.$(OBJEXT) \
-	libluajittex_a-memoryword.$(OBJEXT) \
-	libluajittex_a-mlist.$(OBJEXT) \
-	libluajittex_a-nesting.$(OBJEXT) \
-	libluajittex_a-packaging.$(OBJEXT) \
-	libluajittex_a-postlinebreak.$(OBJEXT) \
-	libluajittex_a-primitive.$(OBJEXT) \
-	libluajittex_a-printing.$(OBJEXT) \
-	libluajittex_a-scanning.$(OBJEXT) \
-	libluajittex_a-stringpool.$(OBJEXT) \
-	libluajittex_a-texdeffont.$(OBJEXT) \
-	libluajittex_a-texfileio.$(OBJEXT) \
-	libluajittex_a-texmath.$(OBJEXT) \
-	libluajittex_a-texnodes.$(OBJEXT) \
-	libluajittex_a-textcodes.$(OBJEXT) \
-	libluajittex_a-textoken.$(OBJEXT) \
-	libluajittex_a-avlstuff.$(OBJEXT) \
-	libluajittex_a-managed-sa.$(OBJEXT) \
-	libluajittex_a-utils.$(OBJEXT) \
-	libluajittex_a-unistring.$(OBJEXT)
-nodist_libluajittex_a_OBJECTS = libluajittex_a-luastuff.$(OBJEXT) \
-	libluajittex_a-texluajitc.$(OBJEXT) $(am__objects_9) \
-	$(am__objects_10)
+nodist_libluajittex_a_OBJECTS = $(am__objects_11) $(am__objects_6)
 libluajittex_a_OBJECTS = $(dist_libluajittex_a_OBJECTS) \
 	$(nodist_libluajittex_a_OBJECTS)
 libluamisc_a_AR = $(AR) $(ARFLAGS)
 libluamisc_a_LIBADD =
-am__objects_11 =  \
+am__objects_12 =  \
 	luatexdir/luafilesystem/src/libluamisc_a-lfs.$(OBJEXT) \
 	luatexdir/luamd5/libluamisc_a-md5.$(OBJEXT) \
 	luatexdir/luamd5/libluamisc_a-md5lib.$(OBJEXT) \
@@ -870,11 +928,33 @@
 	luatexdir/luazlib/libluamisc_a-lgzip.$(OBJEXT) \
 	luatexdir/luazlib/libluamisc_a-lzlib.$(OBJEXT) \
 	luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT)
-nodist_libluamisc_a_OBJECTS = $(am__objects_11)
+nodist_libluamisc_a_OBJECTS = $(am__objects_12)
 libluamisc_a_OBJECTS = $(nodist_libluamisc_a_OBJECTS)
+libluapplib_a_AR = $(AR) $(ARFLAGS)
+libluapplib_a_LIBADD =
+am__objects_13 = 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-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)
+nodist_libluapplib_a_OBJECTS = $(am__objects_13)
+libluapplib_a_OBJECTS = $(nodist_libluapplib_a_OBJECTS)
 libluasocket_a_AR = $(AR) $(ARFLAGS)
 libluasocket_a_LIBADD =
-am__objects_12 =  \
+am__objects_14 =  \
 	luatexdir/luasocket/src/libluasocket_a-auxiliar.$(OBJEXT) \
 	luatexdir/luasocket/src/libluasocket_a-buffer.$(OBJEXT) \
 	luatexdir/luasocket/src/libluasocket_a-compat.$(OBJEXT) \
@@ -891,24 +971,55 @@
 	luatexdir/luasocket/src/libluasocket_a-tcp.$(OBJEXT) \
 	luatexdir/luasocket/src/libluasocket_a-timeout.$(OBJEXT) \
 	luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT)
-nodist_libluasocket_a_OBJECTS = $(am__objects_12)
+nodist_libluasocket_a_OBJECTS = $(am__objects_14)
 libluasocket_a_OBJECTS = $(nodist_libluasocket_a_OBJECTS)
 libluatex_a_AR = $(AR) $(ARFLAGS)
 libluatex_a_LIBADD =
 dist_libluatex_a_OBJECTS =  \
-	luatexdir/lua/libluatex_a-lstrlibext.$(OBJEXT)
-am__objects_13 =  \
+	luatexdir/lua/libluatex_a-lstrlibext.$(OBJEXT) \
+	luatexdir/lua/libluatex_a-helpers.$(OBJEXT) \
+	luatexdir/lua/libluatex_a-texluac.$(OBJEXT)
+am__objects_15 =  \
 	luatexdir/luafontloader/src/libluatex_a-ffdummies.$(OBJEXT) \
 	luatexdir/luafontloader/src/libluatex_a-luafflib.$(OBJEXT) \
+	luatexdir/dvi/libluatex_a-dvigen.$(OBJEXT) \
+	luatexdir/font/libluatex_a-dofont.$(OBJEXT) \
+	luatexdir/font/libluatex_a-luafont.$(OBJEXT) \
+	luatexdir/font/libluatex_a-mapfile.$(OBJEXT) \
+	luatexdir/font/libluatex_a-pkin.$(OBJEXT) \
+	luatexdir/font/libluatex_a-sfnt.$(OBJEXT) \
+	luatexdir/font/libluatex_a-texfont.$(OBJEXT) \
+	luatexdir/font/libluatex_a-tfmofm.$(OBJEXT) \
+	luatexdir/font/libluatex_a-tounicode.$(OBJEXT) \
+	luatexdir/font/libluatex_a-tt_glyf.$(OBJEXT) \
+	luatexdir/font/libluatex_a-tt_table.$(OBJEXT) \
+	luatexdir/font/libluatex_a-vfovf.$(OBJEXT) \
+	luatexdir/font/libluatex_a-vfpacket.$(OBJEXT) \
+	luatexdir/font/libluatex_a-writecff.$(OBJEXT) \
+	luatexdir/font/libluatex_a-writeenc.$(OBJEXT) \
+	luatexdir/font/libluatex_a-writefont.$(OBJEXT) \
+	luatexdir/font/libluatex_a-writet1.$(OBJEXT) \
+	luatexdir/font/libluatex_a-writet3.$(OBJEXT) \
+	luatexdir/font/libluatex_a-writettf.$(OBJEXT) \
+	luatexdir/font/libluatex_a-writetype0.$(OBJEXT) \
+	luatexdir/font/libluatex_a-writetype2.$(OBJEXT) \
+	luatexdir/image/libluatex_a-pdftoepdf.$(OBJEXT) \
+	luatexdir/image/libluatex_a-writeimg.$(OBJEXT) \
+	luatexdir/image/libluatex_a-writejbig2.$(OBJEXT) \
+	luatexdir/image/libluatex_a-writejp2.$(OBJEXT) \
+	luatexdir/image/libluatex_a-writejpg.$(OBJEXT) \
+	luatexdir/image/libluatex_a-writepng.$(OBJEXT) \
+	luatexdir/lang/libluatex_a-hnjalloc.$(OBJEXT) \
+	luatexdir/lang/libluatex_a-hyphen.$(OBJEXT) \
+	luatexdir/lang/libluatex_a-texlang.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-lcallbacklib.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-lfontlib.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-limglib.$(OBJEXT) \
+	luatexdir/lua/libluatex_a-lpdfelib.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-lpdfscannerlib.$(OBJEXT) \
-	luatexdir/lua/libluatex_a-lepdflib.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-lkpselib.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-llanglib.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-llualib.$(OBJEXT) \
-	luatexdir/lua/libluatex_a-llfslibext.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-lnodelib.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-liolibext.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-loslibext.$(OBJEXT) \
@@ -918,70 +1029,74 @@
 	luatexdir/lua/libluatex_a-ltexlib.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-lnewtokenlib.$(OBJEXT) \
 	luatexdir/lua/libluatex_a-luatex-core.$(OBJEXT) \
+	luatexdir/lua/libluatex_a-helpers.$(OBJEXT) \
+	luatexdir/lua/libluatex_a-luainit.$(OBJEXT) \
+	luatexdir/lua/libluatex_a-luanode.$(OBJEXT) \
+	luatexdir/lua/libluatex_a-luastuff.$(OBJEXT) \
+	luatexdir/lua/libluatex_a-luatoken.$(OBJEXT) \
+	luatexdir/lua/libluatex_a-mplibstuff.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfaction.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfannot.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfcolorstack.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfdest.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdffont.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfgen.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfglyph.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfimage.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdflink.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdflistout.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfliteral.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfobj.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfoutline.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfpage.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfpagetree.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfrule.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfsaverestore.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfsetmatrix.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfshipout.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdftables.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfthread.$(OBJEXT) \
+	luatexdir/pdf/libluatex_a-pdfxform.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-backend.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-align.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-arithmetic.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-buildpage.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-commands.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-conditional.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-directions.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-dumpdata.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-equivalents.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-errors.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-expand.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-extensions.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-filename.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-inputstack.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-linebreak.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-mainbody.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-maincontrol.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-mathcodes.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-memoryword.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-mlist.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-nesting.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-packaging.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-postlinebreak.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-primitive.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-printing.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-scanning.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-stringpool.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-texdeffont.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-texfileio.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-texmath.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-texnodes.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-textcodes.$(OBJEXT) \
+	luatexdir/tex/libluatex_a-textoken.$(OBJEXT) \
 	luatexdir/utils/libluatex_a-avl.$(OBJEXT) \
+	luatexdir/utils/libluatex_a-avlstuff.$(OBJEXT) \
+	luatexdir/utils/libluatex_a-managed-sa.$(OBJEXT) \
+	luatexdir/utils/libluatex_a-unistring.$(OBJEXT) \
+	luatexdir/utils/libluatex_a-utils.$(OBJEXT) \
 	synctexdir/libluatex_a-synctex.$(OBJEXT)
-am__objects_14 = libluatex_a-dvigen.$(OBJEXT) \
-	libluatex_a-dofont.$(OBJEXT) libluatex_a-luafont.$(OBJEXT) \
-	libluatex_a-mapfile.$(OBJEXT) libluatex_a-pkin.$(OBJEXT) \
-	libluatex_a-sfnt.$(OBJEXT) libluatex_a-texfont.$(OBJEXT) \
-	libluatex_a-tfmofm.$(OBJEXT) libluatex_a-tounicode.$(OBJEXT) \
-	libluatex_a-tt_glyf.$(OBJEXT) libluatex_a-tt_table.$(OBJEXT) \
-	libluatex_a-vfovf.$(OBJEXT) libluatex_a-vfpacket.$(OBJEXT) \
-	libluatex_a-writecff.$(OBJEXT) libluatex_a-writeenc.$(OBJEXT) \
-	libluatex_a-writefont.$(OBJEXT) libluatex_a-writet1.$(OBJEXT) \
-	libluatex_a-writet3.$(OBJEXT) libluatex_a-writettf.$(OBJEXT) \
-	libluatex_a-writetype0.$(OBJEXT) \
-	libluatex_a-writetype2.$(OBJEXT) \
-	libluatex_a-writeimg.$(OBJEXT) \
-	libluatex_a-writejbig2.$(OBJEXT) \
-	libluatex_a-writejpg.$(OBJEXT) libluatex_a-writejp2.$(OBJEXT) \
-	libluatex_a-writepng.$(OBJEXT) libluatex_a-pdftoepdf.$(OBJEXT) \
-	libluatex_a-texlang.$(OBJEXT) libluatex_a-hyphen.$(OBJEXT) \
-	libluatex_a-hnjalloc.$(OBJEXT) libluatex_a-luainit.$(OBJEXT) \
-	libluatex_a-luanode.$(OBJEXT) libluatex_a-luatoken.$(OBJEXT) \
-	libluatex_a-mplibstuff.$(OBJEXT) \
-	libluatex_a-pdfpagetree.$(OBJEXT) \
-	libluatex_a-pdfaction.$(OBJEXT) libluatex_a-pdfannot.$(OBJEXT) \
-	libluatex_a-pdfcolorstack.$(OBJEXT) \
-	libluatex_a-pdfdest.$(OBJEXT) libluatex_a-pdffont.$(OBJEXT) \
-	libluatex_a-pdfgen.$(OBJEXT) libluatex_a-pdfglyph.$(OBJEXT) \
-	libluatex_a-pdfimage.$(OBJEXT) libluatex_a-pdflink.$(OBJEXT) \
-	libluatex_a-pdflistout.$(OBJEXT) \
-	libluatex_a-pdfliteral.$(OBJEXT) libluatex_a-pdfobj.$(OBJEXT) \
-	libluatex_a-pdfoutline.$(OBJEXT) libluatex_a-pdfpage.$(OBJEXT) \
-	libluatex_a-pdfrule.$(OBJEXT) \
-	libluatex_a-pdfsaverestore.$(OBJEXT) \
-	libluatex_a-pdfsetmatrix.$(OBJEXT) \
-	libluatex_a-pdfshipout.$(OBJEXT) \
-	libluatex_a-pdftables.$(OBJEXT) \
-	libluatex_a-pdfthread.$(OBJEXT) libluatex_a-pdfxform.$(OBJEXT) \
-	libluatex_a-align.$(OBJEXT) libluatex_a-arithmetic.$(OBJEXT) \
-	libluatex_a-buildpage.$(OBJEXT) libluatex_a-commands.$(OBJEXT) \
-	libluatex_a-conditional.$(OBJEXT) \
-	libluatex_a-directions.$(OBJEXT) \
-	libluatex_a-dumpdata.$(OBJEXT) \
-	libluatex_a-equivalents.$(OBJEXT) libluatex_a-errors.$(OBJEXT) \
-	libluatex_a-expand.$(OBJEXT) libluatex_a-extensions.$(OBJEXT) \
-	libluatex_a-filename.$(OBJEXT) \
-	libluatex_a-inputstack.$(OBJEXT) \
-	libluatex_a-linebreak.$(OBJEXT) libluatex_a-mainbody.$(OBJEXT) \
-	libluatex_a-maincontrol.$(OBJEXT) \
-	libluatex_a-mathcodes.$(OBJEXT) \
-	libluatex_a-memoryword.$(OBJEXT) libluatex_a-mlist.$(OBJEXT) \
-	libluatex_a-nesting.$(OBJEXT) libluatex_a-packaging.$(OBJEXT) \
-	libluatex_a-postlinebreak.$(OBJEXT) \
-	libluatex_a-primitive.$(OBJEXT) libluatex_a-printing.$(OBJEXT) \
-	libluatex_a-scanning.$(OBJEXT) \
-	libluatex_a-stringpool.$(OBJEXT) \
-	libluatex_a-texdeffont.$(OBJEXT) \
-	libluatex_a-texfileio.$(OBJEXT) libluatex_a-texmath.$(OBJEXT) \
-	libluatex_a-texnodes.$(OBJEXT) libluatex_a-textcodes.$(OBJEXT) \
-	libluatex_a-textoken.$(OBJEXT) libluatex_a-avlstuff.$(OBJEXT) \
-	libluatex_a-managed-sa.$(OBJEXT) libluatex_a-utils.$(OBJEXT) \
-	libluatex_a-unistring.$(OBJEXT)
-nodist_libluatex_a_OBJECTS = libluatex_a-helpers.$(OBJEXT) \
-	libluatex_a-luastuff.$(OBJEXT) libluatex_a-texluac.$(OBJEXT) \
-	$(am__objects_13) $(am__objects_14)
+nodist_libluatex_a_OBJECTS = $(am__objects_15) $(am__objects_6)
 libluatex_a_OBJECTS = $(dist_libluatex_a_OBJECTS) \
 	$(nodist_libluatex_a_OBJECTS)
 libmd5_a_AR = $(AR) $(ARFLAGS)
@@ -990,16 +1105,16 @@
 libmd5_a_OBJECTS = $(am_libmd5_a_OBJECTS)
 libmf_a_AR = $(AR) $(ARFLAGS)
 libmf_a_LIBADD =
-am__objects_15 = mfini.$(OBJEXT) mf0.$(OBJEXT)
-nodist_libmf_a_OBJECTS = $(am__objects_15) mf-pool.$(OBJEXT)
+am__objects_16 = mfini.$(OBJEXT) mf0.$(OBJEXT)
+nodist_libmf_a_OBJECTS = $(am__objects_16) mf-pool.$(OBJEXT)
 libmf_a_OBJECTS = $(nodist_libmf_a_OBJECTS)
 libmflua_a_AR = $(AR) $(ARFLAGS)
 libmflua_a_LIBADD =
 dist_libmflua_a_OBJECTS = luatexdir/lua/libmflua_a-lkpselib.$(OBJEXT) \
 	mfluadir/libmflua_a-mfluac.$(OBJEXT)
-am__objects_16 = libmflua_a-mfluaini.$(OBJEXT) \
+am__objects_17 = libmflua_a-mfluaini.$(OBJEXT) \
 	libmflua_a-mflua0.$(OBJEXT)
-nodist_libmflua_a_OBJECTS = $(am__objects_16) \
+nodist_libmflua_a_OBJECTS = $(am__objects_17) \
 	libmflua_a-mflua-pool.$(OBJEXT)
 libmflua_a_OBJECTS = $(dist_libmflua_a_OBJECTS) \
 	$(nodist_libmflua_a_OBJECTS)
@@ -1008,33 +1123,36 @@
 dist_libmfluajit_a_OBJECTS =  \
 	luatexdir/lua/libmfluajit_a-lkpselib.$(OBJEXT) \
 	mfluadir/libmfluajit_a-mfluac.$(OBJEXT)
-am__objects_17 = libmfluajit_a-mfluajitini.$(OBJEXT) \
+am__objects_18 = libmfluajit_a-mfluajitini.$(OBJEXT) \
 	libmfluajit_a-mfluajit0.$(OBJEXT)
-nodist_libmfluajit_a_OBJECTS = $(am__objects_17) \
+nodist_libmfluajit_a_OBJECTS = $(am__objects_18) \
 	libmfluajit_a-mfluajit-pool.$(OBJEXT)
 libmfluajit_a_OBJECTS = $(dist_libmfluajit_a_OBJECTS) \
 	$(nodist_libmfluajit_a_OBJECTS)
 libmplibbackends_a_AR = $(AR) $(ARFLAGS)
 libmplibbackends_a_LIBADD =
-am__objects_18 = libmplibbackends_a-pngout.$(OBJEXT)
-am__objects_19 = libmplibbackends_a-svgout.$(OBJEXT)
-nodist_libmplibbackends_a_OBJECTS = $(am__objects_18) \
-	$(am__objects_19)
+am__objects_19 = libmplibbackends_a-pngout.$(OBJEXT)
+am__objects_20 = libmplibbackends_a-svgout.$(OBJEXT)
+nodist_libmplibbackends_a_OBJECTS = $(am__objects_19) \
+	$(am__objects_20)
 libmplibbackends_a_OBJECTS = $(nodist_libmplibbackends_a_OBJECTS)
 libmplibcore_a_AR = $(AR) $(ARFLAGS)
 libmplibcore_a_LIBADD =
-am__objects_20 = libmplibcore_a-mp.$(OBJEXT)
-am__objects_21 = libmplibcore_a-mpmath.$(OBJEXT)
-am__objects_22 = libmplibcore_a-mpmathbinary.$(OBJEXT)
+am__objects_21 = libmplibcore_a-mp.$(OBJEXT)
+am__objects_22 = libmplibcore_a-mpmath.$(OBJEXT)
 am__objects_23 = libmplibcore_a-mpmathdecimal.$(OBJEXT)
 am__objects_24 = libmplibcore_a-mpmathdouble.$(OBJEXT)
 am__objects_25 = libmplibcore_a-mpstrings.$(OBJEXT)
 am__objects_26 = libmplibcore_a-psout.$(OBJEXT)
 nodist_libmplibcore_a_OBJECTS = libmplibcore_a-tfmin.$(OBJEXT) \
-	$(am__objects_20) $(am__objects_21) $(am__objects_22) \
-	$(am__objects_23) $(am__objects_24) $(am__objects_25) \
-	$(am__objects_26)
+	$(am__objects_21) $(am__objects_22) $(am__objects_23) \
+	$(am__objects_24) $(am__objects_25) $(am__objects_26)
 libmplibcore_a_OBJECTS = $(nodist_libmplibcore_a_OBJECTS)
+libmplibextramath_a_AR = $(AR) $(ARFLAGS)
+libmplibextramath_a_LIBADD =
+am__objects_27 = libmplibextramath_a-mpmathbinary.$(OBJEXT)
+nodist_libmplibextramath_a_OBJECTS = $(am__objects_27)
+libmplibextramath_a_OBJECTS = $(nodist_libmplibextramath_a_OBJECTS)
 libmputil_a_AR = $(AR) $(ARFLAGS)
 libmputil_a_LIBADD =
 am_libmputil_a_OBJECTS = mplibdir/libmputil_a-avl.$(OBJEXT) \
@@ -1055,7 +1173,7 @@
 	pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
 	pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
 	pdftexdir/regex/regex.c pdftexdir/regex/regex.h
- at MINGW32_TRUE@am__objects_27 =  \
+ at MINGW32_TRUE@am__objects_28 =  \
 @MINGW32_TRUE@	pdftexdir/regex/libpdftex_a-regex.$(OBJEXT)
 am_libpdftex_a_OBJECTS = pdftexdir/libpdftex_a-avl.$(OBJEXT) \
 	pdftexdir/libpdftex_a-avlstuff.$(OBJEXT) \
@@ -1076,13 +1194,13 @@
 	pdftexdir/libpdftex_a-writet1.$(OBJEXT) \
 	pdftexdir/libpdftex_a-writet3.$(OBJEXT) \
 	pdftexdir/libpdftex_a-writettf.$(OBJEXT) \
-	pdftexdir/libpdftex_a-writezip.$(OBJEXT) $(am__objects_27)
+	pdftexdir/libpdftex_a-writezip.$(OBJEXT) $(am__objects_28)
 libpdftex_a_OBJECTS = $(am_libpdftex_a_OBJECTS)
 libsynctex_a_AR = $(AR) $(ARFLAGS)
 libsynctex_a_LIBADD =
-am__objects_28 = synctexdir/libsynctex_a-synctex_parser.$(OBJEXT) \
+am__objects_29 = synctexdir/libsynctex_a-synctex_parser.$(OBJEXT) \
 	synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT)
-nodist_libsynctex_a_OBJECTS = $(am__objects_28)
+nodist_libsynctex_a_OBJECTS = $(am__objects_29)
 libsynctex_a_OBJECTS = $(nodist_libsynctex_a_OBJECTS)
 libukanji_a_AR = $(AR) $(ARFLAGS)
 libukanji_a_LIBADD =
@@ -1122,10 +1240,10 @@
 	xetexdir/XeTeXFontInst_Mac.h xetexdir/XeTeXFontMgr_Mac.mm \
 	xetexdir/XeTeXFontMgr_Mac.h xetexdir/XeTeX_mac.c \
 	xetexdir/XeTeXFontMgr_FC.cpp xetexdir/XeTeXFontMgr_FC.h
- at XETEX_MACOSX_TRUE@am__objects_29 = xetexdir/libxetex_a-XeTeXFontInst_Mac.$(OBJEXT) \
+ at XETEX_MACOSX_TRUE@am__objects_30 = xetexdir/libxetex_a-XeTeXFontInst_Mac.$(OBJEXT) \
 @XETEX_MACOSX_TRUE@	xetexdir/libxetex_a-XeTeXFontMgr_Mac.$(OBJEXT) \
 @XETEX_MACOSX_TRUE@	xetexdir/libxetex_a-XeTeX_mac.$(OBJEXT)
- at XETEX_MACOSX_FALSE@am__objects_30 = xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT)
+ at XETEX_MACOSX_FALSE@am__objects_31 = xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT)
 am_libxetex_a_OBJECTS = xetexdir/libxetex_a-XeTeXFontInst.$(OBJEXT) \
 	xetexdir/libxetex_a-XeTeXFontMgr.$(OBJEXT) \
 	xetexdir/libxetex_a-XeTeXLayoutInterface.$(OBJEXT) \
@@ -1139,8 +1257,8 @@
 	xetexdir/image/libxetex_a-jpegimage.$(OBJEXT) \
 	xetexdir/image/libxetex_a-mfileio.$(OBJEXT) \
 	xetexdir/image/libxetex_a-numbers.$(OBJEXT) \
-	xetexdir/image/libxetex_a-pngimage.$(OBJEXT) $(am__objects_29) \
-	$(am__objects_30)
+	xetexdir/image/libxetex_a-pngimage.$(OBJEXT) $(am__objects_30) \
+	$(am__objects_31)
 libxetex_a_OBJECTS = $(am_libxetex_a_OBJECTS)
 am__DEPENDENCIES_1 =
 libsynctex_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -1158,8 +1276,8 @@
 dist_aleph_OBJECTS = alephdir/aleph-aleph.$(OBJEXT) \
 	alephdir/aleph-alephbis.$(OBJEXT) \
 	alephdir/aleph-alephextra.$(OBJEXT)
-am__objects_31 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
-nodist_aleph_OBJECTS = $(am__objects_31) aleph-aleph-pool.$(OBJEXT)
+am__objects_32 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
+nodist_aleph_OBJECTS = $(am__objects_32) aleph-aleph-pool.$(OBJEXT)
 aleph_OBJECTS = $(dist_aleph_OBJECTS) $(nodist_aleph_OBJECTS)
 am__DEPENDENCIES_2 = $(proglib) $(am__DEPENDENCIES_1)
 aleph_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
@@ -1221,12 +1339,12 @@
 	eptexdir/eptexextra.h eptexdir/eptex_version.h \
 	synctexdir/synctex.c synctexdir/synctex.h \
 	synctexdir/synctex-common.h synctexdir/synctex-eptex.h
- at EPTEX_SYNCTEX_TRUE@am__objects_32 =  \
+ at EPTEX_SYNCTEX_TRUE@am__objects_33 =  \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/eptex-synctex.$(OBJEXT)
 dist_eptex_OBJECTS = eptexdir/eptex-eptexextra.$(OBJEXT) \
-	$(am__objects_32)
-am__objects_33 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
-nodist_eptex_OBJECTS = $(am__objects_33) eptex-eptex-pool.$(OBJEXT)
+	$(am__objects_33)
+am__objects_34 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
+nodist_eptex_OBJECTS = $(am__objects_34) eptex-eptex-pool.$(OBJEXT)
 eptex_OBJECTS = $(dist_eptex_OBJECTS) $(nodist_eptex_OBJECTS)
 @EPTEX_SYNCTEX_TRUE at am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
 am__dist_etex_SOURCES_DIST = etexdir/etexextra.c etexdir/etexextra.h \
@@ -1233,10 +1351,10 @@
 	etexdir/etex_version.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-etex.h
- at ETEX_SYNCTEX_TRUE@am__objects_34 = synctexdir/etex-synctex.$(OBJEXT)
-dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_34)
-am__objects_35 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
-nodist_etex_OBJECTS = $(am__objects_35) etex-etex-pool.$(OBJEXT)
+ at ETEX_SYNCTEX_TRUE@am__objects_35 = synctexdir/etex-synctex.$(OBJEXT)
+dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_35)
+am__objects_36 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
+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) \
@@ -1245,12 +1363,12 @@
 	euptexdir/euptexextra.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-euptex.h
- at EUPTEX_SYNCTEX_TRUE@am__objects_36 =  \
+ at EUPTEX_SYNCTEX_TRUE@am__objects_37 =  \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/euptex-synctex.$(OBJEXT)
 dist_euptex_OBJECTS = euptexdir/euptex-euptexextra.$(OBJEXT) \
-	$(am__objects_36)
-am__objects_37 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
-nodist_euptex_OBJECTS = $(am__objects_37) euptex-euptex-pool.$(OBJEXT)
+	$(am__objects_37)
+am__objects_38 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
+nodist_euptex_OBJECTS = $(am__objects_38) euptex-euptex-pool.$(OBJEXT)
 euptex_OBJECTS = $(dist_euptex_OBJECTS) $(nodist_euptex_OBJECTS)
 @EUPTEX_SYNCTEX_TRUE at am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
 am_gftodvi_OBJECTS =
@@ -1269,33 +1387,32 @@
 nodist_initex_OBJECTS = initex-callexe.$(OBJEXT)
 initex_OBJECTS = $(nodist_initex_OBJECTS)
 initex_DEPENDENCIES =
-am__objects_38 = luatexdir/luajittex-luatex.$(OBJEXT) \
+am__objects_39 = luatexdir/luajittex-luatex.$(OBJEXT) \
 	mplibdir/luajittex-lmplib.$(OBJEXT)
-nodist_luajittex_OBJECTS = $(am__objects_38)
+nodist_luajittex_OBJECTS = $(am__objects_39)
 luajittex_OBJECTS = $(nodist_luajittex_OBJECTS)
 am__DEPENDENCIES_6 = libmplibcore.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) libmputil.a \
-	libunilib.a libmd5.a $(am__DEPENDENCIES_1)
-luajittex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luajittex_CXXFLAGS) \
-	$(CXXFLAGS) $(luajittex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_39 = luatexdir/luatex-luatex.$(OBJEXT) \
+	$(am__DEPENDENCIES_2) libmputil.a libunilib.a libmd5.a \
+	$(am__DEPENDENCIES_1)
+luajittex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(luajittex_LDFLAGS) $(LDFLAGS) -o $@
+am__objects_40 = luatexdir/luatex-luatex.$(OBJEXT) \
 	mplibdir/luatex-lmplib.$(OBJEXT)
-nodist_luatex_OBJECTS = $(am__objects_39)
+nodist_luatex_OBJECTS = $(am__objects_40)
 luatex_OBJECTS = $(nodist_luatex_OBJECTS)
 am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
-luatex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luatex_CXXFLAGS) \
-	$(CXXFLAGS) $(luatex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_40 = luatexdir/luatex53-luatex.$(OBJEXT) \
+luatex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(luatex_LDFLAGS) $(LDFLAGS) -o $@
+am__objects_41 = luatexdir/luatex53-luatex.$(OBJEXT) \
 	mplibdir/luatex53-lmplib.$(OBJEXT)
-nodist_luatex53_OBJECTS = $(am__objects_40)
+nodist_luatex53_OBJECTS = $(am__objects_41)
 luatex53_OBJECTS = $(nodist_luatex53_OBJECTS)
-luatex53_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luatex53_CXXFLAGS) \
-	$(CXXFLAGS) $(luatex53_LDFLAGS) $(LDFLAGS) -o $@
+luatex53_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(luatex53_LDFLAGS) $(LDFLAGS) -o $@
 am_md5main_OBJECTS = libmd5/md5main-md5main.$(OBJEXT)
 md5main_OBJECTS = $(am_md5main_OBJECTS)
 md5main_DEPENDENCIES = libmd5.a
@@ -1317,8 +1434,8 @@
 mflua_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(mflua_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_41 = mfluadir/mflua_nowin-mfluaextra.$(OBJEXT)
-nodist_mflua_nowin_OBJECTS = $(am__objects_41)
+am__objects_42 = mfluadir/mflua_nowin-mfluaextra.$(OBJEXT)
+nodist_mflua_nowin_OBJECTS = $(am__objects_42)
 mflua_nowin_OBJECTS = $(nodist_mflua_nowin_OBJECTS)
 mflua_nowin_DEPENDENCIES = libmflua.a $(am__DEPENDENCIES_2) \
 	$(windowlib) $(am__DEPENDENCIES_7)
@@ -1332,8 +1449,8 @@
 mfluajit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(mfluajit_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_42 = mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT)
-nodist_mfluajit_nowin_OBJECTS = $(am__objects_42)
+am__objects_43 = mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT)
+nodist_mfluajit_nowin_OBJECTS = $(am__objects_43)
 mfluajit_nowin_OBJECTS = $(nodist_mfluajit_nowin_OBJECTS)
 mfluajit_nowin_DEPENDENCIES = libmfluajit.a $(am__DEPENDENCIES_2) \
 	$(windowlib) $(am__DEPENDENCIES_1)
@@ -1345,13 +1462,13 @@
 mft_OBJECTS = $(nodist_mft_OBJECTS)
 mft_LDADD = $(LDADD)
 mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_43 = mpost-mpxout.$(OBJEXT)
-nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_43)
+am__objects_44 = mpost-mpxout.$(OBJEXT)
+nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_44)
 mpost_OBJECTS = $(nodist_mpost_OBJECTS)
-mpost_DEPENDENCIES = libmplibcore.a libmplibbackends.a \
+mpost_DEPENDENCIES = libmplibcore.a libmplibextramath.a \
+	libmplibbackends.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) libmputil.a
 nodist_odvicopy_OBJECTS = odvicopy.$(OBJEXT)
 odvicopy_OBJECTS = $(nodist_odvicopy_OBJECTS)
@@ -1379,12 +1496,12 @@
 	pdftexdir/etex_version.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-pdftex.h
- at PDFTEX_SYNCTEX_TRUE@am__objects_44 =  \
+ at PDFTEX_SYNCTEX_TRUE@am__objects_45 =  \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/pdftex-synctex.$(OBJEXT)
 dist_pdftex_OBJECTS = pdftexdir/pdftex-pdftexextra.$(OBJEXT) \
-	$(am__objects_44)
-am__objects_45 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
-nodist_pdftex_OBJECTS = $(am__objects_45) pdftex-pdftex-pool.$(OBJEXT)
+	$(am__objects_45)
+am__objects_46 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_46) pdftex-pdftex-pool.$(OBJEXT)
 pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
 am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) libmd5.a
@@ -1411,20 +1528,20 @@
 pltotf_OBJECTS = $(nodist_pltotf_OBJECTS)
 pltotf_LDADD = $(LDADD)
 pltotf_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_46 = pmpost-pmp.$(OBJEXT)
-am__objects_47 = pmpost-pmpmath.$(OBJEXT)
-am__objects_48 = pmpost-pmpmathbinary.$(OBJEXT)
-am__objects_49 = pmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_50 = pmpost-pmpmathdouble.$(OBJEXT)
-am__objects_51 = pmpost-pmpstrings.$(OBJEXT)
-am__objects_52 = pmpost-pmpxout.$(OBJEXT)
-am__objects_53 = pmpost-ppngout.$(OBJEXT)
-am__objects_54 = pmpost-ppsout.$(OBJEXT)
-am__objects_55 = pmpost-psvgout.$(OBJEXT)
-nodist_pmpost_OBJECTS = $(am__objects_46) $(am__objects_47) \
-	$(am__objects_48) $(am__objects_49) $(am__objects_50) \
-	pmpost-pmpost.$(OBJEXT) $(am__objects_51) $(am__objects_52) \
-	$(am__objects_53) $(am__objects_54) $(am__objects_55) \
+am__objects_47 = pmpost-pmp.$(OBJEXT)
+am__objects_48 = pmpost-pmpmath.$(OBJEXT)
+am__objects_49 = pmpost-pmpmathbinary.$(OBJEXT)
+am__objects_50 = pmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_51 = pmpost-pmpmathdouble.$(OBJEXT)
+am__objects_52 = pmpost-pmpstrings.$(OBJEXT)
+am__objects_53 = pmpost-pmpxout.$(OBJEXT)
+am__objects_54 = pmpost-ppngout.$(OBJEXT)
+am__objects_55 = pmpost-ppsout.$(OBJEXT)
+am__objects_56 = pmpost-psvgout.$(OBJEXT)
+nodist_pmpost_OBJECTS = $(am__objects_47) $(am__objects_48) \
+	$(am__objects_49) $(am__objects_50) $(am__objects_51) \
+	pmpost-pmpost.$(OBJEXT) $(am__objects_52) $(am__objects_53) \
+	$(am__objects_54) $(am__objects_55) $(am__objects_56) \
 	pmpost-ptfmin.$(OBJEXT)
 pmpost_OBJECTS = $(nodist_pmpost_OBJECTS)
 pmpost_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1442,10 +1559,10 @@
 	ptexdir/ptex_version.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-ptex.h
- at PTEX_SYNCTEX_TRUE@am__objects_56 = synctexdir/ptex-synctex.$(OBJEXT)
-dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_56)
-am__objects_57 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_57) ptex-ptex-pool.$(OBJEXT)
+ at PTEX_SYNCTEX_TRUE@am__objects_57 = synctexdir/ptex-synctex.$(OBJEXT)
+dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_57)
+am__objects_58 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_58) ptex-ptex-pool.$(OBJEXT)
 ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
 @PTEX_SYNCTEX_TRUE at am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
 am_ptftopl_OBJECTS =
@@ -1466,10 +1583,10 @@
 am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-tex.h
- at TEX_SYNCTEX_TRUE@am__objects_58 = synctexdir/tex-synctex.$(OBJEXT)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_58)
-am__objects_59 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_59) tex-tex-pool.$(OBJEXT)
+ at TEX_SYNCTEX_TRUE@am__objects_59 = synctexdir/tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_59)
+am__objects_60 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_60) tex-tex-pool.$(OBJEXT)
 tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
 @TEX_SYNCTEX_TRUE at am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
 tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -1494,21 +1611,21 @@
 nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT)
 updvitype_OBJECTS = $(am_updvitype_OBJECTS) \
 	$(nodist_updvitype_OBJECTS)
-am__objects_60 = upmpost-pmp.$(OBJEXT)
-am__objects_61 = upmpost-pmpmath.$(OBJEXT)
-am__objects_62 = upmpost-pmpmathbinary.$(OBJEXT)
-am__objects_63 = upmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_64 = upmpost-pmpmathdouble.$(OBJEXT)
-am__objects_65 = upmpost-pmpstrings.$(OBJEXT)
-am__objects_66 = upmpost-pmpxout.$(OBJEXT)
-am__objects_67 = upmpost-ppngout.$(OBJEXT)
-am__objects_68 = upmpost-ppsout.$(OBJEXT)
-am__objects_69 = upmpost-psvgout.$(OBJEXT)
-am__objects_70 = $(am__objects_60) $(am__objects_61) $(am__objects_62) \
-	$(am__objects_63) $(am__objects_64) upmpost-pmpost.$(OBJEXT) \
-	$(am__objects_65) $(am__objects_66) $(am__objects_67) \
-	$(am__objects_68) $(am__objects_69) upmpost-ptfmin.$(OBJEXT)
-nodist_upmpost_OBJECTS = $(am__objects_70)
+am__objects_61 = upmpost-pmp.$(OBJEXT)
+am__objects_62 = upmpost-pmpmath.$(OBJEXT)
+am__objects_63 = upmpost-pmpmathbinary.$(OBJEXT)
+am__objects_64 = upmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_65 = upmpost-pmpmathdouble.$(OBJEXT)
+am__objects_66 = upmpost-pmpstrings.$(OBJEXT)
+am__objects_67 = upmpost-pmpxout.$(OBJEXT)
+am__objects_68 = upmpost-ppngout.$(OBJEXT)
+am__objects_69 = upmpost-ppsout.$(OBJEXT)
+am__objects_70 = upmpost-psvgout.$(OBJEXT)
+am__objects_71 = $(am__objects_61) $(am__objects_62) $(am__objects_63) \
+	$(am__objects_64) $(am__objects_65) upmpost-pmpost.$(OBJEXT) \
+	$(am__objects_66) $(am__objects_67) $(am__objects_68) \
+	$(am__objects_69) $(am__objects_70) upmpost-ptfmin.$(OBJEXT)
+nodist_upmpost_OBJECTS = $(am__objects_71)
 upmpost_OBJECTS = $(nodist_upmpost_OBJECTS)
 am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1522,12 +1639,12 @@
 	uptexdir/uptexextra.h uptexdir/uptex_version.h \
 	synctexdir/synctex.c synctexdir/synctex.h \
 	synctexdir/synctex-common.h synctexdir/synctex-uptex.h
- at UPTEX_SYNCTEX_TRUE@am__objects_71 =  \
+ at UPTEX_SYNCTEX_TRUE@am__objects_72 =  \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/uptex-synctex.$(OBJEXT)
 dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT) \
-	$(am__objects_71)
-am__objects_72 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
-nodist_uptex_OBJECTS = $(am__objects_72) uptex-uptex-pool.$(OBJEXT)
+	$(am__objects_72)
+am__objects_73 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
+nodist_uptex_OBJECTS = $(am__objects_73) uptex-uptex-pool.$(OBJEXT)
 uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
 @UPTEX_SYNCTEX_TRUE at am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
 am_uptftopl_OBJECTS =
@@ -1566,12 +1683,12 @@
 	xetexdir/xetex_version.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-xetex.h
- at XETEX_SYNCTEX_TRUE@am__objects_73 =  \
+ at XETEX_SYNCTEX_TRUE@am__objects_74 =  \
 @XETEX_SYNCTEX_TRUE@	synctexdir/xetex-synctex.$(OBJEXT)
 dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \
-	$(am__objects_73)
-am__objects_74 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_74) xetex-xetex-pool.$(OBJEXT)
+	$(am__objects_74)
+am__objects_75 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_75) xetex-xetex-pool.$(OBJEXT)
 xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
 @XETEX_MACOSX_FALSE at am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1)
 am__DEPENDENCIES_18 = $(libxetex) $(am__DEPENDENCIES_1) \
@@ -1620,290 +1737,6 @@
 	./$(DEPDIR)/euptex-euptex0.Po ./$(DEPDIR)/euptex-euptexini.Po \
 	./$(DEPDIR)/gftodvi.Po ./$(DEPDIR)/gftopk.Po \
 	./$(DEPDIR)/gftype.Po ./$(DEPDIR)/initex-callexe.Po \
-	./$(DEPDIR)/liblua53tex_a-align.Po \
-	./$(DEPDIR)/liblua53tex_a-arithmetic.Po \
-	./$(DEPDIR)/liblua53tex_a-avlstuff.Po \
-	./$(DEPDIR)/liblua53tex_a-buildpage.Po \
-	./$(DEPDIR)/liblua53tex_a-commands.Po \
-	./$(DEPDIR)/liblua53tex_a-conditional.Po \
-	./$(DEPDIR)/liblua53tex_a-directions.Po \
-	./$(DEPDIR)/liblua53tex_a-dofont.Po \
-	./$(DEPDIR)/liblua53tex_a-dumpdata.Po \
-	./$(DEPDIR)/liblua53tex_a-dvigen.Po \
-	./$(DEPDIR)/liblua53tex_a-equivalents.Po \
-	./$(DEPDIR)/liblua53tex_a-errors.Po \
-	./$(DEPDIR)/liblua53tex_a-expand.Po \
-	./$(DEPDIR)/liblua53tex_a-extensions.Po \
-	./$(DEPDIR)/liblua53tex_a-filename.Po \
-	./$(DEPDIR)/liblua53tex_a-helpers.Po \
-	./$(DEPDIR)/liblua53tex_a-hnjalloc.Po \
-	./$(DEPDIR)/liblua53tex_a-hyphen.Po \
-	./$(DEPDIR)/liblua53tex_a-inputstack.Po \
-	./$(DEPDIR)/liblua53tex_a-linebreak.Po \
-	./$(DEPDIR)/liblua53tex_a-luafont.Po \
-	./$(DEPDIR)/liblua53tex_a-luainit.Po \
-	./$(DEPDIR)/liblua53tex_a-luanode.Po \
-	./$(DEPDIR)/liblua53tex_a-luastuff.Po \
-	./$(DEPDIR)/liblua53tex_a-luatoken.Po \
-	./$(DEPDIR)/liblua53tex_a-mainbody.Po \
-	./$(DEPDIR)/liblua53tex_a-maincontrol.Po \
-	./$(DEPDIR)/liblua53tex_a-managed-sa.Po \
-	./$(DEPDIR)/liblua53tex_a-mapfile.Po \
-	./$(DEPDIR)/liblua53tex_a-mathcodes.Po \
-	./$(DEPDIR)/liblua53tex_a-memoryword.Po \
-	./$(DEPDIR)/liblua53tex_a-mlist.Po \
-	./$(DEPDIR)/liblua53tex_a-mplibstuff.Po \
-	./$(DEPDIR)/liblua53tex_a-nesting.Po \
-	./$(DEPDIR)/liblua53tex_a-packaging.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfaction.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfannot.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfcolorstack.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfdest.Po \
-	./$(DEPDIR)/liblua53tex_a-pdffont.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfgen.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfglyph.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfimage.Po \
-	./$(DEPDIR)/liblua53tex_a-pdflink.Po \
-	./$(DEPDIR)/liblua53tex_a-pdflistout.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfliteral.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfobj.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfoutline.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfpage.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfpagetree.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfrule.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfsaverestore.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfsetmatrix.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfshipout.Po \
-	./$(DEPDIR)/liblua53tex_a-pdftables.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfthread.Po \
-	./$(DEPDIR)/liblua53tex_a-pdftoepdf.Po \
-	./$(DEPDIR)/liblua53tex_a-pdfxform.Po \
-	./$(DEPDIR)/liblua53tex_a-pkin.Po \
-	./$(DEPDIR)/liblua53tex_a-postlinebreak.Po \
-	./$(DEPDIR)/liblua53tex_a-primitive.Po \
-	./$(DEPDIR)/liblua53tex_a-printing.Po \
-	./$(DEPDIR)/liblua53tex_a-scanning.Po \
-	./$(DEPDIR)/liblua53tex_a-sfnt.Po \
-	./$(DEPDIR)/liblua53tex_a-stringpool.Po \
-	./$(DEPDIR)/liblua53tex_a-texdeffont.Po \
-	./$(DEPDIR)/liblua53tex_a-texfileio.Po \
-	./$(DEPDIR)/liblua53tex_a-texfont.Po \
-	./$(DEPDIR)/liblua53tex_a-texlang.Po \
-	./$(DEPDIR)/liblua53tex_a-texluac.Po \
-	./$(DEPDIR)/liblua53tex_a-texmath.Po \
-	./$(DEPDIR)/liblua53tex_a-texnodes.Po \
-	./$(DEPDIR)/liblua53tex_a-textcodes.Po \
-	./$(DEPDIR)/liblua53tex_a-textoken.Po \
-	./$(DEPDIR)/liblua53tex_a-tfmofm.Po \
-	./$(DEPDIR)/liblua53tex_a-tounicode.Po \
-	./$(DEPDIR)/liblua53tex_a-tt_glyf.Po \
-	./$(DEPDIR)/liblua53tex_a-tt_table.Po \
-	./$(DEPDIR)/liblua53tex_a-unistring.Po \
-	./$(DEPDIR)/liblua53tex_a-utils.Po \
-	./$(DEPDIR)/liblua53tex_a-vfovf.Po \
-	./$(DEPDIR)/liblua53tex_a-vfpacket.Po \
-	./$(DEPDIR)/liblua53tex_a-writecff.Po \
-	./$(DEPDIR)/liblua53tex_a-writeenc.Po \
-	./$(DEPDIR)/liblua53tex_a-writefont.Po \
-	./$(DEPDIR)/liblua53tex_a-writeimg.Po \
-	./$(DEPDIR)/liblua53tex_a-writejbig2.Po \
-	./$(DEPDIR)/liblua53tex_a-writejp2.Po \
-	./$(DEPDIR)/liblua53tex_a-writejpg.Po \
-	./$(DEPDIR)/liblua53tex_a-writepng.Po \
-	./$(DEPDIR)/liblua53tex_a-writet1.Po \
-	./$(DEPDIR)/liblua53tex_a-writet3.Po \
-	./$(DEPDIR)/liblua53tex_a-writettf.Po \
-	./$(DEPDIR)/liblua53tex_a-writetype0.Po \
-	./$(DEPDIR)/liblua53tex_a-writetype2.Po \
-	./$(DEPDIR)/libluajittex_a-align.Po \
-	./$(DEPDIR)/libluajittex_a-arithmetic.Po \
-	./$(DEPDIR)/libluajittex_a-avlstuff.Po \
-	./$(DEPDIR)/libluajittex_a-buildpage.Po \
-	./$(DEPDIR)/libluajittex_a-commands.Po \
-	./$(DEPDIR)/libluajittex_a-conditional.Po \
-	./$(DEPDIR)/libluajittex_a-directions.Po \
-	./$(DEPDIR)/libluajittex_a-dofont.Po \
-	./$(DEPDIR)/libluajittex_a-dumpdata.Po \
-	./$(DEPDIR)/libluajittex_a-dvigen.Po \
-	./$(DEPDIR)/libluajittex_a-equivalents.Po \
-	./$(DEPDIR)/libluajittex_a-errors.Po \
-	./$(DEPDIR)/libluajittex_a-expand.Po \
-	./$(DEPDIR)/libluajittex_a-extensions.Po \
-	./$(DEPDIR)/libluajittex_a-filename.Po \
-	./$(DEPDIR)/libluajittex_a-hnjalloc.Po \
-	./$(DEPDIR)/libluajittex_a-hyphen.Po \
-	./$(DEPDIR)/libluajittex_a-inputstack.Po \
-	./$(DEPDIR)/libluajittex_a-linebreak.Po \
-	./$(DEPDIR)/libluajittex_a-luafont.Po \
-	./$(DEPDIR)/libluajittex_a-luainit.Po \
-	./$(DEPDIR)/libluajittex_a-luanode.Po \
-	./$(DEPDIR)/libluajittex_a-luastuff.Po \
-	./$(DEPDIR)/libluajittex_a-luatoken.Po \
-	./$(DEPDIR)/libluajittex_a-mainbody.Po \
-	./$(DEPDIR)/libluajittex_a-maincontrol.Po \
-	./$(DEPDIR)/libluajittex_a-managed-sa.Po \
-	./$(DEPDIR)/libluajittex_a-mapfile.Po \
-	./$(DEPDIR)/libluajittex_a-mathcodes.Po \
-	./$(DEPDIR)/libluajittex_a-memoryword.Po \
-	./$(DEPDIR)/libluajittex_a-mlist.Po \
-	./$(DEPDIR)/libluajittex_a-mplibstuff.Po \
-	./$(DEPDIR)/libluajittex_a-nesting.Po \
-	./$(DEPDIR)/libluajittex_a-packaging.Po \
-	./$(DEPDIR)/libluajittex_a-pdfaction.Po \
-	./$(DEPDIR)/libluajittex_a-pdfannot.Po \
-	./$(DEPDIR)/libluajittex_a-pdfcolorstack.Po \
-	./$(DEPDIR)/libluajittex_a-pdfdest.Po \
-	./$(DEPDIR)/libluajittex_a-pdffont.Po \
-	./$(DEPDIR)/libluajittex_a-pdfgen.Po \
-	./$(DEPDIR)/libluajittex_a-pdfglyph.Po \
-	./$(DEPDIR)/libluajittex_a-pdfimage.Po \
-	./$(DEPDIR)/libluajittex_a-pdflink.Po \
-	./$(DEPDIR)/libluajittex_a-pdflistout.Po \
-	./$(DEPDIR)/libluajittex_a-pdfliteral.Po \
-	./$(DEPDIR)/libluajittex_a-pdfobj.Po \
-	./$(DEPDIR)/libluajittex_a-pdfoutline.Po \
-	./$(DEPDIR)/libluajittex_a-pdfpage.Po \
-	./$(DEPDIR)/libluajittex_a-pdfpagetree.Po \
-	./$(DEPDIR)/libluajittex_a-pdfrule.Po \
-	./$(DEPDIR)/libluajittex_a-pdfsaverestore.Po \
-	./$(DEPDIR)/libluajittex_a-pdfsetmatrix.Po \
-	./$(DEPDIR)/libluajittex_a-pdfshipout.Po \
-	./$(DEPDIR)/libluajittex_a-pdftables.Po \
-	./$(DEPDIR)/libluajittex_a-pdfthread.Po \
-	./$(DEPDIR)/libluajittex_a-pdftoepdf.Po \
-	./$(DEPDIR)/libluajittex_a-pdfxform.Po \
-	./$(DEPDIR)/libluajittex_a-pkin.Po \
-	./$(DEPDIR)/libluajittex_a-postlinebreak.Po \
-	./$(DEPDIR)/libluajittex_a-primitive.Po \
-	./$(DEPDIR)/libluajittex_a-printing.Po \
-	./$(DEPDIR)/libluajittex_a-scanning.Po \
-	./$(DEPDIR)/libluajittex_a-sfnt.Po \
-	./$(DEPDIR)/libluajittex_a-stringpool.Po \
-	./$(DEPDIR)/libluajittex_a-texdeffont.Po \
-	./$(DEPDIR)/libluajittex_a-texfileio.Po \
-	./$(DEPDIR)/libluajittex_a-texfont.Po \
-	./$(DEPDIR)/libluajittex_a-texlang.Po \
-	./$(DEPDIR)/libluajittex_a-texluajitc.Po \
-	./$(DEPDIR)/libluajittex_a-texmath.Po \
-	./$(DEPDIR)/libluajittex_a-texnodes.Po \
-	./$(DEPDIR)/libluajittex_a-textcodes.Po \
-	./$(DEPDIR)/libluajittex_a-textoken.Po \
-	./$(DEPDIR)/libluajittex_a-tfmofm.Po \
-	./$(DEPDIR)/libluajittex_a-tounicode.Po \
-	./$(DEPDIR)/libluajittex_a-tt_glyf.Po \
-	./$(DEPDIR)/libluajittex_a-tt_table.Po \
-	./$(DEPDIR)/libluajittex_a-unistring.Po \
-	./$(DEPDIR)/libluajittex_a-utils.Po \
-	./$(DEPDIR)/libluajittex_a-vfovf.Po \
-	./$(DEPDIR)/libluajittex_a-vfpacket.Po \
-	./$(DEPDIR)/libluajittex_a-writecff.Po \
-	./$(DEPDIR)/libluajittex_a-writeenc.Po \
-	./$(DEPDIR)/libluajittex_a-writefont.Po \
-	./$(DEPDIR)/libluajittex_a-writeimg.Po \
-	./$(DEPDIR)/libluajittex_a-writejbig2.Po \
-	./$(DEPDIR)/libluajittex_a-writejp2.Po \
-	./$(DEPDIR)/libluajittex_a-writejpg.Po \
-	./$(DEPDIR)/libluajittex_a-writepng.Po \
-	./$(DEPDIR)/libluajittex_a-writet1.Po \
-	./$(DEPDIR)/libluajittex_a-writet3.Po \
-	./$(DEPDIR)/libluajittex_a-writettf.Po \
-	./$(DEPDIR)/libluajittex_a-writetype0.Po \
-	./$(DEPDIR)/libluajittex_a-writetype2.Po \
-	./$(DEPDIR)/libluatex_a-align.Po \
-	./$(DEPDIR)/libluatex_a-arithmetic.Po \
-	./$(DEPDIR)/libluatex_a-avlstuff.Po \
-	./$(DEPDIR)/libluatex_a-buildpage.Po \
-	./$(DEPDIR)/libluatex_a-commands.Po \
-	./$(DEPDIR)/libluatex_a-conditional.Po \
-	./$(DEPDIR)/libluatex_a-directions.Po \
-	./$(DEPDIR)/libluatex_a-dofont.Po \
-	./$(DEPDIR)/libluatex_a-dumpdata.Po \
-	./$(DEPDIR)/libluatex_a-dvigen.Po \
-	./$(DEPDIR)/libluatex_a-equivalents.Po \
-	./$(DEPDIR)/libluatex_a-errors.Po \
-	./$(DEPDIR)/libluatex_a-expand.Po \
-	./$(DEPDIR)/libluatex_a-extensions.Po \
-	./$(DEPDIR)/libluatex_a-filename.Po \
-	./$(DEPDIR)/libluatex_a-helpers.Po \
-	./$(DEPDIR)/libluatex_a-hnjalloc.Po \
-	./$(DEPDIR)/libluatex_a-hyphen.Po \
-	./$(DEPDIR)/libluatex_a-inputstack.Po \
-	./$(DEPDIR)/libluatex_a-linebreak.Po \
-	./$(DEPDIR)/libluatex_a-luafont.Po \
-	./$(DEPDIR)/libluatex_a-luainit.Po \
-	./$(DEPDIR)/libluatex_a-luanode.Po \
-	./$(DEPDIR)/libluatex_a-luastuff.Po \
-	./$(DEPDIR)/libluatex_a-luatoken.Po \
-	./$(DEPDIR)/libluatex_a-mainbody.Po \
-	./$(DEPDIR)/libluatex_a-maincontrol.Po \
-	./$(DEPDIR)/libluatex_a-managed-sa.Po \
-	./$(DEPDIR)/libluatex_a-mapfile.Po \
-	./$(DEPDIR)/libluatex_a-mathcodes.Po \
-	./$(DEPDIR)/libluatex_a-memoryword.Po \
-	./$(DEPDIR)/libluatex_a-mlist.Po \
-	./$(DEPDIR)/libluatex_a-mplibstuff.Po \
-	./$(DEPDIR)/libluatex_a-nesting.Po \
-	./$(DEPDIR)/libluatex_a-packaging.Po \
-	./$(DEPDIR)/libluatex_a-pdfaction.Po \
-	./$(DEPDIR)/libluatex_a-pdfannot.Po \
-	./$(DEPDIR)/libluatex_a-pdfcolorstack.Po \
-	./$(DEPDIR)/libluatex_a-pdfdest.Po \
-	./$(DEPDIR)/libluatex_a-pdffont.Po \
-	./$(DEPDIR)/libluatex_a-pdfgen.Po \
-	./$(DEPDIR)/libluatex_a-pdfglyph.Po \
-	./$(DEPDIR)/libluatex_a-pdfimage.Po \
-	./$(DEPDIR)/libluatex_a-pdflink.Po \
-	./$(DEPDIR)/libluatex_a-pdflistout.Po \
-	./$(DEPDIR)/libluatex_a-pdfliteral.Po \
-	./$(DEPDIR)/libluatex_a-pdfobj.Po \
-	./$(DEPDIR)/libluatex_a-pdfoutline.Po \
-	./$(DEPDIR)/libluatex_a-pdfpage.Po \
-	./$(DEPDIR)/libluatex_a-pdfpagetree.Po \
-	./$(DEPDIR)/libluatex_a-pdfrule.Po \
-	./$(DEPDIR)/libluatex_a-pdfsaverestore.Po \
-	./$(DEPDIR)/libluatex_a-pdfsetmatrix.Po \
-	./$(DEPDIR)/libluatex_a-pdfshipout.Po \
-	./$(DEPDIR)/libluatex_a-pdftables.Po \
-	./$(DEPDIR)/libluatex_a-pdfthread.Po \
-	./$(DEPDIR)/libluatex_a-pdftoepdf.Po \
-	./$(DEPDIR)/libluatex_a-pdfxform.Po \
-	./$(DEPDIR)/libluatex_a-pkin.Po \
-	./$(DEPDIR)/libluatex_a-postlinebreak.Po \
-	./$(DEPDIR)/libluatex_a-primitive.Po \
-	./$(DEPDIR)/libluatex_a-printing.Po \
-	./$(DEPDIR)/libluatex_a-scanning.Po \
-	./$(DEPDIR)/libluatex_a-sfnt.Po \
-	./$(DEPDIR)/libluatex_a-stringpool.Po \
-	./$(DEPDIR)/libluatex_a-texdeffont.Po \
-	./$(DEPDIR)/libluatex_a-texfileio.Po \
-	./$(DEPDIR)/libluatex_a-texfont.Po \
-	./$(DEPDIR)/libluatex_a-texlang.Po \
-	./$(DEPDIR)/libluatex_a-texluac.Po \
-	./$(DEPDIR)/libluatex_a-texmath.Po \
-	./$(DEPDIR)/libluatex_a-texnodes.Po \
-	./$(DEPDIR)/libluatex_a-textcodes.Po \
-	./$(DEPDIR)/libluatex_a-textoken.Po \
-	./$(DEPDIR)/libluatex_a-tfmofm.Po \
-	./$(DEPDIR)/libluatex_a-tounicode.Po \
-	./$(DEPDIR)/libluatex_a-tt_glyf.Po \
-	./$(DEPDIR)/libluatex_a-tt_table.Po \
-	./$(DEPDIR)/libluatex_a-unistring.Po \
-	./$(DEPDIR)/libluatex_a-utils.Po \
-	./$(DEPDIR)/libluatex_a-vfovf.Po \
-	./$(DEPDIR)/libluatex_a-vfpacket.Po \
-	./$(DEPDIR)/libluatex_a-writecff.Po \
-	./$(DEPDIR)/libluatex_a-writeenc.Po \
-	./$(DEPDIR)/libluatex_a-writefont.Po \
-	./$(DEPDIR)/libluatex_a-writeimg.Po \
-	./$(DEPDIR)/libluatex_a-writejbig2.Po \
-	./$(DEPDIR)/libluatex_a-writejp2.Po \
-	./$(DEPDIR)/libluatex_a-writejpg.Po \
-	./$(DEPDIR)/libluatex_a-writepng.Po \
-	./$(DEPDIR)/libluatex_a-writet1.Po \
-	./$(DEPDIR)/libluatex_a-writet3.Po \
-	./$(DEPDIR)/libluatex_a-writettf.Po \
-	./$(DEPDIR)/libluatex_a-writetype0.Po \
-	./$(DEPDIR)/libluatex_a-writetype2.Po \
 	./$(DEPDIR)/libmflua_a-mflua-pool.Po \
 	./$(DEPDIR)/libmflua_a-mflua0.Po \
 	./$(DEPDIR)/libmflua_a-mfluaini.Po \
@@ -1914,23 +1747,22 @@
 	./$(DEPDIR)/libmplibbackends_a-svgout.Po \
 	./$(DEPDIR)/libmplibcore_a-mp.Po \
 	./$(DEPDIR)/libmplibcore_a-mpmath.Po \
-	./$(DEPDIR)/libmplibcore_a-mpmathbinary.Po \
 	./$(DEPDIR)/libmplibcore_a-mpmathdecimal.Po \
 	./$(DEPDIR)/libmplibcore_a-mpmathdouble.Po \
 	./$(DEPDIR)/libmplibcore_a-mpstrings.Po \
 	./$(DEPDIR)/libmplibcore_a-psout.Po \
 	./$(DEPDIR)/libmplibcore_a-tfmin.Po \
-	./$(DEPDIR)/luajittex-dummy.Po ./$(DEPDIR)/luatex-dummy.Po \
-	./$(DEPDIR)/luatex53-dummy.Po ./$(DEPDIR)/mf-mfextra.Po \
-	./$(DEPDIR)/mf-pool.Po ./$(DEPDIR)/mf0.Po \
-	./$(DEPDIR)/mf_nowin-mfextra.Po ./$(DEPDIR)/mfini.Po \
-	./$(DEPDIR)/mft.Po ./$(DEPDIR)/mpost-mpost.Po \
-	./$(DEPDIR)/mpost-mpxout.Po ./$(DEPDIR)/odvicopy.Po \
-	./$(DEPDIR)/odvitype.Po ./$(DEPDIR)/ofm2opl.Po \
-	./$(DEPDIR)/opl2ofm.Po ./$(DEPDIR)/otangle.Po \
-	./$(DEPDIR)/ovf2ovp.Po ./$(DEPDIR)/ovp2ovf.Po \
-	./$(DEPDIR)/patgen.Po ./$(DEPDIR)/pbibtex-pbibtex.Po \
-	./$(DEPDIR)/pdftex-dummy.Po ./$(DEPDIR)/pdftex-pdftex-pool.Po \
+	./$(DEPDIR)/libmplibextramath_a-mpmathbinary.Po \
+	./$(DEPDIR)/mf-mfextra.Po ./$(DEPDIR)/mf-pool.Po \
+	./$(DEPDIR)/mf0.Po ./$(DEPDIR)/mf_nowin-mfextra.Po \
+	./$(DEPDIR)/mfini.Po ./$(DEPDIR)/mft.Po \
+	./$(DEPDIR)/mpost-mpost.Po ./$(DEPDIR)/mpost-mpxout.Po \
+	./$(DEPDIR)/odvicopy.Po ./$(DEPDIR)/odvitype.Po \
+	./$(DEPDIR)/ofm2opl.Po ./$(DEPDIR)/opl2ofm.Po \
+	./$(DEPDIR)/otangle.Po ./$(DEPDIR)/ovf2ovp.Po \
+	./$(DEPDIR)/ovp2ovf.Po ./$(DEPDIR)/patgen.Po \
+	./$(DEPDIR)/pbibtex-pbibtex.Po ./$(DEPDIR)/pdftex-dummy.Po \
+	./$(DEPDIR)/pdftex-pdftex-pool.Po \
 	./$(DEPDIR)/pdftex-pdftex0.Po ./$(DEPDIR)/pdftex-pdftexini.Po \
 	./$(DEPDIR)/pdftosrc-dummy.Po ./$(DEPDIR)/pdvitype-pdvitype.Po \
 	./$(DEPDIR)/pktogf.Po ./$(DEPDIR)/pktype.Po \
@@ -1976,18 +1808,108 @@
 	luatexdir/$(DEPDIR)/luajittex-luatex.Po \
 	luatexdir/$(DEPDIR)/luatex-luatex.Po \
 	luatexdir/$(DEPDIR)/luatex53-luatex.Po \
+	luatexdir/dvi/$(DEPDIR)/liblua53tex_a-dvigen.Po \
+	luatexdir/dvi/$(DEPDIR)/libluajittex_a-dvigen.Po \
+	luatexdir/dvi/$(DEPDIR)/libluatex_a-dvigen.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-dofont.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-luafont.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-mapfile.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-pkin.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-sfnt.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-texfont.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-tfmofm.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-tounicode.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-tt_glyf.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-tt_table.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-vfovf.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-vfpacket.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-writecff.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-writeenc.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-writefont.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-writet1.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-writet3.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-writettf.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-writetype0.Po \
+	luatexdir/font/$(DEPDIR)/liblua53tex_a-writetype2.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-dofont.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-luafont.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-mapfile.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-pkin.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-sfnt.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-texfont.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-tfmofm.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-tounicode.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-tt_glyf.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-tt_table.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-vfovf.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-vfpacket.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-writecff.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-writeenc.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-writefont.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-writet1.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-writet3.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-writettf.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-writetype0.Po \
+	luatexdir/font/$(DEPDIR)/libluajittex_a-writetype2.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-dofont.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-luafont.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-mapfile.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-pkin.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-sfnt.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-texfont.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-tfmofm.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-tounicode.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-tt_glyf.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-tt_table.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-vfovf.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-vfpacket.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-writecff.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-writeenc.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-writefont.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-writet1.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-writet3.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-writettf.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-writetype0.Po \
+	luatexdir/font/$(DEPDIR)/libluatex_a-writetype2.Po \
+	luatexdir/image/$(DEPDIR)/liblua53tex_a-pdftoepdf.Po \
+	luatexdir/image/$(DEPDIR)/liblua53tex_a-writeimg.Po \
+	luatexdir/image/$(DEPDIR)/liblua53tex_a-writejbig2.Po \
+	luatexdir/image/$(DEPDIR)/liblua53tex_a-writejp2.Po \
+	luatexdir/image/$(DEPDIR)/liblua53tex_a-writejpg.Po \
+	luatexdir/image/$(DEPDIR)/liblua53tex_a-writepng.Po \
+	luatexdir/image/$(DEPDIR)/libluajittex_a-pdftoepdf.Po \
+	luatexdir/image/$(DEPDIR)/libluajittex_a-writeimg.Po \
+	luatexdir/image/$(DEPDIR)/libluajittex_a-writejbig2.Po \
+	luatexdir/image/$(DEPDIR)/libluajittex_a-writejp2.Po \
+	luatexdir/image/$(DEPDIR)/libluajittex_a-writejpg.Po \
+	luatexdir/image/$(DEPDIR)/libluajittex_a-writepng.Po \
+	luatexdir/image/$(DEPDIR)/libluatex_a-pdftoepdf.Po \
+	luatexdir/image/$(DEPDIR)/libluatex_a-writeimg.Po \
+	luatexdir/image/$(DEPDIR)/libluatex_a-writejbig2.Po \
+	luatexdir/image/$(DEPDIR)/libluatex_a-writejp2.Po \
+	luatexdir/image/$(DEPDIR)/libluatex_a-writejpg.Po \
+	luatexdir/image/$(DEPDIR)/libluatex_a-writepng.Po \
+	luatexdir/lang/$(DEPDIR)/liblua53tex_a-hnjalloc.Po \
+	luatexdir/lang/$(DEPDIR)/liblua53tex_a-hyphen.Po \
+	luatexdir/lang/$(DEPDIR)/liblua53tex_a-texlang.Po \
+	luatexdir/lang/$(DEPDIR)/libluajittex_a-hnjalloc.Po \
+	luatexdir/lang/$(DEPDIR)/libluajittex_a-hyphen.Po \
+	luatexdir/lang/$(DEPDIR)/libluajittex_a-texlang.Po \
+	luatexdir/lang/$(DEPDIR)/libluatex_a-hnjalloc.Po \
+	luatexdir/lang/$(DEPDIR)/libluatex_a-hyphen.Po \
+	luatexdir/lang/$(DEPDIR)/libluatex_a-texlang.Po \
+	luatexdir/lua/$(DEPDIR)/liblua53tex_a-helpers.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-lcallbacklib.Po \
-	luatexdir/lua/$(DEPDIR)/liblua53tex_a-lepdflib.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-lfontlib.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-limglib.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-liolibext.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-lkpselib.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-llanglib.Po \
-	luatexdir/lua/$(DEPDIR)/liblua53tex_a-llfslibext.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-llualib.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnewtokenlib.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnodelib.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-loslibext.Po \
+	luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdfelib.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdflib.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdfscannerlib.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstatslib.Po \
@@ -1994,19 +1916,25 @@
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstrlibext.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexiolib.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexlib.Po \
+	luatexdir/lua/$(DEPDIR)/liblua53tex_a-luainit.Po \
+	luatexdir/lua/$(DEPDIR)/liblua53tex_a-luanode.Po \
+	luatexdir/lua/$(DEPDIR)/liblua53tex_a-luastuff.Po \
 	luatexdir/lua/$(DEPDIR)/liblua53tex_a-luatex-core.Po \
+	luatexdir/lua/$(DEPDIR)/liblua53tex_a-luatoken.Po \
+	luatexdir/lua/$(DEPDIR)/liblua53tex_a-mplibstuff.Po \
+	luatexdir/lua/$(DEPDIR)/liblua53tex_a-texluac.Po \
+	luatexdir/lua/$(DEPDIR)/libluajittex_a-helpers.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-lcallbacklib.Po \
-	luatexdir/lua/$(DEPDIR)/libluajittex_a-lepdflib.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-lfontlib.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-limglib.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-liolibext.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-lkpselib.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-llanglib.Po \
-	luatexdir/lua/$(DEPDIR)/libluajittex_a-llfslibext.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-llualib.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-lnewtokenlib.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-lnodelib.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-loslibext.Po \
+	luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdfelib.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdflib.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdfscannerlib.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-lstatslib.Po \
@@ -2013,19 +1941,25 @@
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-lstrlibext.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexiolib.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexlib.Po \
+	luatexdir/lua/$(DEPDIR)/libluajittex_a-luainit.Po \
+	luatexdir/lua/$(DEPDIR)/libluajittex_a-luanode.Po \
+	luatexdir/lua/$(DEPDIR)/libluajittex_a-luastuff.Po \
 	luatexdir/lua/$(DEPDIR)/libluajittex_a-luatex-core.Po \
+	luatexdir/lua/$(DEPDIR)/libluajittex_a-luatoken.Po \
+	luatexdir/lua/$(DEPDIR)/libluajittex_a-mplibstuff.Po \
+	luatexdir/lua/$(DEPDIR)/libluajittex_a-texluajitc.Po \
+	luatexdir/lua/$(DEPDIR)/libluatex_a-helpers.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-lcallbacklib.Po \
-	luatexdir/lua/$(DEPDIR)/libluatex_a-lepdflib.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-lfontlib.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-limglib.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-liolibext.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-lkpselib.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-llanglib.Po \
-	luatexdir/lua/$(DEPDIR)/libluatex_a-llfslibext.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-llualib.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-lnewtokenlib.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-lnodelib.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-loslibext.Po \
+	luatexdir/lua/$(DEPDIR)/libluatex_a-lpdfelib.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-lpdflib.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-lpdfscannerlib.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-lstatslib.Po \
@@ -2032,7 +1966,13 @@
 	luatexdir/lua/$(DEPDIR)/libluatex_a-lstrlibext.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-ltexiolib.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-ltexlib.Po \
+	luatexdir/lua/$(DEPDIR)/libluatex_a-luainit.Po \
+	luatexdir/lua/$(DEPDIR)/libluatex_a-luanode.Po \
+	luatexdir/lua/$(DEPDIR)/libluatex_a-luastuff.Po \
 	luatexdir/lua/$(DEPDIR)/libluatex_a-luatex-core.Po \
+	luatexdir/lua/$(DEPDIR)/libluatex_a-luatoken.Po \
+	luatexdir/lua/$(DEPDIR)/libluatex_a-mplibstuff.Po \
+	luatexdir/lua/$(DEPDIR)/libluatex_a-texluac.Po \
 	luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Po \
 	luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Po \
 	luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-call.Po \
@@ -2103,6 +2043,60 @@
 	luatexdir/luapeg/$(DEPDIR)/liblua53misc_a-lpeg.Po \
 	luatexdir/luapeg/$(DEPDIR)/libluajitmisc_a-lpeg.Po \
 	luatexdir/luapeg/$(DEPDIR)/libluamisc_a-lpeg.Po \
+	luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-pparray.Po \
+	luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppcrypt.Po \
+	luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppdict.Po \
+	luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppheap.Po \
+	luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppload.Po \
+	luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppstream.Po \
+	luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppxref.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-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-ppxref.Po \
+	luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilbasexx.Po \
+	luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilcrypt.Po \
+	luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilflate.Po \
+	luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilfpred.Po \
+	luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utiliof.Po \
+	luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillog.Po \
+	luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillzw.Po \
+	luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmd5.Po \
+	luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmem.Po \
+	luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilnumber.Po \
+	luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilsha.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/luasocket/src/$(DEPDIR)/liblua53socket_a-auxiliar.Po \
 	luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-buffer.Po \
 	luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-compat.Po \
@@ -2160,9 +2154,174 @@
 	luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lzlib.Po \
 	luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lgzip.Po \
 	luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lzlib.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfaction.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfannot.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfcolorstack.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfdest.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdffont.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfgen.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfglyph.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfimage.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdflink.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdflistout.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfliteral.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfobj.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfoutline.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfpage.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfpagetree.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfrule.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfsaverestore.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfsetmatrix.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfshipout.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdftables.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfthread.Po \
+	luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfxform.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfaction.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfannot.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfcolorstack.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfdest.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdffont.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfgen.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfglyph.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfimage.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdflink.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdflistout.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfliteral.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfobj.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfoutline.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfpage.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfpagetree.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfrule.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfsaverestore.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfsetmatrix.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfshipout.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdftables.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfthread.Po \
+	luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfxform.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfaction.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfannot.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfcolorstack.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfdest.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdffont.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfgen.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfglyph.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfimage.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdflink.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdflistout.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfliteral.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfobj.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfoutline.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfpage.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfpagetree.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfrule.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfsaverestore.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfsetmatrix.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfshipout.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdftables.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfthread.Po \
+	luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfxform.Po \
 	luatexdir/slnunicode/$(DEPDIR)/liblua53misc_a-slnunico.Po \
 	luatexdir/slnunicode/$(DEPDIR)/libluajitmisc_a-slnunico.Po \
 	luatexdir/slnunicode/$(DEPDIR)/libluamisc_a-slnunico.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-align.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-arithmetic.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-backend.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-buildpage.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-commands.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-conditional.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-directions.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-dumpdata.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-equivalents.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-errors.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-expand.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-extensions.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-filename.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-inputstack.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-linebreak.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-mainbody.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-maincontrol.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-mathcodes.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-memoryword.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-mlist.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-nesting.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-packaging.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-postlinebreak.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-primitive.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-printing.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-scanning.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-stringpool.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-texdeffont.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-texfileio.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-texmath.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-texnodes.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-textcodes.Po \
+	luatexdir/tex/$(DEPDIR)/liblua53tex_a-textoken.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-align.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-arithmetic.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-backend.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-buildpage.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-commands.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-conditional.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-directions.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-dumpdata.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-equivalents.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-errors.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-expand.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-extensions.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-filename.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-inputstack.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-linebreak.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-mainbody.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-maincontrol.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-mathcodes.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-memoryword.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-mlist.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-nesting.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-packaging.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-postlinebreak.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-primitive.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-printing.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-scanning.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-stringpool.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-texdeffont.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-texfileio.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-texmath.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-texnodes.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-textcodes.Po \
+	luatexdir/tex/$(DEPDIR)/libluajittex_a-textoken.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-align.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-arithmetic.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-backend.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-buildpage.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-commands.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-conditional.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-directions.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-dumpdata.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-equivalents.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-errors.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-expand.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-extensions.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-filename.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-inputstack.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-linebreak.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-mainbody.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-maincontrol.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-mathcodes.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-memoryword.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-mlist.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-nesting.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-packaging.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-postlinebreak.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-primitive.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-printing.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-scanning.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-stringpool.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-texdeffont.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-texfileio.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-texmath.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-texnodes.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-textcodes.Po \
+	luatexdir/tex/$(DEPDIR)/libluatex_a-textoken.Po \
 	luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Po \
 	luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Po \
 	luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Po \
@@ -2174,8 +2333,20 @@
 	luatexdir/unilib/$(DEPDIR)/libunilib_a-ustring.Po \
 	luatexdir/unilib/$(DEPDIR)/libunilib_a-utype.Po \
 	luatexdir/utils/$(DEPDIR)/liblua53tex_a-avl.Po \
+	luatexdir/utils/$(DEPDIR)/liblua53tex_a-avlstuff.Po \
+	luatexdir/utils/$(DEPDIR)/liblua53tex_a-managed-sa.Po \
+	luatexdir/utils/$(DEPDIR)/liblua53tex_a-unistring.Po \
+	luatexdir/utils/$(DEPDIR)/liblua53tex_a-utils.Po \
 	luatexdir/utils/$(DEPDIR)/libluajittex_a-avl.Po \
+	luatexdir/utils/$(DEPDIR)/libluajittex_a-avlstuff.Po \
+	luatexdir/utils/$(DEPDIR)/libluajittex_a-managed-sa.Po \
+	luatexdir/utils/$(DEPDIR)/libluajittex_a-unistring.Po \
+	luatexdir/utils/$(DEPDIR)/libluajittex_a-utils.Po \
 	luatexdir/utils/$(DEPDIR)/libluatex_a-avl.Po \
+	luatexdir/utils/$(DEPDIR)/libluatex_a-avlstuff.Po \
+	luatexdir/utils/$(DEPDIR)/libluatex_a-managed-sa.Po \
+	luatexdir/utils/$(DEPDIR)/libluatex_a-unistring.Po \
+	luatexdir/utils/$(DEPDIR)/libluatex_a-utils.Po \
 	mfluadir/$(DEPDIR)/libmflua_a-mfluac.Po \
 	mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po \
 	mfluadir/$(DEPDIR)/mflua-mfluaextra.Po \
@@ -2314,14 +2485,16 @@
 SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
 	$(nodist_liblua53ffi_a_SOURCES) \
 	$(nodist_liblua53misc_a_SOURCES) \
+	$(nodist_liblua53pplib_a_SOURCES) \
 	$(nodist_liblua53socket_a_SOURCES) \
 	$(dist_liblua53tex_a_SOURCES) $(nodist_liblua53tex_a_SOURCES) \
 	$(nodist_libluaffi_a_SOURCES) \
 	$(nodist_libluajitmisc_a_SOURCES) \
+	$(nodist_libluajitpplib_a_SOURCES) \
 	$(nodist_libluajitsocket_a_SOURCES) \
 	$(dist_libluajittex_a_SOURCES) \
 	$(nodist_libluajittex_a_SOURCES) \
-	$(nodist_libluamisc_a_SOURCES) \
+	$(nodist_libluamisc_a_SOURCES) $(nodist_libluapplib_a_SOURCES) \
 	$(nodist_libluasocket_a_SOURCES) $(dist_libluatex_a_SOURCES) \
 	$(nodist_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \
 	$(nodist_libmf_a_SOURCES) $(dist_libmflua_a_SOURCES) \
@@ -2328,7 +2501,8 @@
 	$(nodist_libmflua_a_SOURCES) $(dist_libmfluajit_a_SOURCES) \
 	$(nodist_libmfluajit_a_SOURCES) \
 	$(nodist_libmplibbackends_a_SOURCES) \
-	$(nodist_libmplibcore_a_SOURCES) $(libmputil_a_SOURCES) \
+	$(nodist_libmplibcore_a_SOURCES) \
+	$(nodist_libmplibextramath_a_SOURCES) $(libmputil_a_SOURCES) \
 	$(libpdftex_a_SOURCES) $(EXTRA_libpdftex_a_SOURCES) \
 	$(nodist_libsynctex_a_SOURCES) $(libukanji_a_SOURCES) \
 	$(libunilib_a_SOURCES) $(libxetex_a_SOURCES) \
@@ -2347,10 +2521,9 @@
 	$(nodist_euptex_SOURCES) $(gftodvi_SOURCES) \
 	$(nodist_gftodvi_SOURCES) $(nodist_gftopk_SOURCES) \
 	$(nodist_gftype_SOURCES) $(nodist_initex_SOURCES) \
-	$(nodist_luajittex_SOURCES) $(nodist_EXTRA_luajittex_SOURCES) \
-	$(nodist_luatex_SOURCES) $(nodist_EXTRA_luatex_SOURCES) \
-	$(nodist_luatex53_SOURCES) $(nodist_EXTRA_luatex53_SOURCES) \
-	$(md5main_SOURCES) $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
+	$(nodist_luajittex_SOURCES) $(nodist_luatex_SOURCES) \
+	$(nodist_luatex53_SOURCES) $(md5main_SOURCES) \
+	$(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
 	$(dist_mflua_SOURCES) $(nodist_mflua_nowin_SOURCES) \
 	$(dist_mfluajit_SOURCES) $(nodist_mfluajit_nowin_SOURCES) \
 	$(nodist_mft_SOURCES) $(nodist_mpost_SOURCES) \
@@ -2420,7 +2593,7 @@
 MANS = $(dist_man_MANS) $(nodist_man_MANS)
 DATA = $(pkgconfig_DATA)
 am__syncinclude_HEADERS_DIST = synctexdir/synctex_parser.h \
-	synctexdir/synctex_parser_utils.h
+	synctexdir/synctex_version.h synctexdir/synctex_parser_utils.h
 HEADERS = $(syncinclude_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -2649,6 +2822,7 @@
 	$(srcdir)/luatexdir/am/luaffi.am \
 	$(srcdir)/luatexdir/am/luafontforge.am \
 	$(srcdir)/luatexdir/am/luamisc.am \
+	$(srcdir)/luatexdir/am/luapplib.am \
 	$(srcdir)/luatexdir/am/luasocket.am \
 	$(srcdir)/luatexdir/am/luatex.am \
 	$(srcdir)/mfluadir/am/mflua.am \
@@ -2957,11 +3131,13 @@
 SUBDIRS = doc lib man web2c . window omegafonts otps
 proglib = lib/lib.a
 EXTRA_LIBRARIES = libmf.a libmflua.a libmfluajit.a libmputil.a \
-	libmplibcore.a libmplibbackends.a libkanji.a libukanji.a \
-	libpdftex.a libluasocket.a liblua53socket.a libluajitsocket.a \
-	libluamisc.a liblua53misc.a libluajitmisc.a libunilib.a \
-	libff.a libluatex.a liblua53tex.a libluajittex.a libluaffi.a \
-	liblua53ffi.a libxetex.a libsynctex.a libmd5.a
+	libmplibcore.a libmplibextramath.a libmplibbackends.a \
+	libkanji.a libukanji.a libpdftex.a libluasocket.a \
+	liblua53socket.a libluajitsocket.a libluamisc.a liblua53misc.a \
+	libluajitmisc.a libunilib.a libff.a libluatex.a liblua53tex.a \
+	libluajittex.a libluaffi.a liblua53ffi.a libluapplib.a \
+	liblua53pplib.a libluajitpplib.a libxetex.a libsynctex.a \
+	libmd5.a
 EXTRA_LTLIBRARIES = libsynctex.la
 lib_LIBRARIES = $(am__append_116)
 lib_LTLIBRARIES = $(am__append_115)
@@ -3070,10 +3246,11 @@
 	uptexdir/tests/testnewu.pl uptexdir/tests/testnewu.tfm \
 	uptexdir/tests/uparse.pl uptexdir/tests/uparse.tfm \
 	uptexdir/tests/gkhugeok.tfm uptexdir/tests/gkhugeng.tfm \
-	uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf \
-	$(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines \
-	euptexdir/COPYRIGHT euptexdir/COPYRIGHT.jis \
-	euptexdir/ChangeLog euptexdir/EUPTEX.txt $(euptex_tests) \
+	uptexdir/tests/gkhugeng.err uptexdir/uptrip/uptrip.diffs \
+	uptexdir/uptrip/texmf.cnf $(euptex_web_srcs) $(euptex_ch_srcs) \
+	euptexdir/euptex.defines euptexdir/COPYRIGHT \
+	euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \
+	euptexdir/EUPTEX.txt $(euptex_tests) \
 	eptexdir/eptrip/eptrip.log eptexdir/eptrip/eptrip.tex \
 	euptexdir/euptrip/euptrip.diffs euptexdir/euptrip/texmf.cnf \
 	euptexdir/pdfprimitive.test \
@@ -3338,9 +3515,10 @@
 	pmp.w pmpost.w pmpxout.w ppsout.w psvgout.w ptfmin.w \
 	pmp-tangle pmpxout-tangle ppsout-tangle psvgout-tangle \
 	pmpsamp.* upmpsamp.* $(nodist_libmplibcore_a_SOURCES) \
+	$(nodist_libmplibextramath_a_SOURCES) \
 	$(nodist_libmplibbackends_a_SOURCES) mp-tangle mpmath-tangle \
-	mpmathbinary-tangle mpmathdecimal-tangle mpmathdouble-tangle \
-	mpstrings-tangle psout-tangle svgout-tangle pngout-tangle \
+	mpmathdecimal-tangle mpmathdouble-tangle mpstrings-tangle \
+	psout-tangle svgout-tangle pngout-tangle \
 	$(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \
 	etex.pool etex-tangle etrip.diffs ewprob.log ewprob.tex \
 	$(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \
@@ -3360,36 +3538,37 @@
 	$(upweb_programs:=.web) uptests/xexampl.aux \
 	uptests/xexampl.bbl uptests/xexampl.blg uptests/xstory.dvityp \
 	uptests/xpagenum.typ uptests/xcmr10.tfm uptests/xcmr10.pl \
-	uptests/x*min10.* uptests/xtestnewu.* uptests/*uparse.* \
-	uptests/*gkhuge*.* uptrip.diffs $(nodist_euptex_SOURCES) \
-	euptex.web euptex.ch euptex-web2c euptex.p euptex.pool \
-	euptex-tangle euptrip.diffs pdfprimitive-euptex.* \
-	$(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \
-	pdftex.pool pdftex-tangle pwprob.log pwprob.tex pdfimage.fmt \
-	pdfimage.log pdfimage.pdf expanded.log postV3.afm postV7.afm \
-	test-13.pdf test-13.xref test-15.pdf test-15.xref \
-	$(nodist_libluatex_sources) luaimage.* luajitimage.* \
-	$(nodist_xetex_SOURCES) xetex.web xetex.ch xetex-web2c xetex.p \
-	xetex.pool xetex-tangle bug73.fmt bug73.log bug73.out \
-	bug73.tex $(omegaware_programs:=.c) $(omegaware_programs:=.h) \
-	$(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
-	ofm2opl.web opl2ofm.web ovf2ovp.web ovp2ovf.web \
-	omegaware/bad*.* omegaware/tests/charwdr.* \
-	omegaware/tests/charwdv.* omegaware/tests/xcheck* \
-	omegaware/tests/xlevel1.* omegaware/tests/xlig*.* ofont*vf \
-	omegaware/tests/xpagenum.* omegaware/tests/xofont* \
-	omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
-	omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
-	omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
-	ocftest.* omegaware/tests/xinbmp* omegaware/tests/xoverbmp* \
-	omegaware/tests/xrealnum.* omegaware/tests/xrepeated.* \
-	omegaware/tests/sample*.ofm omegaware/tests/sample*.ovf \
-	omegaware/tests/sample1-h.opl omegaware/tests/xsample*.out \
-	omegaware/tests/shortend.* omegaware/tests/specialhex.ofm \
-	omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
-	omegaware/tests/xspecialhex.* omegaware/tests/yrepeat* \
-	omegaware/tests/*yarabic* $(nodist_aleph_SOURCES) aleph.web \
-	aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
+	uptests/x*min10.* uptests/xtestnewu.* uptests/xuparse.* \
+	uptests/yuparse.* uptests/ygkhuge*.* uptrip.diffs \
+	$(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
+	euptex.p euptex.pool euptex-tangle euptrip.diffs \
+	pdfprimitive-euptex.* $(nodist_pdftex_SOURCES) pdftex.ch \
+	pdftex-web2c pdftex.p pdftex.pool pdftex-tangle pwprob.log \
+	pwprob.tex pdfimage.fmt pdfimage.log pdfimage.pdf expanded.log \
+	postV3.afm postV7.afm test-13.pdf test-13.xref test-15.pdf \
+	test-15.xref $(nodist_libluatex_sources) luaimage.* \
+	luajitimage.* $(nodist_xetex_SOURCES) xetex.web xetex.ch \
+	xetex-web2c xetex.p xetex.pool xetex-tangle bug73.fmt \
+	bug73.log bug73.out bug73.tex $(omegaware_programs:=.c) \
+	$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
+	$(omegaware_programs:=-web2c) ofm2opl.web opl2ofm.web \
+	ovf2ovp.web ovp2ovf.web omegaware/bad*.* \
+	omegaware/tests/charwdr.* omegaware/tests/charwdv.* \
+	omegaware/tests/xcheck* omegaware/tests/xlevel1.* \
+	omegaware/tests/xlig*.* ofont*vf omegaware/tests/xpagenum.* \
+	omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
+	omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
+	omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
+	omegaware/tests/xOCherokee.* ocftest.* omegaware/tests/xinbmp* \
+	omegaware/tests/xoverbmp* omegaware/tests/xrealnum.* \
+	omegaware/tests/xrepeated.* omegaware/tests/sample*.ofm \
+	omegaware/tests/sample*.ovf omegaware/tests/sample1-h.opl \
+	omegaware/tests/xsample*.out omegaware/tests/shortend.* \
+	omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
+	omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
+	omegaware/tests/yrepeat* omegaware/tests/*yarabic* \
+	$(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
+	aleph.pool aleph-tangle
 CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES)
 TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_27) \
 	$(am__append_36) $(am__append_44) $(am__append_60) \
@@ -3640,9 +3819,7 @@
 #
 mfluajit_tests = mfluajitdir/mfluajittraptest.test
 mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
-#mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
-#	$(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a
-mpost_LDADD = libmplibcore.a libmplibbackends.a  $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
+mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a  $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
 	$(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a
 
 call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
@@ -3708,13 +3885,15 @@
 libmputil_a_SOURCES = mplibdir/avl.h mplibdir/avl.c mplibdir/decNumber.c mplibdir/decNumber.h \
 	mplibdir/decNumberLocal.h mplibdir/decContext.h mplibdir/decContext.c
 
-libmplibcore_a_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+libmplibcore_a_CPPFLAGS = $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+libmplibextramath_a_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) -I${top_builddir}/../../libs   $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
 libmplibbackends_a_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \
 	$(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
 
-nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathbinary_c_h) $(mpmathdecimal_c_h) \
+nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \
 	$(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) 
 
+nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h)
 nodist_libmplibbackends_a_SOURCES = $(pngout_c_h)  $(svgout_c_h)
 mp_c_h = mp.c mplib.h mpmp.h
 mpmath_c_h = mpmath.h mpmath.c
@@ -4090,9 +4269,9 @@
         luatexdir/luasocket/src/udp.h \
         luatexdir/luasocket/src/usocket.h 
 
-libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
-liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
-libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
+libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a libluapplib.a
+liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a liblua53pplib.a
+libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a libluajitpplib.a
 libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUA_INCLUDES)
 liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
 libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
@@ -4228,8 +4407,9 @@
 liblua53tex_a_DEPENDENCIES = libff.a liblua53misc.a
 libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
 libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \
-	$(LIBPNG_INCLUDES) $(POPPLER_INCLUDES) -I$(srcdir)/libmd5 \
-	-DpdfTeX -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/unilib \
+	$(LIBPNG_INCLUDES) -I$(srcdir)/libmd5 -DpdfTeX \
+	-I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/unilib \
+	-I$(srcdir)/luatexdir/luapplib/util \
 	-I$(srcdir)/luatexdir/luafontloader/fontforge/inc \
 	-DLUA_FF_LIB=1 \
 	-I$(srcdir)/luatexdir/luafontloader/fontforge/fontforge \
@@ -4242,155 +4422,383 @@
 liblua53tex_a_CXXFLAGS = $(WARNING_CXXFLAGS)
 libluajittex_a_CXXFLAGS = $(WARNING_CXXFLAGS)
 dist_libluatex_a_SOURCES = \
-	luatexdir/lua/lstrlibext.c
+	luatexdir/lua/lstrlibext.c \
+	luatexdir/lua/helpers.c \
+	luatexdir/lua/texluac.c 
 
 nodist_libluatex_a_SOURCES = \
-	helpers.c luastuff.c texluac.c \
 	$(dist_libluatex_sources) \
 	$(nodist_libluatex_sources)
 
 dist_liblua53tex_a_SOURCES = \
-	luatexdir/lua/lstrlibext.c
+	luatexdir/lua/lstrlibext.c \
+	luatexdir/lua/helpers.c \
+	luatexdir/lua/texluac.c 
 
 nodist_liblua53tex_a_SOURCES = \
-	helpers.c luastuff.c texluac.c \
 	$(dist_libluatex_sources) \
 	$(nodist_libluatex_sources)
 
 dist_libluajittex_a_SOURCES = \
 	luatexdir/lua/lauxlib_bridge.h \
-	luatexdir/lua/lstrlibext.c
+	luatexdir/lua/lstrlibext.c \
+	luatexdir/lua/texluajitc.c
 
 nodist_libluajittex_a_SOURCES = \
-	luastuff.c texluajitc.c \
 	$(dist_libluatex_sources) \
 	$(nodist_libluatex_sources)
 
+libluatex_web = 
+nodist_libluatex_sources = 
+
+#dvigen.c: ctangle$(EXEEXT) luatexdir/dvi/dvigen.w
+#	$(luatex_dvi_ctangle) dvigen.w
+
+#libluatex_web += luatexdir/dvi/dvigen.w
+
+#nodist_libluatex_sources += dvigen.c
+
+# dofont.c: ctangle$(EXEEXT) luatexdir/font/dofont.w
+# 	$(luatex_font_ctangle) dofont.w
+# luafont.c: ctangle$(EXEEXT) luatexdir/font/luafont.w
+# 	$(luatex_font_ctangle) luafont.w
+# mapfile.c: ctangle$(EXEEXT) luatexdir/font/mapfile.w
+# 	$(luatex_font_ctangle) mapfile.w
+# pkin.c: ctangle$(EXEEXT) luatexdir/font/pkin.w
+# 	$(luatex_font_ctangle) pkin.w
+# sfnt.c: ctangle$(EXEEXT) luatexdir/font/sfnt.w
+# 	$(luatex_font_ctangle) sfnt.w
+# texfont.c: ctangle$(EXEEXT) luatexdir/font/texfont.w
+# 	$(luatex_font_ctangle) texfont.w
+# tfmofm.c: ctangle$(EXEEXT) luatexdir/font/tfmofm.w
+# 	$(luatex_font_ctangle) tfmofm.w
+# tounicode.c: ctangle$(EXEEXT) luatexdir/font/tounicode.w
+# 	$(luatex_font_ctangle) tounicode.w
+# tt_glyf.c: ctangle$(EXEEXT) luatexdir/font/tt_glyf.w
+# 	$(luatex_font_ctangle) tt_glyf.w
+# tt_table.c: ctangle$(EXEEXT) luatexdir/font/tt_table.w
+# 	$(luatex_font_ctangle) tt_table.w
+# vfovf.c: ctangle$(EXEEXT) luatexdir/font/vfovf.w
+# 	$(luatex_font_ctangle) vfovf.w
+# vfpacket.c: ctangle$(EXEEXT) luatexdir/font/vfpacket.w
+# 	$(luatex_font_ctangle) vfpacket.w
+# writecff.c: ctangle$(EXEEXT) luatexdir/font/writecff.w
+# 	$(luatex_font_ctangle) writecff.w
+# writeenc.c: ctangle$(EXEEXT) luatexdir/font/writeenc.w
+# 	$(luatex_font_ctangle) writeenc.w
+# writefont.c: ctangle$(EXEEXT) luatexdir/font/writefont.w
+# 	$(luatex_font_ctangle) writefont.w
+# writet1.c: ctangle$(EXEEXT) luatexdir/font/writet1.w
+# 	$(luatex_font_ctangle) writet1.w
+# writet3.c: ctangle$(EXEEXT) luatexdir/font/writet3.w
+# 	$(luatex_font_ctangle) writet3.w
+# writettf.c: ctangle$(EXEEXT) luatexdir/font/writettf.w
+# 	$(luatex_font_ctangle) writettf.w
+# writetype0.c: ctangle$(EXEEXT) luatexdir/font/writetype0.w
+# 	$(luatex_font_ctangle) writetype0.w
+# writetype2.c: ctangle$(EXEEXT) luatexdir/font/writetype2.w
+# 	$(luatex_font_ctangle) writetype2.w
+
+# libluatex_web += luatexdir/font/dofont.w luatexdir/font/luafont.w luatexdir/font/mapfile.w
+# libluatex_web += luatexdir/font/pkin.w luatexdir/font/sfnt.w 
+# libluatex_web += luatexdir/font/texfont.w luatexdir/font/tfmofm.w
+# libluatex_web += luatexdir/font/tounicode.w luatexdir/font/tt_glyf.w
+# libluatex_web += luatexdir/font/tt_table.w luatexdir/font/vfovf.w
+# libluatex_web += luatexdir/font/vfpacket.w luatexdir/font/writecff.w
+# libluatex_web += luatexdir/font/writeenc.w luatexdir/font/writefont.w
+# libluatex_web += luatexdir/font/writet1.w luatexdir/font/writet3.w
+# libluatex_web += luatexdir/font/writettf.w luatexdir/font/writetype0.w
+# libluatex_web += luatexdir/font/writetype2.w
+
+# nodist_libluatex_sources += dofont.c luafont.c mapfile.c pkin.c sfnt.c 
+# nodist_libluatex_sources += texfont.c tfmofm.c tounicode.c tt_glyf.c tt_table.c vfovf.c vfpacket.c
+# nodist_libluatex_sources += writecff.c writeenc.c writefont.c writet1.c writet3.c writettf.c
+# nodist_libluatex_sources += writetype0.c writetype2.c
+
+#writeimg.c: ctangle$(EXEEXT) luatexdir/image/writeimg.w
+#	$(luatex_image_ctangle) writeimg.w
+#writejbig2.c: ctangle$(EXEEXT) luatexdir/image/writejbig2.w
+#	$(luatex_image_ctangle) writejbig2.w
+#writejpg.c: ctangle$(EXEEXT) luatexdir/image/writejpg.w
+#	$(luatex_image_ctangle) writejpg.w
+#writejp2.c: ctangle$(EXEEXT) luatexdir/image/writejp2.w
+#	$(luatex_image_ctangle) writejp2.w
+#writepng.c: ctangle$(EXEEXT) luatexdir/image/writepng.w
+#	$(luatex_image_ctangle) writepng.w
+#pdftoepdf.cc: ctangle$(EXEEXT) luatexdir/image/pdftoepdf.w
+#	$(luatex_image_ctangle) pdftoepdf.w - $@
+
+#libluatex_web += luatexdir/image/writeimg.w
+#libluatex_web += luatexdir/image/writejbig2.w
+#libluatex_web += luatexdir/image/writejpg.w
+#libluatex_web += luatexdir/image/writejp2.w
+#libluatex_web += luatexdir/image/writepng.w
+#libluatex_web += luatexdir/image/pdftoepdf.w
+
+#nodist_libluatex_sources += writeimg.c writejbig2.c writejpg.c writejp2.c writepng.c 
+
+#helpers.c: ctangle$(EXEEXT) luatexdir/lua/helpers.w
+#	$(luatex_lua_ctangle) helpers.w
+#luainit.c: ctangle$(EXEEXT) luatexdir/lua/luainit.w
+#	$(luatex_lua_ctangle) luainit.w
+#luajitstuff.c: ctangle$(EXEEXT) luatexdir/lua/luajitstuff.w
+#	$(luatex_lua_ctangle) luajitstuff.w
+#luanode.c: ctangle$(EXEEXT) luatexdir/lua/luanode.w
+#	$(luatex_lua_ctangle) luanode.w
+#luastuff.c: ctangle$(EXEEXT) luatexdir/lua/luastuff.w
+#	$(luatex_lua_ctangle) luastuff.w
+#luatoken.c: ctangle$(EXEEXT) luatexdir/lua/luatoken.w
+#	$(luatex_lua_ctangle) luatoken.w
+#mplibstuff.c: ctangle$(EXEEXT) luatexdir/lua/mplibstuff.w
+#	$(luatex_lua_ctangle) mplibstuff.w
+#texluac.c: ctangle$(EXEEXT) luatexdir/lua/texluac.w
+#	$(luatex_lua_ctangle) texluac.w
+#texluajitc.c: ctangle$(EXEEXT) luatexdir/lua/texluajitc.w
+#	$(luatex_lua_ctangle) texluajitc.w
+
 #libluatex_web += luatexdir/lua/luainit.w luatexdir/lua/luajitstuff.w
-libluatex_web = luatexdir/dvi/dvigen.w luatexdir/font/dofont.w \
-	luatexdir/font/luafont.w luatexdir/font/mapfile.w \
-	luatexdir/font/pkin.w luatexdir/font/sfnt.w \
-	luatexdir/font/texfont.w luatexdir/font/tfmofm.w \
-	luatexdir/font/tounicode.w luatexdir/font/tt_glyf.w \
-	luatexdir/font/tt_table.w luatexdir/font/vfovf.w \
-	luatexdir/font/vfpacket.w luatexdir/font/writecff.w \
-	luatexdir/font/writeenc.w luatexdir/font/writefont.w \
-	luatexdir/font/writet1.w luatexdir/font/writet3.w \
-	luatexdir/font/writettf.w luatexdir/font/writetype0.w \
-	luatexdir/font/writetype2.w luatexdir/image/writeimg.w \
-	luatexdir/image/writejbig2.w luatexdir/image/writejpg.w \
-	luatexdir/image/writejp2.w luatexdir/image/writepng.w \
-	luatexdir/image/pdftoepdf.w luatexdir/lang/texlang.w \
-	luatexdir/lang/hyphen.w luatexdir/lang/hnjalloc.w \
-	luatexdir/lua/helpers.w luatexdir/lua/luainit.w \
-	luatexdir/lua/luanode.w luatexdir/lua/luastuff.w \
-	luatexdir/lua/luatoken.w luatexdir/lua/mplibstuff.w \
-	luatexdir/lua/texluac.w luatexdir/lua/texluajitc.w \
-	luatexdir/pdf/pdfpagetree.w luatexdir/pdf/pdfaction.w \
-	luatexdir/pdf/pdfannot.w luatexdir/pdf/pdfcolorstack.w \
-	luatexdir/pdf/pdfdest.w luatexdir/pdf/pdffont.w \
-	luatexdir/pdf/pdfgen.w luatexdir/pdf/pdfglyph.w \
-	luatexdir/pdf/pdfimage.w luatexdir/pdf/pdflink.w \
-	luatexdir/pdf/pdflistout.w luatexdir/pdf/pdfliteral.w \
-	luatexdir/pdf/pdfobj.w luatexdir/pdf/pdfoutline.w \
-	luatexdir/pdf/pdfpage.w luatexdir/pdf/pdfrule.w \
-	luatexdir/pdf/pdfsaverestore.w luatexdir/pdf/pdfsetmatrix.w \
-	luatexdir/pdf/pdfshipout.w luatexdir/pdf/pdftables.w \
-	luatexdir/pdf/pdfthread.w luatexdir/pdf/pdfxform.w \
-	luatexdir/tex/align.w luatexdir/tex/arithmetic.w \
-	luatexdir/tex/buildpage.w luatexdir/tex/commands.w \
-	luatexdir/tex/conditional.w luatexdir/tex/directions.w \
-	luatexdir/tex/dumpdata.w luatexdir/tex/equivalents.w \
-	luatexdir/tex/errors.w luatexdir/tex/expand.w \
-	luatexdir/tex/extensions.w luatexdir/tex/filename.w \
-	luatexdir/tex/inputstack.w luatexdir/tex/linebreak.w \
-	luatexdir/tex/mainbody.w luatexdir/tex/maincontrol.w \
-	luatexdir/tex/mathcodes.w luatexdir/tex/memoryword.w \
-	luatexdir/tex/mlist.w luatexdir/tex/nesting.w \
-	luatexdir/tex/packaging.w luatexdir/tex/postlinebreak.w \
-	luatexdir/tex/primitive.w luatexdir/tex/printing.w \
-	luatexdir/tex/scanning.w luatexdir/tex/stringpool.w \
-	luatexdir/tex/texdeffont.w luatexdir/tex/texfileio.w \
-	luatexdir/tex/texmath.w luatexdir/tex/texnodes.w \
-	luatexdir/tex/textcodes.w luatexdir/tex/textoken.w \
-	luatexdir/utils/avlstuff.w luatexdir/utils/managed-sa.w \
-	luatexdir/utils/utils.w luatexdir/utils/unistring.w
-nodist_libluatex_sources = dvigen.c dofont.c luafont.c mapfile.c \
-	pkin.c sfnt.c texfont.c tfmofm.c tounicode.c tt_glyf.c \
-	tt_table.c vfovf.c vfpacket.c writecff.c writeenc.c \
-	writefont.c writet1.c writet3.c writettf.c writetype0.c \
-	writetype2.c writeimg.c writejbig2.c writejpg.c writejp2.c \
-	writepng.c pdftoepdf.cc texlang.c hyphen.c hnjalloc.c \
-	luainit.c luanode.c luatoken.c mplibstuff.c pdfpagetree.c \
-	pdfaction.c pdfannot.c pdfcolorstack.c pdfdest.c pdffont.c \
-	pdfgen.c pdfglyph.c pdfimage.c pdflink.c pdflistout.c \
-	pdfliteral.c pdfobj.c pdfoutline.c pdfpage.c pdfrule.c \
-	pdfsaverestore.c pdfsetmatrix.c pdfshipout.c pdftables.c \
-	pdfthread.c pdfxform.c align.c arithmetic.c buildpage.c \
-	commands.c conditional.c directions.c dumpdata.c equivalents.c \
-	errors.c expand.c extensions.c filename.c inputstack.c \
-	linebreak.c mainbody.c maincontrol.c mathcodes.c memoryword.c \
-	mlist.c nesting.c packaging.c postlinebreak.c primitive.c \
-	printing.c scanning.c stringpool.c texdeffont.c texfileio.c \
-	texmath.c texnodes.c textcodes.c textoken.c avlstuff.c \
-	managed-sa.c utils.c unistring.c
+
+# pdfpagetree.c: ctangle$(EXEEXT) luatexdir/pdf/pdfpagetree.w
+# 	$(luatex_pdf_ctangle) pdfpagetree.w
+# pdfaction.c: ctangle$(EXEEXT) luatexdir/pdf/pdfaction.w
+# 	$(luatex_pdf_ctangle) pdfaction.w
+# pdfannot.c: ctangle$(EXEEXT) luatexdir/pdf/pdfannot.w
+# 	$(luatex_pdf_ctangle) pdfannot.w
+# pdfcolorstack.c: ctangle$(EXEEXT) luatexdir/pdf/pdfcolorstack.w
+# 	$(luatex_pdf_ctangle) pdfcolorstack.w
+# pdfdest.c: ctangle$(EXEEXT) luatexdir/pdf/pdfdest.w
+# 	$(luatex_pdf_ctangle) pdfdest.w
+# pdffont.c: ctangle$(EXEEXT) luatexdir/pdf/pdffont.w
+# 	$(luatex_pdf_ctangle) pdffont.w
+# pdfgen.c: ctangle$(EXEEXT) luatexdir/pdf/pdfgen.w
+# 	$(luatex_pdf_ctangle) pdfgen.w
+# pdfglyph.c: ctangle$(EXEEXT) luatexdir/pdf/pdfglyph.w
+# 	$(luatex_pdf_ctangle) pdfglyph.w
+# pdfimage.c: ctangle$(EXEEXT) luatexdir/pdf/pdfimage.w
+# 	$(luatex_pdf_ctangle) pdfimage.w
+# pdflink.c: ctangle$(EXEEXT) luatexdir/pdf/pdflink.w
+# 	$(luatex_pdf_ctangle) pdflink.w
+# pdflistout.c: ctangle$(EXEEXT) luatexdir/pdf/pdflistout.w
+# 	$(luatex_pdf_ctangle) pdflistout.w
+# pdfliteral.c: ctangle$(EXEEXT) luatexdir/pdf/pdfliteral.w
+# 	$(luatex_pdf_ctangle) pdfliteral.w
+# pdfobj.c: ctangle$(EXEEXT) luatexdir/pdf/pdfobj.w
+# 	$(luatex_pdf_ctangle) pdfobj.w
+# pdfoutline.c: ctangle$(EXEEXT) luatexdir/pdf/pdfoutline.w
+# 	$(luatex_pdf_ctangle) pdfoutline.w
+# pdfpage.c: ctangle$(EXEEXT) luatexdir/pdf/pdfpage.w
+# 	$(luatex_pdf_ctangle) pdfpage.w
+# pdfrule.c: ctangle$(EXEEXT) luatexdir/pdf/pdfrule.w
+# 	$(luatex_pdf_ctangle) pdfrule.w
+# pdfsaverestore.c: ctangle$(EXEEXT) luatexdir/pdf/pdfsaverestore.w
+# 	$(luatex_pdf_ctangle) pdfsaverestore.w
+# pdfsetmatrix.c: ctangle$(EXEEXT) luatexdir/pdf/pdfsetmatrix.w
+# 	$(luatex_pdf_ctangle) pdfsetmatrix.w
+# pdfshipout.c: ctangle$(EXEEXT) luatexdir/pdf/pdfshipout.w
+# 	$(luatex_pdf_ctangle) pdfshipout.w
+# pdftables.c: ctangle$(EXEEXT) luatexdir/pdf/pdftables.w
+# 	$(luatex_pdf_ctangle) pdftables.w
+# pdfthread.c: ctangle$(EXEEXT) luatexdir/pdf/pdfthread.w
+# 	$(luatex_pdf_ctangle) pdfthread.w
+# pdfxform.c: ctangle$(EXEEXT) luatexdir/pdf/pdfxform.w
+# 	$(luatex_pdf_ctangle) pdfxform.w
+
+#libluatex_web += luatexdir/pdf/pdfpagetree.w luatexdir/pdf/pdfaction.w luatexdir/pdf/pdfannot.w
+#libluatex_web += luatexdir/pdf/pdfcolorstack.w luatexdir/pdf/pdfdest.w
+#libluatex_web += luatexdir/pdf/pdffont.w luatexdir/pdf/pdfgen.w luatexdir/pdf/pdfglyph.w
+#libluatex_web += luatexdir/pdf/pdfimage.w luatexdir/pdf/pdflink.w luatexdir/pdf/pdflistout.w
+#libluatex_web += luatexdir/pdf/pdfliteral.w luatexdir/pdf/pdfobj.w
+#libluatex_web += luatexdir/pdf/pdfoutline.w luatexdir/pdf/pdfpage.w luatexdir/pdf/pdfrule.w
+#libluatex_web += luatexdir/pdf/pdfsaverestore.w luatexdir/pdf/pdfsetmatrix.w
+#libluatex_web += luatexdir/pdf/pdfshipout.w luatexdir/pdf/pdftables.w
+#libluatex_web += luatexdir/pdf/pdfthread.w luatexdir/pdf/pdfxform.w
+
+#nodist_libluatex_sources += pdfpagetree.c pdfaction.c pdfannot.c pdfcolorstack.c pdfdest.c pdffont.c
+#nodist_libluatex_sources += pdfgen.c pdfglyph.c pdfimage.c pdflink.c pdflistout.c pdfliteral.c
+#nodist_libluatex_sources += pdfobj.c pdfoutline.c pdfpage.c pdfrule.c pdfsaverestore.c
+#nodist_libluatex_sources += pdfsetmatrix.c pdfshipout.c pdftables.c pdfthread.c pdfxform.c
+
+# align.c: ctangle$(EXEEXT) luatexdir/tex/align.w
+# 	$(luatex_tex_ctangle) align.w
+#arithmetic.c: ctangle$(EXEEXT) luatexdir/tex/arithmetic.w
+#	$(luatex_tex_ctangle) arithmetic.w
+# buildpage.c: ctangle$(EXEEXT) luatexdir/tex/buildpage.w
+# 	$(luatex_tex_ctangle) buildpage.w
+#commands.c: ctangle$(EXEEXT) luatexdir/tex/commands.w
+#	$(luatex_tex_ctangle) commands.w
+#conditional.c: ctangle$(EXEEXT) luatexdir/tex/conditional.w
+#	$(luatex_tex_ctangle) conditional.w
+#directions.c: ctangle$(EXEEXT) luatexdir/tex/directions.w
+#	$(luatex_tex_ctangle) directions.w
+#dumpdata.c: ctangle$(EXEEXT) luatexdir/tex/dumpdata.w
+#	$(luatex_tex_ctangle) dumpdata.w
+#equivalents.c: ctangle$(EXEEXT) luatexdir/tex/equivalents.w
+#	$(luatex_tex_ctangle) equivalents.w
+#errors.c: ctangle$(EXEEXT) luatexdir/tex/errors.w
+#	$(luatex_tex_ctangle) errors.w
+# expand.c: ctangle$(EXEEXT) luatexdir/tex/expand.w
+# 	$(luatex_tex_ctangle) expand.w
+# extensions.c: ctangle$(EXEEXT) luatexdir/tex/extensions.w
+# 	$(luatex_tex_ctangle) extensions.w
+#filename.c: ctangle$(EXEEXT) luatexdir/tex/filename.w
+#	$(luatex_tex_ctangle) filename.w
+#inputstack.c: ctangle$(EXEEXT) luatexdir/tex/inputstack.w
+#	$(luatex_tex_ctangle) inputstack.w
+# linebreak.c: ctangle$(EXEEXT) luatexdir/tex/linebreak.w
+# 	$(luatex_tex_ctangle) linebreak.w
+#mainbody.c: ctangle$(EXEEXT) luatexdir/tex/mainbody.w
+#	$(luatex_tex_ctangle) mainbody.w
+#maincontrol.c: ctangle$(EXEEXT) luatexdir/tex/maincontrol.w
+#	$(luatex_tex_ctangle) maincontrol.w
+#mathcodes.c: ctangle$(EXEEXT) luatexdir/tex/mathcodes.w
+#	$(luatex_tex_ctangle) mathcodes.w
+#memoryword.c: ctangle$(EXEEXT) luatexdir/tex/memoryword.w
+#	$(luatex_tex_ctangle) memoryword.w
+# mlist.c: ctangle$(EXEEXT) luatexdir/tex/mlist.w
+# 	$(luatex_tex_ctangle) mlist.w
+#nesting.c: ctangle$(EXEEXT) luatexdir/tex/nesting.w
+#	$(luatex_tex_ctangle) nesting.w
+# packaging.c: ctangle$(EXEEXT) luatexdir/tex/packaging.w
+# 	$(luatex_tex_ctangle) packaging.w
+#postlinebreak.c: ctangle$(EXEEXT) luatexdir/tex/postlinebreak.w
+#	$(luatex_tex_ctangle) postlinebreak.w
+#primitive.c: ctangle$(EXEEXT) luatexdir/tex/primitive.w
+#	$(luatex_tex_ctangle) primitive.w
+#printing.c: ctangle$(EXEEXT) luatexdir/tex/printing.w
+#	$(luatex_tex_ctangle) printing.w
+# scanning.c: ctangle$(EXEEXT) luatexdir/tex/scanning.w
+# 	$(luatex_tex_ctangle) scanning.w
+#stringpool.c: ctangle$(EXEEXT) luatexdir/tex/stringpool.w
+#	$(luatex_tex_ctangle) stringpool.w
+#texdeffont.c: ctangle$(EXEEXT) luatexdir/tex/texdeffont.w
+#	$(luatex_tex_ctangle) texdeffont.w
+# texfileio.c: ctangle$(EXEEXT) luatexdir/tex/texfileio.w
+# 	$(luatex_tex_ctangle) texfileio.w
+# texmath.c: ctangle$(EXEEXT) luatexdir/tex/texmath.w
+# 	$(luatex_tex_ctangle) texmath.w
+# texnodes.c: ctangle$(EXEEXT) luatexdir/tex/texnodes.w
+# 	$(luatex_tex_ctangle) texnodes.w
+#textcodes.c: ctangle$(EXEEXT) luatexdir/tex/textcodes.w
+#	$(luatex_tex_ctangle) textcodes.w
+# textoken.c: ctangle$(EXEEXT) luatexdir/tex/textoken.w
+# 	$(luatex_tex_ctangle) textoken.w
+
+#avlstuff.c: ctangle$(EXEEXT) luatexdir/utils/avlstuff.w
+#	$(luatex_utils_ctangle) avlstuff.w
+#managed-sa.c: ctangle$(EXEEXT) luatexdir/utils/managed-sa.w
+#	$(luatex_utils_ctangle) managed-sa.w
+#utils.c: ctangle$(EXEEXT) luatexdir/utils/utils.w
+#	$(luatex_utils_ctangle) utils.w
+#unistring.c: ctangle$(EXEEXT) luatexdir/utils/unistring.w
+#	$(luatex_utils_ctangle) unistring.w
+
+#libluatex_web += luatexdir/utils/avlstuff.w luatexdir/utils/managed-sa.w luatexdir/utils/utils.w luatexdir/utils/unistring.w
+
+#nodist_libluatex_sources += avlstuff.c managed-sa.c utils.c unistring.c
 dist_libluatex_sources = luatexdir/luatexcallbackids.h \
 	luatexdir/luatex.h luatexdir/luatex-common.h \
 	luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \
 	luatexdir/luafontloader/src/ffdummies.h \
 	luatexdir/luafontloader/src/luafflib.c luatexdir/dvi/dvigen.h \
-	luatexdir/font/luatexfont.h luatexdir/font/mapfile.h \
-	luatexdir/font/sfnt.h luatexdir/font/texfont.h \
-	luatexdir/font/tt_glyf.h luatexdir/font/tt_table.h \
-	luatexdir/font/writecff.h luatexdir/font/writettf.h \
-	luatexdir/image/epdf.h luatexdir/image/image.h \
-	luatexdir/image/pdftoepdf.h luatexdir/image/writeimg.h \
-	luatexdir/image/writejbig2.h luatexdir/image/writejpg.h \
-	luatexdir/image/writejp2.h luatexdir/image/writepng.h \
-	luatexdir/lang/hnjalloc.h luatexdir/lang/hyphen.h \
-	luatexdir/lang/texlang.h luatexdir/lua/lcallbacklib.c \
+	luatexdir/dvi/dvigen.c luatexdir/font/luatexfont.h \
+	luatexdir/font/mapfile.h luatexdir/font/sfnt.h \
+	luatexdir/font/texfont.h luatexdir/font/tt_glyf.h \
+	luatexdir/font/tt_table.h luatexdir/font/writecff.h \
+	luatexdir/font/writettf.h luatexdir/font/dofont.c \
+	luatexdir/font/luafont.c luatexdir/font/mapfile.c \
+	luatexdir/font/pkin.c luatexdir/font/sfnt.c \
+	luatexdir/font/texfont.c luatexdir/font/tfmofm.c \
+	luatexdir/font/tounicode.c luatexdir/font/tt_glyf.c \
+	luatexdir/font/tt_table.c luatexdir/font/vfovf.c \
+	luatexdir/font/vfpacket.c luatexdir/font/writecff.c \
+	luatexdir/font/writeenc.c luatexdir/font/writefont.c \
+	luatexdir/font/writet1.c luatexdir/font/writet3.c \
+	luatexdir/font/writettf.c luatexdir/font/writetype0.c \
+	luatexdir/font/writetype2.c luatexdir/image/epdf.h \
+	luatexdir/image/image.h luatexdir/image/pdftoepdf.h \
+	luatexdir/image/writeimg.h luatexdir/image/writejbig2.h \
+	luatexdir/image/writejpg.h luatexdir/image/writejp2.h \
+	luatexdir/image/writepng.h luatexdir/image/pdftoepdf.c \
+	luatexdir/image/writeimg.c luatexdir/image/writejbig2.c \
+	luatexdir/image/writejp2.c luatexdir/image/writejpg.c \
+	luatexdir/image/writepng.c luatexdir/lang/hnjalloc.h \
+	luatexdir/lang/hyphen.h luatexdir/lang/texlang.h \
+	luatexdir/lang/hnjalloc.c luatexdir/lang/hyphen.c \
+	luatexdir/lang/texlang.c luatexdir/lua/lcallbacklib.c \
 	luatexdir/lua/lfontlib.c luatexdir/lua/limglib.c \
-	luatexdir/lua/lpdfscannerlib.cc luatexdir/lua/lepdflib.cc \
+	luatexdir/lua/lpdfelib.c luatexdir/lua/lpdfscannerlib.c \
 	luatexdir/lua/lkpselib.c luatexdir/lua/llanglib.c \
-	luatexdir/lua/llualib.c luatexdir/lua/llfslibext.c \
-	luatexdir/lua/lnodelib.c luatexdir/lua/liolibext.c \
-	luatexdir/lua/loslibext.c luatexdir/lua/lpdflib.c \
-	luatexdir/lua/lstatslib.c luatexdir/lua/ltexiolib.c \
-	luatexdir/lua/ltexlib.c luatexdir/lua/lnewtokenlib.c \
-	luatexdir/lua/luatex-api.h luatexdir/lua/luatex-core.c \
-	luatexdir/pdf/pdfpagetree.h luatexdir/pdf/pdfaction.h \
-	luatexdir/pdf/pdfannot.h luatexdir/pdf/pdfcolorstack.h \
-	luatexdir/pdf/pdfdest.h luatexdir/pdf/pdffont.h \
-	luatexdir/pdf/pdfgen.h luatexdir/pdf/pdfglyph.h \
-	luatexdir/pdf/pdfimage.h luatexdir/pdf/pdflink.h \
-	luatexdir/pdf/pdflistout.h luatexdir/pdf/pdfliteral.h \
-	luatexdir/pdf/pdfobj.h luatexdir/pdf/pdfoutline.h \
-	luatexdir/pdf/pdfpage.h luatexdir/pdf/pdfrule.h \
-	luatexdir/pdf/pdfsaverestore.h luatexdir/pdf/pdfsetmatrix.h \
-	luatexdir/pdf/pdfshipout.h luatexdir/pdf/pdftables.h \
-	luatexdir/pdf/pdfthread.h luatexdir/pdf/pdftypes.h \
-	luatexdir/pdf/pdfxform.h luatexdir/tex/align.h \
-	luatexdir/tex/arithmetic.h luatexdir/tex/buildpage.h \
-	luatexdir/tex/commands.h luatexdir/tex/conditional.h \
-	luatexdir/tex/directions.h luatexdir/tex/dumpdata.h \
-	luatexdir/tex/equivalents.h luatexdir/tex/errors.h \
-	luatexdir/tex/expand.h luatexdir/tex/extensions.h \
-	luatexdir/tex/filename.h luatexdir/tex/inputstack.h \
-	luatexdir/tex/linebreak.h luatexdir/tex/mainbody.h \
-	luatexdir/tex/maincontrol.h luatexdir/tex/mathcodes.h \
-	luatexdir/tex/memoryword.h luatexdir/tex/mlist.h \
-	luatexdir/tex/nesting.h luatexdir/tex/packaging.h \
-	luatexdir/tex/postlinebreak.h luatexdir/tex/primitive.h \
-	luatexdir/tex/printing.h luatexdir/tex/scanning.h \
-	luatexdir/tex/stringpool.h luatexdir/tex/texdeffont.h \
-	luatexdir/tex/texfileio.h luatexdir/tex/texmath.h \
-	luatexdir/tex/texnodes.h luatexdir/tex/textoken.h \
-	luatexdir/tex/textcodes.h luatexdir/utils/avl.c \
-	luatexdir/utils/avl.h luatexdir/utils/avlstuff.h \
-	luatexdir/utils/managed-sa.h luatexdir/utils/utils.h \
-	luatexdir/utils/unistring.h synctexdir/synctex-common.h \
-	synctexdir/synctex-luatex.h synctexdir/synctex.c \
-	synctexdir/synctex.h
+	luatexdir/lua/llualib.c luatexdir/lua/lnodelib.c \
+	luatexdir/lua/liolibext.c luatexdir/lua/loslibext.c \
+	luatexdir/lua/lpdflib.c luatexdir/lua/lstatslib.c \
+	luatexdir/lua/ltexiolib.c luatexdir/lua/ltexlib.c \
+	luatexdir/lua/lnewtokenlib.c luatexdir/lua/luatex-api.h \
+	luatexdir/lua/luatex-core.c luatexdir/lua/helpers.c \
+	luatexdir/lua/luainit.c luatexdir/lua/luanode.c \
+	luatexdir/lua/luastuff.c luatexdir/lua/luatoken.c \
+	luatexdir/lua/mplibstuff.c luatexdir/pdf/pdfpagetree.h \
+	luatexdir/pdf/pdfaction.h luatexdir/pdf/pdfannot.h \
+	luatexdir/pdf/pdfcolorstack.h luatexdir/pdf/pdfdest.h \
+	luatexdir/pdf/pdffont.h luatexdir/pdf/pdfgen.h \
+	luatexdir/pdf/pdfglyph.h luatexdir/pdf/pdfimage.h \
+	luatexdir/pdf/pdflink.h luatexdir/pdf/pdflistout.h \
+	luatexdir/pdf/pdfliteral.h luatexdir/pdf/pdfobj.h \
+	luatexdir/pdf/pdfoutline.h luatexdir/pdf/pdfpage.h \
+	luatexdir/pdf/pdfrule.h luatexdir/pdf/pdfsaverestore.h \
+	luatexdir/pdf/pdfsetmatrix.h luatexdir/pdf/pdfshipout.h \
+	luatexdir/pdf/pdftables.h luatexdir/pdf/pdfthread.h \
+	luatexdir/pdf/pdftypes.h luatexdir/pdf/pdfxform.h \
+	luatexdir/pdf/pdfaction.c luatexdir/pdf/pdfannot.c \
+	luatexdir/pdf/pdfcolorstack.c luatexdir/pdf/pdfdest.c \
+	luatexdir/pdf/pdffont.c luatexdir/pdf/pdfgen.c \
+	luatexdir/pdf/pdfglyph.c luatexdir/pdf/pdfimage.c \
+	luatexdir/pdf/pdflink.c luatexdir/pdf/pdflistout.c \
+	luatexdir/pdf/pdfliteral.c luatexdir/pdf/pdfobj.c \
+	luatexdir/pdf/pdfoutline.c luatexdir/pdf/pdfpage.c \
+	luatexdir/pdf/pdfpagetree.c luatexdir/pdf/pdfrule.c \
+	luatexdir/pdf/pdfsaverestore.c luatexdir/pdf/pdfsetmatrix.c \
+	luatexdir/pdf/pdfshipout.c luatexdir/pdf/pdftables.c \
+	luatexdir/pdf/pdfthread.c luatexdir/pdf/pdfxform.c \
+	luatexdir/tex/align.h luatexdir/tex/arithmetic.h \
+	luatexdir/tex/backend.h luatexdir/tex/backend.c \
+	luatexdir/tex/buildpage.h luatexdir/tex/commands.h \
+	luatexdir/tex/conditional.h luatexdir/tex/directions.h \
+	luatexdir/tex/dumpdata.h luatexdir/tex/equivalents.h \
+	luatexdir/tex/errors.h luatexdir/tex/expand.h \
+	luatexdir/tex/extensions.h luatexdir/tex/filename.h \
+	luatexdir/tex/inputstack.h luatexdir/tex/linebreak.h \
+	luatexdir/tex/mainbody.h luatexdir/tex/maincontrol.h \
+	luatexdir/tex/mathcodes.h luatexdir/tex/memoryword.h \
+	luatexdir/tex/mlist.h luatexdir/tex/nesting.h \
+	luatexdir/tex/packaging.h luatexdir/tex/postlinebreak.h \
+	luatexdir/tex/primitive.h luatexdir/tex/printing.h \
+	luatexdir/tex/scanning.h luatexdir/tex/stringpool.h \
+	luatexdir/tex/texdeffont.h luatexdir/tex/texfileio.h \
+	luatexdir/tex/texmath.h luatexdir/tex/texnodes.h \
+	luatexdir/tex/textcodes.h luatexdir/tex/textoken.h \
+	luatexdir/tex/align.c luatexdir/tex/arithmetic.c \
+	luatexdir/tex/buildpage.c luatexdir/tex/commands.c \
+	luatexdir/tex/conditional.c luatexdir/tex/directions.c \
+	luatexdir/tex/dumpdata.c luatexdir/tex/equivalents.c \
+	luatexdir/tex/errors.c luatexdir/tex/expand.c \
+	luatexdir/tex/extensions.c luatexdir/tex/filename.c \
+	luatexdir/tex/inputstack.c luatexdir/tex/linebreak.c \
+	luatexdir/tex/mainbody.c luatexdir/tex/maincontrol.c \
+	luatexdir/tex/mathcodes.c luatexdir/tex/memoryword.c \
+	luatexdir/tex/mlist.c luatexdir/tex/nesting.c \
+	luatexdir/tex/packaging.c luatexdir/tex/postlinebreak.c \
+	luatexdir/tex/primitive.c luatexdir/tex/printing.c \
+	luatexdir/tex/scanning.c luatexdir/tex/stringpool.c \
+	luatexdir/tex/texdeffont.c luatexdir/tex/texfileio.c \
+	luatexdir/tex/texmath.c luatexdir/tex/texnodes.c \
+	luatexdir/tex/textcodes.c luatexdir/tex/textoken.c \
+	luatexdir/utils/avl.c luatexdir/utils/avl.h \
+	luatexdir/utils/avlstuff.h luatexdir/utils/managed-sa.h \
+	luatexdir/utils/utils.h luatexdir/utils/unistring.h \
+	luatexdir/utils/avlstuff.c luatexdir/utils/managed-sa.c \
+	luatexdir/utils/unistring.c luatexdir/utils/utils.c \
+	synctexdir/synctex-common.h synctexdir/synctex-luatex.h \
+	synctexdir/synctex.c synctexdir/synctex.h
 luatex_dvi_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/dvi $(ctangle)
 luatex_font_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/font $(ctangle)
 luatex_image_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/image $(ctangle)
@@ -4457,12 +4865,78 @@
 	luatexdir/luaffi/parser.c
 
 liblua53ffi_sources = $(libluaffi_sources)
+libluapplib_a_DEPENDENCIES = $(ZLIB_DEPEND)
+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)
 
+liblua53pplib_a_CPPFLAGS = \
+	-I$(top_srcdir)/luatexdir/luapplib -I$(top_srcdir)/luatexdir/luapplib/util $(ZLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
+
+libluajitpplib_a_CPPFLAGS = \
+	-I$(top_srcdir)/luatexdir/luapplib -I$(top_srcdir)/luatexdir/luapplib/util $(ZLIB_INCLUDES) $(LUAJIT_INCLUDES)
+
+libluapplib_a_CFLAGS = # $(WARNING_CFLAGS)
+libluajitpplib_a_CFLAGS = # $(WARNING_CFLAGS)
+nodist_libluapplib_a_SOURCES = $(libluapplib_sources)
+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/ppxref.c \
+	luatexdir/luapplib/ppxref.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/zlib/zconf.h \
+	luatexdir/luapplib/zlib/zlib.h 
+
+liblua53pplib_sources = $(libluapplib_sources)
+libluajitpplib_sources = $(libluapplib_sources)
+
 # Force Automake to use CXXLD for linking
-nodist_EXTRA_luatex_SOURCES = dummy.cxx
-nodist_EXTRA_luatex53_SOURCES = dummy.cxx
-nodist_EXTRA_luajittex_SOURCES = dummy.cxx
-luatex_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(POPPLER_INCLUDES) 
+#nodist_EXTRA_luatex_SOURCES = dummy.cxx
+#nodist_EXTRA_luatex53_SOURCES = dummy.cxx
+#nodist_EXTRA_luajittex_SOURCES = dummy.cxx
+luatex_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) 
 luatex_postflags = -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \
 	-I$(srcdir)/mplibdir -Dextra_version_info=`date +-%Y%m%d%H` \
 	-I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='<synctex-luatex.h>'
@@ -4476,12 +4950,14 @@
 luatex_LDFLAGS = -export-dynamic
 luatex53_LDFLAGS = -export-dynamic
 luajittex_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
-luatex_postldadd = libmplibcore.a $(MPFR_LIBS) $(GMP_LIBS) \
-	$(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) \
-	$(LDADD) libmputil.a libunilib.a libmd5.a $(lua_socketlibs)
-luatex_LDADD = libluatex.a libff.a libluamisc.a libluasocket.a libluaffi.a $(LUA_LIBS) $(luatex_postldadd)
-luatex53_LDADD = liblua53tex.a libff.a liblua53misc.a liblua53socket.a liblua53ffi.a $(LUA_LUA53_LIBS) $(luatex_postldadd)
-luajittex_LDADD = libluajittex.a libff.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) $(luatex_postldadd)
+
+#luatex_postldadd = libmplibcore.a $(MPFR_LIBS) $(GMP_LIBS) 
+luatex_postldadd = libmplibcore.a $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) \
+	$(ZLIB_LIBS) $(LDADD) libmputil.a libunilib.a libmd5.a \
+	$(lua_socketlibs)
+luatex_LDADD = libluatex.a libff.a libluamisc.a libluasocket.a libluaffi.a libluapplib.a $(LUA_LIBS) $(luatex_postldadd)
+luatex53_LDADD = liblua53tex.a libff.a liblua53misc.a liblua53socket.a liblua53ffi.a liblua53pplib.a $(LUA_LUA53_LIBS) $(luatex_postldadd)
+luajittex_LDADD = libluajittex.a libff.a libluajitmisc.a libluajitsocket.a libluajitpplib.a $(LUAJIT_LIBS) $(luatex_postldadd)
 luatex_depend = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) libmputil.a libmd5.a
 luatex_DEPENDENCIES = $(luatex_depend) libluatex.a
 luatex53_DEPENDENCIES = $(luatex_depend) liblua53tex.a
@@ -4687,6 +5163,7 @@
 pkgconfigdir = ${libdir}/pkgconfig
 @SYNCTEX_TRUE at syncinclude_HEADERS = \
 @SYNCTEX_TRUE@	synctexdir/synctex_parser.h \
+ at SYNCTEX_TRUE@	synctexdir/synctex_version.h \
 @SYNCTEX_TRUE@	synctexdir/synctex_parser_utils.h
 
 @SYNCTEX_TRUE at pkgconfig_DATA = synctexdir/synctex.pc
@@ -4790,7 +5267,7 @@
 .SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .pl .pl$(EXEEXT) .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luapplib.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -4812,7 +5289,7 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
-$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luapplib.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -5223,6 +5700,77 @@
 	$(AM_V_at)-rm -f liblua53misc.a
 	$(AM_V_AR)$(liblua53misc_a_AR) liblua53misc.a $(liblua53misc_a_OBJECTS) $(liblua53misc_a_LIBADD)
 	$(AM_V_at)$(RANLIB) liblua53misc.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/liblua53pplib_a-pparray.$(OBJEXT):  \
+	luatexdir/luapplib/$(am__dirstamp) \
+	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/liblua53pplib_a-ppcrypt.$(OBJEXT):  \
+	luatexdir/luapplib/$(am__dirstamp) \
+	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/liblua53pplib_a-ppdict.$(OBJEXT):  \
+	luatexdir/luapplib/$(am__dirstamp) \
+	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/liblua53pplib_a-ppheap.$(OBJEXT):  \
+	luatexdir/luapplib/$(am__dirstamp) \
+	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/liblua53pplib_a-ppload.$(OBJEXT):  \
+	luatexdir/luapplib/$(am__dirstamp) \
+	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/liblua53pplib_a-ppstream.$(OBJEXT):  \
+	luatexdir/luapplib/$(am__dirstamp) \
+	luatexdir/luapplib/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/liblua53pplib_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/liblua53pplib_a-utilbasexx.$(OBJEXT):  \
+	luatexdir/luapplib/util/$(am__dirstamp) \
+	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/util/liblua53pplib_a-utilcrypt.$(OBJEXT):  \
+	luatexdir/luapplib/util/$(am__dirstamp) \
+	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/util/liblua53pplib_a-utilflate.$(OBJEXT):  \
+	luatexdir/luapplib/util/$(am__dirstamp) \
+	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/util/liblua53pplib_a-utilfpred.$(OBJEXT):  \
+	luatexdir/luapplib/util/$(am__dirstamp) \
+	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/util/liblua53pplib_a-utiliof.$(OBJEXT):  \
+	luatexdir/luapplib/util/$(am__dirstamp) \
+	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/util/liblua53pplib_a-utillog.$(OBJEXT):  \
+	luatexdir/luapplib/util/$(am__dirstamp) \
+	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/util/liblua53pplib_a-utillzw.$(OBJEXT):  \
+	luatexdir/luapplib/util/$(am__dirstamp) \
+	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/util/liblua53pplib_a-utilmd5.$(OBJEXT):  \
+	luatexdir/luapplib/util/$(am__dirstamp) \
+	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/util/liblua53pplib_a-utilmem.$(OBJEXT):  \
+	luatexdir/luapplib/util/$(am__dirstamp) \
+	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/util/liblua53pplib_a-utilnumber.$(OBJEXT):  \
+	luatexdir/luapplib/util/$(am__dirstamp) \
+	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luapplib/util/liblua53pplib_a-utilsha.$(OBJEXT):  \
+	luatexdir/luapplib/util/$(am__dirstamp) \
+	luatexdir/luapplib/util/$(DEPDIR)/$(am__dirstamp)
+
+liblua53pplib.a: $(liblua53pplib_a_OBJECTS) $(liblua53pplib_a_DEPENDENCIES) $(EXTRA_liblua53pplib_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f liblua53pplib.a
+	$(AM_V_AR)$(liblua53pplib_a_AR) liblua53pplib.a $(liblua53pplib_a_OBJECTS) $(liblua53pplib_a_LIBADD)
+	$(AM_V_at)$(RANLIB) liblua53pplib.a
 luatexdir/luasocket/src/$(am__dirstamp):
 	@$(MKDIR_P) luatexdir/luasocket/src
 	@: > luatexdir/luasocket/src/$(am__dirstamp)
@@ -5291,6 +5839,12 @@
 luatexdir/lua/liblua53tex_a-lstrlibext.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/liblua53tex_a-helpers.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/liblua53tex_a-texluac.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
 luatexdir/luafontloader/src/$(am__dirstamp):
 	@$(MKDIR_P) luatexdir/luafontloader/src
 	@: > luatexdir/luafontloader/src/$(am__dirstamp)
@@ -5303,6 +5857,120 @@
 luatexdir/luafontloader/src/liblua53tex_a-luafflib.$(OBJEXT):  \
 	luatexdir/luafontloader/src/$(am__dirstamp) \
 	luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/dvi/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/dvi
+	@: > luatexdir/dvi/$(am__dirstamp)
+luatexdir/dvi/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/dvi/$(DEPDIR)
+	@: > luatexdir/dvi/$(DEPDIR)/$(am__dirstamp)
+luatexdir/dvi/liblua53tex_a-dvigen.$(OBJEXT):  \
+	luatexdir/dvi/$(am__dirstamp) \
+	luatexdir/dvi/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/font
+	@: > luatexdir/font/$(am__dirstamp)
+luatexdir/font/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/font/$(DEPDIR)
+	@: > luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-dofont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-luafont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-mapfile.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-pkin.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-sfnt.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-texfont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-tfmofm.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-tounicode.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-tt_glyf.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-tt_table.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-vfovf.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-vfpacket.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-writecff.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-writeenc.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-writefont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-writet1.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-writet3.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-writettf.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-writetype0.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/liblua53tex_a-writetype2.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/image
+	@: > luatexdir/image/$(am__dirstamp)
+luatexdir/image/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/image/$(DEPDIR)
+	@: > luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/liblua53tex_a-pdftoepdf.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/liblua53tex_a-writeimg.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/liblua53tex_a-writejbig2.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/liblua53tex_a-writejp2.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/liblua53tex_a-writejpg.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/liblua53tex_a-writepng.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lang/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/lang
+	@: > luatexdir/lang/$(am__dirstamp)
+luatexdir/lang/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/lang/$(DEPDIR)
+	@: > luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lang/liblua53tex_a-hnjalloc.$(OBJEXT):  \
+	luatexdir/lang/$(am__dirstamp) \
+	luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lang/liblua53tex_a-hyphen.$(OBJEXT):  \
+	luatexdir/lang/$(am__dirstamp) \
+	luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lang/liblua53tex_a-texlang.$(OBJEXT):  \
+	luatexdir/lang/$(am__dirstamp) \
+	luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
 luatexdir/lua/liblua53tex_a-lcallbacklib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
@@ -5312,10 +5980,10 @@
 luatexdir/lua/liblua53tex_a-limglib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
-luatexdir/lua/liblua53tex_a-lpdfscannerlib.$(OBJEXT):  \
+luatexdir/lua/liblua53tex_a-lpdfelib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
-luatexdir/lua/liblua53tex_a-lepdflib.$(OBJEXT):  \
+luatexdir/lua/liblua53tex_a-lpdfscannerlib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
 luatexdir/lua/liblua53tex_a-lkpselib.$(OBJEXT):  \
@@ -5327,9 +5995,6 @@
 luatexdir/lua/liblua53tex_a-llualib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
-luatexdir/lua/liblua53tex_a-llfslibext.$(OBJEXT):  \
-	luatexdir/lua/$(am__dirstamp) \
-	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
 luatexdir/lua/liblua53tex_a-lnodelib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
@@ -5357,6 +6022,198 @@
 luatexdir/lua/liblua53tex_a-luatex-core.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/liblua53tex_a-luainit.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/liblua53tex_a-luanode.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/liblua53tex_a-luastuff.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/liblua53tex_a-luatoken.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/liblua53tex_a-mplibstuff.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/pdf
+	@: > luatexdir/pdf/$(am__dirstamp)
+luatexdir/pdf/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/pdf/$(DEPDIR)
+	@: > luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfaction.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfannot.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfcolorstack.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfdest.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdffont.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfgen.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfglyph.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfimage.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdflink.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdflistout.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfliteral.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfobj.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfoutline.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfpage.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfpagetree.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfrule.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfsaverestore.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfsetmatrix.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfshipout.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdftables.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfthread.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/liblua53tex_a-pdfxform.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/tex
+	@: > luatexdir/tex/$(am__dirstamp)
+luatexdir/tex/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) luatexdir/tex/$(DEPDIR)
+	@: > luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-backend.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-align.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-arithmetic.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-buildpage.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-commands.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-conditional.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-directions.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-dumpdata.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-equivalents.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-errors.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-expand.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-extensions.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-filename.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-inputstack.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-linebreak.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-mainbody.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-maincontrol.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-mathcodes.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-memoryword.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-mlist.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-nesting.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-packaging.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-postlinebreak.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-primitive.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-printing.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-scanning.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-stringpool.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-texdeffont.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-texfileio.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-texmath.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-texnodes.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-textcodes.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/liblua53tex_a-textoken.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
 luatexdir/utils/$(am__dirstamp):
 	@$(MKDIR_P) luatexdir/utils
 	@: > luatexdir/utils/$(am__dirstamp)
@@ -5366,6 +6223,18 @@
 luatexdir/utils/liblua53tex_a-avl.$(OBJEXT):  \
 	luatexdir/utils/$(am__dirstamp) \
 	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/liblua53tex_a-avlstuff.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/liblua53tex_a-managed-sa.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/liblua53tex_a-unistring.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/liblua53tex_a-utils.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
 synctexdir/$(am__dirstamp):
 	@$(MKDIR_P) synctexdir
 	@: > synctexdir/$(am__dirstamp)
@@ -5426,6 +6295,65 @@
 	$(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/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-ppxref.$(OBJEXT):  \
+	luatexdir/luapplib/$(am__dirstamp) \
+	luatexdir/luapplib/$(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)
+
+libluajitpplib.a: $(libluajitpplib_a_OBJECTS) $(libluajitpplib_a_DEPENDENCIES) $(EXTRA_libluajitpplib_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libluajitpplib.a
+	$(AM_V_AR)$(libluajitpplib_a_AR) libluajitpplib.a $(libluajitpplib_a_OBJECTS) $(libluajitpplib_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libluajitpplib.a
 luatexdir/luasocket/src/libluajitsocket_a-auxiliar.$(OBJEXT):  \
 	luatexdir/luasocket/src/$(am__dirstamp) \
 	luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
@@ -5482,6 +6410,9 @@
 luatexdir/lua/libluajittex_a-lstrlibext.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluajittex_a-texluajitc.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
 luatexdir/luafontloader/src/libluajittex_a-ffdummies.$(OBJEXT):  \
 	luatexdir/luafontloader/src/$(am__dirstamp) \
 	luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp)
@@ -5488,6 +6419,96 @@
 luatexdir/luafontloader/src/libluajittex_a-luafflib.$(OBJEXT):  \
 	luatexdir/luafontloader/src/$(am__dirstamp) \
 	luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/dvi/libluajittex_a-dvigen.$(OBJEXT):  \
+	luatexdir/dvi/$(am__dirstamp) \
+	luatexdir/dvi/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-dofont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-luafont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-mapfile.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-pkin.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-sfnt.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-texfont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-tfmofm.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-tounicode.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-tt_glyf.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-tt_table.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-vfovf.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-vfpacket.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-writecff.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-writeenc.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-writefont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-writet1.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-writet3.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-writettf.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-writetype0.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluajittex_a-writetype2.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluajittex_a-pdftoepdf.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluajittex_a-writeimg.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluajittex_a-writejbig2.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluajittex_a-writejp2.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluajittex_a-writejpg.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluajittex_a-writepng.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lang/libluajittex_a-hnjalloc.$(OBJEXT):  \
+	luatexdir/lang/$(am__dirstamp) \
+	luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lang/libluajittex_a-hyphen.$(OBJEXT):  \
+	luatexdir/lang/$(am__dirstamp) \
+	luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lang/libluajittex_a-texlang.$(OBJEXT):  \
+	luatexdir/lang/$(am__dirstamp) \
+	luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
 luatexdir/lua/libluajittex_a-lcallbacklib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
@@ -5497,10 +6518,10 @@
 luatexdir/lua/libluajittex_a-limglib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
-luatexdir/lua/libluajittex_a-lpdfscannerlib.$(OBJEXT):  \
+luatexdir/lua/libluajittex_a-lpdfelib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
-luatexdir/lua/libluajittex_a-lepdflib.$(OBJEXT):  \
+luatexdir/lua/libluajittex_a-lpdfscannerlib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
 luatexdir/lua/libluajittex_a-lkpselib.$(OBJEXT):  \
@@ -5512,9 +6533,6 @@
 luatexdir/lua/libluajittex_a-llualib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
-luatexdir/lua/libluajittex_a-llfslibext.$(OBJEXT):  \
-	luatexdir/lua/$(am__dirstamp) \
-	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
 luatexdir/lua/libluajittex_a-lnodelib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
@@ -5542,9 +6560,204 @@
 luatexdir/lua/libluajittex_a-luatex-core.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluajittex_a-helpers.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluajittex_a-luainit.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluajittex_a-luanode.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluajittex_a-luastuff.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluajittex_a-luatoken.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluajittex_a-mplibstuff.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfaction.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfannot.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfcolorstack.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfdest.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdffont.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfgen.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfglyph.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfimage.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdflink.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdflistout.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfliteral.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfobj.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfoutline.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfpage.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfpagetree.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfrule.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfsaverestore.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfsetmatrix.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfshipout.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdftables.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfthread.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluajittex_a-pdfxform.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-backend.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-align.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-arithmetic.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-buildpage.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-commands.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-conditional.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-directions.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-dumpdata.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-equivalents.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-errors.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-expand.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-extensions.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-filename.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-inputstack.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-linebreak.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-mainbody.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-maincontrol.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-mathcodes.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-memoryword.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-mlist.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-nesting.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-packaging.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-postlinebreak.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-primitive.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-printing.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-scanning.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-stringpool.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-texdeffont.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-texfileio.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-texmath.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-texnodes.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-textcodes.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluajittex_a-textoken.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
 luatexdir/utils/libluajittex_a-avl.$(OBJEXT):  \
 	luatexdir/utils/$(am__dirstamp) \
 	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/libluajittex_a-avlstuff.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/libluajittex_a-managed-sa.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/libluajittex_a-unistring.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/libluajittex_a-utils.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
 synctexdir/libluajittex_a-synctex.$(OBJEXT):  \
 	synctexdir/$(am__dirstamp) \
 	synctexdir/$(DEPDIR)/$(am__dirstamp)
@@ -5582,6 +6795,65 @@
 	$(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-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)
+
+libluapplib.a: $(libluapplib_a_OBJECTS) $(libluapplib_a_DEPENDENCIES) $(EXTRA_libluapplib_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libluapplib.a
+	$(AM_V_AR)$(libluapplib_a_AR) libluapplib.a $(libluapplib_a_OBJECTS) $(libluapplib_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libluapplib.a
 luatexdir/luasocket/src/libluasocket_a-auxiliar.$(OBJEXT):  \
 	luatexdir/luasocket/src/$(am__dirstamp) \
 	luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
@@ -5638,6 +6910,12 @@
 luatexdir/lua/libluatex_a-lstrlibext.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluatex_a-helpers.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluatex_a-texluac.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
 luatexdir/luafontloader/src/libluatex_a-ffdummies.$(OBJEXT):  \
 	luatexdir/luafontloader/src/$(am__dirstamp) \
 	luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp)
@@ -5644,6 +6922,96 @@
 luatexdir/luafontloader/src/libluatex_a-luafflib.$(OBJEXT):  \
 	luatexdir/luafontloader/src/$(am__dirstamp) \
 	luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp)
+luatexdir/dvi/libluatex_a-dvigen.$(OBJEXT):  \
+	luatexdir/dvi/$(am__dirstamp) \
+	luatexdir/dvi/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-dofont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-luafont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-mapfile.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-pkin.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-sfnt.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-texfont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-tfmofm.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-tounicode.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-tt_glyf.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-tt_table.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-vfovf.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-vfpacket.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-writecff.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-writeenc.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-writefont.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-writet1.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-writet3.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-writettf.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-writetype0.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/font/libluatex_a-writetype2.$(OBJEXT):  \
+	luatexdir/font/$(am__dirstamp) \
+	luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluatex_a-pdftoepdf.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluatex_a-writeimg.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluatex_a-writejbig2.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluatex_a-writejp2.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluatex_a-writejpg.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/image/libluatex_a-writepng.$(OBJEXT):  \
+	luatexdir/image/$(am__dirstamp) \
+	luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lang/libluatex_a-hnjalloc.$(OBJEXT):  \
+	luatexdir/lang/$(am__dirstamp) \
+	luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lang/libluatex_a-hyphen.$(OBJEXT):  \
+	luatexdir/lang/$(am__dirstamp) \
+	luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lang/libluatex_a-texlang.$(OBJEXT):  \
+	luatexdir/lang/$(am__dirstamp) \
+	luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
 luatexdir/lua/libluatex_a-lcallbacklib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
@@ -5653,10 +7021,10 @@
 luatexdir/lua/libluatex_a-limglib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
-luatexdir/lua/libluatex_a-lpdfscannerlib.$(OBJEXT):  \
+luatexdir/lua/libluatex_a-lpdfelib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
-luatexdir/lua/libluatex_a-lepdflib.$(OBJEXT):  \
+luatexdir/lua/libluatex_a-lpdfscannerlib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
 luatexdir/lua/libluatex_a-lkpselib.$(OBJEXT):  \
@@ -5668,9 +7036,6 @@
 luatexdir/lua/libluatex_a-llualib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
-luatexdir/lua/libluatex_a-llfslibext.$(OBJEXT):  \
-	luatexdir/lua/$(am__dirstamp) \
-	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
 luatexdir/lua/libluatex_a-lnodelib.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
@@ -5698,9 +7063,201 @@
 luatexdir/lua/libluatex_a-luatex-core.$(OBJEXT):  \
 	luatexdir/lua/$(am__dirstamp) \
 	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluatex_a-luainit.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluatex_a-luanode.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluatex_a-luastuff.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluatex_a-luatoken.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/lua/libluatex_a-mplibstuff.$(OBJEXT):  \
+	luatexdir/lua/$(am__dirstamp) \
+	luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfaction.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfannot.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfcolorstack.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfdest.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdffont.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfgen.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfglyph.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfimage.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdflink.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdflistout.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfliteral.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfobj.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfoutline.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfpage.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfpagetree.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfrule.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfsaverestore.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfsetmatrix.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfshipout.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdftables.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfthread.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/pdf/libluatex_a-pdfxform.$(OBJEXT):  \
+	luatexdir/pdf/$(am__dirstamp) \
+	luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-backend.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-align.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-arithmetic.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-buildpage.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-commands.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-conditional.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-directions.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-dumpdata.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-equivalents.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-errors.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-expand.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-extensions.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-filename.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-inputstack.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-linebreak.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-mainbody.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-maincontrol.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-mathcodes.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-memoryword.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-mlist.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-nesting.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-packaging.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-postlinebreak.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-primitive.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-printing.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-scanning.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-stringpool.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-texdeffont.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-texfileio.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-texmath.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-texnodes.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-textcodes.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+luatexdir/tex/libluatex_a-textoken.$(OBJEXT):  \
+	luatexdir/tex/$(am__dirstamp) \
+	luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
 luatexdir/utils/libluatex_a-avl.$(OBJEXT):  \
 	luatexdir/utils/$(am__dirstamp) \
 	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/libluatex_a-avlstuff.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/libluatex_a-managed-sa.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/libluatex_a-unistring.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+luatexdir/utils/libluatex_a-utils.$(OBJEXT):  \
+	luatexdir/utils/$(am__dirstamp) \
+	luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
 synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
 	synctexdir/$(DEPDIR)/$(am__dirstamp)
 
@@ -5762,6 +7319,11 @@
 	$(AM_V_at)-rm -f libmplibcore.a
 	$(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libmplibcore.a
+
+libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libmplibextramath.a
+	$(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmplibextramath.a
 mplibdir/$(am__dirstamp):
 	@$(MKDIR_P) mplibdir
 	@: > mplibdir/$(am__dirstamp)
@@ -6135,7 +7697,7 @@
 
 luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES) 
 	@rm -f luajittex$(EXEEXT)
-	$(AM_V_CXXLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS)
 luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
 	luatexdir/$(DEPDIR)/$(am__dirstamp)
 mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
@@ -6143,7 +7705,7 @@
 
 luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES) 
 	@rm -f luatex$(EXEEXT)
-	$(AM_V_CXXLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS)
 luatexdir/luatex53-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
 	luatexdir/$(DEPDIR)/$(am__dirstamp)
 mplibdir/luatex53-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
@@ -6151,7 +7713,7 @@
 
 luatex53$(EXEEXT): $(luatex53_OBJECTS) $(luatex53_DEPENDENCIES) $(EXTRA_luatex53_DEPENDENCIES) 
 	@rm -f luatex53$(EXEEXT)
-	$(AM_V_CXXLD)$(luatex53_LINK) $(luatex53_OBJECTS) $(luatex53_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(luatex53_LINK) $(luatex53_OBJECTS) $(luatex53_LDADD) $(LIBS)
 libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \
 	libmd5/$(DEPDIR)/$(am__dirstamp)
 
@@ -6389,6 +7951,10 @@
 	-rm -f euptexdir/*.$(OBJEXT)
 	-rm -f libmd5/*.$(OBJEXT)
 	-rm -f luatexdir/*.$(OBJEXT)
+	-rm -f luatexdir/dvi/*.$(OBJEXT)
+	-rm -f luatexdir/font/*.$(OBJEXT)
+	-rm -f luatexdir/image/*.$(OBJEXT)
+	-rm -f luatexdir/lang/*.$(OBJEXT)
 	-rm -f luatexdir/lua/*.$(OBJEXT)
 	-rm -f luatexdir/luaffi/*.$(OBJEXT)
 	-rm -f luatexdir/luafilesystem/src/*.$(OBJEXT)
@@ -6397,10 +7963,14 @@
 	-rm -f luatexdir/luafontloader/src/*.$(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/luasocket/src/*.$(OBJEXT)
 	-rm -f luatexdir/luazip/src/*.$(OBJEXT)
 	-rm -f luatexdir/luazlib/*.$(OBJEXT)
+	-rm -f luatexdir/pdf/*.$(OBJEXT)
 	-rm -f luatexdir/slnunicode/*.$(OBJEXT)
+	-rm -f luatexdir/tex/*.$(OBJEXT)
 	-rm -f luatexdir/unilib/*.$(OBJEXT)
 	-rm -f luatexdir/utils/*.$(OBJEXT)
 	-rm -f mfluadir/*.$(OBJEXT)
@@ -6452,290 +8022,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftopk.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftype.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/initex-callexe.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-align.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-arithmetic.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-avlstuff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-buildpage.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-commands.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-conditional.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-directions.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-dofont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-dumpdata.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-dvigen.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-equivalents.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-errors.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-expand.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-extensions.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-filename.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-helpers.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-hnjalloc.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-hyphen.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-inputstack.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-linebreak.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luafont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luainit.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luanode.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luastuff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luatoken.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mainbody.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-maincontrol.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-managed-sa.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mapfile.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mathcodes.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-memoryword.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mlist.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mplibstuff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-nesting.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-packaging.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfaction.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfannot.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfcolorstack.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfdest.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdffont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfgen.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfglyph.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfimage.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdflink.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdflistout.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfliteral.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfobj.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfoutline.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfpage.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfpagetree.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfrule.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfsaverestore.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfsetmatrix.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfshipout.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdftables.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfthread.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdftoepdf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfxform.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pkin.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-postlinebreak.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-primitive.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-printing.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-scanning.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-sfnt.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-stringpool.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texdeffont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texfileio.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texfont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texlang.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texluac.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texmath.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texnodes.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-textcodes.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-textoken.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tfmofm.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tounicode.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tt_glyf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tt_table.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-unistring.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-utils.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-vfovf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-vfpacket.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writecff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writeenc.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writefont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writeimg.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writejbig2.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writejp2.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writejpg.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writepng.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writet1.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writet3.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writettf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writetype0.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writetype2.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-align.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-arithmetic.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-avlstuff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-buildpage.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-commands.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-conditional.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-directions.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-dofont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-dumpdata.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-dvigen.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-equivalents.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-errors.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-expand.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-extensions.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-filename.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-hnjalloc.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-hyphen.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-inputstack.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-linebreak.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luafont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luainit.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luanode.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luastuff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luatoken.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mainbody.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-maincontrol.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-managed-sa.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mapfile.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mathcodes.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-memoryword.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mlist.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mplibstuff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-nesting.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-packaging.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfaction.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfannot.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfcolorstack.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfdest.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdffont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfgen.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfglyph.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfimage.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdflink.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdflistout.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfliteral.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfobj.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfoutline.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfpage.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfpagetree.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfrule.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfsaverestore.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfsetmatrix.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfshipout.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdftables.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfthread.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdftoepdf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfxform.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pkin.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-postlinebreak.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-primitive.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-printing.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-scanning.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-sfnt.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-stringpool.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texdeffont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texfileio.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texfont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texlang.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texluajitc.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texmath.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texnodes.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-textcodes.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-textoken.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tfmofm.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tounicode.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tt_glyf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tt_table.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-unistring.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-utils.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-vfovf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-vfpacket.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writecff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writeenc.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writefont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writeimg.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writejbig2.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writejp2.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writejpg.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writepng.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writet1.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writet3.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writettf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writetype0.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writetype2.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-align.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-arithmetic.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-avlstuff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-buildpage.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-commands.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-conditional.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-directions.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-dofont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-dumpdata.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-dvigen.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-equivalents.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-errors.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-expand.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-extensions.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-filename.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-helpers.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-hnjalloc.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-hyphen.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-inputstack.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-linebreak.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luafont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luainit.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luanode.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luastuff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luatoken.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mainbody.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-maincontrol.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-managed-sa.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mapfile.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mathcodes.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-memoryword.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mlist.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mplibstuff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-nesting.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-packaging.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfaction.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfannot.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfcolorstack.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfdest.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdffont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfgen.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfglyph.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfimage.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdflink.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdflistout.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfliteral.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfobj.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfoutline.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfpage.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfpagetree.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfrule.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfsaverestore.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfsetmatrix.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfshipout.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdftables.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfthread.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdftoepdf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfxform.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pkin.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-postlinebreak.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-primitive.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-printing.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-scanning.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-sfnt.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-stringpool.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texdeffont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texfileio.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texfont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texlang.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texluac.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texmath.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texnodes.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-textcodes.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-textoken.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tfmofm.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tounicode.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tt_glyf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tt_table.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-unistring.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-utils.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-vfovf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-vfpacket.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writecff.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writeenc.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writefont.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writeimg.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writejbig2.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writejp2.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writejpg.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writepng.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writet1.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writet3.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writettf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writetype0.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writetype2.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmflua_a-mflua-pool.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmflua_a-mflua0.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmflua_a-mfluaini.Po at am__quote@ # am--include-marker
@@ -6746,15 +8032,12 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibbackends_a-svgout.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mp.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmath.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmathbinary.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmathdecimal.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmathdouble.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpstrings.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-psout.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-tfmin.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/luajittex-dummy.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/luatex-dummy.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/luatex53-dummy.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibextramath_a-mpmathbinary.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mf-mfextra.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mf-pool.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mf0.Po at am__quote@ # am--include-marker
@@ -6844,18 +8127,108 @@
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/$(DEPDIR)/luajittex-luatex.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/$(DEPDIR)/luatex-luatex.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/$(DEPDIR)/luatex53-luatex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/dvi/$(DEPDIR)/liblua53tex_a-dvigen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/dvi/$(DEPDIR)/libluajittex_a-dvigen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/dvi/$(DEPDIR)/libluatex_a-dvigen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-dofont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-luafont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-mapfile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-pkin.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-sfnt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-texfont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-tfmofm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-tounicode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-tt_glyf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-tt_table.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-vfovf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-vfpacket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-writecff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-writeenc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-writefont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-writet1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-writet3.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-writettf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-writetype0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/liblua53tex_a-writetype2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-dofont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-luafont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-mapfile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-pkin.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-sfnt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-texfont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-tfmofm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-tounicode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-tt_glyf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-tt_table.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-vfovf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-vfpacket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-writecff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-writeenc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-writefont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-writet1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-writet3.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-writettf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-writetype0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluajittex_a-writetype2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-dofont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-luafont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-mapfile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-pkin.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-sfnt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-texfont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-tfmofm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-tounicode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-tt_glyf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-tt_table.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-vfovf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-vfpacket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-writecff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-writeenc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-writefont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-writet1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-writet3.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-writettf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-writetype0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/font/$(DEPDIR)/libluatex_a-writetype2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/liblua53tex_a-pdftoepdf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/liblua53tex_a-writeimg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/liblua53tex_a-writejbig2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/liblua53tex_a-writejp2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/liblua53tex_a-writejpg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/liblua53tex_a-writepng.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluajittex_a-pdftoepdf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluajittex_a-writeimg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluajittex_a-writejbig2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluajittex_a-writejp2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluajittex_a-writejpg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluajittex_a-writepng.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluatex_a-pdftoepdf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluatex_a-writeimg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluatex_a-writejbig2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluatex_a-writejp2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluatex_a-writejpg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/image/$(DEPDIR)/libluatex_a-writepng.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lang/$(DEPDIR)/liblua53tex_a-hnjalloc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lang/$(DEPDIR)/liblua53tex_a-hyphen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lang/$(DEPDIR)/liblua53tex_a-texlang.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lang/$(DEPDIR)/libluajittex_a-hnjalloc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lang/$(DEPDIR)/libluajittex_a-hyphen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lang/$(DEPDIR)/libluajittex_a-texlang.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lang/$(DEPDIR)/libluatex_a-hnjalloc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lang/$(DEPDIR)/libluatex_a-hyphen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lang/$(DEPDIR)/libluatex_a-texlang.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-helpers.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lcallbacklib.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lepdflib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lfontlib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-limglib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-liolibext.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lkpselib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-llanglib.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-llfslibext.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-llualib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnewtokenlib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnodelib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-loslibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdfelib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdflib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdfscannerlib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstatslib.Po at am__quote@ # am--include-marker
@@ -6862,19 +8235,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstrlibext.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexiolib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-luainit.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-luanode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-luastuff.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-luatex-core.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-luatoken.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-mplibstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-texluac.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-helpers.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lcallbacklib.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lepdflib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lfontlib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-limglib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-liolibext.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lkpselib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-llanglib.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-llfslibext.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-llualib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lnewtokenlib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lnodelib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-loslibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdfelib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdflib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdfscannerlib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lstatslib.Po at am__quote@ # am--include-marker
@@ -6881,19 +8260,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lstrlibext.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexiolib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-luainit.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-luanode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-luastuff.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-luatex-core.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-luatoken.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-mplibstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-texluajitc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-helpers.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lcallbacklib.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lepdflib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lfontlib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-limglib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-liolibext.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lkpselib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-llanglib.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-llfslibext.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-llualib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lnewtokenlib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lnodelib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-loslibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lpdfelib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lpdflib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lpdfscannerlib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lstatslib.Po at am__quote@ # am--include-marker
@@ -6900,7 +8285,13 @@
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lstrlibext.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-ltexiolib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-ltexlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-luainit.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-luanode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-luastuff.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-luatex-core.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-luatoken.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-mplibstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-texluac.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-call.Po at am__quote@ # am--include-marker
@@ -6971,6 +8362,60 @@
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapeg/$(DEPDIR)/liblua53misc_a-lpeg.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)/liblua53pplib_a-pparray.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppcrypt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppdict.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppheap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppload.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppstream.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppxref.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-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-ppxref.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilbasexx.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilcrypt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilflate.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilfpred.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utiliof.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillog.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillzw.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmd5.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmem.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilnumber.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilsha.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
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-auxiliar.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-buffer.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-compat.Po at am__quote@ # am--include-marker
@@ -7028,9 +8473,174 @@
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lzlib.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lgzip.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lzlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfaction.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfannot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfcolorstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfdest.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfgen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfglyph.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfimage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdflink.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdflistout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfliteral.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfobj.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfoutline.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfpagetree.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfrule.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfsaverestore.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfsetmatrix.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfshipout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdftables.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfthread.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/liblua53tex_a-pdfxform.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfaction.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfannot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfcolorstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfdest.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfgen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfglyph.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfimage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdflink.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdflistout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfliteral.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfobj.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfoutline.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfpagetree.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfrule.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfsaverestore.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfsetmatrix.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfshipout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdftables.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfthread.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluajittex_a-pdfxform.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfaction.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfannot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfcolorstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfdest.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfgen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfglyph.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfimage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdflink.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdflistout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfliteral.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfobj.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfoutline.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfpagetree.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfrule.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfsaverestore.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfsetmatrix.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfshipout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdftables.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfthread.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/pdf/$(DEPDIR)/libluatex_a-pdfxform.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/slnunicode/$(DEPDIR)/liblua53misc_a-slnunico.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/slnunicode/$(DEPDIR)/libluajitmisc_a-slnunico.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/slnunicode/$(DEPDIR)/libluamisc_a-slnunico.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-align.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-arithmetic.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-backend.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-buildpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-commands.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-conditional.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-directions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-dumpdata.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-equivalents.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-errors.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-expand.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-extensions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-filename.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-inputstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-linebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-mainbody.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-maincontrol.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-mathcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-memoryword.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-mlist.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-nesting.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-packaging.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-postlinebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-primitive.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-printing.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-scanning.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-stringpool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-texdeffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-texfileio.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-texmath.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-texnodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-textcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/liblua53tex_a-textoken.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-align.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-arithmetic.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-backend.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-buildpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-commands.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-conditional.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-directions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-dumpdata.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-equivalents.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-errors.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-expand.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-extensions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-filename.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-inputstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-linebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-mainbody.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-maincontrol.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-mathcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-memoryword.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-mlist.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-nesting.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-packaging.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-postlinebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-primitive.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-printing.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-scanning.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-stringpool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-texdeffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-texfileio.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-texmath.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-texnodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-textcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluajittex_a-textoken.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-align.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-arithmetic.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-backend.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-buildpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-commands.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-conditional.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-directions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-dumpdata.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-equivalents.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-errors.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-expand.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-extensions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-filename.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-inputstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-linebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-mainbody.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-maincontrol.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-mathcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-memoryword.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-mlist.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-nesting.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-packaging.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-postlinebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-primitive.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-printing.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-scanning.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-stringpool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-texdeffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-texfileio.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-texmath.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-texnodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-textcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/tex/$(DEPDIR)/libluatex_a-textoken.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Po at am__quote@ # am--include-marker
@@ -7042,8 +8652,20 @@
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-ustring.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-utype.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/liblua53tex_a-avl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/liblua53tex_a-avlstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/liblua53tex_a-managed-sa.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/liblua53tex_a-unistring.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/liblua53tex_a-utils.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluajittex_a-avl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluajittex_a-avlstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluajittex_a-managed-sa.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluajittex_a-unistring.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluajittex_a-utils.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluatex_a-avl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluatex_a-avlstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluatex_a-managed-sa.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluatex_a-unistring.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluatex_a-utils.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/libmflua_a-mfluac.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/mflua-mfluaextra.Po at am__quote@ # am--include-marker
@@ -7926,6 +9548,258 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53misc_a_CPPFLAGS) $(CPPFLAGS) $(liblua53misc_a_CFLAGS) $(CFLAGS) -c -o luatexdir/slnunicode/liblua53misc_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/liblua53pplib_a-pparray.o: luatexdir/luapplib/pparray.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-pparray.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-pparray.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-pparray.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-pparray.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pparray.c' object='luatexdir/luapplib/liblua53pplib_a-pparray.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_a-pparray.o `test -f 'luatexdir/luapplib/pparray.c' || echo '$(srcdir)/'`luatexdir/luapplib/pparray.c
+
+luatexdir/luapplib/liblua53pplib_a-pparray.obj: luatexdir/luapplib/pparray.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-pparray.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-pparray.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-pparray.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-pparray.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/pparray.c' object='luatexdir/luapplib/liblua53pplib_a-pparray.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_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`
+
+luatexdir/luapplib/liblua53pplib_a-ppcrypt.o: luatexdir/luapplib/ppcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppcrypt.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppcrypt.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppcrypt.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppcrypt.c' object='luatexdir/luapplib/liblua53pplib_a-ppcrypt.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_a-ppcrypt.o `test -f 'luatexdir/luapplib/ppcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppcrypt.c
+
+luatexdir/luapplib/liblua53pplib_a-ppcrypt.obj: luatexdir/luapplib/ppcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppcrypt.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppcrypt.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppcrypt.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppcrypt.c' object='luatexdir/luapplib/liblua53pplib_a-ppcrypt.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_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`
+
+luatexdir/luapplib/liblua53pplib_a-ppdict.o: luatexdir/luapplib/ppdict.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppdict.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppdict.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppdict.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppdict.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppdict.c' object='luatexdir/luapplib/liblua53pplib_a-ppdict.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_a-ppdict.o `test -f 'luatexdir/luapplib/ppdict.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppdict.c
+
+luatexdir/luapplib/liblua53pplib_a-ppdict.obj: luatexdir/luapplib/ppdict.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppdict.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppdict.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppdict.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppdict.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppdict.c' object='luatexdir/luapplib/liblua53pplib_a-ppdict.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_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`
+
+luatexdir/luapplib/liblua53pplib_a-ppheap.o: luatexdir/luapplib/ppheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppheap.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppheap.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppheap.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppheap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppheap.c' object='luatexdir/luapplib/liblua53pplib_a-ppheap.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_a-ppheap.o `test -f 'luatexdir/luapplib/ppheap.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppheap.c
+
+luatexdir/luapplib/liblua53pplib_a-ppheap.obj: luatexdir/luapplib/ppheap.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppheap.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppheap.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppheap.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppheap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppheap.c' object='luatexdir/luapplib/liblua53pplib_a-ppheap.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_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`
+
+luatexdir/luapplib/liblua53pplib_a-ppload.o: luatexdir/luapplib/ppload.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppload.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppload.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppload.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppload.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppload.c' object='luatexdir/luapplib/liblua53pplib_a-ppload.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_a-ppload.o `test -f 'luatexdir/luapplib/ppload.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppload.c
+
+luatexdir/luapplib/liblua53pplib_a-ppload.obj: luatexdir/luapplib/ppload.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppload.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppload.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppload.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppload.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppload.c' object='luatexdir/luapplib/liblua53pplib_a-ppload.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_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`
+
+luatexdir/luapplib/liblua53pplib_a-ppstream.o: luatexdir/luapplib/ppstream.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppstream.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppstream.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppstream.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppstream.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppstream.c' object='luatexdir/luapplib/liblua53pplib_a-ppstream.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_a-ppstream.o `test -f 'luatexdir/luapplib/ppstream.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppstream.c
+
+luatexdir/luapplib/liblua53pplib_a-ppstream.obj: luatexdir/luapplib/ppstream.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppstream.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppstream.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppstream.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppstream.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppstream.c' object='luatexdir/luapplib/liblua53pplib_a-ppstream.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_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`
+
+luatexdir/luapplib/liblua53pplib_a-ppxref.o: luatexdir/luapplib/ppxref.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppxref.o -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppxref.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppxref.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppxref.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppxref.c' object='luatexdir/luapplib/liblua53pplib_a-ppxref.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_a-ppxref.o `test -f 'luatexdir/luapplib/ppxref.c' || echo '$(srcdir)/'`luatexdir/luapplib/ppxref.c
+
+luatexdir/luapplib/liblua53pplib_a-ppxref.obj: luatexdir/luapplib/ppxref.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/liblua53pplib_a-ppxref.obj -MD -MP -MF luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppxref.Tpo -c -o luatexdir/luapplib/liblua53pplib_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)/liblua53pplib_a-ppxref.Tpo luatexdir/luapplib/$(DEPDIR)/liblua53pplib_a-ppxref.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/ppxref.c' object='luatexdir/luapplib/liblua53pplib_a-ppxref.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/liblua53pplib_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`
+
+luatexdir/luapplib/util/liblua53pplib_a-utilbasexx.o: luatexdir/luapplib/util/utilbasexx.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilbasexx.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilbasexx.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilbasexx.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilbasexx.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilbasexx.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilbasexx.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_a-utilbasexx.o `test -f 'luatexdir/luapplib/util/utilbasexx.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilbasexx.c
+
+luatexdir/luapplib/util/liblua53pplib_a-utilbasexx.obj: luatexdir/luapplib/util/utilbasexx.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilbasexx.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilbasexx.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilbasexx.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilbasexx.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilbasexx.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilbasexx.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_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`
+
+luatexdir/luapplib/util/liblua53pplib_a-utilcrypt.o: luatexdir/luapplib/util/utilcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilcrypt.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilcrypt.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilcrypt.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilcrypt.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilcrypt.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_a-utilcrypt.o `test -f 'luatexdir/luapplib/util/utilcrypt.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilcrypt.c
+
+luatexdir/luapplib/util/liblua53pplib_a-utilcrypt.obj: luatexdir/luapplib/util/utilcrypt.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilcrypt.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilcrypt.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilcrypt.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilcrypt.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilcrypt.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilcrypt.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_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`
+
+luatexdir/luapplib/util/liblua53pplib_a-utilflate.o: luatexdir/luapplib/util/utilflate.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilflate.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilflate.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilflate.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilflate.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilflate.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilflate.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_a-utilflate.o `test -f 'luatexdir/luapplib/util/utilflate.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilflate.c
+
+luatexdir/luapplib/util/liblua53pplib_a-utilflate.obj: luatexdir/luapplib/util/utilflate.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilflate.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilflate.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilflate.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilflate.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilflate.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilflate.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_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`
+
+luatexdir/luapplib/util/liblua53pplib_a-utilfpred.o: luatexdir/luapplib/util/utilfpred.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilfpred.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilfpred.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilfpred.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilfpred.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilfpred.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilfpred.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_a-utilfpred.o `test -f 'luatexdir/luapplib/util/utilfpred.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilfpred.c
+
+luatexdir/luapplib/util/liblua53pplib_a-utilfpred.obj: luatexdir/luapplib/util/utilfpred.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilfpred.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilfpred.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilfpred.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilfpred.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilfpred.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilfpred.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_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`
+
+luatexdir/luapplib/util/liblua53pplib_a-utiliof.o: luatexdir/luapplib/util/utiliof.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utiliof.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utiliof.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utiliof.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utiliof.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utiliof.c' object='luatexdir/luapplib/util/liblua53pplib_a-utiliof.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_a-utiliof.o `test -f 'luatexdir/luapplib/util/utiliof.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utiliof.c
+
+luatexdir/luapplib/util/liblua53pplib_a-utiliof.obj: luatexdir/luapplib/util/utiliof.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utiliof.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utiliof.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utiliof.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utiliof.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utiliof.c' object='luatexdir/luapplib/util/liblua53pplib_a-utiliof.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_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`
+
+luatexdir/luapplib/util/liblua53pplib_a-utillog.o: luatexdir/luapplib/util/utillog.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utillog.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillog.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utillog.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillog.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillog.c' object='luatexdir/luapplib/util/liblua53pplib_a-utillog.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_a-utillog.o `test -f 'luatexdir/luapplib/util/utillog.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utillog.c
+
+luatexdir/luapplib/util/liblua53pplib_a-utillog.obj: luatexdir/luapplib/util/utillog.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utillog.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillog.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utillog.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillog.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillog.c' object='luatexdir/luapplib/util/liblua53pplib_a-utillog.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_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`
+
+luatexdir/luapplib/util/liblua53pplib_a-utillzw.o: luatexdir/luapplib/util/utillzw.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utillzw.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillzw.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utillzw.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillzw.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillzw.c' object='luatexdir/luapplib/util/liblua53pplib_a-utillzw.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_a-utillzw.o `test -f 'luatexdir/luapplib/util/utillzw.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utillzw.c
+
+luatexdir/luapplib/util/liblua53pplib_a-utillzw.obj: luatexdir/luapplib/util/utillzw.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utillzw.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillzw.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utillzw.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utillzw.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utillzw.c' object='luatexdir/luapplib/util/liblua53pplib_a-utillzw.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_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`
+
+luatexdir/luapplib/util/liblua53pplib_a-utilmd5.o: luatexdir/luapplib/util/utilmd5.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilmd5.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmd5.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilmd5.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmd5.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmd5.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilmd5.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_a-utilmd5.o `test -f 'luatexdir/luapplib/util/utilmd5.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilmd5.c
+
+luatexdir/luapplib/util/liblua53pplib_a-utilmd5.obj: luatexdir/luapplib/util/utilmd5.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilmd5.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmd5.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilmd5.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmd5.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmd5.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilmd5.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_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`
+
+luatexdir/luapplib/util/liblua53pplib_a-utilmem.o: luatexdir/luapplib/util/utilmem.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilmem.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmem.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilmem.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmem.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmem.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilmem.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_a-utilmem.o `test -f 'luatexdir/luapplib/util/utilmem.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilmem.c
+
+luatexdir/luapplib/util/liblua53pplib_a-utilmem.obj: luatexdir/luapplib/util/utilmem.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilmem.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmem.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilmem.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilmem.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilmem.c' object='luatexdir/luapplib/util/liblua53pplib_a-utilmem.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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_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`
+
+luatexdir/luapplib/util/liblua53pplib_a-utilnumber.o: luatexdir/luapplib/util/utilnumber.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilnumber.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilnumber.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilnumber.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilnumber.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilnumber.c' object='luatexdir/luapplib/util/liblua53pplib_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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_a-utilnumber.o `test -f 'luatexdir/luapplib/util/utilnumber.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilnumber.c
+
+luatexdir/luapplib/util/liblua53pplib_a-utilnumber.obj: luatexdir/luapplib/util/utilnumber.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilnumber.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilnumber.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilnumber.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilnumber.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilnumber.c' object='luatexdir/luapplib/util/liblua53pplib_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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_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`
+
+luatexdir/luapplib/util/liblua53pplib_a-utilsha.o: luatexdir/luapplib/util/utilsha.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilsha.o -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilsha.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilsha.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilsha.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilsha.c' object='luatexdir/luapplib/util/liblua53pplib_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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_a-utilsha.o `test -f 'luatexdir/luapplib/util/utilsha.c' || echo '$(srcdir)/'`luatexdir/luapplib/util/utilsha.c
+
+luatexdir/luapplib/util/liblua53pplib_a-utilsha.obj: luatexdir/luapplib/util/utilsha.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luapplib/util/liblua53pplib_a-utilsha.obj -MD -MP -MF luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilsha.Tpo -c -o luatexdir/luapplib/util/liblua53pplib_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)/liblua53pplib_a-utilsha.Tpo luatexdir/luapplib/util/$(DEPDIR)/liblua53pplib_a-utilsha.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/luapplib/util/utilsha.c' object='luatexdir/luapplib/util/liblua53pplib_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) $(liblua53pplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luapplib/util/liblua53pplib_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`
+
 luatexdir/luasocket/src/liblua53socket_a-auxiliar.o: luatexdir/luasocket/src/auxiliar.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53socket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luasocket/src/liblua53socket_a-auxiliar.o -MD -MP -MF luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-auxiliar.Tpo -c -o luatexdir/luasocket/src/liblua53socket_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)/liblua53socket_a-auxiliar.Tpo luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-auxiliar.Po
@@ -8164,48 +10038,34 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/lua/liblua53tex_a-lstrlibext.obj `if test -f 'luatexdir/lua/lstrlibext.c'; then $(CYGPATH_W) 'luatexdir/lua/lstrlibext.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/lstrlibext.c'; fi`
 
-liblua53tex_a-helpers.o: helpers.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblua53tex_a-helpers.o -MD -MP -MF $(DEPDIR)/liblua53tex_a-helpers.Tpo -c -o liblua53tex_a-helpers.o `test -f 'helpers.c' || echo '$(srcdir)/'`helpers.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblua53tex_a-helpers.Tpo $(DEPDIR)/liblua53tex_a-helpers.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='helpers.c' object='liblua53tex_a-helpers.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/lua/liblua53tex_a-helpers.o: luatexdir/lua/helpers.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/lua/liblua53tex_a-helpers.o -MD -MP -MF luatexdir/lua/$(DEPDIR)/liblua53tex_a-helpers.Tpo -c -o luatexdir/lua/liblua53tex_a-helpers.o `test -f 'luatexdir/lua/helpers.c' || echo '$(srcdir)/'`luatexdir/lua/helpers.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/lua/$(DEPDIR)/liblua53tex_a-helpers.Tpo luatexdir/lua/$(DEPDIR)/liblua53tex_a-helpers.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/lua/helpers.c' object='luatexdir/lua/liblua53tex_a-helpers.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) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblua53tex_a-helpers.o `test -f 'helpers.c' || echo '$(srcdir)/'`helpers.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/lua/liblua53tex_a-helpers.o `test -f 'luatexdir/lua/helpers.c' || echo '$(srcdir)/'`luatexdir/lua/helpers.c
 
-liblua53tex_a-helpers.obj: helpers.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblua53tex_a-helpers.obj -MD -MP -MF $(DEPDIR)/liblua53tex_a-helpers.Tpo -c -o liblua53tex_a-helpers.obj `if test -f 'helpers.c'; then $(CYGPATH_W) 'helpers.c'; else $(CYGPATH_W) '$(srcdir)/helpers.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblua53tex_a-helpers.Tpo $(DEPDIR)/liblua53tex_a-helpers.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='helpers.c' object='liblua53tex_a-helpers.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/lua/liblua53tex_a-helpers.obj: luatexdir/lua/helpers.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/lua/liblua53tex_a-helpers.obj -MD -MP -MF luatexdir/lua/$(DEPDIR)/liblua53tex_a-helpers.Tpo -c -o luatexdir/lua/liblua53tex_a-helpers.obj `if test -f 'luatexdir/lua/helpers.c'; then $(CYGPATH_W) 'luatexdir/lua/helpers.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/helpers.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/lua/$(DEPDIR)/liblua53tex_a-helpers.Tpo luatexdir/lua/$(DEPDIR)/liblua53tex_a-helpers.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/lua/helpers.c' object='luatexdir/lua/liblua53tex_a-helpers.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) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblua53tex_a-helpers.obj `if test -f 'helpers.c'; then $(CYGPATH_W) 'helpers.c'; else $(CYGPATH_W) '$(srcdir)/helpers.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/lua/liblua53tex_a-helpers.obj `if test -f 'luatexdir/lua/helpers.c'; then $(CYGPATH_W) 'luatexdir/lua/helpers.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/helpers.c'; fi`
 
-liblua53tex_a-luastuff.o: luastuff.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblua53tex_a-luastuff.o -MD -MP -MF $(DEPDIR)/liblua53tex_a-luastuff.Tpo -c -o liblua53tex_a-luastuff.o `test -f 'luastuff.c' || echo '$(srcdir)/'`luastuff.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblua53tex_a-luastuff.Tpo $(DEPDIR)/liblua53tex_a-luastuff.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luastuff.c' object='liblua53tex_a-luastuff.o' libtool=no @AMDEPBACKSLASH@
+luatexdir/lua/liblua53tex_a-texluac.o: luatexdir/lua/texluac.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/lua/liblua53tex_a-texluac.o -MD -MP -MF luatexdir/lua/$(DEPDIR)/liblua53tex_a-texluac.Tpo -c -o luatexdir/lua/liblua53tex_a-texluac.o `test -f 'luatexdir/lua/texluac.c' || echo '$(srcdir)/'`luatexdir/lua/texluac.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/lua/$(DEPDIR)/liblua53tex_a-texluac.Tpo luatexdir/lua/$(DEPDIR)/liblua53tex_a-texluac.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/lua/texluac.c' object='luatexdir/lua/liblua53tex_a-texluac.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) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblua53tex_a-luastuff.o `test -f 'luastuff.c' || echo '$(srcdir)/'`luastuff.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/lua/liblua53tex_a-texluac.o `test -f 'luatexdir/lua/texluac.c' || echo '$(srcdir)/'`luatexdir/lua/texluac.c
 
-liblua53tex_a-luastuff.obj: luastuff.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblua53tex_a-luastuff.obj -MD -MP -MF $(DEPDIR)/liblua53tex_a-luastuff.Tpo -c -o liblua53tex_a-luastuff.obj `if test -f 'luastuff.c'; then $(CYGPATH_W) 'luastuff.c'; else $(CYGPATH_W) '$(srcdir)/luastuff.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblua53tex_a-luastuff.Tpo $(DEPDIR)/liblua53tex_a-luastuff.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luastuff.c' object='liblua53tex_a-luastuff.obj' libtool=no @AMDEPBACKSLASH@
+luatexdir/lua/liblua53tex_a-texluac.obj: luatexdir/lua/texluac.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/lua/liblua53tex_a-texluac.obj -MD -MP -MF luatexdir/lua/$(DEPDIR)/liblua53tex_a-texluac.Tpo -c -o luatexdir/lua/liblua53tex_a-texluac.obj `if test -f 'luatexdir/lua/texluac.c'; then $(CYGPATH_W) 'luatexdir/lua/texluac.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/texluac.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/lua/$(DEPDIR)/liblua53tex_a-texluac.Tpo luatexdir/lua/$(DEPDIR)/liblua53tex_a-texluac.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/lua/texluac.c' object='luatexdir/lua/liblua53tex_a-texluac.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) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblua53tex_a-luastuff.obj `if test -f 'luastuff.c'; then $(CYGPATH_W) 'luastuff.c'; else $(CYGPATH_W) '$(srcdir)/luastuff.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/lua/liblua53tex_a-texluac.obj `if test -f 'luatexdir/lua/texluac.c'; then $(CYGPATH_W) 'luatexdir/lua/texluac.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/texluac.c'; fi`
 
-liblua53tex_a-texluac.o: texluac.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblua53tex_a-texluac.o -MD -MP -MF $(DEPDIR)/liblua53tex_a-texluac.Tpo -c -o liblua53tex_a-texluac.o `test -f 'texluac.c' || echo '$(srcdir)/'`texluac.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblua53tex_a-texluac.Tpo $(DEPDIR)/liblua53tex_a-texluac.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='texluac.c' object='liblua53tex_a-texluac.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) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblua53tex_a-texluac.o `test -f 'texluac.c' || echo '$(srcdir)/'`texluac.c
-
-liblua53tex_a-texluac.obj: texluac.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblua53tex_a-texluac.obj -MD -MP -MF $(DEPDIR)/liblua53tex_a-texluac.Tpo -c -o liblua53tex_a-texluac.obj `if test -f 'texluac.c'; then $(CYGPATH_W) 'texluac.c'; else $(CYGPATH_W) '$(srcdir)/texluac.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblua53tex_a-texluac.Tpo $(DEPDIR)/liblua53tex_a-texluac.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='texluac.c' object='liblua53tex_a-texluac.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) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblua53tex_a-texluac.obj `if test -f 'texluac.c'; then $(CYGPATH_W) 'texluac.c'; else $(CYGPATH_W) '$(srcdir)/texluac.c'; fi`
-
 luatexdir/luafontloader/src/liblua53tex_a-ffdummies.o: luatexdir/luafontloader/src/ffdummies.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/luafontloader/src/liblua53tex_a-ffdummies.o -MD -MP -MF luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-ffdummies.Tpo -c -o luatexdir/luafontloader/src/liblua53tex_a-ffdummies.o `test -f 'luatexdir/luafontloader/src/ffdummies.c' || echo '$(srcdir)/'`luatexdir/luafontloader/src/ffdummies.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-ffdummies.Tpo luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-ffdummies.Po
@@ -8234,6 +10094,426 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/luafontloader/src/liblua53tex_a-luafflib.obj `if test -f 'luatexdir/luafontloader/src/luafflib.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/src/luafflib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/src/luafflib.c'; fi`
 
+luatexdir/dvi/liblua53tex_a-dvigen.o: luatexdir/dvi/dvigen.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/dvi/liblua53tex_a-dvigen.o -MD -MP -MF luatexdir/dvi/$(DEPDIR)/liblua53tex_a-dvigen.Tpo -c -o luatexdir/dvi/liblua53tex_a-dvigen.o `test -f 'luatexdir/dvi/dvigen.c' || echo '$(srcdir)/'`luatexdir/dvi/dvigen.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/dvi/$(DEPDIR)/liblua53tex_a-dvigen.Tpo luatexdir/dvi/$(DEPDIR)/liblua53tex_a-dvigen.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/dvi/dvigen.c' object='luatexdir/dvi/liblua53tex_a-dvigen.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) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/dvi/liblua53tex_a-dvigen.o `test -f 'luatexdir/dvi/dvigen.c' || echo '$(srcdir)/'`luatexdir/dvi/dvigen.c
+
+luatexdir/dvi/liblua53tex_a-dvigen.obj: luatexdir/dvi/dvigen.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/dvi/liblua53tex_a-dvigen.obj -MD -MP -MF luatexdir/dvi/$(DEPDIR)/liblua53tex_a-dvigen.Tpo -c -o luatexdir/dvi/liblua53tex_a-dvigen.obj `if test -f 'luatexdir/dvi/dvigen.c'; then $(CYGPATH_W) 'luatexdir/dvi/dvigen.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/dvi/dvigen.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/dvi/$(DEPDIR)/liblua53tex_a-dvigen.Tpo luatexdir/dvi/$(DEPDIR)/liblua53tex_a-dvigen.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/dvi/dvigen.c' object='luatexdir/dvi/liblua53tex_a-dvigen.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) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/dvi/liblua53tex_a-dvigen.obj `if test -f 'luatexdir/dvi/dvigen.c'; then $(CYGPATH_W) 'luatexdir/dvi/dvigen.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/dvi/dvigen.c'; fi`
+
+luatexdir/font/liblua53tex_a-dofont.o: luatexdir/font/dofont.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/font/liblua53tex_a-dofont.o -MD -MP -MF luatexdir/font/$(DEPDIR)/liblua53tex_a-dofont.Tpo -c -o luatexdir/font/liblua53tex_a-dofont.o `test -f 'luatexdir/font/dofont.c' || echo '$(srcdir)/'`luatexdir/font/dofont.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/font/$(DEPDIR)/liblua53tex_a-dofont.Tpo luatexdir/font/$(DEPDIR)/liblua53tex_a-dofont.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/font/dofont.c' object='luatexdir/font/liblua53tex_a-dofont.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) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/font/liblua53tex_a-dofont.o `test -f 'luatexdir/font/dofont.c' || echo '$(srcdir)/'`luatexdir/font/dofont.c
+
+luatexdir/font/liblua53tex_a-dofont.obj: luatexdir/font/dofont.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua53tex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/font/liblua53tex_a-dofont.obj -MD -MP -MF luatexdir/font/$(DEPDIR)/liblua53tex_a-dofont.Tpo -c -o luatexdir/font/liblua53tex_a-dofont.obj `if test -f 'luatexdir/font/dofont.c'; then $(CYGPATH_W) 'luatexdir/font/dofont.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/font/dofont.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) luatexdir/font/$(DEPDIR)/liblua53tex_a-dofont.Tpo luatexdir/font/$(DEPDIR)/liblua53tex_a-dofont.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='luatexdir/font/dofont.c' object='luatexdir/font/liblua53tex_a-dofont.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) $(