pdftex[830] branches/stable/source/src: sync with tl55409

commits+karl at tug.org commits+karl at tug.org
Thu Jun 4 01:00:08 CEST 2020


Revision: 830
          http://tug.org/svn/pdftex?view=revision&revision=830
Author:   karl
Date:     2020-06-04 01:00:08 +0200 (Thu, 04 Jun 2020)
Log Message:
-----------
sync with tl55409

Modified Paths:
--------------
    branches/stable/source/src/Makefile.am
    branches/stable/source/src/Makefile.in
    branches/stable/source/src/build-aux/missing
    branches/stable/source/src/build-aux/test-driver
    branches/stable/source/src/build-aux/texinfo.tex
    branches/stable/source/src/build-aux/ylwrap
    branches/stable/source/src/doc/build-tools.txt
    branches/stable/source/src/doc/tlbuild.info
    branches/stable/source/src/libs/README
    branches/stable/source/src/texk/README
    branches/stable/source/src/texk/web2c/ChangeLog
    branches/stable/source/src/texk/web2c/Makefile.in
    branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
    branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
    branches/stable/source/src/texk/web2c/cwebdir/texinputs/Xcwebmac.tex
    branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex
    branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
    branches/stable/source/src/texk/web2c/pdftexdir/NEWS
    branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf.cc
    branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.cc
    branches/stable/source/src/texk/web2c/pdftexdir/writepng.c
    branches/stable/source/src/texk/web2c/tangle.ch
    branches/stable/source/src/texk/web2c/tiedir/ChangeLog
    branches/stable/source/src/texk/web2c/tiedir/tie-w2c.ch

Modified: branches/stable/source/src/Makefile.am
===================================================================
--- branches/stable/source/src/Makefile.am	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/Makefile.am	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 53614 2020-01-31 18:59:27Z karl $
+## $Id: Makefile.am 55329 2020-05-28 22:03:59Z karl $
 ## Makefile.am for the TeX Live top-level
 ##
 ## Copyright 2016-2020 Karl Berry <tex-live at tug.org>
@@ -53,8 +53,11 @@
 	@echo "top-level make $@: running install-strip..."
 	$(MAKE) $(AM_MAKEFLAGS) install-strip
 #
-	@echo "top-level make $@: making run-texlinks in $(texlinks_dir) ..."
-	cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks
+# Just in case it's not a full checkout.
+	if test -d "$(texlinks_dir)"; then \
+	  echo "top-level make $@: making run-texlinks in $(texlinks_dir) ..."; \
+	  cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks; \
+	else :; fi
 #
 	@echo "top-level make $@: running $(check_target)..."
 	$(MAKE) $(AM_MAKEFLAGS) $(check_target)

Modified: branches/stable/source/src/Makefile.in
===================================================================
--- branches/stable/source/src/Makefile.in	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/Makefile.in	2020-06-03 23:00:08 UTC (rev 830)
@@ -491,7 +491,7 @@
 recurse_this = 
 recurse_top = 
 
-# $Id: Makefile.in 55138 2020-05-14 17:47:47Z karl $
+# $Id: Makefile.in 55329 2020-05-28 22:03:59Z karl $
 #
 # Requires $(recurse_this) and $(recurse_top).
 # Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
@@ -1044,8 +1044,11 @@
 	@echo "top-level make $@: running install-strip..."
 	$(MAKE) $(AM_MAKEFLAGS) install-strip
 #
-	@echo "top-level make $@: making run-texlinks in $(texlinks_dir) ..."
-	cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks
+# Just in case it's not a full checkout.
+	if test -d "$(texlinks_dir)"; then \
+	  echo "top-level make $@: making run-texlinks in $(texlinks_dir) ..."; \
+	  cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks; \
+	else :; fi
 #
 	@echo "top-level make $@: running $(check_target)..."
 	$(MAKE) $(AM_MAKEFLAGS) $(check_target)

Modified: branches/stable/source/src/build-aux/missing
===================================================================
--- branches/stable/source/src/build-aux/missing	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/build-aux/missing	2020-06-03 23:00:08 UTC (rev 830)
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify

Modified: branches/stable/source/src/build-aux/test-driver
===================================================================
--- branches/stable/source/src/build-aux/test-driver	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/build-aux/test-driver	2020-06-03 23:00:08 UTC (rev 830)
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 2011-2018 Free Software Foundation, Inc.
+# Copyright (C) 2011-2020 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

Modified: branches/stable/source/src/build-aux/texinfo.tex
===================================================================
--- branches/stable/source/src/build-aux/texinfo.tex	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/build-aux/texinfo.tex	2020-06-03 23:00:08 UTC (rev 830)
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2020-05-07.17}
+\def\texinfoversion{2020-05-22.11}
 %
 % Copyright 1985, 1986, 1988, 1990-2020 Free Software Foundation, Inc.
 %
@@ -33,7 +33,7 @@
 % The texinfo.tex in any given distribution could well be out
 % of date, so if that's what you're using, please check.
 %
-% Send bug reports to bug-texinfo at gnu.org.  Please include including a
+% Send bug reports to bug-texinfo at gnu.org.  Please include a
 % complete document in each bug report with which we can reproduce the
 % problem.  Patches are, of course, greatly appreciated.
 %
@@ -408,7 +408,8 @@
 \ifr at ggedbottom \kern-\dimen@ \vfil \fi}
 }
 
-% Check if we are on the first page of a chapter.
+% Check if we are on the first page of a chapter.  Used for printing headings.
+\newif\ifchapterpage
 \def\checkchapterpage{%
   % Get the chapter that was current at the end of the last page
   \ifcase1\the\savedtopmark\fi
@@ -418,12 +419,9 @@
   \let\curchaptername\thischaptername
   %
   \ifx\curchaptername\prevchaptername
-    \let\thischapterheading\thischapter
+    \chapterpagefalse
   \else
-    % \thischapterheading is the same as \thischapter except it is blank
-    % for the first page of a chapter.  This is to prevent the chapter name
-    % being shown twice.
-    \def\thischapterheading{}%
+    \chapterpagetrue
   \fi
 }
 
@@ -1013,7 +1011,7 @@
 \let\setfilename=\comment
 
 % @bye.
-\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
+\outer\def\bye{\chappager\pagelabels\tracingstats=1\ptexend}
 
 
 \message{pdf,}
@@ -1140,6 +1138,45 @@
 \fi
 
 
+% Output page labels information.
+% See PDF reference v.1.7 p.594, section 8.3.1.
+\ifpdf
+\def\pagelabels{%
+  \def\title{0 << /P (T-) /S /D >>}%
+  \edef\roman{\the\romancount << /S /r >>}%
+  \edef\arabic{\the\arabiccount << /S /D >>}%
+  %
+  % Page label ranges must be increasing.  Remove any duplicates.
+  % (There is a slight chance of this being wrong if e.g. there is
+  % a @contents but no @titlepage, etc.)
+  %
+  \ifnum\romancount=0 \def\roman{}\fi
+  \ifnum\arabiccount=0 \def\title{}%
+  \else
+    \ifnum\romancount=\arabiccount \def\roman{}\fi
+  \fi
+  %
+  \ifnum\romancount<\arabiccount
+    \pdfcatalog{/PageLabels << /Nums [\title \roman \arabic ] >> }\relax
+  \else
+    \pdfcatalog{/PageLabels << /Nums [\title \arabic \roman ] >> }\relax
+  \fi
+}
+\else
+  \let\pagelabels\relax
+\fi
+
+\newcount\pagecount \pagecount=0
+\newcount\romancount \romancount=0
+\newcount\arabiccount \arabiccount=0
+\ifpdf
+  \let\ptxadvancepageno\advancepageno
+  \def\advancepageno{%
+    \ptxadvancepageno\global\advance\pagecount by 1
+  }
+\fi
+
+
 % PDF uses PostScript string constants for the names of xref targets,
 % for display in the outlines, and in other places.  Thus, we have to
 % double any backslashes.  Otherwise, a name like "\node" will be
@@ -3806,12 +3843,19 @@
 
 \newtoks\evenheadline    % headline on even pages
 \newtoks\oddheadline     % headline on odd pages
+\newtoks\evenchapheadline% headline on even pages with a new chapter
+\newtoks\oddchapheadline % headline on odd pages with a new chapter
 \newtoks\evenfootline    % footline on even pages
 \newtoks\oddfootline     % footline on odd pages
 
 % Now make \makeheadline and \makefootline in Plain TeX use those variables
-\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
-                            \else \the\evenheadline \fi}}
+\headline={{\textfonts\rm
+            \ifchapterpage
+              \ifodd\pageno\the\oddchapheadline\else\the\evenchapheadline\fi
+            \else
+              \ifodd\pageno\the\oddheadline\else\the\evenheadline\fi
+            \fi}}
+
 \footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
                             \else \the\evenfootline \fi}\HEADINGShook}
 \let\HEADINGShook=\relax
@@ -3827,12 +3871,14 @@
 \def\evenheading{\parsearg\evenheadingxxx}
 \def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish}
 \def\evenheadingyyy #1\|#2\|#3\|#4\finish{%
-\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
+  \global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}
+  \global\evenchapheadline=\evenheadline}
 
 \def\oddheading{\parsearg\oddheadingxxx}
 \def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish}
 \def\oddheadingyyy #1\|#2\|#3\|#4\finish{%
-\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
+  \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}%
+  \global\oddchapheadline=\oddheadline}
 
 \parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
 
@@ -3899,8 +3945,8 @@
 \parseargdef\headings{\csname HEADINGS#1\endcsname}
 
 \def\headingsoff{% non-global headings elimination
-  \evenheadline={\hfil}\evenfootline={\hfil}%
-   \oddheadline={\hfil}\oddfootline={\hfil}%
+  \evenheadline={\hfil}\evenfootline={\hfil}\evenchapheadline={\hfil}%
+   \oddheadline={\hfil}\oddfootline={\hfil}\oddchapheadline={\hfil}%
 }
 
 \def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting
@@ -3907,17 +3953,18 @@
 \HEADINGSoff  % it's the default
 
 % When we turn headings on, set the page number to 1.
+\def\pageone{
+  \global\pageno=1
+  \global\arabiccount = \pagecount
+}
+
 % For double-sided printing, put current file name in lower left corner,
 % chapter name on inside top of right hand pages, document
 % title on inside top of left hand pages, and page numbers on outside top
 % edge of all pages.
 \def\HEADINGSdouble{%
-\global\pageno=1
-\global\evenfootline={\hfil}
-\global\oddfootline={\hfil}
-\global\evenheadline={\line{\folio\hfil\thistitle}}
-\global\oddheadline={\line{\thischapterheading\hfil\folio}}
-\global\let\contentsalignmacro = \chapoddpage
+\pageone
+\HEADINGSdoublex
 }
 \let\contentsalignmacro = \chappager
 
@@ -3924,12 +3971,8 @@
 % For single-sided printing, chapter title goes across top left of page,
 % page number on top right.
 \def\HEADINGSsingle{%
-\global\pageno=1
-\global\evenfootline={\hfil}
-\global\oddfootline={\hfil}
-\global\evenheadline={\line{\thischapterheading\hfil\folio}}
-\global\oddheadline={\line{\thischapterheading\hfil\folio}}
-\global\let\contentsalignmacro = \chappager
+\pageone
+\HEADINGSsinglex
 }
 \def\HEADINGSon{\HEADINGSdouble}
 
@@ -3939,7 +3982,9 @@
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\folio\hfil\thistitle}}
-\global\oddheadline={\line{\thischapterheading\hfil\folio}}
+\global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\evenchapheadline={\line{\folio\hfil}}
+\global\oddchapheadline={\line{\hfil\folio}}
 \global\let\contentsalignmacro = \chapoddpage
 }
 
@@ -3947,11 +3992,25 @@
 \def\HEADINGSsinglex{%
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
-\global\evenheadline={\line{\thischapterheading\hfil\folio}}
-\global\oddheadline={\line{\thischapterheading\hfil\folio}}
+\global\evenheadline={\line{\thischapter\hfil\folio}}
+\global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\evenchapheadline={\line{\hfil\folio}}
+\global\oddchapheadline={\line{\hfil\folio}}
 \global\let\contentsalignmacro = \chappager
 }
 
+% for @setchapternewpage off
+\def\HEADINGSsinglechapoff{%
+\pageone
+\global\evenfootline={\hfil}
+\global\oddfootline={\hfil}
+\global\evenheadline={\line{\thischapter\hfil\folio}}
+\global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\evenchapheadline=\evenheadline
+\global\oddchapheadline=\oddheadline
+\global\let\contentsalignmacro = \chappager
+}
+
 % Subroutines used in generating headings
 % This produces Day Month Year style of output.
 % Only define if not already defined, in case a txi-??.tex file has set
@@ -5139,64 +5198,66 @@
   \let\lbracechar\{%
   \let\rbracechar\}%
   %
+  %
+  \let\do\indexnofontsdef
+  %
   % Non-English letters.
-  \def\AA{AA}%
-  \def\AE{AE}%
-  \def\DH{DZZ}%
-  \def\L{L}%
-  \def\OE{OE}%
-  \def\O{O}%
-  \def\TH{TH}%
-  \def\aa{aa}%
-  \def\ae{ae}%
-  \def\dh{dzz}%
-  \def\exclamdown{!}%
-  \def\l{l}%
-  \def\oe{oe}%
-  \def\ordf{a}%
-  \def\ordm{o}%
-  \def\o{o}%
-  \def\questiondown{?}%
-  \def\ss{ss}%
-  \def\th{th}%
+  \do\AA{AA}%
+  \do\AE{AE}%
+  \do\DH{DZZ}%
+  \do\L{L}%
+  \do\OE{OE}%
+  \do\O{O}%
+  \do\TH{TH}%
+  \do\aa{aa}%
+  \do\ae{ae}%
+  \do\dh{dzz}%
+  \do\exclamdown{!}%
+  \do\l{l}%
+  \do\oe{oe}%
+  \do\ordf{a}%
+  \do\ordm{o}%
+  \do\o{o}%
+  \do\questiondown{?}%
+  \do\ss{ss}%
+  \do\th{th}%
   %
-  \def\LaTeX{LaTeX}%
-  \def\TeX{TeX}%
+  \do\LaTeX{LaTeX}%
+  \do\TeX{TeX}%
   %
-  % Assorted special characters.  \defglyph gives the control sequence a
-  % definition that removes the {} that follows its use.
-  \defglyph\atchar{@}%
-  \defglyph\arrow{->}%
-  \defglyph\bullet{bullet}%
-  \defglyph\comma{,}%
-  \defglyph\copyright{copyright}%
-  \defglyph\dots{...}%
-  \defglyph\enddots{...}%
-  \defglyph\equiv{==}%
-  \defglyph\error{error}%
-  \defglyph\euro{euro}%
-  \defglyph\expansion{==>}%
-  \defglyph\geq{>=}%
-  \defglyph\guillemetleft{<<}%
-  \defglyph\guillemetright{>>}%
-  \defglyph\guilsinglleft{<}%
-  \defglyph\guilsinglright{>}%
-  \defglyph\leq{<=}%
-  \defglyph\lbracechar{\{}%
-  \defglyph\minus{-}%
-  \defglyph\point{.}%
-  \defglyph\pounds{pounds}%
-  \defglyph\print{-|}%
-  \defglyph\quotedblbase{"}%
-  \defglyph\quotedblleft{"}%
-  \defglyph\quotedblright{"}%
-  \defglyph\quoteleft{`}%
-  \defglyph\quoteright{'}%
-  \defglyph\quotesinglbase{,}%
-  \defglyph\rbracechar{\}}%
-  \defglyph\registeredsymbol{R}%
-  \defglyph\result{=>}%
-  \defglyph\textdegree{o}%
+  % Assorted special characters.
+  \do\atchar{@}%
+  \do\arrow{->}%
+  \do\bullet{bullet}%
+  \do\comma{,}%
+  \do\copyright{copyright}%
+  \do\dots{...}%
+  \do\enddots{...}%
+  \do\equiv{==}%
+  \do\error{error}%
+  \do\euro{euro}%
+  \do\expansion{==>}%
+  \do\geq{>=}%
+  \do\guillemetleft{<<}%
+  \do\guillemetright{>>}%
+  \do\guilsinglleft{<}%
+  \do\guilsinglright{>}%
+  \do\leq{<=}%
+  \do\lbracechar{\{}%
+  \do\minus{-}%
+  \do\point{.}%
+  \do\pounds{pounds}%
+  \do\print{-|}%
+  \do\quotedblbase{"}%
+  \do\quotedblleft{"}%
+  \do\quotedblright{"}%
+  \do\quoteleft{`}%
+  \do\quoteright{'}%
+  \do\quotesinglbase{,}%
+  \do\rbracechar{\}}%
+  \do\registeredsymbol{R}%
+  \do\result{=>}%
+  \do\textdegree{o}%
   %
   % We need to get rid of all macros, leaving only the arguments (if present).
   % Of course this is not nearly correct, but it is the best we can do for now.
@@ -5211,11 +5272,14 @@
   \macrolist
   \let\value\indexnofontsvalue
 }
-\def\defglyph#1#2{\def#1##1{#2}} % see above
 
+% Give the control sequence a definition that removes the {} that follows
+% its use, e.g. @AA{} -> AA
+\def\indexnofontsdef#1#2{\def#1##1{#2}}%
 
 
 
+
 % #1 is the index name, #2 is the entry text.
 \def\doind#1#2{%
   \iflinks
@@ -6423,18 +6487,16 @@
 \def\CHAPPAGoff{%
 \global\let\contentsalignmacro = \chappager
 \global\let\pchapsepmacro=\chapbreak
-\global\let\pagealignmacro=\chappager}
+\global\def\HEADINGSon{\HEADINGSsinglechapoff}}
 
 \def\CHAPPAGon{%
 \global\let\contentsalignmacro = \chappager
 \global\let\pchapsepmacro=\chappager
-\global\let\pagealignmacro=\chappager
 \global\def\HEADINGSon{\HEADINGSsingle}}
 
 \def\CHAPPAGodd{%
 \global\let\contentsalignmacro = \chapoddpage
 \global\let\pchapsepmacro=\chapoddpage
-\global\let\pagealignmacro=\chapoddpage
 \global\def\HEADINGSon{\HEADINGSdouble}}
 
 \CHAPPAGon
@@ -6799,9 +6861,7 @@
 %
 \def\startcontents#1{%
   % If @setchapternewpage on, and @headings double, the contents should
-  % start on an odd page, unlike chapters.  Thus, we maintain
-  % \contentsalignmacro in parallel with \pagealignmacro.
-  % From: Torbjorn Granlund <tege at matematik.su.se>
+  % start on an odd page, unlike chapters.
   \contentsalignmacro
   \immediate\closeout\tocfile
   %
@@ -6816,6 +6876,9 @@
     %
     % Roman numerals for page numbers.
     \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
+    \def\thistitle{}% no title in double-sided headings
+    % Record where the Roman numerals started.
+    \ifnum\romancount=0 \global\romancount=\pagecount \fi
 }
 
 % redefined for the two-volume lispref.  We always output on
@@ -6838,8 +6901,7 @@
     \fi
     \closein 1
   \endgroup
-  \lastnegativepageno = \pageno
-  \global\pageno = \savepageno
+  \contentsendroman
 }
 
 % And just the chapters.
