From 067f076776cdd614a40b2069b01e512594706567 Mon Sep 17 00:00:00 2001
From: Luigi Scarso <luigi.scarso@gmail.com>
Date: Mon, 28 Sep 2015 08:32:58 +0000
Subject: [PATCH] sync with TL

---
 source/build-aux/config.guess                 |   5 +-
 source/build-aux/texinfo.tex                  | 623 ++++++++++++------
 source/configure                              |   4 +-
 source/libs/README                            |   8 +-
 source/libs/configure                         |   4 +-
 .../LuaJIT-2.1.0-beta1-PATCHES/ChangeLog      |   4 +
 .../luajit/LuaJIT-2.1.0-beta1/src/lj_alloc.c  |   2 +-
 .../luajit/LuaJIT-2.1.0-beta1/src/lj_arch.h   |   6 +-
 .../luajit/LuaJIT-2.1.0-beta1/src/lj_err.c    |   6 +-
 source/libs/pixman/ChangeLog                  |   5 +
 source/libs/pixman/Makefile.in                |   4 +-
 source/libs/pixman/configure                  |  30 +-
 .../ChangeLog                                 |   5 +
 .../TL-Changes                                |   0
 .../patch-01-hide-symbols                     |   6 +-
 .../{pixman-0.32.6 => pixman-0.32.8}/AUTHORS  |   0
 .../{pixman-0.32.6 => pixman-0.32.8}/COPYING  |   0
 .../ChangeLog                                 |   0
 .../{pixman-0.32.6 => pixman-0.32.8}/INSTALL  |   0
 .../Makefile.am                               |   0
 .../Makefile.win32                            |   0
 .../Makefile.win32.common                     |   0
 .../{pixman-0.32.6 => pixman-0.32.8}/NEWS     |   0
 .../{pixman-0.32.6 => pixman-0.32.8}/README   |   0
 .../config.h.in                               |   0
 .../configure.ac                              |   2 +-
 .../pixman-1-uninstalled.pc.in                |   0
 .../pixman-1.pc.in                            |   0
 .../pixman/Makefile.am                        |   0
 .../pixman/Makefile.sources                   |   0
 .../pixman/Makefile.win32                     |   0
 .../pixman/loongson-mmintrin.h                |   0
 .../pixman/pixman-access-accessors.c          |   0
 .../pixman/pixman-access.c                    |   0
 .../pixman/pixman-accessor.h                  |   0
 .../pixman/pixman-arm-common.h                |   0
 .../pixman/pixman-arm-neon-asm-bilinear.S     |   0
 .../pixman/pixman-arm-neon-asm.S              |   0
 .../pixman/pixman-arm-neon-asm.h              |   0
 .../pixman/pixman-arm-neon.c                  |   0
 .../pixman/pixman-arm-simd-asm-scaled.S       |   0
 .../pixman/pixman-arm-simd-asm.S              |   0
 .../pixman/pixman-arm-simd-asm.h              |   0
 .../pixman/pixman-arm-simd.c                  |   0
 .../pixman/pixman-arm.c                       |   0
 .../pixman/pixman-bits-image.c                |   0
 .../pixman/pixman-combine-float.c             |   0
 .../pixman/pixman-combine32.c                 |   0
 .../pixman/pixman-combine32.h                 |   0
 .../pixman/pixman-compiler.h                  |   0
 .../pixman/pixman-conical-gradient.c          |   0
 .../pixman/pixman-edge-accessors.c            |   0
 .../pixman/pixman-edge-imp.h                  |   0
 .../pixman/pixman-edge.c                      |   0
 .../pixman/pixman-fast-path.c                 |   0
 .../pixman/pixman-filter.c                    |   0
 .../pixman/pixman-general.c                   |  16 +-
 .../pixman/pixman-glyph.c                     |   0
 .../pixman/pixman-gradient-walker.c           |   0
 .../pixman/pixman-image.c                     |   0
 .../pixman/pixman-implementation.c            |   0
 .../pixman/pixman-inlines.h                   |   0
 .../pixman/pixman-linear-gradient.c           |   0
 .../pixman/pixman-matrix.c                    |   0
 .../pixman/pixman-mips-dspr2-asm.S            |   0
 .../pixman/pixman-mips-dspr2-asm.h            |   0
 .../pixman/pixman-mips-dspr2.c                |   0
 .../pixman/pixman-mips-dspr2.h                |   0
 .../pixman/pixman-mips-memcpy-asm.S           |   0
 .../pixman/pixman-mips.c                      |   0
 .../pixman/pixman-mmx.c                       |   0
 .../pixman/pixman-noop.c                      |   0
 .../pixman/pixman-ppc.c                       |   0
 .../pixman/pixman-private.h                   |   0
 .../pixman/pixman-radial-gradient.c           |   0
 .../pixman/pixman-region.c                    |   0
 .../pixman/pixman-region16.c                  |   0
 .../pixman/pixman-region32.c                  |   0
 .../pixman/pixman-solid-fill.c                |   0
 .../pixman/pixman-sse2.c                      |   0
 .../pixman/pixman-ssse3.c                     |   0
 .../pixman/pixman-timer.c                     |   0
 .../pixman/pixman-trap.c                      |   0
 .../pixman/pixman-utils.c                     |   0
 .../pixman/pixman-version.h.in                |   0
 .../pixman/pixman-vmx.c                       |   0
 .../pixman/pixman-x86.c                       |   0
 .../pixman/pixman.c                           |   0
 .../pixman/pixman.h                           |   0
 .../pixman/solaris-hwcap.mapfile              |   0
 source/libs/pixman/version.ac                 |   2 +-
 source/m4/ChangeLog                           |   6 +-
 source/m4/kpse-setup.m4                       |   2 +-
 source/texk/README                            |   4 +-
 source/texk/configure                         |   4 +-
 source/texk/web2c/ChangeLog                   |   6 +-
 source/texk/web2c/Makefile.in                 |  14 +-
 source/texk/web2c/mfluadir/am/mflua.am        |   4 +-
 source/texk/web2c/mfluajitdir/am/mfluajit.am  |  12 +-
 source/texk/web2c/texmfmp.h                   |   4 +-
 source/utils/configure                        |   4 +-
 101 files changed, 513 insertions(+), 279 deletions(-)
 rename source/libs/pixman/{pixman-0.32.6-PATCHES => pixman-0.32.8-PATCHES}/ChangeLog (85%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6-PATCHES => pixman-0.32.8-PATCHES}/TL-Changes (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6-PATCHES => pixman-0.32.8-PATCHES}/patch-01-hide-symbols (55%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/AUTHORS (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/COPYING (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/ChangeLog (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/INSTALL (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/Makefile.am (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/Makefile.win32 (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/Makefile.win32.common (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/NEWS (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/README (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/config.h.in (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/configure.ac (99%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman-1-uninstalled.pc.in (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman-1.pc.in (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/Makefile.am (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/Makefile.sources (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/Makefile.win32 (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/loongson-mmintrin.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-access-accessors.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-access.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-accessor.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-arm-common.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-arm-neon-asm-bilinear.S (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-arm-neon-asm.S (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-arm-neon-asm.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-arm-neon.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-arm-simd-asm-scaled.S (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-arm-simd-asm.S (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-arm-simd-asm.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-arm-simd.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-arm.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-bits-image.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-combine-float.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-combine32.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-combine32.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-compiler.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-conical-gradient.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-edge-accessors.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-edge-imp.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-edge.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-fast-path.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-filter.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-general.c (96%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-glyph.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-gradient-walker.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-image.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-implementation.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-inlines.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-linear-gradient.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-matrix.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-mips-dspr2-asm.S (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-mips-dspr2-asm.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-mips-dspr2.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-mips-dspr2.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-mips-memcpy-asm.S (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-mips.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-mmx.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-noop.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-ppc.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-private.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-radial-gradient.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-region.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-region16.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-region32.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-solid-fill.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-sse2.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-ssse3.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-timer.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-trap.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-utils.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-version.h.in (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-vmx.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman-x86.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman.c (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/pixman.h (100%)
 mode change 100644 => 100755
 rename source/libs/pixman/{pixman-0.32.6 => pixman-0.32.8}/pixman/solaris-hwcap.mapfile (100%)
 mode change 100644 => 100755

diff --git a/source/build-aux/config.guess b/source/build-aux/config.guess
index 16592509d..3c022c5bb 100644
--- a/source/build-aux/config.guess
+++ b/source/build-aux/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2015-08-20'
+timestamp='2015-09-14'
 
 # 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
@@ -965,6 +965,9 @@ EOF
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
diff --git a/source/build-aux/texinfo.tex b/source/build-aux/texinfo.tex
index e70ea2858..bff8eb017 100644
--- a/source/build-aux/texinfo.tex
+++ b/source/build-aux/texinfo.tex
@@ -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{2015-09-04.11}
+\def\texinfoversion{2015-09-20.17}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -196,17 +196,6 @@
   wide-spread wrap-around
 }
 
-% Margin to add to right of even pages, to left of odd pages.
-\newdimen\bindingoffset
-\newdimen\normaloffset
-\newdimen\pagewidth \newdimen\pageheight
-
-% For a final copy, take out the rectangles
-% that mark overfull boxes (in case you have decided
-% that the text looks ok even though it passes the margin).
-%
-\def\finalout{\overfullrule=0pt }
-
 % Sometimes it is convenient to have everything in the transcript file
 % and nothing on the terminal.  We don't just call \tracingall here,
 % since that produces some useless output on the terminal.  We also make
@@ -251,6 +240,15 @@
 \def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
   \removelastskip\penalty-200\bigskip\fi\fi}
 
+% Output routine
+%
+
+% For a final copy, take out the rectangles
+% that mark overfull boxes (in case you have decided
+% that the text looks ok even though it passes the margin).
+%
+\def\finalout{\overfullrule=0pt }
+
 % Do @cropmarks to get crop marks.
 %
 \newif\ifcropmarks
@@ -290,6 +288,9 @@
     \noexpand\else \the\toks8             % 2: color marks
   }%
 }
+
+% \gettopheadingmarks, \getbottomheadingmarks - extract needed part of mark.
+%
 % \topmark doesn't work for the very first chapter (after the title
 % page or the contents), so we use \firstmark there -- this gets us
 % the mark with the chapter defs, unless the user sneaks in, e.g.,
@@ -310,6 +311,10 @@
 \def\prevsectiondefs{}
 \def\lastcolordefs{}
 
+% Margin to add to right of even pages, to left of odd pages.
+\newdimen\bindingoffset
+\newdimen\normaloffset
+\newdimen\pagewidth \newdimen\pageheight
 
 % Main output routine.
 %
@@ -319,25 +324,56 @@
 \newbox\headlinebox
 \newbox\footlinebox
 
-% \onepageout takes a vbox as an argument.  Note that \pagecontents
-% does insertions, but you have to call it yourself.
+% \onepageout takes a vbox as an argument.
+% \shipout a vbox for a single page, adding an optional header, footer,
+% cropmarks, and footnote.  This also causes index entries for this page
+% to be written to the auxiliary files.
+%
 \def\onepageout#1{%
   \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
   %
   \ifodd\pageno  \advance\hoffset by \bindingoffset
   \else \advance\hoffset by -\bindingoffset\fi
   %
+  % Common context changes for both heading and footing.
   % Do this outside of the \shipout so @code etc. will be expanded in
   % the headline as they should be, not taken literally (outputting ''code).
   \def\commmonheadfootline{\let\hsize=\pagewidth \texinfochars}
   %
-  \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
-  \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}%
+  % Retrieve the information for the headings from the marks in the page,
+  % and call Plain TeX's \makeheadline and \makefootline, which use the
+  % values in \headline and \footline.
+  %
+  % This is used to check if we are on the first page of a chapter.
+  \ifcase0\topmark\fi
+  \ifx\thischapter\empty
+    % See comment for \gettopheadingmarks
+    \ifcase0\firstmark\fi
+    \let\curchaptername\thischaptername
+    \ifcase1\firstmark\fi
+    \let\prevchaptername\thischaptername
+  \else
+    \let\curchaptername\thischaptername
+    \ifcase1\topmark\fi
+    \let\prevchaptername\thischaptername
+  \fi
   %
+  \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
   \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
+  %
+  \ifx\curchaptername\prevchaptername
+  \else
+    % If on the first page of a chapter, clear @thischapter so it
+    % doesn't appear in the headline, because the chapter is already
+    % shown in the chapter heading.
+    \def\thischapter{}%
+  \fi
+  %
+  \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}%
   \global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}%
   %
   {%
+    % Set context for writing to auxiliary files like index files.
     % Have to do this stuff outside the \shipout because we want it to
     % take effect in \write's, yet the group defined by the \vbox ends
     % before the \shipout runs.
@@ -407,6 +443,7 @@
 
 \newinsert\margin \dimen\margin=\maxdimen
 
+% Main part of page, including any footnotes
 \def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
 {\catcode`\@ =11
 \gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
@@ -690,6 +727,12 @@
     \endgraf % Not \par, as it may have been set to \lisppar.
     \global\dimen1 = \prevdepth
   \egroup           % End the \vtop.
+  \addgroupbox
+  \prevdepth = \dimen1
+  \checkinserts
+}
+
+\def\addgroupbox{
   % \dimen0 is the vertical size of the group's box.
   \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
   % \dimen2 is how much space is left on the page (more or less).
@@ -702,9 +745,8 @@
     \fi
   \fi
   \box\groupbox
-  \prevdepth = \dimen1
-  \checkinserts
 }
+
 %
 % TeX puts in an \escapechar (i.e., `@') at the beginning of the help
 % message, so this ends up printing `@group can only ...'.
@@ -1046,32 +1088,8 @@ where each line of input produces a line of output.}
 % @refill is a no-op.
 \let\refill=\relax
 
-% If working on a large document in chapters, it is convenient to
-% be able to disable indexing, cross-referencing, and contents, for test runs.
-% This is done with @novalidate (before @setfilename).
-%
-\newif\iflinks \linkstrue % by default we want the aux files.
-\let\novalidate = \linksfalse
-
-% @setfilename is done at the beginning of every texinfo file.  So open
-% here some of the files we need to have open while reading the input.
-% This makes it possible to make a .fmt file for texinfo.
-\def\setfilename{%
-   \iflinks
-     \tryauxfile
-     % Open the new aux file.  TeX will close it automatically at exit.
-     \immediate\openout\auxfile=\jobname.aux
-   \fi % \openindices needs to do some work in any case.
-   \let\setfilename=\comment % Ignore extra @setfilename cmds.
-   %
-   % If texinfo.cnf is present on the system, read it.
-   % Useful for site-wide @afourpaper, etc.
-   \openin 1 texinfo.cnf
-   \ifeof 1 \else \input texinfo.cnf \fi
-   \closein 1
-   %
-   \comment % Ignore the actual filename.
-}
+% @setfilename INFO-FILENAME - ignored
+\let\setfilename=\comment
 
 % @bye.
 \outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
@@ -1825,8 +1843,10 @@ end
 % A few fonts for @defun names and args.
 \setfont\defbf\bfshape{10}{\magstep1}{OT1}
 \setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
+\setfont\defsl\slshape{10}{\magstep1}{OT1TT}
 \setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf
+\let\tenttsl=\defttsl \let\tensl=\defsl \bf}
 
 % Fonts for indices, footnotes, small examples (9pt).
 \def\smallnominalsize{9pt}
@@ -1957,8 +1977,10 @@ end
 % A few fonts for @defun names and args.
 \setfont\defbf\bfshape{10}{\magstephalf}{OT1}
 \setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
+\setfont\defsl\slshape{10}{\magstephalf}{OT1TT}
 \setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf
+\let\tensl=\defsl \let\tenttsl=\defttsl \bf}
 
 % Fonts for indices, footnotes, small examples (9pt).
 \def\smallnominalsize{9pt}
@@ -2777,11 +2799,6 @@ end
 %
 \def\dmn#1{\thinspace #1}
 
-% @l was never documented to mean ``switch to the Lisp font'',
-% and it is not used as such in any manual I can find.  We need it for
-% Polish suppressed-l.  --karl, 22sep96.
-%\def\l#1{{\li #1}\null}
-
 % @acronym for "FBI", "NATO", and the like.
 % We print this one point size smaller, since it's intended for
 % all-uppercase.
@@ -3392,7 +3409,7 @@ end
 \newtoks\evenfootline    % footline on even pages
 \newtoks\oddfootline     % footline on odd pages
 
-% Now make TeX use those variables
+% Now make \makeheadline and \makefootline in Plain TeX use those variables
 \headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
                             \else \the\evenheadline \fi}}
 \footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
@@ -3448,6 +3465,10 @@ end
 % @everyheadingmarks
 % @everyfootingmarks
 
+% These define \getoddheadingmarks, \getevenheadingmarks,
+% \getoddfootingmarks, and \getevenfootingmarks, each to one of
+% \gettopheadingmarks, \getbottomheadingmarks.
+%
 \def\evenheadingmarks{\headingmarks{even}{heading}}
 \def\oddheadingmarks{\headingmarks{odd}{heading}}
 \def\evenfootingmarks{\headingmarks{even}{footing}}
@@ -3737,7 +3758,12 @@ end
    \noindent
    \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
    %
-   \vadjust{\penalty 1200}}% not good to break after first line of item.
+   \ifinner\else
+     \vadjust{\penalty 1200}% not good to break after first line of item.
+   \fi
+   % We can be in inner vertical mode in a footnote, although an
+   % @itemize looks awful there.
+  }%
   \flushcr
 }
 
@@ -4436,8 +4462,6 @@ end
 
 % Used when writing an index entry out to an index file, to prevent
 % expansion of Texinfo commands that can appear in an index entry.
-% Since there are some commands we want to expand, and others we don't,
-% we have to laboriously prevent expansion for those that we don't.
 %
 \def\indexdummies{%
   \escapechar = `\\     % use backslash in output files.
@@ -4659,6 +4683,7 @@ end
   % that we make for arg2 (see \parsemargdef ff.).  We want all this to be
   % expanded for the sake of the index, so we end up just seeing "bar".
   \let\xeatspaces = \eatspaces
+  \let\xprocessmacroarg\eatspaces
 }
 
 % For testing: output @{ and @} in index sort strings as \{ and \}.
@@ -4679,12 +4704,14 @@ end
     \backslashdisappear
     \def-{}%
     \def<{}%
+    \def\@{}%
   }
 
   \gdef\indexnonalnumreappear{%
     \useindexbackslash
     \let-\normaldash
     \let<\normalless
+    \def\@{@}%
   }
 }
 
@@ -4837,7 +4864,10 @@ end
 \def\requireopenindexfile#1{%
 \ifnum\csname #1indfile\endcsname=0
   \expandafter\newwrite \csname#1indfile\endcsname
-  \openout \csname#1indfile\endcsname \jobname.#1 % Open the file
+  \immediate\openout\csname#1indfile\endcsname \jobname.#1 % Open the file
+  % Using \immediate here prevents an object entering into the current box,
+  % which could confound checks such as those in \safewhatsit for preceding
+  % skips.
 \fi}
 
 % Output \ as {\indexbackslash}, because \ is an escape character in
@@ -5037,11 +5067,13 @@ end
     % there is some text.
     \putwordIndexNonexistent
   \else
+    \catcode`\\ = 0
+    \escapechar = `\\
     %
     % If the index file exists but is empty, then \openin leaves \ifeof
     % false.  We have to make TeX try to read something from the file, so
     % it can discover if there is anything in it.
-    \read 1 to \temp
+    \read 1 to \thisline
     \ifeof 1
       \putwordIndexIsEmpty
     \else
@@ -5051,16 +5083,36 @@ end
       \def\indexbackslash{\ttbackslash}%
       \let\indexlbrace\{   % Likewise, set these sequences for braces
       \let\indexrbrace\}   % used in the sort key.
-      \catcode`\\ = 0
-      \escapechar = `\\
       \begindoublecolumns
-      \input \jobname.#1s
+      \let\entryorphanpenalty=\indexorphanpenalty
+      %
+      % Read input from the index file line by line.
+      \loopdo
+        \ifeof1
+          \let\firsttoken\relax
+        \else
+          \read 1 to \nextline
+          \edef\act{\gdef\noexpand\firsttoken{\getfirsttoken\nextline}}%
+          \act
+        \fi
+        \thisline
+        %
+        \ifeof1\else
+        \let\thisline\nextline
+      \repeat
+      %%
       \enddoublecolumns
     \fi
   \fi
   \closein 1
 \endgroup}
 
+\def\getfirsttoken#1{\expandafter\getfirsttokenx#1\endfirsttoken}
+\long\def\getfirsttokenx#1#2\endfirsttoken{\noexpand#1}
+
+\def\loopdo#1\repeat{\def\body{#1}\loopdoxxx}
+\def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next}
+
 % These macros are used by the sorted index file itself.
 % Change them to control the appearance of the index.
 
@@ -5078,10 +5130,10 @@ end
   \catcode`\/=13
   \def/{{\secrmnotbold \normalslash}}%
   \def-{{\normaldash\normaldash}}% en dash `--'
-  \let^=\normalcaret
-  \let~=\normaltilde
+  \def^{{\chapbf \normalcaret}}%
+  \def~{{\chapbf \normaltilde}}%
   \def\_{%
-    \leavevmode \kern.07em \vbox{\hrule width.33em height.06ex}\kern .07em }%
+     \leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }%
   \def|{$\vert$}%
   \def<{$\less$}%
   \def>{$\gtr$}%
@@ -5102,9 +5154,9 @@ end
   % The glue before the bonus allows a little bit of space at the
   % bottom of a column to reduce an increase in inter-line spacing.
   \nobreak
-  \vskip 0pt plus 3\baselineskip
+  \vskip 0pt plus 5\baselineskip
   \penalty -300 
-  \vskip 0pt plus -3\baselineskip
+  \vskip 0pt plus -5\baselineskip
   %
   % Typeset the initial.  Making this add up to a whole number of
   % baselineskips increases the chance of the dots lining up from column
@@ -5112,27 +5164,24 @@ end
   % we need before each entry, but it's better.
   %
   % No shrink because it confuses \balancecolumns.
-  \vskip 1.67\baselineskip plus .5\baselineskip
-  \bgroup \secfonts % Initial is the same size as section headings
-  \leftline{\secbf #1}%
-  \egroup
+  \vskip 1.67\baselineskip plus 1\baselineskip
+  \leftline{\secfonts \kern-0.05em \secbf #1}%
+  % \secfonts is inside the argument of \leftline so that the change of
+  % \baselineskip will not affect any glue inserted before the vbox that
+  % \leftline creates.
   % Do our best not to break after the initial.
   \nobreak
   \vskip .33\baselineskip plus .1\baselineskip
-  \egroup % \initialfonts
+  \egroup % \initialglyphs
 }
 
+\newdimen\entryrightmargin
+\entryrightmargin=0pt
+
 % \entry typesets a paragraph consisting of the text (#1), dot leaders, and
 % then page number (#2) flushed to the right margin.  It is used for index
 % and table of contents entries.  The paragraph is indented by \leftskip.
 %
-% A straightforward implementation would start like this:
-%	\def\entry#1#2{...
-% But this freezes the catcodes in the argument, and can cause problems to
-% @code, which sets - active.  This problem was fixed by a kludge---
-% ``-'' was active throughout whole index, but this isn't really right.
-% The right solution is to prevent \entry from swallowing the whole text.
-%                                 --kasal, 21nov03
 \def\entry{%
   \begingroup
     %
@@ -5140,38 +5189,46 @@ end
     % affect previous text.
     \par
     %
-    % Do not fill out the last line with white space.
-    \parfillskip = 0in
-    %
     % No extra space above this paragraph.
     \parskip = 0in
     %
+    % When reading the text of entry, convert explicit line breaks
+    % from @* into spaces.  The user might give these in long section
+    % titles, for instance.
+    \def\*{\unskip\space\ignorespaces}%
+    \def\entrybreak{\hfil\break}%
+    %
+    % A bit of stretch before each entry for the benefit of balancing
+    % columns.
+    \vskip 0pt plus0.5pt
+    %
+    % Badness calculation for paragraph affected by -
+    %  How much \indexdotfill is stretched, or how much \parfillskip is shrunk
+    %  Number of lines (\linepenalty)
+    %  
     % Do not prefer a separate line ending with a hyphen to fewer lines.
     \finalhyphendemerits = 0
     %
-    % \hangindent is only relevant when the entry text and page number
-    % don't both fit on one line.  In that case, bob suggests starting the
-    % dots pretty far over on the line.  Unfortunately, a large
-    % indentation looks wrong when the entry text itself is broken across
-    % lines.  So we use a small indentation and put up with long leaders.
+    % Word spacing - no stretch
+    \spaceskip=\fontdimen2\font minus \fontdimen4\font
     %
-    % \hangafter is reset to 1 (which is the value we want) at the start
-    % of each paragraph, so we need not do anything with that.
-    \hangindent = 2em
+    \linepenalty=1000  % Discourage line breaks.
+    \hyphenpenalty=5000  % Discourage hyphenation.
     %
-    % When the entry text needs to be broken, just fill out the first line
-    % with blank space.
-    \rightskip = 0pt plus1fil
+    % Ragged right margin, but not for the last line with the leaders in it.
+    % When an index entry spans lines, this stretch competes with the stretch
+    % in \indexdotfill to determine how the line will be split.
+    \rightskip=\entryrightmargin
+    \advance\rightskip by 0pt plus .6\hsize
     %
-    % A bit of stretch before each entry for the benefit of balancing
-    % columns.
-    \vskip 0pt plus1pt
-    %
-    % When reading the text of entry, convert explicit line breaks
-    % from @* into spaces.  The user might give these in long section
-    % titles, for instance.
-    \def\*{\unskip\space\ignorespaces}%
-    \def\entrybreak{\hfil\break}%
+    % \parfillskip is at the end of the line with the page number
+    \parfillskip=0pt
+    % Cancel the \rightskip stretch
+    \advance \parfillskip by 0pt plus -.6\hsize
+    % Determine how far we can stretch into the margin.
+    % This allows, e.g., "Appendix H  GNU Free Documentation License" to fit
+    % on one line.
+    \advance \parfillskip by 0pt minus .6\entryrightmargin
     %
     % Swallow the left brace of the text (first parameter):
     \afterassignment\doentry
@@ -5179,6 +5236,8 @@ end
 }
 \def\entrybreak{\unskip\space\ignorespaces}%
 \def\doentry{%
+    % Save the text of the entry in a \vtop.
+    \global\setbox\entryindexbox=\vtop\bgroup
     \bgroup % Instead of the swallowed brace.
       \noindent
       \aftergroup\finishentry
@@ -5195,29 +5254,70 @@ end
       \ %
     \else
       %
-      % If we must, put the page number on a line of its own, and fill out
-      % this line with blank space.  (The \hfil is overwhelmed with the
-      % fill leaders glue in \indexdotfill if the page number does fit.)
-      \hfil\penalty50
       \null\nobreak\indexdotfill % Have leaders before the page number.
       %
-      % The `\ ' here is removed by the implicit \unskip that TeX does as
-      % part of (the primitive) \par.  Without it, a spurious underfull
-      % \hbox ensues.
       \ifpdf
-	\pdfgettoks#1.%
-	\ \the\toksA
+        \pdfgettoks#1.%
+        \hskip\skip\thinshrinkable\the\toksA
       \else
-	\ #1%
+        \hskip\skip\thinshrinkable #1%
       \fi
     \fi
+    % Parameters for formatting this paragraph, reset for each paragraph.
+    %
+    % \hangindent is only relevant when the entry text and page number
+    % don't both fit on one line.  In that case, bob suggests starting the
+    % dots pretty far over on the line.  Unfortunately, a large
+    % indentation looks wrong when the entry text itself is broken across
+    % lines.  So we use a small indentation and put up with long leaders.
+    %
+    \hangafter = 1
+    \hangindent = 1em
     \par
+    \egroup % The \vtop
   \endgroup
+  % delay text of entry until after penalty
+  \bgroup\aftergroup\insertindexentrybox
+  \entryorphanpenalty
+}
+
+\newskip\thinshrinkable
+\skip\thinshrinkable=.15em minus .15em
+
+\newbox\entryindexbox
+\def\insertindexentrybox{%
+\lineskip=.8ex plus .6ex % This comes into effect when the \vtop has a large 
+                         % depth due to the paragraph in it having several 
+                         % lines.
+\box\entryindexbox}
+
+% Default is no penalty
+\let\entryorphanpenalty\egroup
+
+% Used from \printindex.  \firsttoken should be the first token
+% after the \entry.  If it's not another \entry, we are at the last
+% line of a group of index entries, so insert a penalty to discourage
+% orphaned index entries.
+\long\def\indexorphanpenalty{%
+  \def\isentry{\entry}%
+  \ifx\firsttoken\isentry
+  \else
+    \unskip\penalty 9000
+    % The \unskip here stops breaking before the glue.  It relies on the
+    % \vskip above being there, otherwise there is an error
+    % "You can't use `\unskip' in vertical mode".  There has to be glue
+    % in the current vertical list that hasn't been added to the
+    % "current page".  See Chapter 24 of the TeXbook.  This contradicts
+    % Section 8.3.7 in "TeX by Topic," though.
+  \fi
+  \egroup % now comes the box added with \aftergroup
 }
 
 % Like plain.tex's \dotfill, except uses up at least 1 em.
+% Using a finite stretch encourages several words to appear on a second line
+% if the entry is broken.
 \def\indexdotfill{\cleaders
-  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
+  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus .4\hsize}
 
 \def\primary #1{\line{#1\hfil}}
 
@@ -5244,6 +5344,9 @@ end
 \newbox\partialpage
 \newdimen\doublecolumnhsize
 
+\newtoks\savedtopmark % Used in \begindoublecolumns
+\newtoks\savedfirstmark
+
 \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
   % Grab any single-column material above us.
   \output = {%
@@ -5264,9 +5367,23 @@ end
       \unvbox\PAGE
       \kern-\topskip \kern\baselineskip
     }%
+    % Save \topmark and \firstmark
+    \global\savedtopmark=\expandafter{\topmark}%
+    \global\savedfirstmark=\expandafter{\firstmark}%
   }%
   \eject % run that output routine to set \partialpage
   %
+  % We recover the two marks that the last output routine saved in order
+  % to propagate the information in marks added around a chapter heading,
+  % which could be otherwise be lost by the time the final page is output.
+  %
+  \mark{\the\savedtopmark}% Only mark in page passed to following \output.
+  \output = {%
+    \setbox0=\box\PAGE % clear box 255
+  }abc\eject
+  %
+  \mark{\the\savedfirstmark}%
+  %
   % Use the double-column output routine for subsequent pages.
   \output = {\doublecolumnout}%
   %
@@ -5399,7 +5516,10 @@ end
       \loop
         \global\setbox3 = \copy0
         \global\setbox1 = \vsplit3 to \dimen@
-      \ifdim\ht3>\dimen@
+        % Remove glue from bottom of first column to
+        % make sure it is higher than the second.
+        \global\setbox1 = \vbox{\unvbox1\unpenalty\unskip}%
+      \ifdim\ht3>\ht1
         \global\advance\dimen@ by 1pt
       \repeat
     }%
@@ -5407,9 +5527,11 @@ end
     \divide\dimen@ii by 5
     \ifdim\ht3<\dimen@ii
       % Column heights are too different, so don't make their bottoms
-      % flush with each other
+      % flush with each other.  The glue at the end of the second column
+      % allows a second column to stretch, reducing the difference in
+      % height between the two.
       \setbox0=\vbox to\dimen@{\unvbox1\vfill}%
-      \setbox2=\vbox to\dimen@{\unvbox3\vfill}%
+      \setbox2=\vbox to\dimen@{\unvbox3\vskip 0pt plus 0.3\ht0}%
     \else
       \setbox0=\vbox to\dimen@{\unvbox1}%
       \setbox2=\vbox to\dimen@{\unvbox3}%
@@ -5435,6 +5557,9 @@ end
     \let\lastnode=\empty      % no node to associate with
     \writetocentry{part}{#1}{}% but put it in the toc
     \headingsoff              % no headline or footline on the part page
+    % This outputs a mark at the end of the page that clears \thischapter
+    % and \thissection, like is done in \startcontents.
+    \chapmacro{}{Yomitfromtoc}{}%
     \chapoddpage
   \endgroup
 }
@@ -5679,9 +5804,6 @@ end
 
 % @centerchap is like @unnumbered, but the heading is centered.
 \outer\parseargdef\centerchap{%
-  % Well, we could do the following in a group, but that would break
-  % an assumption that \chapmacro is called at the outermost level.
-  % Thus we are safer this way:		--kasal, 24feb04
   \let\centerparametersmaybe = \centerparameters
   \unnmhead0{#1}%
   \let\centerparametersmaybe = \relax
@@ -5805,7 +5927,11 @@ end
 
 % Define plain chapter starts, and page on/off switching for it.
 \def\chapbreak{\dobreak \chapheadingskip {-4000}}
+
+% Start a new page
 \def\chappager{\par\vfill\supereject}
+
+% \chapoddpage - start on an odd page for a new chapter
 % Because \domark is called before \chapoddpage, the filler page will
 % get the headings for the next chapter, which is wrong.  But we don't
 % care -- we just disable all headings on the filler page.
@@ -5841,7 +5967,7 @@ end
 
 \CHAPPAGon
 
-% Chapter opening.
+% \chapmacro - Chapter opening.
 %
 % #1 is the text, #2 is the section type (Ynumbered, Ynothing,
 % Yappendix, Yomitfromtoc), #3 the chapter number.
@@ -6235,7 +6361,7 @@ end
   \savepageno = \pageno
   \begingroup                  % Set up to handle contents files properly.
     \raggedbottom              % Worry more about breakpoints than the bottom.
-    \advance\hsize by -\contentsrightmargin % Don't use the full line length.
+    \entryrightmargin=\contentsrightmargin % Don't use the full line length.
     %
     % Roman numerals for page numbers.
     \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
@@ -6340,7 +6466,7 @@ end
 
 % Chapters, in the main contents.
 \def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
-%
+
 % Chapters, in the short toc.
 % See comments in \dochapentry re vbox and related settings.
 \def\shortchapentry#1#2#3#4{%
@@ -6355,7 +6481,7 @@ end
   \setbox0 = \hbox{\putwordAppendix{} M}%
   \hbox to \wd0{\putwordAppendix{} #1\hss}}
 %
-\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}}
+\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\hskip.7em#1}{#4}}
 
 % Unnumbered chapters.
 \def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}}
@@ -6388,6 +6514,8 @@ end
 \def\dochapentry#1#2{%
    \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip
    \begingroup
+     % Move the page numbers slightly to the right
+     \advance\entryrightmargin by -0.05em
      \chapentryfonts
      \tocentry{#1}{\dopageno\bgroup#2\egroup}%
    \endgroup
@@ -6500,6 +6628,24 @@ end
 % start of the next paragraph will insert \parskip.
 %
 \def\aboveenvbreak{{%
+  % =10000 instead of <10000 because of a special case in \itemzzz and
+  % \sectionheading, q.v.
+  \ifnum \lastpenalty=10000 \else
+    \advance\envskipamount by \parskip
+    \endgraf
+    \ifdim\lastskip<\envskipamount
+      \removelastskip
+      \ifnum\lastpenalty<10000
+        % Penalize breaking before the environment, because preceding text
+        % often leads into it.
+        \penalty100
+      \fi
+      \vskip\envskipamount
+    \fi
+  \fi
+}}
+
+\def\afterenvbreak{{%
   % =10000 instead of <10000 because of a special case in \itemzzz and
   % \sectionheading, q.v.
   \ifnum \lastpenalty=10000 \else
@@ -6515,8 +6661,6 @@ end
   \fi
 }}
 
-\let\afterenvbreak = \aboveenvbreak
-
 % \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins; it will
 % also clear it, so that its embedded environments do the narrowing again.
 \let\nonarrowing=\relax
@@ -6560,7 +6704,7 @@ end
   % collide with the section heading.
   \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
   %
-  \vbox\bgroup
+  \setbox\groupbox=\vbox\bgroup
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop
       \hbox\bgroup
@@ -6584,6 +6728,7 @@ end
       \egroup
       \cartbot
   \egroup
+  \addgroupbox
   \checkinserts
 }
 
@@ -7061,7 +7206,7 @@ end
   \temp
 }
 
-% \domakedefun \deffn \deffnx \deffnheader
+% \domakedefun \deffn \deffnx \deffnheader { (defn. of \deffnheader) }
 %
 % Define \deffn and \deffnx, without parameters.
 % \deffnheader has to be defined explicitly.
@@ -7410,6 +7555,8 @@ end
 \def\scanmacro#1{%
   \newlinechar`\^^M
   \let\xeatspaces\eatspaces
+  % Reduce doubled backslashes to one
+  \def\xprocessmacroarg{\passargtomacro\eatspaces}%
   %
   % Process the macro body under the current catcode regime.
   \scantokens{#1\texinfoc}\aftermacro%
@@ -7529,6 +7676,7 @@ end
 % an argument to another Texinfo command.
 \def\macroargctxt{%
   \scanctxt
+  \catcode`\^^M=\other
   \catcode`\\=\active
 }
 
@@ -7608,59 +7756,36 @@ end
   \fi
 }
 
-% This makes use of the obscure feature that if the last token of a
-% <parameter list> is #, then the preceding argument is delimited by
-% an opening brace, and that opening brace is not consumed.
-% 
+% \getargs -- Parse the arguments to a @macro line.  Set \macname to
+% the name of the macro, and \argl to the braced argument list.
 \def\getargs#1{\getargsxxx#1{}}
 \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
 \def\getmacname#1 #2\relax{\macname={#1}}
 \def\getmacargs#1{\def\argl{#1}}
+% This made use of the feature that if the last token of a
+% <parameter list> is #, then the preceding argument is delimited by
+% an opening brace, and that opening brace is not consumed.
 
-% For macro processing make @ a letter so that we can make
-% private-to-Texinfo macro names.
-\edef\texiatcatcode{\the\catcode`\@}
-\catcode `@=11\relax
-
-% Parse the optional {params} list.  Set up \paramno and \paramlist
-% so \defmacro knows what to do.  Define \macarg.BLAH for each BLAH
-% in the params list to some hook where the argument is to be expanded.  If
-% there are less than 10 arguments that hook is to be replaced by ##N where N
+% Parse the optional {params} list to @macro or @rmacro.
+% Set \paramno to the number of arguments,
+% and \paramlist to a parameter text for the macro (e.g. #1,#2,#3 for a
+% three-param macro.)  Define \macarg.BLAH for each BLAH in the params
+% list to some hook where the argument is to be expanded.  If there are
+% less than 10 arguments that hook is to be replaced by ##N where N
 % is the position in that list, that is to say the macro arguments are to be
 % defined `a la TeX in the macro body.  
 %
 % That gets used by \mbodybackslash (above).
 %
-% We need to get `macro parameter char #' into several definitions.
-% The technique used is stolen from LaTeX: let \hash be something
-% unexpandable, insert that wherever you need a #, and then redefine
-% it to # just before using the token list produced.
-%
-% The same technique is used to protect \eatspaces till just before
-% the macro is used.
-%
-% If there are 10 or more arguments, a different technique is used, where the
-% hook remains in the body, and when macro is to be expanded the body is
-% processed again to replace the arguments.
-%
-% In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the
-% argument N value and then \edef  the body (nothing else will expand because of
-% the catcode regime underwhich the body was input).
+% If there are 10 or more arguments, a different technique is used: see
+% \parsemmanyargdef.
 %
-% If you compile with TeX (not eTeX), and you have macros with 10 or more
-% arguments, no macro can have more than 256 arguments (else error).
-% 
 \def\parsemargdef#1;{%
   \paramno=0\def\paramlist{}%
   \let\hash\relax
-  \let\xeatspaces\relax
+  % \hash is redefined to `#' later to get it into definitions
+  \let\processmacroarg\relax
   \parsemargdefxxx#1,;,%
-  % In case that there are 10 or more arguments we parse again the arguments
-  % list to set new definitions for the \macarg.BLAH macros corresponding to
-  % each BLAH argument. It was anyhow needed to parse already once this list
-  % in order to count the arguments, and as macros with at most 9 arguments
-  % are by far more frequent than macro with 10 or more arguments, defining
-  % twice the \macarg.BLAH macros does not cost too much processing power.
   \ifnum\paramno<10\relax\else
     \paramno0\relax
     \parsemmanyargdef@@#1,;,% 10 or more arguments
@@ -7671,10 +7796,47 @@ end
   \else \let\next=\parsemargdefxxx
     \advance\paramno by 1
     \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
-        {\xeatspaces{\hash\the\paramno}}%
+        {\processmacroarg{\hash\the\paramno}}%
     \edef\paramlist{\paramlist\hash\the\paramno,}%
   \fi\next}
 
+% \parsemacbody, \parsermacbody
+%
+% Read recursive and nonrecursive macro bodies. (They're different since
+% rec and nonrec macros end differently.)
+% 
+% We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro 
+% body to be transformed.
+% Set \macrobody to the body of the macro, and call \defmacro.
+%
+{\catcode`\ =\other\long\gdef\parsemacbody#1@end macro{%
+\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}%
+{\catcode`\ =\other\long\gdef\parsermacbody#1@end rmacro{%
+\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}%
+
+% Make @ a letter, so that we can make private-to-Texinfo macro names.
+\edef\texiatcatcode{\the\catcode`\@}
+\catcode `@=11\relax
+
+%%%%%%%%%%%%%% Code for > 10 arguments only   %%%%%%%%%%%%%%%%%%
+
+% If there are 10 or more arguments, a different technique is used, where the
+% hook remains in the body, and when macro is to be expanded the body is
+% processed again to replace the arguments.
+%
+% In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the
+% argument N value and then \edef the body (nothing else will expand because of
+% the catcode regime under which the body was input).
+%
+% If you compile with TeX (not eTeX), and you have macros with 10 or more
+% arguments, no macro can have more than 256 arguments (else error).
+%
+% In case that there are 10 or more arguments we parse again the arguments
+% list to set new definitions for the \macarg.BLAH macros corresponding to
+% each BLAH argument. It was anyhow needed to parse already once this list
+% in order to count the arguments, and as macros with at most 9 arguments
+% are by far more frequent than macro with 10 or more arguments, defining
+% twice the \macarg.BLAH macros does not cost too much processing power.
 \def\parsemmanyargdef@@#1,{%
   \if#1;\let\next=\relax
   \else 
@@ -7690,15 +7852,6 @@ end
     \advance\paramno by 1\relax
   \fi\next}
 
-% These two commands read recursive and nonrecursive macro bodies.
-% (They're different since rec and nonrec macros end differently.)
-% Set \temp to the body of the macro, and call \defmacro.
-\catcode `\@\texiatcatcode
-{\catcode`\ =\other\long\gdef\parsemacbody#1@end macro{%
-\xdef\temp{\eatcr{#1}}\endgroup\defmacro}}%
-{\catcode`\ =\other\long\gdef\parsermacbody#1@end rmacro{%
-\xdef\temp{\eatcr{#1}}\endgroup\defmacro}}%
-\catcode `\@=11\relax
 
 \let\endargs@\relax
 \let\nil@\relax
@@ -7727,9 +7880,6 @@ end
     \getargvals@@
   \fi
 }
-
-% Internal for \getargsval@.
-%  
 \def\getargvals@@{%
   \ifx\paramlist\nilm@
       % Some sanity check needed here that \argvaluelist is also empty.
@@ -7837,16 +7987,7 @@ end
   \next
 }
 
-% Save the token stack pointer into macro #1:
-\def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}}
-%
-% Restore the token stack pointer from number in macro #1:
-\def\texirestoretoksstackpoint#1{\expandafter\mathchardef
-  \expandafter\@cclvi#1\relax}
-% Variant \newtoks that can be used non-\outer:
-\def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi}
-
-% Tailing missing arguments are set to empty.
+% Trailing missing arguments are set to empty.
 % 
 \def\setemptyargvalues@{%
   \ifx\paramlist\nilm@
@@ -7877,44 +8018,73 @@ end
    \long\def#2{#4}%
 }
 
-% This defines a Texinfo @macro.  \temp has the body of the macro in it.
+
+%%%%%%%%%%%%%% End of code for > 10 arguments %%%%%%%%%%%%%%%%%%
+
+
+
+% Remove following spaces at the expansion stage.
+% This works because spaces are discarded before each argument when TeX is 
+% getting the arguments for a macro.
+% This must not be immediately followed by a }.
+\long\def\gobblespaces#1{#1}
+
+% This defines a Texinfo @macro or @rmacro, called by \parsemacbody.
+%    \macrobody has the body of the macro in it, with placeholders for
+% its parameters, looking like "\processmacroarg{\hash 1}".
+%    \paramno is the number of parameters
+%    \paramlist is a TeX parameter text, e.g. "#1,#2,#3,"
 % There are eight cases: recursive and nonrecursive macros of zero, one,
 % up to nine, and many arguments.
-% Much magic with \expandafter here.
 % \xdef is used so that macro definitions will survive the file
-% they're defined in; @include reads the file inside a group.
+% they're defined in: @include reads the file inside a group.
 %
 \def\defmacro{%
   \let\hash=##% convert placeholders to macro parameter chars
+  \ifnum\paramno=1
+    \def\processmacroarg{\gobblespaces}%
+    % This removes the pair of braces around the argument.  We don't
+    % use \eatspaces, because this can cause ends of lines to be lost
+    % when the argument to \eatspaces is read, leading to line-based
+    % commands like "@itemize" not being read correctly.
+  \else
+    \def\processmacroarg{\xprocessmacroarg}%
+    \let\xprocessmacroarg\relax
+  \fi
   \ifrecursive   %%%%%%%%%%%%%% Recursive %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     \ifcase\paramno
     % 0
       \expandafter\xdef\csname\the\macname\endcsname{%
-        \noexpand\scanmacro{\temp}}%
+        \noexpand\scanmacro{\macrobody}}%
     \or % 1
       \expandafter\xdef\csname\the\macname\endcsname{%
          \bgroup
          \noexpand\braceorline
-         \expandafter\noexpand\csname\the\macname xxx\endcsname}%
-      \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
-         \egroup\noexpand\scanmacro{\temp}}%
+         \expandafter\noexpand\csname\the\macname @@@\endcsname}%
+      \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
+         \expandafter\noexpand\csname\the\macname @@@@\endcsname{%
+           \noexpand\gobblespaces##1\empty}%
+           % The \empty is for \gobblespaces in case #1 is empty
+         }%
+      \expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
+         \egroup\noexpand\scanmacro{\macrobody}}%
     \else
       \ifnum\paramno<10\relax % at most 9
         \expandafter\xdef\csname\the\macname\endcsname{%
            \bgroup\noexpand\macroargctxt
-           \noexpand\csname\the\macname xx\endcsname}%
-        \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-            \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+           \noexpand\csname\the\macname @@\endcsname}%
+        \expandafter\xdef\csname\the\macname @@\endcsname##1{%
+            \expandafter\noexpand\csname\the\macname @@@\endcsname ##1,}%
         \expandafter\expandafter
         \expandafter\xdef
         \expandafter\expandafter
-          \csname\the\macname xxx\endcsname
-            \paramlist{\egroup\noexpand\scanmacro{\temp}}%
+          \csname\the\macname @@@\endcsname
+            \paramlist{\egroup\noexpand\scanmacro{\macrobody}}%
       \else % 10 or more
         \expandafter\xdef\csname\the\macname\endcsname{%
           \noexpand\getargvals@{\the\macname}{\argl}%
         }%    
-        \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp
+        \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody
         \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble
       \fi
     \fi
@@ -7922,36 +8092,41 @@ end
     \ifcase\paramno
     % 0
       \expandafter\xdef\csname\the\macname\endcsname{%
-        \noexpand\scanmacro{\temp}}%
+        \noexpand\scanmacro{\macrobody}}%
     \or % 1
       \expandafter\xdef\csname\the\macname\endcsname{%
          \bgroup
          \noexpand\braceorline
-         \expandafter\noexpand\csname\the\macname xxx\endcsname}%
-      \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
+         \expandafter\noexpand\csname\the\macname @@@\endcsname}%
+      \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
+         \expandafter\noexpand\csname\the\macname @@@@\endcsname{%
+           \noexpand\gobblespaces##1\empty}%
+           % The \empty is for \gobblespaces in case #1 is empty
+         }%
+      \expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
         \egroup
-        \noexpand\scanmacro{\temp}%
+        \noexpand\scanmacro{\macrobody}%
         }%
     \else % at most 9
       \ifnum\paramno<10\relax
         \expandafter\xdef\csname\the\macname\endcsname{%
            \bgroup\noexpand\macroargctxt
-           \expandafter\noexpand\csname\the\macname xx\endcsname}%
-        \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-            \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+           \expandafter\noexpand\csname\the\macname @@\endcsname}%
+        \expandafter\xdef\csname\the\macname @@\endcsname##1{%
+            \expandafter\noexpand\csname\the\macname @@@\endcsname ##1,}%
         \expandafter\expandafter
         \expandafter\xdef
         \expandafter\expandafter
