l3 (26mar16)

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

1 files changed, 34 insertions, 3 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
index e9b77107076..d27ab75c171 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: l3names.dtx Copyright (C) 1990-2015 The LaTeX3 project
+%% File: l3names.dtx Copyright (C) 1990-2016 The LaTeX3 project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -37,7 +37,7 @@
 \documentclass[full]{l3doc}
 %</driver>
 %<*driver|package>
-\GetIdInfo$Id: l3names.dtx 6328 2015-12-21 12:41:32Z joseph $
+\GetIdInfo$Id: l3names.dtx 6433 2016-03-11 20:04:27Z joseph $
   {L3 Namespace for primitives}
 %</driver|package>
 %<*driver>
@@ -623,6 +623,7 @@
   \__kernel_primitive:NN \pdfsetmatrix                \pdftex_pdfsetmatrix:D
   \__kernel_primitive:NN \pdfstartlink                \pdftex_pdfstartlink:D
   \__kernel_primitive:NN \pdfstartthread              \pdftex_pdfstartthread:D
+  \__kernel_primitive:NN \pdfsuppressptexinfo         \pdftex_pdfsuppressptexinfo:D
   \__kernel_primitive:NN \pdfthread                   \pdftex_pdfthread:D
   \__kernel_primitive:NN \pdfthreadmargin             \pdftex_pdfthreadmargin:D
   \__kernel_primitive:NN \pdftrailer                  \pdftex_pdftrailer:D
@@ -737,6 +738,7 @@
   \__kernel_primitive:NN \XeTeXfindvariationbyname    \xetex_findvariationbyname:D
   \__kernel_primitive:NN \XeTeXfirstfontchar          \xetex_firstfontchar:D
   \__kernel_primitive:NN \XeTeXfonttype               \xetex_fonttype:D
+  \__kernel_primitive:NN \XeTeXgenerateactualtext     \xetex_generateactualtext:D
   \__kernel_primitive:NN \XeTeXglyph                  \xetex_glyph:D
   \__kernel_primitive:NN \XeTeXglyphbounds            \xetex_glyphbounds:D
   \__kernel_primitive:NN \XeTeXglyphindex             \xetex_glyphindex:D
@@ -790,6 +792,7 @@
   \__kernel_primitive:NN \aligntab                    \luatex_aligntab:D
   \__kernel_primitive:NN \attribute                   \luatex_attribute:D
   \__kernel_primitive:NN \attributedef                \luatex_attributedef:D
+  \__kernel_primitive:NN \begincsname                 \luatex_begincsname:D
   \__kernel_primitive:NN \catcodetable                \luatex_catcodetable:D
   \__kernel_primitive:NN \clearmarks                  \luatex_clearmarks:D
   \__kernel_primitive:NN \crampeddisplaystyle         \luatex_crampeddisplaystyle:D
@@ -800,7 +803,10 @@
   \__kernel_primitive:NN \dviextension                \luatex_dviextension:D
   \__kernel_primitive:NN \dvifeedback                 \luatex_dvifeedback:D
   \__kernel_primitive:NN \dvivariable                 \luatex_dvivariable:D
+  \__kernel_primitive:NN \etoksapp                    \luatex_etoksapp:D
+  \__kernel_primitive:NN \etokspre                    \luatex_etokspre:D
   \__kernel_primitive:NN \expanded                    \luatex_expanded:D
+  \__kernel_primitive:NN \firstvalidlanguage          \luatex_firstvalidlanguage:D
   \__kernel_primitive:NN \fontid                      \luatex_fontid:D
   \__kernel_primitive:NN \formatname                  \luatex_formatname:D
   \__kernel_primitive:NN \hjcode                      \luatex_hjcode:D
@@ -808,6 +814,7 @@
   \__kernel_primitive:NN \hyphenationmin              \luatex_hypenationmin:D
   \__kernel_primitive:NN \gleaders                    \luatex_gleaders:D
   \__kernel_primitive:NN \initcatcodetable            \luatex_initcatcodetable:D
+  \__kernel_primitive:NN \lastnamedcs                 \luatex_lastnamedcs:D
   \__kernel_primitive:NN \latelua                     \luatex_latelua:D
   \__kernel_primitive:NN \letcharcode                 \luatex_letcharcode:D
   \__kernel_primitive:NN \luaescapestring             \luatex_luaescapestring:D