@@ -6874,10 +6936,20 @@
     \vfill \eject
     \contentsalignmacro % in case @setchapternewpage odd is in effect
   \endgroup
+  \contentsendroman
+}
+\let\shortcontents = \summarycontents
+
+% Get ready to use Arabic numerals again
+\def\contentsendroman{%
   \lastnegativepageno = \pageno
   \global\pageno = \savepageno
+  %
+  % If \romancount > \arabiccount, the contents are at the end of the
+  % document.  Otherwise, advance where the Arabic numerals start for
+  % the page numbers.
+  \ifnum\romancount>\arabiccount\else\global\arabiccount=\pagecount\fi
 }
-\let\shortcontents = \summarycontents
 
 % Typeset the label for a chapter or appendix for the short contents.
 % The arg is, e.g., `A' for an appendix, or `3' for a chapter.
@@ -7559,7 +7631,7 @@
       \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}%
       \edef\tmp{\noexpand\input #1 }
       \expandafter
-    }\tmp
+    }\expandafter\starttabbox\tmp\egroup
     \afterenvbreak
   }%
 }
@@ -10725,6 +10797,8 @@
   \DeclareUnicodeCharacter{0233}{\=y}%
   \DeclareUnicodeCharacter{0237}{\dotless{j}}%
   %
+  \DeclareUnicodeCharacter{02BC}{'}%
+  %
   \DeclareUnicodeCharacter{02DB}{\ogonek{ }}%
   %
   % Greek letters upper case

Modified: branches/stable/source/src/build-aux/ylwrap
===================================================================
--- branches/stable/source/src/build-aux/ylwrap	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/build-aux/ylwrap	2020-06-03 23:00:08 UTC (rev 830)
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <tromey at cygnus.com>.
 #

Modified: branches/stable/source/src/doc/build-tools.txt
===================================================================
--- branches/stable/source/src/doc/build-tools.txt	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/doc/build-tools.txt	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,6 +1,6 @@
 autoconf (GNU Autoconf) 2.69
 automake (GNU automake) 1.16.2
-bison (GNU Bison) 3.6.1
+bison (GNU Bison) 3.6.2
 flex 2.6.0
 ltmain.sh (GNU libtool) 2.4.6
 m4 (GNU M4) 1.4.18

Modified: branches/stable/source/src/doc/tlbuild.info
===================================================================
--- branches/stable/source/src/doc/tlbuild.info	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/doc/tlbuild.info	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,4 +1,4 @@
-This is tlbuild.info, produced by makeinfo version 6.7 from
+This is tlbuild.info, produced by makeinfo version 5.1 from
 tlbuild.texi.
 
 This file documents the TeX Live build system and more.
@@ -321,8 +321,8 @@
 =====================
 
 To build one package, the basic idea is to use the 'configure' option
-'--disable-all-pkgs' (*note --disable-all-pkgs::).  Then all program and
-library modules are configured but none are made.  However, the
+'--disable-all-pkgs' (*note '--disable-all-pkgs'::).  Then all program
+and library modules are configured but none are made.  However, the
 'Makefile's still contain all build rules and dependencies and can be
 invoked to build an individual program or library, first building any
 required libraries.
@@ -746,7 +746,7 @@
 
      autoconf (GNU Autoconf) 2.69
      automake (GNU automake) 1.16.2
-     bison (GNU Bison) 3.6.1
+     bison (GNU Bison) 3.6.2
      flex 2.6.0
      ltmain.sh (GNU libtool) 2.4.6
      m4 (GNU M4) 1.4.18
@@ -1037,13 +1037,13 @@
 
 * Menu:
 
-* png library::       'libs/libpng'
-* zlib library::      'libs/zlib'
-* freetype library::  'libs/freetype2'
-* kpathsea library::  'texk/kpathsea'
+* 'png' library::       'libs/libpng'
+* 'zlib' library::      'libs/zlib'
+* 'freetype' library::  'libs/freetype2'
+* 'kpathsea' library::  'texk/kpathsea'
 
 
-File: tlbuild.info,  Node: png library,  Next: zlib library,  Up: Library modules
+File: tlbuild.info,  Node: 'png' library,  Next: 'zlib' library,  Up: Library modules
 
 6.4.1 The 'png' library in 'libs/libpng'
 ----------------------------------------
@@ -1099,7 +1099,7 @@
 flags required for the system library.
 
 
-File: tlbuild.info,  Node: zlib library,  Next: freetype library,  Prev: png library,  Up: Library modules
+File: tlbuild.info,  Node: 'zlib' library,  Next: 'freetype' library,  Prev: 'png' library,  Up: Library modules
 
 6.4.2 The 'zlib' library in 'libs/zlib'
 ---------------------------------------
@@ -1111,7 +1111,7 @@
 locations of the 'zlib' headers and/or library.
 
 
-File: tlbuild.info,  Node: freetype library,  Next: kpathsea library,  Prev: zlib library,  Up: Library modules
+File: tlbuild.info,  Node: 'freetype' library,  Next: 'kpathsea' library,  Prev: 'zlib' library,  Up: Library modules
 
 6.4.3 The 'freetype' library in 'libs/freetype2'
 ------------------------------------------------
@@ -1127,7 +1127,7 @@
 'freetype-config'.
 
 
-File: tlbuild.info,  Node: kpathsea library,  Prev: freetype library,  Up: Library modules
+File: tlbuild.info,  Node: 'kpathsea' library,  Prev: 'freetype' library,  Up: Library modules
 
 6.4.4 The 'kpathsea' library in 'texk/kpathsea'
 -----------------------------------------------
@@ -1165,13 +1165,13 @@
 
 * Menu:
 
-* t1utils package:: 'utils/t1utils'
-* xindy package::   'utils/xindy'
-* xdvik package::   'texk/xdvik'
-* asymptote::       'utils/asymptote'
+* 't1utils' package:: 'utils/t1utils'
+* 'xindy' package::   'utils/xindy'
+* 'xdvik' package::   'texk/xdvik'
+* 'asymptote'::       'utils/asymptote'
 
 
-File: tlbuild.info,  Node: t1utils package,  Next: xindy package,  Up: Program modules
+File: tlbuild.info,  Node: 't1utils' package,  Next: 'xindy' package,  Up: Program modules
 
 6.5.1 The 't1utils' package in 'utils/t1utils'
 ----------------------------------------------
@@ -1187,7 +1187,7 @@
 configure option '--disable-t1utils'.
 
 
-File: tlbuild.info,  Node: xindy package,  Next: xdvik package,  Prev: t1utils package,  Up: Program modules
+File: tlbuild.info,  Node: 'xindy' package,  Next: 'xdvik' package,  Prev: 't1utils' package,  Up: Program modules
 
 6.5.2 The 'xindy' package in 'utils/xindy'
 ------------------------------------------
@@ -1213,7 +1213,7 @@
 included by 'configure.ac'.
 
 
-File: tlbuild.info,  Node: xdvik package,  Next: asymptote,  Prev: xindy package,  Up: Program modules
+File: tlbuild.info,  Node: 'xdvik' package,  Next: 'asymptote',  Prev: 'xindy' package,  Up: Program modules
 
 6.5.3 The 'xdvik' package in 'texk/xdvik'
 -----------------------------------------
@@ -1238,7 +1238,7 @@
 also seen at the top level.
 
 
-File: tlbuild.info,  Node: asymptote,  Prev: xdvik package,  Up: Program modules
+File: tlbuild.info,  Node: 'asymptote',  Prev: 'xdvik' package,  Up: Program modules
 
 6.5.4 The subdirectory 'utils/asymptote'
 ----------------------------------------
@@ -1455,21 +1455,21 @@
 
 * Menu:
 
-* --disable-native-texlive-build::
-* --prefix --bindir ...::
-* --disable-largefile::
-* --disable-missing::
-* --enable-compiler-warnings=LEVEL::
-* --enable-cxx-runtime-hack::
-* --enable-maintainer-mode::
-* --enable-multiplatform::
-* --enable-shared::
-* --enable-silent-rules::
-* --without-ln-s::
-* --without-x::
+* '--disable-native-texlive-build'::
+* '--prefix' '--bindir' ...::
+* '--disable-largefile'::
+* '--disable-missing'::
+* '--enable-compiler-warnings='LEVEL::
+* '--enable-cxx-runtime-hack'::
+* '--enable-maintainer-mode'::
+* '--enable-multiplatform'::
+* '--enable-shared'::
+* '--enable-silent-rules'::
+* '--without-ln-s'::
+* '--without-x'::
 
 
-File: tlbuild.info,  Node: --disable-native-texlive-build,  Next: --prefix --bindir ...,  Up: Global configure options
+File: tlbuild.info,  Node: '--disable-native-texlive-build',  Next: '--prefix' '--bindir' ...,  Up: Global configure options
 
 7.1.1 '--disable-native-texlive-build'
 --------------------------------------
@@ -1490,7 +1490,7 @@
 TL-specific adaptations, such as installation paths.
 
 
-File: tlbuild.info,  Node: --prefix --bindir ...,  Next: --disable-largefile,  Prev: --disable-native-texlive-build,  Up: Global configure options
+File: tlbuild.info,  Node: '--prefix' '--bindir' ...,  Next: '--disable-largefile',  Prev: '--disable-native-texlive-build',  Up: Global configure options
 
 7.1.2 '--prefix', '--bindir', ...
 ---------------------------------
@@ -1503,7 +1503,7 @@
 location: (automake)Staged Installs.).
 
 
-File: tlbuild.info,  Node: --disable-largefile,  Next: --disable-missing,  Prev: --prefix --bindir ...,  Up: Global configure options
+File: tlbuild.info,  Node: '--disable-largefile',  Next: '--disable-missing',  Prev: '--prefix' '--bindir' ...,  Up: Global configure options
 
 7.1.3 '--disable-largefile'
 ---------------------------
@@ -1517,7 +1517,7 @@
 'pdftex' or PostScript files created by 'dvips'.
 
 
-File: tlbuild.info,  Node: --disable-missing,  Next: --enable-compiler-warnings=LEVEL,  Prev: --disable-largefile,  Up: Global configure options
+File: tlbuild.info,  Node: '--disable-missing',  Next: '--enable-compiler-warnings='LEVEL,  Prev: '--disable-largefile',  Up: Global configure options
 
 7.1.4 '--disable-missing'
 -------------------------
@@ -1527,7 +1527,7 @@
 when figuring out a specific (sub)set of modules to enable.
 
 
-File: tlbuild.info,  Node: --enable-compiler-warnings=LEVEL,  Next: --enable-cxx-runtime-hack,  Prev: --disable-missing,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-compiler-warnings='LEVEL,  Next: '--enable-cxx-runtime-hack',  Prev: '--disable-missing',  Up: Global configure options
 
 7.1.5 '--enable-compiler-warnings='LEVEL
 ----------------------------------------
@@ -1540,7 +1540,7 @@
 At present, these warning flags assume options from the GNU compilers.
 
 
-File: tlbuild.info,  Node: --enable-cxx-runtime-hack,  Next: --enable-maintainer-mode,  Prev: --enable-compiler-warnings=LEVEL,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-cxx-runtime-hack',  Next: '--enable-maintainer-mode',  Prev: '--enable-compiler-warnings='LEVEL,  Up: Global configure options
 
 7.1.6 '--enable-cxx-runtime-hack'
 ---------------------------------
@@ -1550,7 +1550,7 @@
 resulting binary.  *Note Macros for compilers::.
 
 
-File: tlbuild.info,  Node: --enable-maintainer-mode,  Next: --enable-multiplatform,  Prev: --enable-cxx-runtime-hack,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-maintainer-mode',  Next: '--enable-multiplatform',  Prev: '--enable-cxx-runtime-hack',  Up: Global configure options
 
 7.1.7 '--enable-maintainer-mode'
 --------------------------------
@@ -1562,7 +1562,7 @@
 'AM_MAINTAINER_MODE': (automake)maintainer-mode.
 
 
-File: tlbuild.info,  Node: --enable-multiplatform,  Next: --enable-shared,  Prev: --enable-maintainer-mode,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-multiplatform',  Next: '--enable-shared',  Prev: '--enable-maintainer-mode',  Up: Global configure options
 
 7.1.8 '--enable-multiplatform'
 ------------------------------
@@ -1575,7 +1575,7 @@
 subdirectories.
 
 
-File: tlbuild.info,  Node: --enable-shared,  Next: --enable-silent-rules,  Prev: --enable-multiplatform,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-shared',  Next: '--enable-silent-rules',  Prev: '--enable-multiplatform',  Up: Global configure options
 
 7.1.9 '--enable-shared'
 -----------------------
@@ -1585,7 +1585,7 @@
 '--disable-native-texlive-build' must also be specified).
 
 
-File: tlbuild.info,  Node: --enable-silent-rules,  Next: --without-ln-s,  Prev: --enable-shared,  Up: Global configure options
+File: tlbuild.info,  Node: '--enable-silent-rules',  Next: '--without-ln-s',  Prev: '--enable-shared',  Up: Global configure options
 
 7.1.10 '--enable-silent-rules'
 ------------------------------
@@ -1596,7 +1596,7 @@
 'V=0' to get less, regardless of this option.
 
 
-File: tlbuild.info,  Node: --without-ln-s,  Next: --without-x,  Prev: --enable-silent-rules,  Up: Global configure options
+File: tlbuild.info,  Node: '--without-ln-s',  Next: '--without-x',  Prev: '--enable-silent-rules',  Up: Global configure options
 
 7.1.11 '--without-ln-s'
 -----------------------
@@ -1606,7 +1606,7 @@
 anything useful, and might fail.
 
 
-File: tlbuild.info,  Node: --without-x,  Prev: --without-ln-s,  Up: Global configure options
+File: tlbuild.info,  Node: '--without-x',  Prev: '--without-ln-s',  Up: Global configure options
 
 7.1.12 '--without-x'
 --------------------
@@ -1623,18 +1623,18 @@
 
 * Menu:
 
-* --enable-PROG --disable-PROG::
-* --disable-all-pkgs::
-* Configure options for texk/web2c::
-* Configure options for texk/bibtex-x::
-* Configure options for texk/dvipdfm-x::
-* Configure options for texk/dvisvgm::
-* Configure options for texk/texlive::
-* Configure options for texk/xdvik::
-* Configure options for utils/xindy::
+* '--enable-PROG' '--disable-PROG'::
+* '--disable-all-pkgs'::
+* Configure options for 'texk/web2c'::
+* Configure options for 'texk/bibtex-x'::
+* Configure options for 'texk/dvipdfm-x'::
+* Configure options for 'texk/dvisvgm'::
+* Configure options for 'texk/texlive'::
+* Configure options for 'texk/xdvik'::
+* Configure options for 'utils/xindy'::
 
 
-File: tlbuild.info,  Node: --enable-PROG --disable-PROG,  Next: --disable-all-pkgs,  Up: Program-specific configure options
+File: tlbuild.info,  Node: '--enable-PROG' '--disable-PROG',  Next: '--disable-all-pkgs',  Up: Program-specific configure options
 
 7.2.1 '--enable-PROG', '--disable-PROG'
 ---------------------------------------
@@ -1642,7 +1642,7 @@
 Do or do not build and install the program(s) of module 'PROG'.
 
 
-File: tlbuild.info,  Node: --disable-all-pkgs,  Next: Configure options for texk/web2c,  Prev: --enable-PROG --disable-PROG,  Up: Program-specific configure options
+File: tlbuild.info,  Node: '--disable-all-pkgs',  Next: Configure options for 'texk/web2c',  Prev: '--enable-PROG' '--disable-PROG',  Up: Program-specific configure options
 
 7.2.2 '--disable-all-pkgs'
 --------------------------
@@ -1659,7 +1659,7 @@
 fragment.
 
 
-File: tlbuild.info,  Node: Configure options for texk/web2c,  Next: Configure options for texk/bibtex-x,  Prev: --disable-all-pkgs,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/web2c',  Next: Configure options for 'texk/bibtex-x',  Prev: '--disable-all-pkgs',  Up: Program-specific configure options
 
 7.2.3 Configure options for 'texk/web2c'
 ----------------------------------------
@@ -1726,7 +1726,7 @@
 Do not build the 'SyncTeX' library and tool.
 
 
-File: tlbuild.info,  Node: Configure options for texk/bibtex-x,  Next: Configure options for texk/dvipdfm-x,  Prev: Configure options for texk/web2c,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/bibtex-x',  Next: Configure options for 'texk/dvipdfm-x',  Prev: Configure options for 'texk/web2c',  Up: Program-specific configure options
 
 7.2.4 Configure options for 'texk/bibtex-x'
 -------------------------------------------
@@ -1742,7 +1742,7 @@
 libraries).
 
 
-File: tlbuild.info,  Node: Configure options for texk/dvipdfm-x,  Next: Configure options for texk/dvisvgm,  Prev: Configure options for texk/bibtex-x,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/dvipdfm-x',  Next: Configure options for 'texk/dvisvgm',  Prev: Configure options for 'texk/bibtex-x',  Up: Program-specific configure options
 
 7.2.5 Configure options for 'texk/dvipdfm-x'
 --------------------------------------------
@@ -1760,7 +1760,7 @@
 Do not build the 'xdvipdfmx' program.
 
 