-        \csname\the\macname xxx\endcsname
+        \csname\the\macname @@@\endcsname
         \paramlist{%
             \egroup
-            \noexpand\scanmacro{\temp}%
+            \noexpand\scanmacro{\macrobody}%
             }%
       \else % 10 or more:
         \expandafter\xdef\csname\the\macname\endcsname{%
           \noexpand\getargvals@{\the\macname}{\argl}%
         }%
-        \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp
+        \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody
         \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse
       \fi
     \fi
@@ -8122,6 +8297,7 @@ end
   \pdfmkdest{#1}%
   \iflinks
     {%
+      \requireauxfile
       \atdummies  % preserve commands, but don't expand them
       \edef\writexrdef##1##2{%
 	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
@@ -8386,6 +8562,7 @@ end
 % If its value is nonempty, SUFFIX is output afterward.
 %
 \def\refx#1#2{%
+  \requireauxfile
   {%
     \indexnofonts
     \otherbackslash
@@ -8449,6 +8626,23 @@ end
   \fi
 }
 
+% If working on a large document in chapters, it is convenient to
+% be able to disable indexing, cross-referencing, and contents, for test runs.
+% This is done with @novalidate at the beginning of the file.
+%
+\newif\iflinks \linkstrue % by default we want the aux files.
+\let\novalidate = \linksfalse
+
+% Used when writing to the aux file, or when using data from it.
+\def\requireauxfile{%
+  \iflinks
+    \tryauxfile
+    % Open the new aux file.  TeX will close it automatically at exit.
+    \immediate\openout\auxfile=\jobname.aux
+  \fi
+  \global\let\requireauxfile=\relax   % Only do this once.
+}
+
 % Read the last existing aux file, if any.  No error if none exists.
 %
 \def\tryauxfile{%
@@ -8922,6 +9116,7 @@ end
       % \floatlabel-lof.  Besides \floatident, we include the short
       % caption if specified, else the full caption if specified, else nothing.
       {%
+        \requireauxfile
         \atdummies
         %
         % since we read the caption text in the macro world, where ^^M
@@ -10480,6 +10675,16 @@ directory should work if nowhere else does.}
   % file name, in case not using a pre-dumped format.
   @catcode`+=@active
   @catcode`@_=@active
+  %
+  % If texinfo.cnf is present on the system, read it.
+  % Useful for site-wide @afourpaper, etc.  This macro, @fixbackslash, gets
+  % called at the beginning of every Texinfo file.  Not opening texinfo.cnf
+  % directly in this file, texinfo.tex, makes it possible to make a format
+  % file for Texinfo.
+  %
+  @openin 1 texinfo.cnf
+  @ifeof 1 @else @input texinfo.cnf @fi
+  @closein 1
 }
 
 
diff --git a/source/configure b/source/configure
index 7feca6af4..99b1cf644 100755
--- a/source/configure
+++ b/source/configure
@@ -3981,7 +3981,7 @@ case $enable_luajittex in #(
     : ;; #(
   *) :
     case $host in #(
-  alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+  alpha* | sparc* | powerpc-*-darwin* ) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
 $as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
                       ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -3994,7 +3994,7 @@ case $enable_mfluajit in #(
     : ;; #(
   *) :
     case $host in #(
