summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-18 01:05:29 +0000
committerKarl Berry <karl@freefriends.org>2017-01-18 01:05:29 +0000
commit97b8a7339636b193f7aec90efd0a4039d9bdf2ad (patch)
treec1aba0ba96b767d9384108b1bdf4180d76b6af8b
parent74ef6ba874ba5b13777f06a9472d8d63f7582bc9 (diff)
tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@42985 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/build-aux/texinfo.tex33
-rw-r--r--Master/doc.html36
2 files changed, 33 insertions, 36 deletions
diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex
index c8913ab918e..338bcf65040 100644
--- a/Build/source/build-aux/texinfo.tex
+++ b/Build/source/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2016-09-18.18}
+\def\texinfoversion{2017-01-14.15}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -165,6 +165,9 @@
% Give the space character the catcode for a space.
\def\spaceisspace{\catcode`\ =10\relax}
+% Likewise for ^^M, the end of line character.
+\def\endlineisspace{\catcode13=10\relax}
+
\chardef\dashChar = `\-
\chardef\slashChar = `\/
\chardef\underChar = `\_
@@ -950,21 +953,14 @@ where each line of input produces a line of output.}
% @comment ...line which is ignored...
% @c is the same as @comment
% @ignore ... @end ignore is another way to write a comment
-%
-\def\comment{\begingroup \catcode`\^^M=\active%
-\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other\commentxxx}%
-{\catcode`\^^M=\active%
-\gdef\commentxxx#1^^M{\endgroup%
-\futurelet\nexttoken\commentxxxx}%
-\gdef\commentxxxx{\ifx\nexttoken\aftermacro\expandafter\comment\fi}%
-}
\def\c{\begingroup \catcode`\^^M=\active%
\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
\cxxx}
{\catcode`\^^M=\active \gdef\cxxx#1^^M{\endgroup}}
-% See comment in \scanmacro about why the definitions of @c and @comment differ
+%
+\let\comment\c
% @paragraphindent NCHARS
% We'll use ems for NCHARS, close enough.
@@ -8031,9 +8027,6 @@ end
}
\fi
-\let\aftermacroxxx\relax
-\def\aftermacro{\aftermacroxxx}
-
% alias because \c means cedilla in @tex or @math
\let\texinfoc=\c
@@ -8055,18 +8048,13 @@ end
\catcode`\\=\active
%
% Process the macro body under the current catcode regime.
- \scantokens{#1@texinfoc}\aftermacro%
+ \scantokens{#1@texinfoc}%
%
\catcode`\@=\savedcatcodeone
\catcode`\\=\savedcatcodetwo
%
% The \texinfoc is to remove the \newlinechar added by \scantokens, and
% can be noticed by \parsearg.
- % The \aftermacro allows a \comment at the end of the macro definition
- % to duplicate itself past the final \newlinechar added by \scantokens:
- % this is used in the definition of \group to comment out a newline. We
- % don't do the same for \c to support Texinfo files with macros that ended
- % with a @c, which should no longer be necessary.
% We avoid surrounding the call to \scantokens with \bgroup and \egroup
% to allow macros to open or close groups themselves.
}
@@ -8538,6 +8526,13 @@ end
\ifcase\paramno
% 0
\expandafter\xdef\csname\the\macname\endcsname{%
+ \bgroup
+ \noexpand\spaceisspace
+ \noexpand\endlineisspace
+ \noexpand\expandafter % skip any whitespace after the macro name.
+ \expandafter\noexpand\csname\the\macname @@@\endcsname}%
+ \expandafter\xdef\csname\the\macname @@@\endcsname{%
+ \egroup
\noexpand\scanmacro{\macrobody}}%
\or % 1
\expandafter\xdef\csname\the\macname\endcsname{%
diff --git a/Master/doc.html b/Master/doc.html
index d40d03e5cea..c3447f40058 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -6864,23 +6864,23 @@ GoSans and GoMono fonts with LaTeX support
<a href="texmf-dist/doc/fonts/gofonts/go-samples.pdf">go-samples.pdf</a>.
</small></li>
-<li><b><a href="texmf-dist/doc/bibtex/gost">gost</a></b>:<small>
+<li><b><a href="texmf-dist/doc/bibtex/gost/examples/cp1251">gost</a></b>:<small>
BibTeX styles to format according to GOST
-<a href="texmf-dist/doc/bibtex/gost/gost.pdf">gost.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/gost2003.pdf">gost2003.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/gost2008-customized.pdf">gost2008-customized.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/gost2008.pdf">gost2008.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/gost2008l.pdf">gost2008l.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/gost2008n.pdf">gost2008n.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/gost2008ns.pdf">gost2008ns.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/gost780.pdf">gost780.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/ugost2003.pdf">ugost2003.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/ugost2008-customized.pdf">ugost2008-customized.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/ugost2008.pdf">ugost2008.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/ugost2008l.pdf">ugost2008l.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/ugost2008n.pdf">ugost2008n.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/ugost2008ns.pdf">ugost2008ns.pdf</a>,
-<a href="texmf-dist/doc/bibtex/gost/ugost2008s.pdf">ugost2008s.pdf</a>.
+<a href="texmf-dist/doc/bibtex/gost/examples/cp1251/gost2003.pdf">gost2003.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/cp1251/gost2008-customized.pdf">gost2008-customized.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/cp1251/gost2008.pdf">gost2008.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/cp1251/gost2008l.pdf">gost2008l.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/cp1251/gost2008n.pdf">gost2008n.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/cp1251/gost2008ns.pdf">gost2008ns.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/cp1251/gost780.pdf">gost780.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/utf8/ugost2003.pdf">ugost2003.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/utf8/ugost2008-customized.pdf">ugost2008-customized.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/utf8/ugost2008.pdf">ugost2008.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/utf8/ugost2008l.pdf">ugost2008l.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/utf8/ugost2008n.pdf">ugost2008n.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/utf8/ugost2008ns.pdf">ugost2008ns.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/examples/utf8/ugost2008s.pdf">ugost2008s.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/gost.pdf">gost.pdf</a>.
</small></li>
<li><b><a href="texmf-dist/doc/fonts/gothic">gothic</a></b>:<small>
@@ -16813,8 +16813,10 @@ Convert CJK characters to Unicode, in pdfTeX
<li><b><a href="texmf-dist/doc/latex/xcntperchap">xcntperchap</a></b>:<small>
Track the number of subsections etc. that occur in a specified tracklevel
+<a href="texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.pdf">xcntperchap_basicusage.pdf</a>,
<a href="texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.pdf">xcntperchap_doc.pdf</a>,
-<a href="texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.pdf">xcntperchap_driver.pdf</a>.
+<a href="texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.pdf">xcntperchap_driver.pdf</a>,
+<a href="texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.pdf">xcntperchap_labelusage.pdf</a>.
</small></li>
<li><b><a href="texmf-dist/doc/latex/xcolor">xcolor</a></b>:<small>