latex (12may15)

git-svn-id: svn://tug.org/texlive/trunk@37361 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 76 insertions, 25 deletions

diff --git a/Master/texmf-dist/source/latex/base/latexrelease.dtx b/Master/texmf-dist/source/latex/base/latexrelease.dtx
index 21e5cc909c3..f5a305bf317 100644
--- a/Master/texmf-dist/source/latex/base/latexrelease.dtx
+++ b/Master/texmf-dist/source/latex/base/latexrelease.dtx
@@ -38,7 +38,7 @@
 % \fi
 %         \ProvidesFile{latexrelease.dtx}
 %<fixltx2e>   [2015/02/21 v2.0a fixes to LaTeX (obsolete)]
-%<!fixltx2e>  [2015/02/21 v1.0c LaTeX release emulation and tests]
+%<!fixltx2e>  [2015/05/09 v1.0d LaTeX release emulation and tests]
 %
 % \iffalse
 %<*driver>
diff --git a/Master/texmf-dist/source/latex/base/ltfinal.dtx b/Master/texmf-dist/source/latex/base/ltfinal.dtx
index a9152f1077e..62223d3a1f0 100644
--- a/Master/texmf-dist/source/latex/base/ltfinal.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfinal.dtx
@@ -55,7 +55,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{560}
+% \CheckSum{593}
 %
 % \section{Final settings}
 % This section contains the final settings for \LaTeX.  It initialises
@@ -174,7 +174,22 @@
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000/00/00}%
 %<latexrelease>              {\newXeTeXintercharclass}{Extended Allocation}%
-%<latexrelease>\let\xe@alloc@intercharclass\@undefined
+%<latexrelease> \ifx\XeTeXcharclass\@undefined
+%<latexrelease> \else
+%<latexrelease>   \newcount\xe@alloc@intercharclass
+%<latexrelease>    \xe@alloc@intercharclass=\thr@@
+%<latexrelease>    \def\xe@alloc@#1#2#3#4#5{\global\advance#1\@ne
+%<latexrelease>     \xe@ch@ck#1#4#2%
+%<latexrelease>     \allocationnumber#1%
+%<latexrelease>     \global#3#5\allocationnumber
+%<latexrelease>     \wlog{\string#5=\string#2\the\allocationnumber}}
+%<latexrelease>    \def\xe@ch@ck#1#2#3{%
+%<latexrelease>     \ifnum#1<#2\else
+%<latexrelease>      \errmessage{No room for a new #3}%
+%<latexrelease>     \fi}
+%<latexrelease>    \def\newXeTeXintercharclass{%
+%<latexrelease>     \xe@alloc@\xe@alloc@intercharclass\XeTeXcharclass\chardef\@cclv}
+%<latexrelease> \fi
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/ltlists.dtx b/Master/texmf-dist/source/latex/base/ltlists.dtx
index 6841bafa40a..e71835583d9 100644
--- a/Master/texmf-dist/source/latex/base/ltlists.dtx
+++ b/Master/texmf-dist/source/latex/base/ltlists.dtx
@@ -31,7 +31,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltlists.dtx}
-             [2014/09/29 v1.0s LaTeX Kernel (List Environments)]
+             [2015/05/10 v1.0t LaTeX Kernel (List Environments)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltlists.dtx}
@@ -56,7 +56,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{498}
+% \CheckSum{521}
 %
 % \changes{v1.0b}{1994/03/28}{Improve documentation}
 % \changes{v1.0f}{1994/05/21}{Use new error commands}
@@ -719,8 +719,20 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2015/01/01}{\@doendpe}{clubpenalty fix}%
 \def\@doendpe{\@endpetrue
-     \def\par{\@restorepar\everypar{}\par\@endpefalse}\everypar
+     \def\par{\@restorepar
+%    \end{macrocode}
+%    If a section heading changes |\clubpenalty| to keep lines
+%    after it together then this modification is restored via the
+%   |\everypar| mechanism at the start of the next paragraph. As we
+%   destroy the contents of this token here we explicity set
+%   |\clubpenalty| back to its default.
+% \changes{v1.0t}{2015/05/10}{Explicitly reset \cs{clubpenalty} before
+%  clearing \cs{everypar}; see also pr/0462 and pr/4065}
+%    \begin{macrocode}
+              \clubpenalty\@clubpenalty
+              \everypar{}\par\@endpefalse}\everypar
 %    \end{macrocode}
 %
 %    Use |\setbox0=\lastbox| instead of   |\hskip -\parindent|
@@ -729,7 +741,17 @@
 % \changes{v1.0k}{1995/11/07}{Enclosed \cs{setbox0} assignment by a
 % group so that it leaves the contents of box $0$ intact.}
 %    \begin{macrocode}
-               {{\setbox\z@\lastbox}\everypar{}\@endpefalse}}
+               {{\setbox\z@\lastbox}%
+                \everypar{}\@endpefalse}}
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%    
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{0000/00/00}{\@doendpe}{clubpenalty fix}%
+%<latexrelease>\def\@doendpe{\@endpetrue
+%<latexrelease>     \def\par{\@restorepar\everypar{}\par\@endpefalse}\everypar
+%<latexrelease>               {{\setbox\z@\lastbox}\everypar{}\@endpefalse}}
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/base/ltunicode.dtx b/Master/texmf-dist/source/latex/base/ltunicode.dtx
index aa8366cfe93..d06ac7e0041 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/03/26 v1.0g LaTeX Kernel (Unicode data)]
+  [2015/05/11 v1.0h LaTeX Kernel (Unicode data)]
 \documentclass{ltxdoc}
 \begin{document}
 \DocInput{\jobname.dtx}