-  alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+  alpha* | sparc* | powerpc-*-darwin* ) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit'" >&5
 $as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
                       ac_configure_args="$ac_configure_args '--disable-mfluajit'" ;; #(
diff --git a/source/libs/README b/source/libs/README
index e9f2e4b9e..2e850bc01 100644
--- a/source/libs/README
+++ b/source/libs/README
@@ -1,4 +1,4 @@
-$Id: README 38335 2015-09-10 06:46:36Z peter $
+$Id: README 38475 2015-09-27 14:11:56Z peter $
 Public domain.  Originally created by Karl Berry, 2005.
 
 Libraries we compile for TeX Live.
@@ -21,13 +21,13 @@ gd 2.1.1 - checked 14jan15
 gmp 6.0.0 - checked 25mar14
   http://ftp.gnu.org/gnu/gmp/
 
-graphite2 1.3.1 - checked 31aug15
+graphite2 1.3.3 - checked 27sep15
   http://sourceforge.net/projects/silgraphite/files/graphite2/
 
 harfbuzz 1.0.3 - checked 2sep15
   http://www.freedesktop.org/software/harfbuzz/release/
 
-icu 55.1 (release) - checked 12apr15
+icu 56.1 (rc) - checked 27sep15
   http://download.icu-project.org/files/icu4c/
 
 libpaper 1.1.24+nmu2 - checked 24oct13
