diff --git a/manual/luatexref-t.pdf b/manual/luatexref-t.pdf
index adb0d825c454b24493c23f84aca707a36a03a4f2..07a4d0ba1c42f5c85a4d4f696888e7e66312acb1 100644
Binary files a/manual/luatexref-t.pdf and b/manual/luatexref-t.pdf differ
diff --git a/source/ChangeLog b/source/ChangeLog
index 0e8c8de0865ab690dc1b3933346106651c671528..556cabc061a981e5207939e006eccf5153b6f7d0 100644
--- a/source/ChangeLog
+++ b/source/ChangeLog
@@ -56,7 +56,7 @@
* Makefile.am, configure.ac: Use am/recurse.am.
-2013-03-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+2013-06-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Added Automake options 'tar-pax' for paths
longer than 100 chars and 'no-dist-gzip'.
diff --git a/source/README.hacking b/source/README.hacking
index 00b3847abae213c657371d72493c20c2c9304e32..3a6e52357f37e8e0d8d07e721e9307e5e25469fe 100644
--- a/source/README.hacking
+++ b/source/README.hacking
@@ -20,7 +20,7 @@ ltmain.sh (GNU libtool) 2.4.2
bison (GNU Bison) 3.0
-flex 2.5.37
+flex 2.5.39
m4 (GNU M4) 1.4.17
diff --git a/source/build-aux/config.guess b/source/build-aux/config.guess
index 72625d40c0051742f056457aa4ec424a990b8f3c..1f5c50c0d1529d50b94dc3533ca72a47f0fa5849 100755
--- 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-2014 Free Software Foundation, Inc.
-timestamp='2014-02-12'
+timestamp='2014-03-23'
# 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
@@ -826,7 +826,7 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS*:*)
+ *:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -969,10 +969,10 @@ EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ openrisc*:Linux:*:*)
+ echo or1k-unknown-linux-${LIBC}
exit ;;
- or32:Linux:*:*)
+ or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
diff --git a/source/build-aux/config.sub b/source/build-aux/config.sub
index 092cff00ea786c4b600aa5393f1e054544e3c27c..5d7d62fb6fc5b12bb52ba2c618b586a9c360cda5 100755
--- a/source/build-aux/config.sub
+++ b/source/build-aux/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2014-01-01'
+timestamp='2014-03-23'
# 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
@@ -296,8 +296,7 @@ case $basic_machine in
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | open8 \
- | or1k | or32 \
+ | open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@@ -415,6 +414,7 @@ case $basic_machine in
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
+ | or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -1594,9 +1594,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff --git a/source/build-aux/texinfo.tex b/source/build-aux/texinfo.tex
index 3e521840ca29e35f81557396a7ded1a463fb6a8d..0f2673c849e25850ca3d3d5533fefb29c6f5c13d 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{2014-02-16.16}
+\def\texinfoversion{2014-03-17.07}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -3935,19 +3935,23 @@ end
}
% multitable-only commands.
-%
-% @headitem starts a heading row, which we typeset in bold.
-% Assignments have to be global since we are inside the implicit group
-% of an alignment entry. \everycr resets \everytab so we don't have to
+%
+% @headitem starts a heading row, which we typeset in bold. Assignments
+% have to be global since we are inside the implicit group of an
+% alignment entry. \everycr below resets \everytab so we don't have to
% undo it ourselves.
\def\headitemfont{\b}% for people to use in the template row; not changeable
\def\headitem{%
\checkenv\multitable
\crcr
+ \gdef\headitemcrhook{\nobreak}% attempt to avoid page break after headings
\global\everytab={\bf}% can't use \headitemfont since the parsing differs
\the\everytab % for the first item
}%
%
+% default for tables with no headings.
+\let\headitemcrhook=\relax
+%
% A \tab used to include \hskip1sp. But then the space in a template
% line is not enough. That is bad. So let's go back to just `&' until
% we again encounter the problem the 1sp was intended to solve.
@@ -3978,15 +3982,15 @@ end
%
\everycr = {%
\noalign{%
- \global\everytab={}%
+ \global\everytab={}% Reset from possible headitem.
\global\colcount=0 % Reset the column counter.
- % Check for saved footnotes, etc.
+ %
+ % Check for saved footnotes, etc.:
\checkinserts
- % Keeps underfull box messages off when table breaks over pages.
- %\filbreak
- % Maybe so, but it also creates really weird page breaks when the
- % table breaks over pages. Wouldn't \vfil be better? Wait until the
- % problem manifests itself, so it can be fixed for real --karl.
+ %
+ % Perhaps a \nobreak, then reset:
+ \headitemcrhook
+ \global\let\headitemcrhook=\relax
}%
}%
%
diff --git a/source/configure b/source/configure
index 2846af2f38b68a481233ec5d5021c606f5ff4987..1492bcfe70ab28f3fece6731c497c40f5ea071da 100755
--- a/source/configure
+++ b/source/configure
@@ -2806,11 +2806,6 @@ specify the configure option \`--enable-build-in-source-tree', but
then do not ask for help -- you have been warned." "$LINENO" 5
fi
-# Check whether --enable-missing was given.
-if test "${enable_missing+set}" = set; then :
- enableval=$enable_missing;
-fi
-
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -2882,6 +2877,11 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then :
+ enableval=$enable_missing;
+fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3841,6 +3841,19 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;}
$as_echo "$as_me: WIN32 -> \`--without-x'" >&6;}
ac_configure_args="$ac_configure_args '--without-x'" ;;
esac
+case $enable_luajittex in #(
+ yes | no) :
+ : ;; #(
+ *) :
+ case $host in #(
+ alpha* | sparc* | x86_64-*-cygwin) :
+ { $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'" ;; #(
+ *) :
+ ;;
+esac ;;
+esac
## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
## configure options and TL libraries required for web2c
diff --git a/source/doc/build-tools b/source/doc/build-tools
index f9bb30a7d03e8272d65be7831acee67b06b36a21..4d078014df9f9158bec05b5ea257d16ed10c6890 100644
--- a/source/doc/build-tools
+++ b/source/doc/build-tools
@@ -9,7 +9,7 @@ autoconf (GNU Autoconf) 2.69
automake (GNU automake) 1.14.1
ltmain.sh (GNU libtool) 2.4.2
bison (GNU Bison) 3.0
-flex 2.5.37
+flex 2.5.39
m4 (GNU M4) 1.4.17
makeinfo (GNU texinfo) 5.2
@end example
diff --git a/source/doc/build.texi b/source/doc/build.texi
index 18398c33884b504ffaa913c0849a9ea7dbfc3408..46b54eddd0946887227f49015cd7c17c463f0fb6 100644
--- a/source/doc/build.texi
+++ b/source/doc/build.texi
@@ -113,7 +113,9 @@ finally run @code{make check}. Several details of this process can be
specified via environment variables and a few leading options; all remaining
arguments (assignments or options) are passed to the @file{configure}
script. Or one can run @command{configure} and @command{make} in a suitable
-empty subdirectory.
+empty subdirectory. In principle one could run @command{./configure} in the
+top-level directory of the source tree; this is, however, not well tested
+and should be avoided.
Running the top-level @file{configure} script configures just the top-level
and the subdirectories @file{libs}, @file{utils}, and @file{texk}. Running
@@ -452,6 +454,25 @@ Each library module @file{libs/@var{lib}} or @file{texk/@var{lib}} there is
supplemented by a macro @code{KPSE_@var{LIB}_FLAGS} that provides make
variables for that library. For, e.g., @file{libs/libpng} there is:
+@cpindex @code{KPSE_CAIRO_FLAGS}
+@cpindex @code{KPSE_FONTCONFIG_FLAGS}
+@cpindex @code{KPSE_FREETYPE2_FLAGS}
+@cpindex @code{KPSE_GD_FLAGS}
+@cpindex @code{KPSE_GRAPHITE2_FLAGS}
+@cpindex @code{KPSE_HARFBUZZ_FLAGS}
+@cpindex @code{KPSE_ICU_FLAGS}
+@cpindex @code{KPSE_KPATHSEA_FLAGS}
+@cpindex @code{KPSE_LIBPAPER_FLAGS}
+@cpindex @code{KPSE_LUA52_FLAGS}
+@cpindex @code{KPSE_LUAJIT_FLAGS}
+@cpindex @code{KPSE_PIXMAN_FLAGS}
+@cpindex @code{KPSE_POPPLER_FLAGS}
+@cpindex @code{KPSE_POTRACE_FLAGS}
+@cpindex @code{KPSE_PTEXENC_FLAGS}
+@cpindex @code{KPSE_TECKIT_FLAGS}
+@cpindex @code{KPSE_XPDF_FLAGS}
+@cpindex @code{KPSE_ZLIB_FLAGS}
+@cpindex @code{KPSE_ZZIPLIB_FLAGS}
@defmac KPSE_LIBPNG_FLAGS
Provide the configure option @code{--with-system-libpng}. Set and
@@ -1184,6 +1205,11 @@ option @code{--build=@var{host}} to get the correct canonical host name, but
note that this should not be @code{--host=@var{host}} (@pxref{Hosts and
Cross-Compilation, , , autoconf, Autoconf})!
+In order to, e.g., build 32-bit binaries with @command{clang} on a 64-bit
+OSX system one could use @* @ @ @ @code{./Build --build=i386-apple-darwin
+CC='clang -arch i386'} @backslashchar{} @* @ @ @ @ @ @ @ @ @
+@code{CXX='clang++ -arch i386' OBJCXX='clang++ -arch i386'}
+
@menu
* Configuring:: Configuring for Cross Compilation.
* Problems:: Cross Compilation Problems.
diff --git a/source/doc/texlive.info b/source/doc/texlive.info
index 36836bc016b0c30fcd4025633437c5b2145e55c1..df97238daa2804a715b03cd1c73f8f302b895583 100644
--- a/source/doc/texlive.info
+++ b/source/doc/texlive.info
@@ -3,7 +3,7 @@ texlive.texi.
This file documents the TeX Live system, etc.
- Copyright (C) 2013 Karl Berry, Peter Breitenlohner, & Norbert
+ Copyright (C) 2013, 2014 Karl Berry, Peter Breitenlohner, & Norbert
Preining.
Permission is granted to make and distribute verbatim copies of this
@@ -21,7 +21,7 @@ versions, except that this permission notice may be stated in a
translation approved by the TeX Users Group.
INFO-DIR-SECTION TeX
START-INFO-DIR-ENTRY
-* TeX Live: (texlive). The TeX Live System.
+* TeX Live: (texlive). The TeX Live distribution.
END-INFO-DIR-ENTRY
@@ -31,7 +31,7 @@ The TeX Live System
*******************
This manual documents how to build, install, and use TeX Live. It
-corresponds to version 2014, released in October 2013.
+corresponds to version 2014, released in March 2014.
* Menu:
@@ -48,7 +48,7 @@ File: texlive.info, Node: Introduction, Next: Build System, Prev: Top, Up: T
**************
This manual corresponds to version 2014 of the TeX Live system, released
-in October 2013.
+in March 2014.
1.1 TeX Live Mailing Lists
==========================
@@ -184,7 +184,9 @@ finally run 'make check'. Several details of this process can be
specified via environment variables and a few leading options; all
remaining arguments (assignments or options) are passed to the
'configure' script. Or one can run 'configure' and 'make' in a suitable
-empty subdirectory.
+empty subdirectory. In principle one could run './configure' in the
+top-level directory of the source tree; this is, however, not well
+tested and should be avoided.
Running the top-level 'configure' script configures just the
top-level and the subdirectories 'libs', 'utils', and 'texk'. Running
@@ -355,7 +357,7 @@ and having 'PATH' start with '/usr/local/gnu/bin'). Currently these are
automake (GNU automake) 1.14.1
ltmain.sh (GNU libtool) 2.4.2
bison (GNU Bison) 3.0
- flex 2.5.37
+ flex 2.5.39
m4 (GNU M4) 1.4.17
makeinfo (GNU texinfo) 5.2
@@ -1283,6 +1285,11 @@ the configure option '--build=HOST' to get the correct canonical host
name, but note that this should not be '--host=HOST' (*note
(autoconf)Hosts and Cross-Compilation::)!
+ In order to, e.g., build 32-bit binaries with 'clang' on a 64-bit OSX
+system one could use
+ './Build --build=i386-apple-darwin CC='clang -arch i386'' \
+ 'CXX='clang++ -arch i386' OBJCXX='clang++ -arch i386''
+
* Menu:
* Configuring:: Configuring for Cross Compilation.
@@ -1485,6 +1492,7 @@ Index
* introduction: Introduction. (line 6)
* KPSE_ADD_FLAGS: Autoconf Macros. (line 115)
* KPSE_BASIC: Autoconf Macros. (line 18)
+* 'KPSE_CAIRO_FLAGS': Autoconf Macros. (line 106)
* KPSE_CHECK_LATEX: Autoconf Macros. (line 39)
* KPSE_CHECK_PDFLATEX: Autoconf Macros. (line 47)
* KPSE_CHECK_PERL: Autoconf Macros. (line 51)
@@ -1496,36 +1504,54 @@ Index
* KPSE_COND_WIN32: Autoconf Macros. (line 159)
* KPSE_COND_WIN32_WRAP: Autoconf Macros. (line 170)
* KPSE_CXX_HACK: Autoconf Macros. (line 83)
+* 'KPSE_FONTCONFIG_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_FREETYPE2_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_GD_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_GRAPHITE2_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_HARFBUZZ_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_ICU_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_KPATHSEA_FLAGS': Autoconf Macros. (line 106)
* KPSE_LARGEFILE: Autoconf Macros. (line 94)
+* 'KPSE_LIBPAPER_FLAGS': Autoconf Macros. (line 106)
* KPSE_LIBPNG_FLAGS: Autoconf Macros. (line 106)
+* 'KPSE_LUA52_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_LUAJIT_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_PIXMAN_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_POPPLER_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_POTRACE_FLAGS': Autoconf Macros. (line 106)
* KPSE_PROG_LEX: Autoconf Macros. (line 55)
+* 'KPSE_PTEXENC_FLAGS': Autoconf Macros. (line 106)
* KPSE_RESTORE_FLAGS: Autoconf Macros. (line 120)
+* 'KPSE_TECKIT_FLAGS': Autoconf Macros. (line 106)
* KPSE_WIN32_CALL: Autoconf Macros. (line 177)
+* 'KPSE_XPDF_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_ZLIB_FLAGS': Autoconf Macros. (line 106)
+* 'KPSE_ZZIPLIB_FLAGS': Autoconf Macros. (line 106)
* the TeX Live build system: Build System. (line 6)
Tag Table:
-Node: Top991
-Node: Introduction1382
-Node: Build System2704
-Node: Prerequisites4916
-Node: Building and Installing6304
-Node: Source Tree13505
-Node: Top Levels15515
-Node: Autoconf Macros17110
-Node: Library Modules23422
-Node: Program Modules27680
-Node: Extending30747
-Node: Configure Options34705
-Node: Global Options36209
-Node: Program Specific Options40509
-Node: Library Specific Options46085
-Node: Variable Assignments47998
-Node: Cross Compilation50524
-Node: Configuring51563
-Node: Problems53231
-Node: Coding Rules54896
-Node: Index59302
+Node: Top989
+Node: Introduction1378
+Node: Build System2698
+Node: Prerequisites4910
+Node: Building and Installing6298
+Node: Source Tree13645
+Node: Top Levels15655
+Node: Autoconf Macros17250
+Node: Library Modules23562
+Node: Program Modules27820
+Node: Extending30887
+Node: Configure Options34845
+Node: Global Options36349
+Node: Program Specific Options40649
+Node: Library Specific Options46225
+Node: Variable Assignments48138
+Node: Cross Compilation50664
+Node: Configuring51925
+Node: Problems53593
+Node: Coding Rules55258
+Node: Index59664
End Tag Table
diff --git a/source/doc/texlive.pdf b/source/doc/texlive.pdf
index 98c321d55d16b1bc191ae3f0e6985366ae5b39d7..f142fdf2f0287e8567fc90b8ca73e072061cca22 100644
Binary files a/source/doc/texlive.pdf and b/source/doc/texlive.pdf differ
diff --git a/source/doc/texlive.texi b/source/doc/texlive.texi
index ac08fe0a0003eacc73caee15f89cc2bba1a30999..62ddbd0008091e7493a713f9ae9a35fe6ede13bd 100644
--- a/source/doc/texlive.texi
+++ b/source/doc/texlive.texi
@@ -9,15 +9,15 @@
@headings off
@evenheading @thispage @| @| @TL{} @ @ @thischapter
@oddheading @thissection @| @| @thispage
-@settitle TeX Live: The xxx
+@settitle The TeX Live distribution
@set version 2014
-@set month-year October 2013
+@set month-year March 2014
@copying
This file documents the @TL{} system, etc.
-Copyright @copyright{} 2013 Karl Berry, Peter Breitenlohner, & Norbert Preining.
+Copyright @copyright{} 2013, 2014 Karl Berry, Peter Breitenlohner, & Norbert Preining.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
@@ -58,7 +58,7 @@ approved by the @TeX{} Users Group.
@dircategory TeX
@direntry
-* @TL: (texlive). The @TL{} System.
+* TeX Live: (texlive). The TeX Live distribution.
@end direntry
diff --git a/source/libs/README b/source/libs/README
index e4818ef44c19707cc53556c8649e8f80f2b7ef67..ca12e8e3dcd2b61145cedad0ba3d957871985f11 100644
--- a/source/libs/README
+++ b/source/libs/README
@@ -1,4 +1,4 @@
-$Id: README 33172 2014-03-14 09:24:13Z peter $
+$Id: README 33300 2014-03-27 09:49:34Z peter $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -21,16 +21,16 @@ gd 2.1.0 - checked 26jun13
graphite2 1.2.4 - checked 2dec13
http://sourceforge.net/projects/silgraphite/files/graphite2/
-harfbuzz 0.9.26 - checked 31jan14
+harfbuzz 0.9.27 - checked 19mar14
http://www.freedesktop.org/software/harfbuzz/release/
-icu 52.1 (release) - checked 10oct13
+icu 53.1 (rc) - checked 20mar14
http://download.icu-project.org/files/icu4c/
libpaper 1.1.24+nmu2 - checked 24oct13
ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/
-libpng 1.6.9 - checked 7feb14
+libpng 1.6.10 - checked 15mar14
http://www.libpng.org/ - used by many
http://www.libpng.org/pub/png/pngcode.html
@@ -43,7 +43,7 @@ luajit 2.0.3 - checked 14mar14
pixman 0.32.4 - checked 18nov13
http://cairographics.org/releases/
-poppler 0.25.1 - checked 3jan14
+poppler 0.25.2 - checked 27mar14
http://poppler.freedesktop.org/ - used by luatex and xetex
potrace 1.11 - checked 12apr13
diff --git a/source/libs/configure b/source/libs/configure
index 2847f6f2fe8747f533393caead8b4dd0ee5f5f28..a3ae4a23ea1de83f4ec79a595d308a2df0c1eb17 100755
--- a/source/libs/configure
+++ b/source/libs/configure
@@ -2048,11 +2048,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-# Check whether --enable-missing was given.
-if test "${enable_missing+set}" = set; then :
- enableval=$enable_missing;
-fi
-
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -2124,6 +2119,11 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then :
+ enableval=$enable_missing;
+fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3083,6 +3083,19 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;}
$as_echo "$as_me: WIN32 -> \`--without-x'" >&6;}
ac_configure_args="$ac_configure_args '--without-x'" ;;
esac
+case $enable_luajittex in #(
+ yes | no) :
+ : ;; #(
+ *) :
+ case $host in #(
+ alpha* | sparc* | x86_64-*-cygwin) :
+ { $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'" ;; #(
+ *) :
+ ;;
+esac ;;
+esac
## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
## configure options and TL libraries required for web2c
diff --git a/source/libs/lua52/ChangeLog b/source/libs/lua52/ChangeLog
index c639f54482a1aea3bbb99f14ecbaed2a7f5ba25c..1098c44d2dcab744f8eb4b280c838706afcdb64b 100644
--- a/source/libs/lua52/ChangeLog
+++ b/source/libs/lua52/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Add -DHAVE_UNISTD_H to LUA52_DEFINES because
+ config.h is not used.
+
2014-03-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (AM_CPPFLAGS): Define LUAI_HASHLIMIT=6 for LuaTeX.
diff --git a/source/libs/lua52/configure b/source/libs/lua52/configure
index 09594f7e2db34e784d976560b5765d0fe69edef2..7f0246054f49868f2845e918b8141d96f250a1cf 100755
--- a/source/libs/lua52/configure
+++ b/source/libs/lua52/configure
@@ -5368,6 +5368,10 @@ case $ac_cv_sys_largefile_source in #(
esac
+if test "x$ac_cv_header_stdc" = xyes; then
+ LUA52_DEFINES="$LUA52_DEFINES -DHAVE_UNISTD_H"
+fi
+
LUA52_TREE=lua-5.2.3
diff --git a/source/libs/lua52/configure.ac b/source/libs/lua52/configure.ac
index 727a73116725c8e9a964ee2e90c83f7c8422d32b..c4ad5c5e3e505fe6a8c337422574cea46606daa1 100644
--- a/source/libs/lua52/configure.ac
+++ b/source/libs/lua52/configure.ac
@@ -30,6 +30,10 @@ AC_SEARCH_LIBS([sqrt], [m])
KPSE_LUA52_DEFINES
KPSE_LARGEFILE([LUA52_DEFINES])
+if test "x$ac_cv_header_stdc" = xyes; then
+ LUA52_DEFINES="$LUA52_DEFINES -DHAVE_UNISTD_H"
+fi
+
AC_SUBST([LUA52_TREE], [lua-]lua52_version)
AC_CONFIG_FILES([Makefile include/Makefile])
diff --git a/source/libs/lua52/lua-5.2.3-PATCHES/ChangeLog b/source/libs/lua52/lua-5.2.3-PATCHES/ChangeLog
index b2a675717af5d9e889b44bd1df98072ae52e21a0..66d53cade81a8d817c093eafbd7cbd27e3d3b8fd 100644
--- a/source/libs/lua52/lua-5.2.3-PATCHES/ChangeLog
+++ b/source/libs/lua52/lua-5.2.3-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-02-FreeBSD (new): Required for FreeBSD.
+ From Nikola Lecic <nikola.lecic@anthesphoria.net>.
+
2014-02-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-01-utf-8 (new): Allow utf-8 chars in identifiers.
diff --git a/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-FreeBSD b/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-FreeBSD
new file mode 100644
index 0000000000000000000000000000000000000000..625480b4732f53fb2ecf88cfce93565fd7227b0b
--- /dev/null
+++ b/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-FreeBSD
@@ -0,0 +1,13 @@
+diff -ur lua-5.2.3.orig/src/liolib.c lua-5.2.3/src/liolib.c
+--- lua-5.2.3.orig/src/liolib.c 2013-04-12 20:48:47.000000000 +0200
++++ lua-5.2.3/src/liolib.c 2014-03-19 15:03:49.727286832 +0100
+@@ -19,6 +19,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(HAVE_UNISTD_H)
++#include <unistd.h>
++#endif
+
+ #define liolib_c
+ #define LUA_LIB
diff --git a/source/libs/lua52/lua-5.2.3/src/liolib.c b/source/libs/lua52/lua-5.2.3/src/liolib.c
index 2a4ec4aa344e60ccd6e183c2ed7f9db889cc3e3c..481630101c014da172abf3ba413f754d2ffb7ba7 100644
--- a/source/libs/lua52/lua-5.2.3/src/liolib.c
+++ b/source/libs/lua52/lua-5.2.3/src/liolib.c
@@ -19,6 +19,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
#define liolib_c
#define LUA_LIB
diff --git a/source/libs/lua52/luatest.c b/source/libs/lua52/luatest.c
index 9c016b6890eebc8553cc78826fdc127d772d6884..ae2f3dcbe8e7fe8d42880d13b2cfd6376fe865be 100644
--- a/source/libs/lua52/luatest.c
+++ b/source/libs/lua52/luatest.c
@@ -1,4 +1,4 @@
-/* pixtest.c: Basic test for libpixman
+/* luatest.c: Basic test for liblua52
*
* Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
* You may freely use, modify and/or distribute this file.
diff --git a/source/libs/luajit/jittest.c b/source/libs/luajit/jittest.c
index 71384b9d8eea1fd4d6dd41b30dc7c17e05542f1d..8ac5f862acb34800a13935662672aeb61a1eea6b 100644
--- a/source/libs/luajit/jittest.c
+++ b/source/libs/luajit/jittest.c
@@ -1,4 +1,4 @@
-/* pixtest.c: Basic test for libpixman
+/* jittest.c: Basic test for libluajit
*
* Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
* You may freely use, modify and/or distribute this file.
diff --git a/source/libs/poppler/ChangeLog b/source/libs/poppler/ChangeLog
index 5e18892aa8c6eec33d2e5ada81e161c96f8e203f..bce57251af426cdfab6caefec1b3f6e2f1111d30 100644
--- a/source/libs/poppler/ChangeLog
+++ b/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler-0.25.2.
+ * version.ac: Adjust.
+
2014-01-03 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.25.1.
diff --git a/source/libs/poppler/Makefile.in b/source/libs/poppler/Makefile.in
index a8f56067ee24a8f0c8d46ee0feccbf01f4646677..b56606cfaebe2b599c19b5ce47117ecb92e6762e 100644
--- a/source/libs/poppler/Makefile.in
+++ b/source/libs/poppler/Makefile.in
@@ -52,7 +52,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \
$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/config.h.in \
- $(top_srcdir)/poppler-0.25.1/poppler/poppler-config.h.in \
+ $(top_srcdir)/poppler-0.25.2/poppler/poppler-config.h.in \
$(top_srcdir)/../../build-aux/depcomp ChangeLog \
../../build-aux/compile ../../build-aux/config.guess \
../../build-aux/config.sub ../../build-aux/depcomp \
@@ -550,7 +550,7 @@ poppler-config.h: stamp-h2
@if test ! -f $@; then rm -f stamp-h2; else :; fi
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h2; else :; fi
-stamp-h2: $(top_srcdir)/poppler-0.25.1/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.25.2/poppler/poppler-config.h.in $(top_builddir)/config.status
@rm -f stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status poppler-config.h
diff --git a/source/libs/poppler/configure b/source/libs/poppler/configure
index 5c6c1b8a0ee35b5e608d7ca3c172a237712b56f4..872663153d671c5ea98baff3bcf19c5b544de53e 100755
--- a/source/libs/poppler/configure
+++ b/source/libs/poppler/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.25.1.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.25.2.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -580,12 +580,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='poppler (TeX Live)'
PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.25.1'
-PACKAGE_STRING='poppler (TeX Live) 0.25.1'
+PACKAGE_VERSION='0.25.2'
+PACKAGE_STRING='poppler (TeX Live) 0.25.2'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.25.1/poppler/Array.cc"
+ac_unique_file="poppler-0.25.2/poppler/Array.cc"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1304,7 +1304,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 poppler (TeX Live) 0.25.1 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.25.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1371,7 +1371,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler (TeX Live) 0.25.1:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.25.2:";;
esac
cat <<\_ACEOF
@@ -1484,7 +1484,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.25.1
+poppler (TeX Live) configure 0.25.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2074,7 +2074,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 poppler (TeX Live) $as_me 0.25.1, which was
+It was created by poppler (TeX Live) $as_me 0.25.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3938,7 +3938,7 @@ fi
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.25.1'
+ VERSION='0.25.2'
# Some tools Automake needs.
@@ -6309,12 +6309,12 @@ fi
ac_config_headers="$ac_config_headers config.h"
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.25.1/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.25.2/poppler/poppler-config.h.in"
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.25.1"
+#define POPPLER_VERSION "0.25.2"
_ACEOF
@@ -6448,7 +6448,7 @@ fi
$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-POPPLER_TREE=poppler-0.25.1
+POPPLER_TREE=poppler-0.25.2
ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7008,7 +7008,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 poppler (TeX Live) $as_me 0.25.1, which was
+This file was extended by poppler (TeX Live) $as_me 0.25.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7074,7 +7074,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="\\
-poppler (TeX Live) config.status 0.25.1
+poppler (TeX Live) config.status 0.25.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7205,7 +7205,7 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.25.1/poppler/poppler-config.h.in" ;;
+ "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.25.2/poppler/poppler-config.h.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"include/goo/Makefile") CONFIG_FILES="$CONFIG_FILES include/goo/Makefile" ;;
diff --git a/source/libs/poppler/version.ac b/source/libs/poppler/version.ac
index 6344146a32f99056a9e8b489c448fc920880ecaf..48d6d43a35bc203b0ef7e7caa8a0119e6323369d 100644
--- a/source/libs/poppler/version.ac
+++ b/source/libs/poppler/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.25.1])
+m4_define([poppler_version], [0.25.2])
diff --git a/source/m4/ChangeLog b/source/m4/ChangeLog
index 9825a74dca12d3ec625c7b7dcd6ba505f24c2c4b..abb163010778fe6e72e5e1f7b2c8e501753f1a20 100644
--- a/source/m4/ChangeLog
+++ b/source/m4/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-cairo-flags.m4, kpse-cross.m4, kpse-pixman-flags.m4,
+ kpse-poppler-flags.m4, kpse-potrace-flags.m4, kpse-win32.m4,
+ kpse-zziplib-flags.m4: Clean up.
+
+2014-03-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-setup.m4: Disable LuaJITTeX for known unsupported systems.
+
2014-03-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-luajit-flags.m4 (KPSE_LUAJIT_DEFINES): Set LUAJIT_LDEXTRA
diff --git a/source/m4/kpse-cairo-flags.m4 b/source/m4/kpse-cairo-flags.m4
index f9c38f2e5882b0c6a47d56b39baae8468fba5a05..8e093e8643c79e58825d482d34bfa65a4be5d0fc 100644
--- a/source/m4/kpse-cairo-flags.m4
+++ b/source/m4/kpse-cairo-flags.m4
@@ -1,35 +1,35 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# KPSE_CAIRO_FLAGS
-# ---------------
+# ----------------
# Provide the configure options '--with-system-pixman' (if in the TL tree).
#
# Set the make variables CAIRO_INCLUDES and CAIRO_LIBS to the CPPFLAGS and
# LIBS required for the `-lcairo' library in libs/cairo/ of the TL tree.
-AC_DEFUN([KPSE_CAIRO_FLAGS],
-[_KPSE_LIB_FLAGS([cairo], [cairo], [],
- [-IBLD/libs/cairo/cairo], [BLD/libs/cairo/libcairo.a], [],
- [], [${top_builddir}/../../libs/cairo/cairo/cairo.h])[]dnl
+AC_DEFUN([KPSE_CAIRO_FLAGS], [dnl
+_KPSE_LIB_FLAGS([cairo], [cairo], [],
+ [-IBLD/libs/cairo/cairo], [BLD/libs/cairo/libcairo.a], [],
+ [], [${top_builddir}/../../libs/cairo/cairo/cairo.h])[]dnl
]) # KPSE_CAIRO_FLAGS
# KPSE_CAIRO_OPTIONS([WITH-SYSTEM])
-# --------------------------------
-AC_DEFUN([KPSE_CAIRO_OPTIONS],
-[m4_ifval([$1],
- [AC_ARG_WITH([system-cairo],
- AS_HELP_STRING([--with-system-cairo],
+# ---------------------------------
+AC_DEFUN([KPSE_CAIRO_OPTIONS], [dnl
+m4_ifval([$1],
+ [AC_ARG_WITH([system-cairo],
+ AS_HELP_STRING([--with-system-cairo],
[use installed cairo headers and library (requires pkg-config)]))])[]dnl
]) # KPSE_CAIRO_OPTIONS
# KPSE_CAIRO_SYSTEM_FLAGS
-# ----------------------
-AC_DEFUN([KPSE_CAIRO_SYSTEM_FLAGS],
-[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
+# -----------------------
+AC_DEFUN([KPSE_CAIRO_SYSTEM_FLAGS], [dnl
+AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
if $PKG_CONFIG cairo --atleast-version=1.12; then
CAIRO_INCLUDES=`$PKG_CONFIG cairo --cflags`
CAIRO_LIBS=`$PKG_CONFIG cairo --libs`
diff --git a/source/m4/kpse-cross.m4 b/source/m4/kpse-cross.m4
index 3f0200602976ba0d11d4288f2190eb21b654d37c..9396b8993373cfe4a03ab03ce78697e6f809bffc 100644
--- a/source/m4/kpse-cross.m4
+++ b/source/m4/kpse-cross.m4
@@ -1,12 +1,10 @@
# Private macros for the kpathsea library.
-# Copyright (C) 1995 - 2009 Karl Berry <tex-live@tug.org>
+# Copyright (C) 1995-2014 Karl Berry <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
-
# KPSE_CROSS_PATH_PROG(RESULT, CROSS_PROG, NORMAL_PROG)
# -----------------------------------------------------
# Find a program when cross-compiling, or use a default when not.
@@ -16,35 +14,12 @@
# Example: KPSE_CROSS_PATH_PROG([TANGLE], [tangle], [./tangle]) sets
# 'TANGLE' to the program 'tangle' found in PATH when cross-compiling,
# and to './tangle' if not.
-AC_DEFUN([KPSE_CROSS_PATH_PROG],
- [if test "x$cross_compiling" = xyes; then
+AC_DEFUN([KPSE_CROSS_PATH_PROG], [dnl
+AS_IF([test "x$cross_compiling" = xyes], [dnl
AC_PATH_PROG([$1], [$2])
-if test -z "${$1}"; then
- AC_MSG_ERROR([$2 was not found but is required when cross-compiling.
- Install $2 or set \$$1 to the full pathname.])
-fi
-else
- $1=$3
-fi
+AS_IF([test -z "${$1}"],
+ [AC_MSG_ERROR([$2 was not found but is required when cross-compiling.
+ Install $2 or set \$$1 to the full pathname.])])],
+[$1=$3])
]) # KPSE_CROSS_PATH_PROG
-# KPSE_CROSS_BUILD_VAR(STEM, PROG)
-# --------------------------------
-# Set BUILD$1 to $2 when cross-compiling, to $($1) if not.
-# Example: KPSE_CROSS_BUILD_VAR([CC], [cc]) sets 'BUILDCC' to 'cc'
-# if cross-compiling, and to '$(CC)' if not.
-AC_DEFUN([KPSE_CROSS_BUILD_VAR],
- [if test "x$cross_compiling" = xyes; then
- if test -z "${BUILD$1}"; then
- BUILD$1='$2'
- fi
- AC_MSG_RESULT([setting \$BUILD$1 to ${BUILD$1}])
-else
- if test -n "${BUILD$1}"; then
- AC_MSG_WARN([\$BUILD$1 set but not cross-compiling.])
- fi
- BUILD$1='$($1)'
-fi
-AC_SUBST([BUILD$1])
-]) # KPSE_CROSS_BUILD_VAR
-
diff --git a/source/m4/kpse-pixman-flags.m4 b/source/m4/kpse-pixman-flags.m4
index 08889fe33679e2aa99f583a7899471564b97d0c1..b184e1db253450c23c877dd769035c5843dabf1b 100644
--- a/source/m4/kpse-pixman-flags.m4
+++ b/source/m4/kpse-pixman-flags.m4
@@ -1,35 +1,35 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# KPSE_PIXMAN_FLAGS
-# ---------------
+# -----------------
# Provide the configure options '--with-system-pixman' (if in the TL tree).
#
# Set the make variables PIXMAN_INCLUDES and PIXMAN_LIBS to the CPPFLAGS and
# LIBS required for the `-lpixman-1' library in libs/pixman/ of the TL tree.
-AC_DEFUN([KPSE_PIXMAN_FLAGS],
-[_KPSE_LIB_FLAGS([pixman], [pixman], [],
- [-IBLD/libs/pixman/include], [BLD/libs/pixman/libpixman.a], [],
- [], [${top_builddir}/../../libs/pixman/include/pixman.h])[]dnl
+AC_DEFUN([KPSE_PIXMAN_FLAGS], [dnl
+_KPSE_LIB_FLAGS([pixman], [pixman], [],
+ [-IBLD/libs/pixman/include], [BLD/libs/pixman/libpixman.a], [],
+ [], [${top_builddir}/../../libs/pixman/include/pixman.h])[]dnl
]) # KPSE_PIXMAN_FLAGS
# KPSE_PIXMAN_OPTIONS([WITH-SYSTEM])
-# --------------------------------
-AC_DEFUN([KPSE_PIXMAN_OPTIONS],
-[m4_ifval([$1],
- [AC_ARG_WITH([system-pixman],
- AS_HELP_STRING([--with-system-pixman],
- [use installed pixman headers and library (requires pkg-config)]))])[]dnl
+# ----------------------------------
+AC_DEFUN([KPSE_PIXMAN_OPTIONS], [dnl
+m4_ifval([$1],
+ [AC_ARG_WITH([system-pixman],
+ AS_HELP_STRING([--with-system-pixman],
+ [use installed pixman headers and library (requires pkg-config)]))])[]dnl
]) # KPSE_PIXMAN_OPTIONS
# KPSE_PIXMAN_SYSTEM_FLAGS
-# ----------------------
-AC_DEFUN([KPSE_PIXMAN_SYSTEM_FLAGS],
-[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
+# ------------------------
+AC_DEFUN([KPSE_PIXMAN_SYSTEM_FLAGS], [dnl
+AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
if $PKG_CONFIG pixman-1 --atleast-version=0.18; then
PIXMAN_INCLUDES=`$PKG_CONFIG pixman-1 --cflags`
PIXMAN_LIBS=`$PKG_CONFIG pixman-1 --libs`
diff --git a/source/m4/kpse-poppler-flags.m4 b/source/m4/kpse-poppler-flags.m4
index 6345f9f3146805a399b5c7a4d28b493098f4909f..d2f67719e4244b586d2863d9b188fd1150ae2d5f 100644
--- a/source/m4/kpse-poppler-flags.m4
+++ b/source/m4/kpse-poppler-flags.m4
@@ -1,12 +1,12 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# KPSE_POPPLER_FLAGS
-# ---------------
+# ------------------
# Provide the configure option '--with-system-poppler' (if in the TL tree).
#
# Set the make variables POPPLER_INCLUDES and POPPLER_LIBS to the CPPFLAGS and
@@ -21,18 +21,18 @@ test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
]) # KPSE_POPPLER_FLAGS
# KPSE_POPPLER_OPTIONS([WITH-SYSTEM])
-# --------------------------------
-AC_DEFUN([KPSE_POPPLER_OPTIONS],
-[m4_ifval([$1],
- [AC_ARG_WITH([system-poppler],
- AS_HELP_STRING([--with-system-poppler],
- [use installed poppler headers and library (requires pkg-config)]))])[]dnl
+# -----------------------------------
+AC_DEFUN([KPSE_POPPLER_OPTIONS], [dnl
+m4_ifval([$1],
+ [AC_ARG_WITH([system-poppler],
+ AS_HELP_STRING([--with-system-poppler],
+ [use installed poppler headers and library (requires pkg-config)]))])[]dnl
]) # KPSE_POPPLER_OPTIONS
# KPSE_POPPLER_SYSTEM_FLAGS
-# ----------------------
-AC_DEFUN([KPSE_POPPLER_SYSTEM_FLAGS],
-[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
+# -------------------------
+AC_DEFUN([KPSE_POPPLER_SYSTEM_FLAGS], [dnl
+AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
if $PKG_CONFIG poppler --atleast-version=0.18; then
POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
diff --git a/source/m4/kpse-potrace-flags.m4 b/source/m4/kpse-potrace-flags.m4
index f88936996d2097d5ee03b90cdcfa2dd734c29293..161a90613d37dbe6a3322fcf4229479c902a3350 100644
--- a/source/m4/kpse-potrace-flags.m4
+++ b/source/m4/kpse-potrace-flags.m4
@@ -1,27 +1,27 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# KPSE_POTRACE_FLAGS
-# ---------------
+# ------------------
# Provide the configure options '--with-system-potrace' (if in the TL tree),
# '--with-potrace-includes', and '--with-potrace-libdir'.
#
# Set the make variables POTRACE_INCLUDES and POTRACE_LIBS to the CPPFLAGS and
# LIBS required for the `-lpotrace' library in libs/potrace/ of the TL tree.
-AC_DEFUN([KPSE_POTRACE_FLAGS],
-[_KPSE_LIB_FLAGS([potrace], [potrace], [],
- [-IBLD/libs/potrace/include], [BLD/libs/potrace/libpotrace.a], [],
- [], [${top_builddir}/../../libs/potrace/include/potracelib.h])[]dnl
+AC_DEFUN([KPSE_POTRACE_FLAGS], [dnl
+_KPSE_LIB_FLAGS([potrace], [potrace], [],
+ [-IBLD/libs/potrace/include], [BLD/libs/potrace/libpotrace.a], [],
+ [], [${top_builddir}/../../libs/potrace/include/potracelib.h])[]dnl
]) # KPSE_POTRACE_FLAGS
# KPSE_POTRACE_OPTIONS([WITH-SYSTEM])
-# --------------------------------
+# -----------------------------------
AC_DEFUN([KPSE_POTRACE_OPTIONS], [_KPSE_LIB_OPTIONS([potrace], [$1])])
# KPSE_POTRACE_SYSTEM_FLAGS
-# ----------------------
+# -------------------------
AC_DEFUN([KPSE_POTRACE_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([potrace], [potrace])])
diff --git a/source/m4/kpse-setup.m4 b/source/m4/kpse-setup.m4
index 73913d38159955606914c94c950bc885c63629c5..59a883e2e41c853d1fd4adfb4fdc231414fb41e3 100644
--- a/source/m4/kpse-setup.m4
+++ b/source/m4/kpse-setup.m4
@@ -1,5 +1,5 @@
# Private macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -15,6 +15,7 @@
# additional program specific configure options (if any)
# library dependencies for programs and libraries
AC_DEFUN([KPSE_SETUP], [dnl
+AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
AC_REQUIRE([_KPSE_MSG_WARN_PREPARE])[]dnl
m4_define([kpse_TL], [$1])[]dnl
m4_define([kpse_indent_26], [28])[]dnl
@@ -80,6 +81,12 @@ AS_CASE([$with_x:$kpse_cv_have_win32],
[with_x=no
AC_MSG_NOTICE([WIN32 -> `--without-x'])
ac_configure_args="$ac_configure_args '--without-x'"])
+AS_CASE([$enable_luajittex],
+ [yes | no], [:],
+ [AS_CASE([$host],
+ [alpha* | sparc* | x86_64-*-cygwin],
+ [AC_MSG_NOTICE([$host -> `--disable-luajittex'])
+ ac_configure_args="$ac_configure_args '--disable-luajittex'"])])
KPSE_FOR_PKGS([utils], [m4_sinclude(kpse_TL[utils/]Kpse_Pkg[/ac/withenable.ac])])
KPSE_FOR_PKGS([texk], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])])
KPSE_FOR_PKGS([libs], [m4_sinclude(kpse_TL[libs/]Kpse_Pkg[/ac/withenable.ac])])
diff --git a/source/m4/kpse-win32.m4 b/source/m4/kpse-win32.m4
index 199e942b3b8730922a4c209a665ef8756af27b69..4f1ac0851492a1a4bb2475768978cbd20f2a742d 100644
--- a/source/m4/kpse-win32.m4
+++ b/source/m4/kpse-win32.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -31,7 +31,7 @@ AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
]) # KPSE_COND_WIN32
# KPSE_COND_MINGW32
-# ---------------
+# -----------------
# Define the conditionals WIN32 and MINGW32.
AC_DEFUN([KPSE_COND_MINGW32], [dnl
AC_REQUIRE([KPSE_COND_WIN32])[]dnl
@@ -39,7 +39,7 @@ AM_CONDITIONAL([MINGW32], [test "x$kpse_cv_have_win32" = xmingw32])
]) # KPSE_COND_MINGW32
# KPSE_COND_WIN32_WRAP
-# ---------------
+# --------------------
# Define the conditionals WIN32 and WIN32_WRAP.
AC_DEFUN([KPSE_COND_WIN32_WRAP], [dnl
AC_REQUIRE([KPSE_COND_WIN32])[]dnl
diff --git a/source/m4/kpse-zziplib-flags.m4 b/source/m4/kpse-zziplib-flags.m4
index 064908f19f932dc67cd26c00ee4979c368ee1ced..e2197defb40fa25f31abbc89ffa8600c9417b3f6 100644
--- a/source/m4/kpse-zziplib-flags.m4
+++ b/source/m4/kpse-zziplib-flags.m4
@@ -1,40 +1,38 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 0
-
# KPSE_ZZIPLIB_FLAGS
-# -----------------
+# ------------------
# Provide the configure options '--with-system-zziplib' (if in the TL tree),
# '--with-zziplib-includes', and '--with-zziplib-libdir'.
#
# Set the make variables ZZIPLIB_INCLUDES and ZZIPLIB_LIBS to the CPPFLAGS and
# LIBS required for the `-lpng' library in libs/zziplib/ of the TL tree.
-AC_DEFUN([KPSE_ZZIPLIB_FLAGS],
-[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
+AC_DEFUN([KPSE_ZZIPLIB_FLAGS], [dnl
+AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
_KPSE_LIB_FLAGS([zziplib], [zzip], [],
[-IBLD/libs/zziplib/include], [BLD/libs/zziplib/libzzip.a], [],
[], [${top_builddir}/../../libs/zziplib/include/zzip/zzip.h])[]dnl
]) # KPSE_ZZIPLIB_FLAGS
# KPSE_ZZIPLIB_OPTIONS([WITH-SYSTEM])
-# ----------------------------------
-AC_DEFUN([KPSE_ZZIPLIB_OPTIONS],
-[m4_ifval([$1],
- [AC_ARG_WITH([system-zziplib],
- AS_HELP_STRING([--with-system-zziplib],
- [use installed zziplib headers and library
- (requires pkg-config)]))])[]dnl
+# -----------------------------------
+AC_DEFUN([KPSE_ZZIPLIB_OPTIONS], [dnl
+m4_ifval([$1],
+ [AC_ARG_WITH([system-zziplib],
+ AS_HELP_STRING([--with-system-zziplib],
+ [use installed zziplib headers and library
+ (requires pkg-config)]))])[]dnl
]) # KPSE_ZZIPLIB_OPTIONS
# KPSE_ZZIPLIB_SYSTEM_FLAGS
-# ------------------------
-AC_DEFUN([KPSE_ZZIPLIB_SYSTEM_FLAGS],
-[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
+# -------------------------
+AC_DEFUN([KPSE_ZZIPLIB_SYSTEM_FLAGS], [dnl
+AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
if $PKG_CONFIG zziplib --atleast-version=0.12; then
ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags`
ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs`
diff --git a/source/texk/README b/source/texk/README
index e2a89c296d7b716954a2fc214396bd4271034744..71bf4352daa9dbd5ecc03e6047f42589f192eb77 100644
--- a/source/texk/README
+++ b/source/texk/README
@@ -1,4 +1,4 @@
-$Id: README 32688 2014-01-16 11:45:40Z peter $
+$Id: README 33244 2014-03-21 08:11:03Z peter $
Copyright 2006-2012 TeX Users Group.
You may freely use, modify and/or distribute this file.
@@ -104,7 +104,5 @@ web2c - maintained here, by us - core web2c, plain tex, etc.
The TeX variant dirs (pdftexdir, xetexdir, etc.)
updated here by their respective maintainers.
-xdv2pdf - maintained here, by Khaled Hosny, Jonathan Kew
-
xdvik 22.86 - checked 7apr13
http://sourceforge.net/projects/xdvi/files/xdvik/
diff --git a/source/texk/configure b/source/texk/configure
index 2dfadd70073c1ddf441633596246d92721a4f5e0..0899a89645f4b6af72cb1242bbc4e22dc165eec5 100755
--- a/source/texk/configure
+++ b/source/texk/configure
@@ -2042,11 +2042,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-# Check whether --enable-missing was given.
-if test "${enable_missing+set}" = set; then :
- enableval=$enable_missing;
-fi
-
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -2118,6 +2113,11 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then :
+ enableval=$enable_missing;
+fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3077,6 +3077,19 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;}
$as_echo "$as_me: WIN32 -> \`--without-x'" >&6;}
ac_configure_args="$ac_configure_args '--without-x'" ;;
esac
+case $enable_luajittex in #(
+ yes | no) :
+ : ;; #(
+ *) :
+ case $host in #(
+ alpha* | sparc* | x86_64-*-cygwin) :
+ { $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'" ;; #(
+ *) :
+ ;;
+esac ;;
+esac
## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
## configure options and TL libraries required for web2c
diff --git a/source/texk/kpathsea/ChangeLog b/source/texk/kpathsea/ChangeLog
index 58caf311d94ff8cb81bb59a0836ede165bd6b7ac..b970eb1b4ad3e11919dc687233112681fbbbd065 100644
--- a/source/texk/kpathsea/ChangeLog
+++ b/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, configure.ac, getopt.h: Revert previous change.
+ Cygwin system getopt() is incompatible with the GNU version.
+
2014-03-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, configure.ac: Use Cygwin system getopt().
diff --git a/source/texk/kpathsea/Makefile.am b/source/texk/kpathsea/Makefile.am
index ff15916c27c9c471e69a157ad12d8b98e99ac961..de98f01b5ed5ad166ab32dbe3f8a22591c26bd6b 100644
--- a/source/texk/kpathsea/Makefile.am
+++ b/source/texk/kpathsea/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/kpathsea/
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -80,11 +80,11 @@ libkpathsea_la_SOURCES = \
xstat.c \
xstrdup.c
-if !CYGWIN_OR_MINGW
+if !MINGW32
libkpathsea_la_SOURCES += \
getopt.c \
getopt1.c
-endif !CYGWIN_OR_MINGW
+endif !MINGW32
if WIN32
if MINGW32
diff --git a/source/texk/kpathsea/Makefile.in b/source/texk/kpathsea/Makefile.in
index f6984f9d561bafebc45631c208a35a8c20d0aa25..ade8e6b98ca1ff6d95aaff85c380d18065bfc07a 100644
--- a/source/texk/kpathsea/Makefile.in
+++ b/source/texk/kpathsea/Makefile.in
@@ -55,9 +55,9 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@have_EXEEXT_TRUE@am__append_1 = -DEXEEXT=\"$(EXEEXT)\"
-@CYGWIN_OR_MINGW_FALSE@am__append_2 = \
-@CYGWIN_OR_MINGW_FALSE@ getopt.c \
-@CYGWIN_OR_MINGW_FALSE@ getopt1.c
+@MINGW32_FALSE@am__append_2 = \
+@MINGW32_FALSE@ getopt.c \
+@MINGW32_FALSE@ getopt1.c
@MINGW32_TRUE@@WIN32_TRUE@am__append_3 = \
@MINGW32_TRUE@@WIN32_TRUE@ mingw32.c \
@@ -161,8 +161,8 @@ am__libkpathsea_la_SOURCES_DIST = tex-file.c absolute.c atou.c cnf.c \
xgetcwd.c xmalloc.c xopendir.c xputenv.c xrealloc.c xstat.c \
xstrdup.c getopt.c getopt1.c mingw32.c xfseeko.c xftello.c \
win32lib.c knj.c
-@CYGWIN_OR_MINGW_FALSE@am__objects_1 = libkpathsea_la-getopt.lo \
-@CYGWIN_OR_MINGW_FALSE@ libkpathsea_la-getopt1.lo
+@MINGW32_FALSE@am__objects_1 = libkpathsea_la-getopt.lo \
+@MINGW32_FALSE@ libkpathsea_la-getopt1.lo
@MINGW32_TRUE@@WIN32_TRUE@am__objects_2 = libkpathsea_la-mingw32.lo \
@MINGW32_TRUE@@WIN32_TRUE@ libkpathsea_la-xfseeko.lo \
@MINGW32_TRUE@@WIN32_TRUE@ libkpathsea_la-xftello.lo
diff --git a/source/texk/kpathsea/configure b/source/texk/kpathsea/configure
index e9e6ba816c3846e755f1aaae648902810e408b27..b767b2cd9482c554585c3a91208641a04202d824 100755
--- a/source/texk/kpathsea/configure
+++ b/source/texk/kpathsea/configure
@@ -638,8 +638,6 @@ LTLIBOBJS
have_EXEEXT_FALSE
have_EXEEXT_TRUE
LT_OBJDIR
-CYGWIN_OR_MINGW_FALSE
-CYGWIN_OR_MINGW_TRUE
MINGW32_FALSE
MINGW32_TRUE
WIN32_FALSE
@@ -13457,20 +13455,6 @@ else
fi
-case $host_os in #(
- cygwin* | mingw*) :
- kpse_have_cygwin_or_mingw=yes ;; #(
- *) :
- ;;
-esac
- if test "x$kpse_have_cygwin_or_mingw" = xyes; then
- CYGWIN_OR_MINGW_TRUE=
- CYGWIN_OR_MINGW_FALSE='#'
-else
- CYGWIN_OR_MINGW_TRUE='#'
- CYGWIN_OR_MINGW_FALSE=
-fi
-
LT_OBJDIR="$lt_cv_objdir"
@@ -13747,10 +13731,6 @@ if test -z "${MINGW32_TRUE}" && test -z "${MINGW32_FALSE}"; then
as_fn_error $? "conditional \"MINGW32\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${CYGWIN_OR_MINGW_TRUE}" && test -z "${CYGWIN_OR_MINGW_FALSE}"; then
- as_fn_error $? "conditional \"CYGWIN_OR_MINGW\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${have_EXEEXT_TRUE}" && test -z "${have_EXEEXT_FALSE}"; then
as_fn_error $? "conditional \"have_EXEEXT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/source/texk/kpathsea/configure.ac b/source/texk/kpathsea/configure.ac
index 3f0372b424eff3c32a153ef9cc34d1944a42af24..e18a79adce07839e006d3248d935c4eb27727265 100644
--- a/source/texk/kpathsea/configure.ac
+++ b/source/texk/kpathsea/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -60,10 +60,6 @@ fi
fi
KPSE_COND_MINGW32
-AS_CASE([$host_os],
- [cygwin* | mingw*], [kpse_have_cygwin_or_mingw=yes])
-AM_CONDITIONAL([CYGWIN_OR_MINGW],
- [test "x$kpse_have_cygwin_or_mingw" = xyes])
AC_SUBST([LT_OBJDIR], ["$lt_cv_objdir"])
diff --git a/source/texk/kpathsea/getopt.h b/source/texk/kpathsea/getopt.h
index e96881d4e6fbe5b8b3510c8b3188db84538dbcff..8acf05fb4fbdf9ed0872b3890df3643885aed3b3 100644
--- a/source/texk/kpathsea/getopt.h
+++ b/source/texk/kpathsea/getopt.h
@@ -47,9 +47,6 @@
extern "C" {
#endif
-#if !defined (__GETOPT_H__)
-/* Avoid to redeclare the getopt API. */
-
/* For communication from `getopt' to the caller.
When `getopt' finds an option that takes an argument,
the argument value is returned here.
@@ -81,8 +78,6 @@ extern KPSEDLL int opterr;
extern KPSEDLL int optopt;
-#endif /* !__GETOPT_H__ */
-
#ifndef __need_getopt
/* Describe the long-named options requested by the application.
The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
diff --git a/source/texk/web2c/configure b/source/texk/web2c/configure
index 8fa8fd148dc44bfbc273662f0f8ed2abc88400f5..88995df78ced59e0fa1cde7f04d324488ce1b1e0 100755
--- a/source/texk/web2c/configure
+++ b/source/texk/web2c/configure
@@ -23575,8 +23575,8 @@ ac_config_headers="$ac_config_headers ff-config.h:luatexdir/luafontloader/ff-con
# The supporting programs we need to have available on the build machine.
# make variable cross native
-if test "x$cross_compiling" = xyes; then
-# Extract the first word of "tangle", so it can be a program name with args.
+if test "x$cross_compiling" = xyes; then :
+ # Extract the first word of "tangle", so it can be a program name with args.
set dummy tangle; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -23616,7 +23616,7 @@ $as_echo "no" >&6; }
fi
-if test -z "${TANGLEBOOT}"; then
+if test -z "${TANGLEBOOT}"; then :
as_fn_error $? "tangle was not found but is required when cross-compiling.
Install tangle or set \$TANGLEBOOT to the full pathname." "$LINENO" 5
fi
@@ -23624,8 +23624,8 @@ else
TANGLEBOOT=./tangleboot
fi
-if test "x$cross_compiling" = xyes; then
-# Extract the first word of "tangle", so it can be a program name with args.
+if test "x$cross_compiling" = xyes; then :
+ # Extract the first word of "tangle", so it can be a program name with args.
set dummy tangle; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -23665,7 +23665,7 @@ $as_echo "no" >&6; }
fi
-if test -z "${TANGLE}"; then
+if test -z "${TANGLE}"; then :
as_fn_error $? "tangle was not found but is required when cross-compiling.
Install tangle or set \$TANGLE to the full pathname." "$LINENO" 5
fi
@@ -23673,8 +23673,8 @@ else
TANGLE=./tangle
fi
-if test "x$cross_compiling" = xyes; then
-# Extract the first word of "ctangle", so it can be a program name with args.
+if test "x$cross_compiling" = xyes; then :
+ # Extract the first word of "ctangle", so it can be a program name with args.
set dummy ctangle; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -23714,7 +23714,7 @@ $as_echo "no" >&6; }
fi
-if test -z "${CTANGLEBOOT}"; then
+if test -z "${CTANGLEBOOT}"; then :
as_fn_error $? "ctangle was not found but is required when cross-compiling.
Install ctangle or set \$CTANGLEBOOT to the full pathname." "$LINENO" 5
fi
@@ -23722,8 +23722,8 @@ else
CTANGLEBOOT=./ctangleboot
fi
-if test "x$cross_compiling" = xyes; then
-# Extract the first word of "ctangle", so it can be a program name with args.
+if test "x$cross_compiling" = xyes; then :
+ # Extract the first word of "ctangle", so it can be a program name with args.
set dummy ctangle; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -23763,7 +23763,7 @@ $as_echo "no" >&6; }
fi
-if test -z "${CTANGLE}"; then
+if test -z "${CTANGLE}"; then :
as_fn_error $? "ctangle was not found but is required when cross-compiling.
Install ctangle or set \$CTANGLE to the full pathname." "$LINENO" 5
fi
@@ -23771,8 +23771,8 @@ else
CTANGLE=./ctangle
fi
-if test "x$cross_compiling" = xyes; then
-# Extract the first word of "tie", so it can be a program name with args.
+if test "x$cross_compiling" = xyes; then :
+ # Extract the first word of "tie", so it can be a program name with args.
set dummy tie; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -23812,7 +23812,7 @@ $as_echo "no" >&6; }
fi
-if test -z "${TIE}"; then
+if test -z "${TIE}"; then :
as_fn_error $? "tie was not found but is required when cross-compiling.
Install tie or set \$TIE to the full pathname." "$LINENO" 5
fi
@@ -23820,8 +23820,8 @@ else
TIE=./tie
fi
-if test "x$cross_compiling" = xyes; then
-# Extract the first word of "otangle", so it can be a program name with args.
+if test "x$cross_compiling" = xyes; then :
+ # Extract the first word of "otangle", so it can be a program name with args.
set dummy otangle; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -23861,7 +23861,7 @@ $as_echo "no" >&6; }
fi
-if test -z "${OTANGLE}"; then
+if test -z "${OTANGLE}"; then :
as_fn_error $? "otangle was not found but is required when cross-compiling.
Install otangle or set \$OTANGLE to the full pathname." "$LINENO" 5
fi
diff --git a/source/texk/web2c/luatexdir/NEWS b/source/texk/web2c/luatexdir/NEWS
index 4dd5e19d6bc71a971ef4392ecb8c13a2cd03cbfa..34c46657e20a42c5c05a884cf596043a985429b6 100644
--- a/source/texk/web2c/luatexdir/NEWS
+++ b/source/texk/web2c/luatexdir/NEWS
@@ -2,7 +2,7 @@
This file is in the public domain.
==============================================================
-Luatex beta-0.79.0 was released 20140328 (4956)
+Luatex beta-0.79.0 was released 20140328 (4960)
==============================================================
* The luafontloader now returns 'tsidebearing' glyph values
@@ -89,7 +89,7 @@ Luatex beta-0.79.0 was released 20140328 (4956)
* Synchronization with the TeXLive sources updated the following
libraries:
* libpng is now 1.6.10
- * poppler is now 0.25.1
+ * poppler is now 0.25.2
==============================================================
Luatex beta-0.78.2 was released 20140113 (4748)
diff --git a/source/texk/web2c/mplibdir/ChangeLog b/source/texk/web2c/mplibdir/ChangeLog
index 83494c5a14d2ba8fe5ebaaaaba84662598b595f8..904c875a3357807d524f0f449eba462e0af395a0 100644
--- a/source/texk/web2c/mplibdir/ChangeLog
+++ b/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-16 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * mp.w: An unimportant typo (1.890 --> 1.900).
+
2014-03-14 Taco Hoekwater <taco@luatex.org>
Import metapost 1.900
diff --git a/source/texk/web2c/mplibdir/mp.w b/source/texk/web2c/mplibdir/mp.w
index 789bbcbb742ddcbfb8eda3f206346e46e5874d36..956d8b747fd349290d387ccbb4b41e2db4a39a7b 100644
--- a/source/texk/web2c/mplibdir/mp.w
+++ b/source/texk/web2c/mplibdir/mp.w
@@ -73,7 +73,7 @@ undergoes any modifications, so that it will be clear which version of
@^extensions to \MP@>
@^system dependencies@>
-@d default_banner "This is MetaPost, Version 1.890" /* printed when \MP\ starts */
+@d default_banner "This is MetaPost, Version 1.900" /* printed when \MP\ starts */
@d true 1
@d false 0
diff --git a/source/texk/web2c/web2c/web2c-lexer.c b/source/texk/web2c/web2c/web2c-lexer.c
index 00d1dff0bc09ca19d460ee746f83d746790e52f4..adeabdea0ee5751492e45e19e835aeae019b6e77 100644
--- a/source/texk/web2c/web2c/web2c-lexer.c
+++ b/source/texk/web2c/web2c/web2c-lexer.c
@@ -15,7 +15,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 39
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -187,6 +187,13 @@ extern FILE *yyin, *yyout;
if ( yytext[yyl] == '\n' )\
--yylineno;\
}while(0)
+ #define YY_LINENO_REWIND_TO(dst) \
+ do {\
+ const char *p;\
+ for ( p = yy_cp-1; p >= (dst); --p)\
+ if ( *p == '\n' )\
+ --yylineno;\
+ }while(0)
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
@@ -378,12 +385,9 @@ static void yy_fatal_error (yyconst char msg[] );
yyleng = (size_t) (yy_cp - yy_bp); \
(yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \
- if ( yyleng + (yy_more_offset) >= YYLMAX ) \
+ if ( yyleng >= YYLMAX ) \
YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
- yy_flex_strncpy( &yytext[(yy_more_offset)], (yytext_ptr), yyleng + 1 ); \
- yyleng += (yy_more_offset); \
- (yy_prev_more_offset) = (yy_more_offset); \
- (yy_more_offset) = 0; \
+ yy_flex_strncpy( yytext, (yytext_ptr), yyleng + 1 ); \
(yy_c_buf_p) = yy_cp;
#define YY_NUM_RULES 74
@@ -395,77 +399,38 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_acclist[319] =
+static yyconst flex_int16_t yy_accept[278] =
{ 0,
- 75, 73, 74, 1, 73, 74, 1, 74, 3, 73,
- 74, 73, 74, 61, 73, 74, 62, 73, 74, 53,
- 73, 74, 51, 73, 74, 68, 73, 74, 52, 73,
- 74, 67, 73, 74, 54, 73, 74, 48, 73, 74,
- 70, 73, 74, 69, 73, 74, 57, 73, 74, 55,
- 73, 74, 58, 73, 74, 73, 74, 72, 73, 74,
- 63, 73, 74, 64, 73, 74, 71, 73, 74, 72,
- 73, 74, 72, 73, 74, 72, 73, 74, 72, 73,
- 74, 72, 73, 74, 72, 73, 74, 72, 73, 74,
- 72, 73, 74, 72, 73, 74, 72, 73, 74, 72,
-
- 73, 74, 72, 73, 74, 72, 73, 74, 72, 73,
- 74, 72, 73, 74, 72, 73, 74, 72, 73, 74,
- 72, 73, 74, 72, 73, 74, 2, 73, 74, 1,
- 50, 66, 48, 65, 59, 56, 60, 72, 72, 72,
- 72, 72, 72, 72, 72, 19, 72, 72, 72, 72,
- 72, 72, 72, 72, 27, 72, 72, 72, 72, 32,
- 72, 33, 72, 72, 72, 72, 72, 72, 41, 72,
- 72, 72, 72, 72, 49, 50, 47, 47, 12, 72,
- 72, 72, 72, 72, 72, 17, 72, 72, 72, 22,
- 72, 72, 24, 72, 72, 72, 72, 72, 72, 72,
-
- 29, 72, 72, 31, 72, 72, 72, 72, 72, 72,
- 72, 72, 72, 44, 72, 72, 50, 72, 72, 72,
- 15, 72, 72, 72, 21, 72, 72, 23, 72, 72,
- 26, 72, 72, 72, 72, 72, 72, 72, 72, 72,
- 72, 72, 72, 40, 72, 42, 72, 72, 72, 47,
- 13, 72, 14, 72, 18, 72, 16, 72, 72, 72,
- 72, 38, 39, 72, 72, 72, 28, 72, 72, 72,
- 72, 72, 72, 72, 72, 43, 72, 45, 72, 11,
- 20, 72, 5, 72, 72, 72, 4, 72, 72, 46,
- 72, 72, 72, 72, 36, 72, 37, 72, 10, 7,
-
- 72, 72, 6, 72, 1, 72, 35, 72, 25, 72,
- 72, 30, 72, 72, 34, 72, 9, 8
- } ;
-
-static yyconst flex_int16_t yy_accept[279] =
- { 0,
- 1, 1, 1, 2, 4, 7, 9, 12, 14, 17,
- 20, 23, 26, 29, 32, 35, 38, 41, 44, 47,
- 50, 53, 56, 58, 61, 64, 67, 70, 73, 76,
- 79, 82, 85, 88, 91, 94, 97, 100, 103, 106,
- 109, 112, 115, 118, 121, 124, 127, 130, 131, 131,
- 131, 132, 133, 133, 134, 134, 135, 136, 137, 138,
- 138, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 148, 149, 150, 151, 152, 153, 154, 155, 157, 158,
- 159, 160, 162, 164, 165, 166, 167, 168, 169, 171,
- 172, 173, 174, 175, 175, 175, 177, 178, 178, 179,
-
- 179, 179, 181, 182, 183, 184, 185, 186, 188, 189,
- 190, 192, 193, 195, 196, 197, 197, 197, 197, 198,
- 198, 199, 200, 201, 203, 204, 206, 207, 208, 209,
- 210, 211, 212, 213, 214, 216, 217, 217, 218, 218,
- 218, 218, 219, 220, 221, 223, 224, 225, 227, 228,
- 230, 231, 233, 233, 233, 233, 233, 233, 233, 233,
- 234, 234, 234, 235, 236, 237, 238, 239, 240, 241,
- 242, 243, 244, 246, 248, 249, 250, 250, 250, 251,
- 251, 251, 253, 255, 257, 259, 260, 261, 262, 262,
- 262, 262, 262, 263, 264, 264, 264, 264, 265, 266,
-
- 267, 269, 270, 271, 272, 273, 274, 275, 276, 278,
- 280, 280, 280, 281, 283, 284, 285, 286, 286, 286,
- 286, 286, 287, 288, 289, 290, 292, 293, 294, 295,
- 297, 299, 299, 300, 301, 302, 302, 302, 303, 304,
- 305, 306, 307, 309, 311, 311, 311, 312, 314, 315,
- 315, 315, 315, 317, 317, 317, 317, 317, 317, 317,
- 317, 317, 317, 317, 317, 317, 317, 317, 317, 317,
- 317, 317, 317, 317, 318, 318, 319, 319
+ 0, 0, 75, 73, 1, 1, 3, 73, 61, 62,
+ 53, 51, 68, 52, 67, 54, 48, 70, 69, 57,
+ 55, 58, 73, 72, 63, 64, 71, 72, 72, 72,
+ 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
+ 72, 72, 72, 72, 72, 72, 2, 1, 0, 0,
+ 50, 66, 0, 48, 0, 65, 59, 56, 60, 0,
+ 0, 72, 72, 72, 72, 72, 72, 72, 72, 19,
+ 72, 72, 72, 72, 72, 72, 72, 27, 72, 72,
+ 72, 32, 33, 72, 72, 72, 72, 72, 41, 72,
+ 72, 72, 72, 0, 0, 49, 47, 0, 47, 0,
+
+ 0, 12, 72, 72, 72, 72, 72, 17, 72, 72,
+ 22, 72, 24, 72, 72, 0, 0, 0, 72, 0,
+ 72, 72, 72, 29, 72, 31, 72, 72, 72, 72,
+ 72, 72, 72, 72, 44, 72, 0, 50, 0, 0,
+ 0, 72, 72, 72, 15, 72, 72, 21, 72, 23,
+ 72, 26, 0, 0, 0, 0, 0, 0, 0, 72,
+ 0, 0, 72, 72, 72, 72, 72, 72, 72, 72,
+ 72, 72, 40, 42, 72, 72, 0, 0, 47, 0,
+ 0, 13, 14, 18, 16, 72, 72, 72, 0, 0,
+ 0, 0, 38, 39, 0, 0, 0, 72, 72, 72,
+
+ 28, 72, 72, 72, 72, 72, 72, 72, 43, 45,
+ 0, 0, 11, 20, 5, 72, 72, 0, 0, 0,
+ 0, 72, 4, 72, 72, 46, 72, 72, 72, 36,
+ 37, 0, 10, 7, 72, 0, 0, 72, 6, 72,
+ 1, 72, 35, 25, 0, 0, 72, 30, 72, 0,
+ 0, 0, 34, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 9, 0, 8, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -696,30 +661,19 @@ static yyconst flex_int32_t yy_rule_can_match_eol[75] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
extern int yy_flex_debug;
int yy_flex_debug = 0;
-static yy_state_type *yy_state_buf=0, *yy_state_ptr=0;
-static char *yy_full_match;
-static int yy_lp;
-#define REJECT \
-{ \
-*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ \
-yy_cp = (yy_full_match); /* restore poss. backed-over text */ \
-++(yy_lp); \
-goto find_rule; \
-}
-
-static int yy_more_offset = 0;
-static int yy_prev_more_offset = 0;
-#define yymore() ((yy_more_offset) = yy_flex_strlen( yytext ))
-#define YY_NEED_STRLEN
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET \
- { \
- (yy_more_offset) = (yy_prev_more_offset); \
- yyleng -= (yy_more_offset); \
- }
+#define YY_RESTORE_YY_MORE_OFFSET
#ifndef YYLMAX
#define YYLMAX 8192
#endif
@@ -755,7 +709,7 @@ yywrap (void)
return 1;
}
#define YY_SKIP_YYWRAP /* not that it matters */
-#line 759 "web2c-lexer.c"
+#line 713 "web2c-lexer.c"
#define INITIAL 0
@@ -937,10 +891,6 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 53 "web2c-lexer.l"
-
-#line 943 "web2c-lexer.c"
-
if ( !(yy_init) )
{
(yy_init) = 1;
@@ -949,12 +899,6 @@ YY_DECL
YY_USER_INIT;
#endif
- /* Create the reject buffer large enough to save one state per allowed character. */
- if ( ! (yy_state_buf) )
- (yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE );
- if ( ! (yy_state_buf) )
- YY_FATAL_ERROR( "out of dynamic memory in yylex()" );
-
if ( ! (yy_start) )
(yy_start) = 1; /* first start state */
@@ -973,6 +917,11 @@ YY_DECL
yy_load_buffer_state( );
}
+ {
+#line 53 "web2c-lexer.l"
+
+#line 924 "web2c-lexer.c"
+
while ( 1 ) /* loops until end-of-file is reached */
{
yy_cp = (yy_c_buf_p);
@@ -986,14 +935,15 @@ YY_DECL
yy_bp = yy_cp;
yy_current_state = (yy_start);
-
- (yy_state_ptr) = (yy_state_buf);
- *(yy_state_ptr)++ = yy_current_state;
-
yy_match:
do
{
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
@@ -1001,36 +951,21 @@ yy_match:
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- *(yy_state_ptr)++ = yy_current_state;
++yy_cp;
}
while ( yy_current_state != 277 );
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
yy_find_action:
- yy_current_state = *--(yy_state_ptr);
- (yy_lp) = yy_accept[yy_current_state];
-find_rule: /* we branch to this label when backing up */
- for ( ; ; ) /* until we find what rule we matched */
- {
- if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] )
- {
- yy_act = yy_acclist[(yy_lp)];
- {
- (yy_full_match) = yy_cp;
- break;
- }
- }
- --yy_cp;
- yy_current_state = *--(yy_state_ptr);
- (yy_lp) = yy_accept[yy_current_state];
- }
+ yy_act = yy_accept[yy_current_state];
YY_DO_BEFORE_ACTION;
if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
{
- int yyl;
- for ( yyl = (yy_prev_more_offset); yyl < yyleng; ++yyl )
+ yy_size_t yyl;
+ for ( yyl = 0; yyl < yyleng; ++yyl )
if ( yytext[yyl] == '\n' )
yylineno++;
@@ -1041,6 +976,13 @@ do_action: /* This label is used only to access EOF actions. */
switch ( yy_act )
{ /* beginning of action switch */
+ case 0: /* must back up */
+ /* undo the effects of YY_DO_BEFORE_ACTION */
+ *yy_cp = (yy_hold_char);
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
+ goto yy_find_action;
+
case 1:
/* rule 1 can match eol */
YY_RULE_SETUP
@@ -1502,9 +1444,9 @@ YY_RULE_SETUP
#line 230 "web2c-lexer.l"
ECHO;
YY_BREAK
-#line 1506 "web2c-lexer.c"
- case YY_STATE_EOF(INITIAL):
- yyterminate();
+#line 1448 "web2c-lexer.c"
+case YY_STATE_EOF(INITIAL):
+ yyterminate();
case YY_END_OF_BUFFER:
{
@@ -1569,7 +1511,8 @@ ECHO;
else
{
- yy_cp = (yy_c_buf_p);
+ yy_cp = (yy_last_accepting_cpos);
+ yy_current_state = (yy_last_accepting_state);
goto yy_find_action;
}
}
@@ -1633,6 +1576,7 @@ ECHO;
"fatal flex scanner internal error--no action found" );
} /* end of action switch */
} /* end of scanning one token */
+ } /* end of user's declarations */
} /* end of yylex */
/* yy_get_next_buffer - try to read in a new buffer
@@ -1694,8 +1638,37 @@ static int yy_get_next_buffer (void)
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
- YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+ /* just a shorter name for the current buffer */
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+
+ int yy_c_buf_p_offset =
+ (int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+ if ( b->yy_is_our_buffer )
+ {
+ yy_size_t new_size = b->yy_buf_size * 2;
+
+ if ( new_size <= 0 )
+ b->yy_buf_size += b->yy_buf_size / 8;
+ else
+ b->yy_buf_size *= 2;
+
+ b->yy_ch_buf = (char *)
+ /* Include room in for 2 EOB chars. */
+ yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
+ }
+ else
+ /* Can't grow it, we don't own it. */
+ b->yy_ch_buf = 0;
+
+ if ( ! b->yy_ch_buf )
+ YY_FATAL_ERROR(
+ "fatal error - scanner input buffer overflow" );
+
+ (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+ num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+ number_to_move - 1;
}
@@ -1754,12 +1727,14 @@ static int yy_get_next_buffer (void)
yy_current_state = (yy_start);
- (yy_state_ptr) = (yy_state_buf);
- *(yy_state_ptr)++ = yy_current_state;
-
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
{
register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
@@ -1767,7 +1742,6 @@ static int yy_get_next_buffer (void)
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- *(yy_state_ptr)++ = yy_current_state;
}
return yy_current_state;
@@ -1781,8 +1755,14 @@ static int yy_get_next_buffer (void)
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
{
register int yy_is_jam;
-
+ register char *yy_cp = (yy_c_buf_p);
+
register YY_CHAR yy_c = 1;
+ if ( yy_accept[yy_current_state] )
+ {
+ (yy_last_accepting_state) = yy_current_state;
+ (yy_last_accepting_cpos) = yy_cp;
+ }
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
@@ -1791,8 +1771,6 @@ static int yy_get_next_buffer (void)
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 277);
- if ( ! yy_is_jam )
- *(yy_state_ptr)++ = yy_current_state;
return yy_is_jam ? 0 : yy_current_state;
}
@@ -2241,7 +2219,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len
YY_BUFFER_STATE b;
char *buf;
yy_size_t n;
- int i;
+ yy_size_t i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
@@ -2389,11 +2367,6 @@ static int yy_init_globals (void)
(yy_init) = 0;
(yy_start) = 0;
- (yy_state_buf) = 0;
- (yy_state_ptr) = 0;
- (yy_full_match) = 0;
- (yy_lp) = 0;
-
/* Defined in main.c */
#ifdef YY_STDINIT
yyin = stdin;
@@ -2424,9 +2397,6 @@ int yylex_destroy (void)
yyfree((yy_buffer_stack) );
(yy_buffer_stack) = NULL;
- yyfree ( (yy_state_buf) );
- (yy_state_buf) = NULL;
-
/* Reset the globals. This is important in a non-reentrant scanner so the next time
* yylex() is called, initialization will occur. */
yy_init_globals( );
diff --git a/source/utils/configure b/source/utils/configure
index 0978396fe61583c2d7b9a62ef1fadf7ac744f3db..0fb6bb54ccceea06d41bc8a43960ec7fec42666c 100755
--- a/source/utils/configure
+++ b/source/utils/configure
@@ -2039,11 +2039,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-# Check whether --enable-missing was given.
-if test "${enable_missing+set}" = set; then :
- enableval=$enable_missing;
-fi
-
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -2115,6 +2110,11 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then :
+ enableval=$enable_missing;
+fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3074,6 +3074,19 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;}
$as_echo "$as_me: WIN32 -> \`--without-x'" >&6;}
ac_configure_args="$ac_configure_args '--without-x'" ;;
esac
+case $enable_luajittex in #(
+ yes | no) :
+ : ;; #(
+ *) :
+ case $host in #(
+ alpha* | sparc* | x86_64-*-cygwin) :
+ { $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'" ;; #(
+ *) :
+ ;;
+esac ;;
+esac
## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
## configure options and TL libraries required for web2c