-File: tlbuild.info,  Node: Configure options for texk/dvisvgm,  Next: Configure options for texk/texlive,  Prev: Configure options for texk/dvipdfm-x,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/dvisvgm',  Next: Configure options for 'texk/texlive',  Prev: Configure options for 'texk/dvipdfm-x',  Up: Program-specific configure options
 
 7.2.6 Configure options for 'texk/dvisvgm'
 ------------------------------------------
@@ -1780,7 +1780,7 @@
 Specify non-standard locations of the Ghostscript headers and library.
 
 
-File: tlbuild.info,  Node: Configure options for texk/texlive,  Next: Configure options for texk/xdvik,  Prev: Configure options for texk/dvisvgm,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/texlive',  Next: Configure options for 'texk/xdvik',  Prev: Configure options for 'texk/dvisvgm',  Up: Program-specific configure options
 
 7.2.7 Configure options for 'texk/texlive'
 ------------------------------------------
@@ -1790,7 +1790,7 @@
 the TL scripts required to run 'texlinks'.
 
 
-File: tlbuild.info,  Node: Configure options for texk/xdvik,  Next: Configure options for utils/xindy,  Prev: Configure options for texk/texlive,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'texk/xdvik',  Next: Configure options for 'utils/xindy',  Prev: Configure options for 'texk/texlive',  Up: Program-specific configure options
 
 7.2.8 Configure options for 'texk/xdvik'
 ----------------------------------------
@@ -1807,7 +1807,7 @@
 a native TL build).
 
 
-File: tlbuild.info,  Node: Configure options for utils/xindy,  Prev: Configure options for texk/xdvik,  Up: Program-specific configure options
+File: tlbuild.info,  Node: Configure options for 'utils/xindy',  Prev: Configure options for 'texk/xdvik',  Up: Program-specific configure options
 
 7.2.9 Configure options for 'utils/xindy'
 -----------------------------------------
@@ -1853,10 +1853,10 @@
 
 * Menu:
 
-* Configure options for kpathsea::
+* Configure options for 'kpathsea'::
 
 
-File: tlbuild.info,  Node: Configure options for kpathsea,  Up: Library-specific configure options
+File: tlbuild.info,  Node: Configure options for 'kpathsea',  Up: Library-specific configure options
 
 7.3.1 Configure options for 'kpathsea'
 --------------------------------------
@@ -1880,7 +1880,7 @@
      (TFM file)
 
 to generate the specified type of file dynamically.  The default can be
-overridden by the user in any case (*note kpathsea library::).
+overridden by the user in any case (*note 'kpathsea' library::).
 
 
 File: tlbuild.info,  Node: Variables for configure,  Prev: Library-specific configure options,  Up: Configure options
@@ -5053,11 +5053,11 @@
 
 * Menu:
 
-* tlmgr Machine-readable update and install output::
-* tlmgr Machine-readable option output::
+* tlmgr Machine-readable 'update' and 'install' output::
+* tlmgr Machine-readable 'option' output::
 
 
-File: tlbuild.info,  Node: tlmgr Machine-readable update and install output,  Next: tlmgr Machine-readable option output,  Up: tlmgr MACHINE-READABLE OUTPUT
+File: tlbuild.info,  Node: tlmgr Machine-readable 'update' and 'install' output,  Next: tlmgr Machine-readable 'option' output,  Up: tlmgr MACHINE-READABLE OUTPUT
 
 B.12.1 Machine-readable 'update' and 'install' output
 -----------------------------------------------------
@@ -5175,7 +5175,7 @@
      The estimated total time.
 
 
-File: tlbuild.info,  Node: tlmgr Machine-readable option output,  Prev: tlmgr Machine-readable update and install output,  Up: tlmgr MACHINE-READABLE OUTPUT
+File: tlbuild.info,  Node: tlmgr Machine-readable 'option' output,  Prev: tlmgr Machine-readable 'update' and 'install' output,  Up: tlmgr MACHINE-READABLE OUTPUT
 
 B.12.2 Machine-readable 'option' output
 ---------------------------------------
@@ -5296,112 +5296,113 @@
  [index ]
 * Menu:
 
-* --bindir configure option:             --prefix --bindir ....
+* --bindir configure option:             '--prefix' '--bindir' ....
                                                                (line  6)