@@ -46,7 +46,7 @@ luajit 2.1.0-beta1 - checked 7sep15
 mpfr 3.1.3 - checked 20jun15
   http://ftp.gnu.org/gnu/mpfr/
 
-pixman 0.32.6 - checked 7jul14
+pixman 0.32.8 - checked 27sep15
   http://cairographics.org/releases/
 
 poppler 0.36.0 - checked 10sep15
diff --git a/source/libs/configure b/source/libs/configure
index 1ab2b6a31..7fd994d92 100755
--- a/source/libs/configure
+++ b/source/libs/configure
@@ -3171,7 +3171,7 @@ case $enable_luajittex in #(
     : ;; #(
   *) :
     case $host in #(
-  alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+  alpha* | sparc* | powerpc-*-darwin* ) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
 $as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
                       ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -3184,7 +3184,7 @@ case $enable_mfluajit in #(
     : ;; #(
   *) :
     case $host in #(
-  alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+  alpha* | sparc* | powerpc-*-darwin* ) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit'" >&5
 $as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
                       ac_configure_args="$ac_configure_args '--disable-mfluajit'" ;; #(
diff --git a/source/libs/luajit/LuaJIT-2.1.0-beta1-PATCHES/ChangeLog b/source/libs/luajit/LuaJIT-2.1.0-beta1-PATCHES/ChangeLog
index 5ef8ddb84..030603735 100644
--- a/source/libs/luajit/LuaJIT-2.1.0-beta1-PATCHES/ChangeLog
+++ b/source/libs/luajit/LuaJIT-2.1.0-beta1-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-07-x86_64-cygwin (new): Backport from upstream git.
+
 2015-09-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import LuaJIT-2.1.0-beta1.
