From 9a1c781313c984e8d5c88b832b1c08e1da3fe155 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Jun 2016 22:40:56 +0000 Subject: latex2e (14jun16) git-svn-id: svn://tug.org/texlive/trunk@41447 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/base/classes.dtx | 2 +- Master/texmf-dist/source/latex/base/ltfinal.dtx | 20 +++++++++++++++++--- Master/texmf-dist/source/latex/base/ltvers.dtx | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/source/latex/base') diff --git a/Master/texmf-dist/source/latex/base/classes.dtx b/Master/texmf-dist/source/latex/base/classes.dtx index 885b85c6f51..c8092012147 100644 --- a/Master/texmf-dist/source/latex/base/classes.dtx +++ b/Master/texmf-dist/source/latex/base/classes.dtx @@ -263,7 +263,7 @@ % \end{macro} % % \begin{macro}{\if@restonecol} -% When the document has to printed in two columns, we sometimes +% When the document has to be printed in two columns, we sometimes % have to temporarily switch to one column. This switch is used to % remember to switch back. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/base/ltfinal.dtx b/Master/texmf-dist/source/latex/base/ltfinal.dtx index 5103c8b4ebe..05b09ea2934 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} - [2016/01/05 v2.0p LaTeX Kernel (Final Settings)] + [2016/04/22 v2.0q LaTeX Kernel (Final Settings)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfinal.dtx} @@ -149,6 +149,7 @@ % \changes{v2.0b}{2015/01/23}{use reserved count 257} % \changes{v2.0f}{2015/04/28}{define \cs{xe@alloc@intercharclass} for compatibility with older xelatex initilisation} %\begin{macro}{\xe@alloc@intercharclass} +%\begin{macro}{\e@alloc@intercharclass@top} % \changes{v2.0j}{2016/01/04}{Start allocation at one not three} % \changes{v2.0k}{2016/01/05}{Remove duplicated code} % Allocate |\XeTeXintercharclass| types if xetex is active. @@ -161,13 +162,25 @@ % {\newXeTeXintercharclass}{Extended Allocation}% % \end{macrocode} % -% Classes allocated 1 to 254 (early 1, 2 and 3 were pre-set for CJK). +% Classes allocated 1 to 4094 (or 254 on older xetex) +% (In earlier XeLaTeX versions 1, 2 and 3 were pre-set for CJK). % \changes{v2.0g}{2015/06/19}{Use $-1$ for first range to get contiguous allocation} +% \changes{v2.0q}{2016/04/22}{XeTeX 0.99996 has 4096 char classes not 256} % \begin{macrocode} \ifx\XeTeXcharclass\@undefined \else +% \end{macrocode} +% \begin{macrocode} +\ifdim\the\XeTeXversion\XeTeXrevision\p@>0.99993\p@ + \chardef\e@alloc@intercharclass@top=4095 +\else + \chardef\e@alloc@intercharclass@top=255 +\fi +% \end{macrocode} +% \begin{macrocode} \def\newXeTeXintercharclass{% - \e@alloc\XeTeXcharclass\chardef\xe@alloc@intercharclass\m@ne\@cclv} + \e@alloc\XeTeXcharclass + \chardef\xe@alloc@intercharclass\m@ne\e@alloc@intercharclass@top} \fi % \end{macrocode} % @@ -221,6 +234,7 @@ % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} % % % diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index f0bde869bd5..5dab5b2175c 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{0} +\def\patch@level{1} % \end{macrocode} % \end{macro} % \end{macro} -- cgit v1.2.3