diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/base/latex.ltx')
-rw-r--r-- | Master/texmf-dist/tex/latex/base/latex.ltx | 74 |
1 files changed, 19 insertions, 55 deletions
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index 9c838f1d163..feb482a60ba 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -323,7 +323,7 @@ \def\newdimen {\e@alloc\dimen \dimendef {\count11}\insc@unt\float@count} \def\newskip {\e@alloc\skip \skipdef {\count12}\insc@unt\float@count} \def\newmuskip - {\e@alloc\muskip\muskipdef{\count13}\e@alloc@top\e@alloc@top} + {\e@alloc\muskip\muskipdef{\count13}\m@ne\e@alloc@top} \def\newbox {\e@alloc\box {\ifnum\allocationnumber<\@cclvi \expandafter\chardef @@ -331,12 +331,12 @@ \expandafter\e@alloc@chardef \fi} {\count14}\insc@unt\float@count} -\def\newtoks {\e@alloc\toks \toksdef{\count15}\e@alloc@top\e@alloc@top} -\def\newread {\e@alloc\read \chardef{\count16}\sixt@@n\sixt@@n} -\def\newwrite {\e@alloc\write \chardef{\count17}\sixt@@n\sixt@@n} +\def\newtoks {\e@alloc\toks \toksdef{\count15}\m@ne\e@alloc@top} +\def\newread {\e@alloc\read \chardef{\count16}\m@ne\sixt@@n} +\def\newwrite {\e@alloc\write \chardef{\count17}\m@ne\sixt@@n} \def\new@mathgroup - {\e@alloc\mathgroup\chardef{\count18}\e@mathgroup@top\e@mathgroup@top} -\def\newlanguage {\e@alloc\language \chardef{\count19}\@cclvi\@cclvi} + {\e@alloc\mathgroup\chardef{\count18}\m@ne\e@mathgroup@top} +\def\newlanguage {\e@alloc\language \chardef{\count19}\m@ne\@cclvi} \let\newfam\new@mathgroup \ifx\directlua\@undefined \ifx\widowpenalties\@undefined @@ -357,7 +357,7 @@ \fi \def\e@alloc#1#2#3#4#5#6{% \global\advance#3\@ne - \e@ch@ck{#3}#4#5#1% + \e@ch@ck{#3}{#4}{#5}#1% \allocationnumber#3\relax \global#2#6\allocationnumber \wlog{\string#6=\string#1\the\allocationnumber}}% @@ -421,7 +421,6 @@ \errmessage{No room for a new #3}% \fi} \def\newhelp#1#2{\newtoks#1#1\expandafter{\csname#2\endcsname}} -\def\newtoks{\alloc@5\toks\toksdef\@cclvi} \newdimen\maxdimen \maxdimen=16383.99999pt % the largest legal <dimen> \newskip\hideskip \hideskip=-1000pt plus 1fill % negative but can grow \newdimen\p@ \p@=1pt % this saves macro space and time @@ -665,6 +664,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2015/01/01} +\def\patch@level{1} \iffalse \def\reserved@a#1/#2/#3\@nil{% \count@\year @@ -689,10 +689,15 @@ \fi \let\reserved@a\relax \fi -\everyjob\expandafter{% - \the\everyjob - \typeout{\fmtname \space<\fmtversion>}} -\immediate\write16{\fmtname \space<\fmtversion>} + \ifnum\patch@level=0 + \everyjob\expandafter{\the\everyjob + \typeout{\fmtname \space<\fmtversion>}} + \immediate\write16{\fmtname \space<\fmtversion>} + \else + \everyjob\expandafter{\the\everyjob + \typeout{\fmtname \space<\fmtversion> patch level \patch@level}} + \immediate\write16{\fmtname \space<\fmtversion> patch level \patch@level} + \fi \def\IncludeInRelease#1{\kernel@ifnextchar[% {\@IncludeInRelease{#1}} {\@IncludeInRelease{#1}[#1]}} @@ -7908,14 +7913,14 @@ Type H <return> for immediate help.}% \newcount\@highpenalty \ifx\marks\@undefined\else \def\newmarks{% - \e@alloc\marks \e@alloc@chardef{\count256}\e@alloc@top\e@alloc@top} + \e@alloc\marks \e@alloc@chardef{\count256}\m@ne\e@alloc@top} \fi \ifx\XeTeXcharclass\@undefined \else \countdef\xe@alloc@intercharclass=257 \xe@alloc@intercharclass=\thr@@ \def\newXeTeXintercharclass{% - \e@alloc\XeTeXcharclass\chardef\xe@alloc@intercharclass\@cclv\@cclv} + \e@alloc\XeTeXcharclass\chardef\xe@alloc@intercharclass\m@ne\@cclv} \fi \unitlength = 1pt \fboxsep = 3pt @@ -8108,47 +8113,6 @@ Type H <return> for immediate help.}% \dh\DH\dj\DJ\l\L\ng\NG\ss\SS\th\TH} \protected@edef\MakeUppercase#1{\MakeUppercase{#1}} \protected@edef\MakeLowercase#1{\MakeLowercase{#1}} -\IfFileExists{ltpatch.ltx} - {\typeout{=================================^^J% - Applying patch file ltpatch.ltx^^J% - =================================} - \def\fmtversion@topatch{unknown} - \input{ltpatch.ltx} - \ifx\fmtversion\fmtversion@topatch - \ifx\patch@level\@undefined - \typeout{^^J^^J^^J% - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J% - !! Patch file `ltpatch.ltx' not suitable for this^^J% - !! version of LaTeX.^^J^^J% - !! Please check if initex found an old patch file:^^J% - !! --- if so, rename it or delete it, and redo the^^J% - !! initex run.^^J% - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J}% - \batchmode \@@end - \else - \def\fmtversion@topatch{0}% - \ifx\fmtversion@topatch\patch@level\else - \def\reserved@a\typeout##1##2\reserved@a{% - \typeout{##1 patch level \patch@level}##2} - \everyjob\expandafter\expandafter\expandafter{% - \expandafter\reserved@a\the\everyjob\reserved@a} - \let\reserved@a\relax - \the\everyjob - \fi - \fi - \else - \typeout{^^J^^J^^J% - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J% - !! Patch file `ltpatch.ltx' (for version <\fmtversion@topatch>)^^J% - !! is not suitable for version <\fmtversion> of LaTeX.^^J^^J% - !! Please check if initex found an old patch file:^^J% - !! --- if so, rename it or delete it, and redo the^^J% - !! initex run.^^J% - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J}% - \batchmode \@@end - \fi - \let\fmtversion@topatch\relax - }{} \let\reserved@a\@filelist \let\reserved@b=\@undefined \let\reserved@c=\@undefined |