diff --git a/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_alloc.c b/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_alloc.c
index 0aad826d3..ddd50cae4 100644
--- a/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_alloc.c
+++ b/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_alloc.c
@@ -196,7 +196,7 @@ static LJ_AINLINE void *CALL_MMAP(size_t size)
   return ptr;
 }
 
-#elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__)
+#elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__) || defined(__CYGWIN__)
 
 /* OSX and FreeBSD mmap() use a naive first-fit linear search.
 ** That's perfect for us. Except that -pagezero_size must be set for OSX,
diff --git a/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_arch.h b/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_arch.h
index 6342fbbf8..6760111ef 100644
--- a/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_arch.h
+++ b/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_arch.h
@@ -155,7 +155,11 @@
 #define LJ_ARCH_NAME		"x64"
 #define LJ_ARCH_BITS		64
 #define LJ_ARCH_ENDIAN		LUAJIT_LE
-#define LJ_ABI_WIN		LJ_TARGET_WINDOWS
+#if LJ_TARGET_WINDOWS || __CYGWIN__
+#define LJ_ABI_WIN		1
+#else
+#define LJ_ABI_WIN		0
+#endif
 #define LJ_TARGET_X64		1
 #define LJ_TARGET_X86ORX64	1
 #define LJ_TARGET_EHRETREG	0
diff --git a/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_err.c b/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_err.c
index 2e20c2c0f..9ac0c988f 100644
--- a/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_err.c
+++ b/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_err.c
@@ -183,7 +183,7 @@ static void *err_unwind(lua_State *L, void *stopcf, int errcode)
 
 /* -- External frame unwinding -------------------------------------------- */
 
