summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-05-12 22:39:35 +0000
committerKarl Berry <karl@freefriends.org>2015-05-12 22:39:35 +0000
commite0f112cc5e33e7cc4a9ed0976272789afcda9558 (patch)
treedd33f2b2bead582da4a21f9941af1540372e7993
parentb8dbe89acafe5bf836284a287c370f05162bb86b (diff)
latex (12may15)
git-svn-id: svn://tug.org/texlive/trunk@37361 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/base/alltt.pdfbin172932 -> 172932 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/changes.txt15
-rw-r--r--Master/texmf-dist/doc/latex/base/classes.pdfbin517236 -> 517236 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/cmfonts.pdfbin270770 -> 270770 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/doc.pdfbin627607 -> 627267 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/docstrip.pdfbin469523 -> 468937 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/exscale.pdfbin194323 -> 194323 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/fix-cm.pdfbin261918 -> 261918 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/graphpap.pdfbin156294 -> 156294 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ifthen.pdfbin205224 -> 205224 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/inputenc.pdfbin294571 -> 294571 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/latexrelease.pdfbin232117 -> 232356 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/latexsym.pdfbin192303 -> 192303 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/lb2.pdfbin238184 -> 238184 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/letter.pdfbin305033 -> 305110 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/lgc2.pdfbin202895 -> 202895 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/lppl.pdfbin125833 -> 125833 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltunicode.pdfbin203515 -> 203290 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltxdoc.pdfbin214721 -> 214721 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/makeindx.pdfbin160707 -> 160707 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/manual.pdfbin150072 -> 150072 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/nfssfont.pdfbin201828 -> 201828 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/proc.pdfbin216933 -> 216933 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/slides.pdfbin351420 -> 351420 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/slifonts.pdfbin213778 -> 213778 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/source2e.pdfbin2474451 -> 2476590 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/syntonly.pdfbin181199 -> 181276 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/tlc2.pdfbin273641 -> 273641 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/utf8ienc.pdfbin303578 -> 303358 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/webcomp.pdfbin136166 -> 136166 bytes
-rw-r--r--Master/texmf-dist/source/latex/base/latexrelease.dtx2
-rw-r--r--Master/texmf-dist/source/latex/base/ltfinal.dtx19
-rw-r--r--Master/texmf-dist/source/latex/base/ltlists.dtx30
-rw-r--r--Master/texmf-dist/source/latex/base/ltunicode.dtx50
-rw-r--r--Master/texmf-dist/tex/latex/base/latex.ltx7
-rw-r--r--Master/texmf-dist/tex/latex/base/latexrelease.sty19
-rw-r--r--Master/texmf-dist/tex/latex/base/unicode-letters.def32
37 files changed, 134 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/latex/base/alltt.pdf b/Master/texmf-dist/doc/latex/base/alltt.pdf
index 2ce870634a7..b3ccf8d141e 100644
--- a/Master/texmf-dist/doc/latex/base/alltt.pdf
+++ b/Master/texmf-dist/doc/latex/base/alltt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt
index 9bf384e5f77..e2f35ff684b 100644
--- a/Master/texmf-dist/doc/latex/base/changes.txt
+++ b/Master/texmf-dist/doc/latex/base/changes.txt
@@ -4,6 +4,21 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2015-05-11 Joseph Wright <joseph.wright@morningstar2.co.uk>
+
+ * ltunicode.dtx: Apply East Asian catcode settings to LuaTeX
+
+2015-05-10 <Frank.Mittelbach@latex-project.org>
+
+ * ltlists.dtx: explicitly reset \clubpenalty to default in
+ \@doendpe so that a change done by a heading doesn't survive
+ forever
+
+2015-05-09 David Carlisle <latex-bugs@latex-project.org>
+
+ * ltfinal.dtx, latexrelease.dtx: add the old definition of \newXeTeXintercharclass
+ when emulating old releases.
+
2015-04-28 David Carlisle <latex-bugs@latex-project.org>
* ltfinal.dtx: define \xe@alloc@intercharclass for compatibility with older xelatex.ini
diff --git a/Master/texmf-dist/doc/latex/base/classes.pdf b/Master/texmf-dist/doc/latex/base/classes.pdf
index 12f9fd20ad2..f611b965274 100644
--- a/Master/texmf-dist/doc/latex/base/classes.pdf
+++ b/Master/texmf-dist/doc/latex/base/classes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/cmfonts.pdf b/Master/texmf-dist/doc/latex/base/cmfonts.pdf
index 22858924c5e..312b0081a43 100644
--- a/Master/texmf-dist/doc/latex/base/cmfonts.pdf
+++ b/Master/texmf-dist/doc/latex/base/cmfonts.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/doc.pdf b/Master/texmf-dist/doc/latex/base/doc.pdf
index cd371f8a8d9..5a9da98695f 100644
--- a/Master/texmf-dist/doc/latex/base/doc.pdf
+++ b/Master/texmf-dist/doc/latex/base/doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/docstrip.pdf b/Master/texmf-dist/doc/latex/base/docstrip.pdf
index 69a05ab10de..0d8378ba0a7 100644
--- a/Master/texmf-dist/doc/latex/base/docstrip.pdf
+++ b/Master/texmf-dist/doc/latex/base/docstrip.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/exscale.pdf b/Master/texmf-dist/doc/latex/base/exscale.pdf
index efdc3e14530..8443659ed48 100644
--- a/Master/texmf-dist/doc/latex/base/exscale.pdf
+++ b/Master/texmf-dist/doc/latex/base/exscale.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/fix-cm.pdf b/Master/texmf-dist/doc/latex/base/fix-cm.pdf
index 2eb9f78764d..90baa337ce8 100644
--- a/Master/texmf-dist/doc/latex/base/fix-cm.pdf
+++ b/Master/texmf-dist/doc/latex/base/fix-cm.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/graphpap.pdf b/Master/texmf-dist/doc/latex/base/graphpap.pdf
index e398647a692..2d58e65f6bf 100644
--- a/Master/texmf-dist/doc/latex/base/graphpap.pdf
+++ b/Master/texmf-dist/doc/latex/base/graphpap.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ifthen.pdf b/Master/texmf-dist/doc/latex/base/ifthen.pdf
index 9ba36ee1953..77ead8399c5 100644
--- a/Master/texmf-dist/doc/latex/base/ifthen.pdf
+++ b/Master/texmf-dist/doc/latex/base/ifthen.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/inputenc.pdf b/Master/texmf-dist/doc/latex/base/inputenc.pdf
index 7338ef09df9..d66a58de774 100644
--- a/Master/texmf-dist/doc/latex/base/inputenc.pdf
+++ b/Master/texmf-dist/doc/latex/base/inputenc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/latexrelease.pdf b/Master/texmf-dist/doc/latex/base/latexrelease.pdf
index 4eeb32a76d5..4c01cf217b4 100644
--- a/Master/texmf-dist/doc/latex/base/latexrelease.pdf
+++ b/Master/texmf-dist/doc/latex/base/latexrelease.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/latexsym.pdf b/Master/texmf-dist/doc/latex/base/latexsym.pdf
index 65a415cedd5..b8cbd2bb583 100644
--- a/Master/texmf-dist/doc/latex/base/latexsym.pdf
+++ b/Master/texmf-dist/doc/latex/base/latexsym.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/lb2.pdf b/Master/texmf-dist/doc/latex/base/lb2.pdf
index 0ed19e4b1e6..7e42f598701 100644
--- a/Master/texmf-dist/doc/latex/base/lb2.pdf
+++ b/Master/texmf-dist/doc/latex/base/lb2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/letter.pdf b/Master/texmf-dist/doc/latex/base/letter.pdf
index 335d3d64d82..5fbdeb1e468 100644
--- a/Master/texmf-dist/doc/latex/base/letter.pdf
+++ b/Master/texmf-dist/doc/latex/base/letter.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/lgc2.pdf b/Master/texmf-dist/doc/latex/base/lgc2.pdf
index 1842b81b042..3815d65ba35 100644
--- a/Master/texmf-dist/doc/latex/base/lgc2.pdf
+++ b/Master/texmf-dist/doc/latex/base/lgc2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/lppl.pdf b/Master/texmf-dist/doc/latex/base/lppl.pdf
index b2cec40446e..c384aeff9f7 100644
--- a/Master/texmf-dist/doc/latex/base/lppl.pdf
+++ b/Master/texmf-dist/doc/latex/base/lppl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ltunicode.pdf b/Master/texmf-dist/doc/latex/base/ltunicode.pdf
index cb91cacdbdd..42010fe1596 100644
--- a/Master/texmf-dist/doc/latex/base/ltunicode.pdf
+++ b/Master/texmf-dist/doc/latex/base/ltunicode.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf
index 9a4b7bbe476..bdb353e3343 100644
--- a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf
+++ b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/makeindx.pdf b/Master/texmf-dist/doc/latex/base/makeindx.pdf
index 9e7a4077e41..608bb782b0f 100644
--- a/Master/texmf-dist/doc/latex/base/makeindx.pdf
+++ b/Master/texmf-dist/doc/latex/base/makeindx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/manual.pdf b/Master/texmf-dist/doc/latex/base/manual.pdf
index 32feffd89cf..ddf7f7a1a92 100644
--- a/Master/texmf-dist/doc/latex/base/manual.pdf
+++ b/Master/texmf-dist/doc/latex/base/manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/nfssfont.pdf b/Master/texmf-dist/doc/latex/base/nfssfont.pdf
index c21f27ffc56..73baebef35d 100644
--- a/Master/texmf-dist/doc/latex/base/nfssfont.pdf
+++ b/Master/texmf-dist/doc/latex/base/nfssfont.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/proc.pdf b/Master/texmf-dist/doc/latex/base/proc.pdf
index 0cf07bbb253..732ab50b96b 100644
--- a/Master/texmf-dist/doc/latex/base/proc.pdf
+++ b/Master/texmf-dist/doc/latex/base/proc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/slides.pdf b/Master/texmf-dist/doc/latex/base/slides.pdf
index 473d2dc44c2..8eae702ee4c 100644
--- a/Master/texmf-dist/doc/latex/base/slides.pdf
+++ b/Master/texmf-dist/doc/latex/base/slides.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/slifonts.pdf b/Master/texmf-dist/doc/latex/base/slifonts.pdf
index 76700770991..52628a2f7e5 100644
--- a/Master/texmf-dist/doc/latex/base/slifonts.pdf
+++ b/Master/texmf-dist/doc/latex/base/slifonts.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/source2e.pdf b/Master/texmf-dist/doc/latex/base/source2e.pdf
index 86495eaebd0..8adacceb6b4 100644
--- a/Master/texmf-dist/doc/latex/base/source2e.pdf
+++ b/Master/texmf-dist/doc/latex/base/source2e.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/syntonly.pdf b/Master/texmf-dist/doc/latex/base/syntonly.pdf
index 734b3a6dd6c..6fc3845097e 100644
--- a/Master/texmf-dist/doc/latex/base/syntonly.pdf
+++ b/Master/texmf-dist/doc/latex/base/syntonly.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/tlc2.pdf b/Master/texmf-dist/doc/latex/base/tlc2.pdf
index c68800dd247..943bb426478 100644
--- a/Master/texmf-dist/doc/latex/base/tlc2.pdf
+++ b/Master/texmf-dist/doc/latex/base/tlc2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf
index 8e7e2b6a21c..aca711d756a 100644
--- a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf
+++ b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/webcomp.pdf b/Master/texmf-dist/doc/latex/base/webcomp.pdf
index 9169d5dce8c..18f2ebd20d1 100644
--- a/Master/texmf-dist/doc/latex/base/webcomp.pdf
+++ b/Master/texmf-dist/doc/latex/base/webcomp.pdf
Binary files differ
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}
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}