-* --bindir configure option <1>:         --enable-multiplatform.
+* --bindir configure option <1>:         '--enable-multiplatform'.
                                                                (line  6)
 * --build=HOST:                          Cross configuring.    (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.
+* --disable-all-pkgs:                    '--disable-all-pkgs'. (line  6)
+* --disable-bibtex8:                     Configure options for 'texk/bibtex-x'.
                                                                (line  9)
-* --disable-bibtexu:                     Configure options for texk/bibtex-x.
+* --disable-bibtexu:                     Configure options for 'texk/bibtex-x'.
                                                                (line 12)
-* --disable-dump-share:                  Configure options for texk/web2c.
+* --disable-dump-share:                  Configure options for 'texk/web2c'.
                                                                (line 27)
-* --disable-dvipdfmx:                    Configure options for texk/dvipdfm-x.
+* --disable-dvipdfmx:                    Configure options for 'texk/dvipdfm-x'.
                                                                (line 12)
-* --disable-etex-synctex:                Configure options for texk/web2c.
+* --disable-etex-synctex:                Configure options for 'texk/web2c'.
                                                                (line 59)
-* --disable-ipc:                         Configure options for texk/web2c.
+* --disable-ipc:                         Configure options for 'texk/web2c'.
                                                                (line 31)
-* --disable-largefile:                   --disable-largefile.  (line  6)
-* --disable-linked-scripts:              Configure options for texk/texlive.
+* --disable-largefile:                   '--disable-largefile'.
                                                                (line  6)
-* --disable-mf-nowin:                    Configure options for texk/web2c.
+* --disable-linked-scripts:              Configure options for 'texk/texlive'.
+                                                               (line  6)
+* --disable-mf-nowin:                    Configure options for 'texk/web2c'.
                                                                (line 34)
-* --disable-missing:                     --disable-missing.    (line  6)
-* --disable-native-texlive-build:        --disable-native-texlive-build.
+* --disable-missing:                     '--disable-missing'.  (line  6)
+* --disable-native-texlive-build:        '--disable-native-texlive-build'.
                                                                (line  6)
-* --disable-PROG:                        --enable-PROG --disable-PROG.
+* --disable-PROG:                        '--enable-PROG' '--disable-PROG'.
                                                                (line  6)
-* --disable-synctex:                     Configure options for texk/web2c.
+* --disable-synctex:                     Configure options for 'texk/web2c'.
                                                                (line 64)
-* --disable-tex:                         Configure options for texk/web2c.
+* --disable-tex:                         Configure options for 'texk/web2c'.
                                                                (line 37)
-* --disable-web-progs:                   Configure options for texk/web2c.
+* --disable-web-progs:                   Configure options for 'texk/web2c'.
                                                                (line 41)
-* --disable-xdvipdfmx:                   Configure options for texk/dvipdfm-x.
+* --disable-xdvipdfmx:                   Configure options for 'texk/dvipdfm-x'.
                                                                (line 15)
-* --enable-*win for Metafont window support: Configure options for texk/web2c.
+* --enable-*win for Metafont window support: Configure options for 'texk/web2c'.
                                                                (line 55)
-* --enable-auto-core:                    Configure options for texk/web2c.
+* --enable-auto-core:                    Configure options for 'texk/web2c'.
                                                                (line 45)
-* --enable-compiler-warnings=LEVEL:      --enable-compiler-warnings=LEVEL.
+* --enable-compiler-warnings=LEVEL:      '--enable-compiler-warnings='LEVEL.
                                                                (line  6)
 * --enable-cxx-runtime-hack:             Macros for compilers. (line 29)
-* --enable-etex:                         Configure options for texk/web2c.
+* --enable-etex:                         Configure options for 'texk/web2c'.
                                                                (line 37)
-* --enable-libtool-hack:                 Configure options for texk/web2c.
+* --enable-libtool-hack:                 Configure options for 'texk/web2c'.
                                                                (line 50)
 * --enable-maintainer-mode:              Build system tools.   (line 28)
-* --enable-maintainer-mode <1>:          --enable-maintainer-mode.
+* --enable-maintainer-mode <1>:          '--enable-maintainer-mode'.
                                                                (line  6)
 * --enable-missing to ignore dependencies: Build one package.  (line 71)
-* --enable-mktextfm-default:             kpathsea library.     (line 18)
-* --enable-multiplatform:                --enable-multiplatform.
+* --enable-mktextfm-default:             'kpathsea' library.   (line 18)
+* --enable-multiplatform:                '--enable-multiplatform'.
                                                                (line  6)
-* --enable-PROG:                         --enable-PROG --disable-PROG.
+* --enable-PROG:                         '--enable-PROG' '--disable-PROG'.
                                                                (line  6)
-* --enable-shared:                       --enable-shared.      (line  6)
-* --enable-silent-rules:                 --enable-silent-rules.
+* --enable-shared:                       '--enable-shared'.    (line  6)
+* --enable-silent-rules:                 '--enable-silent-rules'.
                                                                (line  6)
-* --enable-tex-synctex:                  Configure options for texk/web2c.
+* --enable-tex-synctex:                  Configure options for 'texk/web2c'.
                                                                (line 59)
-* --enable-texlive-build:                --disable-native-texlive-build.
+* --enable-texlive-build:                '--disable-native-texlive-build'.
                                                                (line 15)
-* --enable-xi2-scrolling:                Configure options for texk/xdvik.
+* --enable-xi2-scrolling:                Configure options for 'texk/xdvik'.
                                                                (line 13)
-* --enable-xindy-docs:                   Configure options for utils/xindy.
+* --enable-xindy-docs:                   Configure options for 'utils/xindy'.
                                                                (line 10)
-* --enable-xindy-rules:                  Configure options for utils/xindy.
+* --enable-xindy-rules:                  Configure options for 'utils/xindy'.
                                                                (line  6)
 * --host=HOST:                           Cross configuring.    (line  6)
-* --libdir configure option:             --enable-multiplatform.
+* --libdir configure option:             '--enable-multiplatform'.
                                                                (line  6)
 * --no-clean Build option:               Build problems.       (line  6)
-* --prefix configure option:             --prefix --bindir ....
+* --prefix configure option:             '--prefix' '--bindir' ....
                                                                (line  6)
-* --with-banner-add=STR:                 Configure options for texk/web2c.
+* --with-banner-add=STR:                 Configure options for 'texk/web2c'.
                                                                (line  6)
-* --with-clisp-runtime=FILENAME:         Configure options for utils/xindy.
+* --with-clisp-runtime=FILENAME:         Configure options for 'utils/xindy'.
                                                                (line 14)
-* --with-editor=CMD:                     Configure options for texk/web2c.
+* --with-editor=CMD:                     Configure options for 'texk/web2c'.
                                                                (line 11)
-* --with-fontconfig-includes=DIR:        Configure options for texk/web2c.
+* --with-fontconfig-includes=DIR:        Configure options for 'texk/web2c'.
                                                                (line 16)
-* --with-fontconfig-libdir=DIR:          Configure options for texk/web2c.
+* --with-fontconfig-libdir=DIR:          Configure options for 'texk/web2c'.
                                                                (line 16)
-* --with-gs=FILENAME:                    Configure options for texk/xdvik.
+* --with-gs=FILENAME:                    Configure options for 'texk/xdvik'.
                                                                (line  6)
 * --with-LIB-includes=DIR, -libdir:      Library-specific configure options.
                                                                (line 16)
-* --with-libgs-includes, -libdir:        Configure options for texk/dvisvgm.
+* --with-libgs-includes, -libdir:        Configure options for 'texk/dvisvgm'.
                                                                (line 17)
-* --with-system-kpathsea:                kpathsea library.     (line 13)
+* --with-system-kpathsea:                'kpathsea' library.   (line 13)
 * --with-system-LIB:                     Adding a new generic library module.
                                                                (line 34)
 * --with-system-LIB <1>:                 Library-specific configure options.
                                                                (line  9)
-* --with-system-libgs:                   Configure options for texk/dvisvgm.
+* --with-system-libgs:                   Configure options for 'texk/dvisvgm'.
                                                                (line  6)
-* --with-xdvi-x-toolkit:                 xdvik package.        (line 21)
-* --with-xdvi-x-toolkit=KIT:             Configure options for texk/xdvik.
+* --with-xdvi-x-toolkit:                 'xdvik' package.      (line 21)
+* --with-xdvi-x-toolkit=KIT:             Configure options for 'texk/xdvik'.
                                                                (line  9)
-* --without-libgs:                       Configure options for texk/dvisvgm.
+* --without-libgs:                       Configure options for 'texk/dvisvgm'.
                                                                (line 12)
-* --without-ln-s:                        --without-ln-s.       (line  6)
-* --without-x:                           --without-x.          (line  6)
+* --without-ln-s:                        '--without-ln-s'.     (line  6)
+* --without-x:                           '--without-x'.        (line  6)
 * -C configure option:                   Build in parallel.    (line 11)
 * -j make option:                        Build in parallel.    (line  6)
 * adapting TeX Live for distros:         Distro builds.        (line 54)
@@ -5412,14 +5413,14 @@
 * adding a new TeX-specific library:     Adding a new TeX-specific library module.
                                                                (line  6)
 * adding to TeX Live:                    Extending TeX Live.   (line  6)
-* am/ top-level directory:               Top-level directories.
+* 'am/' top-level directory:             Top-level directories.
                                                                (line 14)
 * ANSI C:                                Declarations and definitions.
                                                                (line  6)
-* ApplicationServices Mac framework, required by xetex: Prerequisites.
+* 'ApplicationServices' Mac framework, required by 'xetex': Prerequisites.
                                                                (line 31)
 * asymptote:                             Linked scripts.       (line 23)
-* asymptote <1>:                         asymptote.            (line  6)
+* asymptote <1>:                         'asymptote'.          (line  6)
 * Autoconf:                              Overview of build system.
                                                                (line  6)
 * autoconf macros:                       Autoconf macros.      (line  6)
@@ -5426,11 +5427,11 @@
 * Automake:                              Overview of build system.
                                                                (line  6)
 * biber:                                 Linked scripts.       (line 23)
-* bibtex-x:                              Configure options for texk/bibtex-x.
+* bibtex-x:                              Configure options for 'texk/bibtex-x'.
                                                                (line  6)
-* bibtex8:                               Configure options for texk/bibtex-x.
+* bibtex8:                               Configure options for 'texk/bibtex-x'.
                                                                (line  6)
-* bibtexu:                               Configure options for texk/bibtex-x.
+* bibtexu:                               Configure options for 'texk/bibtex-x'.
                                                                (line  6)
 * BSD distro:                            Distro builds.        (line  6)
 * build directory, required:             Building.             (line 17)
@@ -5442,7 +5443,7 @@
 * Build script:                          Building.             (line  6)
 * build system, design of:               Overview of build system.
                                                                (line  6)
-* build-aux/ top-level directory:        Top-level directories.
+* 'build-aux/' top-level directory:      Top-level directories.
                                                                (line 30)
 * BUILDCC, BUILDCFLAGS, ...:             Cross configuring.    (line 42)
 * building:                              Building.             (line  6)
@@ -5454,8 +5455,8 @@
                                                                (line  6)
 * C99, avoided:                          Declarations and definitions.
                                                                (line  6)
-* cache file, for configure:             Build in parallel.    (line 11)
-* cache for configure:                   Build in parallel.    (line  6)
+* cache file, for 'configure':           Build in parallel.    (line 11)
+* cache for 'configure':                 Build in parallel.    (line  6)
 * callexe.c:                             Macros for Windows.   (line 32)
 * CC:                                    Variables for configure.
                                                                (line 10)
@@ -5467,41 +5468,41 @@
                                                                (line 18)
 * CLISP:                                 Variables for configure.
                                                                (line 17)
-* CLISP <1>:                             Configure options for utils/xindy.
+* CLISP <1>:                             Configure options for 'utils/xindy'.
                                                                (line 14)
-* clisp, required by xindy:              Prerequisites.        (line 35)
-* Cocoa Mac framework, required by xetex: Prerequisites.       (line 31)
+* 'clisp', required by 'xindy':          Prerequisites.        (line 35)
+* 'Cocoa' Mac framework, required by 'xetex': Prerequisites.   (line 31)
 * coding conventions:                    Coding conventions.   (line  6)
 * compilers, C and C++11:                Prerequisites.        (line  6)
 * config.guess, config.sub, ...:         Top-level directories.
                                                                (line 30)
-* configure options:                     Configure options.    (line  6)
-* configure options, for bibtex-x:       Configure options for texk/bibtex-x.
+* 'configure' options:                   Configure options.    (line  6)
+* 'configure' options, for 'bibtex-x':   Configure options for 'texk/bibtex-x'.
                                                                (line  6)
-* configure options, for dvipdfm-x:      Configure options for texk/dvipdfm-x.
+* 'configure' options, for 'dvipdfm-x':  Configure options for 'texk/dvipdfm-x'.
                                                                (line  6)
-* configure options, for dvisvgm:        Configure options for texk/dvisvgm.
+* 'configure' options, for 'dvisvgm':    Configure options for 'texk/dvisvgm'.
                                                                (line  6)
-* configure options, for kpathsea:       Configure options for kpathsea.
+* 'configure' options, for 'kpathsea':   Configure options for 'kpathsea'.
                                                                (line  6)
-* configure options, for texk/texlive:   Configure options for texk/texlive.
+* 'configure' options, for 'texk/texlive': Configure options for 'texk/texlive'.
                                                                (line  6)
-* configure options, for web2c:          Configure options for texk/web2c.
+* 'configure' options, for 'web2c':      Configure options for 'texk/web2c'.
                                                                (line  6)
-* configure options, for xdvik:          Configure options for texk/xdvik.
+* 'configure' options, for 'xdvik':      Configure options for 'texk/xdvik'.
                                                                (line  6)
-* configure options, for xindy:          Configure options for utils/xindy.
+* 'configure' options, for 'xindy':      Configure options for 'utils/xindy'.
                                                                (line  6)
-* configure options, global:             Global configure options.
+* 'configure' options, global:           Global configure options.
                                                                (line  6)
-* configure options, library-specific:   Library-specific configure options.
+* 'configure' options, library-specific: Library-specific configure options.
                                                                (line  6)
-* configure options, program-specific:   Program-specific configure options.
+* 'configure' options, program-specific: Program-specific configure options.
                                                                (line  6)
-* configure variables:                   Variables for configure.
+* 'configure' variables:                 Variables for configure.
                                                                (line  6)
 * configuring, for cross compilation:    Cross configuring.    (line  6)
-* const:                                 Const.                (line  6)
+* 'const':                               Const.                (line  6)
 * continuous integration:                Continuous integration.
                                                                (line  6)
 * conventions, coding:                   Coding conventions.   (line  6)
@@ -5510,7 +5511,7 @@
 * cross compilation:                     Cross compilation.    (line  6)
 * cross compilation configuring:         Cross configuring.    (line  6)
 * cross compilation problems:            Cross problems.       (line  6)
-* cross compilation, with host binary:   xdvik package.        (line 14)
+* cross compilation, with host binary:   'xdvik' package.      (line 14)
 * ctangle:                               Cross problems.       (line 26)
 * CXX:                                   Variables for configure.
                                                                (line 11)
@@ -5520,7 +5521,7 @@
 * declarations before statements, avoiding: Declarations and definitions.
                                                                (line  6)
 * dependencies, with several output files: Build in parallel.  (line  6)
-* DESTDIR:                               --prefix --bindir ....
+* DESTDIR:                               '--prefix' '--bindir' ....
                                                                (line  9)
 * directories, for installation:         Installation directories.
                                                                (line  6)
@@ -5527,30 +5528,31 @@
 * directories, top-level:                Top-level directories.
                                                                (line  6)
 * discards qualifiers warning:           Const.                (line 30)
-* dist and distcheck targets for make:   Build distribution.   (line  6)
+* 'dist' and 'distcheck' targets for 'make': Build distribution.
+                                                               (line  6)
 * distribution tarball, making:          Build distribution.   (line  6)
 * distro, building for:                  Distro builds.        (line  6)
-* dvipdfm-x:                             Configure options for texk/dvipdfm-x.
+* dvipdfm-x:                             Configure options for 'texk/dvipdfm-x'.
                                                                (line  6)
-* dvipdfmx:                              Configure options for texk/dvipdfm-x.
+* dvipdfmx:                              Configure options for 'texk/dvipdfm-x'.
                                                                (line  6)
-* dvisvgm:                               Configure options for texk/dvisvgm.
+* dvisvgm:                               Configure options for 'texk/dvisvgm'.
                                                                (line  6)
 * engine, building one:                  Build one engine.     (line  6)
-* environment variables, for configure:  Configure options.    (line 16)
-* exec_prefix:                           --enable-multiplatform.
+* environment variables, for 'configure': Configure options.   (line 16)
+* exec_prefix:                           '--enable-multiplatform'.
                                                                (line  6)
 * extending TeX Live:                    Extending TeX Live.   (line  6)
-* extern functions:                      Declarations and definitions.
+* 'extern' functions:                    Declarations and definitions.
                                                                (line 41)
 * failure to build:                      Build problems.       (line  6)
 * flags, macros for library and header:  Macros for library and header flags.
                                                                (line  6)
-* fontconfig library, required by xetex: Prerequisites.        (line 31)
+* 'fontconfig' library, required by 'xetex': Prerequisites.    (line 31)
 * FreeType:                              Prerequisites.        (line 11)
-* freetype cross compiling:              Cross problems.       (line 13)
-* freetype library:                      freetype library.     (line  6)
-* freetype-config:                       freetype library.     (line 13)
+* 'freetype' cross compiling:            Cross problems.       (line 13)
+* freetype library:                      'freetype' library.   (line  6)
+* freetype-config:                       'freetype' library.   (line 13)
 * freetype-config <1>:                   Variables for configure.
                                                                (line 24)
 * FT2_CONFIG:                            Variables for configure.
@@ -5559,14 +5561,14 @@
 * general setup macros:                  General setup macros. (line  6)
 * generic library module, adding:        Adding a new generic library module.
                                                                (line  6)
-* Ghostscript location for Xdvik:        Configure options for texk/xdvik.
+* Ghostscript location for Xdvik:        Configure options for 'texk/xdvik'.
                                                                (line  6)
 * git-svn:                               Transfer from Subversion to Github.
                                                                (line  6)
-* global configure options:              Global configure options.
+* global 'configure' options:            Global configure options.
                                                                (line  6)
-* gmake, required:                       Prerequisites.        (line 11)
-* GNU make, required:                    Prerequisites.        (line 11)
+* 'gmake', required:                     Prerequisites.        (line 11)
+* GNU 'make', required:                  Prerequisites.        (line 11)
 * GNU tools, needed for building:        Build system tools.   (line  6)
 * GNU/Linux distro:                      Distro builds.        (line  6)
 * Gnulib, used for common files:         Top-level directories.
@@ -5579,23 +5581,23 @@
 * ICU_CONFIG:                            Variables for configure.
                                                                (line 22)
 * infrastructure, tools needed for:      Build system tools.   (line  6)
-* inst/ top-level directory:             Top-level directories.
+* 'inst/' top-level directory:           Top-level directories.
                                                                (line 39)
 * install-tl, TeX Live installer:        Installing.           (line  8)
 * installation directories:              Installation directories.
                                                                (line  6)
 * installing:                            Installing.           (line  6)
-* interprocess communication:            Configure options for texk/web2c.
+* interprocess communication:            Configure options for 'texk/web2c'.
                                                                (line 31)
 * introduction:                          Introduction.         (line  6)
-* iteration through sources, by configure and make: Build iteration.
+* iteration through sources, by 'configure' and 'make': Build iteration.
                                                                (line  6)
-* kpathsea library:                      kpathsea library.     (line  6)
-* kpathsea.ac:                           kpathsea library.     (line 18)
-* kpse-libpng-flags.m4:                  png library.          (line 46)
+* kpathsea library:                      'kpathsea' library.   (line  6)
+* kpathsea.ac:                           'kpathsea' library.   (line 18)
+* kpse-libpng-flags.m4:                  'png' library.        (line 46)
 * kpse-pkgs.m4:                          Overview of build system.
                                                                (line 30)
-* kpse-zlib-flags.m4:                    zlib library.         (line  6)
+* kpse-zlib-flags.m4:                    'zlib' library.       (line  6)
 * kpsewhich:                             Variables for configure.
                                                                (line 30)
 * KPSEWHICH:                             Variables for configure.
@@ -5625,7 +5627,7 @@
 * KPSE_LARGEFILE:                        Macros for libraries. (line  8)
 * KPSE_LIBPNG_FLAGS:                     Macros for library and header flags.
                                                                (line 10)
-* KPSE_LIBPNG_FLAGS <1>:                 png library.          (line 46)
+* KPSE_LIBPNG_FLAGS <1>:                 'png' library.        (line 46)
 * kpse_libs_pkgs:                        Adding a new generic library module.
                                                                (line  6)
 * KPSE_LIB_FLAGS:                        Macros for library and header flags.
@@ -5641,10 +5643,10 @@
                                                                (line  6)
 * kpse_texlibs_pkgs:                     Adding a new TeX-specific library module.
                                                                (line 11)
-* KPSE_TRY_LIB:                          png library.          (line 18)
+* KPSE_TRY_LIB:                          'png' library.        (line 18)
 * KPSE_TRY_LIB <1>:                      Adding a new generic library module.
                                                                (line 20)
-* KPSE_TRY_LIBXX:                        png library.          (line 31)
+* KPSE_TRY_LIBXX:                        'png' library.        (line 31)
 * KPSE_TRY_LIBXX <1>:                    Adding a new generic library module.
                                                                (line 20)
 * kpse_utils_pkgs:                       Adding a new program module.
@@ -5654,42 +5656,44 @@
                                                                (line 11)
 * KPSE_WITH_TEXLIB:                      Adding a new TeX-specific library module.
                                                                (line 14)
-* large file support:                    --disable-largefile.  (line  6)
+* large file support:                    '--disable-largefile'.
+                                                               (line  6)
 * LATEX:                                 Variables for configure.
                                                                (line 40)
 * layout of sources:                     Layout and infrastructure.
                                                                (line  6)
-* LFS (large file support):              --disable-largefile.  (line  6)
-* libexpat, dependency of libfontconfig: Configure options for texk/web2c.
+* LFS (large file support):              '--disable-largefile'.
+                                                               (line  6)
+* libexpat, dependency of 'libfontconfig': Configure options for 'texk/web2c'.
                                                                (line 50)
-* libfontconfig, hack for avoiding linking dependencies: Configure options for texk/web2c.
+* libfontconfig, hack for avoiding linking dependencies: Configure options for 'texk/web2c'.
                                                                (line 50)
 * libfreetype:                           Variables for configure.
                                                                (line 24)
-* libfreetype, and const:                Const.                (line 21)
-* libpng library:                        png library.          (line  6)
+* 'libfreetype', and 'const':            Const.                (line 21)
+* libpng library:                        'png' library.        (line  6)
 * library module, generic, adding:       Adding a new generic library module.
                                                                (line  6)
 * library module, TeX-specific, adding:  Adding a new TeX-specific library module.
                                                                (line  6)
 * library modules:                       Library modules.      (line  6)
-* library-specific configure options:    Library-specific configure options.
+* library-specific 'configure' options:  Library-specific configure options.
                                                                (line  6)
-* libsigsegv, required by xindy:         Prerequisites.        (line 35)
+* 'libsigsegv', required by 'xindy':     Prerequisites.        (line 35)
 * libstc++, statically linking:          Macros for compilers. (line 29)
 * Libtool:                               Overview of build system.
                                                                (line  6)
-* libtool, hack for avoiding excessive linking: Configure options for texk/web2c.
+* libtool, hack for avoiding excessive linking: Configure options for 'texk/web2c'.
                                                                (line 50)
-* libXt:                                 Configure options for texk/web2c.
+* libXt:                                 Configure options for 'texk/web2c'.
                                                                (line 22)
 * linked scripts:                        Linked scripts.       (line  6)
 * linking C++ libraries statically:      Macros for compilers. (line 29)
-* lisp.run, lisp.exe:                    Configure options for utils/xindy.
+* lisp.run, lisp.exe:                    Configure options for 'utils/xindy'.
                                                                (line 14)
-* LittleEndian architectures:            Configure options for texk/web2c.
+* LittleEndian architectures:            Configure options for 'texk/web2c'.
                                                                (line 27)
-* m4/ top-level directory:               Top-level directories.
+* 'm4/' top-level directory:             Top-level directories.
                                                                (line 14)
 * macros, for compilers:                 Macros for compilers. (line  6)
 * macros, for libraries:                 Macros for libraries. (line  6)
@@ -5701,23 +5705,23 @@
 * MAKE:                                  Variables for configure.
                                                                (line 33)
 * make -t:                               Build system tools.   (line 43)
-* make rules, verbose vs. silent:        --enable-silent-rules.
+* 'make' rules, verbose vs. silent:      '--enable-silent-rules'.
                                                                (line  6)
-* mf-nowin:                              Configure options for texk/web2c.
+* mf-nowin:                              Configure options for 'texk/web2c'.
                                                                (line 34)
-* mingw32:                               Cross configuring.    (line 27)
+* 'mingw32':                             Cross configuring.    (line 27)
 * MINGW32, Automake conditional:         Macros for Windows.   (line 20)
-* mktex.ac:                              kpathsea library.     (line 18)
-* mktextfm:                              kpathsea library.     (line 18)
+* mktex.ac:                              'kpathsea' library.   (line 18)
+* mktextfm:                              'kpathsea' library.   (line 18)
 * modules, for libraries:                Library modules.      (line  6)
 * modules, for programs:                 Program modules.      (line  6)
-* motif:                                 Configure options for texk/xdvik.
+* motif:                                 Configure options for 'texk/xdvik'.
                                                                (line  9)
 * native cross compilation:              Cross compilation.    (line 10)
 * OBJCXX=OBJC-COMPILER:                  Build one package.    (line 78)
 * one engine, building:                  Build one engine.     (line  6)
 * one package, building:                 Build one package.    (line  6)
-* OpenGL, required for Asymptote:        asymptote.            (line  6)
+* OpenGL, required for Asymptote:        'asymptote'.          (line  6)
 * operating system distribution, building for: Distro builds.  (line  6)
 * otangle:                               Cross problems.       (line 26)
 * overall build process:                 Building.             (line  6)
@@ -5724,19 +5728,21 @@
 * parallel build:                        Build in parallel.    (line  6)
 * paths, for installation:               Installation directories.
                                                                (line  6)
-* PDF files, size of:                    --disable-largefile.  (line 11)
+* PDF files, size of:                    '--disable-largefile'.
+                                                               (line 11)
 * PDFLATEX:                              Variables for configure.
                                                                (line 41)
 * PERL:                                  Variables for configure.
                                                                (line 39)
-* perl, required by web2c, etc.:         Prerequisites.        (line 23)
+* 'perl', required by 'web2c', etc.:     Prerequisites.        (line 23)
 * PKG_CONFIG:                            Variables for configure.
                                                                (line 23)
 * plain.tex, not in source tree:         Installing.           (line  8)
-* png library:                           png library.          (line  6)
-* PostScript files, size of:             --disable-largefile.  (line 11)
+* png library:                           'png' library.        (line  6)
+* PostScript files, size of:             '--disable-largefile'.
+                                                               (line 11)
 * Preining, Norbert:                     Distro builds.        (line 54)
-* preloaded binaries:                    Configure options for texk/web2c.
+* preloaded binaries:                    Configure options for 'texk/web2c'.
                                                                (line 45)
 * prerequisites for building:            Prerequisites.        (line  6)
 * problems with build:                   Build problems.       (line  6)
@@ -5743,20 +5749,21 @@
 * program module, adding:                Adding a new program module.
                                                                (line  6)
 * program modules:                       Program modules.      (line  6)
-* program-specific configure options:    Program-specific configure options.
+* program-specific 'configure' options:  Program-specific configure options.
                                                                (line  6)
-* proxy build system:                    png library.          (line 36)
+* proxy build system:                    'png' library.        (line 36)
 * reautoconf:                            Build system tools.   (line 28)
 * requirements for building:             Prerequisites.        (line  6)
 * runscript.exe:                         Macros for Windows.   (line 25)
 * scripts, linked and not maintained:    Linked scripts.       (line  6)
-* scrolling, smooth:                     Configure options for texk/xdvik.
+* scrolling, smooth:                     Configure options for 'texk/xdvik'.
                                                                (line 13)
 * SED:                                   Variables for configure.
                                                                (line 34)
 * setup macros, general:                 General setup macros. (line  6)
 * shared libraries, using vs. avoiding:  Distro builds.        (line 11)
-* size of PDF and PS files:              --disable-largefile.  (line 11)
+* size of PDF and PS files:              '--disable-largefile'.
+                                                               (line 11)
 * size of source tree:                   Build one package.    (line 53)
 * source code declarations:              Declarations and definitions.
                                                                (line  6)
@@ -5764,8 +5771,8 @@
 * source tree:                           Layout and infrastructure.
                                                                (line  6)
 * squeeze:                               Cross problems.       (line 13)
-* squeeze/configure.ac:                  xdvik package.        (line 14)
-* static functions:                      Declarations and definitions.
+* squeeze/configure.ac:                  'xdvik' package.      (line 14)
+* 'static' functions:                    Declarations and definitions.
                                                                (line 35)
 * static linking for C++:                Macros for compilers. (line 29)
 * stpcpy:                                Declarations and definitions.
@@ -5773,12 +5780,12 @@
 * Subversion repository:                 Build system tools.   (line 38)
 * support files, separate from build:    Installing.           (line  8)
 * symlinks, used for scripts:            Linked scripts.       (line  6)
-* synctex:                               Configure options for texk/web2c.
+* synctex:                               Configure options for 'texk/web2c'.
                                                                (line 59)
-* synctex <1>:                           Configure options for texk/web2c.
+* synctex <1>:                           Configure options for 'texk/web2c'.
                                                                (line 64)
 * system distribution, building for:     Distro builds.        (line  6)
-* t1utils package:                       t1utils package.      (line  6)
+* t1utils package:                       't1utils' package.    (line  6)
 * tangle:                                Cross problems.       (line 26)
 * tests, running:                        Overview of build system.
                                                                (line  6)
@@ -5799,12 +5806,12 @@
 * use-commit-times, Subversion:          Build system tools.   (line 38)
 * variable declarations, in source code: Declarations and definitions.
                                                                (line 52)
-* variables for configure:               Variables for configure.
+* variables for 'configure':             Variables for configure.
                                                                (line  6)
 * warning, discards qualifiers:          Const.                (line 30)
 * WARNING_C[XX]FLAGS:                    Macros for compilers. (line  9)
 * web2c program:                         Cross problems.       (line 13)
-* web2c.ac:                              Configure options for texk/web2c.
+* web2c.ac:                              Configure options for 'texk/web2c'.
                                                                (line 37)
 * wget:                                  Linked scripts.       (line 23)
 * WIN32, Automake conditional:           Macros for Windows.   (line 16)
@@ -5813,33 +5820,33 @@
 * Windows, macros for:                   Macros for Windows.   (line  6)
 * withenable.ac, for new modules:        Adding a new program module.
                                                                (line 14)
-* Work/ top-level directory:             Top-level directories.
+* 'Work/' top-level directory:           Top-level directories.
                                                                (line 39)
 * wrapper binary for scripts on Windows: Linked scripts.       (line  6)
-* wrapper build system:                  freetype library.     (line  6)
-* X toolkit:                             Configure options for texk/web2c.
+* wrapper build system:                  'freetype' library.   (line  6)
+* X toolkit:                             Configure options for 'texk/web2c'.
                                                                (line 22)
 * X11 development, required by X clients: Prerequisites.       (line 27)
-* X11 headers, and const:                Const.                (line 21)
-* xasy:                                  asymptote.            (line  6)
-* xaw:                                   Configure options for texk/xdvik.
+* X11 headers, and 'const':              Const.                (line 21)
+* xasy:                                  'asymptote'.          (line  6)
+* xaw:                                   Configure options for 'texk/xdvik'.
                                                                (line  9)
-* xdvik:                                 xdvik package.        (line  6)
-* xdvik <1>:                             Configure options for texk/xdvik.
+* xdvik:                                 'xdvik' package.      (line  6)
+* xdvik <1>:                             Configure options for 'texk/xdvik'.
                                                                (line  6)
-* xdvipdfmx:                             Configure options for texk/dvipdfm-x.
+* xdvipdfmx:                             Configure options for 'texk/dvipdfm-x'.
                                                                (line  6)
 * xindy:                                 Linked scripts.       (line 23)
-* xindy <1>:                             xindy package.        (line  6)
-* xindy <2>:                             Configure options for utils/xindy.
+* xindy <1>:                             'xindy' package.      (line  6)
+* xindy <2>:                             Configure options for 'utils/xindy'.
                                                                (line  6)
-* xindy cross compiling requires clisp:  Cross problems.       (line 33)
-* XInput:                                Configure options for texk/xdvik.
+* 'xindy' cross compiling requires 'clisp': Cross problems.    (line 33)
+* XInput:                                Configure options for 'texk/xdvik'.
                                                                (line 13)
-* Xlib:                                  Configure options for texk/web2c.
+* Xlib:                                  Configure options for 'texk/web2c'.
                                                                (line 22)
 * xz:                                    Linked scripts.       (line 23)
-* zlib library:                          zlib library.         (line  6)
+* zlib library:                          'zlib' library.       (line  6)
 
 
 
@@ -5854,396 +5861,391 @@
 Node: Build in parallel11471
 Node: Build distribution12075
 Node: Build one package12723
-Node: Build one engine16389
-Node: Cross compilation17438
-Node: Cross configuring18718
-Node: Cross problems20395
-Node: Installing22057
-Node: Installation directories23077
-Node: Linked scripts24895
-Node: Distro builds26386
-Node: Layout and infrastructure28762
-Node: Build system tools29593
-Node: Top-level directories31810
-Node: Autoconf macros34046
-Node: General setup macros34808
-Node: Macros for programs35683
-Node: Macros for compilers36484
-Node: Macros for libraries37892
-Node: Macros for library and header flags38318
-Node: Macros for Windows40229
-Node: Library modules41816
-Node: png library42305
-Node: zlib library44653
-Node: freetype library45168
-Node: kpathsea library45864
-Node: Program modules47243
-Node: t1utils package47671
-Node: xindy package48216
-Node: xdvik package49330
-Node: asymptote50389
-Node: Extending TeX Live50885
-Node: Adding a new program module51668
-Node: Adding a new generic library module55007
-Node: Adding a new TeX-specific library module57236
-Node: Configure options57934
-Node: Global configure options59315
-Node: --disable-native-texlive-build59857
-Node: --prefix --bindir ...60819
-Node: --disable-largefile61359
-Node: --disable-missing61901
-Node: --enable-compiler-warnings=LEVEL62302
-Node: --enable-cxx-runtime-hack62958
-Node: --enable-maintainer-mode63378
-Node: --enable-multiplatform63907
-Node: --enable-shared64480
-Node: --enable-silent-rules64851
-Node: --without-ln-s65303
-Node: --without-x65650
-Node: Program-specific configure options65838
-Node: --enable-PROG --disable-PROG66481
-Node: --disable-all-pkgs66754
-Node: Configure options for texk/web2c67537
-Node: Configure options for texk/bibtex-x70075
-Node: Configure options for texk/dvipdfm-x70618
-Node: Configure options for texk/dvisvgm71394
-Node: Configure options for texk/texlive72275
-Node: Configure options for texk/xdvik72696
-Node: Configure options for utils/xindy73317
-Node: Library-specific configure options74207
-Node: Configure options for kpathsea75168
-Node: Variables for configure75872
-Node: Coding conventions77298
-Node: Declarations and definitions78013
-Node: Const80187
-Node: Continuous integration82051
-Node: Transfer from Subversion to Github82715
-Node: Automatic update of the Git mirror84877
-Node: CI testing on Travis-CI85459
-Node: Releases on Github86168
-Node: install-tl86608
-Node: install-tl NAME86977
-Node: install-tl SYNOPSIS87135
-Node: install-tl DESCRIPTION87393
-Node: install-tl REFERENCES88453
-Node: install-tl OPTIONS88977
-Ref: install-tl *-gui* [[=]_module_]89318
-Ref: install-tl text89526
-Ref: install-tl tcl89646
-Ref: install-tl wizard89988
-Ref: install-tl expert90121
-Ref: install-tl perltk90243
-Ref: install-tl *-no-gui*90789
-Ref: install-tl *-lang* _llcode_90879
-Ref: install-tl *-repository* _url|path_91635
-Ref: install-tl *-select-repository*92523
-Ref: install-tl *-all-options*92959
-Ref: install-tl *-custom-bin* _path_93214
-Ref: install-tl *-debug-translation*94048
-Ref: install-tl *-force-platform* _platform_94267
-Ref: install-tl *-help*, *--help*, *-?*94511
-Ref: install-tl *-in-place*94924
-Ref: install-tl *-init-from-profile* _profile_file_95469
-Ref: install-tl *-logfile* _file_95738
-Ref: install-tl *-no-cls*96089
-Ref: install-tl *-no-persistent-downloads*96237
-Ref: install-tl *-persistent-downloads*96262
-Ref: install-tl *-no-verify-downloads*96880
-Ref: install-tl *-non-admin*97243
-Ref: install-tl *-portable*97336
-Ref: install-tl *-print-platform*97475
-Ref: install-tl *-profile* _profile_file_97673
-Ref: install-tl *-q*97894
-Ref: install-tl *-scheme* _scheme_97956
-Ref: install-tl *-v*98430
-Ref: install-tl *-version*, *--version*98585
-Node: install-tl PROFILES98719
-Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)101585
-Ref: install-tl instopt_adjustrepo (default 1)101661
-Ref: install-tl instopt_letter (default 0)101798
-Ref: install-tl instopt_portable (default 0)101889
-Ref: install-tl instopt_write18_restricted (default 1)101985
-Node: install-tl ENVIRONMENT VARIABLES103324
-Ref: install-tl TEXLIVE_DOWNLOADER103702
-Ref: install-tl TL_DOWNLOAD_PROGRAM103725
-Ref: install-tl TL_DOWNLOAD_ARGS103745
-Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK103949
-Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE104151
-Ref: install-tl TEXLIVE_INSTALL_NO_IMPORT104260
-Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME104412
-Ref: install-tl TEXLIVE_INSTALL_PREFIX104534
-Ref: install-tl TEXLIVE_INSTALL_TEXDIR104560
-Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG104591
-Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR104619
-Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME104648
-Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL104678
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG104712
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR104743
-Ref: install-tl NOPERLDOC105114
-Node: install-tl AUTHORS AND COPYRIGHT105178
-Node: tlmgr105591
-Node: tlmgr NAME106076
-Node: tlmgr SYNOPSIS106208
-Node: tlmgr DESCRIPTION106398
-Node: tlmgr EXAMPLES107497
-Ref: tlmgr tlmgr option repository ctan107748
-Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet107820
-Ref: tlmgr tlmgr update --list108425
-Ref: tlmgr tlmgr update --all108518
-Ref: tlmgr tlmgr info _what_108675
-Node: tlmgr OPTIONS108937
-Ref: tlmgr *--repository* _url|path_109457
-Ref: tlmgr /some/local/dir110643
-Ref: tlmgr file:/some/local/dir110672
-Ref: tlmgr ctan110745
-Ref: tlmgr http://mirror.ctan.org/systems/texlive/tlnet110798
-Ref: tlmgr http://server/path/to/tlnet111139
-Ref: tlmgr https://server/path/to/tlnet111520
-Ref: tlmgr ftp://server/path/to/tlnet111988
-Ref: tlmgr user at machine:/path/to/tlnet112120
-Ref: tlmgr scp://user@machine/path/to/tlnet112161
-Ref: tlmgr ssh://user@machine/path/to/tlnet112202
-Ref: tlmgr *--gui* [_action_]112595
-Ref: tlmgr *--gui-lang* _llcode_113408
-Ref: tlmgr *--debug-translation*114144
-Ref: tlmgr *--machine-readable*114347
-Ref: tlmgr *--no-execute-actions*114615
-Ref: tlmgr *--package-logfile* _file_114808
-Ref: tlmgr *--pause*115062
-Ref: tlmgr *--persistent-downloads*115217
-Ref: tlmgr *--no-persistent-downloads*115245
-Ref: tlmgr *--pin-file*115739
-Ref: tlmgr *--usermode*115957
-Ref: tlmgr *--usertree* _dir_116077
-Ref: tlmgr *--verify-repo=[none|main|all]*116203
-Node: tlmgr ACTIONS117102
-Node: tlmgr help117963
-Node: tlmgr version118440
-Node: tlmgr backup118703
-Ref: tlmgr *backup [_option_...] --all*118874
-Ref: tlmgr *backup [_option_...] _pkg_...*118907
-Ref: tlmgr *--backupdir* _directory_119973
-Ref: tlmgr *--all*120190
-Ref: tlmgr *--clean*[=_N_]120442
-Ref: tlmgr *--dry-run*120769
-Node: tlmgr candidates _pkg_120899
-Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]121254
-Ref: tlmgr *depends*121768
-Ref: tlmgr *executes*122110
-Ref: tlmgr *files*122225
-Ref: tlmgr *runfiles*122361
-Ref: tlmgr *texmfdbs*122498
-Ref: tlmgr - all items in TEXMFDBS have the !! prefix.122728
-Ref: tlmgr - all items in TEXMFBDS have an ls-R file (if they exist at all).122804
-Ref: tlmgr - all items in TEXMF with !! are listed in TEXMFDBS.122869
-Ref: tlmgr - all items in TEXMF with an ls-R file are listed in TEXMFDBS.122944
-Ref: tlmgr *--use-svn*122969
-Node: tlmgr conf123110
-Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*123398
-Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*123462
-Node: tlmgr dump-tlpdb [_option_...] [--json]125877
-Ref: tlmgr *--local*126310
-Ref: tlmgr *--remote*126349
-Ref: tlmgr *--json*126387
-Node: tlmgr generate126958
-Ref: tlmgr *generate [_option_...] language*127154
-Ref: tlmgr *generate [_option_...] language.dat*127193
-Ref: tlmgr *generate [_option_...] language.def*127232
-Ref: tlmgr *generate [_option_...] language.dat.lua*127275
-Ref: tlmgr *--dest* _output_file_129602
-Ref: tlmgr *--localcfg* _local_conf_file_130178
-Ref: tlmgr *--rebuild-sys*130301
-Node: tlmgr gui131116
-Node: tlmgr info131294
-Ref: tlmgr *info [_option_...] _pkg_...*131456
-Ref: tlmgr *info [_option_...] collections*131490
-Ref: tlmgr *info [_option_...] schemes*131520
-Ref: tlmgr *--list*133050
-Ref: tlmgr *--only-installed*133364
-Ref: tlmgr *--only-remote*133552
-Ref: tlmgr *--data item1,item2,...*133856
-Ref: tlmgr *--json* 1134437
-Node: tlmgr init-usertree134820
-Node: tlmgr install [_option_...] _pkg_...135201
-Ref: tlmgr *--dry-run* 1135709
-Ref: tlmgr *--file*135826
-Ref: tlmgr *--force*136048
-Ref: tlmgr *--no-depends*136268
-Ref: tlmgr *--no-depends-at-all*136427
-Ref: tlmgr *--reinstall*136827
-Ref: tlmgr *--with-doc*137205
-Ref: tlmgr *--with-src*137218
-Node: tlmgr key137946
-Ref: tlmgr *key list*138104
-Ref: tlmgr *key add _file_*138122
-Ref: tlmgr *key remove _keyid_*138144
-Node: tlmgr list138738
-Node: tlmgr option138900
-Ref: tlmgr *option [--json] [show]*139055
-Ref: tlmgr *option [--json] showall|help*139086
-Ref: tlmgr *option _key_ [_value_]*139112
-Node: tlmgr paper143690
-Ref: tlmgr *paper [a4|letter]*143839
-Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>143915
-Ref: tlmgr *paper --json*143930
-Node: tlmgr path145145
-Ref: tlmgr *path [--w32mode=user|admin] add*145306
-Ref: tlmgr *path [--w32mode=user|admin] remove*145343
-Node: tlmgr pinning146828
-Ref: tlmgr pinning show147069
-Ref: tlmgr pinning add _repo_ _pkgglob_...147142
-Ref: tlmgr pinning remove _repo_ _pkgglob_...147261
-Ref: tlmgr pinning remove _repo_ --all147414
-Node: tlmgr platform147468
-Ref: tlmgr *platform list|add|remove _platform_...*147654
-Ref: tlmgr *platform set _platform_*147681
-Ref: tlmgr *platform set auto*147702
-Ref: tlmgr *--dry-run* 2148579
-Node: tlmgr postaction148698
-Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*148928
-Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*149002
-Ref: tlmgr *--w32mode=[user|admin]*149317
-Ref: tlmgr *--fileassocmode=[1|2]*149733
-Ref: tlmgr *--all* 1150018
-Node: tlmgr print-platform150073
-Node: tlmgr print-platform-info150404
-Node: tlmgr remove [_option_...] _pkg_...150704
-Ref: tlmgr *--all* 2151188
-Ref: tlmgr *--backup*151298
-Ref: tlmgr *--backupdir* _directory_ 1151324
-Ref: tlmgr *--no-depends* 1151729
-Ref: tlmgr *--no-depends-at-all* 1151791
-Ref: tlmgr *--force* 1151894
-Ref: tlmgr *--dry-run* 3152367
-Node: tlmgr repository152703
-Ref: tlmgr *repository list*152891
-Ref: tlmgr *repository list _path|url|tag_*152925
-Ref: tlmgr *repository add _path_ [_tag_]*152958
-Ref: tlmgr *repository remove _path|tag_*152990
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*153044
-Ref: tlmgr *repository status*153065
-Ref: tlmgr The tag (which can be the same as the url);154292
-Node: tlmgr restore154770
-Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*154949
-Ref: tlmgr *restore [_option_...] --all*154979
-Ref: tlmgr *--all* 3155679
-Ref: tlmgr *--backupdir* _directory_ 2155893
-Ref: tlmgr *--dry-run* 4156074
-Ref: tlmgr *--force* 2156206
-Ref: tlmgr *--json* 2156252
-Node: tlmgr search156579
-Ref: tlmgr *search [_option_...] _what_*156743
-Ref: tlmgr *search [_option_...] --file _what_*156780
-Ref: tlmgr *search [_option_...] --all _what_*156816
-Ref: tlmgr *--file* 1157036
-Ref: tlmgr *--all* 4157098
-Ref: tlmgr *--global*157187
-Ref: tlmgr *--word*157314
-Node: tlmgr shell157629
-Ref: tlmgr protocol158364
-Ref: tlmgr help 1158428
-Ref: tlmgr version 1158481
-Ref: tlmgr quit, end, bye, byebye, EOF158549
-Ref: tlmgr restart158570
-Ref: tlmgr load [local|remote]158693
-Ref: tlmgr save158763
-Ref: tlmgr get [_var_] =item set [_var_ [_val_]]158886
-Node: tlmgr show159487
-Node: tlmgr uninstall159654
-Node: tlmgr update [_option_...] [_pkg_...]159884
-Ref: tlmgr *--all* 5160255
-Ref: tlmgr *--self*162434
-Ref: tlmgr *--dry-run* 5163198
-Ref: tlmgr *--list* [_pkg_]163375
-Ref: tlmgr *--exclude* _pkg_164064
-Ref: tlmgr *--no-auto-remove* [_pkg_...]164864
-Ref: tlmgr *--no-auto-install* [_pkg_...]165348
-Ref: tlmgr *--reinstall-forcibly-removed*166110
-Ref: tlmgr *--backup* 1166645
-Ref: tlmgr *--backupdir* _directory_ 3166671
-Ref: tlmgr *--no-depends* 2167837
-Ref: tlmgr *--no-depends-at-all* 2168040
-Ref: tlmgr *--force* 3168143
-Node: tlmgr CONFIGURATION FILE FOR TLMGR169163
-Ref: tlmgr auto-remove, value 0 or 1 (default 1), same as command-line option.170170
-Ref: tlmgr gui-expertmode, value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.170307
-Ref: tlmgr gui-lang _llcode_, with a language code value as with the command-line option.170389
-Ref: tlmgr no-checksums, value 0 or 1 (default 0, see below).170443
-Ref: tlmgr persistent-downloads, value 0 or 1 (default 1), same as command-line option.170523
-Ref: tlmgr require-verification, value 0 or 1 (default 0), same as command-line option.170603
-Ref: tlmgr update-exclude, value: comma-separated list of packages (no space allowed). Same as the command line option --exclude for the action update.170751
-Ref: tlmgr verify-downloads, value 0 or 1 (default 1), same as command-line option.170827
-Ref: tlmgr allowed-actions _action1_ [,_action_,...] The value is a comma-separated list of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode).171096
-Node: tlmgr CRYPTOGRAPHIC VERIFICATION172184
-Node: tlmgr Configuration of GnuPG invocation174357
-Node: tlmgr USER MODE174995
-Node: tlmgr User mode install177841
-Node: tlmgr User mode backup, restore, remove, update178985
-Node: tlmgr User mode generate, option, paper179427
-Node: tlmgr MULTIPLE REPOSITORIES179803
-Node: tlmgr Pinning181532
-Node: tlmgr GUI FOR TLMGR183455
-Node: tlmgr Main display185104
-Node: tlmgr Display configuration area185356
-Ref: tlmgr Status185717
-Ref: tlmgr Category185881
-Ref: tlmgr Match186067
-Ref: tlmgr Selection186248
-Ref: tlmgr Display configuration buttons186452
-Node: tlmgr Package list area186635
-Ref: tlmgr a checkbox187219
-Ref: tlmgr package name187355
-Ref: tlmgr local revision (and version)187454
-Ref: tlmgr remote revision (and version)187829
-Ref: tlmgr short description188126
-Node: tlmgr Main display action buttons188171
-Ref: tlmgr Update all installed188437
-Ref: tlmgr Update188809
-Ref: tlmgr Install188859
-Ref: tlmgr Remove189045
-Ref: tlmgr Backup189223
-Node: tlmgr Menu bar189380
-Ref: tlmgr tlmgr menu189603
-Ref: tlmgr Options menu189911
-Ref: tlmgr Actions menu190994
-Ref: tlmgr Help menu191422
-Node: tlmgr GUI options191556
-Ref: tlmgr -background _color_191802
-Ref: tlmgr -font " _fontname_ _fontsize_ "191867
-Ref: tlmgr -foreground _color_192025
-Ref: tlmgr -geometry _geomspec_192077
-Ref: tlmgr -xrm _xresource_192269
-Node: tlmgr MACHINE-READABLE OUTPUT192538
-Node: tlmgr Machine-readable update and install output193348
-Ref: tlmgr location-url _location_194624
-Ref: tlmgr total-bytes _count_194840
-Ref: tlmgr _pkgname_195250
-Ref: tlmgr _status_195460
-Ref: tlmgr d195538
-Ref: tlmgr f195598
-Ref: tlmgr u195777
-Ref: tlmgr r195823
-Ref: tlmgr a195946
-Ref: tlmgr i196124
-Ref: tlmgr I196243
-Ref: tlmgr _localrev_196345
-Ref: tlmgr _serverrev_196452
-Ref: tlmgr _size_196564
-Ref: tlmgr _runtime_196733
-Ref: tlmgr _esttot_196803
-Node: tlmgr Machine-readable option output196836
-Node: tlmgr ENVIRONMENT VARIABLES197348
-Ref: tlmgr TEXLIVE_COMPRESSOR197859
-Ref: tlmgr TEXLIVE_DOWNLOADER198707
-Ref: tlmgr TL_DOWNLOAD_PROGRAM198730
-Ref: tlmgr TL_DOWNLOAD_ARGS198750
-Ref: tlmgr TEXLIVE_PREFER_OWN199776
-Node: tlmgr AUTHORS AND COPYRIGHT200600
-Node: Index200998
+Node: Build one engine16391
+Node: Cross compilation17440
+Node: Cross configuring18720
+Node: Cross problems20397
+Node: Installing22059
+Node: Installation directories23079
+Node: Linked scripts24897
+Node: Distro builds26388
+Node: Layout and infrastructure28764
+Node: Build system tools29595
+Node: Top-level directories31812
+Node: Autoconf macros34048
+Node: General setup macros34810
+Node: Macros for programs35685
+Node: Macros for compilers36486
+Node: Macros for libraries37894
+Node: Macros for library and header flags38320
+Node: Macros for Windows40231
+Node: Library modules41818
+Node: 'png' library42315
+Node: 'zlib' library44667
+Node: 'freetype' library45188
+Node: 'kpathsea' library45890
+Node: Program modules47273
+Node: 't1utils' package47709
+Node: 'xindy' package48258
+Node: 'xdvik' package49378
+Node: 'asymptote'50443
+Node: Extending TeX Live50943
+Node: Adding a new program module51726
+Node: Adding a new generic library module55065
+Node: Adding a new TeX-specific library module57294
+Node: Configure options57992
+Node: Global configure options59373
+Node: '--disable-native-texlive-build'59941
+Node: '--prefix' '--bindir' ...60909
+Node: '--disable-largefile'61457
+Node: '--disable-missing'62007
+Node: '--enable-compiler-warnings='LEVEL62414
+Node: '--enable-cxx-runtime-hack'63076
+Node: '--enable-maintainer-mode'63502
+Node: '--enable-multiplatform'64037
+Node: '--enable-shared'64616
+Node: '--enable-silent-rules'64993
+Node: '--without-ln-s'65451
+Node: '--without-x'65804
+Node: Program-specific configure options65996
+Node: '--enable-PROG' '--disable-PROG'66659
+Node: '--disable-all-pkgs'66938
+Node: Configure options for 'texk/web2c'67729
+Node: Configure options for 'texk/bibtex-x'70273
+Node: Configure options for 'texk/dvipdfm-x'70822
+Node: Configure options for 'texk/dvisvgm'71604
+Node: Configure options for 'texk/texlive'72491
+Node: Configure options for 'texk/xdvik'72918
+Node: Configure options for 'utils/xindy'73545
+Node: Library-specific configure options74439
+Node: Configure options for 'kpathsea'75402
+Node: Variables for configure76110
+Node: Coding conventions77536
+Node: Declarations and definitions78251
+Node: Const80425
+Node: Continuous integration82289
+Node: Transfer from Subversion to Github82953
+Node: Automatic update of the Git mirror85115
+Node: CI testing on Travis-CI85697
+Node: Releases on Github86406
+Node: install-tl86846
+Node: install-tl NAME87215
+Node: install-tl SYNOPSIS87373
+Node: install-tl DESCRIPTION87631
+Node: install-tl REFERENCES88691
+Node: install-tl OPTIONS89215
+Ref: install-tl *-gui* [[=]_module_]89556
+Ref: install-tl 'text'89764
+Ref: install-tl 'tcl'89884
+Ref: install-tl 'wizard'90226
+Ref: install-tl 'expert'90359
+Ref: install-tl 'perltk'90481
+Ref: install-tl *-no-gui*91027
+Ref: install-tl *-lang* _llcode_91117
+Ref: install-tl *-repository* _url|path_91873
+Ref: install-tl *-select-repository*92761
+Ref: install-tl *-all-options*93197
+Ref: install-tl *-custom-bin* _path_93452
+Ref: install-tl *-debug-translation*94286
+Ref: install-tl *-force-platform* _platform_94505
+Ref: install-tl *-help*, *--help*, *-?*94749
+Ref: install-tl *-in-place*95162
+Ref: install-tl *-init-from-profile* _profile_file_95707
+Ref: install-tl *-logfile* _file_95976
+Ref: install-tl *-no-cls*96327
+Ref: install-tl *-no-persistent-downloads*96475
+Ref: install-tl *-persistent-downloads*96500
+Ref: install-tl *-no-verify-downloads*97118
+Ref: install-tl *-non-admin*97481
+Ref: install-tl *-portable*97574
+Ref: install-tl *-print-platform*97713
+Ref: install-tl *-profile* _profile_file_97911
+Ref: install-tl *-q*98132
+Ref: install-tl *-scheme* _scheme_98194
+Ref: install-tl *-v*98668
+Ref: install-tl *-version*, *--version*98823
+Node: install-tl PROFILES98957
+Ref: install-tl 'instopt_adjustpath' (default 0 on Unix, 1 on Windows)101823
+Ref: install-tl 'instopt_adjustrepo' (default 1)101899
+Ref: install-tl 'instopt_letter' (default 0)102036
+Ref: install-tl 'instopt_portable' (default 0)102127
+Ref: install-tl 'instopt_write18_restricted' (default 1)102223
+Node: install-tl ENVIRONMENT VARIABLES103562
+Ref: install-tl 'TEXLIVE_DOWNLOADER'103940
+Ref: install-tl 'TL_DOWNLOAD_PROGRAM'103963
+Ref: install-tl 'TL_DOWNLOAD_ARGS'103983
+Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'104187
+Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'104389
+Ref: install-tl 'TEXLIVE_INSTALL_NO_IMPORT'104498
+Ref: install-tl 'TEXLIVE_INSTALL_NO_WELCOME'104650
+Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'104772
+Ref: install-tl 'TEXLIVE_INSTALL_TEXDIR'104798
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'104829
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'104857
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'104886
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'104916
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'104950
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'104981
+Ref: install-tl 'NOPERLDOC'105352
+Node: install-tl AUTHORS AND COPYRIGHT105416
+Node: tlmgr105829
+Node: tlmgr NAME106314
+Node: tlmgr SYNOPSIS106446
+Node: tlmgr DESCRIPTION106636
+Node: tlmgr EXAMPLES107735
+Ref: tlmgr 'tlmgr option repository ctan'107986
+Ref: tlmgr 'tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet'108058
+Ref: tlmgr 'tlmgr update --list'108663
+Ref: tlmgr 'tlmgr update --all'108756
+Ref: tlmgr 'tlmgr info' _what_108913
+Node: tlmgr OPTIONS109175
+Ref: tlmgr *--repository* _url|path_109695
+Ref: tlmgr '/some/local/dir'110881
+Ref: tlmgr 'file:/some/local/dir'110910
+Ref: tlmgr 'ctan'110983
+Ref: tlmgr 'http://mirror.ctan.org/systems/texlive/tlnet'111036
+Ref: tlmgr 'http://server/path/to/tlnet'111377
+Ref: tlmgr 'https://server/path/to/tlnet'111758
+Ref: tlmgr 'ftp://server/path/to/tlnet'112226
+Ref: tlmgr 'user at machine:/path/to/tlnet'112358
+Ref: tlmgr 'scp://user@machine/path/to/tlnet'112399
+Ref: tlmgr 'ssh://user@machine/path/to/tlnet'112440
+Ref: tlmgr *--gui* [_action_]112833
+Ref: tlmgr *--gui-lang* _llcode_113646
+Ref: tlmgr *--debug-translation*114382
+Ref: tlmgr *--machine-readable*114585
+Ref: tlmgr *--no-execute-actions*114853
+Ref: tlmgr *--package-logfile* _file_115046
+Ref: tlmgr *--pause*115300
+Ref: tlmgr *--persistent-downloads*115455
+Ref: tlmgr *--no-persistent-downloads*115483
+Ref: tlmgr *--pin-file*115977
+Ref: tlmgr *--usermode*116195
+Ref: tlmgr *--usertree* _dir_116315
+Ref: tlmgr *--verify-repo=[none|main|all]*116441
+Node: tlmgr ACTIONS117340
+Node: tlmgr help118201
+Node: tlmgr version118678
+Node: tlmgr backup118941
+Ref: tlmgr *backup [_option_...] --all*119112
+Ref: tlmgr *backup [_option_...] _pkg_...*119145
+Ref: tlmgr *--backupdir* _directory_120211
+Ref: tlmgr *--all*120428
+Ref: tlmgr *--clean*[=_N_]120680
+Ref: tlmgr *--dry-run*121007
+Node: tlmgr candidates _pkg_121137
+Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]121492
+Ref: tlmgr *depends*122006
+Ref: tlmgr *executes*122348
+Ref: tlmgr *files*122463
+Ref: tlmgr *runfiles*122599
+Ref: tlmgr *texmfdbs*122736
+Ref: tlmgr - all items in 'TEXMFDBS' have the '!!' prefix.122966
+Ref: tlmgr - all items in 'TEXMFBDS' have an 'ls-R' file (if they exist at all).123042
+Ref: tlmgr - all items in 'TEXMF' with '!!' are listed in 'TEXMFDBS'.123107
+Ref: tlmgr - all items in 'TEXMF' with an 'ls-R' file are listed in 'TEXMFDBS'.123182
+Ref: tlmgr *--use-svn*123207
+Node: tlmgr conf123348
+Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*123636
+Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*123700
+Node: tlmgr dump-tlpdb [_option_...] [--json]126115
+Ref: tlmgr *--local*126548
+Ref: tlmgr *--remote*126587
+Ref: tlmgr *--json*126625
+Node: tlmgr generate127196
+Ref: tlmgr *generate [_option_...] language*127392
+Ref: tlmgr *generate [_option_...] language.dat*127431
+Ref: tlmgr *generate [_option_...] language.def*127470
+Ref: tlmgr *generate [_option_...] language.dat.lua*127513
+Ref: tlmgr *--dest* _output_file_129840
+Ref: tlmgr *--localcfg* _local_conf_file_130416
+Ref: tlmgr *--rebuild-sys*130539
+Node: tlmgr gui131354
+Node: tlmgr info131532
+Ref: tlmgr *info [_option_...] _pkg_...*131694
+Ref: tlmgr *info [_option_...] collections*131728
+Ref: tlmgr *info [_option_...] schemes*131758
+Ref: tlmgr *--list*133288
+Ref: tlmgr *--only-installed*133602
+Ref: tlmgr *--only-remote*133790
+Ref: tlmgr *--data 'item1,item2,...'*134094
+Ref: tlmgr *--json* 1134675
+Node: tlmgr init-usertree135058
+Node: tlmgr install [_option_...] _pkg_...135439
+Ref: tlmgr *--dry-run* 1135947
+Ref: tlmgr *--file*136064
+Ref: tlmgr *--force*136286
+Ref: tlmgr *--no-depends*136506
+Ref: tlmgr *--no-depends-at-all*136665
+Ref: tlmgr *--reinstall*137065
+Ref: tlmgr *--with-doc*137443
+Ref: tlmgr *--with-src*137456
+Node: tlmgr key138184
+Ref: tlmgr *key list*138342
+Ref: tlmgr *key add _file_*138360
+Ref: tlmgr *key remove _keyid_*138382
+Node: tlmgr list138976
+Node: tlmgr option139138
+Ref: tlmgr *option [--json] [show]*139293
+Ref: tlmgr *option [--json] showall|help*139324
+Ref: tlmgr *option _key_ [_value_]*139350
+Node: tlmgr paper143928
+Ref: tlmgr *paper [a4|letter]*144077
+Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>144153
+Ref: tlmgr *paper --json*144168
+Node: tlmgr path145383
+Ref: tlmgr *path [--w32mode=user|admin] add*145544
+Ref: tlmgr *path [--w32mode=user|admin] remove*145581
+Node: tlmgr pinning147066
+Ref: tlmgr 'pinning show'147307
+Ref: tlmgr 'pinning add' _repo_ _pkgglob_...147380
+Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...147499
+Ref: tlmgr 'pinning remove _repo_ --all'147652
+Node: tlmgr platform147706
+Ref: tlmgr *platform list|add|remove _platform_...*147892
+Ref: tlmgr *platform set _platform_*147919
+Ref: tlmgr *platform set auto*147940
+Ref: tlmgr *--dry-run* 2148817
+Node: tlmgr postaction148936
+Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*149166
+Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*149240
+Ref: tlmgr *--w32mode=[user|admin]*149555
+Ref: tlmgr *--fileassocmode=[1|2]*149971
+Ref: tlmgr *--all* 1150256
+Node: tlmgr print-platform150311
+Node: tlmgr print-platform-info150642
+Node: tlmgr remove [_option_...] _pkg_...150942
+Ref: tlmgr *--all* 2151426
+Ref: tlmgr *--backup*151536
+Ref: tlmgr *--backupdir* _directory_ 1151562
+Ref: tlmgr *--no-depends* 1151967
+Ref: tlmgr *--no-depends-at-all* 1152029
+Ref: tlmgr *--force* 1152132
+Ref: tlmgr *--dry-run* 3152605
+Node: tlmgr repository152941
+Ref: tlmgr *repository list*153129
+Ref: tlmgr *repository list _path|url|tag_*153163
+Ref: tlmgr *repository add _path_ [_tag_]*153196
+Ref: tlmgr *repository remove _path|tag_*153228
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*153282
+Ref: tlmgr *repository status*153303
+Ref: tlmgr The tag (which can be the same as the url);154530
+Node: tlmgr restore155008
+Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*155187
+Ref: tlmgr *restore [_option_...] --all*155217
+Ref: tlmgr *--all* 3155917
+Ref: tlmgr *--backupdir* _directory_ 2156131
+Ref: tlmgr *--dry-run* 4156312
+Ref: tlmgr *--force* 2156444
+Ref: tlmgr *--json* 2156490
+Node: tlmgr search156817
+Ref: tlmgr *search [_option_...] _what_*156981
+Ref: tlmgr *search [_option_...] --file _what_*157018
+Ref: tlmgr *search [_option_...] --all _what_*157054
+Ref: tlmgr *--file* 1157274
+Ref: tlmgr *--all* 4157336
+Ref: tlmgr *--global*157425
+Ref: tlmgr *--word*157552
+Node: tlmgr shell157867
+Ref: tlmgr protocol158602
+Ref: tlmgr help 1158666
+Ref: tlmgr version 1158719
+Ref: tlmgr quit, end, bye, byebye, EOF158787
+Ref: tlmgr restart158808
+Ref: tlmgr load [local|remote]158931
+Ref: tlmgr save159001
+Ref: tlmgr get [_var_] =item set [_var_ [_val_]]159124
+Node: tlmgr show159725
+Node: tlmgr uninstall159892
+Node: tlmgr update [_option_...] [_pkg_...]160122
+Ref: tlmgr *--all* 5160493
+Ref: tlmgr *--self*162672
+Ref: tlmgr *--dry-run* 5163436
+Ref: tlmgr *--list* [_pkg_]163613
+Ref: tlmgr *--exclude* _pkg_164302
+Ref: tlmgr *--no-auto-remove* [_pkg_...]165102
+Ref: tlmgr *--no-auto-install* [_pkg_...]165586
+Ref: tlmgr *--reinstall-forcibly-removed*166348
+Ref: tlmgr *--backup* 1166883
+Ref: tlmgr *--backupdir* _directory_ 3166909
+Ref: tlmgr *--no-depends* 2168075
+Ref: tlmgr *--no-depends-at-all* 2168278
+Ref: tlmgr *--force* 3168381
+Node: tlmgr CONFIGURATION FILE FOR TLMGR169401
+Ref: tlmgr 'auto-remove', value 0 or 1 (default 1), same as command-line option.170408
+Ref: tlmgr 'gui-expertmode', value 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.170545
+Ref: tlmgr 'gui-lang' _llcode_, with a language code value as with the command-line option.170627
+Ref: tlmgr 'no-checksums', value 0 or 1 (default 0, see below).170681
+Ref: tlmgr 'persistent-downloads', value 0 or 1 (default 1), same as command-line option.170761
+Ref: tlmgr 'require-verification', value 0 or 1 (default 0), same as command-line option.170841
+Ref: tlmgr 'update-exclude', value: comma-separated list of packages (no space allowed). Same as the command line option '--exclude' for the action 'update'.170989
+Ref: tlmgr 'verify-downloads', value 0 or 1 (default 1), same as command-line option.171065
+Ref: tlmgr 'allowed-actions' _action1_ [,_action_,...] The value is a comma-separated list of 'tlmgr' actions which are allowed to be executed when 'tlmgr' is invoked in system mode (that is, without '--usermode').171334
+Node: tlmgr CRYPTOGRAPHIC VERIFICATION172422
+Node: tlmgr Configuration of GnuPG invocation174595
+Node: tlmgr USER MODE175233
+Node: tlmgr User mode install178079
+Node: tlmgr User mode backup, restore, remove, update179223
+Node: tlmgr User mode generate, option, paper179665
+Node: tlmgr MULTIPLE REPOSITORIES180041
+Node: tlmgr Pinning181770
+Node: tlmgr GUI FOR TLMGR183693
+Node: tlmgr Main display185342
+Node: tlmgr Display configuration area185594
+Ref: tlmgr Status185955
+Ref: tlmgr Category186119
+Ref: tlmgr Match186305
+Ref: tlmgr Selection186486
+Ref: tlmgr Display configuration buttons186690
+Node: tlmgr Package list area186873
+Ref: tlmgr a checkbox187457
+Ref: tlmgr package name187593
+Ref: tlmgr local revision (and version)187692
+Ref: tlmgr remote revision (and version)188067
+Ref: tlmgr short description188364
+Node: tlmgr Main display action buttons188409
+Ref: tlmgr Update all installed188675
+Ref: tlmgr Update189047
+Ref: tlmgr Install189097
+Ref: tlmgr Remove189283
+Ref: tlmgr Backup189461
+Node: tlmgr Menu bar189618
+Ref: tlmgr 'tlmgr' menu189841
+Ref: tlmgr 'Options menu'190149
+Ref: tlmgr 'Actions menu'191232
+Ref: tlmgr 'Help menu'191660
+Node: tlmgr GUI options191794
+Ref: tlmgr '-background' _color_192040
+Ref: tlmgr '-font "' _fontname_ _fontsize_ '"'192105
+Ref: tlmgr '-foreground' _color_192263
+Ref: tlmgr '-geometry' _geomspec_192315
+Ref: tlmgr '-xrm' _xresource_192507
+Node: tlmgr MACHINE-READABLE OUTPUT192776
+Node: tlmgr Machine-readable 'update' and 'install' output193592
+Ref: tlmgr 'location-url' _location_194874
+Ref: tlmgr 'total-bytes' _count_195090
+Ref: tlmgr _pkgname_195500
+Ref: tlmgr _status_195710
+Ref: tlmgr 'd'195788
+Ref: tlmgr 'f'195848
+Ref: tlmgr 'u'196027
+Ref: tlmgr 'r'196073
+Ref: tlmgr 'a'196196
+Ref: tlmgr 'i'196374
+Ref: tlmgr 'I'196493
+Ref: tlmgr _localrev_196595
+Ref: tlmgr _serverrev_196702
+Ref: tlmgr _size_196814
+Ref: tlmgr _runtime_196983
+Ref: tlmgr _esttot_197053
+Node: tlmgr Machine-readable 'option' output197086
+Node: tlmgr ENVIRONMENT VARIABLES197604
+Ref: tlmgr 'TEXLIVE_COMPRESSOR'198115
+Ref: tlmgr 'TEXLIVE_DOWNLOADER'198963
+Ref: tlmgr 'TL_DOWNLOAD_PROGRAM'198986
+Ref: tlmgr 'TL_DOWNLOAD_ARGS'199006
+Ref: tlmgr 'TEXLIVE_PREFER_OWN'200032
+Node: tlmgr AUTHORS AND COPYRIGHT200856
+Node: Index201254
 
 End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:

