From 3b378d704d5d92df25314e52e0ce8cac217e9fd0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 19 Sep 2014 22:29:15 +0000 Subject: latex2e (19sep14) git-svn-id: svn://tug.org/texlive/trunk@35209 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/tools/multicol.dtx | 41 +++++++++++++---------- Master/texmf-dist/source/latex/tools/varioref.dtx | 17 ++++++---- 2 files changed, 33 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/source/latex/tools') diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx index 3d70d330f66..786517c0011 100644 --- a/Master/texmf-dist/source/latex/tools/multicol.dtx +++ b/Master/texmf-dist/source/latex/tools/multicol.dtx @@ -20,7 +20,7 @@ % \iffalse This is a METACOMMENT % %% Package `multicol' to use with LaTeX2e -%% Copyright 1989-2013 Frank Mittelbach +%% Copyright 1989-2014 Frank Mittelbach %% %% In addition to the terms of LPPL any distributed version %% (unchanged or modified) of multicol has to keep the statement @@ -91,10 +91,10 @@ % \ProvidesFile{multicol.drv} % \fi % \ProvidesFile{multicol.dtx} - [2014/04/23 v1.8e multicolumn formatting (FMi)] + [2014/08/24 v1.8g multicolumn formatting (FMi)] % % -%% \CheckSum{1839} +%% \CheckSum{1840} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -1671,10 +1671,15 @@ \if@boxedmulticols % \end{macrocode} % In boxed mode we have to close the box in which we have gathered -% all material for the columns. +% all material for the columns. But before we do this we need to +% remove any space at the end of the box as we don't want to use +% this in balancing. Because of the |\color@endgroup| this can't be +% done later in |\balance@columns| as the color command will hide +% it. % \changes{v1.8c}{2013/11/03}{Add \cs{color@endgroup} to prevent color leak} +% \changes{v1.8f}{2014/06/19}{Discard spaces before adding \cs{color@endgroup}} % \begin{macrocode} - \color@endgroup\egroup + \remove@discardable@items\color@endgroup\egroup % \end{macrocode} % Now we call |\balance@columns| the routine that balances material % stored in the box |\mult@box|. @@ -1757,16 +1762,6 @@ % \begin{macrocode} \penalty\z@ % \end{macrocode} -% The processed material might consist of a last line with a -% decender in which case the |\prevdepth| will be -% non-zero. However, this material is getting reformatted now so -% that this value is likely to be wrong. We therefore normalize the -% situation by pretending that the depth is zero and arrange later -% that the box containing the assembled columns has in fact this property. -% \changes{v1.6a}{2003/03/15}{Adjusting \cs{prevdepth}} -% \begin{macrocode} - \prevdepth\z@ -% \end{macrocode} % Now it's safe to change the output routine in order to balance % the columns. % \begin{macrocode} @@ -2056,15 +2051,24 @@ % The depths of the columns depend on their last lines. To ensure % that we will always get a similar look as far as the rules are % concerned we force the depth to be at least the depth of a -% letter~`p' (which is what we initialized |\dimen2| to aboved). +% letter~`p' (which is what we initialized |\dimen2| to above). % \begin{macrocode} \rlap{\phantom p}% }% % \end{macrocode} +% The processed material might consist of a last line with a +% decender in which case the |\prevdepth| will be +% non-zero. However, this material is getting reformatted now so +% that this value is likely to be wrong. We therefore normalize the +% situation by pretending that the depth is zero. +% \changes{v1.8g}{2014/08/24}{Resetting \cs{prevdepth} in the right place} +% \begin{macrocode} + \prevdepth\z@ +% \end{macrocode} % Now after typesetting the box we back up to its baseline by using % the value stored in |\dimen2| (which will hold the largest depth % found on any column). -% \changes{v1.6a}{2003/03/15}{Now adjusting \cs{prevdepth}} +% \changes{v1.8g}{2003/03/15}{Now adjusting \cs{prevdepth}} % \begin{macrocode} \kern-\dimen\tw@ % \end{macrocode} @@ -2075,8 +2079,9 @@ % absolute proof. If the option \texttt{grid} is used % |\mc@gridwarn| will expand to this, otherwise to |\maxdimen| in % which case this warning will not show up. +% \changes{v1.8g}{2014/08/24}{Warn if value is exceeded not when equal} % \begin{macrocode} - \ifdim\dimen\tw@ = \mc@gridwarn + \ifdim\dimen\tw@ > \mc@gridwarn \PackageWarning{multicol}% {Very deep columns!\MessageBreak Grid alignment might be broken}% diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx index 5a1d3375fa0..108419b6f64 100644 --- a/Master/texmf-dist/source/latex/tools/varioref.dtx +++ b/Master/texmf-dist/source/latex/tools/varioref.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2011 +% Copyright 1993-2014 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -21,7 +21,7 @@ % \fi % \iffalse %% Package varioref to use with LaTeX2e -%% Copyright (C) 1992-2011 Frank Mittelbach, all rights reserved. +%% Copyright (C) 1992-2014 Frank Mittelbach, all rights reserved. %% %% For additions or updates to the language options please contact %% the author at @@ -33,10 +33,10 @@ % %\NeedsTeXFormat{LaTeX2e}[1995/05/16] %\ProvidesPackage{varioref} -% [2011/10/02 v1.4z package for extended references (FMi)] +% [2014/07/03 v1.5a package for extended references (FMi)] % \fi % -% \CheckSum{2164} +% \CheckSum{2165} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -760,7 +760,7 @@ \def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}% }} % \end{macrocode} -% Text for croatian defaults was contributed by Sime Ungar +% Text for croatian defaults was contributed by \v{S}ime Ungar % (\verb=ungar@math.hr=). % \changes{v1.4p}{2006/05/13}{Added defaults for croatian} % \begin{macrocode} @@ -1210,7 +1210,10 @@ \def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}% }} % \end{macrocode} +% Updates to the default text for Romanian have been suggested by Florin Oprina +% (\verb==). % \changes{v1.4v}{2009/06/13}{Incorrect text in \cs{reftextafter} (pr/4070)} +% \changes{v1.5a}{2014/07/03}{Correct text in \cs{reftextbefore}} % \begin{macrocode} \DeclareOption{romanian} {\vref@addto\extrasromanian{% @@ -1218,8 +1221,8 @@ \def\reftextfacebefore{pe pagina \reftextvario{opus\u{a}}{precedentei}}% \def\reftextafter {\reftextvario{pe pagina urm\u{a}toare}% {pe urm\u{a}toarea pagin\u{a}}}% - \def\reftextbefore {pe pagina \reftextvario{dinaintea}{ - precedentei}}% + \def\reftextbefore {pe pagina \reftextvario{precedent\u{a}}% + {precedentei}}% \def\reftextcurrent {pe aceast\u{a} pagin\u{a}}% \def\reftextfaraway#1{pe pagina~\pageref{#1}}% \def\reftextpagerange#1#2{pe paginile~\pageref{#1}--\pageref{#2}}% -- cgit v1.2.3