latex2e (19sep14)

git-svn-id: svn://tug.org/texlive/trunk@35209 c570f23f-e606-0410-a88d-b1316a301751

13 files changed, 102 insertions, 40 deletions

diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt
index 2f395cc5866..58eb86c26ce 100644
--- a/Master/texmf-dist/doc/latex/base/changes.txt
+++ b/Master/texmf-dist/doc/latex/base/changes.txt
@@ -4,6 +4,11 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+
+2014-08-30  Frank Mittelbach  <latex-bugs@latex-project.org>
+
+	* fixltx2e.dtx: Reset all within counters in one go (pr/4393)
+
 2014-06-10  David Carlisle  <latex-bugs@latex-project.org>
 
 	* fixltx2e.dtx: add missing \fi reported by Ulrike Fischer
diff --git a/Master/texmf-dist/doc/latex/base/fixltx2e.pdf b/Master/texmf-dist/doc/latex/base/fixltx2e.pdf
index cad63280456..418c3df6807 100644
--- a/Master/texmf-dist/doc/latex/base/fixltx2e.pdf
+++ b/Master/texmf-dist/doc/latex/base/fixltx2e.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/changes.txt b/Master/texmf-dist/doc/latex/tools/changes.txt
index be2740ff79f..ea0389cb81b 100644
--- a/Master/texmf-dist/doc/latex/tools/changes.txt
+++ b/Master/texmf-dist/doc/latex/tools/changes.txt
@@ -5,6 +5,23 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2014-08-24    <Frank.Mittelbach@latex-project.org>
+
+	* multicol.dtx: set \prevdepth to 0pt (in the right place)
+	after adding the multicol material. Was not happening in boxed mode.
+	Test for excessive depth of columns using > not = (which nearly
+	ever will be correct)
+
+2014-07-03    <Frank.Mittelbach@latex-project.org>
+
+	* varioref.dtx: correct Romanian default text as suggested
+
+2014-06-19  Frank Mittelbach  <latex-bugs@latex-project.org>
+
+	* multicol.dtx: color-leak fix introduced a spacing problem in boxed mode
+	as the added color commands were hiding any space at the bottom of the box
+	material (which thus didn't get discarded)
+
 2014-05-14  David Carlisle  <latex-bugs@latex-project.org>
 
 	* readme.txt: rename to 00readme.txt.
diff --git a/Master/texmf-dist/doc/latex/tools/multicol.pdf b/Master/texmf-dist/doc/latex/tools/multicol.pdf
index b931baebef6..0db29c9728c 100644
--- a/Master/texmf-dist/doc/latex/tools/multicol.pdf
+++ b/Master/texmf-dist/doc/latex/tools/multicol.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/varioref.pdf b/Master/texmf-dist/doc/latex/tools/varioref.pdf
index 85f4d641360..4937ddeb5ff 100644
--- a/Master/texmf-dist/doc/latex/tools/varioref.pdf
+++ b/Master/texmf-dist/doc/latex/tools/varioref.pdf
diff --git a/Master/texmf-dist/source/latex/base/fixltx2e.dtx b/Master/texmf-dist/source/latex/base/fixltx2e.dtx
index b6ed3420cb3..dc2d5522254 100644
--- a/Master/texmf-dist/source/latex/base/fixltx2e.dtx
+++ b/Master/texmf-dist/source/latex/base/fixltx2e.dtx
@@ -38,7 +38,7 @@
 %<driver>\ProvidesFile{fixltx2e.drv}
 % \fi
 %         \ProvidesFile{fixltx2e.dtx}
-          [2014/06/10 v1.1r fixes to LaTeX]
+          [2014/08/30 v1.1s fixes to LaTeX]
 %
 % \iffalse
 %<*driver>
@@ -54,7 +54,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1214}
+% \CheckSum{1221}
 %
 %% \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
@@ -745,6 +745,25 @@
 %  operation to get at the column marks invalid.
 %
 %
+% \section{Fixes added after 2014/05/01}
+%
+% \subsection{Within counters only reset next level down (pr4393)}
+%
+% This is actually implicitly documented behavior in the \LaTeX{}
+% Manual that states that |\stepcounter| resets all counters marked
+% ``within''. However it means that if, for example, theorems are
+% numbered within sections and you start a new chapter in a book, the
+% section counter is reset to zero but the theorem counter is not
+% until the first section appears. Thus a theorem directly within the
+% chapter body (without a new section) would show an incremented
+% number relative to the last theorem of the previous chapter.
+%
+%
+% For this reason we are now resetting all levels of within in one go
+% even if that means that some of these resets may happen several times
+% unnecessarily.
+%
+%
 % \StopEventually{}
 %
 % \section{Implementation}
