latex (12may15)

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

3 files changed, 43 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index f218a10bf65..9c838f1d163 100644
--- a/Master/texmf-dist/tex/latex/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex/base/latex.ltx
@@ -4542,8 +4542,11 @@ Type  H <return>  for immediate help.}%
 \def\@endparenv{%
   \addpenalty\@endparpenalty\addvspace\@topsepadd\@endpetrue}
 \def\@doendpe{\@endpetrue
-     \def\par{\@restorepar\everypar{}\par\@endpefalse}\everypar
-               {{\setbox\z@\lastbox}\everypar{}\@endpefalse}}
+     \def\par{\@restorepar
+              \clubpenalty\@clubpenalty
+              \everypar{}\par\@endpefalse}\everypar
+               {{\setbox\z@\lastbox}%
+                \everypar{}\@endpefalse}}
 \newif\if@endpe
 \@endpefalse
 \def\@mklab#1{\hfil #1}
diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty
index ac9eaed8b91..b9d95970672 100644
--- a/Master/texmf-dist/tex/latex/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty
@@ -80,7 +80,7 @@
 \long\def\@gobble@IncludeInRelease#1\EndIncludeInRelease{}
 \let\EndIncludeInRelease\relax
 \ProvidesPackage{latexrelease}
-  [2015/02/21 v1.0c LaTeX release emulation and tests]
+  [2015/05/09 v1.0d LaTeX release emulation and tests]
 \NeedsTeXFormat{LaTeX2e}[1996/06/01]
 \DeclareOption*{%
   \def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#1}}%
@@ -1692,7 +1692,22 @@ of this package available from CTAN}
 \EndIncludeInRelease
 \IncludeInRelease{0000/00/00}%
               {\newXeTeXintercharclass}{Extended Allocation}%
-\let\xe@alloc@intercharclass\@undefined
+ \ifx\XeTeXcharclass\@undefined
+ \else
+   \newcount\xe@alloc@intercharclass
+    \xe@alloc@intercharclass=\thr@@
+    \def\xe@alloc@#1#2#3#4#5{\global\advance#1\@ne
+     \xe@ch@ck#1#4#2%
+     \allocationnumber#1%
+     \global#3#5\allocationnumber
+     \wlog{\string#5=\string#2\the\allocationnumber}}
+    \def\xe@ch@ck#1#2#3{%
+     \ifnum#1<#2\else
+      \errmessage{No room for a new #3}%
+     \fi}
+    \def\newXeTeXintercharclass{%
+     \xe@alloc@\xe@alloc@intercharclass\XeTeXcharclass\chardef\@cclv}
+ \fi
 \EndIncludeInRelease
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/base/unicode-letters.def b/Master/texmf-dist/tex/latex/base/unicode-letters.def
index 4576899298e..2ed8bcd5f46 100644
--- a/Master/texmf-dist/tex/latex/base/unicode-letters.def
+++ b/Master/texmf-dist/tex/latex/base/unicode-letters.def
@@ -12,7 +12,7 @@
 %%   MD5 sum C95A5E60B2B527F4E77286F9C9CF09D1
 %% which are maintained by the Unicode Consortium.
 %%
-%% Generated on 2015-03-26. 
+%% Generated on 2015-05-11. 
 %%
 %% Copyright 2014-2015
 %% The LaTeX3 Project and any individual authors listed elsewhere
@@ -104707,17 +104707,24 @@
 \endgroup
 \global\sfcode"2019=0 %
 \global\sfcode"201D=0 %
-\ifx\XeTeXchartoks\XeTeXcharclass
-  \expandafter\endinput
-\fi
 \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
   \ID 231A % 
   \ID 231B % 
   \OP 2329 % 
@@ -267762,6 +267769,9 @@
   \ID 3FFFC % 
   \ID 3FFFD % 
 \endgroup
+\ifx\XeTeXchartoks\XeTeXcharclass
+  \expandafter\endinput
+\fi
 \gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax}
 \gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax}
 \global\XeTeXinterchartoks 0 1 = {\xtxHanSpace}