diff options
| -rw-r--r-- | Build/source/build-aux/texinfo.tex | 49 | ||||
| -rw-r--r-- | Master/doc.html | 7 |
2 files changed, 35 insertions, 21 deletions
diff --git a/Build/source/build-aux/texinfo.tex b/Build/source/build-aux/texinfo.tex index 022c3f5b370..e2bf51af8c0 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-09-11.18} +\def\texinfoversion{2017-11-17.06} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -5969,24 +5969,30 @@ end % Split the last of the double-column material. \savemarks \balancecolumns - % + }% + \eject % call the \output just set + \ifdim\pagetotal=0pt % Having called \balancecolumns once, we do not % want to call it again. Therefore, reset \output to its normal % 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 - % the current page. We're now back to normal single-column - % typesetting, so reset \pagegoal to the normal \vsize. - \global\vsize = \txipageheight % - \pagegoal = \txipageheight % + % + \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 + % the current page. We're now back to normal single-column + % typesetting, so reset \pagegoal to the normal \vsize. + \global\vsize = \txipageheight % + \pagegoal = \txipageheight % + \else + % We had some left-over material. This might happen when \doublecolumnout + % is called in \balancecolumns. Try again. + \expandafter\enddoublecolumns + \fi } \newbox\balancedcolumns \setbox\balancedcolumns=\vbox{shouldnt see this}% @@ -6001,6 +6007,7 @@ end \ifdim\dimen@<5\baselineskip % Don't split a short final column in two. \setbox2=\vbox{}% + \global\setbox\balancedcolumns=\vbox{\pagesofar}% \else \divide\dimen@ by 2 % target to split to \dimen@ii = \dimen@ @@ -6016,15 +6023,15 @@ end \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. - \setbox2=\box0 - \setbox0 = \vsplit2 to \dimen@ii - \setbox0=\vbox to \dimen@ii {\unvbox0\vfill}% - \setbox2=\vbox to \dimen@ii {\unvbox2\vfill}% + % It appears that we have been called upon to balance too much material. + % Output some of it with \doublecolumnout, leaving the rest on the page. + \setbox\PAGE=\box0 + \doublecolumnout \else % Compare the heights of the two columns. \ifdim4\ht1>5\ht3 @@ -6037,10 +6044,10 @@ end \setbox2=\vbox to\ht1{\unvbox3\unskip}% \setbox0=\vbox to\ht1{\unvbox1\unskip}% \fi + \global\setbox\balancedcolumns=\vbox{\pagesofar}% \fi \fi % - \global\setbox\balancedcolumns=\vbox{\pagesofar}% } \catcode`\@ = \other diff --git a/Master/doc.html b/Master/doc.html index a190dcd3bb9..545fb4c74c7 100644 --- a/Master/doc.html +++ b/Master/doc.html @@ -2044,7 +2044,9 @@ Use op. cit. for the booktitle of a subentry <li><b><a href="texmf-dist/doc/latex/biblatex-oxref">biblatex-oxref</a></b>:<small> BibLaTeX styles inspired by the Oxford Guide to Style +<a href="texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf">oxalph-doc.pdf</a>, <a href="texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf">oxnotes-doc.pdf</a>, +<a href="texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf">oxnum-doc.pdf</a>, <a href="texmf-dist/doc/latex/biblatex-oxref/oxref.pdf">oxref.pdf</a>, <a href="texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf">oxyear-doc.pdf</a>. </small></li> @@ -15504,6 +15506,7 @@ Tagging tables of contents </small></li> <li><b><a href="texmf-dist/doc/latex/tablestyles">tablestyles</a></b>:<small> +Styles for tables with new commands <a href="texmf-dist/doc/latex/tablestyles/tablestyles.pdf">tablestyles.pdf</a>. </small></li> @@ -15823,6 +15826,7 @@ References for TeX and Friends </small></li> <li><b><a href="texmf-dist/doc/generic/tex-virtual-academy-pl/context">tex-virtual-academy-pl</a></b>:<small> +TeX usage web pages, in Polish <a href="texmf-dist/doc/generic/tex-virtual-academy-pl/context/context.html">context.html</a>, <a href="texmf-dist/doc/generic/tex-virtual-academy-pl/context/tytuly.html">tytuly.html</a>, <a href="texmf-dist/doc/generic/tex-virtual-academy-pl/cototex.html">cototex.html</a>, @@ -16973,6 +16977,7 @@ Truncate text to a specified width </small></li> <li><b><a href="texmf-dist/doc/man/man1">ttfutils</a></b>:<small> +convert TrueType to TFM and PK fonts <a href="texmf-dist/doc/man/man1/ttf2afm.man1.pdf">ttf2afm.man1.pdf</a>, <a href="texmf-dist/doc/man/man1/ttf2pk.man1.pdf">ttf2pk.man1.pdf</a>, <a href="texmf-dist/doc/man/man1/ttf2tfm.man1.pdf">ttf2tfm.man1.pdf</a>, @@ -17314,7 +17319,9 @@ Citation style for linguistic studies at the University of Wuppertal <li><b><a href="texmf-dist/doc/latex/unicode-math">unicode-math</a></b>:<small> Unicode mathematics support for XeTeX and LuaTeX +<a href="texmf-dist/doc/latex/unicode-math/unicode-math-code.pdf">unicode-math-code.pdf</a>, <a href="texmf-dist/doc/latex/unicode-math/unicode-math.pdf">unicode-math.pdf</a>, +<a href="texmf-dist/doc/latex/unicode-math/unimath-example.pdf">unimath-example.pdf</a>, <a href="texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf">unimath-symbols.pdf</a>. </small></li> |