diff --git a/source/ChangeLog b/source/ChangeLog
index 1ec0ee5162b19797f233aa4d81d155bae43358cf..fcfe4247ca154d8069a7e672f0993b0498e4f84d 100644
--- a/source/ChangeLog
+++ b/source/ChangeLog
@@ -1,3 +1,12 @@
+2015-03-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tardate.ac: Switch to 2015-03-07.
+
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/dist_hook.am (new): Makefile fragment for dist-hook target.
+ * Makefile.am: Use the fragment am/dist_hook.am.
+
2014-11-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* tardate.ac: Switch to 2014-11-24.
diff --git a/source/am/dist_hook.am b/source/am/dist_hook.am
new file mode 100644
index 0000000000000000000000000000000000000000..96b546e782d218d02ef18e1304c902ca7a8ed7ba
--- /dev/null
+++ b/source/am/dist_hook.am
@@ -0,0 +1,16 @@
+## am/dist_hook.am: Makefile fragment for the dist-hook target.
+##
+## Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+##
+dist-hook:
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
+
+NEVER_DIST = `find . $(NEVER_NAMES)`
+## Names not to be distributed
+NEVER_NAMES = -name .svn
+## Additional names for subdir-objects
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+## Additional names for libtool
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
+
diff --git a/source/build-aux/config.guess b/source/build-aux/config.guess
index dbfb9786cb6f9b8003367505d49dcadb2145610a..f7eb141e75a921f7b87b97983ac1bd8949995716 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-01-01'
+timestamp='2015-03-04'
# 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
@@ -168,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+ /sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || \
+ echo unknown)`
case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
+ earmv*)
+ arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine=${arch}${endian}-unknown
+ ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
case "${UNAME_MACHINE_ARCH}" in
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
@@ -197,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
os=netbsd
;;
esac
+ # Determine ABI tags.
+ case "${UNAME_MACHINE_ARCH}" in
+ earm*)
+ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+ abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ ;;
+ esac
# The OS release
# Debian GNU/NetBSD machines have a different userland, and
# thus, need a distinct triplet. However, they do not need
@@ -213,7 +227,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
+ echo "${machine}-${os}${release}${abi}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -933,6 +947,9 @@ EOF
crisv32:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
+ e2k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
diff --git a/source/build-aux/config.sub b/source/build-aux/config.sub
index 6d2e94c8bf9ea6925b96846aade1fd64074985d3..8f1229c6f7dd1c177c4747b8637125803c155707 100644
--- a/source/build-aux/config.sub
+++ b/source/build-aux/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2015-01-01'
+timestamp='2015-03-08'
# 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
@@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
@@ -259,7 +259,7 @@ case $basic_machine in
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
- | epiphany \
+ | e2k | epiphany \
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
@@ -381,7 +381,7 @@ case $basic_machine in
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
- | elxsi-* \
+ | e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -518,6 +518,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
+ asmjs)
+ basic_machine=asmjs-unknown
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -1373,7 +1376,7 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* | -aros* | -cloudabi* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff --git a/source/build-aux/ltmain.sh b/source/build-aux/ltmain.sh
index b891526897139753a2ff4ac528aef6e2312b8959..0f0a2da3f9dd10627626bf9725b332d95f314393 100755
--- a/source/build-aux/ltmain.sh
+++ b/source/build-aux/ltmain.sh
@@ -2,7 +2,7 @@
## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
## by inline-source v2014-01-03.01
-# libtool (GNU libtool) 2.4.5
+# libtool (GNU libtool) 2.4.6
# Provide generalized library-building support services.
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -31,8 +31,8 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.5
-package_revision=2.4.5
+VERSION=2.4.6
+package_revision=2.4.6
## ------ ##
@@ -64,7 +64,7 @@ package_revision=2.4.5
# libraries, which are installed to $pkgauxdir.
# Set a version string for this script.
-scriptversion=2014-01-03.01; # UTC
+scriptversion=2015-01-20.17; # UTC
# General shell script boiler plate, and helper functions.
# Written by Gary V. Vaughan, 2004
@@ -192,7 +192,7 @@ func_path_progs ()
_G_path_prog_max=0
_G_path_prog_found=false
- _G_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
for _G_dir in $_G_PATH; do
IFS=$_G_save_IFS
test -z "$_G_dir" && _G_dir=.
@@ -1977,7 +1977,7 @@ func_version ()
# End:
# Set a version string.
-scriptversion='(GNU libtool) 2.4.5'
+scriptversion='(GNU libtool) 2.4.6'
# func_echo ARG...
@@ -2039,7 +2039,12 @@ usage_message="Options:
"
# Additional text appended to 'usage_message' in response to '--help'.
-long_help_message=$long_help_message"
+func_help ()
+{
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message
MODE must be one of the following:
@@ -2063,13 +2068,15 @@ include the following information:
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname (GNU libtool) 2.4.5
+ version: $progname (GNU libtool) 2.4.6
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
Report bugs to <bug-libtool@gnu.org>.
GNU libtool home page: <http://www.gnu.org/software/libtool/>.
General help using GNU software: <http://www.gnu.org/gethelp/>."
+ exit 0
+}
# func_lo2o OBJECT-NAME
diff --git a/source/build-aux/texinfo.tex b/source/build-aux/texinfo.tex
index 370d4505084cc0afe8ae9ac191d1af630a32e828..8236d7d2f8258f08874bb9240a537bb803259358 100644
--- a/source/build-aux/texinfo.tex
+++ b/source/build-aux/texinfo.tex
@@ -3,11 +3,12 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2014-12-03.16}
+\def\texinfoversion{2015-02-05.16}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
+% Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -4488,7 +4489,6 @@ end
% Called from \indexdummies and \atdummies.
%
\def\commondummies{%
- %
% \definedummyword defines \#1 as \string\#1\space, thus effectively
% preventing its expansion. This is used only for control words,
% not control letters, because the \space would be incorrect for
@@ -4565,6 +4565,7 @@ end
\definedummyword\guilsinglright
\definedummyword\lbracechar
\definedummyword\leq
+ \definedummyword\mathopsup
\definedummyword\minus
\definedummyword\ogonek
\definedummyword\pounds
@@ -4578,6 +4579,8 @@ end
\definedummyword\quotesinglbase
\definedummyword\rbracechar
\definedummyword\result
+ \definedummyword\sub
+ \definedummyword\sup
\definedummyword\textdegree
%
% We want to disable all macros so that they are not expanded by \write.
@@ -4652,6 +4655,7 @@ end
\definedummyword\samp
\definedummyword\strong
\definedummyword\tie
+ \definedummyword\U
\definedummyword\uref
\definedummyword\url
\definedummyword\var
@@ -8334,14 +8338,7 @@ end
\catcode`\\=\other
%
% Make the characters 128-255 be printing characters.
- {%
- \count1=128
- \def\loop{%
- \catcode\count1=\other
- \advance\count1 by 1
- \ifnum \count1<256 \loop \fi
- }%
- }%
+ {\setnonasciicharscatcodenonglobal\other}%
%
% @ is our escape character in .aux files, and we need braces.
\catcode`\{=1
@@ -8952,6 +8949,7 @@ directory should work if nowhere else does.}
\catcode\count255=#1\relax
\advance\count255 by 1
\repeat
+
}
% @documentencoding sets the definition of non-ASCII characters
@@ -8986,10 +8984,12 @@ directory should work if nowhere else does.}
%
\else \ifx \declaredencoding \utfeight
\setnonasciicharscatcode\active
- \utfeightchardefs
+ % since we already invoked \utfeightchardefs at the top level
+ % (below), do not re-invoke it, then our check for duplicated
+ % definitions triggers. Making non-ascii chars active is enough.
%
\else
- \message{Unknown document encoding #1, ignoring.}%
+ \message{Ignoring unknown document encoding: #1.}%
%
\fi % utfeight
\fi % latnine
@@ -8998,10 +8998,11 @@ directory should work if nowhere else does.}
\fi % ascii
}
+% emacs-page
% A message to be logged when using a character that isn't available
% the default font encoding (OT1).
%
-\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
+\def\missingcharmsg#1{\message{Character missing, sorry: #1.}}
% Take account of \c (plain) vs. \, (Texinfo) difference.
\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
@@ -9037,12 +9038,10 @@ directory should work if nowhere else does.}
\gdef^^b4{\'{}}
\gdef^^b5{$\mu$}
\gdef^^b6{\P}
- %
- \gdef^^b7{$^.$}
+ \gdef^^b7{\ifmmode\cdot\else $\cdot$\fi}
\gdef^^b8{\cedilla\ }
\gdef^^b9{$^1$}
\gdef^^ba{\ordm}
- %
\gdef^^bb{\guillemetright}
\gdef^^bc{$1\over4$}
\gdef^^bd{$1\over2$}
@@ -9331,6 +9330,11 @@ directory should work if nowhere else does.}
\expandafter\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter
\gdef\UTFviiiTmp{#2}%
+ %
+ \expandafter\ifx\csname uni:#1\endcsname \relax \else
+ \errmessage{Internal error, already defined: #1}%
+ \fi
+ %
% define an additional control sequence for this code point.
\expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp
\endgroup}
@@ -9370,23 +9374,49 @@ directory should work if nowhere else does.}
\uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
\endgroup
+% https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_M
+% U+0000..U+007F = https://en.wikipedia.org/wiki/Basic_Latin_(Unicode_block)
+% U+0080..U+00FF = https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block)
+% U+0100..U+017F = https://en.wikipedia.org/wiki/Latin_Extended-A
+% U+0180..U+024F = https://en.wikipedia.org/wiki/Latin_Extended-B
+%
+% Many of our renditions are less than wonderful, and all the missing
+% characters are available somewhere. Loading the necessary fonts
+% awaits user request. We can't truly support Unicode without
+% reimplementing everything that's been done in LaTeX for many years,
+% plus probably using luatex or xetex, and who knows what else.
+% We won't be doing that here in this simple file. But we can try to at
+% least make most of the characters not bomb out.
+%
\def\utfeightchardefs{%
\DeclareUnicodeCharacter{00A0}{\tie}
\DeclareUnicodeCharacter{00A1}{\exclamdown}
\DeclareUnicodeCharacter{00A3}{\pounds}
+ \DeclareUnicodeCharacter{00A7}{\S}
\DeclareUnicodeCharacter{00A8}{\"{ }}
\DeclareUnicodeCharacter{00A9}{\copyright}
\DeclareUnicodeCharacter{00AA}{\ordf}
\DeclareUnicodeCharacter{00AB}{\guillemetleft}
+ \DeclareUnicodeCharacter{00AC}{\ifmmode\lnot\else $\lnot$\fi}
\DeclareUnicodeCharacter{00AD}{\-}
\DeclareUnicodeCharacter{00AE}{\registeredsymbol}
\DeclareUnicodeCharacter{00AF}{\={ }}
\DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
+ \DeclareUnicodeCharacter{00B1}{\ifmmode\pm\else $\pm$\fi}
+ \DeclareUnicodeCharacter{00B2}{$^2$}
+ \DeclareUnicodeCharacter{00B3}{$^3$}
\DeclareUnicodeCharacter{00B4}{\'{ }}
+ \DeclareUnicodeCharacter{00B5}{$\mu$}
+ \DeclareUnicodeCharacter{00B6}{\P}
+ \DeclareUnicodeCharacter{00B7}{\ifmmode\cdot\else $\cdot$\fi}
\DeclareUnicodeCharacter{00B8}{\cedilla{ }}
+ \DeclareUnicodeCharacter{00B9}{$^1$}
\DeclareUnicodeCharacter{00BA}{\ordm}
\DeclareUnicodeCharacter{00BB}{\guillemetright}
+ \DeclareUnicodeCharacter{00BC}{$1\over4$}
+ \DeclareUnicodeCharacter{00BD}{$1\over2$}
+ \DeclareUnicodeCharacter{00BE}{$3\over4$}
\DeclareUnicodeCharacter{00BF}{\questiondown}
\DeclareUnicodeCharacter{00C0}{\`A}
@@ -9413,6 +9443,7 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{00D4}{\^O}
\DeclareUnicodeCharacter{00D5}{\~O}
\DeclareUnicodeCharacter{00D6}{\"O}
+ \DeclareUnicodeCharacter{00D7}{\ifmmode\times\else $\times$\fi}
\DeclareUnicodeCharacter{00D8}{\O}
\DeclareUnicodeCharacter{00D9}{\`U}
\DeclareUnicodeCharacter{00DA}{\'U}
@@ -9446,6 +9477,7 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{00F4}{\^o}
\DeclareUnicodeCharacter{00F5}{\~o}
\DeclareUnicodeCharacter{00F6}{\"o}
+ \DeclareUnicodeCharacter{00F7}{\ifmmode\div\else $\div$\fi}
\DeclareUnicodeCharacter{00F8}{\o}
\DeclareUnicodeCharacter{00F9}{\`u}
\DeclareUnicodeCharacter{00FA}{\'u}
@@ -9465,20 +9497,23 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{0107}{\'c}
\DeclareUnicodeCharacter{0108}{\^C}
\DeclareUnicodeCharacter{0109}{\^c}
- \DeclareUnicodeCharacter{0118}{\ogonek{E}}
- \DeclareUnicodeCharacter{0119}{\ogonek{e}}
\DeclareUnicodeCharacter{010A}{\dotaccent{C}}
\DeclareUnicodeCharacter{010B}{\dotaccent{c}}
\DeclareUnicodeCharacter{010C}{\v{C}}
\DeclareUnicodeCharacter{010D}{\v{c}}
\DeclareUnicodeCharacter{010E}{\v{D}}
+ \DeclareUnicodeCharacter{010F}{d'}
+ \DeclareUnicodeCharacter{0110}{\DH}
+ \DeclareUnicodeCharacter{0111}{\dh}
\DeclareUnicodeCharacter{0112}{\=E}
\DeclareUnicodeCharacter{0113}{\=e}
\DeclareUnicodeCharacter{0114}{\u{E}}
\DeclareUnicodeCharacter{0115}{\u{e}}
\DeclareUnicodeCharacter{0116}{\dotaccent{E}}
\DeclareUnicodeCharacter{0117}{\dotaccent{e}}
+ \DeclareUnicodeCharacter{0118}{\ogonek{E}}
+ \DeclareUnicodeCharacter{0119}{\ogonek{e}}
\DeclareUnicodeCharacter{011A}{\v{E}}
\DeclareUnicodeCharacter{011B}{\v{e}}
\DeclareUnicodeCharacter{011C}{\^G}
@@ -9488,14 +9523,20 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{0120}{\dotaccent{G}}
\DeclareUnicodeCharacter{0121}{\dotaccent{g}}
+ \DeclareUnicodeCharacter{0122}{\cedilla{G}}
+ \DeclareUnicodeCharacter{0123}{\cedilla{g}}
\DeclareUnicodeCharacter{0124}{\^H}
\DeclareUnicodeCharacter{0125}{\^h}
+ \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}}
+ \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}}
\DeclareUnicodeCharacter{0128}{\~I}
\DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
\DeclareUnicodeCharacter{012A}{\=I}
\DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
\DeclareUnicodeCharacter{012C}{\u{I}}
\DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
+ \DeclareUnicodeCharacter{012E}{\ogonek{I}}
+ \DeclareUnicodeCharacter{012F}{\ogonek{i}}
\DeclareUnicodeCharacter{0130}{\dotaccent{I}}
\DeclareUnicodeCharacter{0131}{\dotless{i}}
@@ -9503,15 +9544,29 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{0133}{ij}
\DeclareUnicodeCharacter{0134}{\^J}
\DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
+ \DeclareUnicodeCharacter{0136}{\cedilla{K}}
+ \DeclareUnicodeCharacter{0137}{\cedilla{k}}
+ \DeclareUnicodeCharacter{0138}{\ifmmode\kappa\else $\kappa$\fi}
\DeclareUnicodeCharacter{0139}{\'L}
\DeclareUnicodeCharacter{013A}{\'l}
+ \DeclareUnicodeCharacter{013B}{\cedilla{L}}
+ \DeclareUnicodeCharacter{013C}{\cedilla{l}}
+ \DeclareUnicodeCharacter{013D}{L'}% should kern
+ \DeclareUnicodeCharacter{013E}{l'}% should kern
+ \DeclareUnicodeCharacter{013F}{L\U{00B7}}
+ \DeclareUnicodeCharacter{0140}{l\U{00B7}}
\DeclareUnicodeCharacter{0141}{\L}
\DeclareUnicodeCharacter{0142}{\l}
\DeclareUnicodeCharacter{0143}{\'N}
\DeclareUnicodeCharacter{0144}{\'n}
+ \DeclareUnicodeCharacter{0145}{\cedilla{N}}
+ \DeclareUnicodeCharacter{0146}{\cedilla{n}}
\DeclareUnicodeCharacter{0147}{\v{N}}
\DeclareUnicodeCharacter{0148}{\v{n}}
+ \DeclareUnicodeCharacter{0149}{'n}
+ \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}}
+ \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}}
\DeclareUnicodeCharacter{014C}{\=O}
\DeclareUnicodeCharacter{014D}{\=o}
\DeclareUnicodeCharacter{014E}{\u{O}}
@@ -9523,6 +9578,8 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{0153}{\oe}
\DeclareUnicodeCharacter{0154}{\'R}
\DeclareUnicodeCharacter{0155}{\'r}
+ \DeclareUnicodeCharacter{0156}{\cedilla{R}}
+ \DeclareUnicodeCharacter{0157}{\cedilla{r}}
\DeclareUnicodeCharacter{0158}{\v{R}}
\DeclareUnicodeCharacter{0159}{\v{r}}
\DeclareUnicodeCharacter{015A}{\'S}
@@ -9534,10 +9591,12 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{0160}{\v{S}}
\DeclareUnicodeCharacter{0161}{\v{s}}
- \DeclareUnicodeCharacter{0162}{\cedilla{t}}
- \DeclareUnicodeCharacter{0163}{\cedilla{T}}
+ \DeclareUnicodeCharacter{0162}{\cedilla{T}}
+ \DeclareUnicodeCharacter{0163}{\cedilla{t}}
\DeclareUnicodeCharacter{0164}{\v{T}}
-
+ \DeclareUnicodeCharacter{0165}{\v{t}}
+ \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}}
+ \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}}
\DeclareUnicodeCharacter{0168}{\~U}
\DeclareUnicodeCharacter{0169}{\~u}
\DeclareUnicodeCharacter{016A}{\=U}
@@ -9549,6 +9608,8 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{0170}{\H{U}}
\DeclareUnicodeCharacter{0171}{\H{u}}
+ \DeclareUnicodeCharacter{0172}{\ogonek{U}}
+ \DeclareUnicodeCharacter{0173}{\ogonek{u}}
\DeclareUnicodeCharacter{0174}{\^W}
\DeclareUnicodeCharacter{0175}{\^w}
\DeclareUnicodeCharacter{0176}{\^Y}
@@ -9560,6 +9621,7 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{017C}{\dotaccent{z}}
\DeclareUnicodeCharacter{017D}{\v{Z}}
\DeclareUnicodeCharacter{017E}{\v{z}}
+ \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}}
\DeclareUnicodeCharacter{01C4}{D\v{Z}}
\DeclareUnicodeCharacter{01C5}{D\v{z}}
@@ -9765,12 +9827,51 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{2261}{\equiv}
}% end of \utfeightchardefs
-
% US-ASCII character definitions.
\def\asciichardefs{% nothing need be done
\relax
}
+% Latin1 (ISO-8859-1) character definitions.
+\def\nonasciistringdefs{%
+ \setnonasciicharscatcode\active
+ \def\defstringchar##1{\def##1{\string##1}}%
+ \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3%
+ \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7%
+ \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab%
+ \defstringchar^^ac\defstringchar^^ad\defstringchar^^ae\defstringchar^^af%
+ %
+ \defstringchar^^b0\defstringchar^^b1\defstringchar^^b2\defstringchar^^b3%
+ \defstringchar^^b4\defstringchar^^b5\defstringchar^^b6\defstringchar^^b7%
+ \defstringchar^^b8\defstringchar^^b9\defstringchar^^ba\defstringchar^^bb%
+ \defstringchar^^bc\defstringchar^^bd\defstringchar^^be\defstringchar^^bf%
+ %
+ \defstringchar^^c0\defstringchar^^c1\defstringchar^^c2\defstringchar^^c3%
+ \defstringchar^^c4\defstringchar^^c5\defstringchar^^c6\defstringchar^^c7%
+ \defstringchar^^c8\defstringchar^^c9\defstringchar^^ca\defstringchar^^cb%
+ \defstringchar^^cc\defstringchar^^cd\defstringchar^^ce\defstringchar^^cf%
+ %
+ \defstringchar^^d0\defstringchar^^d1\defstringchar^^d2\defstringchar^^d3%
+ \defstringchar^^d4\defstringchar^^d5\defstringchar^^d6\defstringchar^^d7%
+ \defstringchar^^d8\defstringchar^^d9\defstringchar^^da\defstringchar^^db%
+ \defstringchar^^dc\defstringchar^^dd\defstringchar^^de\defstringchar^^df%
+ %
+ \defstringchar^^e0\defstringchar^^e1\defstringchar^^e2\defstringchar^^e3%
+ \defstringchar^^e4\defstringchar^^e5\defstringchar^^e6\defstringchar^^e7%
+ \defstringchar^^e8\defstringchar^^e9\defstringchar^^ea\defstringchar^^eb%
+ \defstringchar^^ec\defstringchar^^ed\defstringchar^^ee\defstringchar^^ef%
+ %
+ \defstringchar^^f0\defstringchar^^f1\defstringchar^^f2\defstringchar^^f3%
+ \defstringchar^^f4\defstringchar^^f5\defstringchar^^f6\defstringchar^^f7%
+ \defstringchar^^f8\defstringchar^^f9\defstringchar^^fa\defstringchar^^fb%
+ \defstringchar^^fc\defstringchar^^fd\defstringchar^^fe\defstringchar^^ff%
+}
+
+
+% define all the unicode characters we know about, for the sake of @U.
+\utfeightchardefs
+
+
% Make non-ASCII characters printable again for compatibility with
% existing Texinfo documents that may use them, even without declaring a
% document encoding.
@@ -10124,6 +10225,7 @@ directory should work if nowhere else does.}
%
{@catcode`- = @active
@gdef@normalturnoffactive{%
+ @nonasciistringdefs
@let-=@normaldash
@let"=@normaldoublequote
@let$=@normaldollar %$ font-lock fix
@@ -10192,7 +10294,7 @@ directory should work if nowhere else does.}
@c Local variables:
@c eval: (add-hook 'write-file-hooks 'time-stamp)
-@c page-delimiter: "^\\\\message"
+@c page-delimiter: "^\\\\message\\|emacs-page"
@c time-stamp-start: "def\\\\texinfoversion{"
@c time-stamp-format: "%:y-%02m-%02d.%02H"
@c time-stamp-end: "}"
diff --git a/source/configure b/source/configure
index bb2b2c1ef964303081b206ecec9930115fd2142f..e52ec3076e7acdd8b01368458ed3657f74ea3225 100755
--- a/source/configure
+++ b/source/configure
@@ -1518,7 +1518,7 @@ Optional Features:
--disable-web2c do not build the web2c (TeX & Co.) package
--enable-auto-core cause TeX&MF to dump core, given a certain
filename
- --disable-dump-share make fmt/base/mem files architecture-dependent
+ --disable-dump-share make fmt/base files architecture-dependent
--disable-ipc disable TeX's --ipc option, i.e., pipe to a
program
--disable-tex do not compile and install TeX
@@ -1555,7 +1555,7 @@ Optional Features:
--enable-tektronixwin include Tektronix window support
--enable-unitermwin include Uniterm window support
--disable-web-progs do not build WEB programs bibtex ... weave
- --disable-synctex do not build the SyncTeX tool
+ --disable-synctex do not build the SyncTeX library and tool
--disable-texlive do not build the texlive (TeX Live scripts) package
--disable-linked-scripts do not install the linked scripts
--disable-mktexmf-default do not run mktexmf if MF source missing
@@ -4287,8 +4287,7 @@ fi
if test "${enable_web_progs+set}" = set; then :
enableval=$enable_web_progs;
fi
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
# Check whether --enable-synctex was given.
if test "${enable_synctex+set}" = set; then :
enableval=$enable_synctex;
@@ -5290,8 +5289,8 @@ esac
-macro_version='2.4.5'
-macro_revision='2.4.5'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -8678,7 +8677,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -13216,13 +13215,20 @@ if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
-# lt_cv_sys_lib... is unaugmented for libtool script decls...
-lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
-# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -14594,13 +14600,12 @@ fi
done
-for ac_func in putenv strcasecmp strtol strstr
+for ac_func in putenv
do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv"
+if test "x$ac_cv_func_putenv" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_PUTENV 1
_ACEOF
fi
@@ -19119,13 +19124,17 @@ if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
-# lt_cv_sys_lib... is unaugmented for libtool script decls...
-lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
-# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
@@ -19614,12 +19623,11 @@ elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
as_fn_error $? "did not find graphite2" "$LINENO" 5
fi
-if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then
- TECKIT_INCLUDES="-I$with_teckit_includes"
-fi
-TECKIT_LIBS="-lTECkit"
-if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then
- TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS"
+if $PKG_CONFIG teckit; then
+ TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags`
+ TECKIT_LIBS=`$PKG_CONFIG teckit --libs`
+elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then
+ as_fn_error $? "did not find teckit" "$LINENO" 5
fi
if test -n "$ac_tool_prefix"; then
@@ -20919,7 +20927,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -21123,7 +21132,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-lt_cv_sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
reload_cmds_CXX \
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
@@ -21747,7 +21757,7 @@ $as_echo X"$file" |
available_tags='CXX '
# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -22001,8 +22011,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -22168,9 +22181,8 @@ compiler_lib_search_path=$lt_compiler_lib_search_path
_LT_EOF
cat <<'_LT_EOF' >> "$cfgfile"
-## -------------------------------------- ##
-## Shell functions shared with configure. ##
-## -------------------------------------- ##
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
# func_munge_path_list VARIABLE PATH
# -----------------------------------
@@ -22192,7 +22204,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -22223,6 +22235,8 @@ func_cc_basename ()
}
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
_LT_EOF
case $host_os in
diff --git a/source/doc/tlbuild.info b/source/doc/tlbuild.info
index 821be67fc234455b08ce798e957fc8ea443be11b..ddb94f94dc6650689b820d7ee774ebf6f1b79707 100644
--- a/source/doc/tlbuild.info
+++ b/source/doc/tlbuild.info
@@ -702,7 +702,7 @@ Macros for compiler-related checks:
-- Macro: KPSE_COMPILER_WARNINGS
When using the (Objective) C/C++ compiler, set
- 'WARNING_[OBJ]C[XX']FLAGS to suitable warning flags (depending on
+ 'WARNING_[OBJ]C[XX]FLAGS' to suitable warning flags (depending on
the value given to or implied for '--enable-compiler-warnings').
Call 'AC_SUBST' for them. At the moment this only works for GNU
compilers, but could be extended to others if necessary.
@@ -772,8 +772,8 @@ library. E.g., for 'libs/libpng':
and its 'Makefile.am' would be along these lines:
bin_PROGRAMS = foo
- AM_CPPFLAGS = ${ZLIB_INCLUDES} ${LIBPNG_INCLUDES}
- foo_LDADD = ${ZLIB_LIBS} ${LIBPNG_LIBS}
+ AM_CPPFLAGS = ${LIBPNG_INCLUDES} ${ZLIB_INCLUDES}
+ foo_LDADD = ${LIBPNG_LIBS} ${ZLIB_LIBS}
foo_DEPENDENCIES = ${ZLIB_DEPEND} ${LIBPNG_DEPEND}
## Rebuild libz
@ZLIB_RULE@
@@ -1315,12 +1315,11 @@ File: tlbuild.info, Node: '--enable-multiplatform', Next: '--enable-shared',
7.1.8 '--enable-multiplatform'
------------------------------
-If enabled, install executables and libraries in per-platform
-subdirectories of 'EPREFIX/bin' and 'EPREFIX/lib' where EPREFIX is the
-value given or implied for 'exec_prefix'. This can be overridden by
-explicitly '--bindir=DIR' or '--libdir=DIR'. In any case, the values
-for 'bindir' and 'libdir' are automatically propagated to all
-subdirectories.
+If enabled and '--bindir=DIR' or '--libdir=DIR' are not specified,
+install executables and libraries in per-platform subdirectories of
+'EPREFIX/bin' and 'EPREFIX/lib' where EPREFIX is the value given or
+implied for 'exec_prefix'. In any case, the values for 'bindir' and
+'libdir' are automatically propagated to all subdirectories.
File: tlbuild.info, Node: '--enable-shared', Next: '--enable-silent-rules', Prev: '--enable-multiplatform', Up: Global configure options
@@ -1865,7 +1864,7 @@ that may or may not be available on a particular system. It uses
the perhaps slightly less efficient alternative
#if !(defined HAVE_DECL_STPCPY && HAVE_DECL_STPCPY)
- #static inline char *stpcpy(char *dest, const char *src)
+ static inline char *stpcpy(char *dest, const char *src)
{
return strcpy(dest, src) + strlen(src);
}
@@ -4361,6 +4360,8 @@ Index
* --bindir configure option: '--prefix' '--bindir' ....
(line 6)
+* --bindir configure option <1>: '--enable-multiplatform'.
+ (line 6)
* --build=HOST: Cross configuring. (line 6)
* --disable-all-packages configure option: Build one package. (line 6)
* --disable-all-pkgs: '--disable-all-pkgs'. (line 6)
@@ -4428,7 +4429,7 @@ Index
* --enable-xindy-rules: Configure options for 'utils/xindy'.
(line 6)
* --host=HOST: Cross configuring. (line 6)
-* --libdir: '--enable-multiplatform'.
+* --libdir configure option: '--enable-multiplatform'.
(line 6)
* --no-clean Build option: Build problems. (line 6)
* --prefix configure option: '--prefix' '--bindir' ....
@@ -4930,265 +4931,265 @@ Node: '--enable-compiler-warnings='LEVEL51756
Node: '--enable-cxx-runtime-hack'52501
Node: '--enable-maintainer-mode'52934
Node: '--enable-multiplatform'53469
-Node: '--enable-shared'54030
-Node: '--enable-silent-rules'54407
-Node: '--without-ln-s'54869
-Node: '--without-x'55226
-Node: Program-specific configure options55418
-Node: '--enable-PROG' '--disable-PROG'56081
-Node: '--disable-all-pkgs'56364
-Node: Configure options for 'texk/web2c'57358
-Node: Configure options for 'texk/bibtex-x'59816
-Node: Configure options for 'texk/dvipdfm-x'60372
-Node: Configure options for 'texk/dvisvgm'61211
-Node: Configure options for 'texk/texlive'62103
-Node: Configure options for 'texk/xdvik'62530
-Node: Configure options for 'utils/xindy'63140
-Node: Library-specific configure options64045
-Node: Configure options for 'kpathsea'65060
-Node: Configure options for system 'poppler'65773
-Node: Variables for configure66570
-Node: Cross compilation67998
-Node: Cross configuring69297
-Node: Cross problems70970
-Node: Coding conventions72831
-Node: Declarations and definitions73500
-Node: Const75683
-Node: install-tl77546
-Node: install-tl NAME77887
-Node: install-tl SYNOPSIS78045
-Node: install-tl DESCRIPTION78253
-Node: install-tl REFERENCES79254
-Node: install-tl OPTIONS79770
-Ref: install-tl *-gui* [[=]_module_]80124
-Ref: install-tl 'text'80333
-Ref: install-tl 'wizard'80456
-Ref: install-tl 'perltk'80610
-Ref: install-tl *-no-gui*81044
-Ref: install-tl *-lang* _llcode_81125
-Ref: install-tl *-repository* _url|path_81812
-Ref: install-tl *-select-repository*83623
-Ref: install-tl *-all-options*84059
-Ref: install-tl *-custom-bin* _path_84366
-Ref: install-tl *-debug-translation*85021
-Ref: install-tl *-force-platform* _platform_85240
-Ref: install-tl *-help*, *--help*, *-?*85484
-Ref: install-tl *-in-place*85877
-Ref: install-tl *-logfile* _file_86404
-Ref: install-tl *-no-cls*86755
-Ref: install-tl *-non-admin*86886
-Ref: install-tl *--persistent-downloads*86991
-Ref: install-tl *--no-persistent-downloads*87019
-Ref: install-tl *-portable*87627
-Ref: install-tl *-print-platform*87766
-Ref: install-tl *-profile* _profile_87959
-Ref: install-tl *-q*89453
-Ref: install-tl *-scheme* _scheme_89515
-Ref: install-tl *-v*89989
-Ref: install-tl *-version*, *--version*90150
-Node: install-tl ENVIRONMENT VARIABLES90281
-Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'90670
-Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'90872
-Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'90978
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'91009
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'91038
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'91068
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'91102
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'91133
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'91161
-Ref: install-tl 'NOPERLDOC'91216
-Node: install-tl AUTHORS AND COPYRIGHT91280
-Node: tlmgr91638
-Node: tlmgr NAME92075
-Node: tlmgr SYNOPSIS92200
-Node: tlmgr DESCRIPTION92390
-Node: tlmgr EXAMPLES93486
-Ref: tlmgr 'tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet'93777
-Ref: tlmgr 'tlmgr update --list'93958
-Ref: tlmgr 'tlmgr update --all'94051
-Ref: tlmgr 'tlmgr info' _pkg_94207
-Node: tlmgr OPTIONS94413
-Ref: tlmgr *--repository* _url|path_94933
-Ref: tlmgr *--gui* [_action_]95658
-Ref: tlmgr *--gui-lang* _llcode_96065
-Ref: tlmgr *--debug-translation*96748
-Ref: tlmgr *--machine-readable*96951
-Ref: tlmgr *--no-execute-actions*97219
-Ref: tlmgr *--package-logfile* _file_97412
-Ref: tlmgr *--pause*97667
-Ref: tlmgr *--persistent-downloads*97822
-Ref: tlmgr *--no-persistent-downloads*97850
-Ref: tlmgr *--pin-file*98344
-Ref: tlmgr *--usermode*98562
-Ref: tlmgr *--usertree* _dir_98682
-Node: tlmgr ACTIONS99232
-Node: tlmgr help100464
-Node: tlmgr version100940
-Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...101258
-Ref: tlmgr *--backupdir* _directory_102352
-Ref: tlmgr *--all*102549
-Ref: tlmgr *--clean*[=_N_]102771
-Ref: tlmgr *--dry-run*103068
-Node: tlmgr candidates _pkg_103188
-Ref: tlmgr *candidates _pkg_* 1103475
-Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]103619
-Ref: tlmgr *files*104062
-Ref: tlmgr *depends*104197
-Ref: tlmgr *executes*104539
-Ref: tlmgr *runfiles*104657
-Ref: tlmgr *--use-svn*104769
-Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]104886
-Node: tlmgr dump-tlpdb [--local|--remote]106958
-Ref: tlmgr *--local*107468
-Ref: tlmgr *--remote*107507
-Node: tlmgr generate [_option_]... _what_107929
-Ref: tlmgr *generate language*108170
-Ref: tlmgr *generate language.dat*108195
-Ref: tlmgr *generate language.def*108220
-Ref: tlmgr *generate language.dat.lua*108249
-Ref: tlmgr *generate fmtutil*108269
-Ref: tlmgr *--dest* _output_file_110506
-Ref: tlmgr *--localcfg* _local_conf_file_111082
-Ref: tlmgr *--rebuild-sys*111205
-Node: tlmgr gui112066
-Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]112310
-Ref: tlmgr *--list*113515
-Ref: tlmgr *--only-installed*113794
-Ref: tlmgr *--taxonomy*114009
-Ref: tlmgr *--keyword*114021
-Ref: tlmgr *--functionality*114039
-Ref: tlmgr *--characterization*114060
-Node: tlmgr init-usertree114273
-Node: tlmgr install [_option_]... _pkg_...114699
-Ref: tlmgr *--file*115063
-Ref: tlmgr *--reinstall*115289
-Ref: tlmgr *--no-depends*115669
-Ref: tlmgr *--no-depends-at-all*115828
-Ref: tlmgr *--dry-run* 1116226
-Ref: tlmgr *--force*116344
-Node: tlmgr option116550
-Ref: tlmgr *option [show]*116723
-Ref: tlmgr *option showall*116741
-Ref: tlmgr *option _key_ [_value_]*116767
-Node: tlmgr paper120615
-Ref: tlmgr *paper [a4|letter]*120800
-Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*120874
-Node: tlmgr path [--w32mode=user|admin] [add|remove]121901
-Node: tlmgr pinning123384
-Ref: tlmgr 'pinning show'123691
-Ref: tlmgr 'pinning add' _repo_ _pkgglob_...123764
-Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...123883
-Ref: tlmgr 'pinning remove _repo_ --all'124036
-Node: tlmgr platform list|add|remove _platform_...124090
-Node: tlmgr platform set _platform_124338
-Node: tlmgr platform set auto124566
-Ref: tlmgr *--dry-run* 2125683
-Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...125792
-Node: tlmgr print-platform127094
-Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]127566
-Ref: tlmgr *--all* 1128462
-Ref: tlmgr *--backupdir* _directory_ 1128656
-Ref: tlmgr *--dry-run* 3128812
-Ref: tlmgr *--force* 1128929
-Node: tlmgr remove [_option_]... _pkg_...128957
-Ref: tlmgr *--no-depends* 1129480
-Ref: tlmgr *--no-depends-at-all* 1129542
-Ref: tlmgr *--force* 2129598
-Ref: tlmgr *--dry-run* 4130070
-Node: tlmgr repository130177
-Ref: tlmgr *repository list*130385
-Ref: tlmgr *repository list _path|tag_*130415
-Ref: tlmgr *repository add _path_ [_tag_]*130448
-Ref: tlmgr *repository remove _path|tag_*130480
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*130534
-Node: tlmgr search [_option_...] _what_131618
-Node: tlmgr search [_option_...] --file _what_132129
-Node: tlmgr search [_option_...] --taxonomy _what_132380
-Node: tlmgr search [_option_...] --keyword _what_132691
-Node: tlmgr search [_option_...] --functionality _what_133009
-Node: tlmgr search [_option_...] --characterization _what_133347
-Node: tlmgr search [_option_...] --all _what_133687
-Ref: tlmgr *--global*134135
-Ref: tlmgr *--word*134247
-Ref: tlmgr *--list* 1134486
-Ref: tlmgr *--file* 1134832
-Ref: tlmgr *--taxonomy* 1134889
-Ref: tlmgr *--keyword* 1134901
-Ref: tlmgr *--functionality* 1134919
-Ref: tlmgr *--characterization* 1134940
-Ref: tlmgr *--all* 2135095
-Node: tlmgr uninstall135178
-Ref: tlmgr *--force* 3135432
-Node: tlmgr update [_option_]... [_pkg_]...135488
-Ref: tlmgr *--all* 3135859
-Ref: tlmgr *--self*137600
-Ref: tlmgr *--dry-run* 5138364
-Ref: tlmgr *--list* [_pkg_]138541
-Ref: tlmgr *--exclude* _pkg_139230
-Ref: tlmgr *--no-auto-remove* [_pkg_]...139923
-Ref: tlmgr *--no-auto-install* [_pkg_]...140374
-Ref: tlmgr *--reinstall-forcibly-removed*141030
-Ref: tlmgr *--backup* and *--backupdir* _directory_141594
-Ref: tlmgr *--no-depends* 2142775
-Ref: tlmgr *--no-depends-at-all* 2142978
-Ref: tlmgr *--force* 4143034
-Node: tlmgr USER MODE143460
-Node: tlmgr user mode install146271
-Node: tlmgr user mode backup; restore; remove; update147218
-Node: tlmgr user mode generate; option; paper147660
-Node: tlmgr CONFIGURATION FILE FOR TLMGR148036
-Node: tlmgr TAXONOMIES149127
-Ref: tlmgr '--keyword' 2149753
-Ref: tlmgr '--functionality' 2149838
-Ref: tlmgr '--characterization' 2149994
-Ref: tlmgr '--taxonomy' 2150135
-Node: tlmgr MULTIPLE REPOSITORIES150676
-Node: tlmgr Pinning152397
-Node: tlmgr GUI FOR TLMGR154372
-Node: tlmgr Main display155594
-Node: tlmgr Display configuration area155846
-Ref: tlmgr Status156207
-Ref: tlmgr Category156371
-Ref: tlmgr Match156557
-Ref: tlmgr Selection156817
-Ref: tlmgr Display configuration buttons157021
-Node: tlmgr Package list area157204
-Ref: tlmgr a checkbox157788
-Ref: tlmgr package name157924
-Ref: tlmgr local revision (and version)158023
-Ref: tlmgr remote revision (and version)158398
-Ref: tlmgr short description158695
-Node: tlmgr Main display action buttons158740
-Ref: tlmgr Update all installed159006
-Ref: tlmgr Update159378
-Ref: tlmgr Install159428
-Ref: tlmgr Remove159614
-Ref: tlmgr Backup159792
-Node: tlmgr Menu bar159949
-Ref: tlmgr 'tlmgr' menu160146
-Ref: tlmgr 'Options menu'160454
-Ref: tlmgr 'Actions menu'161537
-Ref: tlmgr 'Help menu'161965
-Node: tlmgr MACHINE-READABLE OUTPUT162098
-Node: tlmgr Machine-readable 'update' and 'install' output162914
-Ref: tlmgr 'location-url' _location_164196
-Ref: tlmgr 'total-bytes' _count_164412
-Ref: tlmgr _pkgname_164822
-Ref: tlmgr _status_165032
-Ref: tlmgr 'd'165110
-Ref: tlmgr 'f'165170
-Ref: tlmgr 'u'165349
-Ref: tlmgr 'r'165395
-Ref: tlmgr 'a'165518
-Ref: tlmgr 'i'165696
-Ref: tlmgr 'I'165815
-Ref: tlmgr _localrev_165917
-Ref: tlmgr _serverrev_166024
-Ref: tlmgr _size_166136
-Ref: tlmgr _runtime_166305
-Ref: tlmgr _esttot_166375
-Node: tlmgr Machine-readable 'option' output166408
-Node: tlmgr AUTHORS AND COPYRIGHT166926
-Node: Index167273
+Node: '--enable-shared'54013
+Node: '--enable-silent-rules'54390
+Node: '--without-ln-s'54852
+Node: '--without-x'55209
+Node: Program-specific configure options55401
+Node: '--enable-PROG' '--disable-PROG'56064
+Node: '--disable-all-pkgs'56347
+Node: Configure options for 'texk/web2c'57341
+Node: Configure options for 'texk/bibtex-x'59799
+Node: Configure options for 'texk/dvipdfm-x'60355
+Node: Configure options for 'texk/dvisvgm'61194
+Node: Configure options for 'texk/texlive'62086
+Node: Configure options for 'texk/xdvik'62513
+Node: Configure options for 'utils/xindy'63123
+Node: Library-specific configure options64028
+Node: Configure options for 'kpathsea'65043
+Node: Configure options for system 'poppler'65756
+Node: Variables for configure66553
+Node: Cross compilation67981
+Node: Cross configuring69280
+Node: Cross problems70953
+Node: Coding conventions72814
+Node: Declarations and definitions73483
+Node: Const75665
+Node: install-tl77528
+Node: install-tl NAME77869
+Node: install-tl SYNOPSIS78027
+Node: install-tl DESCRIPTION78235
+Node: install-tl REFERENCES79236
+Node: install-tl OPTIONS79752
+Ref: install-tl *-gui* [[=]_module_]80106
+Ref: install-tl 'text'80315
+Ref: install-tl 'wizard'80438
+Ref: install-tl 'perltk'80592
+Ref: install-tl *-no-gui*81026
+Ref: install-tl *-lang* _llcode_81107
+Ref: install-tl *-repository* _url|path_81794
+Ref: install-tl *-select-repository*83605
+Ref: install-tl *-all-options*84041
+Ref: install-tl *-custom-bin* _path_84348
+Ref: install-tl *-debug-translation*85003
+Ref: install-tl *-force-platform* _platform_85222
+Ref: install-tl *-help*, *--help*, *-?*85466
+Ref: install-tl *-in-place*85859
+Ref: install-tl *-logfile* _file_86386
+Ref: install-tl *-no-cls*86737
+Ref: install-tl *-non-admin*86868
+Ref: install-tl *--persistent-downloads*86973
+Ref: install-tl *--no-persistent-downloads*87001
+Ref: install-tl *-portable*87609
+Ref: install-tl *-print-platform*87748
+Ref: install-tl *-profile* _profile_87941
+Ref: install-tl *-q*89435
+Ref: install-tl *-scheme* _scheme_89497
+Ref: install-tl *-v*89971
+Ref: install-tl *-version*, *--version*90132
+Node: install-tl ENVIRONMENT VARIABLES90263
+Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'90652
+Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'90854
+Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'90960
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'90991
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'91020
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'91050
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'91084
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'91115
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'91143
+Ref: install-tl 'NOPERLDOC'91198
+Node: install-tl AUTHORS AND COPYRIGHT91262
+Node: tlmgr91620
+Node: tlmgr NAME92057
+Node: tlmgr SYNOPSIS92182
+Node: tlmgr DESCRIPTION92372
+Node: tlmgr EXAMPLES93468
+Ref: tlmgr 'tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet'93759
+Ref: tlmgr 'tlmgr update --list'93940
+Ref: tlmgr 'tlmgr update --all'94033
+Ref: tlmgr 'tlmgr info' _pkg_94189
+Node: tlmgr OPTIONS94395
+Ref: tlmgr *--repository* _url|path_94915
+Ref: tlmgr *--gui* [_action_]95640
+Ref: tlmgr *--gui-lang* _llcode_96047
+Ref: tlmgr *--debug-translation*96730
+Ref: tlmgr *--machine-readable*96933
+Ref: tlmgr *--no-execute-actions*97201
+Ref: tlmgr *--package-logfile* _file_97394
+Ref: tlmgr *--pause*97649
+Ref: tlmgr *--persistent-downloads*97804
+Ref: tlmgr *--no-persistent-downloads*97832
+Ref: tlmgr *--pin-file*98326
+Ref: tlmgr *--usermode*98544
+Ref: tlmgr *--usertree* _dir_98664
+Node: tlmgr ACTIONS99214
+Node: tlmgr help100446
+Node: tlmgr version100922
+Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...101240
+Ref: tlmgr *--backupdir* _directory_102334
+Ref: tlmgr *--all*102531
+Ref: tlmgr *--clean*[=_N_]102753
+Ref: tlmgr *--dry-run*103050
+Node: tlmgr candidates _pkg_103170
+Ref: tlmgr *candidates _pkg_* 1103457
+Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]103601
+Ref: tlmgr *files*104044
+Ref: tlmgr *depends*104179
+Ref: tlmgr *executes*104521
+Ref: tlmgr *runfiles*104639
+Ref: tlmgr *--use-svn*104751
+Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]104868
+Node: tlmgr dump-tlpdb [--local|--remote]106940
+Ref: tlmgr *--local*107450
+Ref: tlmgr *--remote*107489
+Node: tlmgr generate [_option_]... _what_107911
+Ref: tlmgr *generate language*108152
+Ref: tlmgr *generate language.dat*108177
+Ref: tlmgr *generate language.def*108202
+Ref: tlmgr *generate language.dat.lua*108231
+Ref: tlmgr *generate fmtutil*108251
+Ref: tlmgr *--dest* _output_file_110488
+Ref: tlmgr *--localcfg* _local_conf_file_111064
+Ref: tlmgr *--rebuild-sys*111187
+Node: tlmgr gui112048
+Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]112292
+Ref: tlmgr *--list*113497
+Ref: tlmgr *--only-installed*113776
+Ref: tlmgr *--taxonomy*113991
+Ref: tlmgr *--keyword*114003
+Ref: tlmgr *--functionality*114021
+Ref: tlmgr *--characterization*114042
+Node: tlmgr init-usertree114255
+Node: tlmgr install [_option_]... _pkg_...114681
+Ref: tlmgr *--file*115045
+Ref: tlmgr *--reinstall*115271
+Ref: tlmgr *--no-depends*115651
+Ref: tlmgr *--no-depends-at-all*115810
+Ref: tlmgr *--dry-run* 1116208
+Ref: tlmgr *--force*116326
+Node: tlmgr option116532
+Ref: tlmgr *option [show]*116705
+Ref: tlmgr *option showall*116723
+Ref: tlmgr *option _key_ [_value_]*116749
+Node: tlmgr paper120597
+Ref: tlmgr *paper [a4|letter]*120782
+Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*120856
+Node: tlmgr path [--w32mode=user|admin] [add|remove]121883
+Node: tlmgr pinning123366
+Ref: tlmgr 'pinning show'123673
+Ref: tlmgr 'pinning add' _repo_ _pkgglob_...123746
+Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...123865
+Ref: tlmgr 'pinning remove _repo_ --all'124018
+Node: tlmgr platform list|add|remove _platform_...124072
+Node: tlmgr platform set _platform_124320
+Node: tlmgr platform set auto124548
+Ref: tlmgr *--dry-run* 2125665
+Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...125774
+Node: tlmgr print-platform127076
+Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]127548
+Ref: tlmgr *--all* 1128444
+Ref: tlmgr *--backupdir* _directory_ 1128638
+Ref: tlmgr *--dry-run* 3128794
+Ref: tlmgr *--force* 1128911
+Node: tlmgr remove [_option_]... _pkg_...128939
+Ref: tlmgr *--no-depends* 1129462
+Ref: tlmgr *--no-depends-at-all* 1129524
+Ref: tlmgr *--force* 2129580
+Ref: tlmgr *--dry-run* 4130052
+Node: tlmgr repository130159
+Ref: tlmgr *repository list*130367
+Ref: tlmgr *repository list _path|tag_*130397
+Ref: tlmgr *repository add _path_ [_tag_]*130430
+Ref: tlmgr *repository remove _path|tag_*130462
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*130516
+Node: tlmgr search [_option_...] _what_131600
+Node: tlmgr search [_option_...] --file _what_132111
+Node: tlmgr search [_option_...] --taxonomy _what_132362
+Node: tlmgr search [_option_...] --keyword _what_132673
+Node: tlmgr search [_option_...] --functionality _what_132991
+Node: tlmgr search [_option_...] --characterization _what_133329
+Node: tlmgr search [_option_...] --all _what_133669
+Ref: tlmgr *--global*134117
+Ref: tlmgr *--word*134229
+Ref: tlmgr *--list* 1134468
+Ref: tlmgr *--file* 1134814
+Ref: tlmgr *--taxonomy* 1134871
+Ref: tlmgr *--keyword* 1134883
+Ref: tlmgr *--functionality* 1134901
+Ref: tlmgr *--characterization* 1134922
+Ref: tlmgr *--all* 2135077
+Node: tlmgr uninstall135160
+Ref: tlmgr *--force* 3135414
+Node: tlmgr update [_option_]... [_pkg_]...135470
+Ref: tlmgr *--all* 3135841
+Ref: tlmgr *--self*137582
+Ref: tlmgr *--dry-run* 5138346
+Ref: tlmgr *--list* [_pkg_]138523
+Ref: tlmgr *--exclude* _pkg_139212
+Ref: tlmgr *--no-auto-remove* [_pkg_]...139905
+Ref: tlmgr *--no-auto-install* [_pkg_]...140356
+Ref: tlmgr *--reinstall-forcibly-removed*141012
+Ref: tlmgr *--backup* and *--backupdir* _directory_141576
+Ref: tlmgr *--no-depends* 2142757
+Ref: tlmgr *--no-depends-at-all* 2142960
+Ref: tlmgr *--force* 4143016
+Node: tlmgr USER MODE143442
+Node: tlmgr user mode install146253
+Node: tlmgr user mode backup; restore; remove; update147200
+Node: tlmgr user mode generate; option; paper147642
+Node: tlmgr CONFIGURATION FILE FOR TLMGR148018
+Node: tlmgr TAXONOMIES149109
+Ref: tlmgr '--keyword' 2149735
+Ref: tlmgr '--functionality' 2149820
+Ref: tlmgr '--characterization' 2149976
+Ref: tlmgr '--taxonomy' 2150117
+Node: tlmgr MULTIPLE REPOSITORIES150658
+Node: tlmgr Pinning152379
+Node: tlmgr GUI FOR TLMGR154354
+Node: tlmgr Main display155576
+Node: tlmgr Display configuration area155828
+Ref: tlmgr Status156189
+Ref: tlmgr Category156353
+Ref: tlmgr Match156539
+Ref: tlmgr Selection156799
+Ref: tlmgr Display configuration buttons157003
+Node: tlmgr Package list area157186
+Ref: tlmgr a checkbox157770
+Ref: tlmgr package name157906
+Ref: tlmgr local revision (and version)158005
+Ref: tlmgr remote revision (and version)158380
+Ref: tlmgr short description158677
+Node: tlmgr Main display action buttons158722
+Ref: tlmgr Update all installed158988
+Ref: tlmgr Update159360
+Ref: tlmgr Install159410
+Ref: tlmgr Remove159596
+Ref: tlmgr Backup159774
+Node: tlmgr Menu bar159931
+Ref: tlmgr 'tlmgr' menu160128
+Ref: tlmgr 'Options menu'160436
+Ref: tlmgr 'Actions menu'161519
+Ref: tlmgr 'Help menu'161947
+Node: tlmgr MACHINE-READABLE OUTPUT162080
+Node: tlmgr Machine-readable 'update' and 'install' output162896
+Ref: tlmgr 'location-url' _location_164178
+Ref: tlmgr 'total-bytes' _count_164394
+Ref: tlmgr _pkgname_164804
+Ref: tlmgr _status_165014
+Ref: tlmgr 'd'165092
+Ref: tlmgr 'f'165152
+Ref: tlmgr 'u'165331
+Ref: tlmgr 'r'165377
+Ref: tlmgr 'a'165500
+Ref: tlmgr 'i'165678
+Ref: tlmgr 'I'165797
+Ref: tlmgr _localrev_165899
+Ref: tlmgr _serverrev_166006
+Ref: tlmgr _size_166118
+Ref: tlmgr _runtime_166287
+Ref: tlmgr _esttot_166357
+Node: tlmgr Machine-readable 'option' output166390
+Node: tlmgr AUTHORS AND COPYRIGHT166908
+Node: Index167255
End Tag Table
diff --git a/source/doc/tlbuild.texi b/source/doc/tlbuild.texi
index 747f16b21b7ced56ead5b996682bbf798c812f74..9be53064d6d3c526220fa9da42879490c3a22949 100644
--- a/source/doc/tlbuild.texi
+++ b/source/doc/tlbuild.texi
@@ -895,7 +895,7 @@ Macros for compiler-related checks:
@defmac KPSE_COMPILER_WARNINGS
@vindex WARNING_C[XX]FLAGS
When using the (Objective) C/C++ compiler, set
-@code{WARNING_[OBJ]C[XX}]FLAGS to suitable warning flags (depending on
+@code{WARNING_[OBJ]C[XX]FLAGS} to suitable warning flags (depending on
the value given to or implied for @code{--enable-compiler-warnings}).
Call @code{AC_SUBST} for them. At the moment this only works for GNU
compilers, but could be extended to others if necessary.
@@ -985,8 +985,8 @@ KPSE_LIBPNG_FLAGS
@noindent and its @file{Makefile.am} would be along these lines:
@example
bin_PROGRAMS = foo
-AM_CPPFLAGS = $@{ZLIB_INCLUDES@} $@{LIBPNG_INCLUDES@}
-foo_LDADD = $@{ZLIB_LIBS@} $@{LIBPNG_LIBS@}
+AM_CPPFLAGS = $@{LIBPNG_INCLUDES@} $@{ZLIB_INCLUDES@}
+foo_LDADD = $@{LIBPNG_LIBS@} $@{ZLIB_LIBS@}
foo_DEPENDENCIES = $@{ZLIB_DEPEND@} $@{LIBPNG_DEPEND@}
## Rebuild libz
@@ZLIB_RULE@@
@@ -1625,14 +1625,15 @@ rebuilds infrastructure files as needed. @xref{maintainer-mode,,
@vindex --enable-multiplatform
@vindex exec_prefix
-@vindex --libdir
-If enabled, install executables and libraries in per-platform
+@vindex --bindir configure @r{option}
+@vindex --libdir configure @r{option}
+If enabled and @code{--bindir=@var{dir}} or @code{--libdir=@var{dir}}
+are not specified, install executables and libraries in per-platform
subdirectories of @file{@var{eprefix}/bin} and
@file{@var{eprefix}/lib} where @var{eprefix} is the value given or
-implied for @code{exec_prefix}. This can be overridden by explicitly
-@code{--bindir=@var{dir}} or @code{--libdir=@var{dir}}. In any case,
-the values for @code{bindir} and @code{libdir} are automatically
-propagated to all subdirectories.
+implied for @code{exec_prefix}. In any case, the values for
+@code{bindir} and @code{libdir} are automatically propagated to all
+subdirectories.
@node @code{--enable-shared}
@@ -2281,7 +2282,7 @@ less efficient alternative
@example
#if !(defined HAVE_DECL_STPCPY && HAVE_DECL_STPCPY)
-#static inline char *stpcpy(char *dest, const char *src)
+static inline char *stpcpy(char *dest, const char *src)
@{
return strcpy(dest, src) + strlen(src);
@}
diff --git a/source/libs/ChangeLog b/source/libs/ChangeLog
index f1b847d5eff9569e5b40271200f825993eb2b6e0..d49a9e359d9255fdf8f5c8ab9ddc669f4acd59d3 100644
--- a/source/libs/ChangeLog
+++ b/source/libs/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../am/dist_hook.am.
+
2013-12-26 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (ACLOCAL): Ensure aclocal.m4 is up to date.
diff --git a/source/libs/Makefile.am b/source/libs/Makefile.am
index 121854667b7be92fa1cce7a556c0a028aba03e22..fd306204bb355ea8915c75cc405d58566d9f3ff5 100644
--- a/source/libs/Makefile.am
+++ b/source/libs/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory libs/
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
## Ensure aclocal.m4 is up to date
@@ -9,9 +9,8 @@ ACLOCAL = @ACLOCAL@ --force
SUBDIRS = . $(MAKE_SUBDIRS)
DIST_SUBDIRS = $(CONF_SUBDIRS)
-# just in case a subdirectory has added directories
-dist-hook:
- rm -rf `find $(distdir) -name .svn`
+# Files not to be distributed
+include $(srcdir)/../am/dist_hook.am
## Configure and build subdirs.
##
diff --git a/source/libs/Makefile.in b/source/libs/Makefile.in
index 9b4d2338d0ead36ecd7311d8d2aef003771cd5f8..bf6f649508fc42ae529a867914dacb457ded973e 100644
--- a/source/libs/Makefile.in
+++ b/source/libs/Makefile.in
@@ -190,7 +190,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
-am__DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../am/dist_hook.am \
+ $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
$(top_srcdir)/../build-aux/compile \
$(top_srcdir)/../build-aux/config.guess \
$(top_srcdir)/../build-aux/config.sub \
@@ -341,6 +342,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = . $(MAKE_SUBDIRS)
DIST_SUBDIRS = $(CONF_SUBDIRS)
+NEVER_DIST = `find . $(NEVER_NAMES)`
+NEVER_NAMES = -name .svn
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
+
+# Files not to be distributed
recurse_this = libs/
recurse_top = ../
@@ -359,7 +366,7 @@ all: all-recursive
.SUFFIXES:
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/recurse.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/dist_hook.am $(srcdir)/../am/recurse.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -381,7 +388,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../am/recurse.am $(am__empty):
+$(srcdir)/../am/dist_hook.am $(srcdir)/../am/recurse.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -812,10 +819,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# just in case a subdirectory has added directories
dist-hook:
- rm -rf `find $(distdir) -name .svn`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
all-local: recurse
diff --git a/source/libs/README b/source/libs/README
index 5889f1c9eff62a201c0fa525a78b5c70255aa746..8b498fe56b2258d3fefd4feac4c761fd97865d4d 100644
--- a/source/libs/README
+++ b/source/libs/README
@@ -1,4 +1,4 @@
-$Id: README 36054 2015-01-14 10:59:36Z peter $
+$Id: README 36458 2015-03-08 10:37:01Z peter $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -24,7 +24,7 @@ gmp 6.0.0 - checked 25mar14
graphite2 1.2.4 - checked 2dec13
http://sourceforge.net/projects/silgraphite/files/graphite2/
-harfbuzz 0.9.37 - checked 18dec14
+harfbuzz 0.9.39 - checked 5mar15
http://www.freedesktop.org/software/harfbuzz/release/
icu 54.1 (release) - checked 2oct14
@@ -37,7 +37,7 @@ libpng 1.6.16 - checked 22dec14
http://www.libpng.org/ - used by many
http://www.libpng.org/pub/png/pngcode.html
-lua 5.2.4 - checked 10mar15
+lua 5.2.3 - checked 7dec13
http://www.lua.org/ftp/
luajit 2.0.3 - checked 14mar14
@@ -49,7 +49,7 @@ mpfr 3.1.2 - checked 13mar13
pixman 0.32.6 - checked 7jul14
http://cairographics.org/releases/
-poppler 0.30.0 - checked 7jan15
+poppler 0.32.0 - checked 8mar15
http://poppler.freedesktop.org/ - used by luatex and xetex
potrace 1.11 - checked 12apr13
diff --git a/source/libs/cairo/ChangeLog b/source/libs/cairo/ChangeLog
index 1fa7b8e2bdeaa22407e57c92f87fb5ee9987cea3..c74dc0e3a95e500c7b3e4e1abb52103b36605134 100644
--- a/source/libs/cairo/ChangeLog
+++ b/source/libs/cairo/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-02 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Added KPSE_COMPILER_VISIBILITY.
diff --git a/source/libs/cairo/Makefile.am b/source/libs/cairo/Makefile.am
index 64fd506021f2c63940e2161fc8ff1b12b7fb41d4..ca74078b94cc814e5f53cf8800967f88bf53fd83 100644
--- a/source/libs/cairo/Makefile.am
+++ b/source/libs/cairo/Makefile.am
@@ -1,7 +1,7 @@
## Proxy Makefile.am to build cairo for TeX Live.
##
## Copyright (C) 2012 Taco Hoekwater <taco@metatex.org>
-## Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2013-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -17,9 +17,9 @@ EXTRA_DIST += $(CAIRO_TREE)-PATCHES
CAIRO_SRC = $(CAIRO_TREE)/src
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.lo' -o -name '*.$(OBJEXT)'`
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . cairo
diff --git a/source/libs/cairo/Makefile.in b/source/libs/cairo/Makefile.in
index d7913edc4edc078e0824da9a5e3b92dcf3496f58..293a412efbaed491c3ce6fc38dd994562a6f27e2 100644
--- a/source/libs/cairo/Makefile.in
+++ b/source/libs/cairo/Makefile.in
@@ -751,10 +751,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/cairo-features.h.in $(srcdir)/config.h.in \
- $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/cairo-features.h.in \
+ $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
$(top_srcdir)/../../build-aux/depcomp \
@@ -916,6 +916,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(CAIRO_TREE) $(CAIRO_TREE)-PATCHES
CAIRO_SRC = $(CAIRO_TREE)/src
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
SUBDIRS = . cairo
AM_CPPFLAGS = -I$(top_srcdir)/$(CAIRO_SRC) $(PIXMAN_INCLUDES) -DCAIRO_NO_MUTEX
AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG) $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
@@ -1040,7 +1046,7 @@ all: config.h cairo-features.h
.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -1062,7 +1068,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -2324,10 +2330,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.lo' -o -name '*.$(OBJEXT)'`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libcairo_a_OBJECTS): config.force
diff --git a/source/libs/configure b/source/libs/configure
index 2800262aaf05ffea2e976a58e7e4a8c78a15ba0b..0069155771a1bbac548e5828d3dadf7126c62c0c 100755
--- a/source/libs/configure
+++ b/source/libs/configure
@@ -1415,7 +1415,7 @@ Optional Features:
--disable-web2c do not build the web2c (TeX & Co.) package
--enable-auto-core cause TeX&MF to dump core, given a certain
filename
- --disable-dump-share make fmt/base/mem files architecture-dependent
+ --disable-dump-share make fmt/base files architecture-dependent
--disable-ipc disable TeX's --ipc option, i.e., pipe to a
program
--disable-tex do not compile and install TeX
@@ -1452,7 +1452,7 @@ Optional Features:
--enable-tektronixwin include Tektronix window support
--enable-unitermwin include Uniterm window support
--disable-web-progs do not build WEB programs bibtex ... weave
- --disable-synctex do not build the SyncTeX tool
+ --disable-synctex do not build the SyncTeX library and tool
--disable-texlive do not build the texlive (TeX Live scripts) package
--disable-linked-scripts do not install the linked scripts
--disable-mktexmf-default do not run mktexmf if MF source missing
@@ -3523,8 +3523,7 @@ fi
if test "${enable_web_progs+set}" = set; then :
enableval=$enable_web_progs;
fi
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
# Check whether --enable-synctex was given.
if test "${enable_synctex+set}" = set; then :
enableval=$enable_synctex;
diff --git a/source/libs/gmp/ChangeLog b/source/libs/gmp/ChangeLog
index eb95ce6f80280ea5192b76bbcbc15d98a61360e3..b3d2839f68f081eb9fc6776f425ed56c904536d0 100644
--- a/source/libs/gmp/ChangeLog
+++ b/source/libs/gmp/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Added GMP_H_EXTERN_INLINE.
diff --git a/source/libs/gmp/Makefile.am b/source/libs/gmp/Makefile.am
index fcc5ebd969ea604dd04029d68f1e0fb29c59173e..5cc6530748af47bd190d9be70bd4c6684cf18605 100644
--- a/source/libs/gmp/Makefile.am
+++ b/source/libs/gmp/Makefile.am
@@ -1,7 +1,7 @@
## Proxy Makefile.am to build GNU MP for TeX Live.
##
## Copyright (C) 2014 Taco Hoekwater <taco@metatex.org>
-## Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -15,9 +15,9 @@ EXTRA_DIST = $(GMP_TREE)
##
EXTRA_DIST += $(GMP_TREE)-PATCHES
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = native . include
diff --git a/source/libs/gmp/Makefile.in b/source/libs/gmp/Makefile.in
index f7639eeca342d1c211f2ef6fd4fcb71cf9828408..70c0a4dfb680c7cb112ea99dc022d42c8fc64a42 100644
--- a/source/libs/gmp/Makefile.in
+++ b/source/libs/gmp/Makefile.in
@@ -551,9 +551,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
$(top_srcdir)/../../build-aux/depcomp \
@@ -717,6 +718,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(GMP_TREE) $(GMP_TREE)-PATCHES
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
SUBDIRS = native . include
AM_CPPFLAGS = -I$(srcdir)/$(GMP_TREE) -I$(srcdir)/$(GMP_TREE)/mpn/generic -DNO_ASM
AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
@@ -1118,7 +1125,7 @@ all: config.h
.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -1140,7 +1147,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -2428,10 +2435,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libgmp_a_OBJECTS): mp_bases.h fac_table.h fib_table.h
$(logops_n_sources):
diff --git a/source/libs/libpng/ChangeLog b/source/libs/libpng/ChangeLog
index 9d76540a3360595f306794abd2be358f7cf5efea..7afce797f91d6f04d55af72f5dc20244429fd275 100644
--- a/source/libs/libpng/ChangeLog
+++ b/source/libs/libpng/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-22 Peter Breitenlohner <peb@mppmu.mpg.de>
Import libpng-1.6.16.
diff --git a/source/libs/libpng/Makefile.am b/source/libs/libpng/Makefile.am
index 35b76dc7006e7387e3a8d563778cc8721b741876..a8f73190e335c349125ea11b94177cbcce8c5fe1 100644
--- a/source/libs/libpng/Makefile.am
+++ b/source/libs/libpng/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build libpng for TeX Live.
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,16 +14,9 @@ EXTRA_DIST = $(LIBPNG_TREE)
##
EXTRA_DIST += $(LIBPNG_TREE)-PATCHES
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
- rm -f $(distdir)/$(LIBPNG_TREE)/config.sub \
- $(distdir)/$(LIBPNG_TREE)/config.guess \
- $(distdir)/$(LIBPNG_TREE)/depcomp \
- $(distdir)/$(LIBPNG_TREE)/install-sh \
- $(distdir)/$(LIBPNG_TREE)/ltmain.sh \
- $(distdir)/$(LIBPNG_TREE)/missing \
- $(distdir)/$(LIBPNG_TREE)/mkinstalldirs
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include
diff --git a/source/libs/libpng/Makefile.in b/source/libs/libpng/Makefile.in
index 6bd236659b33117681da63bde6c02b781d0ea72f..a5250fbb50254e01abb1cc8dab1b1f8c1852faf3 100644
--- a/source/libs/libpng/Makefile.in
+++ b/source/libs/libpng/Makefile.in
@@ -408,9 +408,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/missing \
@@ -561,6 +562,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(LIBPNG_TREE) $(LIBPNG_TREE)-PATCHES
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES)
AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS)
@@ -603,7 +610,7 @@ all: config.h
.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -625,7 +632,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1337,17 +1344,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
- rm -f $(distdir)/$(LIBPNG_TREE)/config.sub \
- $(distdir)/$(LIBPNG_TREE)/config.guess \
- $(distdir)/$(LIBPNG_TREE)/depcomp \
- $(distdir)/$(LIBPNG_TREE)/install-sh \
- $(distdir)/$(LIBPNG_TREE)/ltmain.sh \
- $(distdir)/$(LIBPNG_TREE)/missing \
- $(distdir)/$(LIBPNG_TREE)/mkinstalldirs
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libpng_a_OBJECTS): config.force
diff --git a/source/libs/lua52/ChangeLog b/source/libs/lua52/ChangeLog
index f5a1b289f9e5baba37263e9f8f7e25d641500d53..e1999ad26ef3fda2086ebbedefcb62602238e6db 100644
--- a/source/libs/lua52/ChangeLog
+++ b/source/libs/lua52/ChangeLog
@@ -1,6 +1,10 @@
2015-03-10 Luigi Scarso <luigi.scarso@gmail.com>
Import lua-5.2.4
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-10-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, configure.ac: Build lua52 as (possibly shared)
diff --git a/source/libs/lua52/Makefile.am b/source/libs/lua52/Makefile.am
index 3858a41f1a3bdf17c53ef4da16a48171df41bfeb..c10a3bfbcff1b9e3d9ccba71c6c54a3fee29ffe5 100644
--- a/source/libs/lua52/Makefile.am
+++ b/source/libs/lua52/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build Lua52 for TeX Live.
##
-## Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2013-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,9 +14,9 @@ EXTRA_DIST = $(LUA52_TREE)
##
EXTRA_DIST += $(LUA52_TREE)-PATCHES
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
SUBDIRS = . include
diff --git a/source/libs/lua52/Makefile.in b/source/libs/lua52/Makefile.in
index 52e4d20209a5774cd4593369f7e2304664a3bfa6..f16b1598f66e7f1ed67a36aab772114df3898739 100644
--- a/source/libs/lua52/Makefile.in
+++ b/source/libs/lua52/Makefile.in
@@ -440,7 +440,8 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(srcdir)/texlua52.pc.in \
$(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
@@ -620,6 +621,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(LUA52_TREE) $(LUA52_TREE)-PATCHES error.exp
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES)
AM_CFLAGS = $(WARNING_CFLAGS)
@@ -689,7 +696,7 @@ all: config.h
.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -711,7 +718,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1615,10 +1622,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-lua52includeHEADERS \
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
rebuild.stamp: $(rebuild_target)
echo timestamp >$@
diff --git a/source/libs/lua52/configure b/source/libs/lua52/configure
index 1daff2c3cbd28398d444453bdf9bf985e1c30694..187c0a82757674d9bfab2e042f018621e6882d96 100755
--- a/source/libs/lua52/configure
+++ b/source/libs/lua52/configure
@@ -4944,8 +4944,8 @@ esac
-macro_version='2.4.5'
-macro_revision='2.4.5'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -8392,7 +8392,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -12493,13 +12493,20 @@ if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
-# lt_cv_sys_lib... is unaugmented for libtool script decls...
-lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
-# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -14680,7 +14687,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -14799,7 +14807,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-lt_cv_sys_lib_dlsearch_path_spec; do
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
@@ -15578,7 +15587,7 @@ $as_echo X"$file" |
available_tags=''
# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -15832,8 +15841,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -15985,9 +15997,8 @@ hardcode_action=$hardcode_action
_LT_EOF
cat <<'_LT_EOF' >> "$cfgfile"
-## -------------------------------------- ##
-## Shell functions shared with configure. ##
-## -------------------------------------- ##
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
# func_munge_path_list VARIABLE PATH
# -----------------------------------
@@ -16009,7 +16020,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -16040,6 +16051,8 @@ func_cc_basename ()
}
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
_LT_EOF
case $host_os in
diff --git a/source/libs/luajit/ChangeLog b/source/libs/luajit/ChangeLog
index ef6d06a0bf24e3f40b08941498685fa5364dfb6a..9f7a72e821f0b88d728fdd30b81bdc808126b587 100644
--- a/source/libs/luajit/ChangeLog
+++ b/source/libs/luajit/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, configure.ac: Build luajit as (possibly shared)
diff --git a/source/libs/luajit/LuaJIT-2.0.3-PATCHES/ChangeLog b/source/libs/luajit/LuaJIT-2.0.3-PATCHES/ChangeLog
index 0fa9944f9df28f8fdc0a9650c9b8f311d5d70f07..30aa570e493b6764d8947870223746b19cfdcb97 100644
--- a/source/libs/luajit/LuaJIT-2.0.3-PATCHES/ChangeLog
+++ b/source/libs/luajit/LuaJIT-2.0.3-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-06-ppc-darwin (new): Build fix for PPC OS X.
+ From http://permalink.gmane.org/gmane.comp.lang.lua.luajit/5936.
+
2014-06-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-05-LuaJITTeX (lj_str_new): Replace '6' by LUAI_HASHLIMIT
diff --git a/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-06-ppc-darwin b/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-06-ppc-darwin
new file mode 100644
index 0000000000000000000000000000000000000000..7ab68cfa1378066b47137e3299fec79a3218880d
--- /dev/null
+++ b/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-06-ppc-darwin
@@ -0,0 +1,24 @@
+diff -ur -x lbitlib.c LuaJIT-2.0.3.orig/src/host/buildvm.c LuaJIT-2.0.3/src/host/buildvm.c
+--- LuaJIT-2.0.3.orig/src/host/buildvm.c 2014-03-12 13:10:00.000000000 +0100
++++ LuaJIT-2.0.3/src/host/buildvm.c 2015-02-19 13:01:47.000000000 +0100
+@@ -113,7 +113,7 @@
+ name[0] = '@';
+ else
+ *p = '\0';
+-#elif (LJ_TARGET_PPC || LJ_TARGET_PPCSPE) && !LJ_TARGET_CONSOLE
++#elif ((LJ_TARGET_PPC && !LJ_TARGET_OSX) || LJ_TARGET_PPCSPE) && !LJ_TARGET_CONSOLE
+ /* Keep @plt. */
+ #else
+ *p = '\0';
+diff -ur -x lbitlib.c LuaJIT-2.0.3.orig/src/lj_arch.h LuaJIT-2.0.3/src/lj_arch.h
+--- LuaJIT-2.0.3.orig/src/lj_arch.h 2014-03-12 13:10:00.000000000 +0100
++++ LuaJIT-2.0.3/src/lj_arch.h 2015-02-19 13:04:58.000000000 +0100
+@@ -293,7 +293,7 @@
+ #if __GNUC__ < 4
+ #error "Need at least GCC 4.0 or newer"
+ #endif
+-#elif LJ_TARGET_ARM
++#elif LJ_TARGET_ARM || LJ_TARGET_PPC
+ #if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 2)
+ #error "Need at least GCC 4.2 or newer"
+ #endif
diff --git a/source/libs/luajit/LuaJIT-2.0.3/src/host/buildvm.c b/source/libs/luajit/LuaJIT-2.0.3/src/host/buildvm.c
index 7687ad7ad0b7b610258e7dcf589b2a9fe6ccbb1b..95d89e9b06292fd900695138bc2f66d9785280f2 100644
--- a/source/libs/luajit/LuaJIT-2.0.3/src/host/buildvm.c
+++ b/source/libs/luajit/LuaJIT-2.0.3/src/host/buildvm.c
@@ -113,7 +113,7 @@ static const char *sym_decorate(BuildCtx *ctx,
name[0] = '@';
else
*p = '\0';
-#elif (LJ_TARGET_PPC || LJ_TARGET_PPCSPE) && !LJ_TARGET_CONSOLE
+#elif ((LJ_TARGET_PPC && !LJ_TARGET_OSX) || LJ_TARGET_PPCSPE) && !LJ_TARGET_CONSOLE
/* Keep @plt. */
#else
*p = '\0';
diff --git a/source/libs/luajit/LuaJIT-2.0.3/src/lj_arch.h b/source/libs/luajit/LuaJIT-2.0.3/src/lj_arch.h
index 0196eedc0caa7108fec7d55daa76a47d45596191..0b0720951c00e406e44ece13e7d9d199f83be08d 100644
--- a/source/libs/luajit/LuaJIT-2.0.3/src/lj_arch.h
+++ b/source/libs/luajit/LuaJIT-2.0.3/src/lj_arch.h
@@ -293,7 +293,7 @@
#if __GNUC__ < 4
#error "Need at least GCC 4.0 or newer"
#endif
-#elif LJ_TARGET_ARM
+#elif LJ_TARGET_ARM || LJ_TARGET_PPC
#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 2)
#error "Need at least GCC 4.2 or newer"
#endif
diff --git a/source/libs/luajit/Makefile.am b/source/libs/luajit/Makefile.am
index 393989fdbb4f9de0489dde0d9105763a53faa696..c9ce91409866d54c892659a974f92fad94e39d79 100644
--- a/source/libs/luajit/Makefile.am
+++ b/source/libs/luajit/Makefile.am
@@ -1,7 +1,7 @@
## Proxy Makefile.am to build LuaJIT for TeX Live.
##
## Copyright (C) 2014 Luigi Scarso <luigi.scarso@gmail.com>
-## Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
## We want to re-distribute the whole original LuaJIT source tree.
@@ -12,9 +12,9 @@ EXTRA_DIST = $(LUAJIT_TREE)
##
EXTRA_DIST += $(LUAJIT_TREE)-PATCHES
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES)
AM_CFLAGS = -Wall
diff --git a/source/libs/luajit/Makefile.in b/source/libs/luajit/Makefile.in
index 0e938d031fe7f78bc8c0a284e94287f5a1778f10..a0c96569f5f14a5ff6931726d459ca62f579a6d7 100644
--- a/source/libs/luajit/Makefile.in
+++ b/source/libs/luajit/Makefile.in
@@ -470,9 +470,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(srcdir)/texluajit.pc.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/texluajit.pc.in \
$(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
@@ -660,6 +661,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(LUAJIT_TREE) $(LUAJIT_TREE)-PATCHES jiterr.exp
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES)
AM_CFLAGS = -Wall
SUBDIRS = . native include
@@ -746,7 +753,7 @@ all: config.h
.SUFFIXES: .c .lo .log .o .obj .s .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -768,7 +775,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1750,10 +1757,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-luajitincludeHEADERS \
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libtexluajit_la_OBJECTS): $(HDRGEN)
diff --git a/source/libs/luajit/configure b/source/libs/luajit/configure
index ad49987f250302a8a06eeeddaf551bfeae2b14c8..e6cd0c830f0cb23f2130a96dc5480321c5f6322b 100755
--- a/source/libs/luajit/configure
+++ b/source/libs/luajit/configure
@@ -5172,8 +5172,8 @@ esac
-macro_version='2.4.5'
-macro_revision='2.4.5'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -8549,7 +8549,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -12650,13 +12650,20 @@ if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
-# lt_cv_sys_lib... is unaugmented for libtool script decls...
-lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
-# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -14996,7 +15003,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -15115,7 +15123,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-lt_cv_sys_lib_dlsearch_path_spec; do
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
@@ -15894,7 +15903,7 @@ $as_echo X"$file" |
available_tags=''
# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -16148,8 +16157,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -16301,9 +16313,8 @@ hardcode_action=$hardcode_action
_LT_EOF
cat <<'_LT_EOF' >> "$cfgfile"
-## -------------------------------------- ##
-## Shell functions shared with configure. ##
-## -------------------------------------- ##
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
# func_munge_path_list VARIABLE PATH
# -----------------------------------
@@ -16325,7 +16336,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -16356,6 +16367,8 @@ func_cc_basename ()
}
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
_LT_EOF
case $host_os in
diff --git a/source/libs/mpfr/ChangeLog b/source/libs/mpfr/ChangeLog
index e421e281854521ce93f94d6e8773f0dca8e74558..2cc42249082216d674751b3a6d84f843316f4e6d 100644
--- a/source/libs/mpfr/ChangeLog
+++ b/source/libs/mpfr/ChangeLog
@@ -1,3 +1,12 @@
+2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * m4/mpfr-configs.m4: Drop useless checks for memmove, memset,
+ and strtol.
+
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am [Sparc Solaris, armel]:
diff --git a/source/libs/mpfr/Makefile.am b/source/libs/mpfr/Makefile.am
index 45c08f82198c408ee5add22bc3e95989a938d689..25ea8c406844968829dda2ecd0b9bfa8b5718fb4 100644
--- a/source/libs/mpfr/Makefile.am
+++ b/source/libs/mpfr/Makefile.am
@@ -1,7 +1,7 @@
## Proxy Makefile.am to build MPFR for TeX Live.
##
## Copyright (C) 2014 Taco Hoekwater <taco@metatex.org>
-## Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -15,9 +15,9 @@ EXTRA_DIST = $(MPFR_TREE)
##
EXTRA_DIST += $(MPFR_TREE)-PATCHES
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include
diff --git a/source/libs/mpfr/Makefile.in b/source/libs/mpfr/Makefile.in
index e19a86afdec23d51a82334a0c27b0e26ab3eee0b..1a0e6b5f933dd410e8f6b7fa5c1efc6ccdb1de03 100644
--- a/source/libs/mpfr/Makefile.in
+++ b/source/libs/mpfr/Makefile.in
@@ -489,9 +489,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
$(top_srcdir)/../../build-aux/depcomp \
@@ -653,6 +654,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(MPFR_TREE) $(MPFR_TREE)-PATCHES
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
SUBDIRS = . include
AM_CPPFLAGS = -I$(srcdir)/$(MPFR_TREE)/src $(GMP_INCLUDES)
AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
@@ -901,7 +908,7 @@ all: config.h
.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -923,7 +930,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1901,10 +1908,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libmpfr_a_OBJECTS): $(GMP_DEPEND)
@GMP_RULE@
diff --git a/source/libs/mpfr/config.h.in b/source/libs/mpfr/config.h.in
index 6cb4b2465917cfb9d7c6e412c5c2236923476b6b..71f81eceba825216752c59f0d1843df1d5780cd5 100644
--- a/source/libs/mpfr/config.h.in
+++ b/source/libs/mpfr/config.h.in
@@ -37,15 +37,9 @@
/* Define if compiler supports long long */
#undef HAVE_LONG_LONG
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
/* Define if stdarg */
#undef HAVE_STDARG
@@ -61,9 +55,6 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
-
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
diff --git a/source/libs/mpfr/configure b/source/libs/mpfr/configure
index 45a9bb5c850ec11d46a272552cdcc13349cc9c5d..57483f9956c86b602266d41300804a7d41d17f90 100755
--- a/source/libs/mpfr/configure
+++ b/source/libs/mpfr/configure
@@ -5754,19 +5754,6 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-for ac_func in memmove memset strtol
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
case $host in #(
alpha*-*-*) :
diff --git a/source/libs/mpfr/m4/mpfr-configs.m4 b/source/libs/mpfr/m4/mpfr-configs.m4
index 680cf953c4ff36c24c88795e69048f43a5148717..d4c8373a05e4f94c4b39bff6880795cc01336d87 100644
--- a/source/libs/mpfr/m4/mpfr-configs.m4
+++ b/source/libs/mpfr/m4/mpfr-configs.m4
@@ -2,7 +2,7 @@
# Copyright (C) 2000-2013 Free Software Foundation, Inc.
# Contributed by the AriC and Caramel projects, INRIA.
#
-# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
# Extracted from mpfr-3.1.2/acinclude.m4 and adapted for TeX Live.
#
# This file is free software; the copyright holders
@@ -53,12 +53,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
AC_MSG_RESULT([__va_copy])],
[AC_MSG_RESULT([memcpy])])])
-dnl FIXME: The functions memmove, memset and strtol are really needed by
-dnl MPFR, but if they are implemented as macros, this is also OK (in our
-dnl case). So, we do not return an error, but their tests are currently
-dnl useless.
-AC_CHECK_FUNCS([memmove memset strtol])
-
dnl Check for IEEE-754 switches on Alpha
AS_CASE([$host],
[alpha*-*-*], [
diff --git a/source/libs/pixman/ChangeLog b/source/libs/pixman/ChangeLog
index eb2e493282c162092cebd889ea5ecf658f5429f0..497762f68b49d03b9cfbdd242ba080466c39697e 100644
--- a/source/libs/pixman/ChangeLog
+++ b/source/libs/pixman/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Added KPSE_COMPILER_VISIBILITY.
diff --git a/source/libs/pixman/Makefile.am b/source/libs/pixman/Makefile.am
index 31b89f475501c889a5040e8e1abc6b1eb79963af..c7ecf7b3f7f1a5c27ab467967c68946edd0139d4 100644
--- a/source/libs/pixman/Makefile.am
+++ b/source/libs/pixman/Makefile.am
@@ -1,7 +1,7 @@
## Proxy Makefile.am to build pixman for TeX Live.
##
## Copyright (C) 2012 Taco Hoekwater <taco@metatex.org>
-## Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -17,10 +17,9 @@ EXTRA_DIST += $(PIXMAN_TREE)-PATCHES
PIXMAN_SRC = $(PIXMAN_TREE)/pixman
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
- rm -f $(distdir)/$(PIXMAN_SRC)/pixman-version.h
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include
diff --git a/source/libs/pixman/Makefile.in b/source/libs/pixman/Makefile.in
index 03318995aa6b5c86ef9c3d7960be9f37408ccdc8..50bc7424d823797b563ab441523d615e48687834 100644
--- a/source/libs/pixman/Makefile.in
+++ b/source/libs/pixman/Makefile.in
@@ -432,7 +432,8 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(srcdir)/sources.am \
$(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
@@ -585,6 +586,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(PIXMAN_TREE) $(PIXMAN_TREE)-PATCHES
PIXMAN_SRC = $(PIXMAN_TREE)/pixman
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(PIXMAN_SRC)
AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
@@ -648,7 +655,7 @@ all: config.h
.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/sources.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/sources.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -670,7 +677,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/sources.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/sources.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1470,11 +1477,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
- rm -f $(distdir)/$(PIXMAN_SRC)/pixman-version.h
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
rebuild.stamp: $(rebuild_target)
echo timestamp >$@
diff --git a/source/libs/poppler/ChangeLog b/source/libs/poppler/ChangeLog
index cc2a804da49817a370a5d44723203da740e58896..87452a232989eaf61cb5a8b1804ce125644bd4d2 100644
--- a/source/libs/poppler/ChangeLog
+++ b/source/libs/poppler/ChangeLog
@@ -1,3 +1,17 @@
+2015-03-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler-0.32.0.
+ * version.ac: Adjust.
+
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
+2015-02-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler-0.31.0.
+ * version.ac: Adjust.
+
2015-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.30.0.
diff --git a/source/libs/poppler/Makefile.am b/source/libs/poppler/Makefile.am
index 3951d2a00a715ae8b6cdbb18bfe53bf700ea8bb8..08659d33dfe0a4a79d6cd5013dccb31f0e182727 100644
--- a/source/libs/poppler/Makefile.am
+++ b/source/libs/poppler/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build poppler for TeX Live.
##
-## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,9 +14,9 @@ EXTRA_DIST = $(POPPLER_TREE)
##
EXTRA_DIST += $(POPPLER_TREE)-PATCHES
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include
diff --git a/source/libs/poppler/Makefile.in b/source/libs/poppler/Makefile.in
index 059a93b93bc805e2348a4dc7c5e74a589ce49d61..167d0fad5b9ef312f51548fdfc57aa197f02b2ca 100644
--- a/source/libs/poppler/Makefile.in
+++ b/source/libs/poppler/Makefile.in
@@ -269,13 +269,14 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/missing \
- $(top_srcdir)/poppler-0.30.0/poppler/poppler-config.h.in \
+ $(top_srcdir)/poppler-0.32.0/poppler/poppler-config.h.in \
../../build-aux/compile ../../build-aux/config.guess \
../../build-aux/config.sub ../../build-aux/depcomp \
../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -427,6 +428,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(POPPLER_TREE) $(POPPLER_TREE)-PATCHES
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
SUBDIRS = . include
GOO_SRC = $(top_srcdir)/$(POPPLER_TREE)/goo
FOFI_SRC = $(top_srcdir)/$(POPPLER_TREE)/fofi
@@ -541,7 +548,7 @@ all: config.h poppler-config.h
.SUFFIXES: .cc .cpp .o .obj
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -563,7 +570,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -590,7 +597,7 @@ poppler-config.h: stamp-h2
@test -f $@ || rm -f stamp-h2
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
-stamp-h2: $(top_srcdir)/poppler-0.30.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.32.0/poppler/poppler-config.h.in $(top_builddir)/config.status
@rm -f stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status poppler-config.h
@@ -1409,10 +1416,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libpoppler_a_OBJECTS): $(ZLIB_DEPEND)
diff --git a/source/libs/poppler/configure b/source/libs/poppler/configure
index 12f413b1e73316da2235f551599a2ed5c0ddde05..c9ec0cfea4796a0db696ec28f2a7d5f97753eab6 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.30.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.32.0.
#
# 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.30.0'
-PACKAGE_STRING='poppler (TeX Live) 0.30.0'
+PACKAGE_VERSION='0.32.0'
+PACKAGE_STRING='poppler (TeX Live) 0.32.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.30.0/poppler/Array.cc"
+ac_unique_file="poppler-0.32.0/poppler/Array.cc"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1306,7 +1306,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.30.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.32.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1373,7 +1373,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler (TeX Live) 0.30.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.32.0:";;
esac
cat <<\_ACEOF
@@ -1486,7 +1486,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.30.0
+poppler (TeX Live) configure 0.32.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2076,7 +2076,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.30.0, which was
+It was created by poppler (TeX Live) $as_me 0.32.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3999,7 +3999,7 @@ fi
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.30.0'
+ VERSION='0.32.0'
# Some tools Automake needs.
@@ -6573,12 +6573,12 @@ fi
ac_config_headers="$ac_config_headers config.h"
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.30.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.32.0/poppler/poppler-config.h.in"
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.30.0"
+#define POPPLER_VERSION "0.32.0"
_ACEOF
@@ -6712,7 +6712,7 @@ fi
$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-POPPLER_TREE=poppler-0.30.0
+POPPLER_TREE=poppler-0.32.0
ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7272,7 +7272,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.30.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.32.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7338,7 +7338,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.30.0
+poppler (TeX Live) config.status 0.32.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7469,7 +7469,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.30.0/poppler/poppler-config.h.in" ;;
+ "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.32.0/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/poppler-0.30.0-PATCHES/ChangeLog b/source/libs/poppler/poppler-0.32.0-PATCHES/ChangeLog
similarity index 95%
rename from source/libs/poppler/poppler-0.30.0-PATCHES/ChangeLog
rename to source/libs/poppler/poppler-0.32.0-PATCHES/ChangeLog
index 9e1c0a106200416a1dca7fab5cef90fe061c9f53..3c45002c302f95dbe9e5a988279eb06cc3de4406 100755
--- a/source/libs/poppler/poppler-0.30.0-PATCHES/ChangeLog
+++ b/source/libs/poppler/poppler-0.32.0-PATCHES/ChangeLog
@@ -1,3 +1,17 @@
+2015-03-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported poppler-0.32.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2015-02-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported poppler-0.31.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
2015-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported poppler-0.30.0 source tree from:
diff --git a/source/libs/poppler/poppler-0.30.0-PATCHES/TL-Changes b/source/libs/poppler/poppler-0.32.0-PATCHES/TL-Changes
similarity index 83%
rename from source/libs/poppler/poppler-0.30.0-PATCHES/TL-Changes
rename to source/libs/poppler/poppler-0.32.0-PATCHES/TL-Changes
index bf53ad987abd29459778699fde34901c8d4f6456..d1de678e4271558d32bffe590b9c61fec88f9413 100755
--- a/source/libs/poppler/poppler-0.30.0-PATCHES/TL-Changes
+++ b/source/libs/poppler/poppler-0.32.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.30.0 tree as obtained from:
+Changes applied to the poppler-0.32.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
diff --git a/source/libs/poppler/poppler-0.30.0-PATCHES/patch-02-LLONG_MAX b/source/libs/poppler/poppler-0.32.0-PATCHES/patch-02-LLONG_MAX
similarity index 76%
rename from source/libs/poppler/poppler-0.30.0-PATCHES/patch-02-LLONG_MAX
rename to source/libs/poppler/poppler-0.32.0-PATCHES/patch-02-LLONG_MAX
index 89a45ee3774a6d71868dc827aed86c9b0166e4cf..8885d67111a05ebb1ce722e692ea4a23d5fd3d47 100755
--- a/source/libs/poppler/poppler-0.30.0-PATCHES/patch-02-LLONG_MAX
+++ b/source/libs/poppler/poppler-0.32.0-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.30.0.orig/goo/GooString.h poppler-0.30.0/goo/GooString.h
---- poppler-0.30.0.orig/goo/GooString.h 2014-10-07 22:41:15.000000000 +0200
-+++ poppler-0.30.0/goo/GooString.h 2014-11-04 10:20:40.567904859 +0100
+diff -ur poppler-0.32.0.orig/goo/GooString.h poppler-0.32.0/goo/GooString.h
+--- poppler-0.32.0.orig/goo/GooString.h 2014-10-07 22:41:15.000000000 +0200
++++ poppler-0.32.0/goo/GooString.h 2014-11-04 10:20:40.567904859 +0100
@@ -34,6 +34,21 @@
#endif
diff --git a/source/libs/poppler/poppler-0.30.0/AUTHORS b/source/libs/poppler/poppler-0.32.0/AUTHORS
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/AUTHORS
rename to source/libs/poppler/poppler-0.32.0/AUTHORS
diff --git a/source/libs/poppler/poppler-0.30.0/CMakeLists.txt b/source/libs/poppler/poppler-0.32.0/CMakeLists.txt
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/CMakeLists.txt
rename to source/libs/poppler/poppler-0.32.0/CMakeLists.txt
index 5ed0b4490db214fb37ccc4aa8ef58a2e0d9234e5..301760cfd36a3ebb57f6105d4b6f1269b241b734 100755
--- a/source/libs/poppler/poppler-0.30.0/CMakeLists.txt
+++ b/source/libs/poppler/poppler-0.32.0/CMakeLists.txt
@@ -16,8 +16,13 @@ test_big_endian(WORDS_BIGENDIAN)
include(CheckFileOffsetBits)
CHECK_FILE_OFFSET_BITS()
+find_package (ECM 1.6.0 QUIET NO_MODULE)
+if (ECM_FOUND)
+ include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")
+endif()
+
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "30")
+set(POPPLER_MINOR_VERSION "32")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
@@ -469,7 +474,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 49.0.0 SOVERSION 49)
+set_target_properties(poppler PROPERTIES VERSION 51.0.0 SOVERSION 51)
target_link_libraries(poppler ${poppler_LIBS})
target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/source/libs/poppler/poppler-0.30.0/COPYING b/source/libs/poppler/poppler-0.32.0/COPYING
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/COPYING
rename to source/libs/poppler/poppler-0.32.0/COPYING
diff --git a/source/libs/poppler/poppler-0.30.0/ChangeLog b/source/libs/poppler/poppler-0.32.0/ChangeLog
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/ChangeLog
rename to source/libs/poppler/poppler-0.32.0/ChangeLog
index cccf0001f42179f9b7e0a6d6a06c9d77519c19b4..1aa1094897274de4ce5631421923f2f34c50541e 100755
--- a/source/libs/poppler/poppler-0.30.0/ChangeLog
+++ b/source/libs/poppler/poppler-0.32.0/ChangeLog
@@ -1,3 +1,447 @@
+commit d7cc90a8b60d7e353db6e0acdd0b789485e32972
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 7 15:04:52 2015 +0100
+
+ 0.32.0
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 16 ++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 7 files changed, 23 insertions(+), 7 deletions(-)
+
+commit c13297d154ded11721fe7d3abdba459ca628cef8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 7 14:58:10 2015 +0100
+
+ Update (C)
+
+ poppler/SecurityHandler.cc | 2 +-
+ poppler/SplashOutputDev.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c909964bff671d5ff0d8eee5f613ded4562f8afd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 7 14:54:43 2015 +0100
+
+ Do not assert on broken document
+
+ Bug #89422
+
+ poppler/SecurityHandler.cc | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+commit 3705fcee0309c50b5fecd563e8e466cbe2c5972b
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Fri Mar 6 15:19:58 2015 +0100
+
+ Fix Wrong colour shown when GouraudTriangleShFill uses a DeviceN
+ colorspace
+
+ Bug #89182
+
+ poppler/SplashOutputDev.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit b7fde1ec83a5fff9bec73becc22e581583a30d43
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 25 21:51:34 2015 +0100
+
+ Fix last commit regression
+
+ It seems it actually needs to be pipe->shape and not pipe->usesShape
+ (i.e. it seems at some point we use pipe->shape with useShape
+ being false)
+ Otherwise we had a regression on
+ eci_altona-test-suite-v2_technical2_x4.pdf
+
+ splash/Splash.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 7980fe868a8ef2ee3315f0bcb606c448d6604039
+Author: William Bader <williambader@hotmail.com>
+Date: Wed Feb 25 15:00:33 2015 +0100
+
+ Fix uninitialized variable in Splash::pipeRun
+
+ Use useShape is actually the guard for shape, so use it in the if
+
+ splash/Splash.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 57b6b78a0831fb31c06fd1bc6e9803de524f9d2d
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Tue Feb 24 23:34:57 2015 +0100
+
+ pdfseparate: use always an unique instance for PDFDoc for savePageAs
+
+ utils/pdfseparate.cc | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+commit 8a30d219df71ead323649ff0dfd4a724b5e7bd18
+Author: William Bader <williambader@hotmail.com>
+Date: Sat Feb 21 23:55:10 2015 +0100
+
+ Fix memcpy introduced in ec956ab8552dbe10fac4e649951042bddc424b7d
+
+ goo/GooString.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit ec956ab8552dbe10fac4e649951042bddc424b7d
+Author: William Bader <williambader@hotmail.com>
+Date: Tue Feb 17 22:55:14 2015 +0100
+
+ Reduce use of gmalloc() in GooString::appendfv()
+
+ Bug #89096
+
+ goo/GooString.cc | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+commit 132ef18324f62c1f2a08dcd794b379fadaa4daf5
+Author: Petr Gajdos <pgajdos@suse.cz>
+Date: Wed Feb 11 19:37:21 2015 +0100
+
+ Annot BG/BC: Empty Array means no color
+
+ poppler/Annot.cc | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+commit bf4aae25a244b1033a2479b9a8f633224f7d5de5
+Author: William Bader <williambader@hotmail.com>
+Date: Wed Feb 11 17:35:40 2015 +0100
+
+ Off by one fix to the previous crash fix
+
+ fofi/FoFiTrueType.cc | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+commit 97dd46bae5424818ca808c20506d7d96f7b85fb5
+Author: William Bader <williambader@hotmail.com>
+Date: Mon Feb 9 22:30:51 2015 +0100
+
+ pdftops: Add aaRaster and overprint to man file
+
+ utils/pdftops.1 | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+commit c114a90063d755639d2b0dbf816690a66b54bee0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 8 00:24:11 2015 +0100
+
+ Fix crash in fuzzed file from Bug #84988
+
+ poppler/TextOutputDev.cc | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 22895623e6cd2a5923f552421d44cc80cab77dd8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 7 22:28:21 2015 +0100
+
+ Fix malformed file crash from bug #86854
+
+ poppler/PSOutputDev.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cdb7ad95f7c8fbf63ade040d8a07ec96467042fc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 7 22:21:16 2015 +0100
+
+ Fix malformed file crash in bug #85243
+
+ fofi/FoFiTrueType.cc | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+commit 6641b935e1fc0c4151a723b6b476d987b8324ed2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 7 21:58:23 2015 +0100
+
+ If ECM is around include the sanitizers module
+
+ This way you can run
+ cmake -DECM_ENABLE_SANITIZERS='address'
+ and get an ASAN built poppler
+
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 92e41685dcef538a7fc669ca357ce9f448a8078e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 7 21:54:39 2015 +0100
+
+ Fix crash in malformed file from bug #85275
+
+ poppler/SplashOutputDev.cc | 4 ++--
+ splash/Splash.cc | 10 +++++++++-
+ splash/SplashBitmap.cc | 4 ++--
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+
+commit 9842b3b00492eda21297d5d65f769f77a565f6ac
+Author: Aleksei Volkov <Aleksei Volkov>
+Date: Sat Feb 7 20:46:26 2015 +0100
+
+ No need to check for hmtx, freetype does for us
+
+ Bug #88939
+
+ fofi/FoFiTrueType.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 4849eb43892640062c485e48ba7a29b5a0cc9587
+Author: William Bader <williambader@hotmail.com>
+Date: Sat Feb 7 16:41:53 2015 +0100
+
+ Make the colorpsace optimization and option and not the default
+
+ Bug #88971
+
+ poppler/PSOutputDev.cc | 25 ++++++++++++++++---------
+ poppler/PSOutputDev.h | 4 ++++
+ utils/pdftops.1 | 10 +++++++++-
+ utils/pdftops.cc | 4 ++++
+ 4 files changed, 33 insertions(+), 10 deletions(-)
+
+commit 8e16e423a718b92514885e771e31048f1ae2a766
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Feb 5 20:18:13 2015 +0100
+
+ 0.31.0
+
+ And copyright updating
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 17 +++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/CairoOutputDev.cc | 1 +
+ poppler/CairoOutputDev.h | 1 +
+ poppler/JBIG2Stream.cc | 1 +
+ poppler/JBIG2Stream.h | 1 +
+ poppler/Makefile.am | 2 +-
+ poppler/Stream.cc | 1 +
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
+ 16 files changed, 33 insertions(+), 11 deletions(-)
+
+commit f932315e559a7857d9c5642eb04efc0d2b717789
+Author: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+Date: Tue Jan 20 22:05:29 2015 +1030
+
+ cairo: support embedding JBIG2 image data
+
+ http://lists.freedesktop.org/archives/poppler/2014-December/011183.html
+
+ poppler/CairoOutputDev.cc | 117
+ ++++++++++++++++++++++++++++++++++++++--------
+ poppler/CairoOutputDev.h | 3 ++
+ poppler/JBIG2Stream.cc | 9 +++-
+ poppler/JBIG2Stream.h | 4 +-
+ poppler/Stream.cc | 13 +++++-
+ 5 files changed, 121 insertions(+), 25 deletions(-)
+
+commit 78abf540057181b708c546aee421f81a1dd58331
+Author: Adam Reichold <adamreichold@myopera.com>
+Date: Wed Jan 21 22:30:45 2015 +0100
+
+ Worlds -> Words
+
+ qt4/src/poppler-page.cc | 4 ++--
+ qt4/src/poppler-qt4.h | 2 +-
+ qt4/tests/check_search.cpp | 4 ++--
+ qt5/src/poppler-page.cc | 4 ++--
+ qt5/src/poppler-qt5.h | 2 +-
+ qt5/tests/check_search.cpp | 4 ++--
+ 6 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 027eac4e565576ca2e7042e21426e28abd775d98
+Author: Adam Reichold <adamreichold@myopera.com>
+Date: Tue Jan 20 00:09:09 2015 +0100
+
+ Expose whole-words search option in Qt frontends
+
+ qt4/src/poppler-page-private.h | 5 +-
+ qt4/src/poppler-page.cc | 114
+ +++++++++++++++++++++++++------------
+ qt4/src/poppler-qt4.h | 44 +++++++++++++-
+ qt4/tests/check_search.cpp | 112 +++++++++++++++++++++++++++++++-----
+ qt5/src/poppler-page-private.h | 5 +-
+ qt5/src/poppler-page.cc | 116
+ +++++++++++++++++++++++++------------
+ qt5/src/poppler-qt5.h | 46 +++++++++++++--
+ qt5/tests/check_search.cpp | 126
+ +++++++++++++++++++++++++++++++++--------
+ 8 files changed, 447 insertions(+), 121 deletions(-)
+
+commit 30a0baa353c374165e5f411efc4203746f14a74d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 18 15:39:53 2015 +0100
+
+ Move more variables from GlobalParams to PSOutputDev
+
+ poppler/CairoFontEngine.cc | 4 +-
+ poppler/GfxFont.cc | 15 ++---
+ poppler/GfxFont.h | 7 ++-
+ poppler/GlobalParams.cc | 144
+ ---------------------------------------------
+ poppler/GlobalParams.h | 28 ---------
+ poppler/PSOutputDev.cc | 121 +++++++++++++++++++------------------
+ poppler/PSOutputDev.h | 30 +++++++++-
+ poppler/SplashOutputDev.cc | 2 +-
+ qt4/src/ArthurOutputDev.cc | 4 +-
+ qt5/src/ArthurOutputDev.cc | 4 +-
+ utils/pdftops.cc | 36 ++++--------
+ 11 files changed, 116 insertions(+), 279 deletions(-)
+
+commit 8fed995c3457d64669ae12901450b7c811599dba
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 18 14:52:53 2015 +0100
+
+ Forgot to delete this in the previous commit
+
+ poppler/GlobalParams.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 4992ff7fa062462507733494827fdad7eaaa95b3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 18 13:57:36 2015 +0100
+
+ Move raster mono and resolution from GlobalParams to PSOutputDev
+
+ poppler/GlobalParams.cc | 32 --------------------------------
+ poppler/GlobalParams.h | 7 -------
+ poppler/PSOutputDev.cc | 18 +++++++-----------
+ poppler/PSOutputDev.h | 6 ++++++
+ utils/pdftops.cc | 7 ++++---
+ 5 files changed, 17 insertions(+), 53 deletions(-)
+
+commit 54908f675eda96c363528198e8c530921df2f45a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 18 13:34:45 2015 +0100
+
+ Move psUncompressPreloadedImages from GlobalParams to PSOutputDev
+
+ It belongs there and PSOutputDev is always created by the external
+ user
+ so in case someone wants to set it, it is the same amount of work
+ to set it in GlobalParams than in PSOutputDev
+
+ poppler/GlobalParams.cc | 16 ----------------
+ poppler/GlobalParams.h | 3 ---
+ poppler/PSOutputDev.cc | 9 +++++----
+ poppler/PSOutputDev.h | 2 ++
+ 4 files changed, 7 insertions(+), 23 deletions(-)
+
+commit 136d7aa5e79f153dfcb216c58598e33a8ff16630
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 18 13:28:26 2015 +0100
+
+ Remove declared but not defined function
+
+ poppler/GlobalParams.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit fdba9154d9a176759c765180805e608d4959c34e
+Author: Adam Reichold <adamreichold@myopera.com>
+Date: Fri Jan 16 19:57:59 2015 +0100
+
+ pdftoppm: parse the flags earlier and only once
+
+ utils/pdftoppm.cc | 42 +++++++++++++++---------------------------
+ 1 file changed, 15 insertions(+), 27 deletions(-)
+
+commit 6b072500b5ac936631be6b29b7d5a591848a18f3
+Author: William Bader <williambader@hotmail.com>
+Date: Wed Jan 14 23:28:03 2015 +0100
+
+ Add rasterization option to pdftops
+
+ Also removes GlobalParams stuff \o/
+
+ Coded in conjuntion with Albert
+
+ Bug #85934
+
+ cpp/poppler-page-renderer.cpp | 5 ++--
+ poppler/GlobalParams.cc | 58
+ ++-----------------------------------------
+ poppler/GlobalParams.h | 16 +++---------
+ poppler/PSOutputDev.cc | 14 +++++------
+ poppler/PSOutputDev.h | 5 +++-
+ poppler/SplashOutputDev.cc | 19 ++++++--------
+ poppler/SplashOutputDev.h | 11 +++++---
+ qt4/src/poppler-page.cc | 7 +++---
+ qt5/src/poppler-page.cc | 7 +++---
+ utils/pdftohtml.cc | 9 +++----
+ utils/pdftoppm.cc | 49 ++++++++++++++++++++++++++----------
+ utils/pdftops.cc | 14 ++++++++++-
+ 12 files changed, 96 insertions(+), 118 deletions(-)
+
+commit dc9751e6ac47a708ba6e7a68560bdce6a2e4a010
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jan 9 15:50:02 2015 +0100
+
+ Compile++
+
+ poppler/GfxState.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d91876a0c7a936b1f6f461d80131d7586a6c1a5e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 8 20:13:06 2015 +0100
+
+ Accept malformed documents whose root is a Page instead of a Pages
+
+ gs and Adobe Reader do it so it's "common" enough
+
+ Bug #88172
+
+ poppler/Catalog.cc | 37 ++++++++++++++++++++++++++++++++-----
+ 1 file changed, 32 insertions(+), 5 deletions(-)
+
+commit 7ce86b9be058408eb567d8d0b9747853a66c116f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 8 17:35:28 2015 +0100
+
+ Remove assert in gouraudFillTriangle
+
+ We don't *need* the assert, an error() is fine and the malformed
+ document
+ will just get rendered wrongly instead of "crashing"
+
+ Bugs #85274
+
+ poppler/Gfx.cc | 28 +++++++++++++++++-----------
+ 1 file changed, 17 insertions(+), 11 deletions(-)
+
+commit 9e9df4b20d17478996780008bc9802a857d173fc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 8 17:01:52 2015 +0100
+
+ Fix crash on broken document
+
+ Bug #85281
+
+ poppler/GfxState.cc | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+commit 636faafcb84b856580398f7883b6406d645c85d1
+Author: Adam Reichold <adamreichold@myopera.com>
+Date: Tue Jan 6 22:57:20 2015 +0100
+
+ JPEG2000Stream: Inline doGetChar and doLookChar
+
+ poppler/JPEG2000Stream.cc | 49
+ +++++++++++++++++++++++++----------------------
+ poppler/JPEG2000Stream.h | 7 ++-----
+ 2 files changed, 28 insertions(+), 28 deletions(-)
+
commit c13bffe92963c4969037695992f4c2776bbe973f
Author: Albert Astals Cid <aacid@kde.org>
Date: Sun Jan 4 23:17:42 2015 +0100
diff --git a/source/libs/poppler/poppler-0.30.0/ConfigureChecks.cmake b/source/libs/poppler/poppler-0.32.0/ConfigureChecks.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/ConfigureChecks.cmake
rename to source/libs/poppler/poppler-0.32.0/ConfigureChecks.cmake
diff --git a/source/libs/poppler/poppler-0.30.0/INSTALL b/source/libs/poppler/poppler-0.32.0/INSTALL
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/INSTALL
rename to source/libs/poppler/poppler-0.32.0/INSTALL
diff --git a/source/libs/poppler/poppler-0.30.0/Makefile.am b/source/libs/poppler/poppler-0.32.0/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/Makefile.am
rename to source/libs/poppler/poppler-0.32.0/Makefile.am
diff --git a/source/libs/poppler/poppler-0.30.0/NEWS b/source/libs/poppler/poppler-0.32.0/NEWS
similarity index 98%
rename from source/libs/poppler/poppler-0.30.0/NEWS
rename to source/libs/poppler/poppler-0.32.0/NEWS
index 2ff8e1797bceeb1f62a8217d143fa295815ac3b9..e83112497f054c1660fa0078611880b0624ed779 100755
--- a/source/libs/poppler/poppler-0.30.0/NEWS
+++ b/source/libs/poppler/poppler-0.32.0/NEWS
@@ -1,3 +1,36 @@
+Release 0.32.0
+ core:
+ * Annotations: Fix rendering of empty BG/BC arrays
+ * Splash: Fix wrong colour shown when GouraudTriangleShFill uses a DeviceN colorspace. Bug #89182
+ * Splash: Fix use of uninitialized variable in Splash::pipeRun
+ * Remove unnecesary check for font validity. Bug #88939
+ * Small optimization in GooString::appendfv(). Bug #89096
+ * Fix crashes in malformed files
+
+ utils:
+ * pdftops: Make colorpsace optimization an option instead of default
+ * pdfseparate: use always an unique instance for PDFDoc for savePageAs
+
+ build system:
+ * cmake: If extra-cmake-modules is around include the Sanitizers module
+
+Release 0.31.0
+ core:
+ * CairoOutputDev: support embedding JBIG2 image data
+ * Accept malformed documents whose root is a Page instead of a Pages. Bug #88172
+ * Fix crash on broken documents
+ * JPEG2000Stream: Inline doGetChar and doLookChar
+ * GlobalParams cleaning
+
+ utils:
+ * pdftops: Add rasterization option. Bug #85934
+
+ qt4:
+ * Expose whole-words search option
+
+ qt5:
+ * Expose whole-words search option
+
Release 0.30.0
core:
* Openjpeg2 support (openjpeg 1 is preferred). Bug #58906
diff --git a/source/libs/poppler/poppler-0.30.0/README b/source/libs/poppler/poppler-0.32.0/README
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/README
rename to source/libs/poppler/poppler-0.32.0/README
diff --git a/source/libs/poppler/poppler-0.30.0/README-XPDF b/source/libs/poppler/poppler-0.32.0/README-XPDF
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/README-XPDF
rename to source/libs/poppler/poppler-0.32.0/README-XPDF
diff --git a/source/libs/poppler/poppler-0.30.0/TODO b/source/libs/poppler/poppler-0.32.0/TODO
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/TODO
rename to source/libs/poppler/poppler-0.32.0/TODO
diff --git a/source/libs/poppler/poppler-0.30.0/config.h.cmake b/source/libs/poppler/poppler-0.32.0/config.h.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/config.h.cmake
rename to source/libs/poppler/poppler-0.32.0/config.h.cmake
diff --git a/source/libs/poppler/poppler-0.30.0/config.h.in b/source/libs/poppler/poppler-0.32.0/config.h.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/config.h.in
rename to source/libs/poppler/poppler-0.32.0/config.h.in
diff --git a/source/libs/poppler/poppler-0.30.0/configure.ac b/source/libs/poppler/poppler-0.32.0/configure.ac
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/configure.ac
rename to source/libs/poppler/poppler-0.32.0/configure.ac
index b6429cf8ba148f6fc424f06c2afb7b9679aed3b4..56a972e456bde98cdc0149070f49c43c01bc7651 100755
--- a/source/libs/poppler/poppler-0.30.0/configure.ac
+++ b/source/libs/poppler/poppler-0.32.0/configure.ac
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[30])
+m4_define([poppler_version_minor],[32])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.cc b/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.cc
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.cc
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.h b/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.h
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.h
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.cc b/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.cc
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.cc
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.h b/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.h
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.h
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.cc b/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.cc
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.cc
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.h b/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.h
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.h
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.cc b/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.cc
similarity index 98%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.cc
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.cc
index 4759186edfefe275b21071ac2956b5500b1a8650..11699dd61197d12dd7f10d395b7db356ebf86a65 100755
--- a/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.cc
+++ b/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.cc
@@ -16,11 +16,13 @@
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
// Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2008, 2009, 2012, 2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2009, 2012, 2014, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com>
// Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2014 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2015 Aleksei Volkov <Aleksei Volkov>
+// Copyright (C) 2015 William Bader <williambader@hotmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -38,6 +40,7 @@
#include <algorithm>
#include "goo/gtypes.h"
#include "goo/gmem.h"
+#include "goo/GooLikely.h"
#include "goo/GooString.h"
#include "goo/GooHash.h"
#include "FoFiType1C.h"
@@ -936,7 +939,7 @@ void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc,
GBool ok;
Guint checksum;
int nNewTables;
- int glyfTableLen, length, pos, glyfPos, i, j, k;
+ int glyfTableLen, length, pos, glyfPos, i, j, k, vmtxTabLength;
Guchar vheaTab[36] = {
0, 1, 0, 0, // table version number
0, 0, // ascent
@@ -1047,6 +1050,7 @@ void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc,
}
}
vmtxTab = NULL; // make gcc happy
+ vmtxTabLength = 0;
advance = 0; // make gcc happy
if (needVerticalMetrics) {
needVhea = seekTable("vhea") < 0;
@@ -1104,6 +1108,7 @@ void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc,
checksum = computeTableChecksum(vheaTab, length);
} else if (needVerticalMetrics && i == t42VmtxTable) {
length = 4 + (nGlyphs - 1) * 2;
+ vmtxTabLength = length;
vmtxTab = (Guchar *)gmalloc(length);
vmtxTab[0] = advance / 256;
vmtxTab[1] = advance % 256;
@@ -1218,8 +1223,16 @@ void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc,
dumpString(file + tables[j].offset, tables[j].len,
outputFunc, outputStream);
} else if (needVerticalMetrics && i == t42VheaTable) {
+ if (unlikely(length > (int)sizeof(vheaTab))) {
+ error(errSyntaxWarning, -1, "length bigger than vheaTab size");
+ length = sizeof(vheaTab);
+ }
dumpString(vheaTab, length, outputFunc, outputStream);
} else if (needVerticalMetrics && i == t42VmtxTable) {
+ if (unlikely(length > vmtxTabLength)) {
+ error(errSyntaxWarning, -1, "length bigger than vmtxTab size");
+ length = vmtxTabLength;
+ }
dumpString(vmtxTab, length, outputFunc, outputStream);
}
}
@@ -1366,7 +1379,6 @@ void FoFiTrueType::parse() {
if (seekTable("head") < 0 ||
seekTable("hhea") < 0 ||
seekTable("maxp") < 0 ||
- seekTable("hmtx") < 0 ||
(!openTypeCFF && seekTable("loca") < 0) ||
(!openTypeCFF && seekTable("glyf") < 0) ||
(openTypeCFF && seekTable("CFF ") < 0)) {
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.h b/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.h
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.h
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.cc b/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.cc
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.cc
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.h b/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.h
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.h
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.cc b/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.cc
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.cc
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.h b/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.h
rename to source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.h
diff --git a/source/libs/poppler/poppler-0.30.0/fofi/Makefile.am b/source/libs/poppler/poppler-0.32.0/fofi/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/fofi/Makefile.am
rename to source/libs/poppler/poppler-0.32.0/fofi/Makefile.am
diff --git a/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.cc b/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/FixedPoint.cc
rename to source/libs/poppler/poppler-0.32.0/goo/FixedPoint.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.h b/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/FixedPoint.h
rename to source/libs/poppler/poppler-0.32.0/goo/FixedPoint.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/GooHash.cc b/source/libs/poppler/poppler-0.32.0/goo/GooHash.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/GooHash.cc
rename to source/libs/poppler/poppler-0.32.0/goo/GooHash.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/GooHash.h b/source/libs/poppler/poppler-0.32.0/goo/GooHash.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/GooHash.h
rename to source/libs/poppler/poppler-0.32.0/goo/GooHash.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/GooLikely.h b/source/libs/poppler/poppler-0.32.0/goo/GooLikely.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/GooLikely.h
rename to source/libs/poppler/poppler-0.32.0/goo/GooLikely.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/GooList.cc b/source/libs/poppler/poppler-0.32.0/goo/GooList.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/GooList.cc
rename to source/libs/poppler/poppler-0.32.0/goo/GooList.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/GooList.h b/source/libs/poppler/poppler-0.32.0/goo/GooList.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/GooList.h
rename to source/libs/poppler/poppler-0.32.0/goo/GooList.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/GooMutex.h b/source/libs/poppler/poppler-0.32.0/goo/GooMutex.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/GooMutex.h
rename to source/libs/poppler/poppler-0.32.0/goo/GooMutex.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/GooString.cc b/source/libs/poppler/poppler-0.32.0/goo/GooString.cc
similarity index 97%
rename from source/libs/poppler/poppler-0.30.0/goo/GooString.cc
rename to source/libs/poppler/poppler-0.32.0/goo/GooString.cc
index 8591d95cd3e61fcb698dc362f4a96e83be7bfd24..3f22f3685601497e62100713a4bc32703841b997 100755
--- a/source/libs/poppler/poppler-0.30.0/goo/GooString.cc
+++ b/source/libs/poppler/poppler-0.32.0/goo/GooString.cc
@@ -24,6 +24,7 @@
// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2012 Pino Toscano <pino@kde.org>
// Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2015 William Bader <williambader@hotmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -320,10 +321,11 @@ GooString *GooString::appendfv(const char *fmt, va_list argList) {
int len, i;
const char *p0, *p1;
char *str;
+ GooStringFormatArg argsBuf[ 8 ];
argsLen = 0;
- argsSize = 8;
- args = (GooStringFormatArg *)gmallocn(argsSize, sizeof(GooStringFormatArg));
+ argsSize = sizeof(argsBuf) / sizeof(argsBuf[0]);
+ args = argsBuf;
p0 = fmt;
while (*p0) {
@@ -392,8 +394,13 @@ GooString *GooString::appendfv(const char *fmt, va_list argList) {
if (idx == argsLen) {
if (argsLen == argsSize) {
argsSize *= 2;
- args = (GooStringFormatArg *)greallocn(args, argsSize,
+ if (args == argsBuf) {
+ args = (GooStringFormatArg *)gmallocn(argsSize, sizeof(GooStringFormatArg));
+ memcpy(args, argsBuf, argsLen * sizeof(GooStringFormatArg));
+ } else {
+ args = (GooStringFormatArg *)greallocn(args, argsSize,
sizeof(GooStringFormatArg));
+ }
}
switch (ft) {
case fmtIntDecimal:
@@ -632,7 +639,10 @@ GooString *GooString::appendfv(const char *fmt, va_list argList) {
}
}
- gfree(args);
+ if (args != argsBuf) {
+ gfree(args);
+ }
+
return this;
}
diff --git a/source/libs/poppler/poppler-0.30.0/goo/GooString.h b/source/libs/poppler/poppler-0.32.0/goo/GooString.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/GooString.h
rename to source/libs/poppler/poppler-0.32.0/goo/GooString.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/GooTimer.cc b/source/libs/poppler/poppler-0.32.0/goo/GooTimer.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/GooTimer.cc
rename to source/libs/poppler/poppler-0.32.0/goo/GooTimer.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/GooTimer.h b/source/libs/poppler/poppler-0.32.0/goo/GooTimer.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/GooTimer.h
rename to source/libs/poppler/poppler-0.32.0/goo/GooTimer.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.cc b/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/ImgWriter.cc
rename to source/libs/poppler/poppler-0.32.0/goo/ImgWriter.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.h b/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/ImgWriter.h
rename to source/libs/poppler/poppler-0.32.0/goo/ImgWriter.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.cc b/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/JpegWriter.cc
rename to source/libs/poppler/poppler-0.32.0/goo/JpegWriter.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.h b/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/JpegWriter.h
rename to source/libs/poppler/poppler-0.32.0/goo/JpegWriter.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/Makefile.am b/source/libs/poppler/poppler-0.32.0/goo/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/Makefile.am
rename to source/libs/poppler/poppler-0.32.0/goo/Makefile.am
diff --git a/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.cc b/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.cc
rename to source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.h b/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.h
rename to source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.cc b/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/PNGWriter.cc
rename to source/libs/poppler/poppler-0.32.0/goo/PNGWriter.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.h b/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/PNGWriter.h
rename to source/libs/poppler/poppler-0.32.0/goo/PNGWriter.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.cc b/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/TiffWriter.cc
rename to source/libs/poppler/poppler-0.32.0/goo/TiffWriter.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.h b/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/TiffWriter.h
rename to source/libs/poppler/poppler-0.32.0/goo/TiffWriter.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/gfile.cc b/source/libs/poppler/poppler-0.32.0/goo/gfile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/gfile.cc
rename to source/libs/poppler/poppler-0.32.0/goo/gfile.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/gfile.h b/source/libs/poppler/poppler-0.32.0/goo/gfile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/gfile.h
rename to source/libs/poppler/poppler-0.32.0/goo/gfile.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/gmem.cc b/source/libs/poppler/poppler-0.32.0/goo/gmem.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/gmem.cc
rename to source/libs/poppler/poppler-0.32.0/goo/gmem.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/gmem.h b/source/libs/poppler/poppler-0.32.0/goo/gmem.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/gmem.h
rename to source/libs/poppler/poppler-0.32.0/goo/gmem.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/gmempp.cc b/source/libs/poppler/poppler-0.32.0/goo/gmempp.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/gmempp.cc
rename to source/libs/poppler/poppler-0.32.0/goo/gmempp.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/grandom.cc b/source/libs/poppler/poppler-0.32.0/goo/grandom.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/grandom.cc
rename to source/libs/poppler/poppler-0.32.0/goo/grandom.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/grandom.h b/source/libs/poppler/poppler-0.32.0/goo/grandom.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/grandom.h
rename to source/libs/poppler/poppler-0.32.0/goo/grandom.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/gstrtod.cc b/source/libs/poppler/poppler-0.32.0/goo/gstrtod.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/gstrtod.cc
rename to source/libs/poppler/poppler-0.32.0/goo/gstrtod.cc
diff --git a/source/libs/poppler/poppler-0.30.0/goo/gstrtod.h b/source/libs/poppler/poppler-0.32.0/goo/gstrtod.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/gstrtod.h
rename to source/libs/poppler/poppler-0.32.0/goo/gstrtod.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/gtypes.h b/source/libs/poppler/poppler-0.32.0/goo/gtypes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/gtypes.h
rename to source/libs/poppler/poppler-0.32.0/goo/gtypes.h
diff --git a/source/libs/poppler/poppler-0.30.0/goo/gtypes_p.h b/source/libs/poppler/poppler-0.32.0/goo/gtypes_p.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/goo/gtypes_p.h
rename to source/libs/poppler/poppler-0.32.0/goo/gtypes_p.h
diff --git a/source/libs/poppler/poppler-0.30.0/gtk-doc.make b/source/libs/poppler/poppler-0.32.0/gtk-doc.make
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/gtk-doc.make
rename to source/libs/poppler/poppler-0.32.0/gtk-doc.make
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-cairo-uninstalled.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-cairo-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-cairo-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-cairo-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.cmake b/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.cmake
rename to source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.cmake
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-cpp-uninstalled.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-cpp-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-cpp-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-cpp-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.cmake b/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.cmake
rename to source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.cmake
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-glib-uninstalled.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-glib-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-glib-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-glib-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.cmake b/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-glib.pc.cmake
rename to source/libs/poppler/poppler-0.32.0/poppler-glib.pc.cmake
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-glib.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-glib.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-qt4-uninstalled.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-qt4-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-qt4-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-qt4-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.cmake b/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.cmake
rename to source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.cmake
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-qt5-uninstalled.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-qt5-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-qt5-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-qt5-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.cmake b/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.cmake
rename to source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.cmake
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-splash-uninstalled.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-splash-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-splash-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-splash-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.cmake b/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-splash.pc.cmake
rename to source/libs/poppler/poppler-0.32.0/poppler-splash.pc.cmake
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-splash.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-splash.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler-uninstalled.pc.in b/source/libs/poppler/poppler-0.32.0/poppler-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler.pc.cmake b/source/libs/poppler/poppler-0.32.0/poppler.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler.pc.cmake
rename to source/libs/poppler/poppler-0.32.0/poppler.pc.cmake
diff --git a/source/libs/poppler/poppler-0.30.0/poppler.pc.in b/source/libs/poppler/poppler-0.32.0/poppler.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler.pc.in
rename to source/libs/poppler/poppler-0.32.0/poppler.pc.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Annot.cc b/source/libs/poppler/poppler-0.32.0/poppler/Annot.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/poppler/Annot.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Annot.cc
index d35cb9b2697943e51dc3c22276ea896ea6eb2f92..d7769a0f62796cec0ffb5689e9e1a4a713866b07 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/Annot.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/Annot.cc
@@ -32,6 +32,7 @@
// Copyright (C) 2014 Marek Kasik <mkasik@redhat.com>
// Copyright (C) 2014 Jiri Slaby <jirislaby@gmail.com>
// Copyright (C) 2014 Anuj Khare <khareanuj18@gmail.com>
+// Copyright (C) 2015 Petr Gajdos <pgajdos@suse.cz>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -1045,14 +1046,24 @@ AnnotAppearanceCharacs::AnnotAppearanceCharacs(Dict *dict) {
obj1.free();
if (dict->lookup("BC", &obj1)->isArray()) {
- borderColor = new AnnotColor(obj1.getArray());
+ Array *colorComponents = obj1.getArray();
+ if (colorComponents->getLength() > 0) {
+ borderColor = new AnnotColor(colorComponents);
+ } else {
+ borderColor = NULL;
+ }
} else {
borderColor = NULL;
}
obj1.free();
if (dict->lookup("BG", &obj1)->isArray()) {
- backColor = new AnnotColor(obj1.getArray());
+ Array *colorComponents = obj1.getArray();
+ if (colorComponents->getLength() > 0) {
+ backColor = new AnnotColor(colorComponents);
+ } else {
+ backColor = NULL;
+ }
} else {
backColor = NULL;
}
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Annot.h b/source/libs/poppler/poppler-0.32.0/poppler/Annot.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Annot.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Annot.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Array.cc b/source/libs/poppler/poppler-0.32.0/poppler/Array.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Array.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Array.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Array.h b/source/libs/poppler/poppler-0.32.0/poppler/Array.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Array.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Array.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.cc b/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.h b/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.h
rename to source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.cc b/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.h b/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.h
rename to source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CMap.cc b/source/libs/poppler/poppler-0.32.0/poppler/CMap.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CMap.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/CMap.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CMap.h b/source/libs/poppler/poppler-0.32.0/poppler/CMap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CMap.h
rename to source/libs/poppler/poppler-0.32.0/poppler/CMap.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.cc b/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CachedFile.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/CachedFile.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.h b/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CachedFile.h
rename to source/libs/poppler/poppler-0.32.0/poppler/CachedFile.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.cc b/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.cc
index 4cf8d6b41afd65100d622c8a533e4dff94cf7e1b..a5a3023208ac397b30b1defb1fdbb2f72ba50386 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.cc
@@ -17,7 +17,7 @@
// Copyright (C) 2005-2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
-// Copyright (C) 2005, 2009, 2012, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2009, 2012, 2013, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006, 2007, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
// Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
@@ -417,7 +417,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
ref = *gfxFont->getID();
fontType = gfxFont->getType();
- if (!(fontLoc = gfxFont->locateFont(xref, gFalse))) {
+ if (!(fontLoc = gfxFont->locateFont(xref, NULL))) {
error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->getCString()
: "(unnamed)");
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.h b/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.h
rename to source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.cc b/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.cc
similarity index 97%
rename from source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.cc
index 4e8abcfd94d94ff0aef937a564dee983fa71e8b2..a86ec120f20dcb3d54da0d8c2819aff36dc9b892 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.cc
@@ -28,6 +28,7 @@
// Copyright (C) 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2012 Patrick Pfeifer <p2000@mailinator.com>
// Copyright (C) 2012 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -63,6 +64,7 @@
#include "CairoFontEngine.h"
#include "CairoRescaleBox.h"
#include "UnicodeMap.h"
+#include "JBIG2Stream.h"
//------------------------------------------------------------------------
// #define LOG_CAIRO
@@ -2701,6 +2703,68 @@ static GBool colorMapHasIdentityDecodeMap(GfxImageColorMap *colorMap)
return gTrue;
}
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
+static cairo_status_t setMimeIdFromRef(cairo_surface_t *surface,
+ const char *mime_type,
+ const char *mime_id_prefix,
+ Ref ref)
+{
+ GooString *mime_id;
+ char *idBuffer;
+ cairo_status_t status;
+
+ mime_id = new GooString;
+
+ if (mime_id_prefix)
+ mime_id->append(mime_id_prefix);
+
+ mime_id->appendf("{0:d}-{1:d}", ref.gen, ref.num);
+
+ idBuffer = copyString(mime_id->getCString());
+ status = cairo_surface_set_mime_data (surface, mime_type,
+ (const unsigned char *)idBuffer,
+ mime_id->getLength(),
+ gfree, idBuffer);
+ delete mime_id;
+ if (status)
+ gfree (idBuffer);
+ return status;
+}
+#endif
+
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+GBool CairoOutputDev::setMimeDataForJBIG2Globals(Stream *str,
+ cairo_surface_t *image)
+{
+ JBIG2Stream *jb2Str = static_cast<JBIG2Stream *>(str);
+ Object* globalsStr = jb2Str->getGlobalsStream();
+ char *globalsBuffer;
+ int globalsLength;
+
+ // nothing to do for JBIG2 stream without Globals
+ if (!globalsStr->isStream())
+ return gTrue;
+
+ if (setMimeIdFromRef(image, CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID, NULL,
+ jb2Str->getGlobalsStreamRef()))
+ return gFalse;
+
+ if (!getStreamData(globalsStr->getStream(), &globalsBuffer, &globalsLength))
+ return gFalse;
+
+ if (cairo_surface_set_mime_data (image, CAIRO_MIME_TYPE_JBIG2_GLOBAL,
+ (const unsigned char*)globalsBuffer,
+ globalsLength,
+ gfree, (void*)globalsBuffer))
+ {
+ gfree (globalsBuffer);
+ return gFalse;
+ }
+
+ return gTrue;
+}
+#endif
+
void CairoOutputDev::setMimeData(GfxState *state, Stream *str, Object *ref,
GfxImageColorMap *colorMap, cairo_surface_t *image)
{
@@ -2708,17 +2772,35 @@ void CairoOutputDev::setMimeData(GfxState *state, Stream *str, Object *ref,
int len;
Object obj;
GfxColorSpace *colorSpace;
+ StreamKind strKind = str->getKind();
+ const char *mime_type;
- if (!printing || !(str->getKind() == strDCT || str->getKind() == strJPX))
+ if (!printing)
return;
+ switch (strKind) {
+ case strDCT:
+ mime_type = CAIRO_MIME_TYPE_JPEG;
+ break;
+ case strJPX:
+ mime_type = CAIRO_MIME_TYPE_JP2;
+ break;
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+ case strJBIG2:
+ mime_type = CAIRO_MIME_TYPE_JBIG2;
+ break;
+#endif
+ default:
+ return;
+ }
+
str->getDict()->lookup("ColorSpace", &obj);
colorSpace = GfxColorSpace::parse(NULL, &obj, this, state);
obj.free();
// colorspace in stream dict may be different from colorspace in jpx
// data
- if (str->getKind() == strJPX && colorSpace)
+ if (strKind == strJPX && colorSpace)
return;
// only embed mime data for gray, rgb, and cmyk colorspaces.
@@ -2746,31 +2828,27 @@ void CairoOutputDev::setMimeData(GfxState *state, Stream *str, Object *ref,
if (!colorMapHasIdentityDecodeMap(colorMap))
return;
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+ if (strKind == strJBIG2 && !setMimeDataForJBIG2Globals(str, image))
+ return;
+#endif
+
if (getStreamData (str->getNextStream(), &strBuffer, &len)) {
- cairo_status_t st;
+ cairo_status_t status = CAIRO_STATUS_SUCCESS;
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
if (ref && ref->isRef()) {
- Ref imgRef = ref->getRef();
- GooString *surfaceId = new GooString("poppler-surface-");
- surfaceId->appendf("{0:d}-{1:d}", imgRef.gen, imgRef.num);
- char *idBuffer = copyString(surfaceId->getCString());
- st = cairo_surface_set_mime_data (image, CAIRO_MIME_TYPE_UNIQUE_ID,
- (const unsigned char *)idBuffer,
- surfaceId->getLength(),
- gfree, idBuffer);
- if (st)
- gfree(idBuffer);
- delete surfaceId;
+ status = setMimeIdFromRef(image, CAIRO_MIME_TYPE_UNIQUE_ID,
+ "poppler-surface-", ref->getRef());
}
#endif
+ if (!status) {
+ status = cairo_surface_set_mime_data (image, mime_type,
+ (const unsigned char *)strBuffer, len,
+ gfree, strBuffer);
+ }
- st = cairo_surface_set_mime_data (image,
- str->getKind() == strDCT ?
- CAIRO_MIME_TYPE_JPEG : CAIRO_MIME_TYPE_JP2,
- (const unsigned char *)strBuffer, len,
- gfree, strBuffer);
- if (st)
+ if (status)
gfree (strBuffer);
}
}
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.h b/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.h
similarity index 98%
rename from source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.h
rename to source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.h
index 8de391ae72bd8ae72ad50407e70d62d198e83a5d..33dde0c570a2a1a7a15f35d0de5f621ae35798ab 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.h
+++ b/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.h
@@ -21,6 +21,7 @@
// Copyright (C) 2008, 2009, 2011-2014 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -280,6 +281,9 @@ protected:
GfxImageColorMap *colorMap, cairo_surface_t *image);
void fillToStrokePathClip(GfxState *state);
void alignStrokeCoords(GfxSubpath *subpath, int i, double *x, double *y);
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+ GBool setMimeDataForJBIG2Globals (Stream *str, cairo_surface_t *image);
+#endif
GfxRGB fill_color, stroke_color;
cairo_pattern_t *fill_pattern, *stroke_pattern;
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.cc b/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.h b/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.h
rename to source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Catalog.cc b/source/libs/poppler/poppler-0.32.0/poppler/Catalog.cc
similarity index 96%
rename from source/libs/poppler/poppler-0.30.0/poppler/Catalog.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Catalog.cc
index 039f63e18954b68bd3b7be8565732d47daf33215..f75f4e106f320dc9fdfde8c0d4b39984310fc80f 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/Catalog.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/Catalog.cc
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2013, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Jeff Muizelaar <jrmuizel@nit.ca>
// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
// Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
@@ -807,7 +807,6 @@ int Catalog::getNumPages()
return 0;
}
catDict.dictLookup("Pages", &pagesDict);
- catDict.free();
// This should really be isDict("Pages"), but I've seen at least one
// PDF file where the /Type entry is missing.
@@ -815,19 +814,47 @@ int Catalog::getNumPages()
error(errSyntaxError, -1, "Top-level pages object is wrong type ({0:s})",
pagesDict.getTypeName());
pagesDict.free();
+ catDict.free();
return 0;
}
pagesDict.dictLookup("Count", &obj);
// some PDF files actually use real numbers here ("/Count 9.0")
if (!obj.isNum()) {
- error(errSyntaxError, -1, "Page count in top-level pages object is wrong type ({0:s})",
- obj.getTypeName());
- numPages = 0;
+ if (pagesDict.dictIs("Page")) {
+ Object pageRootRef;
+ catDict.dictLookupNF("Pages", &pageRootRef);
+
+ error(errSyntaxError, -1, "Pages top-level is a single Page. The document is mal-formet, trying to recover...");
+
+ Dict *pageDict = pagesDict.getDict();
+ const Ref pageRef = pageRootRef.getRef();
+ Page *p = new Page(doc, 1, pageDict, pageRef, new PageAttrs(NULL, pageDict), form);
+ if (p->isOk()) {
+ pages = (Page **)gmallocn(1, sizeof(Page *));
+ pageRefs = (Ref *)gmallocn(1, sizeof(Ref));
+
+ pages[0] = p;
+ pageRefs[0].num = pageRef.num;
+ pageRefs[0].gen = pageRef.gen;
+
+ numPages = 1;
+ lastCachedPage = 1;
+ pagesSize = 1;
+ } else {
+ delete p;
+ numPages = 0;
+ }
+ } else {
+ error(errSyntaxError, -1, "Page count in top-level pages object is wrong type ({0:s})",
+ obj.getTypeName());
+ numPages = 0;
+ }
} else {
numPages = (int)obj.getNum();
}
+ catDict.free();
obj.free();
pagesDict.free();
}
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Catalog.h b/source/libs/poppler/poppler-0.32.0/poppler/Catalog.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Catalog.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Catalog.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.cc b/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.h b/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.h
rename to source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CharTypes.h b/source/libs/poppler/poppler-0.32.0/poppler/CharTypes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CharTypes.h
rename to source/libs/poppler/poppler-0.32.0/poppler/CharTypes.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CompactFontTables.h b/source/libs/poppler/poppler-0.32.0/poppler/CompactFontTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CompactFontTables.h
rename to source/libs/poppler/poppler-0.32.0/poppler/CompactFontTables.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.cc b/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.h b/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.h
rename to source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.cc b/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.h b/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.cc b/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/DCTStream.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/DCTStream.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.h b/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/DCTStream.h
rename to source/libs/poppler/poppler-0.32.0/poppler/DCTStream.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.cc b/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/DateInfo.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/DateInfo.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.h b/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/DateInfo.h
rename to source/libs/poppler/poppler-0.32.0/poppler/DateInfo.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.cc b/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Decrypt.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Decrypt.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.h b/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Decrypt.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Decrypt.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Dict.cc b/source/libs/poppler/poppler-0.32.0/poppler/Dict.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Dict.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Dict.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Dict.h b/source/libs/poppler/poppler-0.32.0/poppler/Dict.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Dict.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Dict.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Error.cc b/source/libs/poppler/poppler-0.32.0/poppler/Error.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Error.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Error.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Error.h b/source/libs/poppler/poppler-0.32.0/poppler/Error.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Error.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Error.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/ErrorCodes.h b/source/libs/poppler/poppler-0.32.0/poppler/ErrorCodes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/ErrorCodes.h
rename to source/libs/poppler/poppler-0.32.0/poppler/ErrorCodes.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.cc b/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/FileSpec.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/FileSpec.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.h b/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/FileSpec.h
rename to source/libs/poppler/poppler-0.32.0/poppler/FileSpec.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.cc b/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/FlateStream.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/FlateStream.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.h b/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/FlateStream.h
rename to source/libs/poppler/poppler-0.32.0/poppler/FlateStream.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.cc b/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.h b/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.h
rename to source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.cc b/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/FontInfo.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/FontInfo.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.h b/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/FontInfo.h
rename to source/libs/poppler/poppler-0.32.0/poppler/FontInfo.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Form.cc b/source/libs/poppler/poppler-0.32.0/poppler/Form.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Form.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Form.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Form.h b/source/libs/poppler/poppler-0.32.0/poppler/Form.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Form.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Form.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Function.cc b/source/libs/poppler/poppler-0.32.0/poppler/Function.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Function.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Function.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Function.h b/source/libs/poppler/poppler-0.32.0/poppler/Function.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Function.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Function.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Gfx.cc b/source/libs/poppler/poppler-0.32.0/poppler/Gfx.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/poppler/Gfx.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Gfx.cc
index 6ad1b2c2884a02af7136268c8e2e6b04f6e779eb..07d95b355a894caa514bc04f21f797f2f3438b9f 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/Gfx.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/Gfx.cc
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
-// Copyright (C) 2005-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2013, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Thorkild Stray <thorkild@ifi.uio.no>
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
@@ -3355,6 +3355,12 @@ void Gfx::doGouraudTriangleShFill(GfxGouraudTriangleShading *shading) {
delete reusablePath;
}
+static inline void checkTrue(bool b, const char *message) {
+ if (unlikely(!b)) {
+ error(errSyntaxError, -1, message);
+ }
+}
+
void Gfx::gouraudFillTriangle(double x0, double y0, GfxColor *color0,
double x1, double y1, GfxColor *color1,
double x2, double y2, GfxColor *color2,
@@ -3373,11 +3379,11 @@ void Gfx::gouraudFillTriangle(double x0, double y0, GfxColor *color0,
state->setFillColor(color0);
out->updateFillColor(state);
- path->reset(); assert(!path->isEnd());
- path->setCoord(x0,y0); path->next(); assert(!path->isEnd());
- path->setCoord(x1,y1); path->next(); assert(!path->isEnd());
- path->setCoord(x2,y2); path->next(); assert(!path->isEnd());
- path->setCoord(x0,y0); path->next(); assert( path->isEnd());
+ path->reset(); checkTrue(!path->isEnd(), "Path should not be at end");
+ path->setCoord(x0,y0); path->next(); checkTrue(!path->isEnd(), "Path should not be at end");
+ path->setCoord(x1,y1); path->next(); checkTrue(!path->isEnd(), "Path should not be at end");
+ path->setCoord(x2,y2); path->next(); checkTrue(!path->isEnd(), "Path should not be at end");
+ path->setCoord(x0,y0); path->next(); checkTrue( path->isEnd(), "Path should be at end");
out->fill(state);
} else {
@@ -3420,11 +3426,11 @@ void Gfx::gouraudFillTriangle(double x0, double y0, double color0,
state->setFillColor(&color);
out->updateFillColor(state);
- path->reset(); assert(!path->isEnd());
- path->setCoord(x0,y0); path->next(); assert(!path->isEnd());
- path->setCoord(x1,y1); path->next(); assert(!path->isEnd());
- path->setCoord(x2,y2); path->next(); assert(!path->isEnd());
- path->setCoord(x0,y0); path->next(); assert( path->isEnd());
+ path->reset(); checkTrue(!path->isEnd(), "Path should not be at end");
+ path->setCoord(x0,y0); path->next(); checkTrue(!path->isEnd(), "Path should not be at end");
+ path->setCoord(x1,y1); path->next(); checkTrue(!path->isEnd(), "Path should not be at end");
+ path->setCoord(x2,y2); path->next(); checkTrue(!path->isEnd(), "Path should not be at end");
+ path->setCoord(x0,y0); path->next(); checkTrue( path->isEnd(), "Path should be at end");
out->fill(state);
} else {
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Gfx.h b/source/libs/poppler/poppler-0.32.0/poppler/Gfx.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Gfx.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Gfx.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.cc b/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/poppler/GfxFont.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/GfxFont.cc
index 39f026ad6d4e5f385064ea7c7660593f92453bfc..3e9b7db4248f0647c8c17710f0dd62e01f9ee1d0 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.cc
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2005, 2006, 2008-2010, 2012, 2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2006, 2008-2010, 2012, 2014, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
@@ -66,6 +66,7 @@
#include <fofi/FoFiType1C.h>
#include <fofi/FoFiTrueType.h>
#include "GfxFont.h"
+#include "PSOutputDev.h"
//------------------------------------------------------------------------
@@ -610,7 +611,7 @@ CharCodeToUnicode *GfxFont::readToUnicodeCMap(Dict *fontDict, int nBits,
return ctu;
}
-GfxFontLoc *GfxFont::locateFont(XRef *xref, GBool ps) {
+GfxFontLoc *GfxFont::locateFont(XRef *xref, PSOutputDev *ps) {
GfxFontLoc *fontLoc;
SysFontType sysFontType;
GooString *path, *base14Name, *substName;
@@ -640,19 +641,19 @@ GfxFontLoc *GfxFont::locateFont(XRef *xref, GBool ps) {
case fontType1:
case fontType1C:
case fontType1COT:
- embed = globalParams->getPSEmbedType1();
+ embed = ps->getEmbedType1();
break;
case fontTrueType:
case fontTrueTypeOT:
- embed = globalParams->getPSEmbedTrueType();
+ embed = ps->getEmbedTrueType();
break;
case fontCIDType0C:
case fontCIDType0COT:
- embed = globalParams->getPSEmbedCIDPostScript();
+ embed = ps->getEmbedCIDPostScript();
break;
case fontCIDType2:
case fontCIDType2OT:
- embed = globalParams->getPSEmbedCIDTrueType();
+ embed = ps->getEmbedCIDTrueType();
break;
default:
break;
@@ -669,7 +670,7 @@ GfxFontLoc *GfxFont::locateFont(XRef *xref, GBool ps) {
}
//----- PS passthrough
- if (ps && !isCIDFont() && globalParams->getPSFontPassthrough()) {
+ if (ps && !isCIDFont() && ps->getFontPassthrough()) {
fontLoc = new GfxFontLoc();
fontLoc->locType = gfxFontLocResident;
fontLoc->fontType = fontType1;
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.h b/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.h
similarity index 98%
rename from source/libs/poppler/poppler-0.30.0/poppler/GfxFont.h
rename to source/libs/poppler/poppler-0.32.0/poppler/GfxFont.h
index 1be897503491d47ac19fb5181107cc74d69aeb11..1f01cc7571c0bec705f71cbdacdb3ab3c60b0c91 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.h
+++ b/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.h
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2005, 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2008, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
@@ -43,6 +43,7 @@ class Dict;
class CMap;
class CharCodeToUnicode;
class FoFiTrueType;
+class PSOutputDev;
struct GfxFontCIDWidths;
struct Base14FontMapEntry;
@@ -237,9 +238,9 @@ public:
// Return the writing mode (0=horizontal, 1=vertical).
virtual int getWMode() { return 0; }
- // Locate the font file for this font. If <ps> is true, includes PS
+ // Locate the font file for this font. If <ps> is not null, includes PS
// printer-resident fonts. Returns NULL on failure.
- GfxFontLoc *locateFont(XRef *xref, GBool ps);
+ GfxFontLoc *locateFont(XRef *xref, PSOutputDev *ps);
// Locate a Base-14 font file for a specified font name.
static GfxFontLoc *locateBase14Font(GooString *base14Name);
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/GfxState.cc b/source/libs/poppler/poppler-0.32.0/poppler/GfxState.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/poppler/GfxState.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/GfxState.cc
index 359c0d693ae3439940cca24b3bf3d17b78d2672a..3e9cac415347160fd34227cf2c2c5dddd8b201fd 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/GfxState.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/GfxState.cc
@@ -16,7 +16,7 @@
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2006-2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009, 2012 Koji Otani <sho@bbr.jp>
// Copyright (C) 2009, 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Christian Persch <chpe@gnome.org>
@@ -3048,8 +3048,12 @@ GfxColorSpace *GfxDeviceNColorSpace::copy() {
int *mappingA = NULL;
GooList *sepsCSA = new GooList(sepsCS->getLength());
- for (i = 0; i < sepsCS->getLength(); i++)
- sepsCSA->append(((GfxSeparationColorSpace *) sepsCS->get(i))->copy());
+ for (i = 0; i < sepsCS->getLength(); i++) {
+ GfxSeparationColorSpace *scs = (GfxSeparationColorSpace *) sepsCS->get(i);
+ if (likely(scs != NULL)) {
+ sepsCSA->append(scs->copy());
+ }
+ }
if (mapping != NULL) {
mappingA = (int *)gmalloc(sizeof(int) * nComps);
for (i = 0; i < nComps; i++)
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/GfxState.h b/source/libs/poppler/poppler-0.32.0/poppler/GfxState.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/GfxState.h
rename to source/libs/poppler/poppler-0.32.0/poppler/GfxState.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/GfxState_helpers.h b/source/libs/poppler/poppler-0.32.0/poppler/GfxState_helpers.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/GfxState_helpers.h
rename to source/libs/poppler/poppler-0.32.0/poppler/GfxState_helpers.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.cc b/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.cc
similarity index 91%
rename from source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.cc
index 3d88646f7b385d1a00bb3851d674d279478468bc..7e110d05b15cb4788533290bc9f39b105a7602a2 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.cc
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005, 2007-2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007-2010, 2012, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
@@ -23,7 +23,7 @@
// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2007, 2009 Jonathan Kew <jonathan_kew@sil.org>
// Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2009, 2011, 2012 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011, 2012, 2015 William Bader <williambader@hotmail.com>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
// Copyright (C) 2010, 2012 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de>
@@ -597,18 +597,6 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
psResidentFonts = new GooHash(gTrue);
psResidentFonts16 = new GooList();
psResidentFontsCC = new GooList();
- psEmbedType1 = gTrue;
- psEmbedTrueType = gTrue;
- psEmbedCIDPostScript = gTrue;
- psEmbedCIDTrueType = gTrue;
- psFontPassthrough = gFalse;
- psPreload = gFalse;
- psOPI = gFalse;
- psASCIIHex = gFalse;
- psBinary = gFalse;
- psUncompressPreloadedImages = gFalse;
- psRasterResolution = 300;
- psRasterMono = gFalse;
textEncoding = new GooString("UTF-8");
#if defined(_WIN32)
textEOL = eolDOS;
@@ -620,9 +608,6 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
textPageBreaks = gTrue;
textKeepTinyChars = gFalse;
enableFreeType = gTrue;
- antialias = gTrue;
- vectorAntialias = gTrue;
- antialiasPrinting = gFalse;
strokeAdjust = gTrue;
screenType = screenUnset;
screenSize = -1;
@@ -1548,114 +1533,6 @@ PSFontParam16 *GlobalParams::getPSResidentFontCC(GooString *collection,
return p;
}
-GBool GlobalParams::getPSEmbedType1() {
- GBool e;
-
- lockGlobalParams;
- e = psEmbedType1;
- unlockGlobalParams;
- return e;
-}
-
-GBool GlobalParams::getPSEmbedTrueType() {
- GBool e;
-
- lockGlobalParams;
- e = psEmbedTrueType;
- unlockGlobalParams;
- return e;
-}
-
-GBool GlobalParams::getPSEmbedCIDPostScript() {
- GBool e;
-
- lockGlobalParams;
- e = psEmbedCIDPostScript;
- unlockGlobalParams;
- return e;
-}
-
-GBool GlobalParams::getPSEmbedCIDTrueType() {
- GBool e;
-
- lockGlobalParams;
- e = psEmbedCIDTrueType;
- unlockGlobalParams;
- return e;
-}
-
-GBool GlobalParams::getPSFontPassthrough() {
- GBool e;
-
- lockGlobalParams;
- e = psFontPassthrough;
- unlockGlobalParams;
- return e;
-}
-
-GBool GlobalParams::getPSPreload() {
- GBool preload;
-
- lockGlobalParams;
- preload = psPreload;
- unlockGlobalParams;
- return preload;
-}
-
-GBool GlobalParams::getPSOPI() {
- GBool opi;
-
- lockGlobalParams;
- opi = psOPI;
- unlockGlobalParams;
- return opi;
-}
-
-GBool GlobalParams::getPSASCIIHex() {
- GBool ah;
-
- lockGlobalParams;
- ah = psASCIIHex;
- unlockGlobalParams;
- return ah;
-}
-
-GBool GlobalParams::getPSBinary() {
- GBool binary;
-
- lockGlobalParams;
- binary = psBinary;
- unlockGlobalParams;
- return binary;
-}
-
-GBool GlobalParams::getPSUncompressPreloadedImages() {
- GBool ah;
-
- lockGlobalParams;
- ah = psUncompressPreloadedImages;
- unlockGlobalParams;
- return ah;
-}
-
-double GlobalParams::getPSRasterResolution() {
- double res;
-
- lockGlobalParams;
- res = psRasterResolution;
- unlockGlobalParams;
- return res;
-}
-
-GBool GlobalParams::getPSRasterMono() {
- GBool mono;
-
- lockGlobalParams;
- mono = psRasterMono;
- unlockGlobalParams;
- return mono;
-}
-
GooString *GlobalParams::getTextEncodingName() {
GooString *s;
@@ -1701,33 +1578,6 @@ GBool GlobalParams::getEnableFreeType() {
return f;
}
-GBool GlobalParams::getAntialias() {
- GBool f;
-
- lockGlobalParams;
- f = antialias;
- unlockGlobalParams;
- return f;
-}
-
-GBool GlobalParams::getVectorAntialias() {
- GBool f;
-
- lockGlobalParams;
- f = vectorAntialias;
- unlockGlobalParams;
- return f;
-}
-
-GBool GlobalParams::getAntialiasPrinting() {
- GBool f;
-
- lockGlobalParams;
- f = antialiasPrinting;
- unlockGlobalParams;
- return f;
-}
-
GBool GlobalParams::getStrokeAdjust() {
GBool f;
@@ -1973,78 +1823,6 @@ void GlobalParams::setPSLevel(PSLevel level) {
unlockGlobalParams;
}
-void GlobalParams::setPSEmbedType1(GBool embed) {
- lockGlobalParams;
- psEmbedType1 = embed;
- unlockGlobalParams;
-}
-
-void GlobalParams::setPSEmbedTrueType(GBool embed) {
- lockGlobalParams;
- psEmbedTrueType = embed;
- unlockGlobalParams;
-}
-
-void GlobalParams::setPSEmbedCIDPostScript(GBool embed) {
- lockGlobalParams;
- psEmbedCIDPostScript = embed;
- unlockGlobalParams;
-}
-
-void GlobalParams::setPSEmbedCIDTrueType(GBool embed) {
- lockGlobalParams;
- psEmbedCIDTrueType = embed;
- unlockGlobalParams;
-}
-
-void GlobalParams::setPSFontPassthrough(GBool passthrough) {
- lockGlobalParams;
- psFontPassthrough = passthrough;
- unlockGlobalParams;
-}
-
-void GlobalParams::setPSPreload(GBool preload) {
- lockGlobalParams;
- psPreload = preload;
- unlockGlobalParams;
-}
-
-void GlobalParams::setPSOPI(GBool opi) {
- lockGlobalParams;
- psOPI = opi;
- unlockGlobalParams;
-}
-
-void GlobalParams::setPSASCIIHex(GBool hex) {
- lockGlobalParams;
- psASCIIHex = hex;
- unlockGlobalParams;
-}
-
-void GlobalParams::setPSBinary(GBool binary) {
- lockGlobalParams;
- psBinary = binary;
- unlockGlobalParams;
-}
-
-void GlobalParams::setPSUncompressPreloadedImages(GBool uncomp) {
- lockGlobalParams;
- psUncompressPreloadedImages = uncomp;
- unlockGlobalParams;
-}
-
-void GlobalParams::setPSRasterResolution(double res) {
- lockGlobalParams;
- psRasterResolution = res;
- unlockGlobalParams;
-}
-
-void GlobalParams::setPSRasterMono(GBool mono) {
- lockGlobalParams;
- psRasterMono = mono;
- unlockGlobalParams;
-}
-
void GlobalParams::setTextEncoding(char *encodingName) {
lockGlobalParams;
delete textEncoding;
@@ -2098,30 +1876,6 @@ GBool GlobalParams::setDisableFreeTypeHinting(char *s) {
return ok;
}
-GBool GlobalParams::setAntialias(char *s) {
- GBool ok;
-
- lockGlobalParams;
- ok = parseYesNo2(s, &antialias);
- unlockGlobalParams;
- return ok;
-}
-
-GBool GlobalParams::setVectorAntialias(char *s) {
- GBool ok;
-
- lockGlobalParams;
- ok = parseYesNo2(s, &vectorAntialias);
- unlockGlobalParams;
- return ok;
-}
-
-void GlobalParams::setAntialiasPrinting(GBool anti) {
- lockGlobalParams;
- antialiasPrinting = anti;
- unlockGlobalParams;
-}
-
void GlobalParams::setStrokeAdjust(GBool adjust)
{
lockGlobalParams;
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.h b/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.h
similarity index 83%
rename from source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.h
rename to source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.h
index c33a8024c04000b2c89b1cd2656bdd17f0c2ca11..16d615ae6d99b408ce257b348d32fc082cbb751e 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.h
+++ b/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.h
@@ -13,14 +13,14 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2005, 2007-2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007-2010, 2012, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2009 Jonathan Kew <jonathan_kew@sil.org>
// Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2009, 2011, 2012 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011, 2012, 2014, 2015 William Bader <williambader@hotmail.com>
// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2011 Pino Toscano <pino@kde.org>
// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
@@ -166,26 +166,11 @@ public:
GooList *getPSResidentFonts();
PSFontParam16 *getPSResidentFont16(GooString *fontName, int wMode);
PSFontParam16 *getPSResidentFontCC(GooString *collection, int wMode);
- GBool getPSEmbedType1();
- GBool getPSEmbedTrueType();
- GBool getPSEmbedCIDPostScript();
- GBool getPSEmbedCIDTrueType();
- GBool getPSFontPassthrough();
- GBool getPSPreload();
- GBool getPSOPI();
- GBool getPSASCIIHex();
- GBool getPSBinary();
- GBool getPSUncompressPreloadedImages();
- double getPSRasterResolution();
- GBool getPSRasterMono();
GooString *getTextEncodingName();
EndOfLineKind getTextEOL();
GBool getTextPageBreaks();
GBool getTextKeepTinyChars();
GBool getEnableFreeType();
- GBool getAntialias();
- GBool getVectorAntialias();
- GBool getAntialiasPrinting();
GBool getStrokeAdjust();
ScreenType getScreenType();
int getScreenSize();
@@ -200,7 +185,6 @@ public:
GBool getPrintCommands();
GBool getProfileCommands();
GBool getErrQuiet();
- double getSplashResolution();
CharCodeToUnicode *getCIDToUnicode(GooString *collection);
CharCodeToUnicode *getUnicodeToUnicode(GooString *fontName);
@@ -220,27 +204,12 @@ public:
void setPSShrinkLarger(GBool shrink);
void setPSCenter(GBool center);
void setPSLevel(PSLevel level);
- void setPSEmbedType1(GBool embed);
- void setPSEmbedTrueType(GBool embed);
- void setPSEmbedCIDPostScript(GBool embed);
- void setPSEmbedCIDTrueType(GBool embed);
- void setPSFontPassthrough(GBool passthrough);
- void setPSPreload(GBool preload);
- void setPSOPI(GBool opi);
- void setPSASCIIHex(GBool hex);
- void setPSBinary(GBool binary);
- void setPSUncompressPreloadedImages(GBool uncomp);
- void setPSRasterResolution(double res);
- void setPSRasterMono(GBool mono);
void setTextEncoding(char *encodingName);
GBool setTextEOL(char *s);
void setTextPageBreaks(GBool pageBreaks);
void setTextKeepTinyChars(GBool keep);
GBool setEnableFreeType(char *s);
GBool setDisableFreeTypeHinting(char *s);
- GBool setAntialias(char *s);
- GBool setVectorAntialias(char *s);
- void setAntialiasPrinting(GBool print);
void setStrokeAdjust(GBool strokeAdjust);
void setScreenType(ScreenType st);
void setScreenSize(int size);
@@ -256,6 +225,8 @@ public:
void setProfileCommands(GBool profileCommandsA);
void setErrQuiet(GBool errQuietA);
+ static GBool parseYesNo2(const char *token, GBool *flag);
+
//----- security handlers
void addSecurityHandler(XpdfSecurityHandler *handler);
@@ -264,7 +235,6 @@ public:
private:
void parseNameToUnicode(GooString *name);
- GBool parseYesNo2(const char *token, GBool *flag);
UnicodeMap *getUnicodeMap2(GooString *encodingName);
void scanEncodingDirs();
@@ -319,21 +289,6 @@ private:
GooList *psResidentFontsCC; // 16-bit character collection fonts
// resident in printer: collection name
// mapped to font info [PSFontParam16]
- GBool psEmbedType1; // embed Type 1 fonts?
- GBool psEmbedTrueType; // embed TrueType fonts?
- GBool psEmbedCIDPostScript; // embed CID PostScript fonts?
- GBool psEmbedCIDTrueType; // embed CID TrueType fonts?
- GBool psFontPassthrough; // pass all fonts through as-is?
- GBool psPreload; // preload PostScript images and forms into
- // memory
- GBool psOPI; // generate PostScript OPI comments?
- GBool psASCIIHex; // use ASCIIHex instead of ASCII85?
- GBool psBinary; // use binary instead of hex
- GBool psUncompressPreloadedImages; // uncompress all preloaded images
- double psRasterResolution; // PostScript rasterization resolution (dpi)
- GBool psRasterMono; // true to do PostScript rasterization
- // in monochrome (gray); false to do it
- // in color (RGB/CMYK)
GooString *textEncoding; // encoding (unicodeMap) to use for text
// output
EndOfLineKind textEOL; // type of EOL marker to use for text
@@ -342,9 +297,6 @@ private:
GBool textKeepTinyChars; // keep all characters in text output
GBool enableFreeType; // FreeType enable flag
GBool disableFreeTypeHinting; // FreeType disable hinting flag
- GBool antialias; // anti-aliasing enable flag
- GBool vectorAntialias; // vector anti-aliasing enable flag
- GBool antialiasPrinting; // allow anti-aliasing when printing
GBool strokeAdjust; // stroke adjustment enable flag
ScreenType screenType; // halftone screen type
int screenSize; // screen matrix size
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/GlobalParamsWin.cc b/source/libs/poppler/poppler-0.32.0/poppler/GlobalParamsWin.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/GlobalParamsWin.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/GlobalParamsWin.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Hints.cc b/source/libs/poppler/poppler-0.32.0/poppler/Hints.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Hints.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Hints.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Hints.h b/source/libs/poppler/poppler-0.32.0/poppler/Hints.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Hints.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Hints.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.cc b/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.h b/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.h
rename to source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.cc b/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.cc
index 0695dc5da0e2bd16e74b66f3039076d742ee3da4..66c1d2505e8b6a37fb7bb2a03b40b466111dbd35 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.cc
@@ -22,6 +22,7 @@
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2013, 2014 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -1168,7 +1169,7 @@ JBIG2CodeTable::~JBIG2CodeTable() {
// JBIG2Stream
//------------------------------------------------------------------------
-JBIG2Stream::JBIG2Stream(Stream *strA, Object *globalsStreamA):
+JBIG2Stream::JBIG2Stream(Stream *strA, Object *globalsStreamA, Object *globalsStreamRefA):
FilterStream(strA)
{
pageBitmap = NULL;
@@ -1193,7 +1194,12 @@ JBIG2Stream::JBIG2Stream(Stream *strA, Object *globalsStreamA):
huffDecoder = new JBIG2HuffmanDecoder();
mmrDecoder = new JBIG2MMRDecoder();
- globalsStreamA->copy(&globalsStream);
+ if (globalsStreamA->isStream()) {
+ globalsStreamA->copy(&globalsStream);
+ if (globalsStreamRefA->isRef())
+ globalsStreamRef = globalsStreamRefA->getRef();
+ }
+
segments = globalSegments = NULL;
curStr = NULL;
dataPtr = dataEnd = NULL;
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.h b/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.h
similarity index 95%
rename from source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.h
rename to source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.h
index 0ee2518575c223f6f6683cdf683bef26caa8e612..1e14c5cf78334066f62838bde85edef1a7668b37 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.h
+++ b/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.h
@@ -15,6 +15,7 @@
//
// Copyright (C) 2009 David Benjamin <davidben@mit.edu>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -46,7 +47,7 @@ class JBIG2MMRDecoder;
class JBIG2Stream: public FilterStream {
public:
- JBIG2Stream(Stream *strA, Object *globalsStreamA);
+ JBIG2Stream(Stream *strA, Object *globalsStreamA, Object *globalsStreamRefA);
virtual ~JBIG2Stream();
virtual StreamKind getKind() { return strJBIG2; }
virtual void reset();
@@ -57,6 +58,7 @@ public:
virtual GooString *getPSFilter(int psLevel, const char *indent);
virtual GBool isBinary(GBool last = gTrue);
virtual Object *getGlobalsStream() { return &globalsStream; }
+ virtual Ref getGlobalsStreamRef() { return globalsStreamRef; }
private:
virtual GBool hasGetChars() { return true; }
@@ -132,6 +134,7 @@ private:
GBool readLong(int *x);
Object globalsStream;
+ Ref globalsStreamRef;
Guint pageW, pageH, curPageH;
Guint pageDefPixel;
JBIG2Bitmap *pageBitmap;
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc b/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.cc
similarity index 95%
rename from source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.cc
index 2d48899904e5f656fdad5af1d9cb3717ea669192..35e98b86ebce67fc0d0097a167f61c4c1954bec5 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.cc
@@ -7,7 +7,8 @@
// Copyright 2008-2010, 2012 Albert Astals Cid <aacid@kde.org>
// Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
// Copyright 2014 Thomas Freitag <Thomas.Freitag@alfa.de>
-// Copyright 2013,2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2013, 2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2015 Adam Reichold <adam.reichold@t-online.de>
//
// Licensed under GPLv2 or later
//
@@ -49,6 +50,22 @@ struct JPXStreamPrivate {
#endif
};
+static inline int doLookChar(JPXStreamPrivate* priv) {
+ if (unlikely(priv->counter >= priv->npixels))
+ return EOF;
+
+ return ((unsigned char *)priv->image->comps[priv->ccounter].data)[priv->counter];
+}
+
+static inline int doGetChar(JPXStreamPrivate* priv) {
+ const int result = doLookChar(priv);
+ if (++priv->ccounter == priv->ncomps) {
+ priv->ccounter = 0;
+ ++priv->counter;
+ }
+ return result;
+}
+
JPXStream::JPXStream(Stream *strA) : FilterStream(strA) {
priv = new JPXStreamPrivate;
priv->inited = gFalse;
@@ -91,8 +108,10 @@ Goffset JPXStream::getPos() {
}
int JPXStream::getChars(int nChars, Guchar *buffer) {
+ if (unlikely(priv->inited == gFalse)) { init(); }
+
for (int i = 0; i < nChars; ++i) {
- const int c = doGetChar();
+ const int c = doGetChar(priv);
if (likely(c != EOF)) buffer[i] = c;
else return i;
}
@@ -100,30 +119,15 @@ int JPXStream::getChars(int nChars, Guchar *buffer) {
}
int JPXStream::getChar() {
- return doGetChar();
-}
+ if (unlikely(priv->inited == gFalse)) { init(); }
-int JPXStream::doLookChar() {
- if (unlikely(priv->inited == gFalse))
- init();
-
- if (unlikely(priv->counter >= priv->npixels))
- return EOF;
-
- return ((unsigned char *)priv->image->comps[priv->ccounter].data)[priv->counter];
+ return doGetChar(priv);
}
int JPXStream::lookChar() {
- return doLookChar();
-}
+ if (unlikely(priv->inited == gFalse)) { init(); }
-int JPXStream::doGetChar() {
- int result = doLookChar();
- if (++priv->ccounter == priv->ncomps) {
- priv->ccounter = 0;
- ++priv->counter;
- }
- return result;
+ return doLookChar(priv);
}
GooString *JPXStream::getPSFilter(int psLevel, const char *indent) {
@@ -135,8 +139,7 @@ GBool JPXStream::isBinary(GBool last) {
}
void JPXStream::getImageParams(int *bitsPerComponent, StreamColorSpaceMode *csMode) {
- if (priv->inited == gFalse)
- init();
+ if (unlikely(priv->inited == gFalse)) { init(); }
*bitsPerComponent = 8;
if (priv->image && priv->image->numcomps == 3)
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.h b/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.h
similarity index 91%
rename from source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.h
rename to source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.h
index 50b758608dc6b29115b3e6f2c66c29f856f2ed2b..73b6bdd97b83f237e7d9889221539d731bbf8932 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.h
+++ b/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.h
@@ -6,7 +6,8 @@
//
// Copyright 2008, 2010 Albert Astals Cid <aacid@kde.org>
// Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
-// Copyright 2013,2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2013, 2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2015 Adam Reichold <adam.reichold@t-online.de>
//
// Licensed under GPLv2 or later
//
@@ -49,10 +50,6 @@ private:
void init();
virtual GBool hasGetChars() { return true; }
virtual int getChars(int nChars, Guchar *buffer);
-
- int doGetChar();
-
- int doLookChar();
};
#endif
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.cc b/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/JPXStream.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/JPXStream.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.h b/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/JPXStream.h
rename to source/libs/poppler/poppler-0.32.0/poppler/JPXStream.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Lexer.cc b/source/libs/poppler/poppler-0.32.0/poppler/Lexer.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Lexer.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Lexer.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Lexer.h b/source/libs/poppler/poppler-0.32.0/poppler/Lexer.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Lexer.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Lexer.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Linearization.cc b/source/libs/poppler/poppler-0.32.0/poppler/Linearization.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Linearization.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Linearization.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Linearization.h b/source/libs/poppler/poppler-0.32.0/poppler/Linearization.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Linearization.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Linearization.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Link.cc b/source/libs/poppler/poppler-0.32.0/poppler/Link.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Link.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Link.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Link.h b/source/libs/poppler/poppler-0.32.0/poppler/Link.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Link.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Link.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.cc b/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.h b/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Makefile.am b/source/libs/poppler/poppler-0.32.0/poppler/Makefile.am
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/poppler/Makefile.am
rename to source/libs/poppler/poppler-0.32.0/poppler/Makefile.am
index e0c98d805e8bd4acb258ba266f4d177f641446cd..43faa7e39b3e5cf02b33c7cc5e4e4db18a41ae77 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/Makefile.am
+++ b/source/libs/poppler/poppler-0.32.0/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 49:0:0 \
+ -version-info 51:0:0 \
@create_shared_lib@ \
@auto_import_flags@
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.cc b/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.h b/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.h
rename to source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Movie.cc b/source/libs/poppler/poppler-0.32.0/poppler/Movie.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Movie.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Movie.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Movie.h b/source/libs/poppler/poppler-0.32.0/poppler/Movie.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Movie.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Movie.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.cc b/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.h b/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.h
rename to source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/NameToUnicodeTable.h b/source/libs/poppler/poppler-0.32.0/poppler/NameToUnicodeTable.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/NameToUnicodeTable.h
rename to source/libs/poppler/poppler-0.32.0/poppler/NameToUnicodeTable.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Object.cc b/source/libs/poppler/poppler-0.32.0/poppler/Object.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Object.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Object.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Object.h b/source/libs/poppler/poppler-0.32.0/poppler/Object.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Object.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Object.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.cc b/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.h b/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.h
rename to source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Outline.cc b/source/libs/poppler/poppler-0.32.0/poppler/Outline.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Outline.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Outline.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Outline.h b/source/libs/poppler/poppler-0.32.0/poppler/Outline.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Outline.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Outline.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.cc b/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/OutputDev.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/OutputDev.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.h b/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/OutputDev.h
rename to source/libs/poppler/poppler-0.32.0/poppler/OutputDev.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.cc b/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.h b/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.h
rename to source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PDFDocBuilder.h b/source/libs/poppler/poppler-0.32.0/poppler/PDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PDFDocBuilder.h
rename to source/libs/poppler/poppler-0.32.0/poppler/PDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.cc b/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.h b/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.h
rename to source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.cc b/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.h b/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.h
rename to source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.cc b/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.cc
similarity index 97%
rename from source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.cc
index b95df31066f0f4efc0ea77791535522c1990d466..2502f5fc28681a61037ba0f950df5edae85a9494 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.cc
@@ -23,7 +23,7 @@
// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009, 2011, 2012 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011, 2012, 2014, 2015 William Bader <williambader@hotmail.com>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
// Copyright (C) 2009-2011, 2013, 2014 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2012, 2014 Fabio D'Urso <fabiodurso@hotmail.it>
@@ -1230,6 +1230,20 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
}
// initialize
+ embedType1 = gTrue;
+ embedTrueType = gTrue;
+ embedCIDPostScript = gTrue;
+ embedCIDTrueType = gTrue;
+ fontPassthrough = gFalse;
+ optimizeColorSpace = gFalse;
+ preloadImagesForms = gFalse;
+ generateOPI = gFalse;
+ useASCIIHex = gFalse;
+ useBinary = gFalse;
+ rasterMono = gFalse;
+ rasterResolution = 300;
+ uncompressPreloadedImages = gFalse;
+ rasterAntialias = gFalse;
displayText = gTrue;
ok = gTrue;
outputFunc = outputFuncA;
@@ -1310,7 +1324,6 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
if (!paperMatch)
break; // we only need one entry when all pages are the same size
}
- preload = globalParams->getPSPreload();
if (imgLLX == 0 && imgURX == 0 && imgLLY == 0 && imgURY == 0) {
imgLLX = imgLLY = 0;
imgURX = paperWidth;
@@ -1515,7 +1528,7 @@ void PSOutputDev::writeHeader(const std::vector<int> &pages,
writePS("%%DocumentCustomColors: (atend)\n");
}
writePS("%%DocumentSuppliedResources: (atend)\n");
- if ((level == psLevel1 || level == psLevel1Sep) && globalParams->getPSBinary()) {
+ if ((level == psLevel1 || level == psLevel1Sep) && useBinary) {
writePS("%%DocumentData: Binary\n");
}
@@ -1671,7 +1684,7 @@ void PSOutputDev::writeDocSetup(PDFDoc *doc, Catalog *catalog,
}
}
#if OPI_SUPPORT
- if (globalParams->getPSOPI()) {
+ if (generateOPI) {
writePS("/opiMatrix matrix currentmatrix def\n");
}
#endif
@@ -1880,14 +1893,14 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
font->getID()->num, font->getID()->gen);
setupType3Font(font, psName, parentResDict);
} else {
- fontLoc = font->locateFont(xref, gTrue);
+ fontLoc = font->locateFont(xref, this);
if (fontLoc != NULL) {
switch (fontLoc->locType) {
case gfxFontLocEmbedded:
switch (fontLoc->fontType) {
case fontType1:
// this assumes that the PS font name matches the PDF font name
- psName = font->getEmbeddedFontName()->copy();
+ psName = font->getEmbeddedFontName() ? font->getEmbeddedFontName()->copy() : new GooString();
setupEmbeddedType1Font(&fontLoc->embFontID, psName);
break;
case fontType1C:
@@ -2812,7 +2825,7 @@ void PSOutputDev::setupImages(Dict *resDict) {
Ref imgID;
int i, j;
- if (!(mode == psModeForm || inType3Char || preload)) {
+ if (!(mode == psModeForm || inType3Char || preloadImagesForms)) {
return;
}
@@ -2864,7 +2877,7 @@ void PSOutputDev::setupImages(Dict *resDict) {
}
void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
- GBool useRLE, useCompressed, useASCIIHex;
+ GBool useRLE, useCompressed, doUseASCIIHex;
GooString *s;
int c;
int size, line, col, i;
@@ -2876,9 +2889,9 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
if (level < psLevel2) {
useRLE = gFalse;
useCompressed = gFalse;
- useASCIIHex = gTrue;
+ doUseASCIIHex = gTrue;
} else {
- if (globalParams->getPSUncompressPreloadedImages()) {
+ if (uncompressPreloadedImages) {
useRLE = gFalse;
useCompressed = gFalse;
} else {
@@ -2892,7 +2905,7 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
useCompressed = gFalse;
}
}
- useASCIIHex = globalParams->getPSASCIIHex();
+ doUseASCIIHex = useASCIIHex;
}
if (useCompressed) {
str = str->getUndecodedStream();
@@ -2900,7 +2913,7 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
if (useRLE) {
str = new RunLengthEncoder(str);
}
- if (useASCIIHex) {
+ if (doUseASCIIHex) {
str = new ASCIIHexEncoder(str);
} else {
str = new ASCII85Encoder(str);
@@ -2913,23 +2926,23 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
do {
c = str->getChar();
} while (c == '\n' || c == '\r');
- if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+ if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
break;
}
if (c == 'z') {
++col;
} else {
++col;
- for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) {
+ for (i = 1; i <= (doUseASCIIHex ? 1 : 4); ++i) {
do {
c = str->getChar();
} while (c == '\n' || c == '\r');
- if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+ if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
break;
}
++col;
}
- if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+ if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
break;
}
}
@@ -2937,7 +2950,7 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
++size;
col = 0;
}
- } while (c != (useASCIIHex ? '>' : '~') && c != EOF);
+ } while (c != (doUseASCIIHex ? '>' : '~') && c != EOF);
// add one entry for the final line of data; add another entry
// because the RunLengthDecode filter may read past the end
++size;
@@ -2959,12 +2972,12 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
writePSFmt("{0:d} array 1 index {1:d} 2 index put\n",
innerSize, outer);
line = col = 0;
- writePS((char *)(useASCIIHex ? "dup 0 <" : "dup 0 <~"));
+ writePS((char *)(doUseASCIIHex ? "dup 0 <" : "dup 0 <~"));
for (;;) {
do {
c = str->getChar();
} while (c == '\n' || c == '\r');
- if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+ if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
break;
}
if (c == 'z') {
@@ -2973,18 +2986,18 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
} else {
writePSChar(c);
++col;
- for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) {
+ for (i = 1; i <= (doUseASCIIHex ? 1 : 4); ++i) {
do {
c = str->getChar();
} while (c == '\n' || c == '\r');
- if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+ if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
break;
}
writePSChar(c);
++col;
}
}
- if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+ if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
break;
}
// each line is: "dup nnnnn <~...data...~> put<eol>"
@@ -2992,15 +3005,15 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
// chunks are 1 or 4 bytes each, so we have to stop at 232
// but make it 225 just to be safe
if (col > 225) {
- writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n"));
+ writePS((char *)(doUseASCIIHex ? "> put\n" : "~> put\n"));
++line;
if (line >= innerSize) break;
- writePSFmt((char *)(useASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line);
+ writePSFmt((char *)(doUseASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line);
col = 0;
}
}
- if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
- writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n"));
+ if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
+ writePS((char *)(doUseASCIIHex ? "> put\n" : "~> put\n"));
if (useRLE) {
++line;
writePSFmt("{0:d} <> put\n", line);
@@ -3022,7 +3035,7 @@ void PSOutputDev::setupForms(Dict *resDict) {
Object xObjDict, xObj, xObjRef, subtypeObj;
int i;
- if (!preload) {
+ if (!preloadImagesForms) {
return;
}
@@ -3142,8 +3155,6 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
PreScanOutputDev *scan;
GBool rasterize;
#if HAVE_SPLASH
- GBool mono;
- double dpi;
SplashOutputDev *splashOut;
SplashColor paperColor;
PDFRectangle box;
@@ -3161,7 +3172,6 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
#endif
char hexBuf[32*2 + 2]; // 32 values X 2 chars/value + line ending + null
Guchar digit;
- GBool useBinary;
GBool isGray;
if (forceRasterize) {
@@ -3180,12 +3190,8 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
}
#if HAVE_SPLASH
- // get the rasterization parameters
- dpi = globalParams->getPSRasterResolution();
- mono = globalParams->getPSRasterMono();
-
// start the PS page
- page->makeBox(dpi, dpi, rotateA, useMediaBox, gFalse,
+ page->makeBox(rasterResolution, rasterResolution, rotateA, useMediaBox, gFalse,
sliceX, sliceY, sliceW, sliceH, &box, &crop);
rotateA += page->getRotate();
if (rotateA >= 360) {
@@ -3193,38 +3199,37 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
} else if (rotateA < 0) {
rotateA += 360;
}
- state = new GfxState(dpi, dpi, &box, rotateA, gFalse);
+ state = new GfxState(rasterResolution, rasterResolution, &box, rotateA, gFalse);
startPage(page->getNum(), state, xref);
delete state;
// set up the SplashOutputDev
- if (mono || level == psLevel1) {
+ if (rasterMono || level == psLevel1) {
numComps = 1;
paperColor[0] = 0xff;
splashOut = new SplashOutputDev(splashModeMono8, 1, gFalse,
- paperColor, gFalse,
- globalParams->getAntialiasPrinting());
+ paperColor, gFalse);
#if SPLASH_CMYK
} else if (level == psLevel1Sep || level == psLevel2Sep ||
level == psLevel3Sep || globalParams->getOverprintPreview()) {
numComps = 4;
paperColor[0] = paperColor[1] = paperColor[2] = paperColor[3] = 0;
splashOut = new SplashOutputDev(splashModeCMYK8, 1, gFalse,
- paperColor, gFalse,
- globalParams->getAntialiasPrinting());
+ paperColor, gFalse);
#endif
} else {
numComps = 3;
paperColor[0] = paperColor[1] = paperColor[2] = 0xff;
splashOut = new SplashOutputDev(splashModeRGB8, 1, gFalse,
- paperColor, gFalse,
- globalParams->getAntialiasPrinting());
+ paperColor, gFalse);
}
+ splashOut->setFontAntialias(rasterAntialias);
+ splashOut->setVectorAntialias(rasterAntialias);
splashOut->startDoc(doc);
// break the page into stripes
- hDPI2 = xScale * dpi;
- vDPI2 = yScale * dpi;
+ hDPI2 = xScale * rasterResolution;
+ vDPI2 = yScale * rasterResolution;
if (sliceW < 0 || sliceH < 0) {
if (useMediaBox) {
box = *page->getMediaBox();
@@ -3268,7 +3273,6 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
m0, m1, m2, m3, m4, m5);
switch (level) {
case psLevel1:
- useBinary = globalParams->getPSBinary();
writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1{5:s}\n",
w, h, w, -h, h,
useBinary ? "Bin" : "");
@@ -3307,19 +3311,22 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
}
break;
case psLevel1Sep:
- useBinary = globalParams->getPSBinary();
p = bitmap->getDataPtr();
// Check for an all gray image
- isGray = gTrue;
- for (y = 0; y < h; ++y) {
- for (x = 0; x < w; ++x) {
- if (p[4*x] != p[4*x + 1] || p[4*x] != p[4*x + 2]) {
- isGray = gFalse;
- y = h;
- break;
+ if (getOptimizeColorSpace()) {
+ isGray = gTrue;
+ for (y = 0; y < h; ++y) {
+ for (x = 0; x < w; ++x) {
+ if (p[4*x] != p[4*x + 1] || p[4*x] != p[4*x + 2]) {
+ isGray = gFalse;
+ y = h;
+ break;
+ }
}
+ p += bitmap->getRowSize();
}
- p += bitmap->getRowSize();
+ } else {
+ isGray = gFalse;
}
writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1{5:s}{6:s}\n",
w, h, w, -h, h,
@@ -3466,7 +3473,9 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
p = bitmap->getDataPtr() + (h - 1) * bitmap->getRowSize();
str0 = new MemStream((char *)p, 0, w * h * numComps, &obj);
// Check for a color image that uses only gray
- if (numComps == 4) {
+ if (!getOptimizeColorSpace()) {
+ isGray = gFalse;
+ } else if (numComps == 4) {
int compCyan;
isGray = gTrue;
while ((compCyan = str0->getChar()) != EOF) {
@@ -3520,10 +3529,9 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
writePS(" /Decode [0 1 0 1 0 1 0 1]\n");
}
writePS(" /DataSource currentfile\n");
- useBinary = globalParams->getPSBinary();
if (useBinary) {
/* nothing to do */;
- } else if (globalParams->getPSASCIIHex()) {
+ } else if (useASCIIHex) {
writePS(" /ASCIIHexDecode filter\n");
} else {
writePS(" /ASCII85Decode filter\n");
@@ -3532,7 +3540,7 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
writePS(">>\n");
if (useBinary) {
/* nothing to do */;
- } else if (globalParams->getPSASCIIHex()) {
+ } else if (useASCIIHex) {
str = new ASCIIHexEncoder(str);
} else {
str = new ASCII85Encoder(str);
@@ -5143,14 +5151,13 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
int col, x, y, c, i;
char hexBuf[32*2 + 2]; // 32 values X 2 chars/value + line ending + null
Guchar digit, grayValue;
- const GBool useBinary = globalParams->getPSBinary();
// explicit masking
if (maskStr && !(maskColors && colorMap)) {
maskToClippingPath(maskStr, maskWidth, maskHeight, maskInvert);
}
- if ((inType3Char || preload) && !colorMap) {
+ if ((inType3Char || preloadImagesForms) && !colorMap) {
if (inlineImg) {
// create an array
str = new FixedLengthEncoder(str, len);
@@ -5189,7 +5196,7 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
}
// image/imagemask command
- if ((inType3Char || preload) && !colorMap) {
+ if ((inType3Char || preloadImagesForms) && !colorMap) {
writePSFmt("{0:d} {1:d} {2:s} [{3:d} 0 0 {4:d} 0 {5:d}] pdfImM1a\n",
width, height, invert ? "true" : "false",
width, -height, height);
@@ -5206,7 +5213,7 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
}
// image data
- if (!((inType3Char || preload) && !colorMap)) {
+ if (!((inType3Char || preloadImagesForms) && !colorMap)) {
if (colorMap) {
@@ -5302,7 +5309,6 @@ void PSOutputDev::doImageL1Sep(Object *ref, GfxImageColorMap *colorMap,
GBool checkProcessColor;
char hexBuf[32*2 + 2]; // 32 values X 2 chars/value + line ending + null
Guchar digit;
- const GBool useBinary = globalParams->getPSBinary();
// explicit masking
if (maskStr && !(maskColors && colorMap)) {
@@ -5529,7 +5535,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
GBool emitRect, addRect, extendRect;
GooString *s;
int n, numComps;
- GBool useRLE, useASCII, useASCIIHex, useCompressed;
+ GBool useRLE, useASCII, useCompressed;
GfxSeparationColorSpace *sepCS;
GfxColor color;
GfxCMYK cmyk;
@@ -5708,10 +5714,8 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
writePS(" setcolorspace\n");
}
- useASCIIHex = globalParams->getPSASCIIHex();
-
// set up the image data
- if (mode == psModeForm || inType3Char || preload) {
+ if (mode == psModeForm || inType3Char || preloadImagesForms) {
if (inlineImg) {
// create an array
str2 = new FixedLengthEncoder(str, len);
@@ -5821,7 +5825,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
}
// data source
- if (mode == psModeForm || inType3Char || preload) {
+ if (mode == psModeForm || inType3Char || preloadImagesForms) {
if (inlineImg) {
writePS(" /DataSource { pdfImStr }\n");
} else {
@@ -5833,8 +5837,8 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
}
// filters
- if ((mode == psModeForm || inType3Char || preload) &&
- globalParams->getPSUncompressPreloadedImages()) {
+ if ((mode == psModeForm || inType3Char || preloadImagesForms) &&
+ uncompressPreloadedImages) {
s = NULL;
useRLE = gFalse;
useCompressed = gFalse;
@@ -5845,12 +5849,12 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
if ((colorMap && colorMap->getColorSpace()->getMode() == csDeviceN) ||
inlineImg || !s) {
useRLE = gTrue;
- useASCII = !(mode == psModeForm || inType3Char || preload);
+ useASCII = !(mode == psModeForm || inType3Char || preloadImagesForms);
useCompressed = gFalse;
} else {
useRLE = gFalse;
useASCII = str->isBinary() &&
- !(mode == psModeForm || inType3Char || preload);
+ !(mode == psModeForm || inType3Char || preloadImagesForms);
useCompressed = gTrue;
}
}
@@ -5868,7 +5872,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
delete s;
}
- if (mode == psModeForm || inType3Char || preload) {
+ if (mode == psModeForm || inType3Char || preloadImagesForms) {
// end of image dictionary
writePSFmt(">>\n{0:s}\n", colorMap ? "image" : "imagemask");
@@ -5988,7 +5992,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
Stream *str2;
GooString *s;
int n, numComps;
- GBool useRLE, useASCII, useASCIIHex, useCompressed;
+ GBool useRLE, useASCII, useCompressed;
GBool maskUseRLE, maskUseASCII, maskUseCompressed;
GooString *maskFilters;
GfxSeparationColorSpace *sepCS;
@@ -5997,7 +6001,6 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
int c;
int col, i;
- useASCIIHex = globalParams->getPSASCIIHex();
useRLE = useASCII = useCompressed = gFalse; // make gcc happy
maskUseRLE = maskUseASCII = maskUseCompressed = gFalse; // make gcc happy
maskFilters = NULL; // make gcc happy
@@ -6006,8 +6009,8 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
if (maskStr) {
// mask data source
- if ((mode == psModeForm || inType3Char || preload) &&
- globalParams->getPSUncompressPreloadedImages()) {
+ if ((mode == psModeForm || inType3Char || preloadImagesForms) &&
+ uncompressPreloadedImages) {
s = NULL;
maskUseRLE = gFalse;
maskUseCompressed = gFalse;
@@ -6016,12 +6019,12 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
s = maskStr->getPSFilter(3, " ");
if (!s) {
maskUseRLE = gTrue;
- maskUseASCII = !(mode == psModeForm || inType3Char || preload);
+ maskUseASCII = !(mode == psModeForm || inType3Char || preloadImagesForms);
maskUseCompressed = gFalse;
} else {
maskUseRLE = gFalse;
maskUseASCII = maskStr->isBinary() &&
- !(mode == psModeForm || inType3Char || preload);
+ !(mode == psModeForm || inType3Char || preloadImagesForms);
maskUseCompressed = gTrue;
}
}
@@ -6039,7 +6042,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
if (s) {
delete s;
}
- if (mode == psModeForm || inType3Char || preload) {
+ if (mode == psModeForm || inType3Char || preloadImagesForms) {
writePSFmt("MaskData_{0:d}_{1:d} pdfMaskInit\n",
ref->getRefNum(), ref->getRefGen());
} else {
@@ -6085,7 +6088,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
}
// set up the image data
- if (mode == psModeForm || inType3Char || preload) {
+ if (mode == psModeForm || inType3Char || preloadImagesForms) {
if (inlineImg) {
// create an array
str2 = new FixedLengthEncoder(str, len);
@@ -6203,7 +6206,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
}
// data source
- if (mode == psModeForm || inType3Char || preload) {
+ if (mode == psModeForm || inType3Char || preloadImagesForms) {
if (inlineImg) {
writePS(" /DataSource { pdfImStr }\n");
} else {
@@ -6215,8 +6218,8 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
}
// filters
- if ((mode == psModeForm || inType3Char || preload) &&
- globalParams->getPSUncompressPreloadedImages()) {
+ if ((mode == psModeForm || inType3Char || preloadImagesForms) &&
+ uncompressPreloadedImages) {
s = NULL;
useRLE = gFalse;
useCompressed = gFalse;
@@ -6227,12 +6230,12 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
if ((colorMap && colorMap->getColorSpace()->getMode() == csDeviceN) ||
inlineImg || !s) {
useRLE = gTrue;
- useASCII = !(mode == psModeForm || inType3Char || preload);
+ useASCII = !(mode == psModeForm || inType3Char || preloadImagesForms);
useCompressed = gFalse;
} else {
useRLE = gFalse;
useASCII = str->isBinary() &&
- !(mode == psModeForm || inType3Char || preload);
+ !(mode == psModeForm || inType3Char || preloadImagesForms);
useCompressed = gTrue;
}
}
@@ -6267,7 +6270,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
maskInvert ? 1 : 0, maskInvert ? 0 : 1);
// mask data source
- if (mode == psModeForm || inType3Char || preload) {
+ if (mode == psModeForm || inType3Char || preloadImagesForms) {
writePS(" /DataSource {pdfMaskSrc}\n");
writePS(maskFilters->getCString());
} else {
@@ -6279,7 +6282,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
writePS(">>\n");
}
- if (mode == psModeForm || inType3Char || preload) {
+ if (mode == psModeForm || inType3Char || preloadImagesForms) {
// image command
writePSFmt("{0:s}\n", colorMap ? "image" : "imagemask");
@@ -6302,7 +6305,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
}
// get rid of the array and index
- if (mode == psModeForm || inType3Char || preload) {
+ if (mode == psModeForm || inType3Char || preloadImagesForms) {
if (!inlineImg) writePS("pop ");
writePS("pop pop\n");
@@ -6347,7 +6350,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
// close the mask stream
if (maskStr) {
- if (!(mode == psModeForm || inType3Char || preload)) {
+ if (!(mode == psModeForm || inType3Char || preloadImagesForms)) {
writePS("pdfMaskEnd\n");
}
}
@@ -6629,7 +6632,7 @@ void PSOutputDev::dumpColorSpaceL2(GfxColorSpace *colorSpace,
void PSOutputDev::opiBegin(GfxState *state, Dict *opiDict) {
Object dict;
- if (globalParams->getPSOPI()) {
+ if (generateOPI) {
opiDict->lookup("2.0", &dict);
if (dict.isDict()) {
opiBegin20(state, dict.getDict());
@@ -7002,7 +7005,7 @@ void PSOutputDev::opiTransform(GfxState *state, double x0, double y0,
void PSOutputDev::opiEnd(GfxState *state, Dict *opiDict) {
Object dict;
- if (globalParams->getPSOPI()) {
+ if (generateOPI) {
opiDict->lookup("2.0", &dict);
if (dict.isDict()) {
writePS("%%EndIncludedImage\n");
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.h b/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.h
similarity index 89%
rename from source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.h
rename to source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.h
index 262ce14caabac4afbdb5c3191c198068f94175f0..6c14cef7bb67a5cce9923b32f49710d70bd18b15 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.h
+++ b/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.h
@@ -20,7 +20,7 @@
// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009, 2011 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011, 2015 William Bader <williambader@hotmail.com>
// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2011, 2014 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
@@ -45,6 +45,7 @@
#include "OutputDev.h"
#include <set>
#include <map>
+#include <vector>
class GHooash;
class PDFDoc;
@@ -151,7 +152,7 @@ public:
// Does this device use drawForm()? If this returns false,
// form-type XObjects will be interpreted (i.e., unrolled).
- virtual GBool useDrawForm() { return preload; }
+ virtual GBool useDrawForm() { return preloadImagesForms; }
// Does this device use beginType3Char/endType3Char? Otherwise,
// text in Type 3 fonts will be drawn with drawChar/drawString.
@@ -308,6 +309,28 @@ public:
{ overlayCbk = cbk; overlayCbkData = data; }
void setDisplayText(GBool display) { displayText = display; }
+ void setRasterAntialias(GBool a) { rasterAntialias = a; }
+ void setRasterResolution(double r) { rasterResolution = r; }
+ void setRasterMono(GBool b) { rasterMono = b; }
+ void setUncompressPreloadedImages(GBool b) { uncompressPreloadedImages = b; }
+
+ GBool getEmbedType1() const { return embedType1; }
+ GBool getEmbedTrueType() const { return embedTrueType; }
+ GBool getEmbedCIDPostScript() const { return embedCIDPostScript; }
+ GBool getEmbedCIDTrueType() const { return embedCIDTrueType; }
+ GBool getFontPassthrough() const { return fontPassthrough; }
+ GBool getOptimizeColorSpace() const { return optimizeColorSpace; }
+ void setEmbedType1(GBool b) { embedType1 = b; }
+ void setEmbedTrueType(GBool b) { embedTrueType = b; }
+ void setEmbedCIDPostScript(GBool b) { embedCIDPostScript = b; }
+ void setEmbedCIDTrueType(GBool b) { embedCIDTrueType = b; }
+ void setFontPassthrough(GBool b) { fontPassthrough = b; }
+ void setOptimizeColorSpace(GBool b) { optimizeColorSpace = b; }
+ void setPreloadImagesForms(GBool b) { preloadImagesForms = b; }
+ void setGenerateOPI(GBool b) { generateOPI = b; }
+ void setUseASCIIHex(GBool b) { useASCIIHex = b; }
+ void setUseBinary(GBool b) { useBinary = b; }
+
private:
void init(PSOutputFunc outputFuncA, void *outputStreamA,
@@ -410,8 +433,6 @@ private:
// (only psModePSOrigPageSizes output mode)
int imgLLX, imgLLY, // imageable area, in pts
imgURX, imgURY;
- GBool preload; // load all images into memory, and
- // predefine forms
GBool noCrop;
PSOutputFunc outputFunc;
@@ -488,6 +509,24 @@ private:
GBool t3NeedsRestore; // set if a 'q' operator was issued
GBool forceRasterize; // forces the page to be rasterized into a image before printing
GBool displayText; // displayText
+ GBool rasterAntialias; // antialias on rasterize
+ GBool uncompressPreloadedImages;
+ double rasterResolution; // PostScript rasterization resolution (dpi)
+ GBool rasterMono; // true to do PostScript rasterization
+ // in monochrome (gray); false to do it
+ // in color (RGB/CMYK)
+ GBool embedType1; // embed Type 1 fonts?
+ GBool embedTrueType; // embed TrueType fonts?
+ GBool embedCIDPostScript; // embed CID PostScript fonts?
+ GBool embedCIDTrueType; // embed CID TrueType fonts?
+ GBool fontPassthrough; // pass all fonts through as-is?
+ GBool optimizeColorSpace; // false to keep gray RGB images in their original color space
+ // true to optimize gray images to DeviceGray color space
+ GBool preloadImagesForms; // preload PostScript images and forms into
+ // memory
+ GBool generateOPI; // generate PostScript OPI comments?
+ GBool useASCIIHex; // use ASCIIHex instead of ASCII85?
+ GBool useBinary; // use binary instead of hex
#if OPI_SUPPORT
int opi13Nest; // nesting level of OPI 1.3 objects
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.cc b/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.h b/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.h
rename to source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Page.cc b/source/libs/poppler/poppler-0.32.0/poppler/Page.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Page.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Page.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Page.h b/source/libs/poppler/poppler-0.32.0/poppler/Page.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Page.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Page.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.cc b/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.h b/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.h
rename to source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo_p.h b/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo_p.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo_p.h
rename to source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo_p.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.cc b/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PageTransition.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/PageTransition.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.h b/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PageTransition.h
rename to source/libs/poppler/poppler-0.32.0/poppler/PageTransition.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Parser.cc b/source/libs/poppler/poppler-0.32.0/poppler/Parser.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Parser.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Parser.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Parser.h b/source/libs/poppler/poppler-0.32.0/poppler/Parser.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Parser.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Parser.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.cc b/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.h b/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.h
rename to source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.cc b/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.h b/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.h
rename to source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.cc b/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/ProfileData.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/ProfileData.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.h b/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/ProfileData.h
rename to source/libs/poppler/poppler-0.32.0/poppler/ProfileData.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Rendition.cc b/source/libs/poppler/poppler-0.32.0/poppler/Rendition.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Rendition.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Rendition.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Rendition.h b/source/libs/poppler/poppler-0.32.0/poppler/Rendition.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Rendition.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Rendition.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.cc b/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.cc
similarity index 97%
rename from source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.cc
index d6f55995b1c81565af8d2c4d2f6c2cba6a8ad4b2..63d8b4e1287981a49639c447899133f1348e076c 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.cc
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010, 2012, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2014 Fabio D'Urso <fabiodurso@hotmail.it>
//
@@ -288,12 +288,16 @@ StandardSecurityHandler::StandardSecurityHandler(PDFDoc *docA,
ok = gTrue;
} else if (encVersion == 5 && encRevision == 5) {
fileID = new GooString(); // unused for V=R=5
- ownerEnc = ownerEncObj.getString()->copy();
- userEnc = userEncObj.getString()->copy();
- if (fileKeyLength > 32 || fileKeyLength < 0) {
- fileKeyLength = 32;
+ if (ownerEncObj.isString() && userEncObj.isString()) {
+ ownerEnc = ownerEncObj.getString()->copy();
+ userEnc = userEncObj.getString()->copy();
+ if (fileKeyLength > 32 || fileKeyLength < 0) {
+ fileKeyLength = 32;
+ }
+ ok = gTrue;
+ } else {
+ error(errSyntaxError, -1, "Weird encryption owner/user info");
}
- ok = gTrue;
} else if (!(encVersion == -1 && encRevision == -1)) {
error(errUnimplemented, -1,
"Unsupported version/revision ({0:d}/{1:d}) of Standard security handler",
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.h b/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.h
rename to source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Sound.cc b/source/libs/poppler/poppler-0.32.0/poppler/Sound.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Sound.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Sound.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Sound.h b/source/libs/poppler/poppler-0.32.0/poppler/Sound.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Sound.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Sound.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.cc b/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.cc
index bfb07eb7315691ada4233475aeb956b0d2509025..455c2be62cd2c276fbe107d9b4b4cd24326ce050 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.cc
@@ -15,14 +15,14 @@
//
// Copyright (C) 2005 Takashi Iwai <tiwai@suse.de>
// Copyright (C) 2006 Stefan Schweizer <genstef@gentoo.org>
-// Copyright (C) 2006-2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
// Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2009-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2015 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2014, 2015 William Bader <williambader@hotmail.com>
// Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de>
// Copyright (C) 2010 Brian Cameron <brian.cameron@oracle.com>
// Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
@@ -1252,17 +1252,14 @@ SplashOutputDev::SplashOutputDev(SplashColorMode colorModeA,
GBool reverseVideoA,
SplashColorPtr paperColorA,
GBool bitmapTopDownA,
- GBool allowAntialiasA,
- SplashThinLineMode thinLineMode,
- GBool overprintPreviewA) {
+ SplashThinLineMode thinLineMode,
+ GBool overprintPreviewA) {
colorMode = colorModeA;
bitmapRowPad = bitmapRowPadA;
bitmapTopDown = bitmapTopDownA;
bitmapUpsideDown = gFalse;
- allowAntialias = allowAntialiasA;
- vectorAntialias = allowAntialias &&
- globalParams->getVectorAntialias() &&
- colorMode != splashModeMono1;
+ fontAntialias = gTrue;
+ vectorAntialias = gTrue;
overprintPreview = overprintPreviewA;
enableFreeTypeHinting = gFalse;
enableSlightHinting = gFalse;
@@ -1383,8 +1380,7 @@ void SplashOutputDev::startDoc(PDFDoc *docA) {
enableFreeTypeHinting,
enableSlightHinting,
#endif
- allowAntialias &&
- globalParams->getAntialias() &&
+ getFontAntialias() &&
colorMode != splashModeMono1);
for (i = 0; i < nT3Fonts; ++i) {
delete t3FontCache[i];
@@ -1897,7 +1893,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
} else {
- if (!(fontLoc = gfxFont->locateFont((xref) ? xref : doc->getXRef(), gFalse))) {
+ if (!(fontLoc = gfxFont->locateFont((xref) ? xref : doc->getXRef(), NULL))) {
error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->getCString()
: "(unnamed)");
@@ -4052,8 +4048,8 @@ void SplashOutputDev::setSoftMask(GfxState *state, double *bbox,
p = softMask->getDataPtr() + ty * softMask->getRowSize() + tx;
int xMax = tBitmap->getWidth();
int yMax = tBitmap->getHeight();
- if (xMax + tx > bitmap->getWidth()) xMax = bitmap->getWidth() - tx;
- if (yMax + ty > bitmap->getHeight()) yMax = bitmap->getHeight() - ty;
+ if (xMax > bitmap->getWidth() - tx) xMax = bitmap->getWidth() - tx;
+ if (yMax > bitmap->getHeight() - ty) yMax = bitmap->getHeight() - ty;
for (y = 0; y < yMax; ++y) {
for (x = 0; x < xMax; ++x) {
if (alpha) {
@@ -4151,6 +4147,7 @@ GBool SplashOutputDev::getVectorAntialias() {
}
void SplashOutputDev::setVectorAntialias(GBool vaa) {
+ vaa = vaa && colorMode != splashModeMono1;
vectorAntialias = vaa;
splash->setVectorAntialias(vaa);
}
@@ -4367,7 +4364,7 @@ GBool SplashOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTria
#if SPLASH_CMYK
case splashModeCMYK8:
case splashModeDeviceN8:
- bDirectColorTranslation = (shadingMode == csDeviceCMYK || shadingMode == csDeviceN);
+ bDirectColorTranslation = (shadingMode == csDeviceCMYK);
break;
#endif
default:
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.h b/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.h
similarity index 97%
rename from source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.h
rename to source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.h
index efbb865c45b519693c576031d15c6519f1d075a9..ae20faccb51156b24d2c82ea392a5de2d5335ca7 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.h
+++ b/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.h
@@ -20,7 +20,8 @@
// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
// Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
// Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2012, 2015 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2015 William Bader <williambader@hotmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -170,9 +171,8 @@ public:
SplashOutputDev(SplashColorMode colorModeA, int bitmapRowPadA,
GBool reverseVideoA, SplashColorPtr paperColorA,
GBool bitmapTopDownA = gTrue,
- GBool allowAntialiasA = gTrue,
SplashThinLineMode thinLineMode = splashThinLineDefault,
- GBool overprintPreviewA = globalParams->getOverprintPreview());
+ GBool overprintPreviewA = globalParams->getOverprintPreview());
// Destructor.
virtual ~SplashOutputDev();
@@ -359,6 +359,9 @@ public:
virtual void setVectorAntialias(GBool vaa);
#endif
+ GBool getFontAntialias() { return fontAntialias; }
+ void setFontAntialias(GBool anti) { fontAntialias = anti; }
+
void setFreeTypeHinting(GBool enable, GBool enableSlightHinting);
protected:
@@ -396,7 +399,7 @@ private:
int bitmapRowPad;
GBool bitmapTopDown;
GBool bitmapUpsideDown;
- GBool allowAntialias;
+ GBool fontAntialias;
GBool vectorAntialias;
GBool overprintPreview;
GBool enableFreeTypeHinting;
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.cc b/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.h b/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.h
rename to source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.cc b/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.h b/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Stream-CCITT.h b/source/libs/poppler/poppler-0.32.0/poppler/Stream-CCITT.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Stream-CCITT.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Stream-CCITT.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Stream.cc b/source/libs/poppler/poppler-0.32.0/poppler/Stream.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/poppler/Stream.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/Stream.cc
index 4c00ddb0d5deec0cb86c58d921dfc1ef694ec38c..d2dd761c72945c676e789a62d0ee94fee47688f6 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/Stream.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/Stream.cc
@@ -30,6 +30,7 @@
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
// Copyright (C) 2013 Pino Toscano <pino@kde.org>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -59,6 +60,7 @@
#include "Lexer.h"
#include "GfxState.h"
#include "Stream.h"
+#include "XRef.h"
#include "JBIG2Stream.h"
#include "Stream-CCITT.h"
#include "CachedFile.h"
@@ -337,10 +339,18 @@ Stream *Stream::makeFilter(char *name, Stream *str, Object *params, int recursio
str = new FlateStream(str, pred, columns, colors, bits);
} else if (!strcmp(name, "JBIG2Decode")) {
if (params->isDict()) {
- params->dictLookup("JBIG2Globals", &globals, recursion);
+ XRef *xref = params->getDict()->getXRef();
+ params->dictLookupNF("JBIG2Globals", &globals);
+ while (globals.isRef()) {
+ obj.free();
+ globals.copy(&obj);
+ globals.free();
+ obj.fetch(xref, &globals);
+ }
}
- str = new JBIG2Stream(str, &globals);
+ str = new JBIG2Stream(str, &globals, &obj);
globals.free();
+ obj.free();
} else if (!strcmp(name, "JPXDecode")) {
str = new JPXStream(str);
} else if (!strcmp(name, "Crypt")) {
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/Stream.h b/source/libs/poppler/poppler-0.32.0/poppler/Stream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/Stream.h
rename to source/libs/poppler/poppler-0.32.0/poppler/Stream.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/StructElement.cc b/source/libs/poppler/poppler-0.32.0/poppler/StructElement.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/StructElement.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/StructElement.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/StructElement.h b/source/libs/poppler/poppler-0.32.0/poppler/StructElement.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/StructElement.h
rename to source/libs/poppler/poppler-0.32.0/poppler/StructElement.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.cc b/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.h b/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.h
rename to source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.cc b/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.cc
index c9db1e7d19f3a66d08423dd546942f23c5405b0f..150d444960305e1cb08561490e69a31af52c40ea 100755
--- a/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.cc
+++ b/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.cc
@@ -20,7 +20,7 @@
// Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2007, 2008, 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2008, 2010-2012, 2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010-2012, 2014, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2008 Pino Toscano <pino@kde.org>
// Copyright (C) 2008, 2010 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2009 Ross Moore <ross@maths.mq.edu.au>
@@ -622,6 +622,10 @@ void TextPool::addWord(TextWord *word) {
TextWord *w0, *w1;
// expand the array if needed
+ if (unlikely((word->base / textPoolStep) > INT_MAX)) {
+ error(errSyntaxWarning, -1, "word->base / textPoolStep > INT_MAX");
+ return;
+ }
wordBaseIdx = (int)(word->base / textPoolStep);
if (minBaseIdx > maxBaseIdx) {
minBaseIdx = wordBaseIdx - 128;
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.h b/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.h
rename to source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/UTF.cc b/source/libs/poppler/poppler-0.32.0/poppler/UTF.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/UTF.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/UTF.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/UTF.h b/source/libs/poppler/poppler-0.32.0/poppler/UTF.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/UTF.h
rename to source/libs/poppler/poppler-0.32.0/poppler/UTF.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/UTF8.h b/source/libs/poppler/poppler-0.32.0/poppler/UTF8.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/UTF8.h
rename to source/libs/poppler/poppler-0.32.0/poppler/UTF8.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCClassTables.h b/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCClassTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/UnicodeCClassTables.h
rename to source/libs/poppler/poppler-0.32.0/poppler/UnicodeCClassTables.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCompTables.h b/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCompTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/UnicodeCompTables.h
rename to source/libs/poppler/poppler-0.32.0/poppler/UnicodeCompTables.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/UnicodeDecompTables.h b/source/libs/poppler/poppler-0.32.0/poppler/UnicodeDecompTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/UnicodeDecompTables.h
rename to source/libs/poppler/poppler-0.32.0/poppler/UnicodeDecompTables.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.cc b/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.h b/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.h
rename to source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMapTables.h b/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMapTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/UnicodeMapTables.h
rename to source/libs/poppler/poppler-0.32.0/poppler/UnicodeMapTables.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.cc b/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.h b/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.h
rename to source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.cc b/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.h b/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.h
rename to source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/XRef.cc b/source/libs/poppler/poppler-0.32.0/poppler/XRef.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/XRef.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/XRef.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/XRef.h b/source/libs/poppler/poppler-0.32.0/poppler/XRef.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/XRef.h
rename to source/libs/poppler/poppler-0.32.0/poppler/XRef.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.cc b/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.cc
rename to source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.cc
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.h b/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.h
rename to source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/gen-unicode-tables.py b/source/libs/poppler/poppler-0.32.0/poppler/gen-unicode-tables.py
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/gen-unicode-tables.py
rename to source/libs/poppler/poppler-0.32.0/poppler/gen-unicode-tables.py
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.cmake b/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.cmake
rename to source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.cmake
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.in b/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.in
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.in
rename to source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.in
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/strtok_r.cpp b/source/libs/poppler/poppler-0.32.0/poppler/strtok_r.cpp
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/poppler/strtok_r.cpp
rename to source/libs/poppler/poppler-0.32.0/poppler/strtok_r.cpp
diff --git a/source/libs/poppler/poppler-0.30.0/splash/Makefile.am b/source/libs/poppler/poppler-0.32.0/splash/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/Makefile.am
rename to source/libs/poppler/poppler-0.32.0/splash/Makefile.am
diff --git a/source/libs/poppler/poppler-0.30.0/splash/Splash.cc b/source/libs/poppler/poppler-0.32.0/splash/Splash.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/splash/Splash.cc
rename to source/libs/poppler/poppler-0.32.0/splash/Splash.cc
index fde272acbab39e8f85e953740ad5fb5bae045191..d8ee64096053992b59b9bc5c593d271b5246a2f0 100755
--- a/source/libs/poppler/poppler-0.30.0/splash/Splash.cc
+++ b/source/libs/poppler/poppler-0.32.0/splash/Splash.cc
@@ -11,11 +11,11 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2005-2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
// Copyright (C) 2010-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
-// Copyright (C) 2011-2013 William Bader <williambader@hotmail.com>
+// Copyright (C) 2011-2013, 2015 William Bader <williambader@hotmail.com>
// Copyright (C) 2012 Markus Trippelsdorf <markus@trippelsdorf.de>
// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2012 Matthias Kramm <kramm@quiss.org>
@@ -271,6 +271,7 @@ inline void Splash::pipeInit(SplashPipe *pipe, int x, int y,
// source alpha
pipe->aInput = aInput;
pipe->usesShape = usesShape;
+ pipe->shape = 0;
// knockout
pipe->knockout = knockout;
@@ -5214,6 +5215,10 @@ SplashError Splash::composite(SplashBitmap *src, int xSrc, int ySrc,
return splashErrModeMismatch;
}
+ if (unlikely(!bitmap->data)) {
+ return splashErrZeroImage;
+ }
+
if(src->getSeparationList()->getLength() > bitmap->getSeparationList()->getLength()) {
for (x = bitmap->getSeparationList()->getLength(); x < src->getSeparationList()->getLength(); x++)
bitmap->getSeparationList()->append(((GfxSeparationColorSpace *)src->getSeparationList()->get(x))->copy());
@@ -5783,6 +5788,10 @@ SplashError Splash::blitTransparent(SplashBitmap *src, int xSrc, int ySrc,
return splashErrModeMismatch;
}
+ if (unlikely(!bitmap->data)) {
+ return splashErrZeroImage;
+ }
+
switch (bitmap->mode) {
case splashModeMono1:
for (y = 0; y < h; ++y) {
diff --git a/source/libs/poppler/poppler-0.30.0/splash/Splash.h b/source/libs/poppler/poppler-0.32.0/splash/Splash.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/Splash.h
rename to source/libs/poppler/poppler-0.32.0/splash/Splash.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.cc
index ac344f17c35a1cae2f9a5a208fb0f5313ded6f20..e886683fd415063a6dd8ea7b78b8352420c9e949 100755
--- a/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.cc
+++ b/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.cc
@@ -11,7 +11,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006, 2009, 2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2009, 2010, 2012, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007 Ilmari Heikkinen <ilmari.heikkinen@gmail.com>
// Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com>
// Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
@@ -275,7 +275,7 @@ SplashError SplashBitmap::writeAlphaPGMFile(char *fileName) {
void SplashBitmap::getPixel(int x, int y, SplashColorPtr pixel) {
SplashColorPtr p;
- if (y < 0 || y >= height || x < 0 || x >= width) {
+ if (y < 0 || y >= height || x < 0 || x >= width || !data) {
return;
}
switch (mode) {
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.h b/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashClip.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashClip.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashClip.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashClip.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashClip.h b/source/libs/poppler/poppler-0.32.0/splash/SplashClip.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashClip.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashClip.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashErrorCodes.h b/source/libs/poppler/poppler-0.32.0/splash/SplashErrorCodes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashErrorCodes.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashErrorCodes.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.h b/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.h b/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.h b/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFont.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashFont.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFont.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFont.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFont.h b/source/libs/poppler/poppler-0.32.0/splash/SplashFont.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFont.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFont.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.h b/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.h b/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.h b/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashGlyphBitmap.h b/source/libs/poppler/poppler-0.32.0/splash/SplashGlyphBitmap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashGlyphBitmap.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashGlyphBitmap.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashMath.h b/source/libs/poppler/poppler-0.32.0/splash/SplashMath.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashMath.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashMath.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashPath.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashPath.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashPath.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashPath.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashPath.h b/source/libs/poppler/poppler-0.32.0/splash/SplashPath.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashPath.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashPath.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashPattern.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashPattern.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.h b/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashPattern.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashPattern.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashScreen.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashScreen.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.h b/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashScreen.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashScreen.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashState.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashState.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashState.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashState.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashState.h b/source/libs/poppler/poppler-0.32.0/splash/SplashState.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashState.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashState.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.h b/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.h b/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.h b/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashTypes.h b/source/libs/poppler/poppler-0.32.0/splash/SplashTypes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashTypes.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashTypes.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashXPath.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashXPath.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.h b/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashXPath.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashXPath.h
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.cc b/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.cc
rename to source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.cc
diff --git a/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.h b/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.h
similarity index 100%
rename from source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.h
rename to source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.h
diff --git a/source/libs/poppler/version.ac b/source/libs/poppler/version.ac
index aac07c92affc1339a3c680348cf52177040d3b67..20359d39c411a007f89b32e8aa477afe9aa917c4 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.30.0])
+m4_define([poppler_version], [0.32.0])
diff --git a/source/libs/zlib/ChangeLog b/source/libs/zlib/ChangeLog
index 74cdaa57d3ed258034d3cc2204ab8ac030b6f47c..3bd03b955ec13e5b058e773b3fbb04e3fa5c2ca0 100644
--- a/source/libs/zlib/ChangeLog
+++ b/source/libs/zlib/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Added KPSE_COMPILER_VISIBILITY.
diff --git a/source/libs/zlib/Makefile.am b/source/libs/zlib/Makefile.am
index 4456426c7d455cb71220878e70b14b40de70f7da..6ce5fefe0bf4a44daf0280b49d0ef186178d952c 100644
--- a/source/libs/zlib/Makefile.am
+++ b/source/libs/zlib/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build zlib for TeX Live.
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,10 +14,9 @@ EXTRA_DIST = $(ZLIB_TREE)
##
EXTRA_DIST += $(ZLIB_TREE)-PATCHES
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
- rm -f $(distdir)/$(ZLIB_TREE)/zconf.h
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include
diff --git a/source/libs/zlib/Makefile.in b/source/libs/zlib/Makefile.in
index d612feceb2eb1982e035856de0c54c48573d1659..ee83c26bdd515606d89a9789b7f3b9391659ac96 100644
--- a/source/libs/zlib/Makefile.in
+++ b/source/libs/zlib/Makefile.in
@@ -409,7 +409,8 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
@@ -557,6 +558,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(ZLIB_TREE) $(ZLIB_TREE)-PATCHES
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(ZLIB_TREE) $(ZLIB_DEFINES)
AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
@@ -605,7 +612,7 @@ all: config.h
.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -627,7 +634,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1355,11 +1362,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
- rm -f $(distdir)/$(ZLIB_TREE)/zconf.h
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libz_a_OBJECTS): zconf.h
diff --git a/source/libs/zziplib/ChangeLog b/source/libs/zziplib/ChangeLog
index 1a40ce7ff9f6dd05078e2a814ef65549aea513a2..9687547684a2a1d187cc8d17611d3bb686633b67 100644
--- a/source/libs/zziplib/ChangeLog
+++ b/source/libs/zziplib/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Added KPSE_COMPILER_VISIBILITY.
diff --git a/source/libs/zziplib/Makefile.am b/source/libs/zziplib/Makefile.am
index 0a15a6ecb84f7bb49096ae1cfd6448c3cc414a6f..84ca3d8d3cdc2cec74da62afd7cd6a63c9fac56d 100644
--- a/source/libs/zziplib/Makefile.am
+++ b/source/libs/zziplib/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build zziplib for TeX Live.
##
-## Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2010-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,13 +14,9 @@ EXTRA_DIST = $(ZZIPLIB_TREE)
##
EXTRA_DIST += $(ZZIPLIB_TREE)-PATCHES
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` \
- $(distdir)/$(ZZIPLIB_TREE)/uses
- rm -f $(distdir)/$(ZZIPLIB_TREE)/aclocal.m4 \
- $(distdir)/$(ZZIPLIB_TREE)/zzip/_config.h \
- $(distdir)/$(ZZIPLIB_TREE)/zzip/_msvc.h
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include/zzip
diff --git a/source/libs/zziplib/Makefile.in b/source/libs/zziplib/Makefile.in
index afc93b6b05c757cca6a28a2a185c05e880335c0d..ae18a5559402460f3c1b42bcbe48887d4c1c5a6d 100644
--- a/source/libs/zziplib/Makefile.in
+++ b/source/libs/zziplib/Makefile.in
@@ -409,9 +409,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
$(top_srcdir)/../../build-aux/depcomp \
@@ -571,6 +572,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(ZZIPLIB_TREE) $(ZZIPLIB_TREE)-PATCHES
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
SUBDIRS = . include/zzip
AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) \
$(ZLIB_INCLUDES) $(ZZIPLIB_DEFINES)
@@ -608,7 +615,7 @@ all: config.h
.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -630,7 +637,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1343,14 +1350,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` \
- $(distdir)/$(ZZIPLIB_TREE)/uses
- rm -f $(distdir)/$(ZZIPLIB_TREE)/aclocal.m4 \
- $(distdir)/$(ZZIPLIB_TREE)/zzip/_config.h \
- $(distdir)/$(ZZIPLIB_TREE)/zzip/_msvc.h
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libzzip_a_OBJECTS): config.force
diff --git a/source/m4/ChangeLog b/source/m4/ChangeLog
index f6292b4d1c78a5ac0530df0bb8ed5c0afca13d17..90582391f89a52f824c3e822a6e96bb41d06d9d3 100644
--- a/source/m4/ChangeLog
+++ b/source/m4/ChangeLog
@@ -1,3 +1,22 @@
+2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-common.m4 (KPSE_COMMON): Drop checks for strcasecmp,
+ strtol, and strstr.
+
+2015-03-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-win32.m4: Define KPSE_DO_IF_WIN32 for WIN32 only tests.
+
+2015-02-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-cairo-flags.m4: Require KPSE_PIXMAN_FLAGS.
+ * kpse-poppler-flags.m4: Require KPSE_ZLIB_FLAGS.
+ * kpse-teckit-flags.m4: Use pkg-config.
+
+2015-02-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-pkgs.m4 (kpse_texk_pkgs): Add musixtnt.
+
2015-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-setup.m4: Disable LuaJITTeX for powerpc-*-darwin*.
diff --git a/source/m4/kpse-cairo-flags.m4 b/source/m4/kpse-cairo-flags.m4
index 3d7539633fc6df6437e10e292286ef911de567a3..b6f2d6839d49bbc8486ac60756097c8acfeea15d 100644
--- a/source/m4/kpse-cairo-flags.m4
+++ b/source/m4/kpse-cairo-flags.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -7,11 +7,12 @@
# KPSE_CAIRO_FLAGS
# ----------------
-# Provide the configure options '--with-system-pixman' (if in the TL tree).
+# Provide the configure options '--with-system-cairo' (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], [dnl
+AC_REQUIRE([KPSE_PIXMAN_FLAGS])[]dnl
_KPSE_LIB_FLAGS([cairo], [cairo], [],
[-IBLD/libs/cairo/cairo], [BLD/libs/cairo/libcairo.a], [],
[], [${top_builddir}/../../libs/cairo/cairo/cairo.h])[]dnl
diff --git a/source/m4/kpse-common.m4 b/source/m4/kpse-common.m4
index 70a4c48d79f6c63ad4ea3e216fe96924135e26ab..dfd98d9cbb8646fe4319c18c3834562bcd614094 100644
--- a/source/m4/kpse-common.m4
+++ b/source/m4/kpse-common.m4
@@ -1,6 +1,6 @@
# Public macros for the TeX Live (TL) tree.
# Copyright (C) 1995-2009 Karl Berry <tex-live@tug.org>
-# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holders
# give unlimited permission to copy and/or distribute it,
@@ -248,7 +248,7 @@ AC_FUNC_CLOSEDIR_VOID
AC_CHECK_HEADERS([assert.h float.h limits.h pwd.h stdlib.h sys/param.h])
dnl
dnl Replacement functions that may be required on ancient broken system.
-AC_CHECK_FUNCS([putenv strcasecmp strtol strstr])
+AC_CHECK_FUNCS([putenv])
dnl
dnl More common functions
AC_CHECK_FUNCS([getcwd getwd memcmp memcpy mkstemp mktemp strchr strrchr])
diff --git a/source/m4/kpse-dll-name.m4 b/source/m4/kpse-dll-name.m4
index 019cf0b1328b21b3101e89bcd5f749dc3d02bda3..ba6a40968013090f8682fb8f2c2e806a02741aad 100644
--- a/source/m4/kpse-dll-name.m4
+++ b/source/m4/kpse-dll-name.m4
@@ -1,8 +1,8 @@
# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
#
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# 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_DLL_NAME([M32], [M64], [C32], [C64])
diff --git a/source/m4/kpse-lt-hack.m4 b/source/m4/kpse-lt-hack.m4
index 0110e3578e1c714da82bbde3f6bb95d327e013ee..10c0ad78d579d2a575616632abfda4ec4060229e 100644
--- a/source/m4/kpse-lt-hack.m4
+++ b/source/m4/kpse-lt-hack.m4
@@ -1,12 +1,10 @@
# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
#
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# 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_ENABLE_LT_HACK
# -------------------
# Provide the configure option '--enable-libtool-hack'.
diff --git a/source/m4/kpse-pkgs.m4 b/source/m4/kpse-pkgs.m4
index 83a7c8737036f1f557ca39bbdc6fc050ac5da6fc..744e0c873c352d5a803d3ff2c87ee1c3979757e1 100644
--- a/source/m4/kpse-pkgs.m4
+++ b/source/m4/kpse-pkgs.m4
@@ -1,5 +1,5 @@
# Private macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -119,6 +119,7 @@ lcdf-typetools
makeindexk
makejvf
mendexk
+musixtnt
ps2pk
psutils
seetexk
diff --git a/source/m4/kpse-poppler-flags.m4 b/source/m4/kpse-poppler-flags.m4
index 37aa4af0977e86e770679daa0c10a3b5608b1244..1ba2d5bf729f3240924e48145502d0d59c1d2e5a 100644
--- a/source/m4/kpse-poppler-flags.m4
+++ b/source/m4/kpse-poppler-flags.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -13,6 +13,7 @@
# LIBS required for the `-lpoppler' library in libs/poppler/ of the TL tree.
AC_DEFUN([KPSE_POPPLER_FLAGS], [dnl
AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
+AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
_KPSE_LIB_FLAGS([poppler], [poppler], [],
[-IBLD/libs/poppler/include],
[BLD/libs/poppler/libpoppler.a], [],
diff --git a/source/m4/kpse-search-libs.m4 b/source/m4/kpse-search-libs.m4
index 7f45999062208ca171676af1b9d5935b94c168b5..ff24c0f40bf6f0f40d7d4df052e4f7fb8a4ec8be 100644
--- a/source/m4/kpse-search-libs.m4
+++ b/source/m4/kpse-search-libs.m4
@@ -1,8 +1,8 @@
# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
#
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# 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_SEARCH_LIBS(VARIABLE, FUNCTION, SEARCH-LIBS, [ACTION-IF-NOT-FOUND])
diff --git a/source/m4/kpse-size-max.m4 b/source/m4/kpse-size-max.m4
index d80276c42d76961a2681d20da2486ffdd50972a5..4f03a3a2481b8f536b6b07e19bf654a5af23c402 100644
--- a/source/m4/kpse-size-max.m4
+++ b/source/m4/kpse-size-max.m4
@@ -1,8 +1,8 @@
# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
#
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# 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_CHECK_SIZE_MAX
diff --git a/source/m4/kpse-teckit-flags.m4 b/source/m4/kpse-teckit-flags.m4
index 52f5d13a0f7b71b79c6a8eacf16e73ba0d6b9493..7e027c0e1d44f85aa16df65a072006977bf2c018 100644
--- a/source/m4/kpse-teckit-flags.m4
+++ b/source/m4/kpse-teckit-flags.m4
@@ -1,21 +1,18 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2015 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_TECKIT_FLAGS
# -----------------
-# Provide the configure options '--with-system-teckit' (if in the TL tree),
-# '--with-teckit-includes', and '--with-teckit-libdir'.
+# Provide the configure options '--with-system-teckit' (if in the TL tree).
#
# Set the make variables TECKIT_INCLUDES and TECKIT_LIBS to the CPPFLAGS and
# LIBS required for the `-lTECkit' library in libs/teckit/ of the TL tree.
-AC_DEFUN([KPSE_TECKIT_FLAGS],
-[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
+AC_DEFUN([KPSE_TECKIT_FLAGS], [dnl
+AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
_KPSE_LIB_FLAGS([teckit], [TECkit], [],
[-IBLD/libs/teckit/include], [BLD/libs/teckit/libTECkit.a], [],
[], [${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h])[]dnl
@@ -23,8 +20,16 @@ _KPSE_LIB_FLAGS([teckit], [TECkit], [],
# KPSE_TECKIT_OPTIONS([WITH-SYSTEM])
# ----------------------------------
-AC_DEFUN([KPSE_TECKIT_OPTIONS], [_KPSE_LIB_OPTIONS([teckit], [$1])])
+AC_DEFUN([KPSE_TECKIT_OPTIONS], [_KPSE_LIB_OPTIONS([teckit], [$1], [pkg-config])])
# KPSE_TECKIT_SYSTEM_FLAGS
-# ------------------------
-AC_DEFUN([KPSE_TECKIT_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([teckit], [TECkit])])
+# -------------------------
+AC_DEFUN([KPSE_TECKIT_SYSTEM_FLAGS], [dnl
+AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
+if $PKG_CONFIG teckit; then
+ TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags`
+ TECKIT_LIBS=`$PKG_CONFIG teckit --libs`
+elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then
+ AC_MSG_ERROR([did not find teckit])
+fi
+]) # KPSE_TECKIT_SYSTEM_FLAGS
diff --git a/source/m4/kpse-visibility.m4 b/source/m4/kpse-visibility.m4
index f5db6f9da098d5028b015d0413d8e6b34f5cda8d..8eeb029cc587db31c2f35331130b16666d3cfc82 100644
--- a/source/m4/kpse-visibility.m4
+++ b/source/m4/kpse-visibility.m4
@@ -1,8 +1,8 @@
# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
#
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# 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_COMPILER_VISIBILITY
diff --git a/source/m4/kpse-warnings.m4 b/source/m4/kpse-warnings.m4
index 782674ef7860e2abfed05490a470c3e2d8e23f14..54f2e0a1ab87a890ca9a6c7347d9db79dc07a368 100644
--- a/source/m4/kpse-warnings.m4
+++ b/source/m4/kpse-warnings.m4
@@ -1,8 +1,8 @@
# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
#
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# 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_COMPILER_WARNINGS
diff --git a/source/m4/kpse-win32.m4 b/source/m4/kpse-win32.m4
index 9d6375404faa55ccd2e09fe1d0001c66aff2ae8e..8893ceb68c081f170e0c22ba18a600503734b90d 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-2014 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -68,3 +68,11 @@ AM_CONDITIONAL([WIN32_CALL],
AM_COND_IF([WIN32],
[AC_CONFIG_LINKS([callexe.c:../texlive/w32_wrapper/callexe.c])])
]) # KPSE_WIN32_CALL
+
+# KPSE_DO_IF_WIN32(COMMAND)
+# -------------------------
+# Execute COMMAND, if Windows.
+AC_DEFUN([KPSE_DO_IF_WIN32], [dnl
+AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
+AS_IF([test "x$kpse_cv_have_win32" != xno], [$1])
+]) # KPSE_DO_IF_WIN32
diff --git a/source/m4/libtool.m4 b/source/m4/libtool.m4
index f796d7bcdf2b7cd9a10f0cc16a95bc45864ae82d..a3bc337b79ad3d2bd26f0c10644e55db74e70448 100644
--- a/source/m4/libtool.m4
+++ b/source/m4/libtool.m4
@@ -738,7 +738,7 @@ _LT_COPYING
_LT_LIBTOOL_TAGS
# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
_LT_LIBTOOL_CONFIG_VARS
@@ -748,13 +748,14 @@ _LT_LIBTOOL_TAG_VARS
_LT_EOF
cat <<'_LT_EOF' >> "$cfgfile"
-## -------------------------------------- ##
-## Shell functions shared with configure. ##
-## -------------------------------------- ##
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
_LT_PREPARE_MUNGE_PATH_LIST
_LT_PREPARE_CC_BASENAME
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
_LT_EOF
case $host_os in
@@ -2256,7 +2257,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \$@S|@1\"
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
;;
x:*)
eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
@@ -3100,13 +3101,15 @@ if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
-# lt_cv_sys_lib... is unaugmented for libtool script decls...
-lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
-# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
_LT_DECL([], [variables_saved_for_relink], [1],
[Variables whose values should be saved in libtool wrapper scripts and
restored at link time])
@@ -3139,8 +3142,10 @@ _LT_DECL([], [hardcode_into_libs], [0],
[Whether we should hardcode library paths into libraries])
_LT_DECL([], [sys_lib_search_path_spec], [2],
[Compile-time system search path for libraries])
-_LT_DECL([sys_lib_dlsearch_path_spec], [lt_cv_sys_lib_dlsearch_path_spec], [2],
- [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+ [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+ [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
])# _LT_SYS_DYNAMIC_LINKER
diff --git a/source/m4/ltversion.m4 b/source/m4/ltversion.m4
index a4c5ed433af826367045f6cee35f4399750ea2f1..fa04b52a3bf868bd57e7ba796d64385a51e7ec5a 100644
--- a/source/m4/ltversion.m4
+++ b/source/m4/ltversion.m4
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 4171 ltversion.m4
+# serial 4179 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.5])
-m4_define([LT_PACKAGE_REVISION], [2.4.5])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.5'
-macro_revision='2.4.5'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/source/texk/ChangeLog b/source/texk/ChangeLog
index c18a87bfb6406e4883639a97c7c23973edde6388..2be4bf51d275c425986d1d6f6f8bbed3317a513b 100644
--- a/source/texk/ChangeLog
+++ b/source/texk/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../am/dist_hook.am.
+
2013-12-26 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (ACLOCAL): Ensure aclocal.m4 is up to date.
diff --git a/source/texk/Makefile.am b/source/texk/Makefile.am
index 257d95c370f3e0337f8b67723a0768a7f0d0787c..a986a5cab57ffbd3a1e97a67f40e04944f557e66 100644
--- a/source/texk/Makefile.am
+++ b/source/texk/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
## Ensure aclocal.m4 is up to date
@@ -9,9 +9,8 @@ ACLOCAL = @ACLOCAL@ --force
SUBDIRS = . $(MAKE_SUBDIRS)
DIST_SUBDIRS = $(CONF_SUBDIRS)
-# just in case a subdirectory has added directories
-dist-hook:
- rm -rf `find $(distdir) -name .svn`
+# Files not to be distributed
+include $(srcdir)/../am/dist_hook.am
## Configure and build subdirs.
##
diff --git a/source/texk/Makefile.in b/source/texk/Makefile.in
index be272880a05f36f5a8def25c3dc3fc5cd38cc70e..09208c2ebed4095534a1a31b05a4bb265378d361 100644
--- a/source/texk/Makefile.in
+++ b/source/texk/Makefile.in
@@ -190,7 +190,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
-am__DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../am/dist_hook.am \
+ $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
$(top_srcdir)/../build-aux/compile \
$(top_srcdir)/../build-aux/config.guess \
$(top_srcdir)/../build-aux/config.sub \
@@ -341,6 +342,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = . $(MAKE_SUBDIRS)
DIST_SUBDIRS = $(CONF_SUBDIRS)
+NEVER_DIST = `find . $(NEVER_NAMES)`
+NEVER_NAMES = -name .svn
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
+
+# Files not to be distributed
recurse_this = texk/
recurse_top = ../
@@ -362,7 +369,7 @@ all: all-recursive
.SUFFIXES:
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/recurse.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/dist_hook.am $(srcdir)/../am/recurse.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -384,7 +391,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../am/recurse.am $(am__empty):
+$(srcdir)/../am/dist_hook.am $(srcdir)/../am/recurse.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -815,10 +822,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# just in case a subdirectory has added directories
dist-hook:
- rm -rf `find $(distdir) -name .svn`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
all-local: recurse
diff --git a/source/texk/README b/source/texk/README
index a5bd95895f792ee62b200d7b23ece4ed59f63d62..689986f5adbe045031b2547deaa0e93e418994d1 100644
--- a/source/texk/README
+++ b/source/texk/README
@@ -1,4 +1,4 @@
-$Id: README 36016 2015-01-11 00:03:55Z karl $
+$Id: README 36426 2015-03-03 13:30:44Z peter $
Copyright 2006-2012 TeX Users Group.
You may freely use, modify and/or distribute this file.
@@ -51,7 +51,7 @@ dvipdfm-x - maintained here, by Khaled Hosny, Akira Kakuto, et al., contains
dvipdfmx
xdvipdfmx
-dvipng 1.14 - checked 10may12
+dvipng 1.15 - checked 3mar15
http://mirror.ctan.org/dviware/dvipng/ (but maybe stale)
http://savannah.nongnu.org/files/?group=dvipng
@@ -59,7 +59,7 @@ dvipos - ?
dvipsk - maintained here, by us
-dvisvgm 1.9 - checked 7jan15
+dvisvgm 1.9.1 - checked 1mar15
http://downloads.sourceforge.net/dvisvgm/
gsftopk - from Paul Vojta's xdvi?
@@ -75,6 +75,9 @@ makejvf - ?
mendexk - maintained here, by us (akira et al.)
+/musixtnt 2015-02-09 - checked 10feb15
+ http://mirror.ctan.org/macros/musixtnt/
+
ps2pk - maintained here, by us
psutils 1.23 - checked 16jan14
diff --git a/source/texk/configure b/source/texk/configure
index 1b013965e780019ed4ee18d75f2720bdf7c6f69d..ab0b11d3c1068c8a791e82056da0e82d9e9480c3 100755
--- a/source/texk/configure
+++ b/source/texk/configure
@@ -1407,7 +1407,7 @@ Optional Features:
--disable-web2c do not build the web2c (TeX & Co.) package
--enable-auto-core cause TeX&MF to dump core, given a certain
filename
- --disable-dump-share make fmt/base/mem files architecture-dependent
+ --disable-dump-share make fmt/base files architecture-dependent
--disable-ipc disable TeX's --ipc option, i.e., pipe to a
program
--disable-tex do not compile and install TeX
@@ -1444,7 +1444,7 @@ Optional Features:
--enable-tektronixwin include Tektronix window support
--enable-unitermwin include Uniterm window support
--disable-web-progs do not build WEB programs bibtex ... weave
- --disable-synctex do not build the SyncTeX tool
+ --disable-synctex do not build the SyncTeX library and tool
--disable-texlive do not build the texlive (TeX Live scripts) package
--disable-linked-scripts do not install the linked scripts
--disable-mktexmf-default do not run mktexmf if MF source missing
@@ -3515,8 +3515,7 @@ fi
if test "${enable_web_progs+set}" = set; then :
enableval=$enable_web_progs;
fi
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
# Check whether --enable-synctex was given.
if test "${enable_synctex+set}" = set; then :
enableval=$enable_synctex;
diff --git a/source/texk/kpathsea/ChangeLog b/source/texk/kpathsea/ChangeLog
index bde213e16db49155277fa708b53eb6ae1261fb32..656b42ce232d401341c8e073506eba572ce8aae2 100644
--- a/source/texk/kpathsea/ChangeLog
+++ b/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Drop checks for strcasecmp, strtol, and strstr.
+ * lib.h: Drop the strstr() prototype.
+ * Makefile.am: No need to distribute the replacement functions.
+
2014-12-13 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* texmf.cnf: Sync with master which is changed by Norbert.
diff --git a/source/texk/kpathsea/Makefile.am b/source/texk/kpathsea/Makefile.am
index 17ab473710a911353a0c3da45bd194221009cf7e..e72d1037b56966f5ba1023d2167b40f452bb3054 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-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
SUBDIRS = . doc man
@@ -106,10 +106,7 @@ endif !WIN32
$(libkpathsea_la_OBJECTS): paths.h kpathsea.h
EXTRA_DIST += \
- putenv.c \
- strcasecmp.c \
- strtol.c \
- strstr.c
+ putenv.c
kpseincludedir = ${includedir}/kpathsea
diff --git a/source/texk/kpathsea/Makefile.in b/source/texk/kpathsea/Makefile.in
index 642b71ecfa264dcef5733e81095aa443a6f4f2b8..92a7cb88c3bd3999025602838827aa9f6910d6fd 100644
--- a/source/texk/kpathsea/Makefile.in
+++ b/source/texk/kpathsea/Makefile.in
@@ -527,8 +527,7 @@ am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
../../build-aux/config.sub ../../build-aux/depcomp \
../../build-aux/install-sh ../../build-aux/ltmain.sh \
../../build-aux/missing ../../build-aux/texinfo.tex \
- ../../build-aux/ylwrap AUTHORS ChangeLog NEWS README putenv.c \
- strcasecmp.c strstr.c strtol.c
+ ../../build-aux/ylwrap AUTHORS ChangeLog NEWS README putenv.c
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -694,8 +693,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = . doc man $(am__append_6)
-EXTRA_DIST = PROJECTS putenv.c strcasecmp.c strtol.c strstr.c bsnl.awk \
- cnf-to-paths.awk $(TESTS) tests/cnfnewline/texmf.cnf mktex.cnf
+EXTRA_DIST = PROJECTS putenv.c bsnl.awk cnf-to-paths.awk $(TESTS) \
+ tests/cnfnewline/texmf.cnf mktex.cnf
AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libkpathsea.la
@@ -1018,9 +1017,6 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/putenv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strstr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtol.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpsestat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpsewhich.Po@am__quote@
diff --git a/source/texk/kpathsea/c-auto.in b/source/texk/kpathsea/c-auto.in
index 78f48eb47dd3ef508d0aadb2f2bc77b61c84833e..00e20cb020ef3fd61f2cd62a599c594f7ffcbd9b 100644
--- a/source/texk/kpathsea/c-auto.in
+++ b/source/texk/kpathsea/c-auto.in
@@ -39,10 +39,6 @@
*/
#undef HAVE_DECL_PUTENV
-/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
- */
-#undef HAVE_DECL_STRSTR
-
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
@@ -98,9 +94,6 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
@@ -113,12 +106,6 @@
/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
-
/* Define to 1 if `st_mtim' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_MTIM
diff --git a/source/texk/kpathsea/configure b/source/texk/kpathsea/configure
index efed449ff305dbfae7c0653d0ae6efd6b1eea5c0..deac639ba1cd02dd5c171ef164f73dade694225f 100755
--- a/source/texk/kpathsea/configure
+++ b/source/texk/kpathsea/configure
@@ -4294,8 +4294,8 @@ esac
-macro_version='2.4.5'
-macro_revision='2.4.5'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -7753,7 +7753,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -12078,13 +12078,20 @@ if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
-# lt_cv_sys_lib... is unaugmented for libtool script decls...
-lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
-# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -13456,13 +13463,12 @@ fi
done
-for ac_func in putenv strcasecmp strtol strstr
+for ac_func in putenv
do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv"
+if test "x$ac_cv_func_putenv" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_PUTENV 1
_ACEOF
fi
@@ -13877,16 +13883,6 @@ fi
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_PUTENV $ac_have_decl
_ACEOF
-ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strstr" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRSTR $ac_have_decl
-_ACEOF
ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv"
if test "x$ac_cv_func_putenv" = xyes; then :
@@ -13901,45 +13897,6 @@ esac
fi
-ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
-if test "x$ac_cv_func_strcasecmp" = xyes; then :
- $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" strcasecmp.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
-if test "x$ac_cv_func_strtol" = xyes; then :
- $as_echo "#define HAVE_STRTOL 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" strtol.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS strtol.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr"
-if test "x$ac_cv_func_strstr" = xyes; then :
- $as_echo "#define HAVE_STRSTR 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" strstr.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS strstr.$ac_objext"
- ;;
-esac
-
-fi
-
if test "x$ac_cv_func_getcwd" = xyes; then
@@ -15049,7 +15006,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -15168,7 +15126,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-lt_cv_sys_lib_dlsearch_path_spec; do
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
@@ -15948,7 +15907,7 @@ $as_echo X"$file" |
available_tags=''
# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -16202,8 +16161,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -16355,9 +16317,8 @@ hardcode_action=$hardcode_action
_LT_EOF
cat <<'_LT_EOF' >> "$cfgfile"
-## -------------------------------------- ##
-## Shell functions shared with configure. ##
-## -------------------------------------- ##
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
# func_munge_path_list VARIABLE PATH
# -----------------------------------
@@ -16379,7 +16340,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -16410,6 +16371,8 @@ func_cc_basename ()
}
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
_LT_EOF
case $host_os in
diff --git a/source/texk/kpathsea/configure.ac b/source/texk/kpathsea/configure.ac
index e20f7a83fe4223f885e08d6b3b15cdff0915aeef..d2e08afa4042ea562b5bb04cf26c04e2c9159bf2 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-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2015 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,
@@ -36,8 +36,8 @@ AC_PROG_AWK
AC_CHECK_SIZEOF([long])
dnl Replacement functions that may be required on ancient broken system.
-AC_CHECK_DECLS([putenv, strstr])
-AC_REPLACE_FUNCS([putenv strcasecmp strtol strstr])
+AC_CHECK_DECLS([putenv])
+AC_REPLACE_FUNCS([putenv])
if test "x$ac_cv_func_getcwd" = xyes; then
# We only need to run this if we have getcwd.
diff --git a/source/texk/kpathsea/lib.h b/source/texk/kpathsea/lib.h
index 2aac2519b3da9662c19fdbd35d1c61f66ebaa98b..8c1f8e1ecc4a004bbc64d1c8ececf3cf7a46527f 100644
--- a/source/texk/kpathsea/lib.h
+++ b/source/texk/kpathsea/lib.h
@@ -1,7 +1,7 @@
/* lib.h: declarations for common, low-level routines in kpathsea.
Copyright 1992, 1993, 1994, 1995, 1996, 2008, 2009, 2010, 2011,
- 2012 Karl Berry.
+ 2012, 2015 Karl Berry.
Copyright 1999, 2000, 2003, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -151,10 +151,6 @@ extern KPSEDLL const_string xbasename (const_string name);
/* Return directory part of NAME. This returns a new string. */
extern KPSEDLL string xdirname (const_string name);
-#if !HAVE_DECL_STRSTR
-extern string strstr (const_string haystack, const_string needle);
-#endif
-
/* If NAME has a suffix, return a pointer to its first character (i.e.,
the one after the `.'); otherwise, return NULL. */
extern KPSEDLL const_string find_suffix (const_string name);
diff --git a/source/texk/kpathsea/strcasecmp.c b/source/texk/kpathsea/strcasecmp.c
deleted file mode 100644
index 481a1ae45f702f294f516dcaef603c079eb36a9e..0000000000000000000000000000000000000000
--- a/source/texk/kpathsea/strcasecmp.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* strcasecmp.c - case-insensitive strcmp
-
- Copyright 2008, 2010 Karl Berry.
- Copyright 1991, 1992, 1995 Free Software Foundation, Inc.
- This file was part of the GNU C Library.
- Modified by Karl Berry for kpathsea.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, see <http://www.gnu.org/licenses/>. */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <ctype.h>
-
-/* Compare S1 and S2, ignoring case, returning less than, equal to or
- greater than zero if S1 is lexiographically less than,
- equal to or greater than S2. */
-int
-strcasecmp (s1, s2)
- const char *s1;
- const char *s2;
-{
- register const unsigned char *p1 = (const unsigned char *) s1;
- register const unsigned char *p2 = (const unsigned char *) s2;
- unsigned char c1, c2;
-
- if (p1 == p2)
- return 0;
-
- do
- {
- c1 = tolower (*p1++);
- c2 = tolower (*p2++);
- if (c1 == '\0')
- break;
- }
- while (c1 == c2);
-
- return c1 - c2;
-}
-
-int
-strncasecmp (s1, s2, n)
- const char *s1;
- const char *s2;
- unsigned n;
-{
- register const unsigned char *p1 = (const unsigned char *) s1;
- register const unsigned char *p2 = (const unsigned char *) s2;
- unsigned char c1, c2;
-
- if (p1 == p2 || n == 0)
- return 0;
-
- do
- {
- c1 = tolower (*p1++);
- c2 = tolower (*p2++);
- if (c1 == '\0' || c1 != c2)
- return c1 - c2;
- } while (--n > 0);
-
- return c1 - c2;
-}
diff --git a/source/texk/kpathsea/strstr.c b/source/texk/kpathsea/strstr.c
deleted file mode 100644
index 4042c49287230fc239faf8745c6ee029e6f73279..0000000000000000000000000000000000000000
--- a/source/texk/kpathsea/strstr.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* strstr.c - search for a substring in string.
-
- Copyright 2008, 2010 Karl Berry.
- Copyright 1994, 1995 Free Software Foundation, Inc.
- This file was part of the GNU C Library.
- Modified for kpathsea by Karl Berry.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, see <http://www.gnu.org/licenses/>. */
-
-/*
- * My personal strstr() implementation that beats most other algorithms.
- * Until someone tells me otherwise, I assume that this is the
- * fastest implementation of strstr() in C.
- * I deliberately chose not to comment it. You should have at least
- * as much fun trying to understand it, as I had to write it :-).
- *
- * Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-typedef unsigned chartype;
-
-char *
-strstr (phaystack, pneedle)
- const char *phaystack;
- const char *pneedle;
-{
- register const unsigned char *haystack, *needle;
- register chartype b, c;
-
- haystack = (const unsigned char *) phaystack;
- needle = (const unsigned char *) pneedle;
-
- b = *needle;
- if (b != '\0')
- {
- haystack--; /* possible ANSI violation */
- do
- {
- c = *++haystack;
- if (c == '\0')
- goto ret0;
- }
- while (c != b);
-
- c = *++needle;
- if (c == '\0')
- goto foundneedle;
- ++needle;
- goto jin;
-
- for (;;)
- {
- register chartype a;
- register const unsigned char *rhaystack, *rneedle;
-
- do
- {
- a = *++haystack;
- if (a == '\0')
- goto ret0;
- if (a == b)
- break;
- a = *++haystack;
- if (a == '\0')
- goto ret0;
-shloop: ;
- }
- while (a != b);
-
-jin: a = *++haystack;
- if (a == '\0')
- goto ret0;
-
- if (a != c)
- goto shloop;
-
- rhaystack = haystack-- + 1;
- rneedle = needle;
- a = *rneedle;
-
- if (*rhaystack == a)
- do
- {
- if (a == '\0')
- goto foundneedle;
- ++rhaystack;
- a = *++needle;
- if (*rhaystack != a)
- break;
- if (a == '\0')
- goto foundneedle;
- ++rhaystack;
- a = *++needle;
- }
- while (*rhaystack == a);
-
- needle = rneedle; /* took the register-poor aproach */
-
- if (a == '\0')
- break;
- }
- }
-foundneedle:
- return (char*) haystack;
-ret0:
- return 0;
-}
diff --git a/source/texk/kpathsea/strtol.c b/source/texk/kpathsea/strtol.c
deleted file mode 100644
index a1864c6f7edcc61742c17d57a0b5755c7561b7b3..0000000000000000000000000000000000000000
--- a/source/texk/kpathsea/strtol.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/* strtol.c - convert a string to an unsigned long int.
-
- Copyright 1997, 2008 Karl Berry.
- Copyright 1991, 1992, 1994, 1995 Free Software Foundation, Inc.
- Modified by Karl Berry for kpathsea.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, see <http://www.gnu.org/licenses/>. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define USE_NUMBER_GROUPING
-# define STDC_HEADERS
-# define HAVE_LIMITS_H
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#ifdef HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stddef.h>
-# include <stdlib.h>
-#else
-# ifndef NULL
-# define NULL 0
-# endif
-#endif
-
-#ifdef USE_NUMBER_GROUPING
-# include "../locale/localeinfo.h"
-#endif
-
-/* Nonzero if we are defining `strtoul' or `strtouq', operating on
- unsigned integers. */
-#ifndef UNSIGNED
-# define UNSIGNED 0
-# define INT LONG int
-#else
-# define strtol strtoul
-# define INT unsigned LONG int
-#endif
-
-/* If QUAD is defined, we are defining `strtoq' or `strtouq',
- operating on `long long int's. */
-#ifdef QUAD
-# if UNSIGNED
-# define strtoul strtouq
-# else
-# define strtol strtoq
-# endif
-# define LONG long long
-# undef LONG_MIN
-# define LONG_MIN LONG_LONG_MIN
-# undef LONG_MAX
-# define LONG_MAX LONG_LONG_MAX
-# undef ULONG_MAX
-# define ULONG_MAX ULONG_LONG_MAX
-# if __GNUC__ == 2 && __GNUC_MINOR__ < 7
- /* Work around gcc bug with using this constant. */
- static const unsigned long long int maxquad = ULONG_LONG_MAX;
-# undef ULONG_MAX
-# define ULONG_MAX maxquad
-# endif
-#else
-# define LONG long
-#endif
-
-#ifdef __STDC__
-# define INTERNAL(x) INTERNAL1(x)
-# define INTERNAL1(x) __##x##_internal
-#else
-# define INTERNAL(x) __/**/x/**/_internal
-#endif
-
-#ifdef USE_NUMBER_GROUPING
-/* This file defines a function to check for correct grouping. */
-# include "grouping.h"
-#endif
-
-
-/* Convert NPTR to an `unsigned long int' or `long int' in base BASE.
- If BASE is 0 the base is determined by the presence of a leading
- zero, indicating octal or a leading "0x" or "0X", indicating hexadecimal.
- If BASE is < 2 or > 36, it is reset to 10.
- If ENDPTR is not NULL, a pointer to the character after the last
- one converted is stored in *ENDPTR. */
-
-INT
-INTERNAL (strtol) (nptr, endptr, base, group)
- const char *nptr;
- char **endptr;
- int base;
- int group;
-{
- int negative;
- register unsigned LONG int cutoff;
- register unsigned int cutlim;
- register unsigned LONG int i;
- register const char *s;
- register unsigned char c;
- const char *save, *end;
- int overflow;
-
-#ifdef USE_NUMBER_GROUPING
- /* The thousands character of the current locale. */
- wchar_t thousands;
- /* The numeric grouping specification of the current locale,
- in the format described in <locale.h>. */
- const char *grouping;
-
- if (group)
- {
- grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
- if (*grouping <= 0 || *grouping == CHAR_MAX)
- grouping = NULL;
- else
- {
- /* Figure out the thousands separator character. */
- if (mbtowc (&thousands, _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
- strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
- thousands = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
- if (thousands == L'\0')
- grouping = NULL;
- }
- }
- else
- grouping = NULL;
-#endif
-
- if (base < 0 || base == 1 || base > 36)
- base = 10;
-
- s = nptr;
-
- /* Skip white space. */
- while (isspace (*s))
- ++s;
- if (*s == '\0')
- goto noconv;
-
- /* Check for a sign. */
- if (*s == '-')
- {
- negative = 1;
- ++s;
- }
- else if (*s == '+')
- {
- negative = 0;
- ++s;
- }
- else
- negative = 0;
-
- if (base == 16 && s[0] == '0' && toupper (s[1]) == 'X')
- s += 2;
-
- /* If BASE is zero, figure it out ourselves. */
- if (base == 0)
- if (*s == '0')
- {
- if (toupper (s[1]) == 'X')
- {
- s += 2;
- base = 16;
- }
- else
- base = 8;
- }
- else
- base = 10;
-
- /* Save the pointer so we can check later if anything happened. */
- save = s;
-
-#ifdef USE_NUMBER_GROUPING
- if (group)
- {
- /* Find the end of the digit string and check its grouping. */
- end = s;
- for (c = *end; c != '\0'; c = *++end)
- if (c != thousands && !isdigit (c) &&
- (!isalpha (c) || toupper (c) - 'A' + 10 >= base))
- break;
- if (*s == thousands)
- end = s;
- else
- end = correctly_grouped_prefix (s, end, thousands, grouping);
- }
- else
-#endif
- end = NULL;
-
- cutoff = ULONG_MAX / (unsigned LONG int) base;
- cutlim = ULONG_MAX % (unsigned LONG int) base;
-
- overflow = 0;
- i = 0;
- for (c = *s; c != '\0'; c = *++s)
- {
- if (s == end)
- break;
- if (isdigit (c))
- c -= '0';
- else if (isalpha (c))
- c = toupper (c) - 'A' + 10;
- else
- break;
- if (c >= base)
- break;
- /* Check for overflow. */
- if (i > cutoff || (i == cutoff && c > cutlim))
- overflow = 1;
- else
- {
- i *= (unsigned LONG int) base;
- i += c;
- }
- }
-
- /* Check if anything actually happened. */
- if (s == save)
- goto noconv;
-
- /* Store in ENDPTR the address of one character
- past the last character we converted. */
- if (endptr != NULL)
- *endptr = (char *) s;
-
-#if !UNSIGNED
- /* Check for a value that is within the range of
- `unsigned LONG int', but outside the range of `LONG int'. */
- if (i > (negative ?
- -(unsigned LONG int) LONG_MIN : (unsigned LONG int) LONG_MAX))
- overflow = 1;
-#endif
-
- if (overflow)
- {
- errno = ERANGE;
-#if UNSIGNED
- return ULONG_MAX;
-#else
- return negative ? LONG_MIN : LONG_MAX;
-#endif
- }
-
- /* Return the result of the appropriate sign. */
- return (negative ? -i : i);
-
-noconv:
- /* There was no number to convert. */
- if (endptr != NULL)
- *endptr = (char *) nptr;
- return 0L;
-}
-
-/* External user entry point. */
-
-#ifdef weak_symbol
-weak_symbol (strtol)
-#endif
-
-INT
-strtol (nptr, endptr, base)
- const char *nptr;
- char **endptr;
- int base;
-{
- return INTERNAL (strtol) (nptr, endptr, base, 0);
-}
diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog
index 85d88fd0858199f7fb24cecb96926b773c4eafb6..c18e27888f108813790a3dd7cdec35106cc0e5e1 100644
--- a/source/texk/web2c/ChangeLog
+++ b/source/texk/web2c/ChangeLog
@@ -1,3 +1,19 @@
+2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * w2c/config.h: Drop the strtol() prototype.
+
+2015-03-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Initialize {EXTRA,lib}_{,LT}LIBRARIES.
+
+2015-02-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ac/web2c.ac: Update some help texts.
+
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2015-01-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* cpascal.h: Remove intcast.
diff --git a/source/texk/web2c/Makefile.am b/source/texk/web2c/Makefile.am
index 1b23f6cd5ac6082351a1f2f8075a5824d5727c7e..54515ae21d5cc0954cf7ce9bf86b405ca192f713 100644
--- a/source/texk/web2c/Makefile.am
+++ b/source/texk/web2c/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/web2c/.
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
@@ -17,15 +17,18 @@ proglib = lib/lib.a
## Below we will add to these
EXTRA_PROGRAMS =
+EXTRA_LIBRARIES =
+EXTRA_LTLIBRARIES =
bin_PROGRAMS =
+lib_LIBRARIES =
+lib_LTLIBRARIES =
noinst_PROGRAMS =
dist_man_MANS =
nodist_man_MANS =
check_PROGRAMS =
TESTS =
-EXTRA_LIBRARIES =
EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h
-DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh
+DISTCLEANFILES = CXXLD.sh
CLEANFILES =
TRIPTRAP_CLEAN =
TRIPTRAP =
@@ -33,11 +36,8 @@ bin_links =
install_exe_links =
uninstall_exe_links =
-dist-hook:
- cd "$(distdir)" && rm -rf $(NEVER_DIST)
-
-## in case of an SVN repository
-NEVER_DIST = `find . -name .svn`
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
## The sh script that does the conversion.
web2c = AM_V_P=$(AM_V_P) $(SHELL) ./web2c-sh $@
diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in
index 710dc5e5e758e7ad0219dc6dd10e6debda9f423f..d7569d3796b5f425cf2f0c6fcb9c7d0b0da0fa21 100644
--- a/source/texk/web2c/Makefile.in
+++ b/source/texk/web2c/Makefile.in
@@ -122,7 +122,7 @@ TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
$(am__append_50) $(am__append_52) $(am__append_58) \
$(am__append_62) $(am__append_64) $(am__append_70) \
$(am__append_81) $(am__append_82) $(am__append_90) \
- $(am__append_92) $(am__append_95) $(am__append_125) \
+ $(am__append_92) $(am__append_95) $(am__append_127) \
libmd5/md5.test
@WEB_TRUE@am__append_1 = $(web_programs)
@WEB_TRUE@am__append_2 = $(web_tests)
@@ -233,91 +233,93 @@ TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
@ALEPH_TRUE@am__append_94 = aleph
@ALEPH_TRUE@am__append_95 = $(aleph_tests)
@SYNCTEX_TRUE@am__append_96 = synctex
-@TEX_SYNCTEX_TRUE@am__append_97 = -I$(srcdir)/synctexdir \
+@SYNCTEX_TRUE@am__append_97 = $(LTLIBSYNCTEX)
+@SYNCTEX_TRUE@am__append_98 = $(LIBSYNCTEX)
+@TEX_SYNCTEX_TRUE@am__append_99 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_98 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_99 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_100 = \
+@TEX_SYNCTEX_TRUE@am__append_100 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_101 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_102 = \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h
-@ETEX_SYNCTEX_TRUE@am__append_101 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_103 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_102 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_104 = \
+@ETEX_SYNCTEX_TRUE@am__append_104 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_105 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_106 = \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h
-@PTEX_SYNCTEX_TRUE@am__append_105 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_107 = -I$(srcdir)/synctexdir \
@PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-@PTEX_SYNCTEX_TRUE@am__append_106 = $(ZLIB_LIBS)
-@PTEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_DEPEND)
-@PTEX_SYNCTEX_TRUE@am__append_108 = \
+@PTEX_SYNCTEX_TRUE@am__append_108 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_109 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_110 = \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-ptex.h
-@UPTEX_SYNCTEX_TRUE@am__append_109 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@am__append_111 = -I$(srcdir)/synctexdir \
@UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-@UPTEX_SYNCTEX_TRUE@am__append_110 = $(ZLIB_LIBS)
-@UPTEX_SYNCTEX_TRUE@am__append_111 = $(ZLIB_DEPEND)
-@UPTEX_SYNCTEX_TRUE@am__append_112 = \
+@UPTEX_SYNCTEX_TRUE@am__append_112 = $(ZLIB_LIBS)
+@UPTEX_SYNCTEX_TRUE@am__append_113 = $(ZLIB_DEPEND)
+@UPTEX_SYNCTEX_TRUE@am__append_114 = \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-uptex.h
-@EPTEX_SYNCTEX_TRUE@am__append_113 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@am__append_115 = -I$(srcdir)/synctexdir \
@EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
-@EPTEX_SYNCTEX_TRUE@am__append_114 = $(ZLIB_LIBS)
-@EPTEX_SYNCTEX_TRUE@am__append_115 = $(ZLIB_DEPEND)
-@EPTEX_SYNCTEX_TRUE@am__append_116 = \
+@EPTEX_SYNCTEX_TRUE@am__append_116 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_117 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_118 = \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-eptex.h
-@EUPTEX_SYNCTEX_TRUE@am__append_117 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@am__append_119 = -I$(srcdir)/synctexdir \
@EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
-@EUPTEX_SYNCTEX_TRUE@am__append_118 = $(ZLIB_LIBS)
-@EUPTEX_SYNCTEX_TRUE@am__append_119 = $(ZLIB_DEPEND)
-@EUPTEX_SYNCTEX_TRUE@am__append_120 = \
+@EUPTEX_SYNCTEX_TRUE@am__append_120 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_121 = $(ZLIB_DEPEND)
+@EUPTEX_SYNCTEX_TRUE@am__append_122 = \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-euptex.h
-@PDFTEX_SYNCTEX_TRUE@am__append_121 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_123 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_122 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_124 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h
-@XETEX_SYNCTEX_TRUE@am__append_123 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_125 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_124 = \
+@XETEX_SYNCTEX_TRUE@am__append_126 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xetex.h
-@SYNCTEX_TRUE@am__append_125 = $(synctex_tests)
+@SYNCTEX_TRUE@am__append_127 = $(synctex_tests)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -1257,7 +1259,8 @@ nodist_ptftopl_OBJECTS = ptftopl-ptftopl.$(OBJEXT)
ptftopl_OBJECTS = $(am_ptftopl_OBJECTS) $(nodist_ptftopl_OBJECTS)
am_synctex_OBJECTS = synctexdir/synctex-synctex_main.$(OBJEXT)
synctex_OBJECTS = $(am_synctex_OBJECTS)
-synctex_DEPENDENCIES = $(libsynctex) $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+synctex_DEPENDENCIES = $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_1)
nodist_tangle_OBJECTS = tangle.$(OBJEXT)
tangle_OBJECTS = $(nodist_tangle_OBJECTS)
tangle_LDADD = $(LDADD)
@@ -1273,9 +1276,9 @@ dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_49)
am__objects_50 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
nodist_tex_OBJECTS = $(am__objects_50) tex-tex-pool.$(OBJEXT)
tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
-@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
+@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_12)
+ $(am__DEPENDENCIES_13)
nodist_tftopl_OBJECTS = tftopl.$(OBJEXT)
tftopl_OBJECTS = $(nodist_tftopl_OBJECTS)
tftopl_LDADD = $(LDADD)
@@ -1292,7 +1295,7 @@ txt2zlib_OBJECTS = $(nodist_txt2zlib_OBJECTS)
am_upbibtex_OBJECTS =
nodist_upbibtex_OBJECTS = upbibtex-upbibtex.$(OBJEXT)
upbibtex_OBJECTS = $(am_upbibtex_OBJECTS) $(nodist_upbibtex_OBJECTS)
-am__DEPENDENCIES_13 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_14 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2)
am_updvitype_OBJECTS =
nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT)
@@ -1314,11 +1317,11 @@ am__objects_61 = $(am__objects_51) $(am__objects_52) $(am__objects_53) \
$(am__objects_59) $(am__objects_60) upmpost-ptfmin.$(OBJEXT)
nodist_upmpost_OBJECTS = $(am__objects_61)
upmpost_OBJECTS = $(nodist_upmpost_OBJECTS)
-am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmputil.a
-upmpost_DEPENDENCIES = $(am__DEPENDENCIES_14)
+upmpost_DEPENDENCIES = $(am__DEPENDENCIES_15)
am_uppltotf_OBJECTS =
nodist_uppltotf_OBJECTS = uppltotf-uppltotf.$(OBJEXT)
uppltotf_OBJECTS = $(am_uppltotf_OBJECTS) $(nodist_uppltotf_OBJECTS)
@@ -1333,7 +1336,7 @@ dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT) \
am__objects_63 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
nodist_uptex_OBJECTS = $(am__objects_63) uptex-uptex-pool.$(OBJEXT)
uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
-@UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
+@UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
am_uptftopl_OBJECTS =
nodist_uptftopl_OBJECTS = uptftopl-uptftopl.$(OBJEXT)
uptftopl_OBJECTS = $(am_uptftopl_OBJECTS) $(nodist_uptftopl_OBJECTS)
@@ -1377,13 +1380,13 @@ dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \
am__objects_65 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
nodist_xetex_OBJECTS = $(am__objects_65) xetex-xetex-pool.$(OBJEXT)
xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
-@XETEX_MACOSX_FALSE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_17 = $(libxetex) $(am__DEPENDENCIES_1) \
+@XETEX_MACOSX_FALSE@am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_18 = $(libxetex) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_16)
-xetex_DEPENDENCIES = $(am__DEPENDENCIES_17) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_17)
+xetex_DEPENDENCIES = $(am__DEPENDENCIES_18) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_1)
xetex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xetex_CXXFLAGS) \
@@ -1766,12 +1769,13 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
$(TEST_LOG_FLAGS)
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/../../am/bin_links.am \
- $(srcdir)/Makefile.in $(srcdir)/alephdir/am/aleph.am \
- $(srcdir)/am/bootstrap.am $(srcdir)/am/cweb.am \
- $(srcdir)/am/texmf.am $(srcdir)/am/web.am $(srcdir)/c-auto.in \
- $(srcdir)/ctangleboot-sh.in $(srcdir)/eptexdir/am/eptex.am \
- $(srcdir)/etexdir/am/etex.am $(srcdir)/euptexdir/am/euptex.am \
- $(srcdir)/libmd5/am/md5.am $(srcdir)/luatexdir/am/libluatex.am \
+ $(srcdir)/../../am/dist_hook.am $(srcdir)/Makefile.in \
+ $(srcdir)/alephdir/am/aleph.am $(srcdir)/am/bootstrap.am \
+ $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/am/web.am \
+ $(srcdir)/c-auto.in $(srcdir)/ctangleboot-sh.in \
+ $(srcdir)/eptexdir/am/eptex.am $(srcdir)/etexdir/am/etex.am \
+ $(srcdir)/euptexdir/am/euptex.am $(srcdir)/libmd5/am/md5.am \
+ $(srcdir)/luatexdir/am/libluatex.am \
$(srcdir)/luatexdir/am/libunilib.am \
$(srcdir)/luatexdir/am/luafontforge.am \
$(srcdir)/luatexdir/am/luamisc.am \
@@ -1928,10 +1932,12 @@ LIBPNG_DEPEND = @LIBPNG_DEPEND@
LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBSYNCTEX = @LIBSYNCTEX@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LTLIBSYNCTEX = @LTLIBSYNCTEX@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LUA52_DEFINES = @LUA52_DEFINES@
LUA52_DEPEND = @LUA52_DEPEND@
@@ -1991,7 +1997,6 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
-WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
@@ -2079,12 +2084,15 @@ AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
SUBDIRS = doc lib man web2c . window omegafonts otps
proglib = lib/lib.a
-dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
-nodist_man_MANS =
EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
libluamisc.a libluajitmisc.a libunilib.a libff.a libjitff.a \
libluatex.a libluajittex.a libxetex.a libsynctex.a libmd5.a
+EXTRA_LTLIBRARIES = libsynctex.la
+lib_LIBRARIES = $(am__append_98)
+lib_LTLIBRARIES = $(am__append_97)
+dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
+nodist_man_MANS =
EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
ctangleboot.cin cwebboot.cin cwebboot.hin tangle.test \
@@ -2343,11 +2351,11 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
synctexdir/synctex-p-rec.ch1 synctexdir/synctex-ep-mem.ch0 \
synctexdir/synctex-ep-mem.ch1 synctexdir/synctex-pdf-rec.ch2 \
synctexdir/synctex-xe-rec.ch3 $(synctex_tests) libmd5/md5.test
-DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
- tangle.p tangle-web2c tangleboot.c tangleboot.h tangleboot.p \
- tangleboot-web2c ctangle.c cweb.c cweb.h common-ctangle \
- ctangleboot.c cwebboot.c cwebboot.h cftest.p \
- $(web_programs:=.c) $(web_programs:=.h) $(web_programs:=.p) \
+DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
+ tangleboot.c tangleboot.h tangleboot.p tangleboot-web2c \
+ ctangle.c cweb.c cweb.h common-ctangle ctangleboot.c \
+ cwebboot.c cwebboot.h cftest.p $(web_programs:=.c) \
+ $(web_programs:=.h) $(web_programs:=.p) \
$(web_programs:=-web2c) tests/xexampl.aux tests/xexampl.bbl \
tests/xexampl.blg longline.aux longline.bbl longline.bib \
longline.blg tests/memtest.bib tests/memtest?.* \
@@ -2432,9 +2440,14 @@ install_exe_links = $(am__append_20) $(am__append_29) $(am__append_34) \
$(am__append_73) $(am__append_78)
uninstall_exe_links = $(am__append_21) $(am__append_30) \
$(am__append_35) $(am__append_74) $(am__append_79)
-NEVER_DIST = `find . -name .svn` cwebdir/cweave.log cwebdir/cweave.trs \
- ctiedir/ctie.log ctiedir/ctie.trs tiedir/tie.log \
- tiedir/tie.trs
+NEVER_DIST = `find . $(NEVER_NAMES)` cwebdir/cweave.log \
+ cwebdir/cweave.trs ctiedir/ctie.log ctiedir/ctie.trs \
+ tiedir/tie.log tiedir/tie.trs
+NEVER_NAMES = -name .svn
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
+
+# Files not to be distributed
web2c = AM_V_P=$(AM_V_P) $(SHELL) ./web2c-sh $@
makecpool = $(AM_V_GEN)web2c/makecpool
@@ -2534,18 +2547,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
nodist_initex_SOURCES = callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_97)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_99)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_98)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_100)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_100)
+dist_tex_SOURCES = texextra.c $(am__append_102)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_99)
+tex_prereq = texd.h $(am__append_101)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -2675,19 +2688,19 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_101)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_103)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_102)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_104)
# e-TeX C sources
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
- etexdir/etex_version.h $(am__append_104)
+ etexdir/etex_version.h $(am__append_106)
# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_103)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_105)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -2722,20 +2735,20 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
pproglib = lib/libp.a
libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_105)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_107)
# With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_106)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_108)
ptex_DEPENDENCIES = $(ptex_dependencies)
# pTeX C sources
ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
- ptexdir/ptex_version.h $(am__append_108)
+ ptexdir/ptex_version.h $(am__append_110)
# We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_107)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_109)
ptex_web_srcs = \
tex.web \
tex.ch
@@ -2769,22 +2782,22 @@ ptftopl_DEPENDENCIES = $(ptex_dependencies)
# e-pTeX Tests
#
eptex_tests = eptexdir/eptriptest
-eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_113)
+eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_115)
# With --enable-ipc, e-pTeX may need to link with -lsocket.
eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) $(am__append_114)
+ $(ipc_socketlibs) $(am__append_116)
eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
# e-pTeX C sources
eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
- eptexdir/eptex_version.h $(am__append_116)
+ eptexdir/eptex_version.h $(am__append_118)
# We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
- eptexdir/eptex_version.h $(am__append_115)
+ eptexdir/eptex_version.h $(am__append_117)
eptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -2816,21 +2829,21 @@ upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \
uptexdir/yokotate.test
libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_109)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_111)
# With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_110)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_112)
uptex_DEPENDENCIES = $(uptex_dependencies)
# upTeX C sources
uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
- uptexdir/uptex_version.h $(am__append_112)
+ uptexdir/uptex_version.h $(am__append_114)
# We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
uptex_prereq = uptexd.h ptexdir/ptex_version.h \
- uptexdir/uptex_version.h $(am__append_111)
+ uptexdir/uptex_version.h $(am__append_113)
uptex_web_srcs = \
tex.web \
tex.ch
@@ -2865,23 +2878,23 @@ uptftopl_DEPENDENCIES = $(uptex_dependencies)
# e-upTeX Tests
#
euptex_tests = euptexdir/euptriptest
-euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_117)
+euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_119)
# With --enable-ipc, e-upTeX may need to link with -lsocket.
euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) $(am__append_118)
+ $(ipc_socketlibs) $(am__append_120)
euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
# e-upTeX C sources
euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
- $(am__append_120)
+ $(am__append_122)
# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
euptex_prereq = euptexd.h etexdir/etex_version.h \
ptexdir/ptex_version.h eptexdir/eptex_version.h \
- uptexdir/uptex_version.h $(am__append_119)
+ uptexdir/uptex_version.h $(am__append_121)
euptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -2933,7 +2946,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_121)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_123)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -2946,7 +2959,7 @@ pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
- $(am__append_122)
+ $(am__append_124)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -3391,7 +3404,7 @@ xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
$(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \
$(ZLIB_DEPEND)
@XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_123)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_125)
xetex_CFLAGS = # $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -3402,7 +3415,7 @@ xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
xetexdir/etex_version.h xetexdir/xetex_version.h \
- $(am__append_124)
+ $(am__append_126)
xetex_ch_srcs = \
xetexdir/xetex.web \
xetexdir/tex.ch0 \
@@ -3533,12 +3546,8 @@ synctex_SOURCES = \
synctexdir/synctex_main.c
synctex_CPPFLAGS = -I$(srcdir)/synctexdir
-@SYSTEM_ZLIB_FALSE@libsynctex = libsynctex.a
-@SYSTEM_ZLIB_TRUE@libsynctex = libsynctex.la
synctex_LDADD = $(libsynctex) $(ZLIB_LIBS)
-EXTRA_LTLIBRARIES = libsynctex.la
-@SYNCTEX_TRUE@@SYSTEM_ZLIB_TRUE@lib_LTLIBRARIES = $(WANTEDLIBS)
-@SYNCTEX_TRUE@@SYSTEM_ZLIB_FALSE@lib_LIBRARIES = libsynctex.a
+libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
@@ -3655,7 +3664,7 @@ all: ff-config.h
.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -3677,7 +3686,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -14646,7 +14655,6 @@ uninstall-man: uninstall-man1 uninstall-man5
.PRECIOUS: Makefile
-
dist-hook:
cd "$(distdir)" && rm -rf $(NEVER_DIST)
diff --git a/source/texk/web2c/ac/web2c.ac b/source/texk/web2c/ac/web2c.ac
index 20b8085be9712753ed51d2462577d7910b80cf49..e840ba8c6b15d1550be842e61c245ea490dabbc4 100644
--- a/source/texk/web2c/ac/web2c.ac
+++ b/source/texk/web2c/ac/web2c.ac
@@ -1,6 +1,6 @@
## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
dnl
-dnl Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
## configure options for TeX and MF
@@ -18,7 +18,7 @@ AC_ARG_ENABLE([auto-core],
kpse_indent_26))[]dnl
AC_ARG_ENABLE([dump-share],
AS_HELP_STRING([--disable-dump-share],
- [make fmt/base/mem files architecture-dependent],
+ [make fmt/base files architecture-dependent],
kpse_indent_26))[]dnl
## configure options for TeX
AC_ARG_ENABLE([ipc],
@@ -75,10 +75,9 @@ AC_ARG_ENABLE([web-progs],
AS_HELP_STRING([--disable-web-progs],
[do not build WEB programs bibtex ... weave],
kpse_indent_26))[]dnl
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
AC_ARG_ENABLE([synctex],
AS_HELP_STRING([--disable-synctex],
- [do not build the SyncTeX tool],
+ [do not build the SyncTeX library and tool],
kpse_indent_26))[]dnl
diff --git a/source/texk/web2c/c-auto.in b/source/texk/web2c/c-auto.in
index 53d0046bc05a7119c9d53f3719e69f93bfead914..cc5b92f97d728a07af13bbba78f62d1ec7a17b1c 100644
--- a/source/texk/web2c/c-auto.in
+++ b/source/texk/web2c/c-auto.in
@@ -153,9 +153,6 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
@@ -180,12 +177,6 @@
/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
-
/* Define to 1 if you have the <StructTreeRoot.h> header file. */
#undef HAVE_STRUCTTREEROOT_H
diff --git a/source/texk/web2c/configure b/source/texk/web2c/configure
index 877ad553a17d7cc035c81e86fded00f966c79c1c..fdacd196ddc487e2101d4d7256f6b24e36170683 100755
--- a/source/texk/web2c/configure
+++ b/source/texk/web2c/configure
@@ -638,13 +638,12 @@ am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
subdirs
-WANTEDLIBS
-SYNCTEX_LT_VERSINFO
-SYNCTEXVERSION
+LIBSYNCTEX
+LTLIBSYNCTEX
SYNCTEX_FALSE
SYNCTEX_TRUE
-SYSTEM_ZLIB_FALSE
-SYSTEM_ZLIB_TRUE
+SYNCTEX_LT_VERSINFO
+SYNCTEXVERSION
OTANGLE
TIE
CTANGLE
@@ -1038,8 +1037,6 @@ with_system_poppler
with_system_xpdf
with_system_zziplib
with_system_teckit
-with_teckit_includes
-with_teckit_libdir
with_system_icu
with_system_graphite2
with_system_harfbuzz
@@ -1706,7 +1703,7 @@ Optional Features:
--enable-cxx-runtime-hack link C++ runtime statically
--enable-libtool-hack ignore libtool dependency_libs
--enable-auto-core cause TeX&MF to dump core, given a certain filename
- --disable-dump-share make fmt/base/mem files architecture-dependent
+ --disable-dump-share make fmt/base files architecture-dependent
--disable-ipc disable TeX's --ipc option, i.e., pipe to a program
--disable-tex do not compile and install TeX
--enable-tex-synctex build TeX with SyncTeX support
@@ -1742,7 +1739,7 @@ Optional Features:
--enable-tektronixwin include Tektronix window support
--enable-unitermwin include Uniterm window support
--disable-web-progs do not build WEB programs bibtex ... weave
- --disable-synctex do not build the SyncTeX tool
+ --disable-synctex do not build the SyncTeX library and tool
--disable-missing terminate if a requested program or feature must be
disabled, e.g., due to missing libraries
@@ -1801,11 +1798,8 @@ Optional Packages:
xpdf library from TL (requires pkg-config)
--with-system-zziplib use installed zziplib headers and library (requires
pkg-config)
- --with-system-teckit use installed teckit headers and library
- --with-teckit-includes=DIR
- teckit headers installed in DIR
- --with-teckit-libdir=DIR
- teckit library installed in DIR
+ --with-system-teckit use installed teckit headers and library (requires
+ pkg-config)
--with-system-icu use installed ICU headers and libraries (requires
icu-config)
--with-system-graphite2 use installed graphite2 headers and library
@@ -4903,8 +4897,8 @@ esac
-macro_version='2.4.5'
-macro_revision='2.4.5'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -8362,7 +8356,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -12687,13 +12681,20 @@ if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
-# lt_cv_sys_lib... is unaugmented for libtool script decls...
-lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
-# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -14065,13 +14066,12 @@ fi
done
-for ac_func in putenv strcasecmp strtol strstr
+for ac_func in putenv
do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv"
+if test "x$ac_cv_func_putenv" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_PUTENV 1
_ACEOF
fi
@@ -17908,13 +17908,17 @@ if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
-# lt_cv_sys_lib... is unaugmented for libtool script decls...
-lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
-# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
@@ -18884,8 +18888,7 @@ fi
if test "${enable_web_progs+set}" = set; then :
enableval=$enable_web_progs;
fi
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
# Check whether --enable-synctex was given.
if test "${enable_synctex+set}" = set; then :
enableval=$enable_synctex;
@@ -22512,7 +22515,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -22716,7 +22720,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-lt_cv_sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
reload_cmds_CXX \
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
@@ -22810,7 +22815,7 @@ $as_echo "$as_me: creating $ofile" >&6;}
available_tags='CXX '
# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -23064,8 +23069,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -23231,9 +23239,8 @@ compiler_lib_search_path=$lt_compiler_lib_search_path
_LT_EOF
cat <<'_LT_EOF' >> "$cfgfile"
-## -------------------------------------- ##
-## Shell functions shared with configure. ##
-## -------------------------------------- ##
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
# func_munge_path_list VARIABLE PATH
# -----------------------------------
@@ -23255,7 +23262,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -23286,6 +23293,8 @@ func_cc_basename ()
}
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
_LT_EOF
case $host_os in
@@ -24043,23 +24052,12 @@ fi
if test "${with_system_teckit+set}" = set; then :
withval=$with_system_teckit;
fi
-
-# Check whether --with-teckit-includes was given.
-if test "${with_teckit_includes+set}" = set; then :
- withval=$with_teckit_includes;
-fi
-
-# Check whether --with-teckit-libdir was given.
-if test "${with_teckit_libdir+set}" = set; then :
- withval=$with_teckit_libdir;
-fi
if test "x$with_system_teckit" = xyes; then
- if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then
- TECKIT_INCLUDES="-I$with_teckit_includes"
-fi
-TECKIT_LIBS="-lTECkit"
-if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then
- TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS"
+ if $PKG_CONFIG teckit; then
+ TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags`
+ TECKIT_LIBS=`$PKG_CONFIG teckit --libs`
+elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then
+ as_fn_error $? "did not find teckit" "$LINENO" 5
fi
else
TECKIT_INCLUDES="-I$kpse_BLD/libs/teckit/include"
@@ -24718,13 +24716,11 @@ ac_config_files="$ac_config_files silent-sh"
## texk/web2c/synctexdir/ac/synctex.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
- if test "x$with_system_zlib" = xyes; then
- SYSTEM_ZLIB_TRUE=
- SYSTEM_ZLIB_FALSE='#'
-else
- SYSTEM_ZLIB_TRUE='#'
- SYSTEM_ZLIB_FALSE=
-fi
+
+SYNCTEXVERSION=1.17.0
+
+
+SYNCTEX_LT_VERSINFO=18:0:17
if test "x$enable_synctex" != xno; then
@@ -24736,14 +24732,11 @@ else
fi
+if test "x$with_system_zlib" = xyes; then :
+ LTLIBSYNCTEX=libsynctex.la
-SYNCTEXVERSION=1.17.0
-
-
-SYNCTEX_LT_VERSINFO=18:0:17
-
-if test "x$enable_synctex" != xno; then :
- WANTEDLIBS=libsynctex.la
+else
+ LIBSYNCTEX=libsynctex.a
fi
@@ -25050,10 +25043,6 @@ if test -z "${UPWEB_TRUE}" && test -z "${UPWEB_FALSE}"; then
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${SYSTEM_ZLIB_TRUE}" && test -z "${SYSTEM_ZLIB_FALSE}"; then
- as_fn_error $? "conditional \"SYSTEM_ZLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${SYNCTEX_TRUE}" && test -z "${SYNCTEX_FALSE}"; then
as_fn_error $? "conditional \"SYNCTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -25782,7 +25771,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -25986,7 +25976,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-lt_cv_sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
reload_cmds_CXX \
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
@@ -26825,7 +26816,7 @@ $as_echo X"$file" |
available_tags='CXX '
# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -27079,8 +27070,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -27246,9 +27240,8 @@ compiler_lib_search_path=$lt_compiler_lib_search_path
_LT_EOF
cat <<'_LT_EOF' >> "$cfgfile"
-## -------------------------------------- ##
-## Shell functions shared with configure. ##
-## -------------------------------------- ##
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
# func_munge_path_list VARIABLE PATH
# -----------------------------------
@@ -27270,7 +27263,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -27301,6 +27294,8 @@ func_cc_basename ()
}
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
_LT_EOF
case $host_os in
diff --git a/source/texk/web2c/doc/Makefile.in b/source/texk/web2c/doc/Makefile.in
index 980035df1ba5e28dcf9f86b1ecb1b6b902cd09e3..dd08a2fd74f8d5bbdc98f6578d8214d986df6df5 100644
--- a/source/texk/web2c/doc/Makefile.in
+++ b/source/texk/web2c/doc/Makefile.in
@@ -307,10 +307,12 @@ LIBPNG_DEPEND = @LIBPNG_DEPEND@
LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBSYNCTEX = @LIBSYNCTEX@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LTLIBSYNCTEX = @LTLIBSYNCTEX@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LUA52_DEFINES = @LUA52_DEFINES@
LUA52_DEPEND = @LUA52_DEPEND@
@@ -370,7 +372,6 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
-WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/source/texk/web2c/lib/Makefile.in b/source/texk/web2c/lib/Makefile.in
index ddef60f9608489b725df01e582b39b06e8e161b8..f0f6c8ba50654bd719e612212b7e35a235fe07a2 100644
--- a/source/texk/web2c/lib/Makefile.in
+++ b/source/texk/web2c/lib/Makefile.in
@@ -303,10 +303,12 @@ LIBPNG_DEPEND = @LIBPNG_DEPEND@
LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBSYNCTEX = @LIBSYNCTEX@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LTLIBSYNCTEX = @LTLIBSYNCTEX@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LUA52_DEFINES = @LUA52_DEFINES@
LUA52_DEPEND = @LUA52_DEPEND@
@@ -366,7 +368,6 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
-WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/source/texk/web2c/luatexdir/ChangeLog b/source/texk/web2c/luatexdir/ChangeLog
index 38b00d97f7543c9610bce96eb389441dc5eb2a74..914a0f99b725cc2c4ba94fdd0a4f3408473ae7b0 100644
--- a/source/texk/web2c/luatexdir/ChangeLog
+++ b/source/texk/web2c/luatexdir/ChangeLog
@@ -1,7 +1,3 @@
-2015-03-10 Luigi Scarso <luigi.scarso@gmail.com>
- newtoken library; lua 5.2.4;
- Several bug fixed.
-
2015-01-14 Luigi Scarso <luigi.scarso@gmail.com>
tex/mlist.w: mlist_to_hlist(pointer mlist, boolean penalties, int cur_style)
diff --git a/source/texk/web2c/luatexdir/lua/lnewtokenlib.c b/source/texk/web2c/luatexdir/lua/lnewtokenlib.c
index 25f083b401fb58ba710a244bbc12730bf0297b0a..a4848b973aff4ef9ed3e896f2b624d9439f26476 100644
--- a/source/texk/web2c/luatexdir/lua/lnewtokenlib.c
+++ b/source/texk/web2c/luatexdir/lua/lnewtokenlib.c
@@ -579,7 +579,7 @@ static int set_macro(lua_State * L)
fast_store_new_token(end_match_token);
while (str < se) {
/* hh: str2uni could return len too (also elsewhere) */
- t = (halfword) str2uni((unsigned char *) str);
+ t = (halfword) str2uni((const unsigned char *) str);
str += utf8_size(t);
cc = get_cat_code(ct,t);
/* this is a relating simple converter; if more is needed one can just use */
@@ -593,7 +593,7 @@ static int set_macro(lua_State * L)
halfword _cs = null ;
const char *_name = str ;
while (str < se) {
- t = (halfword) str2uni((unsigned char *) str);
+ t = (halfword) str2uni((const unsigned char *) str);
_s = utf8_size(t);
_c = get_cat_code(ct,t);
if (_c == 11) {
diff --git a/source/texk/web2c/man/Makefile.in b/source/texk/web2c/man/Makefile.in
index 64f1cb60dc0537996e828ceebf50e2cbb2aecdc4..b30199585290d7856fae453903a390422aa1b714 100644
--- a/source/texk/web2c/man/Makefile.in
+++ b/source/texk/web2c/man/Makefile.in
@@ -283,10 +283,12 @@ LIBPNG_DEPEND = @LIBPNG_DEPEND@
LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBSYNCTEX = @LIBSYNCTEX@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LTLIBSYNCTEX = @LTLIBSYNCTEX@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LUA52_DEFINES = @LUA52_DEFINES@
LUA52_DEPEND = @LUA52_DEPEND@
@@ -346,7 +348,6 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
-WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/source/texk/web2c/omegafonts/Makefile.in b/source/texk/web2c/omegafonts/Makefile.in
index 67721b7472cdb75a6d7bb290dc2c80910cdcc5f1..725b32bf5ba3592116dfbe0f80c90989f383b536 100644
--- a/source/texk/web2c/omegafonts/Makefile.in
+++ b/source/texk/web2c/omegafonts/Makefile.in
@@ -529,10 +529,12 @@ LIBPNG_DEPEND = @LIBPNG_DEPEND@
LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBSYNCTEX = @LIBSYNCTEX@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LTLIBSYNCTEX = @LTLIBSYNCTEX@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LUA52_DEFINES = @LUA52_DEFINES@
LUA52_DEPEND = @LUA52_DEPEND@
@@ -592,7 +594,6 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
-WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/source/texk/web2c/otps/Makefile.in b/source/texk/web2c/otps/Makefile.in
index b5a909813dfa51bc3d217044787afd2298ee0dbf..3361a7cfd287dae7fd5f755eb876e2be7fef36dd 100644
--- a/source/texk/web2c/otps/Makefile.in
+++ b/source/texk/web2c/otps/Makefile.in
@@ -569,10 +569,12 @@ LIBPNG_DEPEND = @LIBPNG_DEPEND@
LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBSYNCTEX = @LIBSYNCTEX@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LTLIBSYNCTEX = @LTLIBSYNCTEX@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LUA52_DEFINES = @LUA52_DEFINES@
LUA52_DEPEND = @LUA52_DEPEND@
@@ -632,7 +634,6 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
-WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/source/texk/web2c/otps/win32/Makefile.in b/source/texk/web2c/otps/win32/Makefile.in
index bc3d77195a896c054d71de7aefd95b3eb25ecd71..c77e6c9f6c63771fffd591bb375f4b48bab57376 100644
--- a/source/texk/web2c/otps/win32/Makefile.in
+++ b/source/texk/web2c/otps/win32/Makefile.in
@@ -291,10 +291,12 @@ LIBPNG_DEPEND = @LIBPNG_DEPEND@
LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBSYNCTEX = @LIBSYNCTEX@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LTLIBSYNCTEX = @LTLIBSYNCTEX@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LUA52_DEFINES = @LUA52_DEFINES@
LUA52_DEPEND = @LUA52_DEPEND@
@@ -354,7 +356,6 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
-WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/source/texk/web2c/synctexdir/ChangeLog b/source/texk/web2c/synctexdir/ChangeLog
index f1bda4c4a0ed631f3264a725c8369fcebf419096..979e9c8e5d74da0205cfd05f05d2ac90cc7160b4 100644
--- a/source/texk/web2c/synctexdir/ChangeLog
+++ b/source/texk/web2c/synctexdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ac/synctex.a, am/synctex.am: Reorganize rules for libsynctex.
+
2014-12-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* synctex.c: Define SYNCTEX_YES as 1, not -1 (for bitfields).
diff --git a/source/texk/web2c/synctexdir/ac/synctex.ac b/source/texk/web2c/synctexdir/ac/synctex.ac
index 5ecc2fa085b9494f1abe377880042d022b5047bf..c6067463730ba04beadb99ac65a38e544d51bd2b 100644
--- a/source/texk/web2c/synctexdir/ac/synctex.ac
+++ b/source/texk/web2c/synctexdir/ac/synctex.ac
@@ -1,20 +1,20 @@
## texk/web2c/synctexdir/ac/synctex.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
dnl
-dnl Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
dnl Additional code for synctex
dnl
-dnl Building libsynctex as shared library requires a system zlib
-AM_CONDITIONAL([SYSTEM_ZLIB], [test "x$with_system_zlib" = xyes])
-
-AM_CONDITIONAL([SYNCTEX], [test "x$enable_synctex" != xno])
-
m4_define([synctex_version], m4_chomp(m4_include([synctexdir/synctex_parser_version.txt]))[.0])
AC_SUBST([SYNCTEXVERSION], [synctex_version])
KPSE_LT_VERSION([synctex])
-AS_IF([test "x$enable_synctex" != xno],
- [AC_SUBST([WANTEDLIBS], [libsynctex.la])])
+
+AM_CONDITIONAL([SYNCTEX], [test "x$enable_synctex" != xno])
+
+dnl Building libsynctex as shared library requires a system zlib
+AS_IF([test "x$with_system_zlib" = xyes],
+ [AC_SUBST([LTLIBSYNCTEX], [libsynctex.la])],
+ [AC_SUBST([LIBSYNCTEX], [libsynctex.a])])
AC_CONFIG_FILES([synctexdir/synctex.pc])
diff --git a/source/texk/web2c/synctexdir/am/synctex.am b/source/texk/web2c/synctexdir/am/synctex.am
index c4481ae1cadb17947b43a5d37fef37c4a8b98a06..1f3f366de7179177e128c6c1a541b50497cd1fa3 100644
--- a/source/texk/web2c/synctexdir/am/synctex.am
+++ b/source/texk/web2c/synctexdir/am/synctex.am
@@ -1,42 +1,30 @@
## texk/web2c/synctexdir/am/synctex.am: Makefile fragment for SyncTeX.
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## The SyncTeX tool
if SYNCTEX
bin_PROGRAMS += synctex
+lib_LTLIBRARIES += $(LTLIBSYNCTEX)
+lib_LIBRARIES += $(LIBSYNCTEX)
endif SYNCTEX
EXTRA_PROGRAMS += synctex
+EXTRA_LTLIBRARIES += libsynctex.la
+EXTRA_LIBRARIES += libsynctex.a
synctex_SOURCES = \
synctexdir/synctex_main.c
synctex_CPPFLAGS = -I$(srcdir)/synctexdir
-if SYSTEM_ZLIB
-libsynctex = libsynctex.la
-else !SYSTEM_ZLIB
-libsynctex = libsynctex.a
-endif !SYSTEM_ZLIB
-
synctex_LDADD = $(libsynctex) $(ZLIB_LIBS)
$(synctex_OBJECTS): $(libsynctex)
## The (shared or nonshared) SyncTeX parser library
-
-EXTRA_LTLIBRARIES = libsynctex.la
-EXTRA_LIBRARIES += libsynctex.a
-
-if SYNCTEX
-if SYSTEM_ZLIB
-lib_LTLIBRARIES = $(WANTEDLIBS)
-else !SYSTEM_ZLIB
-lib_LIBRARIES = libsynctex.a
-endif !SYSTEM_ZLIB
-endif SYNCTEX
+libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
diff --git a/source/texk/web2c/w2c/config.h b/source/texk/web2c/w2c/config.h
index 25ba9b7f559d6f2bea38efeab6592f5be075dbd9..ab76a1b5794b4ca562ac7fdb75c93f9d72f7d188 100644
--- a/source/texk/web2c/w2c/config.h
+++ b/source/texk/web2c/w2c/config.h
@@ -1,6 +1,7 @@
/* w2c/config.h: All .c files include this first.
-Copyright 1995, 1996, 2006, 2007, 2009, 2010, 2012, 2014 Karl Berry.
+Copyright 1995, 1996, 2006, 2007, 2009, 2010, 2012, 2014,
+ 2015 Karl Berry.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -126,11 +127,6 @@ typedef unsigned long uintptr_t;
#define WIN32WIN
#endif
-/* strtol.c */
-#ifndef HAVE_STRTOL
-extern long strtol (const char *, char **, int);
-#endif
-
#if defined __GNUC__ && __GNUC__ >=3
#define WEB2C_NORETURN __attribute__((__noreturn__))
#else
diff --git a/source/texk/web2c/web2c/c-auto.in b/source/texk/web2c/web2c/c-auto.in
index 014d6241bf795dae9217d38a79e1929ff0ea819e..e198ab430766cb8994cad4b9ca6aa7f8c987e357 100644
--- a/source/texk/web2c/web2c/c-auto.in
+++ b/source/texk/web2c/web2c/c-auto.in
@@ -64,9 +64,6 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
@@ -82,12 +79,6 @@
/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
-
/* Define to 1 if `st_mtim' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_MTIM
diff --git a/source/texk/web2c/web2c/configure b/source/texk/web2c/web2c/configure
index 6f4dbd791d99de39a86be7f947924c3e11e9d945..7b42263ef13f2eec57fd9d8f3194f81817ae8519 100755
--- a/source/texk/web2c/web2c/configure
+++ b/source/texk/web2c/web2c/configure
@@ -4222,8 +4222,8 @@ esac
-macro_version='2.4.5'
-macro_revision='2.4.5'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -7681,7 +7681,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -12006,13 +12006,20 @@ if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
-# lt_cv_sys_lib... is unaugmented for libtool script decls...
-lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
-# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -13384,13 +13391,12 @@ fi
done
-for ac_func in putenv strcasecmp strtol strstr
+for ac_func in putenv
do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv"
+if test "x$ac_cv_func_putenv" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_PUTENV 1
_ACEOF
fi
@@ -14820,7 +14826,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -14939,7 +14946,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-lt_cv_sys_lib_dlsearch_path_spec; do
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
@@ -15715,7 +15723,7 @@ $as_echo X"$file" |
available_tags=''
# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -15969,8 +15977,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -16122,9 +16133,8 @@ hardcode_action=$hardcode_action
_LT_EOF
cat <<'_LT_EOF' >> "$cfgfile"
-## -------------------------------------- ##
-## Shell functions shared with configure. ##
-## -------------------------------------- ##
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
# func_munge_path_list VARIABLE PATH
# -----------------------------------
@@ -16146,7 +16156,7 @@ func_munge_path_list ()
x)
;;
*:)
- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
;;
x:*)
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -16177,6 +16187,8 @@ func_cc_basename ()
}
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
_LT_EOF
case $host_os in
diff --git a/source/texk/web2c/web2c/web2c-parser.c b/source/texk/web2c/web2c/web2c-parser.c
index 316bc2a13cd565e07562845c644c6d93c432e057..c9a365add3074c24d0a7b2076b396d029ea135b5 100644
--- a/source/texk/web2c/web2c/web2c-parser.c
+++ b/source/texk/web2c/web2c/web2c-parser.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.0.3. */
+/* A Bison parser, made by GNU Bison 3.0.4. */
/* Bison implementation for Yacc-like parsers in C
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "3.0.3"
+#define YYBISON_VERSION "3.0.4"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
diff --git a/source/texk/web2c/web2c/web2c-parser.h b/source/texk/web2c/web2c/web2c-parser.h
index 83649f55c02fbc2c2c6d4fa571a95cac0b5b2ded..1af0a6dab6c144e4afe36e3361e936d0e0502618 100644
--- a/source/texk/web2c/web2c/web2c-parser.h
+++ b/source/texk/web2c/web2c/web2c-parser.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.0.3. */
+/* A Bison parser, made by GNU Bison 3.0.4. */
/* Bison interface for Yacc-like parsers in C
diff --git a/source/texk/web2c/window/Makefile.in b/source/texk/web2c/window/Makefile.in
index cd78788682cdd41986e6ccad068655a6733a7ad8..d6ee810def4ff365617e40e8906c27152b11fc12 100644
--- a/source/texk/web2c/window/Makefile.in
+++ b/source/texk/web2c/window/Makefile.in
@@ -301,10 +301,12 @@ LIBPNG_DEPEND = @LIBPNG_DEPEND@
LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBSYNCTEX = @LIBSYNCTEX@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LTLIBSYNCTEX = @LTLIBSYNCTEX@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LUA52_DEFINES = @LUA52_DEFINES@
LUA52_DEPEND = @LUA52_DEPEND@
@@ -364,7 +366,6 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
-WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/source/utils/ChangeLog b/source/utils/ChangeLog
index 2d7b5ac2aa3a91474a41d3ab56d3c242a75b84fc..9425256ffd579e22e12bc253b986dec831ae7928 100644
--- a/source/utils/ChangeLog
+++ b/source/utils/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../am/dist_hook.am.
+
2013-12-26 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (ACLOCAL): Ensure aclocal.m4 is up to date.
diff --git a/source/utils/Makefile.am b/source/utils/Makefile.am
index fec2625c83daf2d016bae759bc9513ff0636b1f8..a60030706aa1cd3c7c12d0520c623d4e5807b8f9 100644
--- a/source/utils/Makefile.am
+++ b/source/utils/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory utils/
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
## Ensure aclocal.m4 is up to date
@@ -9,9 +9,8 @@ ACLOCAL = @ACLOCAL@ --force
SUBDIRS = . $(MAKE_SUBDIRS)
DIST_SUBDIRS = $(CONF_SUBDIRS)
-# just in case a subdirectory has added directories
-dist-hook:
- rm -rf `find $(distdir) -name .svn`
+# Files not to be distributed
+include $(srcdir)/../am/dist_hook.am
## Configure and build subdirs.
##
diff --git a/source/utils/Makefile.in b/source/utils/Makefile.in
index ba43dc76e9458ed77693b8c0fc6fa78b7ece254f..01d1ee1de181993eafd4c68d933384aed10fa2b2 100644
--- a/source/utils/Makefile.in
+++ b/source/utils/Makefile.in
@@ -190,7 +190,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
-am__DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../am/dist_hook.am \
+ $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
$(top_srcdir)/../build-aux/compile \
$(top_srcdir)/../build-aux/config.guess \
$(top_srcdir)/../build-aux/config.sub \
@@ -340,6 +341,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = . $(MAKE_SUBDIRS)
DIST_SUBDIRS = $(CONF_SUBDIRS)
+NEVER_DIST = `find . $(NEVER_NAMES)`
+NEVER_NAMES = -name .svn
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
+
+# Files not to be distributed
recurse_this = utils/
recurse_top = ../
@@ -358,7 +365,7 @@ all: all-recursive
.SUFFIXES:
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/recurse.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/dist_hook.am $(srcdir)/../am/recurse.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -380,7 +387,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../am/recurse.am $(am__empty):
+$(srcdir)/../am/dist_hook.am $(srcdir)/../am/recurse.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -811,10 +818,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# just in case a subdirectory has added directories
dist-hook:
- rm -rf `find $(distdir) -name .svn`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
all-local: recurse
diff --git a/source/utils/README b/source/utils/README
index 653bb2c213f891e82604d26e2be57397da70da67..2fd742ee147c32b340b6fc7f484aa61e300e021b 100644
--- a/source/utils/README
+++ b/source/utils/README
@@ -1,4 +1,4 @@
-$Id: README 36016 2015-01-11 00:03:55Z karl $
+$Id: README 36417 2015-03-02 08:20:57Z peter $
Public domain. Originally written 2005 by Karl Berry.
Extra utilities we (optionally) compile for TeX Live.
@@ -23,7 +23,7 @@ pmx 2.7.0 - checked 25nov14
ps2eps 1.68 - checked 10may12
http://tm.uka.de/~bless/ps2eps
-t1utils 1.38 - checked 3oct13
+t1utils 1.39 - checked 1mar15
http://www.lcdf.org/type/
texdoctk - reluctantly maintained here in TL
diff --git a/source/utils/configure b/source/utils/configure
index 55b55260f8811e0ba2cd092ff74a0a41dee89767..e97f7718fd590824b9ffcc50e4860b3d78951f18 100755
--- a/source/utils/configure
+++ b/source/utils/configure
@@ -1404,7 +1404,7 @@ Optional Features:
--disable-web2c do not build the web2c (TeX & Co.) package
--enable-auto-core cause TeX&MF to dump core, given a certain
filename
- --disable-dump-share make fmt/base/mem files architecture-dependent
+ --disable-dump-share make fmt/base files architecture-dependent
--disable-ipc disable TeX's --ipc option, i.e., pipe to a
program
--disable-tex do not compile and install TeX
@@ -1441,7 +1441,7 @@ Optional Features:
--enable-tektronixwin include Tektronix window support
--enable-unitermwin include Uniterm window support
--disable-web-progs do not build WEB programs bibtex ... weave
- --disable-synctex do not build the SyncTeX tool
+ --disable-synctex do not build the SyncTeX library and tool
--disable-texlive do not build the texlive (TeX Live scripts) package
--disable-linked-scripts do not install the linked scripts
--disable-mktexmf-default do not run mktexmf if MF source missing
@@ -3512,8 +3512,7 @@ fi
if test "${enable_web_progs+set}" = set; then :
enableval=$enable_web_progs;
fi
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
# Check whether --enable-synctex was given.
if test "${enable_synctex+set}" = set; then :
enableval=$enable_synctex;