summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-07-30 23:07:33 +0000
committerKarl Berry <karl@freefriends.org>2016-07-30 23:07:33 +0000
commit87de64a55b20671a3b63f28699b68a97c0f0d02c (patch)
tree66cf652f496d5f2ebe2a80c7ed23800069a88195 /Master/texmf-dist/tex/latex/base
parentac3b718eba78b8184901dd441561b896a9fb93b3 (diff)
latex (30jul16)
git-svn-id: svn://tug.org/texlive/trunk@41765 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/base')
-rw-r--r--Master/texmf-dist/tex/latex/base/latex.ltx11
-rw-r--r--Master/texmf-dist/tex/latex/base/latexrelease.sty17
2 files changed, 15 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index 94e70269ba3..d07e888c1a4 100644
--- a/Master/texmf-dist/tex/latex/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex/base/latex.ltx
@@ -387,7 +387,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
@@ -403,8 +403,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
@@ -433,6 +433,7 @@
\fi
\def\newinsert#1{%
\@tempswafalse
+\global\advance\insc@unt\m@ne
\ifnum\count10<\insc@unt
\ifnum\count11<\insc@unt
\ifnum\count12<\insc@unt
@@ -440,9 +441,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
@@ -704,7 +705,7 @@
\def\fmtname{LaTeX2e}
\edef\fmtversion
{2016/03/31}
-\def\patch@level{2}
+\def\patch@level{3}
\iffalse
\def\reserved@a#1/#2/#3\@nil{%
\count@\year
diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty
index e6394680bf1..2b373673db6 100644
--- a/Master/texmf-dist/tex/latex/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty
@@ -86,7 +86,7 @@
\long\def\@gobble@IncludeInRelease#1\EndIncludeInRelease{}
\let\EndIncludeInRelease\relax
\ProvidesPackage{latexrelease}
- [2015/06/22 v1.0f LaTeX release emulation and tests]
+ [2016/07/04 v1.0g LaTeX release emulation and tests]
\NeedsTeXFormat{LaTeX2e}[1996/06/01]
\DeclareOption*{%
\def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#1}}%
@@ -121,7 +121,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
@@ -1315,7 +1315,7 @@ of this package available from CTAN}
}%
\EndIncludeInRelease
%%% From File: ltspace.dtx
-\IncludeInRelease{2015/01/01}%
+\IncludeInRelease{2015/10/01}%
{\@esphack}{hyphenation after space hack}%
\def\@esphack{%
\relax
@@ -1353,7 +1353,7 @@ of this package available from CTAN}
\fi}%
\EndIncludeInRelease
\IncludeInRelease{2015/01/01}%
- {\Eesphack}{hyphenation after space hack}%
+ {\@Esphack}{hyphenation after space hack}%
\def\@Esphack{%
\relax
\ifhmode
@@ -1570,7 +1570,7 @@ of this package available from CTAN}
\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
@@ -1586,8 +1586,8 @@ of this package available from CTAN}
\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
@@ -1619,6 +1619,7 @@ of this package available from CTAN}
\fi
\def\newinsert#1{%
\@tempswafalse
+\global\advance\insc@unt\m@ne
\ifnum\count10<\insc@unt
\ifnum\count11<\insc@unt
\ifnum\count12<\insc@unt
@@ -1626,9 +1627,9 @@ of this package available from CTAN}
\@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