-#if defined(__GNUC__) && !LJ_NO_UNWIND && !LJ_TARGET_WINDOWS
+#if defined(__GNUC__) && !LJ_NO_UNWIND && !LJ_ABI_WIN
 
 /*
 ** We have to use our own definitions instead of the mandatory (!) unwind.h,
@@ -349,7 +349,7 @@ LJ_FUNCA int lj_err_unwind_arm(int state, void *ucb, _Unwind_Context *ctx)
 
 #endif
 
-#elif LJ_TARGET_X64 && LJ_TARGET_WINDOWS
+#elif LJ_TARGET_X64 && LJ_ABI_WIN
 
 /*
 ** Someone in Redmond owes me several days of my life. A lot of this is
@@ -414,7 +414,9 @@ LJ_FUNCA EXCEPTION_DISPOSITION lj_err_unwind_win64(EXCEPTION_RECORD *rec,
     if (cf2) {  /* We catch it, so start unwinding the upper frames. */
       if (rec->ExceptionCode == LJ_MSVC_EXCODE ||
 	  rec->ExceptionCode == LJ_GCC_EXCODE) {
+#if LJ_TARGET_WINDOWS
 	__DestructExceptionObject(rec, 1);
+#endif
 	setstrV(L, L->top++, lj_err_str(L, LJ_ERR_ERRCPP));
       } else if (!LJ_EXCODE_CHECK(rec->ExceptionCode)) {
 	/* Don't catch access violations etc. */
diff --git a/source/libs/pixman/ChangeLog b/source/libs/pixman/ChangeLog
index d30209afe..c4c881f57 100644
--- a/source/libs/pixman/ChangeLog
+++ b/source/libs/pixman/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import pixman-0.32.8.
+	* version.ac: Adapted.
+
 2015-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Better dependencies for 'make check'.
diff --git a/source/libs/pixman/Makefile.in b/source/libs/pixman/Makefile.in
index be6adb68d..b1ba8a5df 100644
--- a/source/libs/pixman/Makefile.in
+++ b/source/libs/pixman/Makefile.in
@@ -440,7 +440,7 @@ am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing \
 	$(top_srcdir)/../../build-aux/test-driver \
-	$(top_srcdir)/pixman-0.32.6/pixman/pixman-version.h.in \
+	$(top_srcdir)/pixman-0.32.8/pixman/pixman-version.h.in \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
 	../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -702,7 +702,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-pixman-version.h: $(top_builddir)/config.status $(top_srcdir)/pixman-0.32.6/pixman/pixman-version.h.in
+pixman-version.h: $(top_builddir)/config.status $(top_srcdir)/pixman-0.32.8/pixman/pixman-version.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 clean-noinstLIBRARIES:
diff --git a/source/libs/pixman/configure b/source/libs/pixman/configure
index 85eac9cc4..57e14f3dc 100755
--- a/source/libs/pixman/configure
+++ b/source/libs/pixman/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pixman (TeX Live) 0.32.6.
+# Generated by GNU Autoconf 2.69 for pixman (TeX Live) 0.32.8.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -580,12 +580,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pixman (TeX Live)'
 PACKAGE_TARNAME='pixman--tex-live-'
-PACKAGE_VERSION='0.32.6'
-PACKAGE_STRING='pixman (TeX Live) 0.32.6'
+PACKAGE_VERSION='0.32.8'
+PACKAGE_STRING='pixman (TeX Live) 0.32.8'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="pixman-0.32.6/pixman/pixman.h"
+ac_unique_file="pixman-0.32.8/pixman/pixman.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1281,7 +1281,7 @@ if test "$ac_init_help" = "long"; then
   # 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 pixman (TeX Live) 0.32.6 to adapt to many kinds of systems.
+\`configure' configures pixman (TeX Live) 0.32.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1348,7 +1348,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pixman (TeX Live) 0.32.6:";;
+     short | recursive ) echo "Configuration of pixman (TeX Live) 0.32.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1445,7 +1445,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pixman (TeX Live) configure 0.32.6
+pixman (TeX Live) configure 0.32.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1952,7 +1952,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pixman (TeX Live) $as_me 0.32.6, which was
+It was created by pixman (TeX Live) $as_me 0.32.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3875,7 +3875,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pixman--tex-live-'
- VERSION='0.32.6'
+ VERSION='0.32.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4078,7 +4078,7 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 PIXMAN_VERSION_MAJOR=0
 PIXMAN_VERSION_MINOR=32
-PIXMAN_VERSION_MICRO=6
+PIXMAN_VERSION_MICRO=8
 
 test_CFLAGS=${CFLAGS+set} # We may override autoconf default CFLAGS.
 
@@ -6032,14 +6032,14 @@ rm -f core conftest.err conftest.$ac_objext \
 $as_echo "$_yesno" >&6; }
 
 
-PIXMAN_TREE=pixman-0.32.6
+PIXMAN_TREE=pixman-0.32.8
 
 
 if test -f $srcdir/$PIXMAN_TREE/pixman/pixman-version.h; then
   as_fn_error $? "Sorry, you must remove the file $PIXMAN_TREE/pixman/pixman-version.h" "$LINENO" 5
 fi
 
-ac_config_files="$ac_config_files Makefile include/Makefile pixman-version.h:pixman-0.32.6/pixman/pixman-version.h.in"
+ac_config_files="$ac_config_files Makefile include/Makefile pixman-version.h:pixman-0.32.8/pixman/pixman-version.h.in"
 
 
 cat >confcache <<\_ACEOF
@@ -6585,7 +6585,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pixman (TeX Live) $as_me 0.32.6, which was
+This file was extended by pixman (TeX Live) $as_me 0.32.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6651,7 +6651,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pixman (TeX Live) config.status 0.32.6
+pixman (TeX Live) config.status 0.32.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -6784,7 +6784,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-    "pixman-version.h") CONFIG_FILES="$CONFIG_FILES pixman-version.h:pixman-0.32.6/pixman/pixman-version.h.in" ;;
+    "pixman-version.h") CONFIG_FILES="$CONFIG_FILES pixman-version.h:pixman-0.32.8/pixman/pixman-version.h.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/source/libs/pixman/pixman-0.32.6-PATCHES/ChangeLog b/source/libs/pixman/pixman-0.32.8-PATCHES/ChangeLog
old mode 100644
new mode 100755
similarity index 85%
rename from source/libs/pixman/pixman-0.32.6-PATCHES/ChangeLog
rename to source/libs/pixman/pixman-0.32.8-PATCHES/ChangeLog
index fa46f5647..d77828604
--- a/source/libs/pixman/pixman-0.32.6-PATCHES/ChangeLog
+++ b/source/libs/pixman/pixman-0.32.8-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import pixman-0.32.8.
+	* patch-01-hide-symbols: Adapted.
+
 2014-12-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-01-hide-symbols (new): Allow to hide all symbols.
diff --git a/source/libs/pixman/pixman-0.32.6-PATCHES/TL-Changes b/source/libs/pixman/pixman-0.32.8-PATCHES/TL-Changes
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6-PATCHES/TL-Changes
rename to source/libs/pixman/pixman-0.32.8-PATCHES/TL-Changes
diff --git a/source/libs/pixman/pixman-0.32.6-PATCHES/patch-01-hide-symbols b/source/libs/pixman/pixman-0.32.8-PATCHES/patch-01-hide-symbols
old mode 100644
new mode 100755
similarity index 55%
rename from source/libs/pixman/pixman-0.32.6-PATCHES/patch-01-hide-symbols
rename to source/libs/pixman/pixman-0.32.8-PATCHES/patch-01-hide-symbols
index dfcd5bf86..088231f47
--- a/source/libs/pixman/pixman-0.32.6-PATCHES/patch-01-hide-symbols
+++ b/source/libs/pixman/pixman-0.32.8-PATCHES/patch-01-hide-symbols
@@ -1,6 +1,6 @@
-diff -ur pixman-0.32.6.orig/pixman/pixman-compiler.h pixman-0.32.6/pixman/pixman-compiler.h
---- pixman-0.32.6.orig/pixman/pixman-compiler.h	2014-04-24 06:34:14.000000000 +0200
-+++ pixman-0.32.6/pixman/pixman-compiler.h	2014-12-04 08:34:52.000000000 +0100
+diff -ur pixman-0.32.8.orig/pixman/pixman-compiler.h pixman-0.32.8/pixman/pixman-compiler.h
+--- pixman-0.32.8.orig/pixman/pixman-compiler.h	2015-06-30 11:48:31.000000000 +0200
++++ pixman-0.32.8/pixman/pixman-compiler.h	2015-09-26 18:58:53.409947954 +0200
 @@ -91,7 +91,7 @@
  
  /* GCC visibility */
diff --git a/source/libs/pixman/pixman-0.32.6/AUTHORS b/source/libs/pixman/pixman-0.32.8/AUTHORS
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/AUTHORS
rename to source/libs/pixman/pixman-0.32.8/AUTHORS
diff --git a/source/libs/pixman/pixman-0.32.6/COPYING b/source/libs/pixman/pixman-0.32.8/COPYING
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/COPYING
rename to source/libs/pixman/pixman-0.32.8/COPYING
diff --git a/source/libs/pixman/pixman-0.32.6/ChangeLog b/source/libs/pixman/pixman-0.32.8/ChangeLog
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/ChangeLog
rename to source/libs/pixman/pixman-0.32.8/ChangeLog
diff --git a/source/libs/pixman/pixman-0.32.6/INSTALL b/source/libs/pixman/pixman-0.32.8/INSTALL
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/INSTALL
rename to source/libs/pixman/pixman-0.32.8/INSTALL
diff --git a/source/libs/pixman/pixman-0.32.6/Makefile.am b/source/libs/pixman/pixman-0.32.8/Makefile.am
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/Makefile.am
rename to source/libs/pixman/pixman-0.32.8/Makefile.am
diff --git a/source/libs/pixman/pixman-0.32.6/Makefile.win32 b/source/libs/pixman/pixman-0.32.8/Makefile.win32
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/Makefile.win32
rename to source/libs/pixman/pixman-0.32.8/Makefile.win32
diff --git a/source/libs/pixman/pixman-0.32.6/Makefile.win32.common b/source/libs/pixman/pixman-0.32.8/Makefile.win32.common
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/Makefile.win32.common
rename to source/libs/pixman/pixman-0.32.8/Makefile.win32.common
diff --git a/source/libs/pixman/pixman-0.32.6/NEWS b/source/libs/pixman/pixman-0.32.8/NEWS
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/NEWS
rename to source/libs/pixman/pixman-0.32.8/NEWS
diff --git a/source/libs/pixman/pixman-0.32.6/README b/source/libs/pixman/pixman-0.32.8/README
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/README
rename to source/libs/pixman/pixman-0.32.8/README
diff --git a/source/libs/pixman/pixman-0.32.6/config.h.in b/source/libs/pixman/pixman-0.32.8/config.h.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/config.h.in
rename to source/libs/pixman/pixman-0.32.8/config.h.in
diff --git a/source/libs/pixman/pixman-0.32.6/configure.ac b/source/libs/pixman/pixman-0.32.8/configure.ac
old mode 100644
new mode 100755
similarity index 99%
rename from source/libs/pixman/pixman-0.32.6/configure.ac
rename to source/libs/pixman/pixman-0.32.8/configure.ac
index dce76b3b2..97494e693
--- a/source/libs/pixman/pixman-0.32.6/configure.ac
+++ b/source/libs/pixman/pixman-0.32.8/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 32)
-m4_define([pixman_micro], 6)
+m4_define([pixman_micro], 8)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
diff --git a/source/libs/pixman/pixman-0.32.6/pixman-1-uninstalled.pc.in b/source/libs/pixman/pixman-0.32.8/pixman-1-uninstalled.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman-1-uninstalled.pc.in
rename to source/libs/pixman/pixman-0.32.8/pixman-1-uninstalled.pc.in
diff --git a/source/libs/pixman/pixman-0.32.6/pixman-1.pc.in b/source/libs/pixman/pixman-0.32.8/pixman-1.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman-1.pc.in
rename to source/libs/pixman/pixman-0.32.8/pixman-1.pc.in
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/Makefile.am b/source/libs/pixman/pixman-0.32.8/pixman/Makefile.am
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/Makefile.am
rename to source/libs/pixman/pixman-0.32.8/pixman/Makefile.am
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/Makefile.sources b/source/libs/pixman/pixman-0.32.8/pixman/Makefile.sources
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/Makefile.sources
rename to source/libs/pixman/pixman-0.32.8/pixman/Makefile.sources
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/Makefile.win32 b/source/libs/pixman/pixman-0.32.8/pixman/Makefile.win32
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/Makefile.win32
rename to source/libs/pixman/pixman-0.32.8/pixman/Makefile.win32
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/loongson-mmintrin.h b/source/libs/pixman/pixman-0.32.8/pixman/loongson-mmintrin.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/loongson-mmintrin.h
rename to source/libs/pixman/pixman-0.32.8/pixman/loongson-mmintrin.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-access-accessors.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-access-accessors.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-access-accessors.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-access-accessors.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-access.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-access.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-access.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-access.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-accessor.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman-accessor.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-accessor.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-accessor.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-common.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-common.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-common.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-common.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-neon-asm-bilinear.S b/source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-neon-asm-bilinear.S
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-neon-asm-bilinear.S
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-neon-asm-bilinear.S
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-neon-asm.S b/source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-neon-asm.S
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-neon-asm.S
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-neon-asm.S
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-neon-asm.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-neon-asm.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-neon-asm.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-neon-asm.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-neon.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-neon.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-neon.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-neon.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-simd-asm-scaled.S b/source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-simd-asm-scaled.S
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-simd-asm-scaled.S
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-simd-asm-scaled.S
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-simd-asm.S b/source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-simd-asm.S
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-simd-asm.S
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-simd-asm.S
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-simd-asm.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-simd-asm.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-simd-asm.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-simd-asm.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-simd.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-simd.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-arm-simd.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-arm-simd.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-arm.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-arm.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-arm.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-arm.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-bits-image.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-bits-image.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-bits-image.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-bits-image.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-combine-float.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-combine-float.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-combine-float.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-combine-float.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-combine32.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-combine32.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-combine32.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-combine32.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-combine32.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman-combine32.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-combine32.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-combine32.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-compiler.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman-compiler.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-compiler.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-compiler.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-conical-gradient.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-conical-gradient.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-conical-gradient.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-conical-gradient.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-edge-accessors.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-edge-accessors.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-edge-accessors.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-edge-accessors.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-edge-imp.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman-edge-imp.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-edge-imp.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-edge-imp.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-edge.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-edge.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-edge.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-edge.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-fast-path.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-fast-path.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-fast-path.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-fast-path.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-filter.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-filter.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-filter.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-filter.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-general.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-general.c
old mode 100644
new mode 100755
similarity index 96%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-general.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-general.c
index a653fa71a..f82ea7d71
--- a/source/libs/pixman/pixman-0.32.6/pixman/pixman-general.c
+++ b/source/libs/pixman/pixman-0.32.8/pixman/pixman-general.c
@@ -140,23 +140,21 @@ general_composite_rect  (pixman_implementation_t *imp,
 #define ALIGN(addr)							\
     ((uint8_t *)((((uintptr_t)(addr)) + 15) & (~15)))
 
-    src_buffer = ALIGN (scanline_buffer);
-    mask_buffer = ALIGN (src_buffer + width * Bpp);
-    dest_buffer = ALIGN (mask_buffer + width * Bpp);
+    if (width <= 0 || _pixman_multiply_overflows_int (width, Bpp * 3))
+	return;
 
-    if (ALIGN (dest_buffer + width * Bpp) >
-	    scanline_buffer + sizeof (stack_scanline_buffer))
+    if (width * Bpp * 3 > sizeof (stack_scanline_buffer) - 32 * 3)
     {
 	scanline_buffer = pixman_malloc_ab_plus_c (width, Bpp * 3, 32 * 3);
 
 	if (!scanline_buffer)
 	    return;
-
-	src_buffer = ALIGN (scanline_buffer);
-	mask_buffer = ALIGN (src_buffer + width * Bpp);
-	dest_buffer = ALIGN (mask_buffer + width * Bpp);
     }
 
+    src_buffer = ALIGN (scanline_buffer);
+    mask_buffer = ALIGN (src_buffer + width * Bpp);
+    dest_buffer = ALIGN (mask_buffer + width * Bpp);
+
     if (width_flag == ITER_WIDE)
     {
 	/* To make sure there aren't any NANs in the buffers */
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-glyph.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-glyph.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-glyph.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-glyph.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-gradient-walker.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-gradient-walker.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-gradient-walker.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-gradient-walker.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-image.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-image.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-image.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-image.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-implementation.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-implementation.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-implementation.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-implementation.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-inlines.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman-inlines.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-inlines.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-inlines.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-linear-gradient.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-linear-gradient.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-linear-gradient.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-linear-gradient.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-matrix.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-matrix.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-matrix.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-matrix.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-mips-dspr2-asm.S b/source/libs/pixman/pixman-0.32.8/pixman/pixman-mips-dspr2-asm.S
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-mips-dspr2-asm.S
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-mips-dspr2-asm.S
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-mips-dspr2-asm.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman-mips-dspr2-asm.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-mips-dspr2-asm.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-mips-dspr2-asm.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-mips-dspr2.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-mips-dspr2.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-mips-dspr2.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-mips-dspr2.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-mips-dspr2.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman-mips-dspr2.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-mips-dspr2.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-mips-dspr2.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-mips-memcpy-asm.S b/source/libs/pixman/pixman-0.32.8/pixman/pixman-mips-memcpy-asm.S
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-mips-memcpy-asm.S
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-mips-memcpy-asm.S
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-mips.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-mips.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-mips.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-mips.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-mmx.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-mmx.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-mmx.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-mmx.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-noop.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-noop.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-noop.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-noop.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-ppc.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-ppc.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-ppc.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-ppc.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-private.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman-private.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-private.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-private.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-radial-gradient.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-radial-gradient.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-radial-gradient.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-radial-gradient.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-region.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-region.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-region.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-region.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-region16.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-region16.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-region16.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-region16.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-region32.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-region32.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-region32.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-region32.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-solid-fill.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-solid-fill.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-solid-fill.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-solid-fill.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-sse2.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-sse2.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-sse2.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-sse2.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-ssse3.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-ssse3.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-ssse3.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-ssse3.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-timer.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-timer.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-timer.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-timer.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-trap.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-trap.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-trap.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-trap.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-utils.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-utils.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-utils.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-utils.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-version.h.in b/source/libs/pixman/pixman-0.32.8/pixman/pixman-version.h.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-version.h.in
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-version.h.in
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-vmx.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-vmx.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-vmx.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-vmx.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-x86.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman-x86.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman-x86.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman-x86.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman.c b/source/libs/pixman/pixman-0.32.8/pixman/pixman.c
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman.c
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman.c
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman.h b/source/libs/pixman/pixman-0.32.8/pixman/pixman.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/pixman.h
rename to source/libs/pixman/pixman-0.32.8/pixman/pixman.h
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/solaris-hwcap.mapfile b/source/libs/pixman/pixman-0.32.8/pixman/solaris-hwcap.mapfile
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/pixman/pixman-0.32.6/pixman/solaris-hwcap.mapfile
rename to source/libs/pixman/pixman-0.32.8/pixman/solaris-hwcap.mapfile
diff --git a/source/libs/pixman/version.ac b/source/libs/pixman/version.ac
index b4ee6b26d..c0935e7a3 100644
--- a/source/libs/pixman/version.ac
+++ b/source/libs/pixman/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current pixman version
-m4_define([pixman_version], [0.32.6])
+m4_define([pixman_version], [0.32.8])
diff --git a/source/m4/ChangeLog b/source/m4/ChangeLog
index 474e8d465..9d08d9fb6 100644
--- a/source/m4/ChangeLog
+++ b/source/m4/ChangeLog
@@ -1,4 +1,8 @@
-2015-09-044  Peter Breitenlohner  <peb@mppmu.mpg.de>
+2015-09-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-setup.m4: Allow LuaJIT for x86_64-cygwin.
+
+2015-09-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpse-lib-version.m4 (KPSE_LIB_VERSION): Allow more general
 	version number suffix strings, e.g., "-beta1".
diff --git a/source/m4/kpse-setup.m4 b/source/m4/kpse-setup.m4
index a47abb34b..4cac0f2f7 100644
--- a/source/m4/kpse-setup.m4
+++ b/source/m4/kpse-setup.m4
@@ -85,7 +85,7 @@ AC_FOREACH([Kpse_Pkg], [luajittex mfluajit], [dnl
 AS_CASE([$enable_]Kpse_Pkg,
         [yes | no], [:],
           [AS_CASE([$host],
-                   [alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ],
+                   [alpha* | sparc* | powerpc-*-darwin* ],
                      [AC_MSG_NOTICE([$host -> `--disable-]Kpse_Pkg['])
                       ac_configure_args="$ac_configure_args '--disable-]Kpse_Pkg['"])])
 ])
