texlive[41797] trunk: tl-update-auto
commits+karl at tug.org
commits+karl at tug.org
Thu Aug 4 03:16:17 CEST 2016
Revision: 41797
http://tug.org/svn/texlive?view=revision&revision=41797
Author: karl
Date: 2016-08-04 03:16:17 +0200 (Thu, 04 Aug 2016)
Log Message:
-----------
tl-update-auto
Modified Paths:
--------------
trunk/Build/source/build-aux/texinfo.tex
trunk/Master/texmf-dist/tex/texinfo/texinfo.tex
Modified: trunk/Build/source/build-aux/texinfo.tex
===================================================================
--- trunk/Build/source/build-aux/texinfo.tex 2016-08-04 01:10:35 UTC (rev 41796)
+++ trunk/Build/source/build-aux/texinfo.tex 2016-08-04 01:16:17 UTC (rev 41797)
@@ -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-07-31.07}
+\def\texinfoversion{2016-08-01.14}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1562,6 +1562,46 @@
\txiuseunicodedestnamefalse
\fi
%
+ % Color support
+ %
+ \def\rgbDarkRed{0.50 0.09 0.12}
+ \def\rgbBlack{0 0 0}
+ %
+ \def\pdfsetcolor#1{\special{pdf:scolor [#1]}}
+ %
+ % Set color, and create a mark which defines \thiscolor accordingly,
+ % so that \makeheadline knows which color to restore.
+ \def\setcolor#1{%
+ \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \domark
+ \pdfsetcolor{#1}%
+ }
+ %
+ \def\maincolor{\rgbBlack}
+ \pdfsetcolor{\maincolor}
+ \edef\thiscolor{\maincolor}
+ \def\lastcolordefs{}
+ %
+ \def\makefootline{%
+ \baselineskip24pt
+ \line{\pdfsetcolor{\maincolor}\the\footline}%
+ }
+ %
+ \def\makeheadline{%
+ \vbox to 0pt{%
+ \vskip-22.5pt
+ \line{%
+ \vbox to8.5pt{}%
+ % Extract \thiscolor definition from the marks.
+ \getcolormarks
+ % Typeset the headline with \maincolor, then restore the color.
+ \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
+ }%
+ \vss
+ }%
+ \nointerlineskip
+ }
+ %
% PDF outline support
%
% Emulate pdfTeX primitive
@@ -5924,7 +5964,7 @@
\dimen@ = \ht0
\advance\dimen@ by \topskip
\advance\dimen@ by-\baselineskip
- \ifdim\dimen@<14\baselineskip
+ \ifdim\dimen@<5\baselineskip
% Don't split a short final column in two.
\setbox2=\vbox{}%
\else
@@ -5931,42 +5971,39 @@
\divide\dimen@ by 2 % target to split to
\dimen at ii = \dimen@
\splittopskip = \topskip
- % Loop until the second column is no higher than the first
+ % Loop until left column is at least as high as the right column.
{%
\vbadness = 10000
\loop
\global\setbox3 = \copy0
\global\setbox1 = \vsplit3 to \dimen@
- % Remove glue from bottom of first column to
- % make sure it is higher than the second.
+ % Remove glue from bottom of columns to compare
+ % apparent heights.
\global\setbox1 = \vbox{\unvbox1\unpenalty\unskip}%
- \ifdim\ht3>\ht1
+ \global\setbox3 = \vbox{\unvbox3\unpenalty\unskip}%
+ \ifdim\ht1<\ht3
\global\advance\dimen@ by 1pt
\repeat
}%
+ % Now the left column is in box 1, and the right column in box 3.
+ % Check whether the left column has come out higher than the page itself.
+ % (Note that we have doubled \vsize for the double columns, so
+ % the actual height of the page is 0.5\vsize).
\ifdim2\ht1>\vsize
- % The left column has come out longer than the page itself. (Note
- % that we have doubled \vsize for the double columns, so
- % the actual height of the page is 0.5\vsize). Just split the last
- % of the double column material roughly in half.
+ % Just split the last of the double column material roughly in half.
\setbox2=\box0
\setbox0 = \vsplit2 to \dimen at ii
\setbox0=\vbox to\dimen at ii{\unvbox0}%
\setbox2=\vbox to\dimen at ii{\unvbox2}%
\else
- \multiply\dimen at ii by 5
- \divide\dimen at ii by 4
- \global\setbox3 = \copy0
- \global\setbox1 = \vsplit3 to \dimen at ii
- \global\setbox\balancedcolumns=\vbox{\pagesofar}%
- \ifdim\ht3<\dimen at ii
+ % Compare the heights of the two columns.
+ \ifdim4\ht1>5\ht3
% Column heights are too different, so don't make their bottoms
- % flush with each other. The glue at the end of the second column
- % allows a second column to stretch, reducing the difference in
- % height between the two.
- \setbox0=\vbox to\dimen@{\unvbox1\vfill}%
- \setbox2=\vbox to\dimen@{\unvbox3\vskip 0pt plus 0.3\ht0}%
+ % flush with each other.
+ \setbox2=\vbox to \ht1 {\unvbox3\vfill}%
+ \setbox0=\vbox to \ht1 {\unvbox1\vfill}%
\else
+ % Make column bottoms flush with each other.
\setbox0=\vbox to\dimen@{\unvbox1}%
\setbox2=\vbox to\dimen@{\unvbox3}%
\fi
Modified: trunk/Master/texmf-dist/tex/texinfo/texinfo.tex
===================================================================
--- trunk/Master/texmf-dist/tex/texinfo/texinfo.tex 2016-08-04 01:10:35 UTC (rev 41796)
+++ trunk/Master/texmf-dist/tex/texinfo/texinfo.tex 2016-08-04 01:16:17 UTC (rev 41797)
@@ -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-08-03.13}
+\def\texinfoversion{2016-07-31.07}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1562,46 +1562,6 @@
\txiuseunicodedestnamefalse
\fi
%
- % Color support
- %
- \def\rgbDarkRed{0.50 0.09 0.12}
- \def\rgbBlack{0 0 0}
- %
- \def\pdfsetcolor#1{\special{pdf:scolor [#1]}}
- %
- % Set color, and create a mark which defines \thiscolor accordingly,
- % so that \makeheadline knows which color to restore.
- \def\setcolor#1{%
- \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
- \domark
- \pdfsetcolor{#1}%
- }
- %
- \def\maincolor{\rgbBlack}
- \pdfsetcolor{\maincolor}
- \edef\thiscolor{\maincolor}
- \def\lastcolordefs{}
- %
- \def\makefootline{%
- \baselineskip24pt
- \line{\pdfsetcolor{\maincolor}\the\footline}%
- }
- %
- \def\makeheadline{%
- \vbox to 0pt{%
- \vskip-22.5pt
- \line{%
- \vbox to8.5pt{}%
- % Extract \thiscolor definition from the marks.
- \getcolormarks
- % Typeset the headline with \maincolor, then restore the color.
- \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
- }%
- \vss
- }%
- \nointerlineskip
- }
- %
% PDF outline support
%
% Emulate pdfTeX primitive
@@ -1623,11 +1583,6 @@
\safewhatsit{\pdfdest name{\pdfdestname} xyz}%
}}
%
- % by default, use black for everything.
- \def\urlcolor{\rgbBlack}
- \def\linkcolor{\rgbBlack}
- \def\endlink{\setcolor{\maincolor}\pdfendlink}
- %
\def\dopdfoutline#1#2#3#4{%
\iftxiuseunicodedestname
\def\pdfoutlinedest{#3}% Pass through Unicode characters.
@@ -5969,7 +5924,7 @@
\dimen@ = \ht0
\advance\dimen@ by \topskip
\advance\dimen@ by-\baselineskip
- \ifdim\dimen@<5\baselineskip
+ \ifdim\dimen@<14\baselineskip
% Don't split a short final column in two.
\setbox2=\vbox{}%
\else
@@ -5976,39 +5931,42 @@
\divide\dimen@ by 2 % target to split to
\dimen at ii = \dimen@
\splittopskip = \topskip
- % Loop until left column is at least as high as the right column.
+ % Loop until the second column is no higher than the first
{%
\vbadness = 10000
\loop
\global\setbox3 = \copy0
\global\setbox1 = \vsplit3 to \dimen@
- % Remove glue from bottom of columns to compare
- % apparent heights.
+ % Remove glue from bottom of first column to
+ % make sure it is higher than the second.
\global\setbox1 = \vbox{\unvbox1\unpenalty\unskip}%
- \global\setbox3 = \vbox{\unvbox3\unpenalty\unskip}%
- \ifdim\ht1<\ht3
+ \ifdim\ht3>\ht1
\global\advance\dimen@ by 1pt
\repeat
}%
- % Now the left column is in box 1, and the right column in box 3.
- % Check whether the left column has come out higher than the page itself.
- % (Note that we have doubled \vsize for the double columns, so
- % the actual height of the page is 0.5\vsize).
\ifdim2\ht1>\vsize
- % Just split the last of the double column material roughly in half.
+ % The left column has come out longer than the page itself. (Note
+ % that we have doubled \vsize for the double columns, so
+ % the actual height of the page is 0.5\vsize). Just split the last
+ % of the double column material roughly in half.
\setbox2=\box0
\setbox0 = \vsplit2 to \dimen at ii
\setbox0=\vbox to\dimen at ii{\unvbox0}%
\setbox2=\vbox to\dimen at ii{\unvbox2}%
\else
- % Compare the heights of the two columns.
- \ifdim4\ht1>5\ht3
+ \multiply\dimen at ii by 5
+ \divide\dimen at ii by 4
+ \global\setbox3 = \copy0
+ \global\setbox1 = \vsplit3 to \dimen at ii
+ \global\setbox\balancedcolumns=\vbox{\pagesofar}%
+ \ifdim\ht3<\dimen at ii
% Column heights are too different, so don't make their bottoms
- % flush with each other.
- \setbox2=\vbox to \ht1 {\unvbox3\vfill}%
- \setbox0=\vbox to \ht1 {\unvbox1\vfill}%
+ % flush with each other. The glue at the end of the second column
+ % allows a second column to stretch, reducing the difference in
+ % height between the two.
+ \setbox0=\vbox to\dimen@{\unvbox1\vfill}%
+ \setbox2=\vbox to\dimen@{\unvbox3\vskip 0pt plus 0.3\ht0}%
\else
- % Make column bottoms flush with each other.
\setbox0=\vbox to\dimen@{\unvbox1}%
\setbox2=\vbox to\dimen@{\unvbox3}%
\fi
@@ -8845,21 +8803,16 @@
\ifpdf
% For pdfTeX and LuaTeX
{\indexnofonts
+ \turnoffactive
\makevalueexpandable
- %
- % This (wrongly) does not take account of leading or trailing
- % spaces in #1, which should be ignored.
- \ifx\luatexversion\thisisundefined
- \edef\pdfxrefdest{#1}% pdfTeX: Replace Unicode characters with ASCII.
- \else
- \def\pdfxrefdest{#1}% LuaTeX: Pass through Unicode characters.
- \fi
- \turnoffactive
% This expands tokens, so do it after making catcode changes, so _
% etc. don't get their TeX definitions. This ignores all spaces in
% #4, including (wrongly) those in the middle of the filename.
\getfilename{#4}%
%
+ % This (wrongly) does not take account of leading or trailing
+ % spaces in #1, which should be ignored.
+ \edef\pdfxrefdest{#1}%
\ifx\pdfxrefdest\empty
\def\pdfxrefdest{Top}% no empty targets
\else
@@ -8880,7 +8833,12 @@
\else
% For XeTeX
{\indexnofonts
+ \turnoffactive
\makevalueexpandable
+ % This expands tokens, so do it after making catcode changes, so _
+ % etc. don't get their TeX definitions. This ignores all spaces in
+ % #4, including (wrongly) those in the middle of the filename.
+ \getfilename{#4}%
%
% This (wrongly) does not take account of leading or trailing
% spaces in #1, which should be ignored.
@@ -8889,12 +8847,6 @@
\else
\edef\pdfxrefdest{#1}% Replace Unicode characters with ASCII.
\fi
- \turnoffactive
- % This expands tokens, so do it after making catcode changes, so _
- % etc. don't get their TeX definitions. This ignores all spaces in
- % #4, including (wrongly) those in the middle of the filename.
- \getfilename{#4}%
- %
\ifx\pdfxrefdest\empty
\def\pdfxrefdest{Top}% no empty targets
\else
@@ -9967,18 +9919,6 @@
\fi % latone
\fi % lattwo
\fi % ascii
- %
- \ifx\XeTeXrevision\thisisundefined
- \else
- \ifx \declaredencoding \utfeight
- \else
- \ifx \declaredencoding \ascii
- \else
- \message{Warning: XeTeX with non-UTF-8 encodings cannot handle %
- non-ASCII characters in auxiallity files.}%
- \fi
- \fi
- \fi
}
% emacs-page
More information about the tex-live-commits
mailing list