latex2e 2015/01/01

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

2 files changed, 28 insertions, 139 deletions

diff --git a/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini b/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
index 04f18dae475..fe1cfda48ef 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
+++ b/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
@@ -1,34 +1,26 @@
 % $Id$
 % Karl Berry, originally written 2008. public domain.
 
-% must be done first (activation of primitives)
-\input lualatexiniconfig.tex
-
+\begingroup
+  \catcode`\{=1 %
+  \catcode`\}=2 %
+% JAW: Enable 'extra' pdfTeX primitives only in .ini file
+% latex.ltx enables the extra primitives bu a subset of those from
+% pdfTeX are needed to do the configuration below (pdftexconfig.tex).
+% Rather than list them all, just enable those classed as 'pdftex'.
+    \directlua{tex.enableprimitives('',tex.extraprimitives('pdftex'))}
+% JAW: Set up job name quoting before latex.ltx
+% Web2c pdfTeX/XeTeX quote job names containing spaces, but LuaTeX does
+% not do this at the engine level. The behaviour can be changed using
+% a callback. Originally this code was loaded via lualatexquotejobname.tex
+% but that required a hack around latex.ltx: the behaviour has been altered
+% to allow the callback route to be used directly.
+  \global\everyjob{%
+    \directlua{dofile(assert(kpse.find_file("lualatexquotejobname.lua")))}%
+  }
+\endgroup
 % settings inherited from pdftex
-\input pdftexconfig.tex
 % pdf output by default
+\input pdftexconfig.tex
 
-% prevent latex.ltx from \dump-ing
-\let\DUMP\dump
-\let\dump\relax
-
-% the usual format initialization.
-\scrollmode
-\input latex.ltx
-
-% some commands in the kernel need patchin to work with luatex
-\input lualatex-patch-kernel.tex
-
-% latex.ltx sets \everyjob, so this must come afterwards
-\input lualatexquotejobname.tex
-
-% latex.ltx sets wrong (T1) \lccodes, \uccodes for the "80-"ff range
-\input lualatex-reset-codes.tex     % reset them
-\input luatex-unicode-letters.tex   % set codes based on Unicode (full range)
-% Note: unlike xelatex, we don't need to load unicode-letters before latex.ltx
-% (hence hyphenation patterns) due to diferences in \patterns hendling
-
-% restore \dump for derived formats (mylatex, etc) that might use it
-\let\dump\DUMP
-\let\DUMP\undefined
-\dump
+\input latex.ltx
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini b/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini
index eb0ba44f538..39769ed0337 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini
+++ b/Master/texmf-dist/tex/latex/latexconfig/xelatex.ini
@@ -1,119 +1,16 @@
 % $Id$
 % Public domain.  Originally by Jonathan Kew.
-\XeTeXuseglyphmetrics=1
-\XeTeXdashbreakstate=1
-\input unicode-letters
-% disable the \dump in latex.ltx
-\expandafter\let\csname saved-dump-cs\endcsname\dump
-\let\dump=\relax
-\scrollmode
-\input latex.ltx
-%
-% Allocator for \XeTeXintercharclass values, from Enrico Gregorio 
-%
-\catcode`\@=11
-\newcount\xe@alloc@intercharclass % allocates intercharclass
-\xe@alloc@intercharclass=\thr@@ % from 4 (1,2 and 3 are used by CJK, AFAIK)
-\def\xe@alloc@#1#2#3#4#5{\global\advance#1\@ne
- \xe@ch@ck#1#4#2% make sure there's still room
- \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\XeTeXintercharclass\chardef\@cclv} %at most 254
 
 % Primitives in pdftex and luatex, we'll just use macros here.
 % Since we are generating a whatsit, not 100% compatible,
 % but hopefully close enough.
-\def\pdfmapfile#1{\special{pdf:mapfile #1}}
-\def\pdfmapline#1{\special{pdf:mapline #1}}
-
-\catcode`\@=12
-
-% Because latex.ltx sets up character code tables for T1 encoding by default,
-% we need to reset values from unicode-letters that may have been overridden
+% 
+% JAW: Moved before latex.ltx, added \protected status
 \begingroup
