summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-01-24 03:30:31 +0000
committerKarl Berry <karl@freefriends.org>2012-01-24 03:30:31 +0000
commit5f3f20bb5f926c0d52d945a1b4daa58b86bf5230 (patch)
treed9429c1ead423a0f6da128dba4051630a3be13ce
parent40a9858994b54c55aaba137c74331105ecb879d6 (diff)
/home/texlive/karl/Master/tlpkg/bin/tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@25188 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/build-aux/texinfo.tex81
-rw-r--r--Master/doc.html34
2 files changed, 81 insertions, 34 deletions
diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex
index f91cd5e690d..dcdeb9b4ffa 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{2012-01-04.16}
+\def\texinfoversion{2012-01-19.16}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -7802,26 +7802,36 @@ end
\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
\def\ref#1{\xrefX[#1,,,,,,,]}
+%
+\newbox\topbox
+\newbox\printedrefnamebox
+\newbox\printedmanualbox
+%
\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
\unsepspaces
- \def\printedmanual{\ignorespaces #5}%
+ %
\def\printedrefname{\ignorespaces #3}%
- \setbox1=\hbox{\printedmanual\unskip}%
- \setbox0=\hbox{\printedrefname\unskip}%
- \ifdim \wd0 = 0pt
+ \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
+ %
+ \def\printedmanual{\ignorespaces #5}%
+ \setbox\printedmanualbox = \hbox{\printedmanual\unskip}%
+ %
+ % If the printed reference name (arg #3) was not explicitly given in
+ % the @xref, figure out what we want to use.
+ \ifdim \wd\printedrefnamebox = 0pt
% No printed node name was explicitly given.
\expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
- % Use the node name inside the square brackets.
+ % Not auto section-title: use node name inside the square brackets.
\def\printedrefname{\ignorespaces #1}%
\else
- % Use the actual chapter/section title appear inside
- % the square brackets. Use the real section title if we have it.
- \ifdim \wd1 > 0pt
- % It is in another manual, so we don't have it.
+ % Auto section-title: use chapter/section title inside
+ % the square brackets if we have it.
+ \ifdim \wd\printedmanualbox > 0pt
+ % It is in another manual, so we don't have it; use node name.
\def\printedrefname{\ignorespaces #1}%
\else
\ifhavexrefs
- % We know the real title if we have the xref values.
+ % We (should) know the real title if we have the xref values.
\def\printedrefname{\refx{#1-title}{}}%
\else
% Otherwise just copy the Info node name.
@@ -7867,7 +7877,7 @@ end
\iffloat\Xthisreftitle
% If the user specified the print name (third arg) to the ref,
% print it instead of our usual "Figure 1.2".
- \ifdim\wd0 = 0pt
+ \ifdim\wd\printedrefnamebox = 0pt
\refx{#1-snt}{}%
\else
\printedrefname
@@ -7875,21 +7885,46 @@ end
%
% if the user also gave the printed manual name (fifth arg), append
% "in MANUALNAME".
- \ifdim \wd1 > 0pt
+ \ifdim \wd\printedmanualbox > 0pt
\space \putwordin{} \cite{\printedmanual}%
\fi
\else
% node/anchor (non-float) references.
- %
- % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
- % insert empty discretionaries after hyphens, which means that it will
- % not find a line break at a hyphen in a node names. Since some manuals
- % are best written with fairly long node names, containing hyphens, this
- % is a loss. Therefore, we give the text of the node name again, so it
- % is as if TeX is seeing it for the first time.
- \ifdim \wd1 > 0pt
- \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
+ %
+ % If we use \unhbox to print the node names, TeX does not insert
+ % empty discretionaries after hyphens, which means that it will not
+ % find a line break at a hyphen in a node names. Since some manuals
+ % are best written with fairly long node names, containing hyphens,
+ % this is a loss. Therefore, we give the text of the node name
+ % again, so it is as if TeX is seeing it for the first time.
+ %
+ % Cross-manual reference. Only include the "Section ``foo'' in" if
+ % the foo is neither missing or Top. Thus, @xref{,,,foo,The Foo Manual}
+ % outputs simply "see The Foo Manual".
+ \ifdim \wd\printedmanualbox > 0pt
+ % What is the 7sp about? The idea is that we also want to omit
+ % the Section part if we would be printing "Top", since they are
+ % clearly trying to refer to the whole manual. But, this being
+ % TeX, we can't easily compare strings while ignoring the possible
+ % spaces before and after in the input. By adding the arbitrary
+ % 7sp, we make it much less likely that a real node name would
+ % happen to have the same width as "Top" (e.g., in a monospaced font).
+ % I hope it will never happen in practice.
+ %
+ % For the same basic reason, we retypeset the "Top" at every
+ % reference, since the current font is indeterminate.
+ %
+ \setbox\topbox = \hbox{Top\kern7sp}%
+ \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
+ \ifdim \wd2 > 7sp
+ \ifdim \wd2 = \wd\topbox \else
+ \putwordSection{} ``\printedrefname'' \putwordin{}\space
+ \fi
+ \fi
+ \cite{\printedmanual}%
\else
+ % Reference in this manual.
+ %
% _ (for example) has to be the character _ for the purposes of the
% control sequence corresponding to the node, but it has to expand
% into the usual \leavevmode...\vrule stuff for purposes of
@@ -7901,7 +7936,7 @@ end
\setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
\ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
}%
- % output the `[mynode]' via a macro so it can be overridden.
+ % output the `[mynode]' via the macro below so it can be overridden.
\xrefprintnodename\printedrefname
%
% But we always want a comma and a space:
diff --git a/Master/doc.html b/Master/doc.html
index bb21d82c635..a5031d2bd0e 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -4318,6 +4318,8 @@ Embed Gnuplot commands in LaTeX documents.
<li><b><a href="texmf-dist/doc/bibtex/gost">gost</a></b>:<small>
BibTeX styles to format according to GOST.
<a href="texmf-dist/doc/bibtex/gost/gost705-custom.pdf">gost705-custom.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/gost705-sorted.pdf">gost705-sorted.pdf</a>,
+<a href="texmf-dist/doc/bibtex/gost/gost705-unsorted.pdf">gost705-unsorted.pdf</a>,
<a href="texmf-dist/doc/bibtex/gost/gost705.pdf">gost705.pdf</a> (ru),
<a href="texmf-dist/doc/bibtex/gost/gost780.pdf">gost780.pdf</a> (ru).
</small></li>
@@ -7419,6 +7421,11 @@ List environment for making outlines.
<a href="texmf-dist/doc/latex/outline/outline.pdf">outline.pdf</a>.
</small></li>
+<li><b><a href="texmf-dist/doc/latex/outlines">outlines</a></b>:<small>
+Produce "outline" lists.
+<a href="texmf-dist/doc/latex/outlines/outlines.pdf">outlines.pdf</a>.
+</small></li>
+
<li><b><a href="texmf-dist/doc/latex/overpic">overpic</a></b>:<small>
Combine LaTeX commands over included graphics.
<a href="texmf-dist/doc/latex/overpic/opic-abs.pdf">opic-abs.pdf</a> (en),
@@ -7431,7 +7438,7 @@ Combine LaTeX commands over included graphics.
<h2 id="letter-P">P</h2>
-<ol start="1127">
+<ol start="1128">
<li><b><a href="texmf-dist/doc/latex/pagecolor">pagecolor</a></b>:<small>
Interrogate page colour.
@@ -8719,7 +8726,7 @@ Virtual maths alphabets based on pxfonts and txfonts.
<h2 id="letter-Q">Q</h2>
-<ol start="1328">
+<ol start="1329">
<li><b><a href="texmf-dist/doc/latex/qcm">qcm</a></b>:<small>
A LaTeX2e class for making multiple choice questionnaires
@@ -8763,7 +8770,7 @@ Consistent quote marks.
<h2 id="letter-R">R</h2>
-<ol start="1335">
+<ol start="1336">
<li><b><a href="texmf-dist/doc/latex/randbild">randbild</a></b>:<small>
Marginal pictures.
@@ -9002,7 +9009,7 @@ Class for Ryerson Unversity Graduate School requirements.
<h2 id="letter-S">S</h2>
-<ol start="1376">
+<ol start="1377">
<li><b><a href="texmf-dist/doc/latex/sageep">sageep</a></b>:<small>
Format papers for the annual meeting of EEGS.
@@ -9825,7 +9832,7 @@ Format systems of equations.
<h2 id="letter-T">T</h2>
-<ol start="1508">
+<ol start="1509">
<li><b><a href="texmf-dist/doc/latex/t-angles">t-angles</a></b>:<small>
Draw tangles, trees, Hopf algebra operations and other pictures.
@@ -11082,7 +11089,7 @@ Print a typographic grid.
<h2 id="letter-U">U</h2>
-<ol start="1673">
+<ol start="1674">
<li><b><a href="texmf-dist/doc/latex/uaclasses">uaclasses</a></b>:<small>
University of Arizona thesis and dissertation format.
@@ -11258,7 +11265,7 @@ University of Washington thesis class.
<h2 id="letter-V">V</h2>
-<ol start="1704">
+<ol start="1705">
<li><b><a href="texmf-dist/doc/bibtex/vancouver">vancouver</a></b>:<small>
Bibliographic style file for Biomedical Journals.
@@ -11415,7 +11422,7 @@ Variable-width multiple text columns.
<h2 id="letter-W">W</h2>
-<ol start="1730">
+<ol start="1731">
<li><b><a href="texmf-dist/doc/fonts/wadalab">wadalab</a></b>:<small>
Wadalab (Japanese) font packages.
@@ -11497,7 +11504,7 @@ Produces figures which text can flow around.
<h2 id="letter-X">X</h2>
-<ol start="1744">
+<ol start="1745">
<li><b><a href="texmf-dist/doc/latex/xargs">xargs</a></b>:<small>
Define commands with many optional arguments.
@@ -11683,6 +11690,11 @@ Expandable macros that take an optional argument.
<a href="texmf-dist/doc/latex/xoptarg/xoptarg.pdf">xoptarg.pdf</a>.
</small></li>
+<li><b><a href="texmf-dist/doc/latex/xpatch">xpatch</a></b>:<small>
+Extending etoolbox patching commands.
+<a href="texmf-dist/doc/latex/xpatch/xpatch.pdf">xpatch.pdf</a>.
+</small></li>
+
<li><b><a href="texmf-dist/doc/fonts/xq">xq</a></b>:<small>
Support for writing about xiangqi.
<a href="texmf-dist/doc/fonts/xq/xqexample.pdf">xqexample.pdf</a>.
@@ -11734,7 +11746,7 @@ Tree macros using XY-Pic.
<h2 id="letter-Y">Y</h2>
-<ol start="1780">
+<ol start="1782">
<li><b><a href="texmf-dist/doc/latex/yafoot">yafoot</a></b>:<small>
A bundle of miscellaneous footnote packages.
@@ -11782,7 +11794,7 @@ Many-featured Young tableaux and Young diagrams.
<h2 id="letter-Z">Z</h2>
-<ol start="1788">
+<ol start="1790">
<li><b><a href="texmf-dist/doc/latex/zed-csp">zed-csp</a></b>:<small>
Typesetting Z and CSP format specifications.