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/tex/latex/base/fix-cm.sty | 2 +- Master/texmf-dist/tex/latex/base/fixltx2e.sty | 3 ++- Master/texmf-dist/tex/latex/tools/multicol.sty | 12 ++++++------ Master/texmf-dist/tex/latex/tools/varioref.sty | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex') 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}}% -- cgit v1.2.3