summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
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 /Master/texmf-dist/tex
parent29740d0452a743ccdc3345b0cf600c1a99424d8d (diff)
latex now defines \xe@alloc@intercharclass
git-svn-id: svn://tug.org/texlive/trunk@37124 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-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
3 files changed, 6 insertions, 16 deletions
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