summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-10 01:05:50 +0000
committerKarl Berry <karl@freefriends.org>2017-03-10 01:05:50 +0000
commit650db6a2d24455986e4540669b11d8fbcacba8d4 (patch)
tree3924d77857c9c7c84583a8bc9ce83e21362e7472
parent384baaf869ba604839871caf949e516c11a28ea6 (diff)
tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@43451 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/build-aux/texinfo.tex14
-rw-r--r--Master/doc.html3
2 files changed, 8 insertions, 9 deletions
diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex
index f5008fc7fde..970d8784688 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{2017-03-06.19}
+\def\texinfoversion{2017-03-07.20}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5888,8 +5888,8 @@ end
\divide\doublecolumnhsize by 2
\hsize = \doublecolumnhsize
%
- % Double the \vsize as well. (We don't need a separate register here,
- % since nobody clobbers \vsize.)
+ % Double the \vsize as well.
+ \advance\vsize by -\ht\partialpage
\vsize = 2\vsize
%
% For the benefit of balancing columns
@@ -5907,10 +5907,10 @@ end
% previous page.
\dimen@ = \vsize
\divide\dimen@ by 2
- \advance\dimen@ by -\ht\partialpage
%
% box0 will be the left-hand column, box2 the right.
\setbox0=\vsplit\PAGE to\dimen@ \setbox2=\vsplit\PAGE to\dimen@
+ \global\advance\vsize by 2\ht\partialpage
\onepageout\pagesofar
\unvbox\PAGE
\penalty\outputpenalty
@@ -5976,9 +5976,9 @@ end
%
% \pagegoal was set to the doubled \vsize above, since we restarted
% the current page. We're now back to normal single-column
- % typesetting, so reset \pagegoal to the normal \vsize (after the
- % \endgroup where \vsize got restored).
- \pagegoal = \vsize
+ % typesetting, so reset \pagegoal to the normal \vsize.
+ \global\vsize = \txipageheight %
+ \pagegoal = \txipageheight %
}
\newbox\balancedcolumns
\setbox\balancedcolumns=\vbox{shouldnt see this}%
diff --git a/Master/doc.html b/Master/doc.html
index 7fece1176dc..cc7373e9a27 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -136,7 +136,6 @@ Class for typesetting publications of ACM
<a href="texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf">sample-sigchi-a.pdf</a>,
<a href="texmf-dist/doc/latex/acmart/sample-sigchi.pdf">sample-sigchi.pdf</a>,
<a href="texmf-dist/doc/latex/acmart/sample-sigconf.pdf">sample-sigconf.pdf</a>,
-<a href="texmf-dist/doc/latex/acmart/sample-siggraph.pdf">sample-siggraph.pdf</a>,
<a href="texmf-dist/doc/latex/acmart/sample-sigplan.pdf">sample-sigplan.pdf</a>,
<a href="texmf-dist/doc/latex/acmart/sampleteaser.pdf">sampleteaser.pdf</a>.
</small></li>
@@ -10335,7 +10334,7 @@ Use italic and upright greek letters with mathtime
</small></li>
<li><b><a href="texmf-dist/doc/latex/mucproc">mucproc</a></b>:<small>
-conference proceedings for the German MuC-conference
+Conference proceedings for the German MuC-conference
<a href="texmf-dist/doc/latex/mucproc/mucproc.pdf">mucproc.pdf</a>.
</small></li>