-\catcode`\@=11 \count@=128 % reset chars "80-"FF to category "other", no case mapping
-\loop \ifnum\count@<256
-  \global\uccode\count@=0 \global\lccode\count@=0
-  \global\catcode\count@=12 \global\sfcode\count@=1000
-  \advance\count@ by 1 \repeat
-\def\C #1 #2 #3 {\global\uccode"#1="#2 \global\lccode"#1="#3 } % case mappings (non-letter)
-\def\L #1 #2 #3 {\global\catcode"#1=11 % category: letter
-  \C #1 #2 #3 % with case mappings
-  \ifnum"#1="#3 \else \global\sfcode"#1=999 \fi % uppercase letters have sfcode=999
-  \global\XeTeXmathcode"#1="7"01"#1 % BMP letters default to class 7 (var), fam 1
-  }
-\def\l #1 {\L #1 #1 #1 } % letter without case mappings
-\l 00AA
-\L 00B5 039C 00B5
-\l 00BA
-\L 00C0 00C0 00E0
-\L 00C1 00C1 00E1
-\L 00C2 00C2 00E2
-\L 00C3 00C3 00E3
-\L 00C4 00C4 00E4
-\L 00C5 00C5 00E5
-\L 00C6 00C6 00E6
-\L 00C7 00C7 00E7
-\L 00C8 00C8 00E8
-\L 00C9 00C9 00E9
-\L 00CA 00CA 00EA
-\L 00CB 00CB 00EB
-\L 00CC 00CC 00EC
-\L 00CD 00CD 00ED
-\L 00CE 00CE 00EE
-\L 00CF 00CF 00EF
-\L 00D0 00D0 00F0
-\L 00D1 00D1 00F1
-\L 00D2 00D2 00F2
-\L 00D3 00D3 00F3
-\L 00D4 00D4 00F4
-\L 00D5 00D5 00F5
-\L 00D6 00D6 00F6
-\L 00D8 00D8 00F8
-\L 00D9 00D9 00F9
-\L 00DA 00DA 00FA
-\L 00DB 00DB 00FB
-\L 00DC 00DC 00FC
-\L 00DD 00DD 00FD
-\L 00DE 00DE 00FE
-\l 00DF
-\L 00E0 00C0 00E0
-\L 00E1 00C1 00E1
-\L 00E2 00C2 00E2
-\L 00E3 00C3 00E3
-\L 00E4 00C4 00E4
-\L 00E5 00C5 00E5
-\L 00E6 00C6 00E6
-\L 00E7 00C7 00E7
-\L 00E8 00C8 00E8
-\L 00E9 00C9 00E9
-\L 00EA 00CA 00EA
-\L 00EB 00CB 00EB
-\L 00EC 00CC 00EC
-\L 00ED 00CD 00ED
-\L 00EE 00CE 00EE
-\L 00EF 00CF 00EF
-\L 00F0 00D0 00F0
-\L 00F1 00D1 00F1
-\L 00F2 00D2 00F2
-\L 00F3 00D3 00F3
-\L 00F4 00D4 00F4
-\L 00F5 00D5 00F5
-\L 00F6 00D6 00F6
-\L 00F8 00D8 00F8
-\L 00F9 00D9 00F9
-\L 00FA 00DA 00FA
-\L 00FB 00DB 00FB
-\L 00FC 00DC 00FC
-\L 00FD 00DD 00FD
-\L 00FE 00DE 00FE
-\L 00FF 0178 00FF
+  \catcode`\{=1 %
+  \catcode`\}=2 %
+  \protected\gdef\pdfmapfile#1{\special{pdf:mapfile #1}}
+  \protected\gdef\pdfmapline#1{\special{pdf:mapline #1}}
 \endgroup
-\expandafter\let\expandafter\dump\csname saved-dump-cs\endcsname
-\dump
+
+\input latex.ltx
\ No newline at end of file