Modified: branches/stable/source/src/libs/README
===================================================================
--- branches/stable/source/src/libs/README	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/libs/README	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,4 +1,4 @@
-$Id: README 55138 2020-05-14 17:47:47Z karl $
+$Id: README 55409 2020-06-03 21:59:11Z kakuto $
 Public domain.  Originally created by Karl Berry, 2005.
 
 Libraries we compile for TeX Live.
@@ -25,8 +25,8 @@
   http://sourceforge.net/projects/silgraphite/files/graphite2/
   (requires C++11)
 
-harfbuzz 2.6.4 - checked 30oct19
-  http://www.freedesktop.org/software/harfbuzz/release/
+harfbuzz 2.6.7 - checked 04jun20
+  https://github.com/harfbuzz/harfbuzz/releases/download/2.6.7/
 
 icu 63.1 - checked 8jan19
   http://download.icu-project.org/files/icu4c/

Modified: branches/stable/source/src/texk/README
===================================================================
--- branches/stable/source/src/texk/README	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/README	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,4 +1,4 @@
-$Id: README 54456 2020-03-21 22:04:56Z karl $
+$Id: README 55255 2020-05-24 10:16:15Z ascherer $
 Copyright 2006-2020 TeX Users Group.
 You may freely use, modify and/or distribute this file.
 