diff --git a/source/texk/README b/source/texk/README
index 27b078715..f185a5ddd 100644
--- a/source/texk/README
+++ b/source/texk/README
@@ -1,4 +1,4 @@
-$Id: README 38285 2015-09-03 06:54:44Z peter $
+$Id: README 38471 2015-09-27 12:22:13Z peter $
 Copyright 2006-2015 TeX Users Group.
 You may freely use, modify and/or distribute this file.
 
@@ -69,7 +69,7 @@ gsftopk - from Paul Vojta's xdvi?
 
 kpathsea - maintained here, by us
 
-lcdf-typetools 2.104 - checked 8jul14
+lcdf-typetools 2.105 - checked 27sep15
   http://www.lcdf.org/type/
 
 makeindexk - maintained here, by us
diff --git a/source/texk/configure b/source/texk/configure
index 294dd2e4c..0896acc43 100755
--- a/source/texk/configure
+++ b/source/texk/configure
@@ -3163,7 +3163,7 @@ case $enable_luajittex in #(
     : ;; #(
   *) :
     case $host in #(
-  alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+  alpha* | sparc* | powerpc-*-darwin* ) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
 $as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
                       ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -3176,7 +3176,7 @@ case $enable_mfluajit in #(
     : ;; #(
   *) :
     case $host in #(