@@ -578,15 +578,6 @@
 \global\sfcode"201D=0 %
 \endverbatimcopy
 %    \end{macrocode}
-% Lua\TeX{} and older versions of Xe\TeX{} stop here: character classes are a
-% Xe\TeX{}-only concept.
-%    \begin{macrocode}
-\verbatimcopy
-\ifx\XeTeXchartoks\XeTeXcharclass
-  \expandafter\endinput
-\fi
-\endverbatimcopy
-%    \end{macrocode}
 %
 % \section{Xe\TeX{} Character classes}
 % 
@@ -727,6 +718,8 @@
 % \end{macro}
 % \end{macro}
 %
+% \changes{v1.0h}{2015/05/11}{Apply cateogry codes to East Asian
+%   chars in all cases}
 % Before actually reading the line breaking data file, the appropriate
 % temporary code is added to the output. As described above, only a limited
 % number of classes need to be covered: they are hard-coded as classes
@@ -734,13 +727,23 @@
 %    \begin{macrocode}
 \verbatimcopy
 \begingroup
-  \def\ID#1 {\global\XeTeXcharclass"#1=1 \global\catcode"#1=11 }
-  \def\OP#1 {\global\XeTeXcharclass"#1=2 }
-  \def\CL#1 {\global\XeTeXcharclass"#1=3 }
-  \def\EX#1 {\global\XeTeXcharclass"#1=3 }
-  \def\IS#1 {\global\XeTeXcharclass"#1=3 }
-  \def\NS#1 {\global\XeTeXcharclass"#1=3 }
-  \def\CM#1 {\global\XeTeXcharclass"#1=256 }
+  \ifx\XeTeXchartoks\XeTeXcharclass
+    \def\ID#1 {\global\catcode"#1=11 }
+    \def\OP#1 {}
+    \let\CL\OP
+    \let\EX\OP
+    \let\IS\OP
+    \let\NS\OP
+    \let\CM\OP
+  \else
+    \def\ID#1 {\global\XeTeXcharclass"#1=1 \global\catcode"#1=11 }
+    \def\OP#1 {\global\XeTeXcharclass"#1=2 }
+    \def\CL#1 {\global\XeTeXcharclass"#1=3 }
+    \def\EX#1 {\global\XeTeXcharclass"#1=3 }
+    \def\IS#1 {\global\XeTeXcharclass"#1=3 }
+    \def\NS#1 {\global\XeTeXcharclass"#1=3 }
+    \def\CM#1 {\global\XeTeXcharclass"#1=256 }
+  \fi
 \endverbatimcopy
 %    \end{macrocode}
 %
@@ -753,6 +756,18 @@
 \repeat
 %    \end{macrocode}
 %
+% \changes{v1.0h}{2015/05/11}{Move the stop point for Lua\TeX{}}
+% Lua\TeX{} and older versions of Xe\TeX{} stop here: character classes are a
+% Xe\TeX{}-only concept.
+%    \begin{macrocode}
+\verbatimcopy
+\endgroup
+\ifx\XeTeXchartoks\XeTeXcharclass
+  \expandafter\endinput
+\fi
+\endverbatimcopy
+%    \end{macrocode}
+%
 % \changes{v1.0a}{2015/03/25}{Use \cs{hskip} rather than \cs{hspace}
 %   in glue settings}
 % Set up material to be inserted between character classes.
@@ -760,7 +775,6 @@
 % work with plain as well as \LaTeXe{}.
 %    \begin{macrocode}
 \verbatimcopy
-\endgroup
 \gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax}
 \gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax}
 \global\XeTeXinterchartoks 0 1 = {\xtxHanSpace}