@@ -116,7 +116,8 @@
        aleph - maintained here
         ctie - CTAN
         cweb - https://github.com/ascherer/cwebbin
-               (original Knuth, ftp://ftp.cs.stanford.edu/pub/cweb/)
+               (original Knuth, ftp://ftp.cs.stanford.edu/pub/cweb/
+               and ftp://ftp.cs.stanford.edu/pub/ctwill/)
        eptex - https://github.com/texjporg/tex-jp-build
                also: https://osdn.jp/projects/eptex
         etex - maintained here

Modified: branches/stable/source/src/texk/web2c/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/ChangeLog	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/ChangeLog	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,3 +1,40 @@
+2020-06-02  Andreas Scherer  <https://ascherer.github.io>
+
+	* gftopk.ch: Preserve internal section numbering.
+
+2020-05-30  Andreas Scherer  <https://ascherer.github.io>
+
+	* bibtex.ch,
+	* dvicopy.ch,
+	* dvitype.ch,
+	* gftodvi.ch,
+	* gftopk.ch,
+	* gftype.ch,
+	* mft.ch,
+	* pktogf.ch,
+	* pltotf.ch,
+	* tangle.ch,
+	* tftopl.ch,
+	* vftovp.ch,
+	* vptovf.ch,
+	* weave.ch: 'do_nothing' for something; this improves the
+	typographic output of the WEB sources with changes applied.
+
+2020-05-25  Andreas Scherer  <https://ascherer.github.io>
+
+	* bibtex.ch,
+	* mft.ch,
+	* tangle.ch,
+	* weave.ch: Spell checking with 'aspell -l en_US'.
+
+2020-05-24  Andreas Scherer  <https://ascherer.github.io>
+
+	* dvicopy.web,
+	* patgen.web,
+	* pktogf.web,
+	* pktype.web: Update convention to indicate 'not a titlepage, add
+	headline to table-of-contents page.'
+
 2020-05-14  Karl Berry  <karl at freefriends.org>
 
 	* Makefile.am (POPPLER_RULE): remove.

Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/Makefile.in	2020-06-03 23:00:08 UTC (rev 830)
@@ -4551,10 +4551,10 @@
 luahbtex_LDFLAGS = -export-dynamic
 luajithbtex_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
 luatex_postldadd = libmplibcore.a $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) \
-	$(ZLIB_LIBS) $(PPLIB_LIBS) $(LDADD) libmputil.a libunilib.a \
+	$(PPLIB_LIBS) $(ZLIB_LIBS) $(LDADD) libmputil.a libunilib.a \
 	libmd5.a $(lua_socketlibs)
 luahbtex_postldadd = libmplibcore.a $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) \
