From 87de64a55b20671a3b63f28699b68a97c0f0d02c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 30 Jul 2016 23:07:33 +0000 Subject: latex (30jul16) git-svn-id: svn://tug.org/texlive/trunk@41765 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/base/latexrelease.dtx | 4 ++-- Master/texmf-dist/source/latex/base/ltplain.dtx | 13 ++++++++----- Master/texmf-dist/source/latex/base/ltspace.dtx | 6 +++--- Master/texmf-dist/source/latex/base/ltvers.dtx | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/source/latex/base') diff --git a/Master/texmf-dist/source/latex/base/latexrelease.dtx b/Master/texmf-dist/source/latex/base/latexrelease.dtx index 34929854e45..8cb0028b363 100644 --- a/Master/texmf-dist/source/latex/base/latexrelease.dtx +++ b/Master/texmf-dist/source/latex/base/latexrelease.dtx @@ -39,7 +39,7 @@ %<*!fixltx2e> % \fi % \ProvidesFile{latexrelease.dtx} - [2015/06/22 v1.0f LaTeX release emulation and tests] + [2016/07/04 v1.0g LaTeX release emulation and tests] % \iffalse % %<*driver> @@ -429,7 +429,7 @@ >\expandafter\@parse@version\latexreleaseversion//00\@nil \PackageWarningNoLine{latexrelease}{% The current package is for an older LaTeX format:\MessageBreak -LaTeX \fmtversion\space\MessageBreak +LaTeX \latexreleaseversion\space\MessageBreak Obtain a newer version of this package!} \expandafter\endinput \fi diff --git a/Master/texmf-dist/source/latex/base/ltplain.dtx b/Master/texmf-dist/source/latex/base/ltplain.dtx index f4eda258a3d..afe2fead63d 100644 --- a/Master/texmf-dist/source/latex/base/ltplain.dtx +++ b/Master/texmf-dist/source/latex/base/ltplain.dtx @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltplain.dtx} - [2015/11/18 v2.2b LaTeX Kernel (Plain TeX)] + [2016/07/29 v2.2c LaTeX Kernel (Plain TeX)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltplain.dtx} @@ -613,6 +613,7 @@ % \end{macrocode} % % \begin{macro}{\extrafloats} +% \changes{v2.2c}{2016/07/29}{use \cs{global} \cs{chardef}} % \begin{macrocode} \ifx\numexpr\@undefined % \end{macrocode} @@ -622,7 +623,7 @@ \count@#1\relax \ifnum\count@>\z@ \newinsert\reserved@a -\expandafter\chardef +\global\expandafter\chardef \csname bx@\the\allocationnumber\endcsname\allocationnumber \@cons\@freelist{\csname bx@\the\allocationnumber\endcsname}% \advance\count@\m@ne @@ -644,8 +645,8 @@ \ch@ck1\count@\dimen \ch@ck2\count@\skip \ch@ck4\count@\box -\e@alloc@chardef\float@count\count@ -\expandafter\e@alloc@chardef +\global\e@alloc@chardef\float@count\count@ +\global\expandafter\e@alloc@chardef \csname bx@\the\float@count\endcsname\float@count \@cons\@freelist{\csname bx@\the\float@count\endcsname}% \expandafter @@ -716,9 +717,11 @@ % \end{macrocode} % If the classic registers are exausted, take an insert from the free float list % and use |\extrafloats| to add a new float to that list. +% \changes{v2.2c}{2016/07/29}{fix for tlb-newinsert-001} % \begin{macrocode} \def\newinsert#1{% \@tempswafalse +\global\advance\insc@unt\m@ne \ifnum\count10<\insc@unt \ifnum\count11<\insc@unt \ifnum\count12<\insc@unt @@ -726,9 +729,9 @@ \@tempswatrue \fi\fi\fi\fi \if@tempswa -\global\advance\insc@unt\m@ne \allocationnumber\insc@unt \else +\global\advance\insc@unt\@ne \extrafloats\@ne \@next\@currbox\@freelist {\ifnum\@currbox<\e@insert@top diff --git a/Master/texmf-dist/source/latex/base/ltspace.dtx b/Master/texmf-dist/source/latex/base/ltspace.dtx index 5a8e8633b8f..0459c30ef42 100644 --- a/Master/texmf-dist/source/latex/base/ltspace.dtx +++ b/Master/texmf-dist/source/latex/base/ltspace.dtx @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltspace.dtx} - [2015/11/07 v1.3f LaTeX Kernel (spacing)] + [2016/07/04 v1.3g LaTeX Kernel (spacing)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltspace.dtx} @@ -551,7 +551,7 @@ % \changes{v1.3d}{2015/01/11}{Allow hyphenation (Donald Arseneau pr/3498) (latexrelease)} % \begin{macrocode} % -%\IncludeInRelease{2015/01/01}% +%\IncludeInRelease{2015/10/01}% % {\@esphack}{hyphenation after space hack}% %<*2ekernel|latexrelease> \def\@esphack{% @@ -607,7 +607,7 @@ % \begin{macrocode} % %\IncludeInRelease{2015/01/01}% -% {\Eesphack}{hyphenation after space hack}% +% {\@Esphack}{hyphenation after space hack}% %<*2ekernel|latexrelease> \def\@Esphack{% \relax diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index c7415266ab4..aaaf4b8fb52 100644 --- a/Master/texmf-dist/source/latex/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex/base/ltvers.dtx @@ -95,7 +95,7 @@ {2016/03/31} % %<*2ekernel> -\def\patch@level{2} +\def\patch@level{3} % \end{macrocode} % \end{macro} % \end{macro} -- cgit v1.2.3