summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-12-24 02:15:09 +0000
committerKarl Berry <karl@freefriends.org>2015-12-24 02:15:09 +0000
commit87f19619dc931da6f4e8f24c5f65a0dbf4e0128f (patch)
tree81a9a28b4906b20b584cf4e04f4566980663c854
parentd2e26f52b6b60defc7cf7298133a849dcad9f82e (diff)
/home/texlive/karl/Master/tlpkg/bin/tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@39186 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/build-aux/texinfo.tex20
-rw-r--r--Master/doc.html2
2 files changed, 12 insertions, 10 deletions
diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex
index 34fd353a9dc..f140bba94b8 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-12-17.20}
+\def\texinfoversion{2015-12-20.12}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5410,6 +5410,9 @@ end
}
\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
+ % If not much space left on page, start a new page.
+ \ifdim\pagetotal>0.8\vsize\vfill\eject\fi
+ %
% Grab any single-column material above us.
\output = {%
%
@@ -5467,7 +5470,7 @@ end
% since nobody clobbers \vsize.)
\global\doublecolumntopgap = \topskip
\global\advance\doublecolumntopgap by -1\baselineskip
- \global\advance\vsize by -1\doublecolumntopgap
+ \advance\vsize by -1\doublecolumntopgap
\vsize = 2\vsize
\topskip=0pt
\global\entrylinedepth=0pt\relax
@@ -5537,23 +5540,20 @@ end
\penalty0
%
\output = {%
- % Split the last of the double-column material. Leave it on the
- % current page, no automatic page break.
+ % Split the last of the double-column material.
\savemarks
\balancecolumns
%
- % If we end up splitting too much material for the current page,
- % though, there will be another page break right after this \output
- % invocation ends. Having called \balancecolumns once, we do not
+ % Having called \balancecolumns once, we do not
% want to call it again. Therefore, reset \output to its normal
- % definition right away. (We hope \balancecolumns will never be
- % called on to balance too much material, but if it is, this makes
- % the output somewhat more palatable.)
+ % definition right away.
\global\output = {\onepageout{\pagecontents\PAGE}}%
}%
\eject
\endgroup % started in \begindoublecolumns
\restoremarks
+ % Leave the double-column material on the current page, no automatic
+ % page break.
\box\balancedcolumns
%
% \pagegoal was set to the doubled \vsize above, since we restarted
diff --git a/Master/doc.html b/Master/doc.html
index 08f62d8e496..08c40b7b96b 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -1275,6 +1275,8 @@ An introduction to the Beamer class, in Portuguese
<li><b><a href="texmf-dist/doc/latex/beamer-verona">beamer-verona</a></b>:<small>
A theme for the beamer class
+<a href="texmf-dist/doc/latex/beamer-verona/beamer-verona-default.pdf">beamer-verona-default.pdf</a>,
+<a href="texmf-dist/doc/latex/beamer-verona/beamer-verona-sidebar.pdf">beamer-verona-sidebar.pdf</a>,
<a href="texmf-dist/doc/latex/beamer-verona/beamer-verona.pdf">beamer-verona.pdf</a>.
</small></li>