summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-29 02:16:32 +0000
committerKarl Berry <karl@freefriends.org>2015-10-29 02:16:32 +0000
commit4cf50d1f9be254989e88fef0ddbbf8191ec8bdd6 (patch)
tree713e110b23c2d0693f06c67c8043d432f42e0fa5
parent7e22c82733b926f71d6b57e96941b45dd44a87bf (diff)
/home/texlive/karl/Master/tlpkg/bin/tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@38734 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/build-aux/texinfo.tex112
-rw-r--r--Master/doc.html1
2 files changed, 62 insertions, 51 deletions
diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex
index bca1ecfcb77..86eafa8255f 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{2015-10-26.14}
+\def\texinfoversion{2015-10-27.10}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5228,7 +5228,7 @@ end
}
\def\entrybreak{\unskip\space\ignorespaces}%
\def\doentry{%
- % Save the text of the entry in a \vtop.
+ % Save the text of the entry
\global\setbox\boxA=\hbox\bgroup
\bgroup % Instead of the swallowed brace.
\noindent
@@ -5262,55 +5262,65 @@ end
\fi
\egroup % end \boxA
\ifdim\wd\boxB = 0pt
- \global\setbox\entryindexbox=\box\boxA
+ \global\setbox\entryindexbox=\box\boxA
\else
- \global\setbox\entryindexbox=\vtop\bgroup\noindent
- % We want the text of the entries to be aligned to the left, and the
- % page numbers to be aligned to the right.
- %
- \advance\leftskip by 0pt plus 1fil
- \advance\leftskip by 0pt plus -1fill
- \rightskip = 0pt plus -1fil
- \advance\rightskip by 0pt plus 1fill
- % Cause last line, which could consist of page numbers on their own if the
- % list of page numbers is long, to be aligned to the right.
- \parfillskip=0pt plus -1fill
- %
- \hangindent=1em
- %
- \advance\rightskip by \entryrightmargin
- % Determine how far we can stretch into the margin.
- % This allows, e.g., "Appendix H GNU Free Documentation License" to fit
- % on one line.
- \advance \parfillskip by 0pt minus .6\entryrightmargin
- %
- \ifdim\wd\boxA > \hsize % If the entry doesn't fit in one line
- \ifdim\dimen@ > 0.9\hsize % due to long index text
- \dimen@ = 0.6\dimen@ % Try to split the text roughly evenly
- \dimen@ii = \hsize
- \advance \dimen@ii by -1em
- \ifnum\dimen@>\dimen@ii
- % If the entry is too long, use the whole line
- \dimen@ = \dimen@ii
+ \global\setbox\entryindexbox=\vbox\bgroup\noindent
+ % We want the text of the entries to be aligned to the left, and the
+ % page numbers to be aligned to the right.
+ %
+ \advance\leftskip by 0pt plus 1fil
+ \advance\leftskip by 0pt plus -1fill
+ \rightskip = 0pt plus -1fil
+ \advance\rightskip by 0pt plus 1fill
+ % Cause last line, which could consist of page numbers on their own
+ % if the list of page numbers is long, to be aligned to the right.
+ \parfillskip=0pt plus -1fill
+ %
+ \hangindent=1em
+ %
+ \advance\rightskip by \entryrightmargin
+ % Determine how far we can stretch into the margin.
+ % This allows, e.g., "Appendix H GNU Free Documentation License" to
+ % fit on one line in @letterpaper format.
+ \ifdim\entryrightmargin>2.1em
+ \dimen@i=2.1em
+ \else
+ \dimen@i=0em
\fi
- \advance\leftskip by 0pt plus 1fill % ragged right
- \parshape = 2 0pt \dimen@ 1em \dimen@ii
- % Ideally we'd add a finite glue at the end of the first line only, but
- % TeX doesn't seem to provide a way to do such a thing.
- \fi\fi
- \unhbox\boxA
- %
- % Do not prefer a separate line ending with a hyphen to fewer lines.
- \finalhyphendemerits = 0
- %
- % Word spacing - no stretch
- \spaceskip=\fontdimen2\font minus \fontdimen4\font
- %
- \linepenalty=1000 % Discourage line breaks.
- \hyphenpenalty=5000 % Discourage hyphenation.
- %
- \par % format the paragraph
- \egroup % The \vtop
+ \advance \parfillskip by 0pt minus 1\dimen@i
+ %
+ \dimen@ii = \hsize
+ \advance\dimen@ii by -1\leftskip
+ \advance\dimen@ii by -1\entryrightmargin
+ \advance\dimen@ii by 1\dimen@i
+ \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line
+ \ifdim\dimen@ > 0.5\dimen@ii % due to long index text
+ \dimen@ = 0.7\dimen@ % Try to split the text roughly evenly
+ \dimen@ii = \hsize
+ \advance \dimen@ii by -1em
+ \ifnum\dimen@>\dimen@ii
+ % If the entry is too long, use the whole line
+ \dimen@ = \dimen@ii
+ \fi
+ \advance\leftskip by 0pt plus 1fill % ragged right
+ \advance \dimen@ by 1\rightskip
+ \parshape = 2 0pt \dimen@ 1em \dimen@ii
+ % Ideally we'd add a finite glue at the end of the first line only, but
+ % TeX doesn't seem to provide a way to do such a thing.
+ \fi\fi
+ \unhbox\boxA
+ %
+ % Do not prefer a separate line ending with a hyphen to fewer lines.
+ \finalhyphendemerits = 0
+ %
+ % Word spacing - no stretch
+ \spaceskip=\fontdimen2\font minus \fontdimen4\font
+ %
+ \linepenalty=1000 % Discourage line breaks.
+ \hyphenpenalty=5000 % Discourage hyphenation.
+ %
+ \par % format the paragraph
+ \egroup % The \vbox
\fi
\endgroup
% delay text of entry until after penalty
@@ -5323,8 +5333,8 @@ end
\newbox\entryindexbox
\def\insertindexentrybox{%
-\lineskip=.8ex plus .6ex % This comes into effect when the \vtop has a large
- % depth due to the paragraph in it having several
+\lineskip=.8ex plus .6ex % This comes into effect when the \vbox has a large
+ % height due to the paragraph in it having several
% lines.
\box\entryindexbox}
diff --git a/Master/doc.html b/Master/doc.html
index e4bf46353a0..7fbaedac488 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -7623,6 +7623,7 @@ A TeX macro package that defines LaTeX
<a href="texmf-dist/doc/latex/base/letter.pdf">letter.pdf</a>,
<a href="texmf-dist/doc/latex/base/lgc2.pdf">lgc2.pdf</a>,
<a href="texmf-dist/doc/latex/base/lppl.pdf">lppl.pdf</a>,
+<a href="texmf-dist/doc/latex/base/ltluatex.pdf">ltluatex.pdf</a>,
<a href="texmf-dist/doc/latex/base/ltnews.pdf">ltnews.pdf</a>,
<a href="texmf-dist/doc/latex/base/ltunicode.pdf">ltunicode.pdf</a>,
<a href="texmf-dist/doc/latex/base/ltx3info.pdf">ltx3info.pdf</a>,