summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-29 22:03:27 +0000
committerKarl Berry <karl@freefriends.org>2015-04-29 22:03:27 +0000
commit8292ae68fb4279ef673d6212cd6cf9b091f89d99 (patch)
tree65c8853077095d206aab0cd65b47f716b828cfe7
parent29740d0452a743ccdc3345b0cf600c1a99424d8d (diff)
latex now defines \xe@alloc@intercharclass
git-svn-id: svn://tug.org/texlive/trunk@37124 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.txt4
-rw-r--r--Master/texmf-dist/doc/latex/base/classes.pdfbin516255 -> 517236 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/cmfonts.pdfbin270848 -> 270770 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/doc.pdfbin627348 -> 627607 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/docstrip.pdfbin469356 -> 469523 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/exscale.pdfbin194318 -> 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.pdfbin294565 -> 294571 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/latexrelease.pdfbin232117 -> 232117 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.pdfbin304873 -> 305033 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.pdfbin203348 -> 203515 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltxdoc.pdfbin214721 -> 214721 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/makeindx.pdfbin160723 -> 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.pdfbin216980 -> 216933 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/slides.pdfbin351434 -> 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.pdfbin2473578 -> 2474451 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/syntonly.pdfbin181023 -> 181199 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 -> 303578 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/webcomp.pdfbin136166 -> 136166 bytes
-rw-r--r--Master/texmf-dist/source/latex/base/ltfinal.dtx10
-rw-r--r--Master/texmf-dist/tex/latex/base/latex.ltx5
-rw-r--r--Master/texmf-dist/tex/latex/base/latexrelease.sty5
-rw-r--r--Master/texmf-dist/tex/latex/latexconfig/xelatex.ini12
34 files changed, 16 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/latex/base/alltt.pdf b/Master/texmf-dist/doc/latex/base/alltt.pdf
index 3575401a129..2ce870634a7 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 d498ffabcd5..9bf384e5f77 100644
--- a/Master/texmf-dist/doc/latex/base/changes.txt
+++ b/Master/texmf-dist/doc/latex/base/changes.txt
@@ -4,6 +4,10 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2015-04-28 David Carlisle <latex-bugs@latex-project.org>
+
+ * ltfinal.dtx: define \xe@alloc@intercharclass for compatibility with older xelatex.ini
+
2015-04-08 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
* ltfssbas.dtx: Try loading fd file if family has changed
diff --git a/Master/texmf-dist/doc/latex/base/classes.pdf b/Master/texmf-dist/doc/latex/base/classes.pdf
index c35483c990b..12f9fd20ad2 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 91e3cd79c97..22858924c5e 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 d7c4a19cd5b..cd371f8a8d9 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 e41ba79a30c..69a05ab10de 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 9d8d6671035..efdc3e14530 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 cf8c36ea5b1..2eb9f78764d 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 047fbbb0918..e398647a692 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 c068d089d8b..9ba36ee1953 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 8e177a51f6e..7338ef09df9 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 d51e8b1337f..4eeb32a76d5 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 502a5e76c3e..65a415cedd5 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 96ec753ae4a..0ed19e4b1e6 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 0d806729a5f..335d3d64d82 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 0a5a2bf9df1..1842b81b042 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 b9059031cd9..b2cec40446e 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 bed383ab8b1..cb91cacdbdd 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 576d217ec6d..9a4b7bbe476 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 5d4ad5f328e..9e7a4077e41 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 c4628856ed6..32feffd89cf 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 40ea0052200..c21f27ffc56 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 f8a0842eccc..0cf07bbb253 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 c8cfb95a858..473d2dc44c2 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 4de367739ab..76700770991 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 00fc4893b8c..86495eaebd0 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 49f9d7c8528..734b3a6dd6c 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 7ea8280e765..c68800dd247 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 c0e18a76eb4..8e7e2b6a21c 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 eba2a22be67..9169d5dce8c 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/ltfinal.dtx b/Master/texmf-dist/source/latex/base/ltfinal.dtx
index 72b09cc8567..a9152f1077e 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/03/26 v2.0e LaTeX Kernel (Final Settings)]
+ [2015/04/28 v2.0f LaTeX Kernel (Final Settings)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfinal.dtx}
@@ -55,7 +55,7 @@
%</driver>
% \fi
%
-% \CheckSum{558}
+% \CheckSum{560}
%
% \section{Final settings}
% This section contains the final settings for \LaTeX. It initialises
@@ -147,6 +147,7 @@
%\begin{macro}{\newXeTeXintercharclass}
% \changes{v2.0a}{2014/12/30}{macro added}
% \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}
% Allocate |\XeTeXintercharclass| types if xetex is active.
% previously defined in |xetex.ini|.
%
@@ -161,9 +162,10 @@
% \begin{macrocode}
\ifx\XeTeXcharclass\@undefined
\else
-\count257=\thr@@
+\countdef\xe@alloc@intercharclass=257
+\xe@alloc@intercharclass=\thr@@
\def\newXeTeXintercharclass{%
- \e@alloc\XeTeXcharclass\chardef{\count257}\@cclv\@cclv}
+ \e@alloc\XeTeXcharclass\chardef\xe@alloc@intercharclass\@cclv\@cclv}
\fi
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index 32bcc906d25..f218a10bf65 100644
--- a/Master/texmf-dist/tex/latex/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex/base/latex.ltx
@@ -7909,9 +7909,10 @@ Type H <return> for immediate help.}%
\fi
\ifx\XeTeXcharclass\@undefined
\else
-\count257=\thr@@
+\countdef\xe@alloc@intercharclass=257
+\xe@alloc@intercharclass=\thr@@
\def\newXeTeXintercharclass{%
- \e@alloc\XeTeXcharclass\chardef{\count257}\@cclv\@cclv}
+ \e@alloc\XeTeXcharclass\chardef\xe@alloc@intercharclass\@cclv\@cclv}
\fi
\unitlength = 1pt
\fboxsep = 3pt
diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty
index 2135cd54f0a..ac9eaed8b91 100644
--- a/Master/texmf-dist/tex/latex/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty
@@ -1684,9 +1684,10 @@ of this package available from CTAN}
{\newXeTeXintercharclass}{Extended Allocation}%
\ifx\XeTeXcharclass\@undefined
\else
-\count257=\thr@@
+\countdef\xe@alloc@intercharclass=257
+\xe@alloc@intercharclass=\thr@@
\def\newXeTeXintercharclass{%
- \e@alloc\XeTeXcharclass\chardef{\count257}\@cclv\@cclv}
+ \e@alloc\XeTeXcharclass\chardef\xe@alloc@intercharclass\@cclv\@cclv}
\fi
\EndIncludeInRelease
\IncludeInRelease{0000/00/00}%
diff --git a/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini b/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini
index 9e86c445c3c..38b16a9465a 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini
+++ b/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini
@@ -12,18 +12,6 @@
\protected\gdef\pdfmapline#1{\special{pdf:mapline #1}}
\endgroup
-% "Internal" control sequence from old xelatex.ini, nevertheless used by
-% (at least) xeCJK.sty. David Carlisle says that the \count register
-% for this is hardwired to be 257, so it's easy to make an alias.
-% Thread starts at http://tug.org/pipermail/tex-live/2015-April/036640.html.
-%
-\begingroup
- \catcode`\@=11
- \ifx\xe@alloc@intercharclass\@undefined
- \global\countdef\xe@alloc@intercharclass=257
- \fi
-\endgroup
-
% As of TL 2015, aka LaTeX2e 2015/01/01, latex.ltx includes unicode
% letter assignments and other things previously done in the .ini.
\input latex.ltx