-	$(ZLIB_LIBS) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) $(PPLIB_LIBS) \
+	$(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) $(PPLIB_LIBS) $(ZLIB_LIBS) \
 	$(LDADD) libmputil.a libunilib.a libmd5.a $(lua_socketlibs)
 luatex_LDADD = libluatex.a libluatexspecific.a libluatex.a libff.a libluamisc.a libluasocket.a libluaffi.a  $(LUA_LIBS) $(luatex_postldadd)
 luajittex_LDADD = libluajittex.a libluajittexspecific.a libluajittex.a libff.a libluajitmisc.a libluajitsocket.a   $(LUAJIT_LIBS) $(luatex_postldadd)
@@ -4634,7 +4634,7 @@
 	$(am__append_111)
 xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
 	$(ICU_LIBS) $(ICU_LIBS_EXTRA) $(TECKIT_LIBS) $(LIBPNG_LIBS) \
-	$(FREETYPE2_LIBS) $(ZLIB_LIBS) $(PPLIB_LIBS) libmd5.a \
+	$(FREETYPE2_LIBS) $(PPLIB_LIBS) $(ZLIB_LIBS) libmd5.a \
 	$(am__append_112)
 xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
 	$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
@@ -18864,7 +18864,7 @@
 synctexdir/synctex.log: synctex$(EXEEXT)
 libmd5/md5.log: md5main$(EXEEXT)
 
-# $Id: Makefile.in 55138 2020-05-14 17:47:47Z karl $
+# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
 # am/bin_links.am: Makefile fragment for bindir links.
 .PHONY: install-bin-links uninstall-bin-links
 

Modified: branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ChangeLog	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/cwebdir/ChangeLog	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,3 +1,24 @@
+2020-06-01  Andreas Scherer  <https://ascherer.github.io>
+
+	* texinputs/pdfwebtocfront.tex: Adapt to 'pwebmac.tex 4.5.2.
+
+2020-05-31  Andreas Scherer  <https://ascherer.github.io>
+
+	* comm-w2c.ch: Sanitize command for PDF outlines.
+
+2020-05-26  Andreas Scherer  <https://ascherer.github.io>
+
+	* texinputs/pdfwebtocfront.tex: Fake headline on page after TOC.
+
+2020-05-23  Andreas Scherer  <https://ascherer.github.io>
+
+	* texinputs/pdfwebtocfront.tex: Add treatment for {pdf,xe}tex.web.
+
+2020-05-22  Andreas Scherer  <https://ascherer.github.io>
+
+	* texinputs/Xcwebmac.tex: Activate alternative assignment operator.
+	* texinputs/pdfwebtocfront.tex: Add comments to the macro code.
+
 2020-05-07  Andreas Scherer  <https://ascherer.github.io>
 
 	* texinputs/Xcwebmac.tex: Amend macros from knuth.drv (n

Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch	2020-06-03 23:00:08 UTC (rev 830)
@@ -18,7 +18,7 @@
 @x
 \def\title{Common code for CTANGLE and CWEAVE (Version 3.64)}
 @y
-\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}}
+\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi
 \def\title{Common code for CTANGLE and CWEAVE (\TeX~Live)}
 @z
 

Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/Xcwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/Xcwebmac.tex	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/Xcwebmac.tex	2020-06-03 23:00:08 UTC (rev 830)
@@ -25,10 +25,11 @@
 % Version 3.64 [p20] --- Andreas Scherer, March 2002
 % Version 3.64 [p21] --- Andreas Scherer, Octobre 2005
 % Version 3.64 [2018] --- Andreas Scherer, Octobre 2018
+% Version 3.64 [2020] --- Andreas Scherer, May 2020
 
 \ifx\undefined\botofcontents\input cwebmac.tex\fi
 
-\xdef\fmtversion{\fmtversion[2018]}
+\xdef\fmtversion{\fmtversion[2020]}
 
 \def\Cpp{\CPLUSPLUS/} % for backward compatibility
 
@@ -37,4 +38,4 @@
 \def\C#1{\5\5\quad$\triangleright\,${\cmntfont#1}$\,\triangleleft$}
 \def\SHC#1{\5\5\quad$\diamond\,${\cmntfont#1}}
 
-%\let\K=\leftarrow % "honest" alternative to standard assignment operator
+\let\K=\leftarrow % "honest" alternative to standard assignment operator

Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,45 +1,65 @@
+% pdfwebtofront.tex
+% Code from knuth.drv in https://github.com/oberdiek/latex-tds
+% 2020/05/30 v1.1 by Andreas Scherer.
 %
-% Move contents page to the front
+% This file is part of project https://github.com/ascherer/cwebbin
+% and may be distributed under the MIT License or the LaTeX Project
+% Public License.
 %
-% Code from knuth.drv in https://github.com/oberdiek/latex-tds
-% Works with pdftex and xetex.
+% Move table-of-contents page to the front in PDF output.
+% Works with pdftex and xetex in connection with either 'webmac.tex'
+% for Pascal/WEB programs or 'cwebmac.tex' for C/CWEB programs.
 %
 \ifx\detokenize\undefined\endinput\fi
+\def\contentsfile{\jobname.toc} % file that gets table of contents info
+\newif\iftexmf\texmffalse % special toc treatment for TeX, Metafont, etc.
 \newread\testread
 \openin\testread=\contentsfile\relax
 \ifeof\testread % First run
 \else % Second run
+  % Redefine '\con' to be invoked before the first '\N' (starred section).
   \let\ORGcon\con
   \def\con{%
-    \ifnum\pageno=1 \global\titletrue\fi
+    \def\:{\par\hangindent 2em} % Fix for 'bibtex.web'.
+    % reduce size of PDF pages for more screen space
+    \pdfpagewidth=\pagewidth  \advance\pdfpagewidth by 2cm
+    \pdfpageheight=\pageheight \advance\pdfpageheight by 3cm
+    \ifpdftex \pdfhorigin=1cm \pdfvorigin=1cm
+    \else \advance\pdfpageheight by 1cm \global\pageshift=-1.54cm
+      \global\hoffset=-1.54cm \global\voffset=-1.54cm \fi
     \begingroup
       \let\end\relax
       \ORGcon
+      % let's start with section '1', the 'Introduction'.
+      \ifx\undefined\gdepth \mark{{{\tensy x}1}{Introduction}} % WEB
+      \else \mark{{{\tensy x}1}0{Introduction}}\fi % CWEB
+      \eject % set '\botmark' on TOC, hence '\topmark' on next page.
     \endgroup
     \let\con\end
   }%
+  % Redefine '\N’ to invoke redefined '\con' before switching back
+  % to original '\N'.
   \expandafter\let\csname ORGN\expandafter\endcsname
                   \csname N\endcsname
   \expandafter\outer\expandafter\def\csname N\endcsname{%
     \con
-    \advance\pageno by -1\relax
     \expandafter\let\csname N\expandafter\endcsname
                     \csname ORGN\endcsname
     \csname N\endcsname
   }%
+  % Special variant of the above for 'mf.web' and 'tex.web'.  They put
+  % their tables-of-contents on a sparse 'page 2' and start on page '3'.
   \begingroup
-    \def\num{0}%
     \edef\x{\jobname}%
     \edef\y{\detokenize{tex}}%
-    \ifx\x\y
-      \def\num{1}%
-    \else
-      \edef\y{\detokenize{mf}}%
-      \ifx\x\y
-        \def\num{1}%
-      \fi
-    \fi
-  \expandafter\endgroup\ifnum\num=1 %
+    \ifx\x\y \texmftrue\else
+    \edef\y{\detokenize{mf}}%
+    \ifx\x\y \texmftrue\else
+    \edef\y{\detokenize{pdftex}}%
+    \ifx\x\y \texmftrue\else
+    \edef\y{\detokenize{xetex}}%
+    \ifx\x\y \texmftrue\fi\fi\fi\fi
+  \expandafter\endgroup\iftexmf %
     \def\contentspagenumber{2}%
     \let\ORGpageno\pageno
     \def\pageno{%
@@ -48,7 +68,6 @@
                       \csname N\endcsname
       \expandafter\outer\expandafter\def\csname N\endcsname{%
         \con
-        \advance\pageno by -1\relax
         \expandafter\let\csname N\expandafter\endcsname
                         \csname ORGN\endcsname
         \csname N\endcsname

Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,3 +1,22 @@
+2020-06-03  Thanh Han The  <hanthethanh at gmail.com>
+
+	* pdftex.web: Initialize save_tail to avoid a value of 0 given at compile
+	time. Remove unnecessary codes. (from Hironobu Yamashita). pdftex r829.
+
+2020-06-02  Thanh Han The  <hanthethanh at gmail.com>
+
+	* pdftex.web (auto_kern): @d=3, rather than "explicit".
+	(Display kern |p|): report auto_kern message; avoid link(r)
+	when r=null. pdftex r828.
+
+2020-05-31  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
+
+	* writepng.c: Suppress a compiler warning: '&&' within '||'
+
+2020-05-15  Akira Kakuto  <kakuto at w32tex.org>
+
+	* pdftoepdf.cc, pdftosrc.cc, NEWS: remove support of poppler.
+
 2020-05-14  Karl Berry  <karl at freefriends.org>
 
 	* pdftoepdf-poppler0.68.0.cc,
@@ -20,7 +39,7 @@
 2020-03-28  Thanh Han The  <hanthethanh at gmail.com>
 
 	* pdftex.web (load_expand_font, vf_def_font): do not call
-	copy_expand_params on null_font.
+	copy_expand_params on null_font. pdftex r823.
 	Original report from Robert Schlicht,
 	https://tug.org/pipermail/tex-live/2020-March/045099.html
 	https://mailman.ntg.nl/pipermail/ntg-pdftex/2020-March/004307.html

Modified: branches/stable/source/src/texk/web2c/pdftexdir/NEWS
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/NEWS	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/pdftexdir/NEWS	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,3 +1,7 @@
+- source: poppler support removed, as it was too hard to keep in sync
+  with upstream. For native TL, pdftex has always used libs/xpdf,
+  which is cut-down and adapted code from xpdf.
+
 pdfTeX 3.14159265-2.6-1.40.21 (TeX Live 2020) (March 27, 2020)
 - changes:
   - new primitive \pdfmajorversion; this merely changes the version
@@ -34,27 +38,7 @@
     range for Unicode; the implication is that multiple code points must
     now be separated by spaces (as has always been documented).
 
-- source: support xpdf-4 by default, or xpdf-3.04, or poppler-0.57.0
-  and older, via #defines.
-  Provide new files:
-  pdftosrc-newpoppler.cc for poppler-0.59.0 upto poppler-0.70.1.
-  pdftosrc-poppler0.71.0 for poppler-0.71.0.
-  pdftosrc-poppler0.72.0 for poppler-0.72.0 upto poppler-0.75.0.
-  pdftosrc-poppler0.76.0 for poppler-0.76.0 upto poppler-0.82.0.
-  pdftosrc-poppler0.83.0 for poppler-0.83.0 and newer. 
-  pdftoepdf-poppler0.68.0.cc for poppler-0.59.0 upto poppler-0.68.0.
-  pdftoepdf-poppler0.69.0.cc for poppler-0.69.0.
-  pdftoepdf-poppler0.70.0.cc for poppler-0.70.0 and poppler-0.70.1.
-  pdftoepdf-poppler0.71.0.cc for poppler-0.71.0.
-  pdftoepdf-poppler0.72.0.cc for poppler-0.72.0 upto poppler-0.74.0.
-  pdftoepdf-poppler0.75.0.cc for poppler-0.75.0.
-  pdftoepdf-poppler0.76.0.cc for poppler-0.76.0 upto poppler-0.82.0.
-  pdftoepdf-poppler0.83.0.cc for poppler-0.83.0 upto poppler-0.85.0.
-  pdftoepdf-poppler0.86.0.cc for poppler-0.86.0 and newer.
-  Note that pdftosrc-*.cc and pdftoepdf-*.cc should be
-  renamed as pdftosrc.cc, and pdftoepdf.cc, respectively, before
-  compilation. Further, POPPLER_VERSION should be defined properly
-  like -DPOPPLER_VERSION='"0.86.0"'.
+- source: support xpdf-4 by default, or xpdf-3.04, via #defines.
 
 ---------------------------------------------------------------
 pdfTeX 3.14159265-2.6-1.40.18 (TeX Live 2017)  (April 27, 2017)

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf.cc	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf.cc	2020-06-03 23:00:08 UTC (rev 830)
@@ -31,19 +31,10 @@
 #include <string.h>
 #include <ctype.h>
 
-#ifdef POPPLER_VERSION
-#include <dirent.h>
-#include <poppler-config.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
-#define GString GooString
-#else
 #include <aconf.h>
 #include <GString.h>
 #include <gmem.h>
 #include <gfile.h>
-#endif
 #include <assert.h>
 
 #include "Object.h"
@@ -682,11 +673,7 @@
     }
     for (r = encodingList; r != 0; r = n) {
         n = r->next;
-#ifdef POPPLER_VERSION
-        r->font->decRefCnt();
-#else
         delete r->font;
-#endif
         delete r;
     }
 }