@@ -824,7 +831,7 @@
   \__kernel_primitive:NN \nohrule                     \luatex_nohrule:D
   \__kernel_primitive:NN \nokerns                     \luatex_nokerns:D
   \__kernel_primitive:NN \noligs                      \luatex_noligs:D
-  \__kernel_primitive:NN \nospace                     \luatex_nospace:D
+  \__kernel_primitive:NN \nospaces                    \luatex_nospaces:D
   \__kernel_primitive:NN \novrule                     \luatex_novrule:D
   \__kernel_primitive:NN \outputbox                   \luatex_outputbox:D
   \__kernel_primitive:NN \pageleftoffset              \luatex_pageleftoffset:D
@@ -843,6 +850,8 @@
   \__kernel_primitive:NN \suppresslongerror           \luatex_suppresslongerror:D
   \__kernel_primitive:NN \suppressmathparerror        \luatex_suppressmathparerror:D
   \__kernel_primitive:NN \suppressoutererror          \luatex_suppressoutererror:D
+  \__kernel_primitive:NN \toksapp                     \luatex_toksapp:D
+  \__kernel_primitive:NN \tokspre                     \luatex_tokspre:D
   \__kernel_primitive:NN \tpack                       \luatex_tpack:D
   \__kernel_primitive:NN \vpack                       \luatex_vpack:D
 %    \end{macrocode}
@@ -872,6 +881,8 @@
   \__kernel_primitive:NN \copyfont                    \pdftex_copyfont:D
   \__kernel_primitive:NN \draftmode                   \pdftex_draftmode:D
   \__kernel_primitive:NN \expandglyphsinfont          \pdftex_fontexpand:D
+  \__kernel_primitive:NN \ifabsdim                    \pdftex_ifabsdim:D
+  \__kernel_primitive:NN \ifabsnum                    \pdftex_ifabsnum:D
   \__kernel_primitive:NN \ignoreligaturesinfont       \pdftex_ignoreligaturesinfont:D
   \__kernel_primitive:NN \insertht                    \pdftex_insertht:D
   \__kernel_primitive:NN \lastsavedboxresourceindex   \pdftex_pdflastxform:D
@@ -892,6 +903,7 @@
   \__kernel_primitive:NN \saveboxresource             \pdftex_pdfxform:D
   \__kernel_primitive:NN \saveimageresource           \pdftex_pdfximage:D
   \__kernel_primitive:NN \setrandomseed               \pdftex_setrandomseed:D
+  \__kernel_primitive:NN \tracingfonts                \pdftex_tracingfonts:D
   \__kernel_primitive:NN \uniformdeviate              \pdftex_uniformdeviate:D
 %    \end{macrocode}
 % The set of Unicode math primitives were introduced by \XeTeX{} and \LuaTeX{}
@@ -1117,6 +1129,25 @@
   \tex_let:D \tex_input:D                \@@input
   \tex_let:D \tex_italiccorrection:D     \@@italiccorr
   \tex_let:D \tex_underline:D            \@@underline
+%    \end{macrocode}
+% Some tidying up is needed for \tn{(pdf)tracingfonts}. Newer \LuaTeX{} has
+% this simply as \tn{tracingfonts}, but that will have been overwritten by
+% the \LaTeXe{} kernel. So any spurious definition has to be removed, then
+% the real version saved either from the \pdfTeX{} name or from \LuaTeX{}.
+% In the latter case, we leave \tn{@@tracingfonts} available: this might
+% be useful and almost all \LaTeXe{} users will have \pkg{expl3} loaded by
+% \pkg{fontspec}. (We follow the usual kernel convention that |@@| is used
+% for saved primitives.)
+%   \begin{macrocode}
+  \tex_let:D \pdftex_tracingfonts:D \tex_undefined:D
+  \etex_ifdefined:D \pdftracingfonts
+    \tex_let:D \pdftex_tracingfonts:D \pdftracingfonts
+  \tex_else:D
+    \etex_ifdefined:D \luatex_directlua:D
+      \luatex_directlua:D { tex.enableprimitives("@@", {"tracingfonts"}) }
+      \tex_let:D \pdftex_tracingfonts:D \luatextracingfonts
+    \tex_fi:D
+  \tex_fi:D
 \tex_fi:D
 %    \end{macrocode}
 % That is also true for the \LuaTeX{} primitives under \LaTeXe{}