summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/latexconfig
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-27 22:20:28 +0000
committerKarl Berry <karl@freefriends.org>2015-04-27 22:20:28 +0000
commit7e3e7b10ea87bd3e3c7dbf9630bd6528b593092b (patch)
tree37612b01e11887c0dc198742291368f0fedfb596 /Master/texmf-dist/tex/latex/latexconfig
parentd8df7ae430443f47b644e3aa135be4fb63b390a3 (diff)
(\xe@alloc@intercharclass): define if not already
defined (which it can't be, but anyway). Report from Scott Kostyshak, http://tug.org/pipermail/tex-live/2015-April/036640.html. git-svn-id: svn://tug.org/texlive/trunk@37086 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/latexconfig')
-rw-r--r--Master/texmf-dist/tex/latex/latexconfig/xelatex.ini21
1 files changed, 17 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini b/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini
index 39769ed0337..9e86c445c3c 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini
+++ b/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini
@@ -5,12 +5,25 @@
% Since we are generating a whatsit, not 100% compatible,
% but hopefully close enough.
%
-% JAW: Moved before latex.ltx, added \protected status
\begingroup
- \catcode`\{=1 %
- \catcode`\}=2 %
+ \catcode`\{=1
+ \catcode`\}=2
\protected\gdef\pdfmapfile#1{\special{pdf:mapfile #1}}
\protected\gdef\pdfmapline#1{\special{pdf:mapline #1}}
\endgroup
-\input latex.ltx \ No newline at end of file
+% "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