@@ -725,11 +712,7 @@
     PdfDocument *pdf_doc;
     Page *page;
     PDFRectangle *pagebox;
-#ifdef POPPLER_VERSION
-    int pdf_major_version_found, pdf_minor_version_found;
-#else
     float pdf_version_found, pdf_version_wanted;
-#endif
     // initialize
     if (!isInit) {
         globalParams = new GlobalParams();
@@ -744,22 +727,6 @@
     // this works only for PDF 1.x -- but since any versions of PDF newer
     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
     // then have to changed drastically anyway.
-#ifdef POPPLER_VERSION
-    pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
-    pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
-    if ((pdf_major_version_found > major_pdf_version_wanted)
-     || (pdf_minor_version_found > minor_pdf_version_wanted)) {
-        const char *msg =
-            "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed";
-        if (pdf_inclusion_errorlevel > 0) {
-            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
-        } else if (pdf_inclusion_errorlevel < 0) {
-            ; /* do nothing */
-        } else { /* = 0, give warning */
-            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
-        }
-    }
-#else
     pdf_version_found = pdf_doc->doc->getPDFVersion();
     pdf_version_wanted = major_pdf_version_wanted + (minor_pdf_version_wanted * 0.1);
     if (pdf_version_found > pdf_version_wanted + 0.01) {
@@ -773,7 +740,6 @@
             pdftex_warn(msg, pdf_version_found, pdf_version_wanted);
         }
     }
-#endif
     epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
     if (page_name) {
         // get page by name

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.cc	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.cc	2020-06-03 23:00:08 UTC (rev 830)
@@ -24,19 +24,10 @@
 #include <string.h>
 #include <ctype.h>
 
-#ifdef POPPLER_VERSION
-#define GString GooString
-#define xpdfVersion POPPLER_VERSION
-#include <dirent.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
-#else
 #include <aconf.h>
 #include <GString.h>
 #include <gmem.h>
 #include <gfile.h>
-#endif
 #include <assert.h>
 
 #include "Object.h"
@@ -181,7 +172,7 @@
                     obj1.free();
                     obj2.free();
                 }
-#if defined(POPPLER_VERSION) || defined(XPDF304)
+#if defined(XPDF304)
                 while (str->getChar() != EOF) ;
 #else /* xpdf 4.00 */
                 lexer->skipToEOF();

Modified: branches/stable/source/src/texk/web2c/pdftexdir/writepng.c
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/writepng.c	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/pdftexdir/writepng.c	2020-06-03 23:00:08 UTC (rev 830)
@@ -71,7 +71,7 @@
         pdftex_fail("unsupported type of color_type <%i>",
                     png_get_color_type(png_ptr(img), png_info(img)));
     }
-    if (fixedpdfmajorversion > 1 || fixedpdfminorversion >= 4
+    if ((fixedpdfmajorversion > 1 || fixedpdfminorversion >= 4)
         && (png_get_color_type(png_ptr(img), png_info(img)) == PNG_COLOR_TYPE_GRAY_ALPHA
             || png_get_color_type(png_ptr(img), png_info(img)) == PNG_COLOR_TYPE_RGB_ALPHA)) {
         /* png with alpha channel in device colours; we have to add a Page

Modified: branches/stable/source/src/texk/web2c/tangle.ch
===================================================================
--- branches/stable/source/src/texk/web2c/tangle.ch	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/tangle.ch	2020-06-03 23:00:08 UTC (rev 830)
@@ -242,7 +242,7 @@
 @d parametric2=4 {second type of parametric macros have this |ilk|}
 @z
 
- at x [50] unambig_length is a variabe now
+ at x [50] unambig_length is a variable now
 @!chopped_id:array [0..unambig_length] of ASCII_code; {chopped identifier}
 @y
 @!chopped_id:array [0..max_id_length] of ASCII_code; {chopped identifier}
@@ -670,7 +670,7 @@
     getopt_return_val := getopt_long_only (argc, argv, '', long_options,
                                            address_of (option_index));
     if getopt_return_val = -1 then begin
-      {End of arguments; we exit the loop below.} ;
+      do_nothing; {End of arguments; we exit the loop below.}
 
     end else if getopt_return_val = "?" then begin
       usage (my_name);
@@ -787,7 +787,7 @@
 long_options[current_option].val := 0;
 incr (current_option);
 
-@ Strict comparisions.
+@ Strict comparisons.
 @.-strict@>
 
 @<Define the option...@> =
@@ -797,7 +797,7 @@
 long_options[current_option].val := 0;
 incr (current_option);
 
-@ Loose comparisions.
+@ Loose comparisons.
 @.-loose@>
 
 @<Define the option...@> =
@@ -807,7 +807,7 @@
 long_options[current_option].val := 0;
 incr (current_option);
 
-@ Loose comparisions.
+@ Loose comparisons.
 @.-length@>
 
 @<Define the option...@> =

Modified: branches/stable/source/src/texk/web2c/tiedir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/tiedir/ChangeLog	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/tiedir/ChangeLog	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,3 +1,15 @@
+2020-05-31  Andreas Scherer  <https://ascherer.github.io>
+
+	* tie-w2c.ch: Format title page similar to CWEB.
+
+2020-05-29  Karl Berry  <karl at freefriends.org>
+
+	* tie-w2c.ch: pd not copyright.
+
+2020-05-28  Andreas Scherer  <https://ascherer.github.io>
+
+	* tie-w2c.ch: Incorporated Igor Liferenko's changes.
+
 2020-04-30  Andreas Scherer  <https://ascherer.github.io>
 
 	* tie-w2c.ch: Fix type format in section 60.

Modified: branches/stable/source/src/texk/web2c/tiedir/tie-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/tiedir/tie-w2c.ch	2020-06-02 12:46:04 UTC (rev 829)
+++ branches/stable/source/src/texk/web2c/tiedir/tie-w2c.ch	2020-06-03 23:00:08 UTC (rev 830)
@@ -1,14 +1,74 @@
 % Changes to adapt tie to web2c.
-% Copyright 2001 by Olaf Weber
+% Created 2001 by Olaf Weber
+% Updated 2020 by Andreas Scherer
 % This file is in the Public Domain.
 
- at x Already in cpascal.h.
+Limbo
+
+ at x l.42
+  \centerline{(CWEB Version 2.4)}
+ at y
+  \centerline{(CWEB Version 2.4 [\TeX~Live])}
+ at z
+
+ at x l.44 -- reformat 'covernote' on table-of-contents page
+\def\botofcontents{
+\null\vfill
+\item{$\copyright$}1989, 1992
+   by Technische Hochschule Darmstadt,\hfill\break
+Fachbereich Informatik, Institut f\"ur Theoretische Informatik\hfill\break
+All rights reserved.\hfill\break
+This program is distributed WITHOUT ANY WARRANTY, express or implied.
+\hfill\break
+Permission is granted to make and distribute verbatim copies of this
+program provided that the copyright notice and this permission notice
+are preserved on all copies.
+\hfill\break
+Permission is granted to copy and distribute modified versions of this
+program under the conditions for verbatim copying, provided that the
+entire resulting derived work is distributed under the terms of a
+permission notice identical to this one.
+}
+ at y
+\def\covernote{\vbox{\noindent
+Copyright \copyright~1989, 1992
+   by Technische Hochschule Darmstadt,\hfill\break
+Fachbereich Informatik, Institut f\"ur Theoretische Informatik
+\smallskip\noindent
+All rights reserved.
+\bigskip\noindent
+This program is distributed WITHOUT ANY WARRANTY, express or implied.
+\smallskip\noindent
+Permission is granted to make and distribute verbatim copies of this
+program provided that the copyright notice and this permission notice
+are preserved on all copies.
+\smallskip\noindent
+Permission is granted to copy and distribute modified versions of this
+program under the conditions for verbatim copying, provided that the
+entire resulting derived work is distributed under the terms of a
+permission notice identical to this one.
+}}
+ at z
+
+Section 2
+
+ at x l.113 -- improve typography
+@<Global |#include|s@>@;
+ at y
+@<Global \&{\#include}s@>@;
+ at z
+
+Section 3
+
+ at x l.123 -- Already in cpascal.h.
 @d incr(v) v+=1 /* increase a variable by unity */
 @d decr(v) v-=1 /* decrease a variable by unity */
 @y
 @z
 
- at x
+Section 4
+
+ at x l.130
 @ Furthermore we include the additional types |boolean| and |string|.
 @d false 0
 @d true 1
@@ -16,13 +76,15 @@
 typedef int boolean;
 typedef char* string;
 @y
-@ Furthermore we include the additional types |boolean| and |string|.
-/* |boolean|, |false|, |true|; |string|; all from \.{<kpathsea/simpletypes.h>} */
+@ The types |boolean| (with values |false| and |true|) and
+|string| come from \.{<kpathsea/simpletypes.h>}.
 @s boolean int
 @s string int
 @z
 
- at x -- we need more input files.
+Section 5
+
+ at x l.144 -- we need more input files.
 #define max_file_index 9
 /* we don't think that anyone needs more than 9 change files,
 @y
@@ -30,29 +92,64 @@
 /* we don't think that anyone needs more than 32 change files,
 @z
 
- at x
+Section 6
+
+l.155
+ at x -- replace preprocessor macros
+ at d spotless 0
+ at d troublesome 1
+ at d fatal 2
+
+@<Global variables@>=
+static int history=spotless;
+ at y
+@<Global variables@>=
+typedef enum {
+    spotless,
+    troublesome,
+    fatal } return_code;
+static return_code history=spotless;
+ at z
+
+Section 15
+
+ at x l.461
 @d print(a)  fprintf(term_out,a) /* `|print|' means write on the terminal */
 @y
 @d print(a)  fprintf(term_out,"%s",a) /* `|print|' means write on the terminal */
 @z
 
- at x
+ at x l.463 -- function used only for error messages
+ at d print3(a,b,c)  fprintf(term_out,a,b,c) /* same with three arguments */
+ at y
+ at d print3(a,b,c)  fprintf(stderr,a,b,c) /* same with three arguments */
+ at z
+
+ at x l.468
 @d print_ln(v)  {fprintf(term_out,v);term_new_line;}
 @y
 @d print_ln(v)  {fprintf(term_out,"%s",v);term_new_line;}
 @z
 
- at x -- add to global includes.
+ at x l.471 -- used only for error reporting
+ at d print3_ln(a,b,c)  {print3(a,b,c);term_new_line;}
+ at y
+ at d print3_ln(a,b,c)  {print3(a,b,c);new_line(stderr);}
+ at z
+
+ at x l.478 -- add to global includes.
+@<Global |#include|s@>=
 #include <stdio.h>
 @y
+@<Global \&{\#include}s@>=
 #include "cpascal.h" /* |decr| and |incr| */
 #include <kpathsea/kpathsea.h>
 #define usage tieusage /* Also redefine |usage| to avoid clash with function from lib. */
 @z
 
-Section 16: Remove redundant #include directives.
+Section 16
 
- at x l.483
+ at x l.483 -- Remove redundant #include directives.
 This should cause no trouble in any \Cl\ program.
 @^system dependencies@>
 
@@ -105,6 +202,8 @@
     post } out_md_type;
 @z
 
+Section 24
+
 @x l.617
 void get_line(i)
 	file_index i;
@@ -113,7 +212,9 @@
 get_line (file_index i)
 @z
 
- at x l.650
+Section 27
+
+ at x l.650 -- fix typo
 replacement part of a change file, or in an incomplerte check if the
 @y
 replacement part of a change file, or in an incomplete check if the
@@ -125,6 +226,14 @@
    if (c!=@' ' && c!=tab_mark && c!=@'\r')
 @z
 
+Section 31
+
+ at x l.742 -- print errors on 'stderr'
+ at d err_print(m)  { @+ print_nl(m); error_loc
+ at y
+ at d err_print(m)  { @+ new_line(stderr); fprintf(stderr,"%s",m); error_loc
+ at z
+
 @x l.745
 void err_loc(i) /* prints location of error */
         int i;
@@ -133,6 +242,27 @@
 err_loc (int i) /* prints location of error */
 @z
 
+Section 32
+
+ at x l.761 -- print errors on 'stderr'
+         print(m); print_c('.'); history=fatal;
+	 term_new_line; jump_out();
+ at y
+         fprintf(stderr,"%s",m);
+         fputc('.',stderr); history=fatal;
+	 new_line(stderr); jump_out();
+ at z
+
+Section 33
+
+ at x l.774
+ at d jump_out() exit(1)
+ at y
+ at d jump_out() exit(EXIT_FAILURE)
+ at z
+
+Section 34
+
 @x l.790 Use binary mode for output files
     out_file=fopen(out_name,"w");
 @y
@@ -139,6 +269,8 @@
     out_file=fopen(out_name,"wb");
 @z
 
+Section 36
+
 @x l.811
 	  fopen(input_organization[0]->name_of_file,"r");
 @y
@@ -145,6 +277,8 @@
 	  kpse_open_file(input_organization[0]->name_of_file, kpse_web_format);
 @z
 
+Section 37
+
 @x l.830
 	fopen(input_organization[i]->name_of_file,"r");
 @y
@@ -151,7 +285,9 @@
 	kpse_open_file(input_organization[i]->name_of_file, kpse_web_format);
 @z
 
- at x
+Section 38
+
+ at x l.851
 boolean lines_dont_match(i,j)
 	file_index i,j;
 @y
@@ -159,7 +295,9 @@
 lines_dont_match (file_index i, file_index j)
 @z
 
- at x
+Section 39
+
+ at x l.872
 void init_change_file(i,b)
 	file_index i; boolean b;
 @y
@@ -167,7 +305,9 @@
 init_change_file (file_index i, boolean b)
 @z
 
- at x
+Section 42
+
+ at x l.919
 void put_line(j)
 	file_index j;
 @y
@@ -175,7 +315,9 @@
 put_line (file_index j)
 @z
 
- at x
+Section 43
+
+ at x l.935
 boolean e_of_ch_module(i)
 	file_index i;
 @y
@@ -183,7 +325,9 @@
 e_of_ch_module (file_index i)
 @z
 
- at x
+Section 44
+
+ at x l.955
 boolean e_of_ch_preamble(i)
 	file_index i;
 @y
@@ -191,7 +335,9 @@
 e_of_ch_preamble (file_index i)
 @z
 
- at x l.1005
+Section 47
+
+ at x l.1005 -- fix typo
 a line to write and |test_input| ist set to |none|.
 @y
 a line to write and |test_input| is set to |none|.
@@ -217,7 +363,9 @@
 else
 @z
 
- at x
+Section 55
+
+ at x l.1158
 void usage()
 {
    print("Usage: tie -[mc] outfile master changefile(s)");
@@ -228,13 +376,17 @@
    print("Usage: tie -m|-c outfile master changefile(s)");
 @z
 
- at x l.1169
+Section 56
+
+ at x l.1169 -- fix typo
 change files.  The names fo the file parameters will be inserted into
 @y
 change files.  The names of the file parameters will be inserted into
 @z
 
- at x
+Section 59
+
+ at x l.1236
 main(argc,argv)
         int argc; string *argv;
 @y
@@ -241,7 +393,7 @@
 int main (int argc, string *argv)
 @z
 
- at x
+ at x l.1241
   print_ln(banner); /* print a ``banner line'' */
   print_ln(copyright); /* include the copyright notice */
 @y
@@ -251,25 +403,41 @@
   print_ln(copyright); /* include the copyright notice */
 @z
 
- at x l.1256
+Section 60
+
+ at x l.1256 -- fix typo
 Additionaly we report the history to the user, although this may not
 @y
 Additionally we report the history to the user, although this may not
 @z
 
- at x
+ at x l.1261 -- rewrite error reporting
 @<Print the job |history|@>=
 {string msg;
+   switch (history) {
+      case spotless: msg="No errors were found"; break;
+      case troublesome: msg="Pardon me, but I think I spotted something wrong.";
+	        break;
+      case fatal: msg="That was a fatal error, my friend";  break;
+      } /* there are no other cases */
+   print2_nl("(%s.)",msg);  term_new_line;
+   exit ( history == spotless  ?  0 : 1 );
+}
 @y
- at s const_string int
-
 @<Print the job |history|@>=
-{const_string msg;
- at z
-
- at x -- silence unitialized warning
-      case fatal: msg="That was a fatal error, my friend";  break;
- at y
+{
+   switch (history) {
+      case spotless: print2_nl("(%s.)", "No errors were found");
+        term_new_line; break;
+      case troublesome: new_line(stderr); fprintf(stderr,
+        "(Pardon me, but I think I spotted something wrong.)");
+        new_line(stderr); break;
+      case fatal:
       default: /* Anything except spotless, troublesome, or fatal is a bug. */
-      case fatal: msg="That was a fatal error, my friend";  break;
+        new_line(stderr);
+        fprintf(stderr, "(That was a fatal error, my friend.)");
+        new_line(stderr); break;
+      }
+   exit ( history == spotless ?  EXIT_SUCCESS : EXIT_FAILURE );
+}
 @z



More information about the pdftex-commits mailing list.