summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-02 22:14:43 +0000
committerKarl Berry <karl@freefriends.org>2015-07-02 22:14:43 +0000
commit8c0844204a3fbad2c755beca8c0b1edc6ae33601 (patch)
tree71c54caf8fd2007a53ad7f1b518f231a61aa2a07 /Master/texmf-dist/source/latex/base
parent586aedcf63ecf6ea7da1c1529e5ea5ba8f5cb426 (diff)
latex (2jul15)
git-svn-id: svn://tug.org/texlive/trunk@37737 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base')
-rw-r--r--Master/texmf-dist/source/latex/base/latexrelease.dtx7
-rw-r--r--Master/texmf-dist/source/latex/base/latexrelease.ins2
-rw-r--r--Master/texmf-dist/source/latex/base/ltcounts.dtx11
-rw-r--r--Master/texmf-dist/source/latex/base/ltfinal.dtx96
-rw-r--r--Master/texmf-dist/source/latex/base/ltfsscmp.dtx4
-rw-r--r--Master/texmf-dist/source/latex/base/ltfssdcl.dtx77
-rw-r--r--Master/texmf-dist/source/latex/base/ltnews22.tex2
-rw-r--r--Master/texmf-dist/source/latex/base/ltplain.dtx27
-rw-r--r--Master/texmf-dist/source/latex/base/ltunicode.dtx7
-rw-r--r--Master/texmf-dist/source/latex/base/ltvers.dtx24
-rw-r--r--Master/texmf-dist/source/latex/base/utf8ienc.dtx11
11 files changed, 184 insertions, 84 deletions
diff --git a/Master/texmf-dist/source/latex/base/latexrelease.dtx b/Master/texmf-dist/source/latex/base/latexrelease.dtx
index f5a305bf317..12c2c0854e1 100644
--- a/Master/texmf-dist/source/latex/base/latexrelease.dtx
+++ b/Master/texmf-dist/source/latex/base/latexrelease.dtx
@@ -34,13 +34,14 @@
%</dtx>
%<driver>\ProvidesFile{latexrelease.drv}
%<fixltx2e>\ProvidesPackage{fixltx2e}
+%<fixltx2e> [2015/06/22 v2.0b fixes to LaTeX (obsolete)]
%<latexrelease>\ProvidesPackage{latexrelease}
+%<*!fixltx2e>
% \fi
% \ProvidesFile{latexrelease.dtx}
-%<fixltx2e> [2015/02/21 v2.0a fixes to LaTeX (obsolete)]
-%<!fixltx2e> [2015/05/09 v1.0d LaTeX release emulation and tests]
-%
+ [2015/06/22 v1.0f LaTeX release emulation and tests]
% \iffalse
+%</!fixltx2e>
%<*driver>
\documentclass{ltxdoc}
\newcommand\Lopt[1]{\textsf{#1}}
diff --git a/Master/texmf-dist/source/latex/base/latexrelease.ins b/Master/texmf-dist/source/latex/base/latexrelease.ins
index 65d9e677a00..ae41fd88f91 100644
--- a/Master/texmf-dist/source/latex/base/latexrelease.ins
+++ b/Master/texmf-dist/source/latex/base/latexrelease.ins
@@ -84,11 +84,13 @@ extension .ins) which are part of the distribution.
\from{ltdefns.dtx} {latexrelease}%
\from{ltboxes.dtx} {latexrelease}%
\from{ltmath.dtx} {latexrelease}%
+ \from{ltcounts.dtx} {latexrelease}%
\from{ltlength.dtx} {latexrelease}%
\from{ltfloat.dtx} {latexrelease}%
\from{ltoutput.dtx} {latexrelease}%
\from{ltspace.dtx} {latexrelease}%
\from{ltplain.dtx} {latexrelease}%
+ \from{ltfssdcl.dtx} {latexrelease}%
\from{ltfssini.dtx} {latexrelease}%
\from{ltfssbas.dtx} {latexrelease}%
\from{ltfsscmp.dtx} {latexrelease}%
diff --git a/Master/texmf-dist/source/latex/base/ltcounts.dtx b/Master/texmf-dist/source/latex/base/ltcounts.dtx
index 935f5f4c11b..0fb2d8b90a8 100644
--- a/Master/texmf-dist/source/latex/base/ltcounts.dtx
+++ b/Master/texmf-dist/source/latex/base/ltcounts.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltcounts.dtx}
- [2015/01/10 v1.1h LaTeX Kernel (Counters)]
+ [2015/06/05 v1.1i LaTeX Kernel (Counters)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltcounts.dtx}
@@ -56,7 +56,7 @@
%</driver>
% \fi
%
-% \CheckSum{373}
+% \CheckSum{377}
%
% \changes{v1.0c}{1994/03/29}
% {Create file from parts of ltmiscen and ltherest.}
@@ -260,13 +260,14 @@
% initiates resetting the next level down.
% \begin{macrocode}
%</2ekernel>
-%<latexrelease>\IncludeInRelease}{2015/01/01}{\@stpelt}{%
+%<latexrelease>\IncludeInRelease{2015/01/01}{\@stpelt}{Reset nested counters}%
%<*2ekernel|latexrelease>
\def\@stpelt#1{\global\csname c@#1\endcsname \m@ne\stepcounter{#1}}%
+%<latexrelease>\EndIncludeInRelease
%</2ekernel|latexrelease>
-%<latexrelease>}
+%<latexrelease>\IncludeInRelease{0000/00/00}{\@stpelt}{Reset nested counters}%%
%<latexrelease>\def\@stpelt#1{\global\csname c@#1\endcsname \z@}%
-%<latexrelease>}
+%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/base/ltfinal.dtx b/Master/texmf-dist/source/latex/base/ltfinal.dtx
index 62223d3a1f0..d1d95dcd259 100644
--- a/Master/texmf-dist/source/latex/base/ltfinal.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfinal.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltfinal.dtx}
- [2015/04/28 v2.0f LaTeX Kernel (Final Settings)]
+ [2015/06/23 v2.0h LaTeX Kernel (Final Settings)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfinal.dtx}
@@ -115,6 +115,7 @@
%\begin{macro}{\newmarks}
% \changes{v2.0a}{2014/12/30}{macro added}
% \changes{v2.0b}{2015/01/23}{use reserved count 256}
+% \changes{v2.0g}{2015/06/19}{Use $-1$ for first range to get contiguous allocation}
% Allocate extended marks types if etex is active.
% Placed here at the end of the format
% to increase compatibility with count allocations
@@ -129,7 +130,7 @@
% \begin{macrocode}
\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
% \end{macrocode}
%
@@ -159,13 +160,14 @@
% \end{macrocode}
%
% Classes allocatedfrom 4 (1,2 and 3 are used by CJK), up to 254.
+% \changes{v2.0g}{2015/06/19}{Use $-1$ for first range to get contiguous allocation}
% \begin{macrocode}
\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
% \end{macrocode}
%
@@ -639,25 +641,29 @@
% Between major releases, small patches will be distributed in
% files |ltpatch.ltx| which must be added at this point.
% \changes{v1.0m}{1994/06/08}{Add patch file system}
-% \begin{macrocode}
-\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
+% \changes{v2.0h}{2015/06/23}
+% {set \cs{patch@level} in ltvers rather than in ltfinal/ltpatch}
+%
+% Patch file code removed.
+% \begin{macrocode}
+%\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
% \end{macrocode}
% \changes{v1.0q}{1995/04/21}
% {Allow initial patch level 0}
@@ -666,29 +672,29 @@
% The code below adds the `patch level' string to the first |\typeout|
% in the startup banner.
% \begin{macrocode}
- \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
- }{}
+% \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
+% }{}
% \end{macrocode}
%
% \subsection{Freeing Memory}
diff --git a/Master/texmf-dist/source/latex/base/ltfsscmp.dtx b/Master/texmf-dist/source/latex/base/ltfsscmp.dtx
index 755a8837b6e..6bcbe95eb31 100644
--- a/Master/texmf-dist/source/latex/base/ltfsscmp.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfsscmp.dtx
@@ -36,7 +36,7 @@
%
%
\ProvidesFile{ltfsscmp.dtx}
- [2015/02/22 v3.0e LaTeX Kernel (NFSS1 Compatibility)]
+ [2015/06/23 v3.0f LaTeX Kernel (NFSS1 Compatibility)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -124,7 +124,7 @@
% In older releases we provide the original definitions.
%
% \begin{macrocode}
-\IncludeInRelease{2014/05/01}{\new@fontshape}%
+\IncludeInRelease{0000/00/00}{\new@fontshape}%
{NFSS version1 commands}%
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
index 5d5ee12b8cf..e10734b6dad 100644
--- a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
@@ -52,7 +52,7 @@
%<+checkmem>\CHECKMEM
% \fi
%
-% \CheckSum{1887}
+% \CheckSum{2011}
%
%
% \GetFileInfo{ltfssdcl.dtx}
@@ -335,6 +335,10 @@
% per math version as no reset list)}
% \changes{v3.0q}{2015/03/18}{Introduce \cs{e@mathgroup@top}}
% \begin{macrocode}
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2015/01/01}
+%<latexrelease> {\select@group}{\select@group}%
+%<*2ekernel|latexrelease>
\def\select@group#1#2#3#4{%
\ifx\math@bgroup\bgroup\else\relax\expandafter\@firstofone\fi
{%
@@ -359,6 +363,40 @@
#1{#4}%
}%
}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}
+%<latexrelease> {\select@group}{\select@group}%
+%<latexrelease>\def\select@group#1#2#3#4{%
+%<latexrelease> \ifx\math@bgroup\bgroup\else\relax\expandafter\@firstofone\fi
+%<latexrelease> {%
+%<latexrelease> \ifmmode
+%<latexrelease> \ifnum\csname c@mv@\math@version\endcsname<\sixt@@n
+%<latexrelease> \begingroup
+%<latexrelease> \escapechar\m@ne
+%<latexrelease> \getanddefine@fonts
+%<latexrelease> {\csname c@mv@\math@version\endcsname}#3%
+%<latexrelease> \globaldefs\@ne \math@fonts
+%<latexrelease> \endgroup
+%<latexrelease> \init@restore@version
+%<latexrelease> \xdef#1{\noexpand\use@mathgroup\noexpand#2%
+%<latexrelease> {\number\csname c@mv@\math@version\endcsname}}%
+%<latexrelease> \global\advance\csname c@mv@\math@version\endcsname\@ne
+%<latexrelease> \else
+%<latexrelease> \let#1\relax
+%<latexrelease> \@latex@error{Too many math alphabets used in
+%<latexrelease> version \math@version}%
+%<latexrelease> \@eha
+%<latexrelease> \fi
+%<latexrelease> \else \expandafter\non@alpherr\fi
+%<latexrelease> #1{#4}%
+%<latexrelease> }%
+%<latexrelease>}
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
+% \end{macrocode}
+%
+% \begin{macrocode}
\@onlypreamble\restore@mathversion
% \end{macrocode}
% \end{macro}
@@ -427,6 +465,10 @@
% per math version as no reset list)}
% \changes{v3.0q}{2015/03/18}{Introduce \cs{e@mathgroup@top}}
% \begin{macrocode}
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2015/01/01}
+%<latexrelease> {\document@select@group}{\document@select@group}%
+%<*2ekernel|latexrelease>
\def\document@select@group#1#2#3#4{%
\ifx\math@bgroup\bgroup\else\relax\expandafter\@firstofone\fi
{%
@@ -453,6 +495,39 @@
#1{#4}%
}%
}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}
+%<latexrelease> {\document@select@group}{\document@select@group}%
+%<latexrelease>\def\document@select@group#1#2#3#4{%
+%<latexrelease> \ifx\math@bgroup\bgroup\else\relax\expandafter\@firstofone\fi
+%<latexrelease> {%
+%<latexrelease> \ifmmode
+%<latexrelease> \ifnum\csname c@mv@\math@version\endcsname<\sixt@@n
+%<latexrelease> \begingroup
+%<latexrelease> \escapechar\m@ne
+%<latexrelease> \getanddefine@fonts
+%<latexrelease> {\csname c@mv@\math@version\endcsname}#3%
+%<latexrelease> \globaldefs\@ne \math@fonts
+%<latexrelease> \endgroup
+%<latexrelease> \expandafter\extract@alph@from@version
+%<latexrelease> \csname mv@\math@version\expandafter\endcsname
+%<latexrelease> \expandafter{\number\csname
+%<latexrelease> c@mv@\math@version\endcsname}%
+%<latexrelease> #1%
+%<latexrelease> \global\advance\csname c@mv@\math@version\endcsname\@ne
+%<latexrelease> \else
+%<latexrelease> \let#1\relax
+%<latexrelease> \@latex@error{Too many math alphabets used
+%<latexrelease> in version \math@version}%
+%<latexrelease> \@eha
+%<latexrelease> \fi
+%<latexrelease> \else \expandafter\non@alpherr\fi
+%<latexrelease> #1{#4}%
+%<latexrelease> }%
+%<latexrelease>}
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/source/latex/base/ltnews22.tex b/Master/texmf-dist/source/latex/base/ltnews22.tex
index 8d4151beac6..7f6c307b752 100644
--- a/Master/texmf-dist/source/latex/base/ltnews22.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews22.tex
@@ -225,7 +225,7 @@ with modern \TeX\ distributions. It is already separately available
from CTAN. This replaces earlier build systems (based at various times on
\textsf{make}, \textsf{cons}, and Windows \textsf{bat} files). It allows the
sources to be tested and packaged on a range of platforms (within the team,
-OS X, Windows, Linux and and cygwin platforms are used). It also allows the
+OS X, Windows, Linux and cygwin platforms are used). It also allows the
format to be tested on \hologo{XeTeX} and \hologo{LuaTeX} as well as the
standard \hologo{pdfTeX}/\eTeX\ engines.
diff --git a/Master/texmf-dist/source/latex/base/ltplain.dtx b/Master/texmf-dist/source/latex/base/ltplain.dtx
index da1398c4538..f14969b31d0 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/03/10 v2.0g LaTeX Kernel (Plain TeX)]
+ [2015/06/19 v2.0h LaTeX Kernel (Plain TeX)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltplain.dtx}
@@ -336,6 +336,7 @@
% |\newwrite| and |\newfam| (DPC) to save later redefinition.
% \changes{v2.0a}{2014/12/30}{New engine-specific allocation scheme (latexrelease)}
% \changes{v2.0f}{2015/03/02}{allow 255 math groups in Unicode engines}
+% \changes{v2.0h}{2015/06/19}{Use $-1$ for first range to get contiguous allocation}
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
@@ -348,7 +349,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}
% \end{macrocode}
% For compatibility use |\chardef| in the classical range.
% \begin{macrocode}
@@ -359,12 +360,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
%</2ekernel|latexrelease>
% \end{macrocode}
@@ -378,6 +379,7 @@
%<latexrelease>\def\newskip{\alloc@2\skip\skipdef\insc@unt}
%<latexrelease>\def\newmuskip{\alloc@3\muskip\muskipdef\@cclvi}
%<latexrelease>\def\newbox{\alloc@4\box\chardef\insc@unt}
+%<latexrelease>\def\newtoks{\alloc@5\toks\toksdef\@cclvi}
%<latexrelease>\def\newread{\alloc@6\read\chardef\sixt@@n}
%<latexrelease>\def\newwrite{\alloc@7\write\chardef\sixt@@n}
%<latexrelease>\def\new@mathgroup{\alloc@8\fam\chardef\sixt@@n}
@@ -489,15 +491,20 @@
%
% | \e@alloc type defcmd current top extended-top newname|
%
+% Note that if just a single allocation range is required
+% (not omitting a range up to 255 for inserts) then $-1$
+% should be used for the first upper bound argument, |#4|.
+%
% \begin{macrocode}
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2015/01/01}{\e@alloc}{Extended Allocation}%
% \end{macrocode}
%
+% \changes{v2.0h}{2015/06/19}{extra braces in case arguments not single token}
% \begin{macrocode}
\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}}%
@@ -649,14 +656,12 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v2.0h}{2015/06/19}{delete spurious old definition of \cs{newtoks}}
% \begin{macro}{\newhelp}
-% \begin{macro}{\newtoks}
% \begin{macrocode}
\def\newhelp#1#2{\newtoks#1#1\expandafter{\csname#2\endcsname}}
-\def\newtoks{\alloc@5\toks\toksdef\@cclvi}
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
% \begin{macro}{\maxdimen}
% \begin{macro}{\hideskip}
diff --git a/Master/texmf-dist/source/latex/base/ltunicode.dtx b/Master/texmf-dist/source/latex/base/ltunicode.dtx
index d06ac7e0041..b122b27f17f 100644
--- a/Master/texmf-dist/source/latex/base/ltunicode.dtx
+++ b/Master/texmf-dist/source/latex/base/ltunicode.dtx
@@ -44,7 +44,7 @@
%
%<*driver>
\ProvidesFile{ltunicode.dtx}
- [2015/05/11 v1.0h LaTeX Kernel (Unicode data)]
+ [2015/06/20 v1.0i LaTeX Kernel (Unicode data)]
\documentclass{ltxdoc}
\begin{document}
\DocInput{\jobname.dtx}
@@ -425,6 +425,7 @@
{#1}{#3}{#4}%
}
% \end{macrocode}
+% \changes{v1.0i}{2015/06/20}{Include first code point in a range in output}
% In the case where the first code point for a range was found, we
% assume the next line is the last code point (it always is). It's then
% a question of checking if the range is a set of letters or not, and if
@@ -439,10 +440,10 @@
\count@="#3 %
\begingroup
\loop
- \ifnum\count@<"#1 %
- \advance\count@\@ne
+ \unless\ifnum\count@>"#1 %
\sethex\temp{\count@}%
\unicodeletter\temp\temp\temp
+ \advance\count@\@ne
\repeat
\endgroup
\fi
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index 44f437c64c8..55573527b54 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltvers.dtx}
- [2015/02/21 v1.0r LaTeX Kernel (Version Info)]
+ [2015/06/23 v1.0t LaTeX Kernel (Version Info)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltvers.dtx}
@@ -55,7 +55,7 @@
%</driver>
% \fi
%
-% \CheckSum{110}
+% \CheckSum{131}
%
% \section{Version Identification}
% First we identify the date and version number of this release of
@@ -80,9 +80,12 @@
% \changes{v1.0a}{1994/03/04}
% {Initial version, split from latex.dtx}
% \changes{v1.0r}{2015/02/21}{Removed autoload code}
+% \changes{v1.0t}{2015/06/23}
+% {set \cs{patch@level} in ltvers rather than in ltfinal/ltpatch}
%
% \begin{macro}{\fmtname}
% \begin{macro}{\fmtversion}
+% \begin{macro}{\patcj@level}
% \begin{macrocode}
%<*2ekernel>
\def\fmtname{LaTeX2e}
@@ -93,9 +96,11 @@
{2015/01/01}
%</2ekernel|latexrelease>
%<*2ekernel>
+\def\patch@level{1}
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% Check that the format being made is not too old.
% The error message complains about `more than 5 years'
@@ -140,13 +145,16 @@
%
% \changes{v1.0p}{2015/01/22}{Preserve any \cs{everyjob} material inserted
% by a loader (\texttt{.ini} file)}
-% This startup banner may be further modified by the code in
-% |ltfinal.dtx| if a patch file is present.
% \begin{macrocode}
-\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
%</2ekernel>
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/latex/base/utf8ienc.dtx b/Master/texmf-dist/source/latex/base/utf8ienc.dtx
index 7495ecdab4a..a6756eabd4a 100644
--- a/Master/texmf-dist/source/latex/base/utf8ienc.dtx
+++ b/Master/texmf-dist/source/latex/base/utf8ienc.dtx
@@ -219,7 +219,7 @@
%<+ts1> \ProvidesFile{ts1enc.dfu}
%<+x2> \ProvidesFile{x2enc.dfu}
%<+all> \ProvidesFile{utf8enc.dfu}
- [2014/09/29 v1.1m UTF-8 support for inputenc]
+ [2015/06/27 v1.1n UTF-8 support for inputenc]
% \end{macrocode}
%
% \begin{macrocode}
@@ -887,6 +887,7 @@
% and corrected by Matthias Noe (\verb=a9931078@unet.univie.ac.at=) --- thanks.
% \changes{v1.1j}{2007/11/09}{Added a few new unicode decls in cyrillic (pr/3988)}
% \changes{v1.1k}{2007/11/11}{Added and further unicode decls in cyrillic}
+% \changes{v1.1n}{2015/06/27}{correct accent http://tex.stackexchange.com/q/252521}
% \begin{macrocode}
%<*all,x2,t2c,t2b,t2a,ot2,lcy>
\DeclareUnicodeCharacter{0400}{\@tabacckludge`\CYRE}
@@ -894,7 +895,7 @@
%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0401}{\CYRYO}
%<all,x2,t2a,ot2>\DeclareUnicodeCharacter{0402}{\CYRDJE}
%<*all,x2,t2c,t2b,t2a,ot2,lcy>
-\DeclareUnicodeCharacter{0403}{\@tabacckludge`\CYRG}
+\DeclareUnicodeCharacter{0403}{\@tabacckludge'\CYRG}
%</all,x2,t2c,t2b,t2a,ot2,lcy>
%<all,x2,t2a,ot2,lcy>\DeclareUnicodeCharacter{0404}{\CYRIE}
%<all,x2,t2c,t2b,t2a,ot2>\DeclareUnicodeCharacter{0405}{\CYRDZE}
@@ -905,7 +906,7 @@
%<all,x2,t2b,t2a,ot2>\DeclareUnicodeCharacter{040A}{\CYRNJE}
%<all,x2,t2a,ot2>\DeclareUnicodeCharacter{040B}{\CYRTSHE}
%<*all,x2,t2c,t2b,t2a,ot2,lcy>
-\DeclareUnicodeCharacter{040C}{\@tabacckludge`\CYRK}
+\DeclareUnicodeCharacter{040C}{\@tabacckludge'\CYRK}
\DeclareUnicodeCharacter{040D}{\@tabacckludge`\CYRI}
%</all,x2,t2c,t2b,t2a,ot2,lcy>
%<all,x2,t2b,t2a,lcy>\DeclareUnicodeCharacter{040E}{\CYRUSHRT}
@@ -980,7 +981,7 @@
%</all,x2,t2c,t2b,t2a,ot2,lcy>
%<all,x2,t2a,ot2>\DeclareUnicodeCharacter{0452}{\cyrdje}
%<*all,x2,t2c,t2b,t2a,ot2,lcy>
-\DeclareUnicodeCharacter{0453}{\@tabacckludge`\cyrg}
+\DeclareUnicodeCharacter{0453}{\@tabacckludge'\cyrg}
%</all,x2,t2c,t2b,t2a,ot2,lcy>
%<all,x2,t2a,ot2,lcy>\DeclareUnicodeCharacter{0454}{\cyrie}
%<all,x2,t2c,t2b,t2a,ot2>\DeclareUnicodeCharacter{0455}{\cyrdze}
@@ -991,7 +992,7 @@
%<all,x2,t2b,t2a,ot2>\DeclareUnicodeCharacter{045A}{\cyrnje}
%<all,x2,t2a,ot2>\DeclareUnicodeCharacter{045B}{\cyrtshe}
%<*all,x2,t2c,t2b,t2a,ot2,lcy>
-\DeclareUnicodeCharacter{045C}{\@tabacckludge`\cyrk}
+\DeclareUnicodeCharacter{045C}{\@tabacckludge'\cyrk}
\DeclareUnicodeCharacter{045D}{\@tabacckludge`\cyri}
%</all,x2,t2c,t2b,t2a,ot2,lcy>
%<all,x2,t2b,t2a,lcy>\DeclareUnicodeCharacter{045E}{\cyrushrt}