From a3bde12ddd0f6630ae30eda498cf6824e2b66fba Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 24 Dec 2015 23:26:36 +0000
Subject: sync

git-svn-id: svn://tug.org/texlive/trunk@39194 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/texinfo/texinfo.tex | 20 ++++++++++----------
 Master/tlpkg/bin/check-files-by-format    |  9 ++++++---
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'Master')

diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index 34fd353a9dc..f140bba94b8 100644
--- a/Master/texmf-dist/tex/texinfo/texinfo.tex
+++ b/Master/texmf-dist/tex/texinfo/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/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format
index 80d21267551..fa2704d8fc2 100755
--- a/Master/tlpkg/bin/check-files-by-format
+++ b/Master/tlpkg/bin/check-files-by-format
@@ -43,9 +43,12 @@ my $exclude_otf = { '*base*' => 'texmf-dist/fonts/opentype',
 # 1 means pdfinfo issues errors but still exits successfully
 # 2 means pdfinfo exits non-zero
 my $exclude_pdf = {
-     # author cannot fix:
-  'texmf-dist/doc/fonts/frcursive/frcursive.pdf' => 1,	# 14nov11
-  'texmf-dist/doc/generic/pst-perspective/' => 1,	# 17apr14
+     # 14nov11 author cannot fix:
+  'texmf-dist/doc/fonts/frcursive/frcursive.pdf' => 1,
+     # 17apr14 unknown:
+  'texmf-dist/doc/generic/pst-perspective/' => 1,
+     # 20dec15 "couldn't read xref table", but seems mostly ok:
+  'texmf-dist/doc/latex/ksp-thesis/ksp-thesis.pdf' => 1,
      # 15dec12 derekn says will be fixed in next xpdf after 3.03:
      # (causes seg fault now):
   'texmf-dist/doc/latex/ocgx/demo-ocgx.pdf' => -1,
-- 
cgit v1.2.3