From 8d43432f298bfaf722721b96ec4427ac4672fc74 Mon Sep 17 00:00:00 2001 From: Luigi Scarso <luigi.scarso@gmail.com> Date: Thu, 7 Apr 2016 08:42:14 +0000 Subject: [PATCH] sync with TL rev. 40299. --- source/README.1prerequisites | 6 + source/build-aux/README.TL | 34 +- source/build-aux/compile | 9 +- source/build-aux/config.guess | 14 +- source/build-aux/config.sub | 4 +- source/build-aux/test-driver | 15 +- source/doc/README.solaris | 11 +- source/doc/tlbuild.info | 674 +++++++++--------- source/doc/tlbuild.texi | 50 +- source/libs/README | 8 +- source/libs/libpng/ChangeLog | 5 + source/libs/libpng/Makefile.am | 2 +- source/libs/libpng/Makefile.in | 2 +- source/texk/README | 20 +- source/texk/kpathsea/ChangeLog | 25 +- source/texk/kpathsea/NEWS | 3 + source/texk/kpathsea/cnf.c | 72 +- source/texk/kpathsea/doc/kpathsea.info | 114 +-- source/texk/kpathsea/doc/kpathsea.texi | 6 +- source/texk/kpathsea/file-p.c | 2 +- source/texk/kpathsea/kpsewhich.c | 4 +- source/texk/kpathsea/mingw32.c | 2 +- source/texk/kpathsea/mingw32.h | 2 +- source/texk/kpathsea/texmf.cnf | 25 +- source/texk/kpathsea/win32/ChangeLog | 4 + source/texk/kpathsea/win32/dirutil.c | 2 +- source/texk/kpathsea/win32/getdestdir.c | 2 +- source/texk/kpathsea/win32/mkpaths.c | 2 +- source/texk/kpathsea/win32/mktex.h | 2 +- source/texk/kpathsea/win32/mktexfmt.c | 2 +- source/texk/kpathsea/win32/mktexlsr.c | 2 +- source/texk/kpathsea/win32/mktexmf.c | 2 +- source/texk/kpathsea/win32/mktexpk.c | 2 +- source/texk/kpathsea/win32/mktextfm.c | 2 +- source/texk/kpathsea/win32/mktexupd.c | 2 +- source/texk/kpathsea/win32/mktexupdmain.c | 2 +- source/texk/kpathsea/win32lib.c | 2 +- source/texk/kpathsea/win32lib.h | 2 +- source/texk/texlive/w32_wrapper/runscript.tlu | 4 +- source/texk/web2c/Makefile.in | 358 +++++----- source/texk/web2c/NEWS | 3 +- source/texk/web2c/doc/web2c.info | 227 +++--- source/texk/web2c/doc/web2c.texi | 4 +- source/texk/web2c/mfluadir/am/mflua.am | 6 +- source/texk/web2c/mfluajitdir/am/mfluajit.am | 6 +- source/texk/web2c/web2c/ChangeLog | 5 + source/texk/web2c/web2c/convert | 8 +- 47 files changed, 950 insertions(+), 810 deletions(-) diff --git a/source/README.1prerequisites b/source/README.1prerequisites index e118df535..0834359da 100644 --- a/source/README.1prerequisites +++ b/source/README.1prerequisites @@ -54,3 +54,9 @@ timestamps--notably, 'use-commit-times' must be set to 'yes' in your Subversion configuration (*note Build system tools::). Barring buggy commits, no infrastructure tools are needed to do a normal build. + +Building on Debian +------------------ + +On Debian systems the necessary build dependencies are installed by + apt-get install libfontconfig-dev libx11-dev libxmu-dev libxaw7-dev diff --git a/source/build-aux/README.TL b/source/build-aux/README.TL index 6860b6215..85632f16c 100644 --- a/source/build-aux/README.TL +++ b/source/build-aux/README.TL @@ -1,20 +1,28 @@ -Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +$Id: README.TL 40250 2016-04-05 18:20:42Z karl $ +Copyright 2016 Karl Berry <tex-live@tug.org> +Copyright 2009-2013 Peter Breitenlohner <tex-live@tug.org> You may freely use, modify and/or distribute this file. This directory is the central repository for auxiliary files, mostly shell scripts, needed to build the TeX Live (TL) tree. They are used by -all packages `owned' by the TL tree, i.e., maintained as part of TL. +all packages included in the TL tree, whether or not TL is the actual +owner/maintainer of the package -compile, missing, test-driver, and ylwrap come from automake; ltmain.sh -comes from libtool. Those must be manually updated when new versions of the -packages are installed. The Master/tlpkg/dev/srclist.txt file has checks -for these, but updates are not automatic. (We generally try to use the -latest official release, as it is available directly from GNU, not any -distro version.) +The files fall into three sets: -relpath is locally written. +0) relpath is locally written. -The rest of these files are maintained elsewhere and are available from -the GNU gnulib project (http://savannah.gnu.org/projects/gnulib). The -script Master/tlpkg/bin/tl-update-auto attempts to keep those up to date -(except when the TL sources are frozen). +1) Those in GNU Gnulib (http://savannah.gnu.org/projects/gnulib). The +script Master/tlpkg/bin/tl-update-auto attempts to keep these up to date +nightly (except when the TL sources are frozen). + +2) Those not in Gnulib, that must come directly from an automake or +libtool installation. These must be manually updated when new versions +of those GNU packages are installed. The Master/tlpkg/dev/srclist.txt +file checks for these relative to installation on the local machine, but +updates are not automatic. + +There should be no other files in this directory. + +We generally try to use the latest official release, as it is available +directly from GNU, rather than any distro or other patched version. diff --git a/source/build-aux/compile b/source/build-aux/compile index 531136b06..4bfd30ccf 100644 --- a/source/build-aux/compile +++ b/source/build-aux/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ exit $ret # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/source/build-aux/config.guess b/source/build-aux/config.guess index d5d667d4a..0967f2afa 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-2016 Free Software Foundation, Inc. -timestamp='2016-03-24' +timestamp='2016-04-02' # 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 @@ -386,7 +386,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # This test works for both compilers. if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 @@ -684,7 +684,7 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac @@ -701,7 +701,7 @@ EOF # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then HP_ARCH=hppa2.0w @@ -900,7 +900,7 @@ EOF exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -1294,7 +1294,7 @@ EOF if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in @@ -1389,7 +1389,7 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos diff --git a/source/build-aux/config.sub b/source/build-aux/config.sub index 6223dde93..8d39c4ba3 100644 --- a/source/build-aux/config.sub +++ b/source/build-aux/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-01-01' +timestamp='2016-03-30' # 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 @@ -1531,6 +1531,8 @@ case $os in ;; -nacl*) ;; + -ios) + ;; -none) ;; *) diff --git a/source/build-aux/test-driver b/source/build-aux/test-driver index d30605660..8e575b017 100644 --- a/source/build-aux/test-driver +++ b/source/build-aux/test-driver @@ -3,7 +3,7 @@ scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -106,11 +106,14 @@ trap "st=143; $do_exit" 15 # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -119,6 +122,12 @@ case $estatus:$expect_failure in *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" diff --git a/source/doc/README.solaris b/source/doc/README.solaris index 4570b06dd..8d7e447cb 100644 --- a/source/doc/README.solaris +++ b/source/doc/README.solaris @@ -105,16 +105,9 @@ is desired by changing the map file. Building texlive ================ -Two extra settings were needed to compile TeX Live with gcc 5.2: - * export LIBPNG_USER_CPPFLAGS="-D_XOPEN_SOURCE=600" +Additional settings were needed to compile TeX Live with gcc 5.2: * ./Build --without-iconv -The second option makes sure to avoid linking against libiconv +The '--without-iconv' makes sure to avoid linking against libiconv which is not available on SunOS by default. -The first option is only needed on Solaris 10 to circumvent a problem -in libpng <https://sourceforge.net/p/libpng/bugs/245/>. - -Using `#define _POSIX_SOURCE 1` will fail to compile on Solaris 10 with gcc 5.x -unless one of `_XPG6`, `_XOPEN_SOURCE = 600`, or `_POSIX_C_SOURCE = 200112L` is set. - diff --git a/source/doc/tlbuild.info b/source/doc/tlbuild.info index 280cdfa50..e79706e17 100644 --- a/source/doc/tlbuild.info +++ b/source/doc/tlbuild.info @@ -53,8 +53,7 @@ File: tlbuild.info, Node: Introduction, Next: Overview of build system, Prev: 1 Introduction ************** -This manual (dated February 2016) corresponds to the TeX Live 2016 -release. +This manual (dated April 2016) corresponds to the TeX Live 2016 release. This manual is aimed at system installers and programmers, and focuses on how to configure, build, and develop the TeX Live (TL) @@ -172,7 +171,8 @@ Automake/Autoconf output in general) should work with any reasonable that are not installed by default. 'xetex' - requires 'fontconfig' (again both headers and library). + requires 'fontconfig' (again both headers and library), or, for + MacOSX only, the 'ApplicationServices' and 'Cocoa' frameworks. 'xindy' requires GNU 'clisp' and in addition 'perl', 'latex', and @@ -209,13 +209,13 @@ File: tlbuild.info, Node: Building, Next: Installing, Prev: Prerequisites, U The top-level 'Build' script is intended to simplify building the binaries distributed with TeX Live itself--we call this the "native" TL build. It configures and makes everything in a subdirectory of the main -build tree (default 'Work/'), installs everything in an other +build tree (default 'Work/'), installs everything in another subdirectory (default 'inst/'), and finally runs 'make check'. The exact directory and command names can be specified via environment variables and a few leading options. All remaining arguments (assignments or options) are passed to the 'configure' script. Please -take a look at the script itself for more information; it is not -complicated. +take a look at the './Build' source file itself for more information; it +is a straightforward shell script. An alternative, and the one we will mainly discuss here, is to run 'configure' and 'make' oneself in a suitable empty subdirectory. @@ -308,12 +308,12 @@ library modules are configured but none are made. However, the invoked to build an individual program or library and causes to first build any required libraries. - This "build-on-demand" procedure is used, e.g., in the 'luatex' -repository to build LuaTeX, essentially from a subset of the complete -TeX Live tree. Similarly, when, e.g., building the original e-TeX has -been disabled (as it is by default), one can run 'make etex' (or 'make -etex.exe') in 'texk/web2c/' to build e-TeX (although there is no -comparably simple way to install e-TeX). + This "build-on-demand" procedure is used, e.g., in the upstream +LuaTeX repository to build LuaTeX, essentially from a subset of the +complete TeX Live tree. Similarly, when, e.g., building the original +e-TeX has been disabled (as it is by default), one can run 'make etex' +(or 'make etex.exe') in 'texk/web2c/' to build e-TeX (although there is +no comparably simple way to install e-TeX). If you want to work on a single program within the TL sources, this is the recommended way to do it. Here is an example from start to @@ -362,6 +362,21 @@ have undesired side effects. For an example, see the 'build-pdftex.sh' script in the 'pdftex' development sources (<http://pdftex.org>), which are indeed a cut-down TL source tree. + Caveat 1: even with '--disable-all-pkgs', dependencies will be +checked. For instance, if a non-MacOSX system does not have +'fontconfig', XeTeX cannot be built (*note Prerequisites::) and +'configure' will terminate. To proceed without such dependencies, +specify '--enable-missing' also. (Arguably this should happen +automatically.) + + Caveat 2: unless 'CC' and 'CXX' and 'OBJCXX' are explicitly +specified, each package will configure its own compiler(s). In +practice, this results in a conflict in only one instance: the ICU +('libs/icu') library will prefer 'clang' and 'clang++' over all others +if they are installed, whereas everything else prefers 'gcc' and 'g++'. +Usually the results will be interoperable, but it can cause extra +confusion and problems when debugging a program that uses ICU. + File: tlbuild.info, Node: Installing, Next: Layout and infrastructure, Prev: Building, Up: Top @@ -4370,7 +4385,7 @@ Index * --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-packages: Build one package. (line 6) * --disable-all-pkgs: --disable-all-pkgs. (line 6) * --disable-bibtex8: Configure options for texk/bibtex-x. (line 9) @@ -4408,16 +4423,15 @@ Index (line 45) * --enable-compiler-warnings=LEVEL: --enable-compiler-warnings=LEVEL. (line 6) -* --enable-cxx-runtime-hack configure option: Macros for compilers. - (line 29) +* --enable-cxx-runtime-hack: Macros for compilers. (line 29) * --enable-etex: Configure options for texk/web2c. (line 37) * --enable-libtool-hack: Configure options for texk/web2c. (line 50) -* --enable-maintainer-mode: --enable-maintainer-mode. +* --enable-maintainer-mode: Build system tools. (line 28) +* --enable-maintainer-mode <1>: --enable-maintainer-mode. (line 6) -* --enable-maintainer-mode configure option: Build system tools. - (line 28) +* --enable-missing to ignore dependencies: Build one package. (line 67) * --enable-mktextfm-default: kpathsea library. (line 20) * --enable-multiplatform: --enable-multiplatform. (line 6) @@ -4490,6 +4504,8 @@ Index (line 14) * ANSI C: Declarations and definitions. (line 6) +* ApplicationServices Mac framework, required by xetex: Prerequisites. + (line 27) * asymptote: Linked scripts. (line 22) * asymptote <1>: asymptote. (line 6) * Autoconf: Overview of build system. @@ -4526,16 +4542,19 @@ Index * callexe.c: Macros for Windows. (line 32) * CC: Variables for configure. (line 10) +* CC=C-COMPILER: Build one package. (line 74) * CC_BUILD: Cross problems. (line 13) * chktex: Declarations and definitions. (line 18) +* clang compilers, preferred by ICU: Build one package. (line 74) * clisp: Variables for configure. (line 18) * CLISP: Variables for configure. (line 17) * CLISP <1>: Configure options for utils/xindy. (line 14) -* clisp, required by xindy: Prerequisites. (line 30) +* clisp, required by xindy: Prerequisites. (line 31) +* Cocoa Mac framework, required by xetex: Prerequisites. (line 27) * coding conventions: Coding conventions. (line 6) * compilers, C and C++: Prerequisites. (line 6) * config.guess, config.sub: Top-level directories. @@ -4579,6 +4598,7 @@ Index * ctangle: Cross problems. (line 26) * CXX: Variables for configure. (line 11) +* CXX=C++-COMPILER: Build one package. (line 74) * declarations and definitions, in source code: Declarations and definitions. (line 6) * dependencies, with several output files: Build in parallel. (line 6) @@ -4605,7 +4625,7 @@ Index * extra/ top-level directory: Top-level directories. (line 39) * failure to build: Build problems. (line 6) -* ffcall, required by xindy: Prerequisites. (line 30) +* ffcall, required by xindy: Prerequisites. (line 31) * flags, macros for library and header: Macros for library and header flags. (line 6) * fontconfig library, required by xetex: Prerequisites. (line 27) @@ -4631,6 +4651,7 @@ Index * ICU cross compiling: Cross problems. (line 20) * ICU libraries: Variables for configure. (line 24) +* ICU, prefers clang compilers: Build one package. (line 74) * icu-config: Variables for configure. (line 24) * ICU_CONFIG: Variables for configure. @@ -4762,6 +4783,7 @@ Index * motif: Configure options for texk/xdvik. (line 9) * native cross compilation: Cross compilation. (line 10) +* OBJCXX=OBJC-COMPILER: Build one package. (line 74) * one package, building: Build one package. (line 6) * OpenGL, required for Asymptote: asymptote. (line 6) * operating system distribution, building for: Distro builds. (line 6) @@ -4888,311 +4910,311 @@ Index Tag Table: Node: Top1030 Node: Introduction1948 -Node: Overview of build system3708 -Node: Prerequisites5772 -Node: Building7834 -Node: Build iteration9053 -Node: Build problems10125 -Node: Build in parallel10528 -Node: Build distribution11120 -Node: Build one package11691 -Node: Installing14465 -Node: Installation directories15480 -Node: Linked scripts17296 -Node: Distro builds18777 -Node: Layout and infrastructure21167 -Node: Build system tools21956 -Node: Top-level directories23965 -Node: Autoconf macros26006 -Node: General setup macros26707 -Node: Macros for programs27574 -Node: Macros for compilers28386 -Node: Macros for libraries29820 -Node: Macros for library and header flags30246 -Node: Macros for Windows32126 -Node: Library modules33703 -Node: png library34192 -Node: zlib library36481 -Node: freetype library36996 -Node: kpathsea library37524 -Node: Program modules38923 -Node: t1utils package39351 -Node: xindy package39914 -Node: xdvik package41093 -Node: asymptote42166 -Node: Extending TeX Live42617 -Node: Adding a new program module42985 -Node: Adding a new generic library module44504 -Node: Adding a new TeX-specific library module46717 -Node: Configure options47404 -Node: Global configure options48786 -Node: --disable-native-texlive-build49328 -Node: --prefix --bindir ...50318 -Node: --disable-largefile50858 -Node: --disable-missing51543 -Node: --enable-compiler-warnings=LEVEL51944 -Node: --enable-cxx-runtime-hack52683 -Node: --enable-maintainer-mode53110 -Node: --enable-multiplatform53639 -Node: --enable-shared54177 -Node: --enable-silent-rules54548 -Node: --without-ln-s55004 -Node: --without-x55355 -Node: Program-specific configure options55543 -Node: --enable-PROG --disable-PROG56186 -Node: --disable-all-pkgs56463 -Node: Configure options for texk/web2c57449 -Node: Configure options for texk/bibtex-x59967 -Node: Configure options for texk/dvipdfm-x60510 -Node: Configure options for texk/dvisvgm61283 -Node: Configure options for texk/texlive62169 -Node: Configure options for texk/xdvik62590 -Node: Configure options for utils/xindy63194 -Node: Library-specific configure options64095 -Node: Configure options for kpathsea65106 -Node: Configure options for system poppler65815 -Node: Variables for configure66606 -Node: Cross compilation68034 -Node: Cross configuring69333 -Node: Cross problems71006 -Node: Coding conventions72653 -Node: Declarations and definitions73322 -Node: Const75504 -Node: install-tl77367 -Node: install-tl NAME77708 -Node: install-tl SYNOPSIS77866 -Node: install-tl DESCRIPTION78074 -Node: install-tl REFERENCES79075 -Node: install-tl OPTIONS79591 -Ref: install-tl *-gui* [[=]_module_]79945 -Ref: install-tl text80154 -Ref: install-tl wizard80277 -Ref: install-tl perltk80431 -Ref: install-tl *-no-gui*80865 -Ref: install-tl *-lang* _llcode_80946 -Ref: install-tl *-repository* _url|path_81633 -Ref: install-tl *-select-repository*83444 -Ref: install-tl *-all-options*83880 -Ref: install-tl *-custom-bin* _path_84187 -Ref: install-tl *-debug-translation*84842 -Ref: install-tl *-force-platform* _platform_85061 -Ref: install-tl *-help*, *--help*, *-?*85305 -Ref: install-tl *-in-place*85698 -Ref: install-tl *-logfile* _file_86225 -Ref: install-tl *-no-cls*86576 -Ref: install-tl *-non-admin*86707 -Ref: install-tl *--persistent-downloads*86812 -Ref: install-tl *--no-persistent-downloads*86840 -Ref: install-tl *-portable*87448 -Ref: install-tl *-print-platform*87587 -Ref: install-tl *-profile* _profile_87780 -Ref: install-tl *-q*89274 -Ref: install-tl *-scheme* _scheme_89336 -Ref: install-tl *-v*89810 -Ref: install-tl *-version*, *--version*89971 -Node: install-tl ENVIRONMENT VARIABLES90102 -Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK90491 -Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE90693 -Ref: install-tl TEXLIVE_INSTALL_PREFIX90799 -Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG90830 -Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME90859 -Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL90889 -Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG90923 -Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR90954 -Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR90982 -Ref: install-tl NOPERLDOC91037 -Node: install-tl AUTHORS AND COPYRIGHT91101 -Node: tlmgr91459 -Node: tlmgr NAME91896 -Node: tlmgr SYNOPSIS92021 -Node: tlmgr DESCRIPTION92211 -Node: tlmgr EXAMPLES93307 -Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet93598 -Ref: tlmgr tlmgr update --list93779 -Ref: tlmgr tlmgr update --all93872 -Ref: tlmgr tlmgr info _pkg_94028 -Node: tlmgr OPTIONS94234 -Ref: tlmgr *--repository* _url|path_94754 -Ref: tlmgr *--gui* [_action_]95479 -Ref: tlmgr *--gui-lang* _llcode_95886 -Ref: tlmgr *--debug-translation*96569 -Ref: tlmgr *--machine-readable*96772 -Ref: tlmgr *--no-execute-actions*97040 -Ref: tlmgr *--package-logfile* _file_97233 -Ref: tlmgr *--pause*97488 -Ref: tlmgr *--persistent-downloads*97643 -Ref: tlmgr *--no-persistent-downloads*97671 -Ref: tlmgr *--pin-file*98165 -Ref: tlmgr *--usermode*98383 -Ref: tlmgr *--usertree* _dir_98503 -Node: tlmgr ACTIONS99053 -Node: tlmgr help100285 -Node: tlmgr version100761 -Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...101079 -Ref: tlmgr *--backupdir* _directory_102173 -Ref: tlmgr *--all*102370 -Ref: tlmgr *--clean*[=_N_]102592 -Ref: tlmgr *--dry-run*102889 -Node: tlmgr candidates _pkg_103009 -Ref: tlmgr *candidates _pkg_* 1103296 -Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]103440 -Ref: tlmgr *files*103883 -Ref: tlmgr *depends*104018 -Ref: tlmgr *executes*104360 -Ref: tlmgr *runfiles*104478 -Ref: tlmgr *--use-svn*104590 -Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]104707 -Node: tlmgr dump-tlpdb [--local|--remote]106779 -Ref: tlmgr *--local*107289 -Ref: tlmgr *--remote*107328 -Node: tlmgr generate [_option_]... _what_107750 -Ref: tlmgr *generate language*107991 -Ref: tlmgr *generate language.dat*108016 -Ref: tlmgr *generate language.def*108041 -Ref: tlmgr *generate language.dat.lua*108070 -Ref: tlmgr *generate fmtutil*108090 -Ref: tlmgr *--dest* _output_file_110327 -Ref: tlmgr *--localcfg* _local_conf_file_110903 -Ref: tlmgr *--rebuild-sys*111026 -Node: tlmgr gui111887 -Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]112131 -Ref: tlmgr *--list*113336 -Ref: tlmgr *--only-installed*113615 -Ref: tlmgr *--taxonomy*113830 -Ref: tlmgr *--keyword*113842 -Ref: tlmgr *--functionality*113860 -Ref: tlmgr *--characterization*113881 -Node: tlmgr init-usertree114094 -Node: tlmgr install [_option_]... _pkg_...114520 -Ref: tlmgr *--file*114884 -Ref: tlmgr *--reinstall*115110 -Ref: tlmgr *--no-depends*115490 -Ref: tlmgr *--no-depends-at-all*115649 -Ref: tlmgr *--dry-run* 1116047 -Ref: tlmgr *--force*116165 -Node: tlmgr option116371 -Ref: tlmgr *option [show]*116544 -Ref: tlmgr *option showall*116562 -Ref: tlmgr *option _key_ [_value_]*116588 -Node: tlmgr paper120436 -Ref: tlmgr *paper [a4|letter]*120621 -Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*120695 -Node: tlmgr path [--w32mode=user|admin] [add|remove]121722 -Node: tlmgr pinning123205 -Ref: tlmgr pinning show123512 -Ref: tlmgr pinning add _repo_ _pkgglob_...123585 -Ref: tlmgr pinning remove _repo_ _pkgglob_...123704 -Ref: tlmgr pinning remove _repo_ --all123857 -Node: tlmgr platform list|add|remove _platform_...123911 -Node: tlmgr platform set _platform_124159 -Node: tlmgr platform set auto124387 -Ref: tlmgr *--dry-run* 2125504 -Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...125613 -Node: tlmgr print-platform126915 -Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]127387 -Ref: tlmgr *--all* 1128283 -Ref: tlmgr *--backupdir* _directory_ 1128477 -Ref: tlmgr *--dry-run* 3128633 -Ref: tlmgr *--force* 1128750 -Node: tlmgr remove [_option_]... _pkg_...128778 -Ref: tlmgr *--no-depends* 1129301 -Ref: tlmgr *--no-depends-at-all* 1129363 -Ref: tlmgr *--force* 2129419 -Ref: tlmgr *--dry-run* 4129891 -Node: tlmgr repository129998 -Ref: tlmgr *repository list*130206 -Ref: tlmgr *repository list _path|tag_*130236 -Ref: tlmgr *repository add _path_ [_tag_]*130269 -Ref: tlmgr *repository remove _path|tag_*130301 -Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*130355 -Node: tlmgr search [_option_...] _what_131439 -Node: tlmgr search [_option_...] --file _what_131950 -Node: tlmgr search [_option_...] --taxonomy _what_132201 -Node: tlmgr search [_option_...] --keyword _what_132512 -Node: tlmgr search [_option_...] --functionality _what_132830 -Node: tlmgr search [_option_...] --characterization _what_133168 -Node: tlmgr search [_option_...] --all _what_133508 -Ref: tlmgr *--global*133956 -Ref: tlmgr *--word*134068 -Ref: tlmgr *--list* 1134307 -Ref: tlmgr *--file* 1134653 -Ref: tlmgr *--taxonomy* 1134710 -Ref: tlmgr *--keyword* 1134722 -Ref: tlmgr *--functionality* 1134740 -Ref: tlmgr *--characterization* 1134761 -Ref: tlmgr *--all* 2134916 -Node: tlmgr uninstall134999 -Ref: tlmgr *--force* 3135253 -Node: tlmgr update [_option_]... [_pkg_]...135309 -Ref: tlmgr *--all* 3135680 -Ref: tlmgr *--self*137421 -Ref: tlmgr *--dry-run* 5138185 -Ref: tlmgr *--list* [_pkg_]138362 -Ref: tlmgr *--exclude* _pkg_139051 -Ref: tlmgr *--no-auto-remove* [_pkg_]...139744 -Ref: tlmgr *--no-auto-install* [_pkg_]...140195 -Ref: tlmgr *--reinstall-forcibly-removed*140851 -Ref: tlmgr *--backup* and *--backupdir* _directory_141415 -Ref: tlmgr *--no-depends* 2142596 -Ref: tlmgr *--no-depends-at-all* 2142799 -Ref: tlmgr *--force* 4142855 -Node: tlmgr USER MODE143281 -Node: tlmgr user mode install146092 -Node: tlmgr user mode backup; restore; remove; update147039 -Node: tlmgr user mode generate; option; paper147481 -Node: tlmgr CONFIGURATION FILE FOR TLMGR147857 -Node: tlmgr TAXONOMIES148948 -Ref: tlmgr --keyword 2149574 -Ref: tlmgr --functionality 2149659 -Ref: tlmgr --characterization 2149815 -Ref: tlmgr --taxonomy 2149956 -Node: tlmgr MULTIPLE REPOSITORIES150497 -Node: tlmgr Pinning152218 -Node: tlmgr GUI FOR TLMGR154193 -Node: tlmgr Main display155415 -Node: tlmgr Display configuration area155667 -Ref: tlmgr Status156028 -Ref: tlmgr Category156192 -Ref: tlmgr Match156378 -Ref: tlmgr Selection156638 -Ref: tlmgr Display configuration buttons156842 -Node: tlmgr Package list area157025 -Ref: tlmgr a checkbox157609 -Ref: tlmgr package name157745 -Ref: tlmgr local revision (and version)157844 -Ref: tlmgr remote revision (and version)158219 -Ref: tlmgr short description158516 -Node: tlmgr Main display action buttons158561 -Ref: tlmgr Update all installed158827 -Ref: tlmgr Update159199 -Ref: tlmgr Install159249 -Ref: tlmgr Remove159435 -Ref: tlmgr Backup159613 -Node: tlmgr Menu bar159770 -Ref: tlmgr tlmgr menu159967 -Ref: tlmgr Options menu160275 -Ref: tlmgr Actions menu161358 -Ref: tlmgr Help menu161786 -Node: tlmgr MACHINE-READABLE OUTPUT161919 -Node: tlmgr Machine-readable update and install output162729 -Ref: tlmgr location-url _location_164005 -Ref: tlmgr total-bytes _count_164221 -Ref: tlmgr _pkgname_164631 -Ref: tlmgr _status_164841 -Ref: tlmgr d164919 -Ref: tlmgr f164979 -Ref: tlmgr u165158 -Ref: tlmgr r165204 -Ref: tlmgr a165327 -Ref: tlmgr i165505 -Ref: tlmgr I165624 -Ref: tlmgr _localrev_165726 -Ref: tlmgr _serverrev_165833 -Ref: tlmgr _size_165945 -Ref: tlmgr _runtime_166114 -Ref: tlmgr _esttot_166184 -Node: tlmgr Machine-readable option output166217 -Node: tlmgr AUTHORS AND COPYRIGHT166729 -Node: Index167076 +Node: Overview of build system3705 +Node: Prerequisites5769 +Node: Building7907 +Node: Build iteration9155 +Node: Build problems10227 +Node: Build in parallel10630 +Node: Build distribution11222 +Node: Build one package11793 +Node: Installing15379 +Node: Installation directories16394 +Node: Linked scripts18210 +Node: Distro builds19691 +Node: Layout and infrastructure22081 +Node: Build system tools22870 +Node: Top-level directories24879 +Node: Autoconf macros26920 +Node: General setup macros27621 +Node: Macros for programs28488 +Node: Macros for compilers29300 +Node: Macros for libraries30734 +Node: Macros for library and header flags31160 +Node: Macros for Windows33040 +Node: Library modules34617 +Node: png library35106 +Node: zlib library37395 +Node: freetype library37910 +Node: kpathsea library38438 +Node: Program modules39837 +Node: t1utils package40265 +Node: xindy package40828 +Node: xdvik package42007 +Node: asymptote43080 +Node: Extending TeX Live43531 +Node: Adding a new program module43899 +Node: Adding a new generic library module45418 +Node: Adding a new TeX-specific library module47631 +Node: Configure options48318 +Node: Global configure options49700 +Node: --disable-native-texlive-build50242 +Node: --prefix --bindir ...51232 +Node: --disable-largefile51772 +Node: --disable-missing52457 +Node: --enable-compiler-warnings=LEVEL52858 +Node: --enable-cxx-runtime-hack53597 +Node: --enable-maintainer-mode54024 +Node: --enable-multiplatform54553 +Node: --enable-shared55091 +Node: --enable-silent-rules55462 +Node: --without-ln-s55918 +Node: --without-x56269 +Node: Program-specific configure options56457 +Node: --enable-PROG --disable-PROG57100 +Node: --disable-all-pkgs57377 +Node: Configure options for texk/web2c58363 +Node: Configure options for texk/bibtex-x60881 +Node: Configure options for texk/dvipdfm-x61424 +Node: Configure options for texk/dvisvgm62197 +Node: Configure options for texk/texlive63083 +Node: Configure options for texk/xdvik63504 +Node: Configure options for utils/xindy64108 +Node: Library-specific configure options65009 +Node: Configure options for kpathsea66020 +Node: Configure options for system poppler66729 +Node: Variables for configure67520 +Node: Cross compilation68948 +Node: Cross configuring70247 +Node: Cross problems71920 +Node: Coding conventions73567 +Node: Declarations and definitions74236 +Node: Const76418 +Node: install-tl78281 +Node: install-tl NAME78622 +Node: install-tl SYNOPSIS78780 +Node: install-tl DESCRIPTION78988 +Node: install-tl REFERENCES79989 +Node: install-tl OPTIONS80505 +Ref: install-tl *-gui* [[=]_module_]80859 +Ref: install-tl text81068 +Ref: install-tl wizard81191 +Ref: install-tl perltk81345 +Ref: install-tl *-no-gui*81779 +Ref: install-tl *-lang* _llcode_81860 +Ref: install-tl *-repository* _url|path_82547 +Ref: install-tl *-select-repository*84358 +Ref: install-tl *-all-options*84794 +Ref: install-tl *-custom-bin* _path_85101 +Ref: install-tl *-debug-translation*85756 +Ref: install-tl *-force-platform* _platform_85975 +Ref: install-tl *-help*, *--help*, *-?*86219 +Ref: install-tl *-in-place*86612 +Ref: install-tl *-logfile* _file_87139 +Ref: install-tl *-no-cls*87490 +Ref: install-tl *-non-admin*87621 +Ref: install-tl *--persistent-downloads*87726 +Ref: install-tl *--no-persistent-downloads*87754 +Ref: install-tl *-portable*88362 +Ref: install-tl *-print-platform*88501 +Ref: install-tl *-profile* _profile_88694 +Ref: install-tl *-q*90188 +Ref: install-tl *-scheme* _scheme_90250 +Ref: install-tl *-v*90724 +Ref: install-tl *-version*, *--version*90885 +Node: install-tl ENVIRONMENT VARIABLES91016 +Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK91405 +Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE91607 +Ref: install-tl TEXLIVE_INSTALL_PREFIX91713 +Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG91744 +Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME91773 +Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL91803 +Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG91837 +Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR91868 +Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR91896 +Ref: install-tl NOPERLDOC91951 +Node: install-tl AUTHORS AND COPYRIGHT92015 +Node: tlmgr92373 +Node: tlmgr NAME92810 +Node: tlmgr SYNOPSIS92935 +Node: tlmgr DESCRIPTION93125 +Node: tlmgr EXAMPLES94221 +Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet94512 +Ref: tlmgr tlmgr update --list94693 +Ref: tlmgr tlmgr update --all94786 +Ref: tlmgr tlmgr info _pkg_94942 +Node: tlmgr OPTIONS95148 +Ref: tlmgr *--repository* _url|path_95668 +Ref: tlmgr *--gui* [_action_]96393 +Ref: tlmgr *--gui-lang* _llcode_96800 +Ref: tlmgr *--debug-translation*97483 +Ref: tlmgr *--machine-readable*97686 +Ref: tlmgr *--no-execute-actions*97954 +Ref: tlmgr *--package-logfile* _file_98147 +Ref: tlmgr *--pause*98402 +Ref: tlmgr *--persistent-downloads*98557 +Ref: tlmgr *--no-persistent-downloads*98585 +Ref: tlmgr *--pin-file*99079 +Ref: tlmgr *--usermode*99297 +Ref: tlmgr *--usertree* _dir_99417 +Node: tlmgr ACTIONS99967 +Node: tlmgr help101199 +Node: tlmgr version101675 +Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...101993 +Ref: tlmgr *--backupdir* _directory_103087 +Ref: tlmgr *--all*103284 +Ref: tlmgr *--clean*[=_N_]103506 +Ref: tlmgr *--dry-run*103803 +Node: tlmgr candidates _pkg_103923 +Ref: tlmgr *candidates _pkg_* 1104210 +Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]104354 +Ref: tlmgr *files*104797 +Ref: tlmgr *depends*104932 +Ref: tlmgr *executes*105274 +Ref: tlmgr *runfiles*105392 +Ref: tlmgr *--use-svn*105504 +Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]105621 +Node: tlmgr dump-tlpdb [--local|--remote]107693 +Ref: tlmgr *--local*108203 +Ref: tlmgr *--remote*108242 +Node: tlmgr generate [_option_]... _what_108664 +Ref: tlmgr *generate language*108905 +Ref: tlmgr *generate language.dat*108930 +Ref: tlmgr *generate language.def*108955 +Ref: tlmgr *generate language.dat.lua*108984 +Ref: tlmgr *generate fmtutil*109004 +Ref: tlmgr *--dest* _output_file_111241 +Ref: tlmgr *--localcfg* _local_conf_file_111817 +Ref: tlmgr *--rebuild-sys*111940 +Node: tlmgr gui112801 +Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]113045 +Ref: tlmgr *--list*114250 +Ref: tlmgr *--only-installed*114529 +Ref: tlmgr *--taxonomy*114744 +Ref: tlmgr *--keyword*114756 +Ref: tlmgr *--functionality*114774 +Ref: tlmgr *--characterization*114795 +Node: tlmgr init-usertree115008 +Node: tlmgr install [_option_]... _pkg_...115434 +Ref: tlmgr *--file*115798 +Ref: tlmgr *--reinstall*116024 +Ref: tlmgr *--no-depends*116404 +Ref: tlmgr *--no-depends-at-all*116563 +Ref: tlmgr *--dry-run* 1116961 +Ref: tlmgr *--force*117079 +Node: tlmgr option117285 +Ref: tlmgr *option [show]*117458 +Ref: tlmgr *option showall*117476 +Ref: tlmgr *option _key_ [_value_]*117502 +Node: tlmgr paper121350 +Ref: tlmgr *paper [a4|letter]*121535 +Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*121609 +Node: tlmgr path [--w32mode=user|admin] [add|remove]122636 +Node: tlmgr pinning124119 +Ref: tlmgr pinning show124426 +Ref: tlmgr pinning add _repo_ _pkgglob_...124499 +Ref: tlmgr pinning remove _repo_ _pkgglob_...124618 +Ref: tlmgr pinning remove _repo_ --all124771 +Node: tlmgr platform list|add|remove _platform_...124825 +Node: tlmgr platform set _platform_125073 +Node: tlmgr platform set auto125301 +Ref: tlmgr *--dry-run* 2126418 +Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...126527 +Node: tlmgr print-platform127829 +Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]128301 +Ref: tlmgr *--all* 1129197 +Ref: tlmgr *--backupdir* _directory_ 1129391 +Ref: tlmgr *--dry-run* 3129547 +Ref: tlmgr *--force* 1129664 +Node: tlmgr remove [_option_]... _pkg_...129692 +Ref: tlmgr *--no-depends* 1130215 +Ref: tlmgr *--no-depends-at-all* 1130277 +Ref: tlmgr *--force* 2130333 +Ref: tlmgr *--dry-run* 4130805 +Node: tlmgr repository130912 +Ref: tlmgr *repository list*131120 +Ref: tlmgr *repository list _path|tag_*131150 +Ref: tlmgr *repository add _path_ [_tag_]*131183 +Ref: tlmgr *repository remove _path|tag_*131215 +Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*131269 +Node: tlmgr search [_option_...] _what_132353 +Node: tlmgr search [_option_...] --file _what_132864 +Node: tlmgr search [_option_...] --taxonomy _what_133115 +Node: tlmgr search [_option_...] --keyword _what_133426 +Node: tlmgr search [_option_...] --functionality _what_133744 +Node: tlmgr search [_option_...] --characterization _what_134082 +Node: tlmgr search [_option_...] --all _what_134422 +Ref: tlmgr *--global*134870 +Ref: tlmgr *--word*134982 +Ref: tlmgr *--list* 1135221 +Ref: tlmgr *--file* 1135567 +Ref: tlmgr *--taxonomy* 1135624 +Ref: tlmgr *--keyword* 1135636 +Ref: tlmgr *--functionality* 1135654 +Ref: tlmgr *--characterization* 1135675 +Ref: tlmgr *--all* 2135830 +Node: tlmgr uninstall135913 +Ref: tlmgr *--force* 3136167 +Node: tlmgr update [_option_]... [_pkg_]...136223 +Ref: tlmgr *--all* 3136594 +Ref: tlmgr *--self*138335 +Ref: tlmgr *--dry-run* 5139099 +Ref: tlmgr *--list* [_pkg_]139276 +Ref: tlmgr *--exclude* _pkg_139965 +Ref: tlmgr *--no-auto-remove* [_pkg_]...140658 +Ref: tlmgr *--no-auto-install* [_pkg_]...141109 +Ref: tlmgr *--reinstall-forcibly-removed*141765 +Ref: tlmgr *--backup* and *--backupdir* _directory_142329 +Ref: tlmgr *--no-depends* 2143510 +Ref: tlmgr *--no-depends-at-all* 2143713 +Ref: tlmgr *--force* 4143769 +Node: tlmgr USER MODE144195 +Node: tlmgr user mode install147006 +Node: tlmgr user mode backup; restore; remove; update147953 +Node: tlmgr user mode generate; option; paper148395 +Node: tlmgr CONFIGURATION FILE FOR TLMGR148771 +Node: tlmgr TAXONOMIES149862 +Ref: tlmgr --keyword 2150488 +Ref: tlmgr --functionality 2150573 +Ref: tlmgr --characterization 2150729 +Ref: tlmgr --taxonomy 2150870 +Node: tlmgr MULTIPLE REPOSITORIES151411 +Node: tlmgr Pinning153132 +Node: tlmgr GUI FOR TLMGR155107 +Node: tlmgr Main display156329 +Node: tlmgr Display configuration area156581 +Ref: tlmgr Status156942 +Ref: tlmgr Category157106 +Ref: tlmgr Match157292 +Ref: tlmgr Selection157552 +Ref: tlmgr Display configuration buttons157756 +Node: tlmgr Package list area157939 +Ref: tlmgr a checkbox158523 +Ref: tlmgr package name158659 +Ref: tlmgr local revision (and version)158758 +Ref: tlmgr remote revision (and version)159133 +Ref: tlmgr short description159430 +Node: tlmgr Main display action buttons159475 +Ref: tlmgr Update all installed159741 +Ref: tlmgr Update160113 +Ref: tlmgr Install160163 +Ref: tlmgr Remove160349 +Ref: tlmgr Backup160527 +Node: tlmgr Menu bar160684 +Ref: tlmgr tlmgr menu160881 +Ref: tlmgr Options menu161189 +Ref: tlmgr Actions menu162272 +Ref: tlmgr Help menu162700 +Node: tlmgr MACHINE-READABLE OUTPUT162833 +Node: tlmgr Machine-readable update and install output163643 +Ref: tlmgr location-url _location_164919 +Ref: tlmgr total-bytes _count_165135 +Ref: tlmgr _pkgname_165545 +Ref: tlmgr _status_165755 +Ref: tlmgr d165833 +Ref: tlmgr f165893 +Ref: tlmgr u166072 +Ref: tlmgr r166118 +Ref: tlmgr a166241 +Ref: tlmgr i166419 +Ref: tlmgr I166538 +Ref: tlmgr _localrev_166640 +Ref: tlmgr _serverrev_166747 +Ref: tlmgr _size_166859 +Ref: tlmgr _runtime_167028 +Ref: tlmgr _esttot_167098 +Node: tlmgr Machine-readable option output167131 +Node: tlmgr AUTHORS AND COPYRIGHT167643 +Node: Index167990 End Tag Table diff --git a/source/doc/tlbuild.texi b/source/doc/tlbuild.texi index ea5c85446..8aa305f82 100644 --- a/source/doc/tlbuild.texi +++ b/source/doc/tlbuild.texi @@ -2,7 +2,7 @@ @setfilename tlbuild.info @set version 2016 -@set month-year February 2016 +@set month-year April 2016 @set mytitle Building @TeX{} Live (@value{version}) @settitle @value{mytitle} @@ -238,7 +238,11 @@ that are not installed by default. @item xetex @cindex @code{fontconfig} library, required by @code{xetex} -requires @file{fontconfig} (again both headers and library). +@cindex @code{ApplicationServices} Mac framework, required by @code{xetex} +@cindex @code{Cocoa} Mac framework, required by @code{xetex} +requires @file{fontconfig} (again both headers and library), or, for +MacOSX only, the @code{ApplicationServices} and @code{Cocoa} +frameworks. @item xindy @cindex @code{clisp}, required by @code{xindy} @@ -289,13 +293,13 @@ do a normal build. The top-level @file{Build} script is intended to simplify building the binaries distributed with @TL{} itself---we call this the ``native'' TL build. It configures and makes everything in a subdirectory of the -main build tree (default @file{Work/}), installs everything in an -other subdirectory (default @file{inst/}), and finally runs @code{make +main build tree (default @file{Work/}), installs everything in another +subdirectory (default @file{inst/}), and finally runs @code{make check}. The exact directory and command names can be specified via environment variables and a few leading options. All remaining arguments (assignments or options) are passed to the @file{configure} -script. Please take a look at the script itself for more information; -it is not complicated. +script. Please take a look at the @file{./Build} source file itself +for more information; it is a straightforward shell script. @cindex source directory building, not supported @cindex build directory, required @@ -404,7 +408,7 @@ system, since all the support files are lacking; @pxref{Installing}. @cindex build one package @cindex one package, building -@vindex --disable-all-packages configure @r{option} +@vindex --disable-all-packages @cindex build on demand To build one package, the basic idea is to use the @code{configure} option @code{--disable-all-pkgs} (@pxref{@code{--disable-all-pkgs}}). @@ -413,9 +417,9 @@ However, the @file{Makefile}s still contain all build rules and dependencies and can be invoked to build an individual program or library and causes to first build any required libraries. -This ``build-on-demand'' procedure is used, e.g., in the @code{luatex} -repository to build Lua@TeX{}, essentially from a subset of the -complete @TL{} tree. Similarly, when, e.g., building the original +This ``build-on-demand'' procedure is used, e.g., in the upstream +Lua@TeX{} repository to build Lua@TeX{}, essentially from a subset of +the complete @TL{} tree. Similarly, when, e.g., building the original e-@TeX{} has been disabled (as it is by default), one can run @code{make etex} (or @code{make etex.exe}) in @file{texk/web2c/} to build e-@TeX{} (although there is no comparably simple way to install @@ -472,6 +476,28 @@ For an example, see the @code{build-pdftex.sh} script in the @code{pdftex} development sources (@url{http://pdftex.org}), which are indeed a cut-down TL source tree. +@vindex --enable-missing @r{to ignore dependencies} +Caveat 1: even with @code{--disable-all-pkgs}, dependencies will be +checked. For instance, if a non-MacOSX system does not have +@code{fontconfig}, Xe@TeX{} cannot be built (@pxref{Prerequisites}) +and @code{configure} will terminate. To proceed without such +dependencies, specify @code{--enable-missing} also. (Arguably this +should happen automatically.) + +@vindex CC=@var{c-compiler} +@vindex CXX=@var{c++-compiler} +@vindex OBJCXX=@var{objc-compiler} +@cindex ICU, prefers @code{clang} compilers +@cindex @code{clang} compilers, preferred by ICU +Caveat 2: unless @code{CC} and @code{CXX} and @code{OBJCXX} are +explicitly specified, each package will configure its own compiler(s). +In practice, this results in a conflict in only one instance: the ICU +(@file{libs/icu}) library will prefer @code{clang} and @code{clang++} +over all others if they are installed, whereas everything else prefers +@code{gcc} and @code{g++}. Usually the results will be interoperable, +but it can cause extra confusion and problems when debugging a program +that uses ICU. + @node Installing @chapter Installing @@ -727,7 +753,7 @@ Currently the versions we use are: @end display @pindex reautoconf -@vindex --enable-maintainer-mode configure @r{option} +@vindex --enable-maintainer-mode These versions should be used to update the generated files (e.g., @file{configure} or @file{Makefile.in}) in all or parts of the TL tree after their dependencies have been changed. This can be done @@ -929,7 +955,7 @@ or @code{kpse_cv_visibility_cxxflags} variable. @defmac KPSE_CXX_HACK @cindex static linking for C++ @cindex linking C++ libraries statically -@vindex --enable-cxx-runtime-hack configure @r{option} +@vindex --enable-cxx-runtime-hack @pindex libstc++@r{, statically linking} Provide the configure option @code{--enable-cxx-runtime-hack}. If enabled and when using @code{g++}, try to statically link with diff --git a/source/libs/README b/source/libs/README index 87849e3e4..14b8cf22a 100644 --- a/source/libs/README +++ b/source/libs/README @@ -1,4 +1,4 @@ -$Id: README 40154 2016-03-27 17:16:39Z karl $ +$Id: README 40250 2016-04-05 18:20:42Z karl $ Public domain. Originally created by Karl Berry, 2005. Libraries we compile for TeX Live. @@ -21,10 +21,10 @@ gd 2.1.1 - checked 14jan15 gmp 6.1.0 - checked 28dec15 http://ftp.gnu.org/gnu/gmp/ -graphite2 1.3.7 - checked 15mar16 +graphite2 1.3.8 - checked 31mar16 http://sourceforge.net/projects/silgraphite/files/graphite2/ -harfbuzz 1.2.4 - checked 17mar16 +harfbuzz 1.2.5 - checked 05apr16 http://www.freedesktop.org/software/harfbuzz/release/ icu 57.1 (release) - checked 27mar16 @@ -66,5 +66,5 @@ xpdf 3.04 - checked 28may14 zlib 1.2.8 - checked 18may13 http://www.zlib.net/ - used by many -zziplib 0.13.62 - checked 12mar12 +zziplib 0.13.62 - checked 31mar16 http://zziplib.sourceforge.net/ - used by luatex diff --git a/source/libs/libpng/ChangeLog b/source/libs/libpng/ChangeLog index 84d1018da..7f8e29ffb 100644 --- a/source/libs/libpng/ChangeLog +++ b/source/libs/libpng/ChangeLog @@ -1,3 +1,8 @@ +2016-03-30 Karl Berry <karl@tug.org> + + * Makefile.am (AM_CPPFLAGS): remove LIBPNG_USER_CPPFLAGS per Mojca. + http://tug.org/pipermail/tlbuild/2016q1/003440.html + 2016-03-28 Karl Berry <karl@tug.org> * configure.ac: insert check for -std=c89 from Mojca. diff --git a/source/libs/libpng/Makefile.am b/source/libs/libpng/Makefile.am index 3141c432d..c0e6bae3b 100644 --- a/source/libs/libpng/Makefile.am +++ b/source/libs/libpng/Makefile.am @@ -22,7 +22,7 @@ NEVER_NAMES += $(NEVER_NAMES_SUB) SUBDIRS = . include AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) \ - $(LIBPNG_DEFINES) $(LIBPNG_USER_CPPFLAGS) + $(LIBPNG_DEFINES) AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS) noinst_LIBRARIES=libpng.a diff --git a/source/libs/libpng/Makefile.in b/source/libs/libpng/Makefile.in index e780b5bd0..e38bbc217 100644 --- a/source/libs/libpng/Makefile.in +++ b/source/libs/libpng/Makefile.in @@ -570,7 +570,7 @@ 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) $(LIBPNG_USER_CPPFLAGS) + $(LIBPNG_DEFINES) AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS) noinst_LIBRARIES = libpng.a diff --git a/source/texk/README b/source/texk/README index 684020d23..20c4d5674 100644 --- a/source/texk/README +++ b/source/texk/README @@ -1,4 +1,4 @@ -$Id: README 39995 2016-03-11 06:12:34Z kakuto $ +$Id: README 40296 2016-04-07 00:56:37Z karl $ Copyright 2006-2016 TeX Users Group. You may freely use, modify and/or distribute this file. @@ -39,7 +39,7 @@ detex 2.8 - checked 10may12 dtl - ? -dvi2tty 5.3.4 - checked 10may12 +dvi2tty 6.0.0 - checked 05mar16 https://github.com/t-tk/dvi2tty dvidvi - maintained here. @@ -111,7 +111,7 @@ web2c - maintained here, by us - core web2c, plain tex, etc. eptex - https://osdn.jp/projects/eptex/ etex - maintained here euptex - https://texwiki.texjp.org/?e-pTeX - mflua[jit] - https://github.com/luigiScarso/mflua + mflua[jit] - https://foundry.supelec.fr/projects/mflua/ mplibdir - http://tug.org/metapost luatex - http://luatex.org pdftex - http://pdftex.org @@ -121,5 +121,17 @@ web2c - maintained here, by us - core web2c, plain tex, etc. uptex - https://texwiki.texjp.org/?upTeX%2CupLaTeX xetex - http://tug.org/xetex/ -xdvik 22.87 - checked 14apr14 +xdvik 22.87.03 - checked 6apr16 http://sourceforge.net/projects/xdvi/files/xdvik/ + Procedure for updating xdvik from sourceforge release: +tar xf ... +diff -crN2 \ + -x .cvsignore -x configure -x autom4te.cache -x Makefile.in -x ChangeLog \ + xdvik xdvik-22.87.03/texk/xdvik >/tmp/c +cd xdvik +patch -p1 </tmp/c +reautoconf +add import entry to ChangeLog, update texk/README +remove unpacked ../xdvik-* +make sure it builds +commit. diff --git a/source/texk/kpathsea/ChangeLog b/source/texk/kpathsea/ChangeLog index f413ba82a..6b52ba1b2 100644 --- a/source/texk/kpathsea/ChangeLog +++ b/source/texk/kpathsea/ChangeLog @@ -1,3 +1,22 @@ +2016-04-06 Karl Berry <karl@tug.org> + + * texmf.cnf (TEXMFVAR, TEXMFCONFIG): 2016. + (shell_escape_commands): add gregorio, fingers crossed. + + * cnf.c (do_line): do not keep checking ISSPACE beyond + end of string. (Can crash on lines without spaces.) + Return error string if problems. + * kpathsea_cnf_get: give warning, with line number, + if do_line returns a message. + +2016-02-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * texmf.cnf: Typo. + +2016-04-06 Karl Berry <karl@tug.org> + + * kpsewhich.c, et al.: copyright 2016. + 2016-03-06 Karl Berry <karl@tug.org> * version.ac: remove /dev for start of 2016 builds. @@ -16,9 +35,9 @@ * win32lib.h: Update (w32 only). -2015-00-01 Peter Breitenlohner <peb@mppmu.mpg.de> +2015-10-01 Peter Breitenlohner <peb@mppmu.mpg.de> - * kpsewhich.c (USGAE): Say "list shown by -help-formats". + * kpsewhich.c (USAGE): Say "list shown by -help-formats". 2015-07-07 Peter Breitenlohner <peb@mppmu.mpg.de> @@ -8820,3 +8839,5 @@ Fri Apr 23 16:11:13 1993 Karl Berry (karl@cs.umb.edu) * pathsrch.c: paths.h need not be included. * Created. + +(This ChangeLog file public domain.) diff --git a/source/texk/kpathsea/NEWS b/source/texk/kpathsea/NEWS index 85661c301..0fb062bea 100644 --- a/source/texk/kpathsea/NEWS +++ b/source/texk/kpathsea/NEWS @@ -1,5 +1,8 @@ This file records noteworthy changes. (Public domain.) +6.2.2 (for TeX Live 2016) +* gregorio added to default shell_escape_commands. + 6.2.1 (for TeX Live 2015, 21 May 2015) * search path information output with new option --help-formats to kpsewhich, no longer with --help. diff --git a/source/texk/kpathsea/cnf.c b/source/texk/kpathsea/cnf.c index 578e42a5a..e216a18d1 100644 --- a/source/texk/kpathsea/cnf.c +++ b/source/texk/kpathsea/cnf.c @@ -1,6 +1,6 @@ /* cnf.c: read config files. - Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011, 2012 Karl Berry. + Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011, 2012, 2016 Karl Berry. Copyright 1997-2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -39,14 +39,18 @@ #define CNF_HASH_SIZE 751 #define CNF_NAME "texmf.cnf" - -/* Do a single line in a cnf file: if it's blank or a comment, skip it. - Otherwise, parse <variable>[.<program>] [=] <value>. Do - this even if the <variable> is already set in the environment, since - the envvalue might contain a trailing :, in which case we'll be - looking for the cnf value. */ -static void + +/* Do a single line in a cnf file: if it's blank or a comment or + erroneous, skip it. Otherwise, parse + <variable>[.<program>] [=] <value> + Do this even if the <variable> is already set in the environment, + since the envvalue might contain a trailing :, in which case we'll be + looking for the cnf value. + + We return NULL if ok, an error string otherwise. */ + +static string do_line (kpathsea kpse, string line) { unsigned len; @@ -55,16 +59,16 @@ do_line (kpathsea kpse, string line) string prog = NULL; /* Skip leading whitespace. */ - while (ISSPACE (*line)) + while (*line && ISSPACE (*line)) line++; /* More to do only if we have non-comment material left. */ if (*line == 0 || *line == '%' || *line == '#') - return; + return NULL; /* Remove trailing comment: a % or # preceded by whitespace. Also remove any whitespace before that. For example, the value for - foo = a#b %something + foo = a#b %something is a#b. */ value = line + strlen (line) - 1; /* start at end of line */ while (value > line) { @@ -79,17 +83,21 @@ do_line (kpathsea kpse, string line) /* The variable name is everything up to the next space or = or `.'. */ start = line; - while (!ISSPACE (*line) && *line != '=' && *line != '.') + while (*line && !ISSPACE (*line) && *line != '=' && *line != '.') line++; /* `line' is now one character past the end of the variable name. */ len = line - start; - var = (string)xmalloc (len + 1); + if (len == 0) { + return ("No cnf variable name"); + } + + var = (string) xmalloc (len + 1); strncpy (var, start, len); var[len] = 0; /* If the variable is qualified with a program name, find out which. */ - while (ISSPACE (*line)) + while (*line && ISSPACE (*line)) line++; if (*line == '.') { /* Skip spaces, then everything up to the next space or =. */ @@ -103,17 +111,17 @@ do_line (kpathsea kpse, string line) /* It's annoying to repeat all this, but making a tokenizing subroutine would be just as long and annoying. */ len = line - start; - prog = (string)xmalloc (len + 1); + prog = (string) xmalloc (len + 1); strncpy (prog, start, len); prog[len] = 0; } /* Skip whitespace, an optional =, more whitespace. */ - while (ISSPACE (*line)) + while (*line && ISSPACE (*line)) line++; if (*line == '=') { line++; - while (ISSPACE (*line)) + while (*line && ISSPACE (*line)) line++; } @@ -122,8 +130,11 @@ do_line (kpathsea kpse, string line) len = strlen (start); while (len > 0 && ISSPACE (start[len - 1])) len--; - - value = (string)xmalloc (len + 1); + if (len == 0) { + return ("No cnf value"); + } + + value = (string) xmalloc (len + 1); strncpy (value, start, len); value[len] = 0; @@ -155,10 +166,13 @@ do_line (kpathsea kpse, string line) free (prog); var = lhs; } + /* last-ditch debug */ + /* fprintf (stderr, "kpse/cnf.c hash_insert(%s,%s)\n", var, value); */ hash_insert (&(kpse->cnf_hash), var, value); - /* We could check that anything remaining is preceded by a comment - character, but let's not bother. */ + /* We should check that anything remaining is preceded by a comment + character, but we don't. Sorry. */ + return NULL; } /* Read all the configuration files in the path. */ @@ -176,12 +190,16 @@ read_all_cnf (kpathsea kpse) if (cnf_files && *cnf_files) { for (cnf = cnf_files; *cnf; cnf++) { string line; + string msg; + unsigned lineno = 0; FILE *cnf_file = xfopen (*cnf, FOPEN_R_MODE); if (kpse->record_input) kpse->record_input (*cnf); while ((line = read_line (cnf_file)) != NULL) { - unsigned len = strlen (line); + unsigned len; + lineno++; + len = strlen (line); /* Strip trailing spaces. */ while (len > 0 && ISSPACE(line[len-1])) { line[len - 1] = 0; @@ -190,9 +208,11 @@ read_all_cnf (kpathsea kpse) /* Concatenate consecutive lines that end with \. */ while (len > 0 && line[len - 1] == '\\') { string next_line = read_line (cnf_file); + lineno++; line[len - 1] = 0; if (!next_line) { - WARNING1 ("kpathsea: %s: Last line of file ends with \\", *cnf); + WARNING2 ("%s:%d: (kpathsea) Last line of file ends with \\", + *cnf, lineno); } else { string new_line; new_line = concat (line, next_line); @@ -202,7 +222,11 @@ read_all_cnf (kpathsea kpse) } } - do_line (kpse, line); + msg = do_line (kpse, line); + if (msg) { + WARNING4 ("%s:%d: (kpathsea) %s on line: %s", + *cnf, lineno, msg, line); + } free (line); } diff --git a/source/texk/kpathsea/doc/kpathsea.info b/source/texk/kpathsea/doc/kpathsea.info index 3155fd955..bfca8c1b0 100644 --- a/source/texk/kpathsea/doc/kpathsea.info +++ b/source/texk/kpathsea/doc/kpathsea.info @@ -3,7 +3,7 @@ kpathsea.texi. This file documents the Kpathsea library for path searching. - Copyright (C) 1996-2015 Karl Berry & Olaf Weber. + Copyright (C) 1996-2016 Karl Berry & Olaf Weber. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are @@ -37,7 +37,7 @@ Kpathsea library **************** This manual documents the Kpathsea library for path searching. It -corresponds to version 6.2.1, released in May 2015. +corresponds to version 6.2.2, released in Aprile 2016. * Menu: @@ -61,8 +61,8 @@ File: kpathsea.info, Node: Introduction, Next: unixtex.ftp, Prev: Top, Up: T 1 Introduction ************** -This manual corresponds to version 6.2.1 of the Kpathsea library, -released in May 2015. +This manual corresponds to version 6.2.2 of the Kpathsea library, +released in Aprile 2016. The library's fundamental purpose is to return a filename from a list of directories specified by the user, similar to what shells do when @@ -3638,58 +3638,58 @@ Index Tag Table: Node: Top1480 -Node: Introduction2258 -Node: History4202 -Node: unixtex.ftp8799 -Node: Security10294 -Node: TeX directory structure12798 -Node: Path searching16846 -Node: Searching overview17504 -Node: Path sources20899 -Node: Config files21957 -Node: Path expansion25884 -Node: Default expansion26833 -Node: Variable expansion28903 -Node: Tilde expansion30304 -Node: Brace expansion31284 -Node: KPSE_DOT expansion32209 -Node: Subdirectory expansion32722 -Node: Filename database35076 -Node: ls-R36130 -Node: Filename aliases39025 -Node: Database format40203 -Node: Invoking kpsewhich41216 -Node: Path searching options42171 -Node: Specially-recognized files50091 -Node: Auxiliary tasks51446 -Node: Standard options53785 -Node: TeX support54141 -Node: Supported file formats55493 -Node: File lookup63158 -Node: Glyph lookup64907 -Node: Basic glyph lookup66031 -Node: Fontmap66911 -Node: Fallback font69332 -Node: Suppressing warnings70244 -Node: mktex scripts71371 -Node: mktex configuration72586 -Node: mktex script names78389 -Node: mktex script arguments79775 -Node: Programming80654 -Node: Programming overview81176 -Node: Calling sequence83873 -Node: Program-specific files90405 -Node: Programming with config files91428 -Node: Reporting bugs92740 -Node: Bug checklist93418 -Node: Mailing lists96890 -Node: Debugging97565 -Node: Logging102642 -Node: Common problems104509 -Node: Unable to find files104986 -Node: Slow path searching107396 -Node: Unable to generate fonts108771 -Node: TeX or Metafont failing111242 -Node: Index112595 +Node: Introduction2261 +Node: History4208 +Node: unixtex.ftp8805 +Node: Security10300 +Node: TeX directory structure12804 +Node: Path searching16852 +Node: Searching overview17510 +Node: Path sources20905 +Node: Config files21963 +Node: Path expansion25890 +Node: Default expansion26839 +Node: Variable expansion28909 +Node: Tilde expansion30310 +Node: Brace expansion31290 +Node: KPSE_DOT expansion32215 +Node: Subdirectory expansion32728 +Node: Filename database35082 +Node: ls-R36136 +Node: Filename aliases39031 +Node: Database format40209 +Node: Invoking kpsewhich41222 +Node: Path searching options42177 +Node: Specially-recognized files50097 +Node: Auxiliary tasks51452 +Node: Standard options53791 +Node: TeX support54147 +Node: Supported file formats55499 +Node: File lookup63164 +Node: Glyph lookup64913 +Node: Basic glyph lookup66037 +Node: Fontmap66917 +Node: Fallback font69338 +Node: Suppressing warnings70250 +Node: mktex scripts71377 +Node: mktex configuration72592 +Node: mktex script names78395 +Node: mktex script arguments79781 +Node: Programming80660 +Node: Programming overview81182 +Node: Calling sequence83879 +Node: Program-specific files90411 +Node: Programming with config files91434 +Node: Reporting bugs92746 +Node: Bug checklist93424 +Node: Mailing lists96896 +Node: Debugging97571 +Node: Logging102648 +Node: Common problems104515 +Node: Unable to find files104992 +Node: Slow path searching107402 +Node: Unable to generate fonts108777 +Node: TeX or Metafont failing111248 +Node: Index112601 End Tag Table diff --git a/source/texk/kpathsea/doc/kpathsea.texi b/source/texk/kpathsea/doc/kpathsea.texi index af7ca2170..6a07df157 100644 --- a/source/texk/kpathsea/doc/kpathsea.texi +++ b/source/texk/kpathsea/doc/kpathsea.texi @@ -2,13 +2,13 @@ @setfilename kpathsea.info @settitle Kpathsea: A library for path searching -@set version 6.2.1 -@set month-year May 2015 +@set version 6.2.2 +@set month-year Aprile 2016 @copying This file documents the Kpathsea library for path searching. -Copyright @copyright{} 1996--2015 Karl Berry & Olaf Weber. +Copyright @copyright{} 1996--2016 Karl Berry & Olaf Weber. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are diff --git a/source/texk/kpathsea/file-p.c b/source/texk/kpathsea/file-p.c index eb8955f08..8e45a9209 100644 --- a/source/texk/kpathsea/file-p.c +++ b/source/texk/kpathsea/file-p.c @@ -1,6 +1,6 @@ /* file-p.c: file predicates. - Copyright 1992, 1993, 1994, 2008 Karl Berry. + Copyright 1992, 1993, 1994, 2008, 2015, 2016 Karl Berry. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/kpsewhich.c b/source/texk/kpathsea/kpsewhich.c index e46f6d284..b26bd4f68 100644 --- a/source/texk/kpathsea/kpsewhich.c +++ b/source/texk/kpathsea/kpsewhich.c @@ -1,7 +1,7 @@ /* kpsewhich -- standalone path lookup and variable expansion for Kpathsea. Ideas from Thomas Esser, Pierre MacKay, and many others. - Copyright 1995-2015 Karl Berry & Olaf Weber. + Copyright 1995-2016 Karl Berry & Olaf Weber. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -631,7 +631,7 @@ read_command_line (kpathsea kpse, int argc, string *argv) } else if (ARGUMENT_IS ("version")) { puts (kpathsea_version_string); - puts ("Copyright 2015 Karl Berry & Olaf Weber.\n\ + puts ("Copyright 2016 Karl Berry & Olaf Weber.\n\ License LGPLv2.1+: GNU Lesser GPL version 2.1 or later <http://gnu.org/licenses/lgpl.html>\n\ This is free software: you are free to change and redistribute it.\n\ There is NO WARRANTY, to the extent permitted by law.\n"); diff --git a/source/texk/kpathsea/mingw32.c b/source/texk/kpathsea/mingw32.c index 32c23e75d..a126ba4cf 100644 --- a/source/texk/kpathsea/mingw32.c +++ b/source/texk/kpathsea/mingw32.c @@ -1,6 +1,6 @@ /* mingw32.c: bits and pieces for mingw32 - Copyright 2009-2013 Taco Hoekwater <taco@luatex.org>. + Copyright 2009-2016 Taco Hoekwater <taco@luatex.org>. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/mingw32.h b/source/texk/kpathsea/mingw32.h index 8db9c135f..cfa49a657 100644 --- a/source/texk/kpathsea/mingw32.h +++ b/source/texk/kpathsea/mingw32.h @@ -1,6 +1,6 @@ /* mingw32.h: declarations for mingw32. - Copyright 2009-2014 Taco Hoekwater <taco@luatex.org>. + Copyright 2009-2016 Taco Hoekwater <taco@luatex.org>. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/texmf.cnf b/source/texk/kpathsea/texmf.cnf index 4d129cb2a..928de4f6e 100644 --- a/source/texk/kpathsea/texmf.cnf +++ b/source/texk/kpathsea/texmf.cnf @@ -4,16 +4,20 @@ % If you modify this original file, YOUR CHANGES WILL BE LOST when it is % updated. Instead, put your changes -- and only your changes, not an % entire copy! -- in ../../texmf.cnf. That is, if this file is -% installed in /some/path/to/texlive/2015/texmf-dist/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2015/texmf.cnf. +% installed in /some/path/to/texlive/2016/texmf-dist/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2016/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. % +% Each statement in this file boils down to: +% <variable>[.<program>] [=] <value> +% +% Neither the <variable> nor the <value> may be empty. % Any identifier (sticking to A-Za-z_ for names is safest) can be assigned. % The `=' (and surrounding spaces) is optional. % $foo (or ${foo}) in a value expands to the envvar or cnf value of foo. -% Long lines can be continued with a \. +% Lines can be continued with a \; no whitespace removal is done. % % Earlier entries (in the same or another file) override later ones, and % an environment variable foo overrides any texmf.cnf definition of foo. @@ -36,8 +40,7 @@ % expanded into the compile-time default. Probably not what you want. % % Brace notation is supported, for example: /usr/local/{mytex,othertex} -% expands to /usr/local/mytex:/usr/local/othertex. We make extensive -% use of this. +% expands to /usr/local/mytex:/usr/local/othertex. % Part 1: Search paths and directories. @@ -76,10 +79,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config TEXMFHOME = ~/texmf % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. -TEXMFVAR = ~/.texlive2015/texmf-var +TEXMFVAR = ~/.texlive2016/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. -TEXMFCONFIG = ~/.texlive2015/texmf-config +TEXMFCONFIG = ~/.texlive2016/texmf-config % List all the texmf trees. For an explanation of what they are, see the % TeX Live manual. @@ -562,6 +565,7 @@ shell_escape = p shell_escape_commands = \ bibtex,bibtex8,\ extractbb,\ +gregorio,\ kpsewhich,\ makeindex,\ mpost,\ @@ -571,9 +575,6 @@ repstopdf,\ % dvips - but external commands can be executed, need at least -R1. % epspdf, ps2pdf, pstopdf - need to respect openout_any, % and gs -dSAFER must be used and check for shell injection with filenames. -% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides, -% without Unix convert it hardly seems worth it, and Windows convert -% is something completely different that destroys filesystems, so skip. % pygmentize - but is the filter feature insecure? % ps4pdf - but it calls an unrestricted latex. % rpdfcrop - maybe ok, but let's get experience with repstopdf first. @@ -649,8 +650,8 @@ file_line_error_style = f % Used by makempx to run TeX. We use "etex" because MetaPost is % expecting DVI, and not "tex" because we want first line parsing. TEX = etex -# -# Use Japanese eptex for Japanese pmpost. + +% Use Japanese eptex for Japanese pmpost. TEX.pmpost = eptex % These variables specify the external program called for the diff --git a/source/texk/kpathsea/win32/ChangeLog b/source/texk/kpathsea/win32/ChangeLog index 4bce31540..5b8013f45 100644 --- a/source/texk/kpathsea/win32/ChangeLog +++ b/source/texk/kpathsea/win32/ChangeLog @@ -1,3 +1,7 @@ +2016-04-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * All *.c, *.h files: Copyright year 2016. + 2015-06-20 Peter Breitenlohner <peb@mppmu.mpg.de> * dirutil.h, getdestdir.h, mktexupd.h (removed): Merged ... diff --git a/source/texk/kpathsea/win32/dirutil.c b/source/texk/kpathsea/win32/dirutil.c index c219efd27..658c5f30c 100644 --- a/source/texk/kpathsea/win32/dirutil.c +++ b/source/texk/kpathsea/win32/dirutil.c @@ -1,6 +1,6 @@ /* dirutil.c - Copyright 2000, 2015 Akira Kakuto. + Copyright 2000, 2016 Akira Kakuto. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/win32/getdestdir.c b/source/texk/kpathsea/win32/getdestdir.c index 281e3540f..7fd78dc4f 100644 --- a/source/texk/kpathsea/win32/getdestdir.c +++ b/source/texk/kpathsea/win32/getdestdir.c @@ -1,6 +1,6 @@ /* getdestdir.c - Copyright 2000, 2015 Akira Kakuto. + Copyright 2000, 2016 Akira Kakuto. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/win32/mkpaths.c b/source/texk/kpathsea/win32/mkpaths.c index 5de8c6565..46c8c0071 100644 --- a/source/texk/kpathsea/win32/mkpaths.c +++ b/source/texk/kpathsea/win32/mkpaths.c @@ -1,6 +1,6 @@ /* mkpaths.c - Copyright 2015 Akira Kakuto. + Copyright 2015, 2016 Akira Kakuto. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/win32/mktex.h b/source/texk/kpathsea/win32/mktex.h index b4deb0eba..a349aafb6 100644 --- a/source/texk/kpathsea/win32/mktex.h +++ b/source/texk/kpathsea/win32/mktex.h @@ -1,6 +1,6 @@ /* mktex.h - Copyright 2000, 2015 Akira Kakuto. + Copyright 2000, 2016 Akira Kakuto. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/win32/mktexfmt.c b/source/texk/kpathsea/win32/mktexfmt.c index 3171643d6..ac400b54a 100644 --- a/source/texk/kpathsea/win32/mktexfmt.c +++ b/source/texk/kpathsea/win32/mktexfmt.c @@ -1,6 +1,6 @@ /* mktexfmt.c - Copyright 2000, 2015 Akira Kakuto. + Copyright 2000, 2016 Akira Kakuto. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/win32/mktexlsr.c b/source/texk/kpathsea/win32/mktexlsr.c index a7926f7eb..5a299a3ca 100644 --- a/source/texk/kpathsea/win32/mktexlsr.c +++ b/source/texk/kpathsea/win32/mktexlsr.c @@ -1,6 +1,6 @@ /* mktexlsr.c - Copyright 2000, 2015 Akira Kakuto. + Copyright 2000, 2016 Akira Kakuto. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/win32/mktexmf.c b/source/texk/kpathsea/win32/mktexmf.c index af38fa50b..9c5a47a65 100644 --- a/source/texk/kpathsea/win32/mktexmf.c +++ b/source/texk/kpathsea/win32/mktexmf.c @@ -1,6 +1,6 @@ /* mktexmf.c - Copyright 2000, 2015 Akira Kakuto. + Copyright 2000, 2016 Akira Kakuto. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/win32/mktexpk.c b/source/texk/kpathsea/win32/mktexpk.c index de7d6b456..9d89174bb 100644 --- a/source/texk/kpathsea/win32/mktexpk.c +++ b/source/texk/kpathsea/win32/mktexpk.c @@ -1,6 +1,6 @@ /* mktexpk.c - Copyright 2000, 2015 Akira Kakuto. + Copyright 2000, 2016 Akira Kakuto. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/win32/mktextfm.c b/source/texk/kpathsea/win32/mktextfm.c index 34cea032d..dd1258473 100644 --- a/source/texk/kpathsea/win32/mktextfm.c +++ b/source/texk/kpathsea/win32/mktextfm.c @@ -1,6 +1,6 @@ /* mktextfm.c - Copyright 2000, 2015 Akira Kakuto. + Copyright 2000, 2016 Akira Kakuto. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/win32/mktexupd.c b/source/texk/kpathsea/win32/mktexupd.c index c05ae1f74..343891f97 100644 --- a/source/texk/kpathsea/win32/mktexupd.c +++ b/source/texk/kpathsea/win32/mktexupd.c @@ -1,6 +1,6 @@ /* mktexupd.c - Copyright 2000, 2015 Akira Kakuto. + Copyright 2000, 2016 Akira Kakuto. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/win32/mktexupdmain.c b/source/texk/kpathsea/win32/mktexupdmain.c index 841dac288..3a52ee3bd 100644 --- a/source/texk/kpathsea/win32/mktexupdmain.c +++ b/source/texk/kpathsea/win32/mktexupdmain.c @@ -1,6 +1,6 @@ /* mktexupdmain.c - Copyright 2000, 2015 Akira Kakuto. + Copyright 2000, 2016 Akira Kakuto. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/source/texk/kpathsea/win32lib.c b/source/texk/kpathsea/win32lib.c index 4b176aab9..8fa05b926 100644 --- a/source/texk/kpathsea/win32lib.c +++ b/source/texk/kpathsea/win32lib.c @@ -1,6 +1,6 @@ /* win32lib.c: bits and pieces for win32 and msvc. - Copyright 2006, 2011-2013 Akira Kakuto. + Copyright 2006, 2011-2016 Akira Kakuto. Copyright 1996, 1997, 1998, 1999 Fabrice Popineau. This library is free software; you can redistribute it and/or diff --git a/source/texk/kpathsea/win32lib.h b/source/texk/kpathsea/win32lib.h index 28aae28d8..badb32b4e 100644 --- a/source/texk/kpathsea/win32lib.h +++ b/source/texk/kpathsea/win32lib.h @@ -1,6 +1,6 @@ /* win32lib.h: bits and pieces for win32 and msvc. - Copyright 2006, 2010-2015 Akira Kakuto. + Copyright 2006, 2010-2016 Akira Kakuto. Copyright 1996, 1997, 1998, 1999 Fabrice Popineau. This library is free software; you can redistribute it and/or diff --git a/source/texk/texlive/w32_wrapper/runscript.tlu b/source/texk/texlive/w32_wrapper/runscript.tlu index 9698b7f73..53deaf071 100644 --- a/source/texk/texlive/w32_wrapper/runscript.tlu +++ b/source/texk/texlive/w32_wrapper/runscript.tlu @@ -1,7 +1,7 @@ -local svnrevision = string.match("$Revision: 39066 $", "%d+") or "0" -local svndate = string.match("$Date: 2015-12-11 05:51:32 +0900 (Fri, 11 Dec 2015) $", "[-%d]+") or "2009-12-04" +local svnrevision = string.match("$Revision: 39067 $", "%d+") or "0" +local svndate = string.match("$Date: 2015-12-10 23:28:26 +0100 (Thu, 10 Dec 2015) $", "[-%d]+") or "2009-12-04" local bannerstr = "runscript wrapper utility (rev. " .. svnrevision .. ", " .. svndate .. ")\n" .. "usage: runscript script-name [arguments]\n" .. diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in index 17eaf62e5..b14e83860 100644 --- a/source/texk/web2c/Makefile.in +++ b/source/texk/web2c/Makefile.in @@ -117,13 +117,13 @@ noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ $(am__EXEEXT_37) $(am__EXEEXT_38) TESTS = tangle.test $(am__EXEEXT_41) ctiedir/ctie.test \ cwebdir/cweave.test tiedir/tie.test $(am__append_6) \ - $(am__append_16) $(am__append_26) $(am__append_36) \ - $(am__append_44) $(am__append_57) $(am__append_58) \ - $(am__append_60) $(am__append_65) $(am__append_68) \ - $(am__append_70) $(am__append_75) $(am__append_78) \ - $(am__append_80) $(am__append_85) $(am__append_96) \ - $(am__append_97) $(am__append_104) $(am__append_106) \ - $(am__append_108) $(am__append_142) libmd5/md5.test + $(am__append_16) $(am__append_25) $(am__append_34) \ + $(am__append_42) $(am__append_55) $(am__append_56) \ + $(am__append_58) $(am__append_63) $(am__append_66) \ + $(am__append_68) $(am__append_73) $(am__append_76) \ + $(am__append_78) $(am__append_83) $(am__append_94) \ + $(am__append_95) $(am__append_102) $(am__append_104) \ + $(am__append_106) $(am__append_140) libmd5/md5.test @WEB_TRUE@am__append_1 = $(web_programs) @WEB_TRUE@am__append_2 = $(web_tests) @TEX_TRUE@am__append_3 = tex @@ -148,193 +148,191 @@ TESTS = tangle.test $(am__EXEEXT_41) ctiedir/ctie.test \ @MFLUA_TRUE@@WIN32_TRUE@am__append_22 = install-mflua-links @MFLUA_TRUE@@WIN32_TRUE@am__append_23 = uninstall-mflua-links @MFLUAN_FALSE@@MFLUA_TRUE@@WIN32_FALSE@am__append_24 = mflua$(EXEEXT):mflua-nowin -@MFLUA_TRUE@@WIN32_FALSE@am__append_25 = mflua$(EXEEXT):inimflua -@MFLUA_TRUE@am__append_26 = $(mflua_tests) -@MFLUA_TRUE@am__append_27 = mfluatrap.diffs -@MFLUA_TRUE@am__append_28 = mfluatrap-clean -@MFLUAJIT_TRUE@am__append_29 = mfluajit -@MFLUAJITN_TRUE@@MFLUAJIT_TRUE@am__append_30 = mfluajit-nowin -@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_31 = call_mfluajit -@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_32 = install-mfluajit-links -@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_33 = uninstall-mfluajit-links -@MFLUAJITN_FALSE@@MFLUAJIT_TRUE@@WIN32_FALSE@am__append_34 = mfluajit$(EXEEXT):mfluajit-nowin -@MFLUAJIT_TRUE@@WIN32_FALSE@am__append_35 = mfluajit$(EXEEXT):inimfluajit -@MFLUAJIT_TRUE@am__append_36 = $(mfluajit_tests) -@MFLUAJIT_TRUE@am__append_37 = mfluajittrap.diffs -@MFLUAJIT_TRUE@am__append_38 = mfluajittrap-clean -@MP_TRUE@am__append_39 = mpost -@MP_TRUE@@WIN32_TRUE@am__append_40 = call_mpost -@MP_TRUE@@WIN32_TRUE@am__append_41 = install-mpost-links -@MP_TRUE@@WIN32_TRUE@am__append_42 = uninstall-mpost-links -@MP_TRUE@@WIN32_FALSE@am__append_43 = mpost$(EXEEXT):dvitomp mpost$(EXEEXT):mfplain -@MP_TRUE@am__append_44 = $(mp_tests) -@MP_TRUE@am__append_45 = mptrap.diffs -@MP_TRUE@am__append_46 = mptrap-clean -@PMP_TRUE@am__append_47 = pmpost -@PMP_TRUE@@WIN32_TRUE@am__append_48 = call_pmpost -@PMP_TRUE@@WIN32_TRUE@am__append_49 = install-pmpost-links -@PMP_TRUE@@WIN32_TRUE@am__append_50 = uninstall-pmpost-links -@PMP_TRUE@@WIN32_FALSE@am__append_51 = pmpost$(EXEEXT):pdvitomp -@UPMP_TRUE@am__append_52 = upmpost -@UPMP_TRUE@@WIN32_TRUE@am__append_53 = call_upmpost -@UPMP_TRUE@@WIN32_TRUE@am__append_54 = install-upmpost-links -@UPMP_TRUE@@WIN32_TRUE@am__append_55 = uninstall-upmpost-links -@UPMP_TRUE@@WIN32_FALSE@am__append_56 = upmpost$(EXEEXT):updvitomp -@PMP_TRUE@am__append_57 = $(pmpost_tests) -@UPMP_TRUE@am__append_58 = $(upmpost_tests) -@ETEX_TRUE@am__append_59 = etex -@ETEX_TRUE@am__append_60 = $(etex_tests) -@ETEX_TRUE@am__append_61 = etrip.diffs -@ETEX_TRUE@am__append_62 = etrip-clean -@PTEX_TRUE@am__append_63 = ptex -@PWEB_TRUE@am__append_64 = $(pweb_programs) -@PTEX_TRUE@am__append_65 = $(ptex_tests) -@PTEX_TRUE@am__append_66 = ptrip.diffs -@PTEX_TRUE@am__append_67 = ptrip-clean -@PWEB_TRUE@am__append_68 = $(pweb_tests) -@EPTEX_TRUE@am__append_69 = eptex -@EPTEX_TRUE@am__append_70 = $(eptex_tests) -@EPTEX_TRUE@am__append_71 = eptrip.diffs -@EPTEX_TRUE@am__append_72 = eptrip-clean -@UPTEX_TRUE@am__append_73 = uptex -@UPWEB_TRUE@am__append_74 = $(upweb_programs) -@UPTEX_TRUE@am__append_75 = $(uptex_tests) -@UPTEX_TRUE@am__append_76 = uptrip.diffs -@UPTEX_TRUE@am__append_77 = uptrip-clean -@UPWEB_TRUE@am__append_78 = $(upweb_tests) -@EUPTEX_TRUE@am__append_79 = euptex -@EUPTEX_TRUE@am__append_80 = $(euptex_tests) -@EUPTEX_TRUE@am__append_81 = euptrip.diffs -@EUPTEX_TRUE@am__append_82 = euptrip-clean -@MINGW32_TRUE@am__append_83 = \ +@MFLUA_TRUE@am__append_25 = $(mflua_tests) +@MFLUA_TRUE@am__append_26 = mfluatrap.diffs +@MFLUA_TRUE@am__append_27 = mfluatrap-clean +@MFLUAJIT_TRUE@am__append_28 = mfluajit +@MFLUAJITN_TRUE@@MFLUAJIT_TRUE@am__append_29 = mfluajit-nowin +@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_30 = call_mfluajit +@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_31 = install-mfluajit-links +@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_32 = uninstall-mfluajit-links +@MFLUAJITN_FALSE@@MFLUAJIT_TRUE@@WIN32_FALSE@am__append_33 = mfluajit$(EXEEXT):mfluajit-nowin +@MFLUAJIT_TRUE@am__append_34 = $(mfluajit_tests) +@MFLUAJIT_TRUE@am__append_35 = mfluajittrap.diffs +@MFLUAJIT_TRUE@am__append_36 = mfluajittrap-clean +@MP_TRUE@am__append_37 = mpost +@MP_TRUE@@WIN32_TRUE@am__append_38 = call_mpost +@MP_TRUE@@WIN32_TRUE@am__append_39 = install-mpost-links +@MP_TRUE@@WIN32_TRUE@am__append_40 = uninstall-mpost-links +@MP_TRUE@@WIN32_FALSE@am__append_41 = mpost$(EXEEXT):dvitomp mpost$(EXEEXT):mfplain +@MP_TRUE@am__append_42 = $(mp_tests) +@MP_TRUE@am__append_43 = mptrap.diffs +@MP_TRUE@am__append_44 = mptrap-clean +@PMP_TRUE@am__append_45 = pmpost +@PMP_TRUE@@WIN32_TRUE@am__append_46 = call_pmpost +@PMP_TRUE@@WIN32_TRUE@am__append_47 = install-pmpost-links +@PMP_TRUE@@WIN32_TRUE@am__append_48 = uninstall-pmpost-links +@PMP_TRUE@@WIN32_FALSE@am__append_49 = pmpost$(EXEEXT):pdvitomp +@UPMP_TRUE@am__append_50 = upmpost +@UPMP_TRUE@@WIN32_TRUE@am__append_51 = call_upmpost +@UPMP_TRUE@@WIN32_TRUE@am__append_52 = install-upmpost-links +@UPMP_TRUE@@WIN32_TRUE@am__append_53 = uninstall-upmpost-links +@UPMP_TRUE@@WIN32_FALSE@am__append_54 = upmpost$(EXEEXT):updvitomp +@PMP_TRUE@am__append_55 = $(pmpost_tests) +@UPMP_TRUE@am__append_56 = $(upmpost_tests) +@ETEX_TRUE@am__append_57 = etex +@ETEX_TRUE@am__append_58 = $(etex_tests) +@ETEX_TRUE@am__append_59 = etrip.diffs +@ETEX_TRUE@am__append_60 = etrip-clean +@PTEX_TRUE@am__append_61 = ptex +@PWEB_TRUE@am__append_62 = $(pweb_programs) +@PTEX_TRUE@am__append_63 = $(ptex_tests) +@PTEX_TRUE@am__append_64 = ptrip.diffs +@PTEX_TRUE@am__append_65 = ptrip-clean +@PWEB_TRUE@am__append_66 = $(pweb_tests) +@EPTEX_TRUE@am__append_67 = eptex +@EPTEX_TRUE@am__append_68 = $(eptex_tests) +@EPTEX_TRUE@am__append_69 = eptrip.diffs +@EPTEX_TRUE@am__append_70 = eptrip-clean +@UPTEX_TRUE@am__append_71 = uptex +@UPWEB_TRUE@am__append_72 = $(upweb_programs) +@UPTEX_TRUE@am__append_73 = $(uptex_tests) +@UPTEX_TRUE@am__append_74 = uptrip.diffs +@UPTEX_TRUE@am__append_75 = uptrip-clean +@UPWEB_TRUE@am__append_76 = $(upweb_tests) +@EUPTEX_TRUE@am__append_77 = euptex +@EUPTEX_TRUE@am__append_78 = $(euptex_tests) +@EUPTEX_TRUE@am__append_79 = euptrip.diffs +@EUPTEX_TRUE@am__append_80 = euptrip-clean +@MINGW32_TRUE@am__append_81 = \ @MINGW32_TRUE@ pdftexdir/regex/regex.c \ @MINGW32_TRUE@ pdftexdir/regex/regex.h -@PDFTEX_TRUE@am__append_84 = pdftex ttf2afm pdftosrc -@PDFTEX_TRUE@am__append_85 = $(pdftex_tests) $(ttf2afm_tests) \ +@PDFTEX_TRUE@am__append_82 = pdftex ttf2afm pdftosrc +@PDFTEX_TRUE@am__append_83 = $(pdftex_tests) $(ttf2afm_tests) \ @PDFTEX_TRUE@ $(pdftosrc_tests) -@LUATEX_TRUE@am__append_86 = luatex -@LUATEX_TRUE@@WIN32_TRUE@am__append_87 = call_luatex -@LUATEX_TRUE@@WIN32_TRUE@am__append_88 = install-luatex-links -@LUATEX_TRUE@@WIN32_TRUE@am__append_89 = uninstall-luatex-links -@LUATEX_TRUE@@WIN32_FALSE@am__append_90 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac -@LUAJITTEX_TRUE@am__append_91 = luajittex -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_92 = call_luajittex -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_93 = install-luajittex-links -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_94 = uninstall-luajittex-links -@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_95 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc -@LUATEX_TRUE@am__append_96 = $(luatex_tests) -@LUAJITTEX_TRUE@am__append_97 = $(luajittex_tests) -@XETEX_TRUE@am__append_98 = xetex -@XETEX_MACOSX_TRUE@am__append_99 = -DXETEX_MAC -@XETEX_MACOSX_FALSE@am__append_100 = $(FONTCONFIG_INCLUDES) -@XETEX_MACOSX_FALSE@am__append_101 = $(FONTCONFIG_LIBS) -@XETEX_MACOSX_TRUE@am__append_102 = \ +@LUATEX_TRUE@am__append_84 = luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_85 = call_luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_86 = install-luatex-links +@LUATEX_TRUE@@WIN32_TRUE@am__append_87 = uninstall-luatex-links +@LUATEX_TRUE@@WIN32_FALSE@am__append_88 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac +@LUAJITTEX_TRUE@am__append_89 = luajittex +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_90 = call_luajittex +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_91 = install-luajittex-links +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_92 = uninstall-luajittex-links +@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_93 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc +@LUATEX_TRUE@am__append_94 = $(luatex_tests) +@LUAJITTEX_TRUE@am__append_95 = $(luajittex_tests) +@XETEX_TRUE@am__append_96 = xetex +@XETEX_MACOSX_TRUE@am__append_97 = -DXETEX_MAC +@XETEX_MACOSX_FALSE@am__append_98 = $(FONTCONFIG_INCLUDES) +@XETEX_MACOSX_FALSE@am__append_99 = $(FONTCONFIG_LIBS) +@XETEX_MACOSX_TRUE@am__append_100 = \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.mm \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c -@XETEX_MACOSX_FALSE@am__append_103 = \ +@XETEX_MACOSX_FALSE@am__append_101 = \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h -@XETEX_TRUE@am__append_104 = $(xetex_tests) -@OTANGLE_TRUE@am__append_105 = $(omegaware_programs) -@OTANGLE_TRUE@am__append_106 = $(OTANGLE_tests) $(OMFONTS_tests) -@ALEPH_TRUE@am__append_107 = aleph -@ALEPH_TRUE@am__append_108 = $(aleph_tests) -@SYNCTEX_TRUE@am__append_109 = synctex -@SYNCTEX_TRUE@am__append_110 = $(LTLIBSYNCTEX) -@SYNCTEX_TRUE@am__append_111 = $(LIBSYNCTEX) -@MINGW32_TRUE@am__append_112 = -lshlwapi -@MINGW32_TRUE@am__append_113 = -lshlwapi -@TEX_SYNCTEX_TRUE@am__append_114 = -I$(srcdir)/synctexdir \ +@XETEX_TRUE@am__append_102 = $(xetex_tests) +@OTANGLE_TRUE@am__append_103 = $(omegaware_programs) +@OTANGLE_TRUE@am__append_104 = $(OTANGLE_tests) $(OMFONTS_tests) +@ALEPH_TRUE@am__append_105 = aleph +@ALEPH_TRUE@am__append_106 = $(aleph_tests) +@SYNCTEX_TRUE@am__append_107 = synctex +@SYNCTEX_TRUE@am__append_108 = $(LTLIBSYNCTEX) +@SYNCTEX_TRUE@am__append_109 = $(LIBSYNCTEX) +@MINGW32_TRUE@am__append_110 = -lshlwapi +@MINGW32_TRUE@am__append_111 = -lshlwapi +@TEX_SYNCTEX_TRUE@am__append_112 = -I$(srcdir)/synctexdir \ @TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\" -@TEX_SYNCTEX_TRUE@am__append_115 = $(ZLIB_LIBS) -@TEX_SYNCTEX_TRUE@am__append_116 = $(ZLIB_DEPEND) -@TEX_SYNCTEX_TRUE@am__append_117 = \ +@TEX_SYNCTEX_TRUE@am__append_113 = $(ZLIB_LIBS) +@TEX_SYNCTEX_TRUE@am__append_114 = $(ZLIB_DEPEND) +@TEX_SYNCTEX_TRUE@am__append_115 = \ @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_118 = -I$(srcdir)/synctexdir \ +@ETEX_SYNCTEX_TRUE@am__append_116 = -I$(srcdir)/synctexdir \ @ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\" -@ETEX_SYNCTEX_TRUE@am__append_119 = $(ZLIB_LIBS) -@ETEX_SYNCTEX_TRUE@am__append_120 = $(ZLIB_DEPEND) -@ETEX_SYNCTEX_TRUE@am__append_121 = \ +@ETEX_SYNCTEX_TRUE@am__append_117 = $(ZLIB_LIBS) +@ETEX_SYNCTEX_TRUE@am__append_118 = $(ZLIB_DEPEND) +@ETEX_SYNCTEX_TRUE@am__append_119 = \ @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_122 = -I$(srcdir)/synctexdir \ +@PTEX_SYNCTEX_TRUE@am__append_120 = -I$(srcdir)/synctexdir \ @PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\" -@PTEX_SYNCTEX_TRUE@am__append_123 = $(ZLIB_LIBS) -@PTEX_SYNCTEX_TRUE@am__append_124 = $(ZLIB_DEPEND) -@PTEX_SYNCTEX_TRUE@am__append_125 = \ +@PTEX_SYNCTEX_TRUE@am__append_121 = $(ZLIB_LIBS) +@PTEX_SYNCTEX_TRUE@am__append_122 = $(ZLIB_DEPEND) +@PTEX_SYNCTEX_TRUE@am__append_123 = \ @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_126 = -I$(srcdir)/synctexdir \ +@UPTEX_SYNCTEX_TRUE@am__append_124 = -I$(srcdir)/synctexdir \ @UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\" -@UPTEX_SYNCTEX_TRUE@am__append_127 = $(ZLIB_LIBS) -@UPTEX_SYNCTEX_TRUE@am__append_128 = $(ZLIB_DEPEND) -@UPTEX_SYNCTEX_TRUE@am__append_129 = \ +@UPTEX_SYNCTEX_TRUE@am__append_125 = $(ZLIB_LIBS) +@UPTEX_SYNCTEX_TRUE@am__append_126 = $(ZLIB_DEPEND) +@UPTEX_SYNCTEX_TRUE@am__append_127 = \ @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_130 = -I$(srcdir)/synctexdir \ +@EPTEX_SYNCTEX_TRUE@am__append_128 = -I$(srcdir)/synctexdir \ @EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\" -@EPTEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_LIBS) -@EPTEX_SYNCTEX_TRUE@am__append_132 = $(ZLIB_DEPEND) -@EPTEX_SYNCTEX_TRUE@am__append_133 = \ +@EPTEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_LIBS) +@EPTEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_DEPEND) +@EPTEX_SYNCTEX_TRUE@am__append_131 = \ @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_134 = -I$(srcdir)/synctexdir \ +@EUPTEX_SYNCTEX_TRUE@am__append_132 = -I$(srcdir)/synctexdir \ @EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\" -@EUPTEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_LIBS) -@EUPTEX_SYNCTEX_TRUE@am__append_136 = $(ZLIB_DEPEND) -@EUPTEX_SYNCTEX_TRUE@am__append_137 = \ +@EUPTEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_LIBS) +@EUPTEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_DEPEND) +@EUPTEX_SYNCTEX_TRUE@am__append_135 = \ @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_138 = -I$(srcdir)/synctexdir \ +@PDFTEX_SYNCTEX_TRUE@am__append_136 = -I$(srcdir)/synctexdir \ @PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\" -@PDFTEX_SYNCTEX_TRUE@am__append_139 = \ +@PDFTEX_SYNCTEX_TRUE@am__append_137 = \ @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_140 = -I$(srcdir)/synctexdir \ +@XETEX_SYNCTEX_TRUE@am__append_138 = -I$(srcdir)/synctexdir \ @XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\" -@XETEX_SYNCTEX_TRUE@am__append_141 = \ +@XETEX_SYNCTEX_TRUE@am__append_139 = \ @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_142 = $(synctex_tests) +@SYNCTEX_TRUE@am__append_140 = $(synctex_tests) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ @@ -2110,8 +2108,8 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluajit.a libmputil.a \ libff.a libluatex.a libluajittex.a libxetex.a libsynctex.a \ libmd5.a EXTRA_LTLIBRARIES = libsynctex.la -lib_LIBRARIES = $(am__append_111) -lib_LTLIBRARIES = $(am__append_110) +lib_LIBRARIES = $(am__append_109) +lib_LTLIBRARIES = $(am__append_108) dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 nodist_man_MANS = TEST_EXTENSIONS = .pl .test @@ -2496,24 +2494,24 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \ omegaware/tests/*yarabic* $(nodist_aleph_SOURCES) aleph.web \ aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES) -TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_28) \ - $(am__append_38) $(am__append_46) $(am__append_62) \ - $(am__append_67) $(am__append_72) $(am__append_77) \ - $(am__append_82) -TRIPTRAP = $(am__append_7) $(am__append_17) $(am__append_27) \ - $(am__append_37) $(am__append_45) $(am__append_61) \ - $(am__append_66) $(am__append_71) $(am__append_76) \ - $(am__append_81) +TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_27) \ + $(am__append_36) $(am__append_44) $(am__append_60) \ + $(am__append_65) $(am__append_70) $(am__append_75) \ + $(am__append_80) +TRIPTRAP = $(am__append_7) $(am__append_17) $(am__append_26) \ + $(am__append_35) $(am__append_43) $(am__append_59) \ + $(am__append_64) $(am__append_69) $(am__append_74) \ + $(am__append_79) bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \ - $(am__append_24) $(am__append_25) $(am__append_34) \ - $(am__append_35) $(am__append_43) $(am__append_51) \ - $(am__append_56) $(am__append_90) $(am__append_95) -install_exe_links = $(am__append_12) $(am__append_22) $(am__append_32) \ - $(am__append_41) $(am__append_49) $(am__append_54) \ - $(am__append_88) $(am__append_93) + $(am__append_24) $(am__append_33) $(am__append_41) \ + $(am__append_49) $(am__append_54) $(am__append_88) \ + $(am__append_93) +install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \ + $(am__append_39) $(am__append_47) $(am__append_52) \ + $(am__append_86) $(am__append_91) uninstall_exe_links = $(am__append_13) $(am__append_23) \ - $(am__append_33) $(am__append_42) $(am__append_50) \ - $(am__append_55) $(am__append_89) $(am__append_94) + $(am__append_32) $(am__append_40) $(am__append_48) \ + $(am__append_53) $(am__append_87) $(am__append_92) NEVER_DIST = `find . $(NEVER_NAMES)` cwebdir/cweave.log \ cwebdir/cweave.trs ctiedir/ctie.log ctiedir/ctie.trs \ tiedir/tie.log tiedir/tie.trs @@ -2623,18 +2621,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_114) +tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_112) # With --enable-ipc, TeX may need to link with -lsocket. -tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_115) +tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_113) # 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_117) +dist_tex_SOURCES = texextra.c $(am__append_115) # We must create texd.h before building the tex_OBJECTS. -tex_prereq = texd.h $(am__append_116) +tex_prereq = texd.h $(am__append_114) tex_ch_srcs = \ tex.web \ tex.ch \ @@ -2825,19 +2823,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_118) +etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_116) # With --enable-ipc, e-TeX may need to link with -lsocket. -etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_119) +etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_117) # 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_121) + etexdir/etex_version.h $(am__append_119) # 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_120) +etex_prereq = etexd.h etexdir/etex_version.h $(am__append_118) etex_web_srcs = \ tex.web \ etexdir/etex.ch @@ -2863,20 +2861,20 @@ pweb_programs = pbibtex pdvitype ppltotf ptftopl pproglib = lib/libp.a libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h libkanji_a_CPPFLAGS = $(ptex_cppflags) -ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_122) +ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_120) # With --enable-ipc, pTeX may need to link with -lsocket. -ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_123) +ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_121) 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_125) + ptexdir/ptex_version.h $(am__append_123) # 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_124) +ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_122) ptex_web_srcs = \ tex.web \ tex.ch @@ -2916,22 +2914,22 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \ ptexdir/pbibtex-longline-test.pl ptexdir/pbibtex-mem.test \ ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \ - $(am__append_130) + $(am__append_128) # With --enable-ipc, e-pTeX may need to link with -lsocket. eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) libmd5.a $(am__append_131) + $(ipc_socketlibs) libmd5.a $(am__append_129) eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a # 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_133) + eptexdir/eptex_version.h $(am__append_131) # 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_132) + eptexdir/eptex_version.h $(am__append_130) eptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -2961,21 +2959,21 @@ up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) upweb_programs = upbibtex updvitype uppltotf uptftopl libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c libukanji_a_CPPFLAGS = $(uptex_cppflags) -uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_126) +uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_124) # With --enable-ipc, upTeX may need to link with -lsocket. -uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_127) +uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_125) 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_129) + uptexdir/uptex_version.h $(am__append_127) # 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_128) + uptexdir/uptex_version.h $(am__append_126) uptex_web_srcs = \ tex.web \ tex.ch @@ -3017,23 +3015,23 @@ upweb_tests = \ uptexdir/yokotate.test euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \ - -I$(srcdir)/libmd5 $(am__append_134) + -I$(srcdir)/libmd5 $(am__append_132) # With --enable-ipc, e-upTeX may need to link with -lsocket. euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) libmd5.a $(am__append_135) + $(ipc_socketlibs) libmd5.a $(am__append_133) euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a # 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_137) + $(am__append_135) # 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_136) + uptexdir/uptex_version.h $(am__append_134) euptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -3073,7 +3071,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \ pdftexdir/writejbig2.c pdftexdir/writejpg.c \ pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \ pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \ - $(am__append_83) + $(am__append_81) @MINGW32_TRUE@REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \ pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \ @@ -3089,7 +3087,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_138) +pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_136) pdftex_CXXFLAGS = $(WARNING_CXXFLAGS) # With --enable-ipc, pdfTeX may need to link with -lsocket. @@ -3102,7 +3100,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_139) + $(am__append_137) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -3559,17 +3557,17 @@ libxetex = libxetex.a xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \ $(GRAPHITE2_INCLUDES) $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) \ - $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_99) \ - $(am__append_100) + $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_97) \ + $(am__append_98) xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \ $(ICU_LIBS) $(TECKIT_LIBS) $(POPPLER_LIBS) $(LIBPNG_LIBS) \ - $(FREETYPE2_LIBS) $(ZLIB_LIBS) libmd5.a $(am__append_101) + $(FREETYPE2_LIBS) $(ZLIB_LIBS) libmd5.a $(am__append_99) xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \ $(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \ $(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \ $(ZLIB_DEPEND) libmd5.a @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa -xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_140) +xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_138) xetex_CFLAGS = $(WARNING_CFLAGS) xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) @@ -3580,7 +3578,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_141) + $(am__append_139) xetex_ch_srcs = \ xetexdir/xetex.web \ xetexdir/tex.ch0 \ @@ -3607,7 +3605,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/XeTeXFontInst.cpp \ xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \ xetexdir/image/mfileio.h xetexdir/image/numbers.c \ xetexdir/image/numbers.h xetexdir/image/pngimage.c \ - xetexdir/image/pngimage.h $(am__append_102) $(am__append_103) + xetexdir/image/pngimage.h $(am__append_100) $(am__append_101) # We must create xetexd.h etc. before building the libxetex_a_OBJECTS. libxetex_prereq = xetexd.h $(xetex_dependencies) @@ -3711,12 +3709,12 @@ synctex_SOURCES = \ synctexdir/synctex_main.c synctex_CPPFLAGS = -I$(srcdir)/synctexdir -synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_112) +synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_110) 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) -libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_113) +libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_111) libsynctex_la_SOURCES = \ synctexdir/synctex_parser.c \ synctexdir/synctex_parser_local.h \ @@ -14430,10 +14428,8 @@ trap-clean: .PHONY: install-mflua-links uninstall-mflua-links @WIN32_TRUE@install-mflua-links: call_mflua$(EXEEXT) @MFLUAN_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_mflua$(EXEEXT) $(DESTDIR)$(bindir)/mflua-nowin$(EXEEXT) -@WIN32_TRUE@ $(INSTALL_PROGRAM) call_mflua$(EXEEXT) $(DESTDIR)$(bindir)/inimflua$(EXEEXT) @WIN32_TRUE@uninstall-mflua-links: @MFLUAN_FALSE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/mflua-nowin$(EXEEXT) -@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/inimflua$(EXEEXT) # We must create mfluad.h and mfluadir/mflua_version.h before compiling mfluaextra.c. $(mflua_OBJECTS) $(mflua_nowin_OBJECTS): mfluad.h mfluadir/mflua_version.h @@ -14478,10 +14474,8 @@ mfluatrap-clean: .PHONY: install-mfluajit-links uninstall-mfluajit-links @WIN32_TRUE@install-mfluajit-links: call_mfluajit$(EXEEXT) @MFLUAJITN_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_mfluajit$(EXEEXT) $(DESTDIR)$(bindir)/mfluajit-nowin$(EXEEXT) -@WIN32_TRUE@ $(INSTALL_PROGRAM) call_mfluajit$(EXEEXT) $(DESTDIR)$(bindir)/inimfluajit$(EXEEXT) @WIN32_TRUE@uninstall-mfluajit-links: @MFLUAJITN_FALSE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/mfluajit-nowin$(EXEEXT) -@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/inimfluajit$(EXEEXT) # We must create mfluajitd.h and mfluadir/mflua_version.h before compiling mfluajitextra.c. $(mfluajit_OBJECTS) $(mfluajit_nowin_OBJECTS): mfluajitd.h mfluadir/mflua_version.h diff --git a/source/texk/web2c/NEWS b/source/texk/web2c/NEWS index d15f6e36d..b8160a853 100644 --- a/source/texk/web2c/NEWS +++ b/source/texk/web2c/NEWS @@ -1,6 +1,7 @@ This file records noteworthy changes. (Public domain.) -2015 (for TeX Live 2014, 21 May 2015) +2016 (for TeX Live 2016) +2015 (for TeX Live 2015, 21 May 2015) 2014 (for TeX Live 2014, 24 May 2014) 2013 (for TeX Live 2013, 30 May 2013) 2012 (for TeX Live 2012, 1 July 2012) diff --git a/source/texk/web2c/doc/web2c.info b/source/texk/web2c/doc/web2c.info index ac9b9bad2..eb3457720 100644 --- a/source/texk/web2c/doc/web2c.info +++ b/source/texk/web2c/doc/web2c.info @@ -1,4 +1,4 @@ -This is web2c.info, produced by makeinfo version 5.2 from web2c.texi. +This is web2c.info, produced by makeinfo version 6.1 from web2c.texi. This file documents the installation and use of the programs in Web2c, an implementation of Donald Knuth's TeX system. @@ -58,7 +58,7 @@ Web2c This document describes how to install and use the programs in the Web2c implementation of the TeX system, especially for Unix systems. It -corresponds to Web2c version 2015, released in May 2015. +corresponds to Web2c version 2016, released in April 2016. * Menu: @@ -82,7 +82,8 @@ File: web2c.info, Node: Introduction, Next: Installation, Prev: Top, Up: Top 1 Introduction ************** -This manual corresponds to version 2015 of Web2c, released in May 2015. +This manual corresponds to version 2016 of Web2c, released in April +2016. "Web2c" is the name of a TeX implementation, originally for Unix, but now also running under DOS, Amiga, and other operating systems. By "TeX @@ -3419,7 +3420,7 @@ Index �[index�] * Menu: -* '#define' options: Compile-time options. +* #define options: Compile-time options. (line 6) * $ expansion in filenames: \input filenames. (line 47) * %& magic number: Determining the memory dump to use. @@ -3460,7 +3461,7 @@ Index * -base=BASE: Determining the memory dump to use. (line 15) * -base=DUMPNAME: Common options. (line 34) -* -change=CHFILE: mft invocation. (line 62) +* -change=CHFILE: mft invocation. (line 63) * -charcode-format=TYPE: tftopl invocation. (line 27) * -charcode-format=TYPE <1>: vftovp invocation. (line 30) * -D compiler options: Compile-time options. @@ -3521,7 +3522,7 @@ Index * -shell-restricted: tex invocation. (line 121) * -show-opcodes: dvitype invocation. (line 52) * -strict: tangle invocation. (line 46) -* -style=MFTFILE: mft invocation. (line 66) +* -style=MFTFILE: mft invocation. (line 67) * -T: mpost invocation. (line 115) * -terse: bibtex invocation. (line 28) * -tex=TEXPROGRAM: mpost invocation. (line 118) @@ -3541,7 +3542,7 @@ Index * .fmt: Initial TeX. (line 6) * .mf: mf invocation. (line 24) * .mp: mpost invocation. (line 30) -* '.mps' files and PDF: mpost invocation. (line 86) +* .mps files and PDF: mpost invocation. (line 86) * .NNN PostScript figures: mpost invocation. (line 35) * .NNNgf generic fonts: mf invocation. (line 34) * .tcx character translation files: Common options. (line 98) @@ -3572,7 +3573,7 @@ Index * \openin, and pipes: Shell escapes. (line 63) * \openout and security: tex invocation. (line 48) * \openout, and pipes: Shell escapes. (line 63) -* \output routine, and '\write': Shell escapes. (line 28) +* \output routine, and \write: Shell escapes. (line 28) * \pdfshellescape: Shell escapes. (line 63) * \string: \input filenames. (line 59) * \tracingcharsubdef and MLTeX: \tracingcharsubdef. (line 6) @@ -3584,7 +3585,7 @@ Index (line 16) * accented character: TCX files. (line 6) * accents, hyphenating words with: MLTeX. (line 6) -* acknowledgements: Introduction. (line 51) +* acknowledgements: Introduction. (line 52) * acm.bst: Basic BibTeX style files. (line 19) * Ada, WEB for: WEB. (line 12) @@ -3627,7 +3628,7 @@ Index * BDF and GF conversion: Font utilities available elsewhere. (line 15) * beginfig: mpost invocation. (line 35) -* Berry, Karl: Introduction. (line 41) +* Berry, Karl: Introduction. (line 42) * BIBINPUTS, search path for bib files: bibtex invocation. (line 18) * bibliographies, creating: BibTeX. (line 6) * bibliography: References. (line 6) @@ -3643,7 +3644,7 @@ Index * blank lines, in TCX files: TCX files. (line 66) * boxes, memory for: Runtime options. (line 20) * breakpoints, memory for: Runtime options. (line 20) -* Breitenlohner, Peter: Introduction. (line 8) +* Breitenlohner, Peter: Introduction. (line 9) * BSTINPUTS, search path for bst files: bibtex invocation. (line 18) * btex for MetaPost labels: mpost invocation. (line 48) * btxdoc.bib: bibtex invocation. (line 48) @@ -3654,7 +3655,7 @@ Index * byte swapping: Hardware and memory dumps. (line 13) * c-sources Makefile target: Additional targets. (line 12) -* change files, and MFT: mft invocation. (line 62) +* change files, and MFT: mft invocation. (line 63) * change files, and Tangle: tangle invocation. (line 11) * change files, and Weave: weave invocation. (line 14) * changing error messages style: Common options. (line 26) @@ -3674,7 +3675,7 @@ Index (line 69) * cm.base: Initial Metafont. (line 26) * cmbase.mf: Initial Metafont. (line 26) -* cmbase.mft: mft invocation. (line 72) +* cmbase.mft: mft invocation. (line 73) * cmmf.base not recommended: Initial Metafont. (line 26) * color, in DVItoMP: dvitomp invocation. (line 15) * comments, in TCX files: TCX files. (line 70) @@ -3687,7 +3688,7 @@ Index (line 6) * Computer Modern fonts, and Troff: mpost invocation. (line 65) * Computer Modern macros: Initial Metafont. (line 26) -* 'Computer Modern Typefaces', production of: mft invocation. (line 72) +* Computer Modern Typefaces, production of: mft invocation. (line 73) * configuration: Installation. (line 6) * configuration file reading: Path searching. (line 6) * configuration file values: Runtime options. (line 6) @@ -3713,7 +3714,7 @@ Index * cross-references, omitting: weave invocation. (line 22) * current directory, used for output: Output file location. (line 6) -* Curtis, Pavel: Introduction. (line 41) +* Curtis, Pavel: Introduction. (line 42) * Cweb: WEB. (line 12) * CWEB: WEB. (line 12) * date and time, in memory dumps: Hardware and memory dumps. @@ -3752,12 +3753,12 @@ Index * dx horizontal escapement <1>: gftype invocation. (line 106) * dy vertical escapement: gftype invocation. (line 106) * dynamic array allocation: Runtime options. (line 35) -* dynamic Metafont mode definitions with 'smode': Modes. (line 28) +* dynamic Metafont mode definitions with smode: Modes. (line 28) * dynamic packing variable: pktype invocation. (line 44) * e response at error prompt: Editor invocation. (line 6) * e-circumflex: \charsubdef. (line 20) * e-TeX: TeX extensions. (line 10) -* e.mft: mft invocation. (line 72) +* e.mft: mft invocation. (line 73) * EC fonts: tex invocation. (line 41) * EC fonts <1>: mf invocation. (line 24) * editing of bitmap fonts: Font utilities available elsewhere. @@ -3788,7 +3789,7 @@ Index * file formats for fonts: Font file formats. (line 6) * file recorder: Common options. (line 84) * filename conventions, in input files: \input filenames. (line 6) -* filenames starting with '-': Option conventions. (line 19) +* filenames starting with -: Option conventions. (line 19) * first line of the main input file: Common options. (line 98) * fixed-point arithmetic: Compile-time options. (line 21) @@ -3828,7 +3829,7 @@ Index * fraction routines: Compile-time options. (line 21) * Free Software Foundation documentation system: Formats. (line 47) -* freedom of Web2c: Introduction. (line 22) +* freedom of Web2c: Introduction. (line 23) * ftp.math.utah.edu: bibtex invocation. (line 54) * generating source specials: tex invocation. (line 133) * geometric designs: Metafont. (line 6) @@ -3865,12 +3866,12 @@ Index * headerbyte information: tftopl invocation. (line 95) * height, in pixels: pktype invocation. (line 62) * help, online: Common options. (line 11) -* Henry, Patrick: Introduction. (line 22) +* Henry, Patrick: Introduction. (line 23) * Herberts, Mathias: Online Metafont graphics. (line 20) * hex character codes, in TCX files: TCX files. (line 77) -* history: Introduction. (line 41) -* Hobby, John: Introduction. (line 8) +* history: Introduction. (line 42) +* Hobby, John: Introduction. (line 9) * horizontal escapement: pktype invocation. (line 57) * horizontal escapement <1>: gftype invocation. (line 106) * hp2627: Online Metafont graphics. @@ -3886,7 +3887,7 @@ Index * hyphenation and languages: Languages and hyphenation. (line 6) * hyphenation patterns, creating: patgen invocation. (line 6) -* ice cream: Introduction. (line 22) +* ice cream: Introduction. (line 23) * identifier case: tangle invocation. (line 35) * identifier collisions: tangle invocation. (line 46) * identifier length: tangle invocation. (line 27) @@ -3908,7 +3909,7 @@ Index * install-formats Make target: Additional targets. (line 17) * install-mems Make target: Additional targets. (line 34) * installation: Installation. (line 6) -* interaction between TCX files and '-8bit'.: TCX files. (line 104) +* interaction between TCX files and -8bit.: TCX files. (line 104) * interaction mode: Common options. (line 50) * international characters: TCX files. (line 6) * introduction: Introduction. (line 6) @@ -3919,7 +3920,7 @@ Index * job name: Common options. (line 55) * kerning table, in TFM files: tftopl invocation. (line 101) * keyboard character code, translating: TCX files. (line 101) -* Knuth, Donald E.: Introduction. (line 8) +* Knuth, Donald E.: Introduction. (line 9) * Knuth, Donald E. <1>: mft invocation. (line 56) * KPATHSEA_DEBUG: Common options. (line 59) * KRN property: tftopl invocation. (line 101) @@ -3934,7 +3935,7 @@ Index * left side bearing: pktype invocation. (line 66) * left side bearing <1>: gftype invocation. (line 82) * legalisms: Legalisms. (line 6) -* licensing terms: Introduction. (line 22) +* licensing terms: Introduction. (line 23) * LIG property: tftopl invocation. (line 101) * ligature table, in TFM files: tftopl invocation. (line 101) * LIGTABLE property: tftopl invocation. (line 101) @@ -3961,7 +3962,7 @@ Index * magnification <1>: dvitype invocation. (line 28) * main_memory: Runtime options. (line 15) * Make targets, additional: Additional targets. (line 6) -* Martin, Rick: Introduction. (line 51) +* Martin, Rick: Introduction. (line 52) * Mathematical Reviews: Formats. (line 39) * mathematical typesetting: TeX. (line 6) * mem file, determining: Determining the memory dump to use. @@ -3998,7 +3999,7 @@ Index (line 15) * MetaPost input files: mpost invocation. (line 30) * MetaPost invocation: mpost invocation. (line 6) -* MetaPost source, prettyprinting: mft invocation. (line 78) +* MetaPost source, prettyprinting: mft invocation. (line 79) * MetaPost, initial: Initial MetaPost. (line 6) * MetaPost, TeX, and Metafont: Three programs. (line 6) * metatype1: Font utilities available elsewhere. @@ -4024,8 +4025,8 @@ Index * modes.mf recommended modes file: Modes. (line 10) * mode_def: Modes. (line 15) * mode_setup: Modes. (line 15) -* Morgan, Tim: Introduction. (line 41) -* Morris, Bob: Introduction. (line 51) +* Morgan, Tim: Introduction. (line 42) +* Morris, Bob: Introduction. (line 52) * MPEDIT: Editor invocation. (line 10) * mpgraph.ps: mpost invocation. (line 18) * mpman.ps: mpost invocation. (line 6) @@ -4075,7 +4076,7 @@ Index * path searching: Path searching. (line 6) * path searching debugging: Common options. (line 59) * PDF: TeX extensions. (line 20) -* PDF, and '.mps' files: mpost invocation. (line 86) +* PDF, and .mps files: mpost invocation. (line 86) * pdfTeX: TeX extensions. (line 20) * permissions, legal: Legalisms. (line 6) * PFA and PFB conversion: Font utilities available elsewhere. @@ -4108,7 +4109,7 @@ Index * plain.bst: Basic BibTeX style files. (line 11) * plain.fmt: Initial TeX. (line 13) -* plain.mft: mft invocation. (line 66) +* plain.mft: mft invocation. (line 67) * pltotf: pltotf invocation. (line 6) * pool file, writing: tangle invocation. (line 16) * Poole, Simon: Online Metafont graphics. @@ -4151,7 +4152,7 @@ Index * pxtoch: Font utilities available elsewhere. (line 23) * Raichle, Bernd: MLTeX. (line 6) -* reading, additional: Introduction. (line 59) +* reading, additional: Introduction. (line 60) * readonly directory, running TeX in: Output file location. (line 15) * readonly directory, running TeX in <1>: Output file location. @@ -4170,7 +4171,7 @@ Index * restricted shell escapes: Shell escapes. (line 6) * right side bearing: pktype invocation. (line 66) * right side bearing <1>: gftype invocation. (line 82) -* Rokicki, Tomas: Introduction. (line 41) +* Rokicki, Tomas: Introduction. (line 42) * run length encoded bitmaps: pktype invocation. (line 76) * run length encoded bitmaps <1>: gftype invocation. (line 89) * runtime options: Runtime options. (line 6) @@ -4181,8 +4182,8 @@ Index (line 42) * security, and output files: tex invocation. (line 48) * security, and shell escapes: Shell escapes. (line 6) -* security, and 'write': mpost invocation. (line 92) -* security, and '\openout': tex invocation. (line 48) +* security, and write: mpost invocation. (line 92) +* security, and \openout: tex invocation. (line 48) * shapes: Metafont. (line 6) * sharing memory dumps: Hardware and memory dumps. (line 6) @@ -4201,18 +4202,18 @@ Index * sockets: IPC and TeX. (line 6) * space-terminated filenames: \input filenames. (line 10) * Spiderweb: WEB. (line 12) -* Stallman, Richard: Introduction. (line 51) +* Stallman, Richard: Introduction. (line 52) * starting page: dvicopy invocation. (line 28) * starting page <1>: dvitype invocation. (line 46) * Steele Jr., Guy L.: Hardware and memory dumps. (line 34) * stopping at the first error: Common options. (line 41) -* strategy, overall: Introduction. (line 16) +* strategy, overall: Introduction. (line 17) * string numbers, displaying: pooltype invocation. (line 6) * string pool, writing: tangle invocation. (line 16) * string representation: pooltype invocation. (line 30) * style design, for BibTeX: bibtex invocation. (line 45) -* style files: mft invocation. (line 66) +* style files: mft invocation. (line 67) * substitutions of font glyphs: MLTeX. (line 6) * sun: Online Metafont graphics. (line 42) @@ -4254,7 +4255,7 @@ Index * TeX, input files found: tex invocation. (line 20) * TeX, invocation: tex invocation. (line 6) * TeX, Metafont, and MetaPost: Three programs. (line 6) -* TeX, Web2c implementation of: Introduction. (line 8) +* TeX, Web2c implementation of: Introduction. (line 9) * tex.fmt: Initial TeX. (line 13) * TEXBIB, search path for bib files: bibtex invocation. (line 18) * TEXEDIT: Editor invocation. (line 10) @@ -4265,7 +4266,7 @@ Index (line 79) * TEXMFOUTPUT, used for reading: Output file location. (line 25) -* TEXMFOUTPUT, used if '.' unwritable: Output file location. +* TEXMFOUTPUT, used if . unwritable: Output file location. (line 19) * texput: tex invocation. (line 33) * TFM files, converting property lists to: pltotf invocation. (line 6) @@ -4284,11 +4285,11 @@ Index (line 59) * torture tests: Triptrap. (line 6) * translation file for TeX, specifying: Common options. (line 98) -* translation from WEB to C: Introduction. (line 16) +* translation from WEB to C: Introduction. (line 17) * trap Make target: Additional targets. (line 41) * trap test: Triptrap. (line 6) * trapman.tex: Triptrap. (line 6) -* Trickey, Howard: Introduction. (line 41) +* Trickey, Howard: Introduction. (line 42) * trip Make target: Additional targets. (line 41) * trip test: Triptrap. (line 6) * tripman.tex: Triptrap. (line 6) @@ -4341,7 +4342,7 @@ Index * WEB programs, compiling: tangle invocation. (line 6) * WEB programs, typesetting: weave invocation. (line 6) * WEB2C, search path for TCX files: TCX files. (line 35) -* Weber, Olaf: Introduction. (line 41) +* Weber, Olaf: Introduction. (line 42) * webmac.tex: weave invocation. (line 22) * webman.tex: WEB. (line 12) * whitespace, in TCX files: TCX files. (line 68) @@ -4385,74 +4386,74 @@ Index Tag Table: Node: Top2754 -Node: Introduction3747 -Node: Installation6903 -Node: configure options9005 -Node: Compile-time options11027 -Node: Additional targets12129 -Node: Triptrap13406 -Node: Runtime options14933 -Node: Commonalities16691 -Node: Option conventions17292 -Node: Common options18515 -Node: Path searching22895 -Node: Output file location23867 -Node: Three programs25192 -Node: Initial and virgin25946 -Node: Memory dumps26875 -Node: Creating memory dumps27331 -Node: Determining the memory dump to use28542 -Node: Hardware and memory dumps30123 -Node: Editor invocation32573 -Node: \input filenames33440 -Node: TeX36433 -Node: tex invocation37584 -Node: Initial TeX44487 -Node: Formats45851 -Node: Languages and hyphenation48777 -Node: MLTeX49207 -Node: \charsubdef50695 -Node: \tracingcharsubdef53018 -Node: TCX files53593 -Node: patgen invocation59033 -Node: Shell escapes59739 -Node: IPC and TeX63303 -Node: TeX extensions63873 -Node: Metafont65004 -Node: mf invocation66292 -Node: Initial Metafont70129 -Node: Modes71759 -Node: Online Metafont graphics74009 -Node: gftodvi invocation77434 -Node: mft invocation80254 -Node: MetaPost84252 -Node: mpost invocation85014 -Node: Initial MetaPost90190 -Node: dvitomp invocation91112 -Node: BibTeX91777 -Node: bibtex invocation92138 -Node: Basic BibTeX style files94436 -Node: WEB95766 -Node: tangle invocation97007 -Node: weave invocation99130 -Node: pooltype invocation100537 -Node: DVI utilities101667 -Node: dvicopy invocation102599 -Node: dvitype invocation103882 -Node: dvitype output example106217 -Node: Font utilities109268 -Node: Font file formats110448 -Node: gftopk invocation113717 -Node: pktogf invocation114908 -Node: pktype invocation116074 -Node: gftype invocation118897 -Node: tftopl invocation123400 -Node: pltotf invocation127993 -Node: vftovp invocation129044 -Node: vptovf invocation131279 -Node: Font utilities available elsewhere132306 -Node: Legalisms134686 -Node: References136840 -Node: Index141407 +Node: Introduction3749 +Node: Installation6907 +Node: configure options9009 +Node: Compile-time options11031 +Node: Additional targets12133 +Node: Triptrap13410 +Node: Runtime options14937 +Node: Commonalities16695 +Node: Option conventions17296 +Node: Common options18519 +Node: Path searching22899 +Node: Output file location23871 +Node: Three programs25196 +Node: Initial and virgin25950 +Node: Memory dumps26879 +Node: Creating memory dumps27335 +Node: Determining the memory dump to use28546 +Node: Hardware and memory dumps30127 +Node: Editor invocation32577 +Node: \input filenames33444 +Node: TeX36437 +Node: tex invocation37588 +Node: Initial TeX44491 +Node: Formats45855 +Node: Languages and hyphenation48781 +Node: MLTeX49211 +Node: \charsubdef50699 +Node: \tracingcharsubdef53022 +Node: TCX files53597 +Node: patgen invocation59037 +Node: Shell escapes59743 +Node: IPC and TeX63307 +Node: TeX extensions63877 +Node: Metafont65008 +Node: mf invocation66296 +Node: Initial Metafont70133 +Node: Modes71763 +Node: Online Metafont graphics74013 +Node: gftodvi invocation77438 +Node: mft invocation80258 +Node: MetaPost84256 +Node: mpost invocation85018 +Node: Initial MetaPost90194 +Node: dvitomp invocation91116 +Node: BibTeX91781 +Node: bibtex invocation92142 +Node: Basic BibTeX style files94440 +Node: WEB95770 +Node: tangle invocation97011 +Node: weave invocation99134 +Node: pooltype invocation100541 +Node: DVI utilities101671 +Node: dvicopy invocation102603 +Node: dvitype invocation103886 +Node: dvitype output example106221 +Node: Font utilities109272 +Node: Font file formats110452 +Node: gftopk invocation113721 +Node: pktogf invocation114912 +Node: pktype invocation116078 +Node: gftype invocation118901 +Node: tftopl invocation123404 +Node: pltotf invocation127997 +Node: vftovp invocation129048 +Node: vptovf invocation131283 +Node: Font utilities available elsewhere132310 +Node: Legalisms134690 +Node: References136844 +Node: Index141411 End Tag Table diff --git a/source/texk/web2c/doc/web2c.texi b/source/texk/web2c/doc/web2c.texi index 6b819699f..c89be4fb5 100644 --- a/source/texk/web2c/doc/web2c.texi +++ b/source/texk/web2c/doc/web2c.texi @@ -11,8 +11,8 @@ The latest version is available from ftp://ftp.tug.org/tex/texinfo.tex.} \fi @end tex -@set version 2015 -@set month-year May 2015 +@set version 2016 +@set month-year April 2016 @c Define new indices for commands in auxiliary files, filenames, and options. @defcodeindex cm diff --git a/source/texk/web2c/mfluadir/am/mflua.am b/source/texk/web2c/mfluadir/am/mflua.am index 3b859fd8d..ee9744df9 100644 --- a/source/texk/web2c/mfluadir/am/mflua.am +++ b/source/texk/web2c/mfluadir/am/mflua.am @@ -1,6 +1,7 @@ ## texk/web2c/mfluadir/am/mflua.am: Makefile fragment for MFLua. ## -## Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2016 Karl Berry <tex-live@tug.org> +## Copyright 2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## MFLua @@ -18,7 +19,6 @@ else !WIN32 if !MFLUAN bin_links += mflua$(EXEEXT):mflua-nowin endif !MFLUAN -bin_links += mflua$(EXEEXT):inimflua endif !WIN32 endif MFLUA EXTRA_PROGRAMS += mflua mflua-nowin @@ -34,12 +34,10 @@ install-mflua-links: call_mflua$(EXEEXT) if !MFLUAN $(INSTALL_PROGRAM) call_mflua$(EXEEXT) $(DESTDIR)$(bindir)/mflua-nowin$(EXEEXT) endif !MFLUAN - $(INSTALL_PROGRAM) call_mflua$(EXEEXT) $(DESTDIR)$(bindir)/inimflua$(EXEEXT) uninstall-mflua-links: if !MFLUAN rm -f $(DESTDIR)$(bindir)/mflua-nowin$(EXEEXT) endif !MFLUAN - rm -f $(DESTDIR)$(bindir)/inimflua$(EXEEXT) endif WIN32 dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h diff --git a/source/texk/web2c/mfluajitdir/am/mfluajit.am b/source/texk/web2c/mfluajitdir/am/mfluajit.am index b2cf7a4fa..ef385c893 100644 --- a/source/texk/web2c/mfluajitdir/am/mfluajit.am +++ b/source/texk/web2c/mfluajitdir/am/mfluajit.am @@ -1,6 +1,7 @@ ## texk/web2c/mfluajitdir/am/mfluajit.am: Makefile fragment for MFLuaJIT. ## -## Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2016 Karl Berry <tex-live@tug.org> +## Copyright 2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## MFLuaJIT @@ -18,7 +19,6 @@ else !WIN32 if !MFLUAJITN bin_links += mfluajit$(EXEEXT):mfluajit-nowin endif !MFLUAJITN -bin_links += mfluajit$(EXEEXT):inimfluajit endif !WIN32 endif MFLUAJIT EXTRA_PROGRAMS += mfluajit mfluajit-nowin @@ -34,12 +34,10 @@ install-mfluajit-links: call_mfluajit$(EXEEXT) if !MFLUAJITN $(INSTALL_PROGRAM) call_mfluajit$(EXEEXT) $(DESTDIR)$(bindir)/mfluajit-nowin$(EXEEXT) endif !MFLUAJITN - $(INSTALL_PROGRAM) call_mfluajit$(EXEEXT) $(DESTDIR)$(bindir)/inimfluajit$(EXEEXT) uninstall-mfluajit-links: if !MFLUAJITN rm -f $(DESTDIR)$(bindir)/mfluajit-nowin$(EXEEXT) endif !MFLUAJITN - rm -f $(DESTDIR)$(bindir)/inimfluajit$(EXEEXT) endif WIN32 dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h diff --git a/source/texk/web2c/web2c/ChangeLog b/source/texk/web2c/web2c/ChangeLog index 3bf485585..792a9f593 100644 --- a/source/texk/web2c/web2c/ChangeLog +++ b/source/texk/web2c/web2c/ChangeLog @@ -1,3 +1,8 @@ +2016-04-06 Karl Berry <karl@tug.org> + + * convert: remove $pascalfile if it is empty, + along with moving the non-empty .c output, etc. + 2015-06-12 Peter Breitenlohner <peb@mppmu.mpg.de> Integrate MFLua and MFLuaJIT. diff --git a/source/texk/web2c/web2c/convert b/source/texk/web2c/web2c/convert index 36c5c13c9..0b56a9202 100644 --- a/source/texk/web2c/web2c/convert +++ b/source/texk/web2c/web2c/convert @@ -1,5 +1,7 @@ #!/bin/sh # Convert WEB programs not needing special treatment to C. +# Public domain. Originally written ca.1985 by Tom Rokicki, +# Tim Morgan, Karl Berry, et al. : ${srcdir=.} @@ -105,9 +107,13 @@ eval "cat $srcdir/web2c/common.defines $more_defines $pascalfile \ # Using the above pipeline as the condition of an if does no good, since # typical sh's use the status of the first command as the pipeline result. # So check for an empty output file, or one with the error marker we put in. -if test ! -s $cfile || grep @error@ $output_files >/dev/null; then +if test ! -s "$cfile" || grep @error@ $output_files >/dev/null; then : ${TMPDIR=/tmp} # Don't just delete it, since it may be useful for debugging. + if test ! -s "$pascalfile"; then + echo "$0: $pascalfile empty, removing it." >&2 + rm -f $pascalfile + fi echo "$0: conversion of $pascalfile failed, moving dregs:" >&2 cmd="mv $output_files $TMPDIR" (cd $TMPDIR && rm -f $output_files) -- GitLab