-  alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+  alpha* | sparc* | powerpc-*-darwin* ) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit'" >&5
 $as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
                       ac_configure_args="$ac_configure_args '--disable-mfluajit'" ;; #(
diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog
index 8aaf0ba33..89f6bcf95 100644
--- a/source/texk/web2c/ChangeLog
+++ b/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* triptest.test: Also check tripos.tex.
+
 2015-09-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Check poppler for Object::initCmd(const char*).
@@ -274,7 +278,7 @@
 
 	* trap.test (removed): Renamed ...
 	* mftraptest (new): ... into this.
-	* trp.test (removed): Renamed ...
+	* trip.test (removed): Renamed ...
 	* triptest (new): ... into this.
 	* am/texmf.am, triptrap-sh: Adapted.
 
diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in
index 1e376ea6e..a0659228b 100644
--- a/source/texk/web2c/Makefile.in
+++ b/source/texk/web2c/Makefile.in
@@ -2778,7 +2778,7 @@ mfluajit_nowin_CPPFLAGS = $(mfluajit_CPPFLAGS) -DMFNOWIN $(LUAJIT_INCLUDES) $(LU
 mfluajit_nowin_LDADD = libmfluajit.a $(LDADD) $(windowlib) $(LUAJIT_LIBS)
 mfluajit_nowin_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
 
-# MFLua C sources
+# MFLuaJIT C sources
 mfluajit_c_h = mfluajitini.c mfluajit0.c mfluajitcoerce.h mfluajitd.h
 dist_libmfluajit_a_SOURCES = luatexdir/lua/lkpselib.c mfluadir/mfluac.c mfluadir/mfluac.h
 nodist_libmfluajit_a_SOURCES = $(mfluajit_c_h) mfluajit-pool.c
@@ -2794,7 +2794,7 @@ mfluajit_ch_src = \
 	mf-binpool.ch
 
 
-# MFLua tests
+# MFLuaJIT tests
 #
 mfluajit_tests = mfluajitdir/mfluajittraptest.test
 mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
@@ -15384,9 +15384,9 @@ $(mflua_OBJECTS) $(mflua_nowin_OBJECTS): mfluad.h mfluadir/mflua_version.h
 # We must create mfluad.h before building the libmflua_a_OBJECTS.
 $(libmflua_a_OBJECTS): mfluad.h
 
-$(mflua_c_h): mflua-web2c $(LUA_DEPEND)
+$(mflua_c_h): mflua-web2c
 	@$(web2c) mflua
-mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines
+mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines $(LUA_DEPEND)
 	@$(web2c) mflua
 
 mflua-pool.c: mflua.pool mfluad.h $(makecpool_stamp)
@@ -15432,15 +15432,15 @@ $(mfluajit_OBJECTS) $(mfluajit_nowin_OBJECTS): mfluajitd.h mfluadir/mflua_versio
 # We must create mfluajitd.h before building the libmfluajit_a_OBJECTS.
 $(libmfluajit_a_OBJECTS): mfluajitd.h
 
-$(mfluajit_c_h): mfluajit-web2c $(LUAJIT_DEPEND)
+$(mfluajit_c_h): mfluajit-web2c
 	@$(web2c) mfluajit
-mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines
+mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines $(LUAJIT_DEPEND)
 	@$(web2c) mfluajit
 
 mfluajit-pool.c: mfluajit.pool mfluajitd.h $(makecpool_stamp)
 	$(makecpool) mfluajit >$@ || rm -f $@
 
-# Tangling MFLua
+# Tangling MFLuaJIT
 mfluajit.p mfluajit.pool: mfluajit-tangle
 	@$(texmf_tangle) mfluajit mfluajit
 mfluajit-tangle: tangle$(EXEEXT) mfluajit.web mfluajit.ch tangle-sh
diff --git a/source/texk/web2c/mfluadir/am/mflua.am b/source/texk/web2c/mfluadir/am/mflua.am
index 17f27d145..3b859fd8d 100644
--- a/source/texk/web2c/mfluadir/am/mflua.am
+++ b/source/texk/web2c/mfluadir/am/mflua.am
@@ -68,9 +68,9 @@ libmflua_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) -DMF_LUA
 # We must create mfluad.h before building the libmflua_a_OBJECTS.
 $(libmflua_a_OBJECTS): mfluad.h
 
-$(mflua_c_h): mflua-web2c $(LUA_DEPEND)
+$(mflua_c_h): mflua-web2c
 	@$(web2c) mflua
-mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines
+mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines $(LUA_DEPEND)
 	@$(web2c) mflua
 
 mflua-pool.c: mflua.pool mfluad.h $(makecpool_stamp)
diff --git a/source/texk/web2c/mfluajitdir/am/mfluajit.am b/source/texk/web2c/mfluajitdir/am/mfluajit.am
index c990ca4b1..b2cf7a4fa 100644
--- a/source/texk/web2c/mfluajitdir/am/mfluajit.am
+++ b/source/texk/web2c/mfluajitdir/am/mfluajit.am
@@ -3,7 +3,7 @@
 ## Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
-## MFLua
+## MFLuaJIT
 ##
 if MFLUAJIT
 bin_PROGRAMS += mfluajit
@@ -59,7 +59,7 @@ $(mfluajit_OBJECTS) $(mfluajit_nowin_OBJECTS): mfluajitd.h mfluadir/mflua_versio
 ## To avoid compiling everything twice, the common objects are in a library.
 EXTRA_LIBRARIES += libmfluajit.a
 
-# MFLua C sources
+# MFLuaJIT C sources
 mfluajit_c_h = mfluajitini.c mfluajit0.c mfluajitcoerce.h mfluajitd.h
 dist_libmfluajit_a_SOURCES = luatexdir/lua/lkpselib.c mfluadir/mfluac.c mfluadir/mfluac.h
 nodist_libmfluajit_a_SOURCES = $(mfluajit_c_h) mfluajit-pool.c
@@ -68,15 +68,15 @@ libmfluajit_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DMF_LUA -DJIT
 # We must create mfluajitd.h before building the libmfluajit_a_OBJECTS.
 $(libmfluajit_a_OBJECTS): mfluajitd.h
 
-$(mfluajit_c_h): mfluajit-web2c $(LUAJIT_DEPEND)
+$(mfluajit_c_h): mfluajit-web2c
 	@$(web2c) mfluajit
-mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines
+mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines $(LUAJIT_DEPEND)
 	@$(web2c) mfluajit
 
 mfluajit-pool.c: mfluajit.pool mfluajitd.h $(makecpool_stamp)
 	$(makecpool) mfluajit >$@ || rm -f $@
 
-# Tangling MFLua
+# Tangling MFLuaJIT
 mfluajit.p mfluajit.pool: mfluajit-tangle
 	@$(texmf_tangle) mfluajit mfluajit
 mfluajit-tangle: tangle$(EXEEXT) mfluajit.web mfluajit.ch tangle-sh
@@ -106,7 +106,7 @@ DISTCLEANFILES += $(nodist_libmfluajit_a_SOURCES) mfluajit.web mfluajit.ch mflua
 EXTRA_DIST += \
 	mfluajitdir/ChangeLog
 
-# MFLua tests
+# MFLuaJIT tests
 #
 mfluajit_tests = mfluajitdir/mfluajittraptest.test
 mfluajitdir/mfluajittraptest.log: mfluajit$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
diff --git a/source/texk/web2c/texmfmp.h b/source/texk/web2c/texmfmp.h
index 2fd065e7a..3fbf70215 100644
--- a/source/texk/web2c/texmfmp.h
+++ b/source/texk/web2c/texmfmp.h
@@ -1,4 +1,4 @@
-/* texmf.h: Main include file for TeX and MF in C. This file is
+/* texmfmp.h: Main include file for TeX and MF in C. This file is
    included by {tex,mf}d.h, which is the first include in the C files
    output by web2c.  */
 
@@ -338,7 +338,7 @@ extern void paintrow (/*screenrow, pixelcolor, transspec, screencol*/);
     }									\
   } while (0)
 
-/* We define the routines to do the actual work in texmf.c.  */
+/* We define the routines to do the actual work in texmfmp.c.  */
 #ifdef XeTeX
 #include <zlib.h>
 extern void do_dump (char *, int, int, gzFile);
diff --git a/source/utils/configure b/source/utils/configure
index c7f546a4f..d7858b37f 100755
--- a/source/utils/configure
+++ b/source/utils/configure
@@ -3160,7 +3160,7 @@ case $enable_luajittex in #(
     : ;; #(
   *) :
     case $host in #(
-  alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+  alpha* | sparc* | powerpc-*-darwin* ) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
 $as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
                       ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -3173,7 +3173,7 @@ case $enable_mfluajit in #(
     : ;; #(
   *) :
     case $host in #(
-  alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+  alpha* | sparc* | powerpc-*-darwin* ) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit'" >&5
 $as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
                       ac_configure_args="$ac_configure_args '--disable-mfluajit'" ;; #(
-- 
GitLab