@@ -2245,6 +2264,17 @@
 }
 %    \end{macrocode}
 %
+% \subsection{Within counters only reset next level down}
+%
+% \changes{v1.1s}{2014/08/30}{Reset all within counters in one go}
+%
+%    Rather than resetting the ``within'' counter to zero we set it to
+%    $-1$ and then run |\stepcounter| that moves it to $0$ and also
+%    initiates resetting the next level down.
+%    \begin{macrocode}
+ \def\@stpelt#1{\global\csname c@#1\endcsname \m@ne\stepcounter{#1}}
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 %</fixltx2e>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/unpack.ins b/Master/texmf-dist/source/latex/base/unpack.ins
index 4a5484d10f9..b5c068f7d06 100644
--- a/Master/texmf-dist/source/latex/base/unpack.ins
+++ b/Master/texmf-dist/source/latex/base/unpack.ins
@@ -60,7 +60,8 @@
 }
 
 
-\askonceonly
+%\askonceonly
+\askforoverwritefalse
 
 \keepsilent
 
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 @@
 %<driver> \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 @@
 %
 %<package>\NeedsTeXFormat{LaTeX2e}[1995/05/16]
 %<package>\ProvidesPackage{varioref}
-%<package>    [2011/10/02 v1.4z package for extended references (FMi)]
+%<package>    [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=<florin.oprina@gmail.com>=).
 % \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}}%
diff --git a/Master/texmf-dist/tex/latex/base/fix-cm.sty b/Master/texmf-dist/tex/latex/base/fix-cm.sty
index f6d5f14b304..95ab8deab9a 100644
--- a/Master/texmf-dist/tex/latex/base/fix-cm.sty
+++ b/Master/texmf-dist/tex/latex/base/fix-cm.sty
@@ -38,7 +38,7 @@
 %% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fix-cm}
-          [2014/06/10 v1.1r fixes to LaTeX]
+          [2014/08/30 v1.1s fixes to LaTeX]
 %% \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
diff --git a/Master/texmf-dist/tex/latex/base/fixltx2e.sty b/Master/texmf-dist/tex/latex/base/fixltx2e.sty
index 6d7cd859cee..f877d313c28 100644
--- a/Master/texmf-dist/tex/latex/base/fixltx2e.sty
+++ b/Master/texmf-dist/tex/latex/base/fixltx2e.sty
@@ -38,7 +38,7 @@
 %% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fixltx2e}
-          [2014/06/10 v1.1r fixes to LaTeX]
+          [2014/08/30 v1.1s fixes to LaTeX]
 %% \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
@@ -551,6 +551,7 @@
         \@parboxrestore
         \@floatboxreset
 }
+ \def\@stpelt#1{\global\csname c@#1\endcsname \m@ne\stepcounter{#1}}
 \endinput
 %%
 %% End of file `fixltx2e.sty'.
diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty
index 974a431f34d..c990c7273d1 100644
--- a/Master/texmf-dist/tex/latex/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex/tools/multicol.sty
@@ -31,7 +31,7 @@
 %% given in the file `manifest.txt'.
 %% 
 %% 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
@@ -96,8 +96,8 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]
 \ProvidesPackage{multicol}
-          [2014/04/23 v1.8e  multicolumn formatting (FMi)]
-%% \CheckSum{1839}
+          [2014/08/24 v1.8g  multicolumn formatting (FMi)]
+%% \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
@@ -300,7 +300,7 @@
 \newdimen\multicol@leftmargin
 \def\endmulticols{\par
   \if@boxedmulticols
-    \color@endgroup\egroup
+    \remove@discardable@items\color@endgroup\egroup
     \balance@columns
     \return@nonemptymark{first}%
                  \kept@firstmark
@@ -324,7 +324,6 @@
         \unvbox\colbreak@box\fi
     \fi
    \penalty\z@
-   \prevdepth\z@
    \output{\balance@columns@out}\eject
     \ifvbox\partial@page
          \unvbox\partial@page\fi
@@ -403,8 +402,9 @@
        \mc@align@columns
        \rlap{\phantom p}%
     }%
+   \prevdepth\z@
  \kern-\dimen\tw@
- \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/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty
index 0780913c3d0..bcd792a57d3 100644
--- a/Master/texmf-dist/tex/latex/tools/varioref.sty
+++ b/Master/texmf-dist/tex/latex/tools/varioref.sty
@@ -31,7 +31,7 @@
 %% given in the file `manifest.txt'.
 %% 
 %% 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
@@ -42,7 +42,7 @@
 %%
 \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)]
 %% \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
@@ -501,8 +501,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}}%