summaryrefslogtreecommitdiff
path: root/Build/source/build-aux
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-28 02:16:37 +0000
committerKarl Berry <karl@freefriends.org>2015-10-28 02:16:37 +0000
commitd24ba51605edf099febda0802a9bc89b4b640766 (patch)
treeafe6ceb2e92475632682612206a9274f741e20e1 /Build/source/build-aux
parentfbe92ef765a6045cd94c045d6e73dc790f89403c (diff)
/home/texlive/karl/Master/tlpkg/bin/tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@38729 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/build-aux')
-rw-r--r--Build/source/build-aux/texinfo.tex20
1 files changed, 10 insertions, 10 deletions
diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex
index b5ebbcfafeb..bca1ecfcb77 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-21.19}
+\def\texinfoversion{2015-10-26.14}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5244,10 +5244,9 @@ end
\global\setbox\boxA=\hbox\bgroup\unhbox\boxA
% #1 is the page number.
%
- % The following is kludged to not output a line of dots in the index if
- % there are no page numbers. The next person who breaks this will be
- % cursed by a Unix daemon.
- \setbox\boxB = \hbox{#1}%
+ % Get the width of the page numbers, and only use
+ % leaders if they are present.
+ \global\setbox\boxB = \hbox{#1}%
\ifdim\wd\boxB = 0pt
\null\nobreak\hfill\ %
\else
@@ -5262,6 +5261,9 @@ end
\fi
\fi
\egroup % end \boxA
+ \ifdim\wd\boxB = 0pt
+ \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.
@@ -5290,11 +5292,8 @@ end
\ifnum\dimen@>\dimen@ii
% If the entry is too long, use the whole line
\dimen@ = \dimen@ii
- \else
- % Cause stretch of 1fill at the end of the first line, to avoid
- % extra spacing in a short first line.
- \hskip 0pt plus 1fill
\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.
@@ -5308,10 +5307,11 @@ end
\spaceskip=\fontdimen2\font minus \fontdimen4\font
%
\linepenalty=1000 % Discourage line breaks.
- \hyphenpenalty=10000 % Discourage hyphenation.
+ \hyphenpenalty=5000 % Discourage hyphenation.
%
\par % format the paragraph
\egroup % The \vtop
+ \fi
\endgroup
% delay text of entry until after penalty
\bgroup\aftergroup\insertindexentrybox