summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-11-22 22:50:16 +0000
committerKarl Berry <karl@freefriends.org>2016-11-22 22:50:16 +0000
commitf476e2547d6f421f3f59e812adb855596f668eb5 (patch)
tree859e615afe313dc934f3ca679cd4ea760e356f98 /Master/texmf-dist/tex
parent4061b69b7a85fc322821dbfc8beb83b498542e45 (diff)
l3 (22nov16)
git-svn-id: svn://tug.org/texlive/trunk@42556 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/l3build/l3build.lua17
-rw-r--r--Master/texmf-dist/tex/latex/l3build/regression-test.tex13
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex284
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty209
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty8
15 files changed, 429 insertions, 162 deletions
diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua
index f75a96959be..06f6942ace5 100644
--- a/Master/texmf-dist/tex/latex/l3build/l3build.lua
+++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua
@@ -17,8 +17,8 @@
--]]
-- Version information: should be identical to that in l3build.dtx
-release_date = "2016/10/19"
-release_ver = "6730"
+release_date = "2016/11/21"
+release_ver = "6760"
-- "module" is a deprecated function in Lua 5.2: as we want the name
-- for other purposes, and it should eventually be 'free', simply
@@ -792,19 +792,6 @@ function formatlog(logfile, newfile, engine)
if checksearch then
line = string.gsub(line, "%(.*/([%w-]+%.[%w-]+)%)?%s*$", "(../%1")
end
- -- Deal with the map line: some wrapping then a zap
- if string.match(lastline, "*pdftex%.map") then
- print("MAP ELONG")
- line = lastline .. line
- lastline = ""
- end
- if string.match(line, "%{[^%}]*pdftex%.map%}") then
- if string.match(line, "pdftex%.map%}%s*%(") and
- not string.match(line, "%)%s*$") then
- return "", line
- end
- end
- line = string.gsub(line, "%{[^%}]*/pdftex%.map%}", "")
-- Deal with the fact that "(.aux)" may have still a leading space
line = string.gsub(line, "^ %(%.aux%)", "(.aux)")
-- Merge all of .fd data into one line so will be removed later
diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
index 3d10ca5e1f8..ade132e225a 100644
--- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex
+++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
@@ -166,7 +166,6 @@
\ifx#1\@undefined\LONGTYPEOUT{Undefined \string#1}\else
\ifx#1\relax\LONGTYPEOUT{Relaxed \space\space\string#1}\else
\LONGTYPEOUT{Defined \space\space\string#1}\fi\fi}
-\OMIT
\ifx\InputIfFileExists\@undefined
\newread\@inputcheck
\long\def\InputIfFileExists#1#2#3{%
@@ -181,7 +180,17 @@
\fi
\InputIfFileExists{regression-test.cfg}
{\LONGTYPEOUT{^^J***^^Jregression-test.cfg in operation^^J***^^J}}{}
-\TIMO
+\ifdefined\pdfoutput
+ \ifnum\pdfoutput>0 %
+ \pdfmapfile{pdftex.map}%
+ \fi
+\else
+ \ifdefined\outputmode
+ \ifnum\outputmode>0 %
+ \pdfextension mapfile{pdftex.map}%
+ \fi
+ \fi
+\fi
\newcount \gTESTint
\def\SEPARATOR{%
\TYPE{%
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
index 591a3c52294..bc2c7375122 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
@@ -46,8 +46,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{l3sort}{Support package l3kernel too old}
@@ -59,7 +59,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3sort.dtx 6730 2016-10-19 11:19:38Z joseph $
+\GetIdInfo$Id: l3sort.dtx 6760 2016-11-21 20:35:31Z joseph $
{L3 Experimental sorting functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
index a0ce8b9d326..b13f2f9add9 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{l3flag}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3flag.dtx 6730 2016-10-19 11:19:38Z joseph $
+\GetIdInfo$Id: l3flag.dtx 6760 2016-11-21 20:35:31Z joseph $
{L3 Experimental flags}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
index a5605769613..b77e039e031 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{l3regex}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3regex.dtx 6730 2016-10-19 11:19:38Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6760 2016-11-21 20:35:31Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
index 4f92950cb33..522d4bcd40b 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{l3regex}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3regex.dtx 6730 2016-10-19 11:19:38Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6760 2016-11-21 20:35:31Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
index a570d9a325b..1fe47bca0b3 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{l3tl-build}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3tl-build.dtx 6730 2016-10-19 11:19:38Z joseph $
+\GetIdInfo$Id: l3tl-build.dtx 6760 2016-11-21 20:35:31Z joseph $
{L3 Experimental token list construction}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index c2ec8683ada..6c7ce4fcab5 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -47,8 +47,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{l3galley}{Support package l3kernel too old}
@@ -60,7 +60,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3galley.dtx 6730 2016-10-19 11:19:38Z joseph $
+\GetIdInfo$Id: l3galley.dtx 6760 2016-11-21 20:35:31Z joseph $
{L3 Experimental galley code}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index c15781e05f6..6fa4e32f964 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -33,6 +33,7 @@
%% l3fp-expo.dtx (with options: `package')
%% l3fp-trig.dtx (with options: `package')
%% l3fp-convert.dtx (with options: `package')
+%% l3fp-random.dtx (with options: `package')
%% l3fp-assign.dtx (with options: `package')
%% l3box.dtx (with options: `package')
%% l3coffins.dtx (with options: `package')
@@ -82,8 +83,8 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}%
\def\ExplFileDescription{L3 programming layer}%
-\def\ExplFileDate{2016/10/19}%
-\def\ExplFileVersion{6730}%
+\def\ExplFileDate{2016/11/21}%
+\def\ExplFileVersion{6760}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -10622,7 +10623,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3fp.dtx 6685 2016-08-19 16:26:52Z bruno $
+\GetIdInfo$Id: l3fp.dtx 6761 2016-11-21 21:48:43Z joseph $
{L3 Floating points}
%% File: l3fp-aux.dtx Copyright(C) 2011-2014,2016 The LaTeX3 Project
%%
@@ -10864,6 +10865,32 @@
{ \fi: \__fp_exp_after_o:w \s__fp #3 ; }
\cs_new:Npn \__fp_case_return_ii_o:ww #1 \fi: #2 \s__fp #3 ;
{ \fi: \__fp_exp_after_o:w }
+\prg_new_conditional:Npnn \__fp_int:w \s__fp \__fp_chk:w #1 #2 #3; { TF , T , F , p }
+ {
+ \if_case:w #1 \exp_stop_f:
+ \prg_return_true:
+ \or: \__fp_int_normal:nnnnn #3
+ \else: \prg_return_false:
+ \fi:
+ }
+\cs_new:Npn \__fp_int_normal:nnnnn #1 #2#3#4#5
+ {
+ \if_int_compare:w #1 > \c_zero
+ \__fp_decimate:nNnnnn { \c_sixteen - #1 }
+ \__fp_int_test:Nw
+ {#2} {#3} {#4} {#5}
+ \else:
+ \prg_return_false:
+ \fi:
+ }
+\cs_new:Npn \__fp_int_test:Nw #1#2;
+ {
+ \if_meaning:w 0 #1
+ \prg_return_true:
+ \else:
+ \prg_return_false:
+ \fi:
+ }
\cs_new:Npn \__fp_small_int:wTF \s__fp \__fp_chk:w #1#2
{
\if_case:w #1 \exp_stop_f:
@@ -11299,13 +11326,24 @@
\cs_new:Npn \__fp_round_o:Nw #1#2 @
{
\if_case:w
- \__int_eval:w \__fp_array_count:n {#2} - \c_one \__int_eval_end:
- \__fp_round:Nwn #1 #2 {0} \exp:w
+ \__int_eval:w \__fp_array_count:n {#2} \__int_eval_end:
+ \__fp_round_no_arg_o:Nw #1 \exp:w
+ \or: \__fp_round:Nwn #1 #2 {0} \exp:w
\or: \__fp_round:Nww #1 #2 \exp:w
\else: \__fp_round:Nwww #1 #2 @ \exp:w
\fi:
\exp_end_continue_f:w
}
+\cs_new:Npn \__fp_round_no_arg_o:Nw #1
+ {
+ \cs_if_eq:NNTF #1 \__fp_round_to_nearest:NNN
+ { \__fp_error:nnnn { num-args } { round () } { 1 } { 3 } }
+ {
+ \__fp_error:nffn { num-args }
+ { \__fp_round_name_from_cs:N #1 () } { 1 } { 2 }
+ }
+ \exp_after:wN \c_nan_fp
+ }
\cs_new:Npn \__fp_round:Nwww #1#2 ; #3 ; \s__fp \__fp_chk:w #4#5#6 ; #7 @
{
\cs_if_eq:NNTF #1 \__fp_round_to_nearest:NNN
@@ -12100,6 +12138,30 @@
}
}
\group_end:
+\cs_new:cpn { __fp_parse_prefix_,:Nw } #1
+ {
+ \if_int_compare:w #1 = \c_one
+ \exp_after:wN \__fp_parse_one:Nw
+ \exp_after:wN #1
+ \else:
+ \__msg_kernel_expandable_error:nnn
+ { kernel } { fp-missing-number } { , }
+ \exp_after:wN \c_nan_fp \exp:w \exp_end_continue_f:w
+ \exp_after:wN \__fp_parse_infix:NN
+ \exp_after:wN #1
+ \exp_after:wN ,
+ \fi:
+ }
+\cs_new:cpn { __fp_parse_prefix_):Nw } #1
+ {
+ \if_int_compare:w #1 = \c_one
+ \else:
+ \__msg_kernel_expandable_error:nnn
+ { kernel } { fp-missing-number } { ) }
+ \exp_after:wN \c_nan_fp \exp:w \exp_end_continue_f:w
+ \fi:
+ \__fp_parse_infix:NN #1 )
+ }
\cs_set_protected:Npn \__fp_tmp:w #1 #2
{
\cs_new:cpn { __fp_parse_word_#1:N }
@@ -12170,6 +12232,10 @@
{ \__fp_parse_function:NNN \__fp_minmax_o:Nw 2 }
\cs_new:Npn \__fp_parse_word_min:N
{ \__fp_parse_function:NNN \__fp_minmax_o:Nw 0 }
+\cs_new:Npn \__fp_parse_word_rand:N
+ { \__fp_parse_function:NNN \__fp_rand_o:Nw ? }
+\cs_new:Npn \__fp_parse_word_randint:N
+ { \__fp_parse_function:NNN \__fp_randint_o:Nw ? }
\cs_new:Npn \__fp_parse_word_abs:N
{ \__fp_parse_unary_function:nNN { set_sign } 0 }
\cs_new:Npn \__fp_parse_word_exp:N
@@ -12227,6 +12293,12 @@
\cs_new:Npn \__fp_parse_after:ww
#1@ \__fp_parse_infix_end:N \s__fp_stop
{ \exp_end: #1 }
+\cs_new:Npn \__fp_parse_o:n #1
+ {
+ \exp_after:wN \exp_after:wN
+ \exp_after:wN \__fp_exp_after_o:w
+ \__fp_parse:n {#1}
+ }
\cs_new:Npn \__fp_parse_operand:Nw #1
{
\exp_end_continue_f:w
@@ -12847,6 +12919,48 @@
\fp_while_do:nNnn {#1} #2 {#3} {#4}
}
}
+\cs_new:Npn \fp_step_function:nnnN #1#2#3
+ {
+ \exp_after:wN \__fp_step:wwwN
+ \exp:w \exp_end_continue_f:w \__fp_parse_o:n {#1} :
+ \exp:w \exp_end_continue_f:w \__fp_parse_o:n {#2} :
+ \exp:w \exp_end_continue_f:w \__fp_parse:n {#3} :
+ }
+\cs_generate_variant:Nn \fp_step_function:nnnN { nnnc }
+\cs_new:Npn \__fp_step:wwwN #1 : #2 : #3 : #4
+ {
+ \fp_compare:nNnTF {#2} > 0
+ { \__fp_step:NfnnN > }
+ {
+ \fp_compare:nNnTF {#2} = 0
+ {
+ \__msg_kernel_expandable_error:nnn { kernel } { zero-step } {#4}
+ \use_none:nnnn
+ }
+ { \__fp_step:NfnnN < }
+ }
+ { \fp_eval:n {#1} } {#2} {#3} #4
+ }
+
+\cs_new:Npn \__fp_step:NnnnN #1#2#3#4#5
+ {
+ \fp_compare:nNnF {#2} #1 {#4}
+ {
+ #5 {#2}
+ \__fp_step:NfnnN
+ #1 { \fp_eval:n { #2 + #3 } } {#3} {#4} #5
+ }
+ }
+\cs_generate_variant:Nn \__fp_step:NnnnN { Nf }
+\cs_new_protected:Npn \fp_step_inline:nnnn #1#2#3#4
+ {
+ \int_gincr:N \g__prg_map_int
+ \cs_gset_protected:cpn { __prg_map_ \int_use:N \g__prg_map_int :w }
+ ##1 {#4}
+ \fp_step_function:nnnc {#1} {#2} {#3}
+ { __prg_map_ \int_use:N \g__prg_map_int :w }
+ \__prg_break_point:Nn \scan_stop: { \int_gdecr:N \g__prg_map_int }
+ }
\cs_new:Npn \__fp_minmax_o:Nw #1#2 @
{
\if_meaning:w 0 #1
@@ -16033,6 +16147,166 @@
}
\exp_not:N \__fp_array_to_clist_loop:Nw
}
+%% File: l3fp-random.dtx Copyright (C) 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
+%% license or (at your option) any later version. The latest version
+%% of this license is in the file
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
+%% and all files in that bundle must be distributed together.
+%%
+%% The released version of this bundle is available from CTAN.
+%%
+%% -----------------------------------------------------------------------
+%%
+%% The development version of the bundle can be found at
+%%
+%% http://www.latex-project.org/svnroot/experimental/trunk/
+%%
+%% for those people who are interested.
+%%
+%%%%%%%%%%%
+%% NOTE: %%
+%%%%%%%%%%%
+%%
+%% Snapshots taken from the repository represent work in progress and may
+%% not work or may contain conflicting material! We therefore ask
+%% people _not_ to put them into distributions, archives, etc. without
+%% prior consultation with the LaTeX Project Team.
+%%
+%% -----------------------------------------------------------------------
+%%
+\cs_new:Npn \__fp_rand_o:Nw ? #1 @
+ {
+ \tl_if_empty:nTF {#1}
+ { \__fp_rand_o: }
+ {
+ \__msg_kernel_expandable_error:nnnnn
+ { kernel } { fp-num-args } { rand() } { 0 } { 0 }
+ \exp_after:wN \c_nan_fp
+ }
+ }
+\cs_if_exist:NTF \pdftex_uniformdeviate:D
+ {
+ \cs_new:Npn \__fp_rand_o:
+ {
+ \__fp_parse_o:n
+ {
+ .
+ \exp_after:wN \use_none:n
+ \__int_value:w \__int_eval:w 1 0000 0000 +
+ \pdftex_uniformdeviate:D 1 0000 0000 \__int_eval_end:
+ \exp_after:wN \use_none:n
+ \__int_value:w \__int_eval:w 1 0000 0000 +
+ \pdftex_uniformdeviate:D 1 0000 0000 \__int_eval_end:
+ }
+ }
+ }
+ {
+ \cs_new:Npn \__fp_rand_o:
+ {
+ \__msg_kernel_expandable_error:nn { kernel } { fp-no-random }
+ \exp_after:wN \c_nan_fp
+ }
+ }
+\cs_new:Npn \__fp_randint_o:Nw ? #1 @
+ {
+ \if_case:w
+ \__int_eval:w \__fp_array_count:n {#1} - \c_one \__int_eval_end:
+ \exp_after:wN \__fp_randint_e:w \c_one_fp #1
+ \or: \__fp_randint_e:w #1
+ \else:
+ \__msg_kernel_expandable_error:nnnnn
+ { kernel } { fp-num-args } { randint() } { 1 } { 2 }
+ \exp_after:wN \c_nan_fp \exp:w
+ \fi:
+ \exp_after:wN \exp_end:
+ }
+\cs_new:Npn \__fp_randint_badarg:w \s__fp \__fp_chk:w #1#2#3;
+ {
+ \__fp_int:wTF \s__fp \__fp_chk:w #1#2#3;
+ {
+ \if_meaning:w 1 #1
+ \if_int_compare:w
+ \use_i_delimit_by_q_stop:nw #3 \q_stop > \c_sixteen
+ \exp_after:wN \c_one
+ \fi:
+ \fi:
+ }
+ { \c_one }
+ }
+\cs_new:Npn \__fp_randint_e:w #1; #2;
+ {
+ \if_case:w
+ \__fp_randint_badarg:w #1;
+ \__fp_randint_badarg:w #2;
+ \fp_compare:nNnTF { #1; } > { #2; } { \c_one } { \c_zero }
+ \fp_compare:nNnTF { #1; + 2e9 } < { #2; }
+ { \__fp_randint_wide_e:nn }
+ { \__fp_randint_narrow_e:nn }
+ { #1; } { #2; }
+ \or:
+ \__fp_invalid_operation_tl_o:ff
+ { randint } { \__fp_array_to_clist:n { #1; #2; } }
+ \exp:w
+ \fi:
+ }
+\cs_if_exist:NTF \pdftex_uniformdeviate:D
+ {
+ \cs_new:Npn \__fp_randint_narrow_e:nn #1#2
+ {
+ \__fp_parse_o:n
+ {
+ #1 +
+ \pdftex_uniformdeviate:D
+ \int_eval:n { \fp_to_int:n { #2 - #1 } + \c_one }
+ }
+ \exp:w
+ }
+ \cs_new:Npn \__fp_randint_wide_e:nn #1 #2
+ {
+ \exp_args:Nf \__fp_randint_wide_e:nnn
+ { \fp_to_int:n { ceil ( ( #2 - #1 + \c_six ) * 1e-8 ) } }
+ {#1} {#2}
+ }
+ \cs_new:Npn \__fp_randint_wide_e:nnn #1#2#3
+ {
+ \exp_args:Nf \__fp_randint_wide_e:nnnn
+ {
+ \__fp_parse:n
+ {
+ #2 +
+ \pdftex_uniformdeviate:D #1 e 8 +
+ \pdftex_uniformdeviate:D 1 0000 0000
+ }
+ }
+ {#1} {#2} {#3}
+ }
+ \cs_new:Npn \__fp_randint_wide_e:nnnn #1#2#3#4
+ {
+ \fp_compare:nNnTF {#1} > {#4}
+ { \__fp_randint_wide_e:nnn {#2} {#3} {#4} }
+ { \__fp_exp_after_o:w #1 \exp:w }
+ }
+ }
+ {
+ \cs_new:Npn \__fp_randint_narrow_e:nn #1#2
+ {
+ \__msg_kernel_expandable_error:nn { kernel } { fp-no-random }
+ \exp_after:wN \c_nan_fp \exp:w
+ }
+ \cs_new:Npn \__fp_randint_wide_e:nn #1#2
+ {
+ \__msg_kernel_expandable_error:nn { kernel } { fp-no-random }
+ \exp_after:wN \c_nan_fp \exp:w
+ }
+ }
+\__msg_kernel_new:nnn { kernel } { fp-no-random }
+ { Random~numbers~unavailable }
%%
%% File: l3fp-assign.dtx Copyright (C) 2011-2016 The LaTeX3 project
%%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index b57887da668..4c9fa9cd86f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -47,8 +47,8 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}%
\def\ExplFileDescription{L3 programming layer}%
-\def\ExplFileDate{2016/10/19}%
-\def\ExplFileVersion{6730}%
+\def\ExplFileDate{2016/11/21}%
+\def\ExplFileVersion{6760}%
\let\ExplLoaderFileVersion\ExplFileVersion
\begingroup
\def\tempa{LaTeX2e}%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 7dfc9b66c66..f41857ca261 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -47,8 +47,8 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}%
\def\ExplFileDescription{L3 programming layer}%
-\def\ExplFileDate{2016/10/19}%
-\def\ExplFileVersion{6730}%
+\def\ExplFileDate{2016/11/21}%
+\def\ExplFileVersion{6760}%
\let\ExplLoaderFileVersion\ExplFileVersion
\ProvidesPackage{\ExplFileName}
[%
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index f16aa19f843..5ae4be21638 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -46,8 +46,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{l3keys2e}{Support package l3kernel too old}
@@ -61,8 +61,8 @@
}
\def\ExplFileName{l3keys2e}
\def\ExplFileDescription{LaTeX2e option processing using LaTeX3 keys}
-\def\ExplFileDate{2016/10/19}
-\def\ExplFileVersion{6730}
+\def\ExplFileDate{2016/11/21}
+\def\ExplFileVersion{6760}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\cs_generate_variant:Nn \clist_put_right:Nn { Nv }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
index a16df31eead..fe5d8257511 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -47,8 +47,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{xfrac}{Support package l3kernel too old}
@@ -63,8 +63,8 @@
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
\def\ExplFileName{xfrac}
\def\ExplFileDescription{L3 Experimental split-level fractions}
-\def\ExplFileDate{2016/10/19}
-\def\ExplFileVersion{6730}
+\def\ExplFileDate{2016/11/21}
+\def\ExplFileVersion{6760}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\keys_define:nn { xfrac }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 4777b58c255..c1ff2f604fa 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{xparse}{Support package l3kernel too old}
@@ -65,8 +65,8 @@
}
\def\ExplFileName{xparse}
\def\ExplFileDescription{L3 Experimental document command parser}
-\def\ExplFileDate{2016/10/19}
-\def\ExplFileVersion{6730}
+\def\ExplFileDate{2016/11/21}
+\def\ExplFileVersion{6760}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\tl_const:Nx \c__xparse_no_value_tl
@@ -96,7 +96,9 @@
\bool_new:N \l__xparse_processor_bool
\int_new:N \l__xparse_processor_int
\tl_new:N \l__xparse_signature_tl
-\tl_new:N \l__xparse_tmp_tl
+\prop_new:N \l__xparse_tmp_prop
+\tl_new:N \l__xparse_tmpa_tl
+\tl_new:N \l__xparse_tmpb_tl
\cs_new_protected:Npn \__xparse_declare_cmd:Nnn
{
\bool_set_false:N \l__xparse_expandable_bool
@@ -234,8 +236,8 @@
\cs_new_protected:Npn \__xparse_count_mandatory:N #1
{
\quark_if_recursion_tail_stop:N #1
- \prop_get:NnNTF \c__xparse_shorthands_prop {#1} \l__xparse_tmp_tl
- { \exp_after:wN \__xparse_count_mandatory:N \l__xparse_tmp_tl }
+ \prop_get:NnNTF \c__xparse_shorthands_prop {#1} \l__xparse_tmpa_tl
+ { \exp_after:wN \__xparse_count_mandatory:N \l__xparse_tmpa_tl }
{ \__xparse_count_mandatory_aux:N #1 }
}
\cs_new_protected:Npn \__xparse_count_mandatory_aux:N #1
@@ -267,23 +269,21 @@
\quark_if_recursion_tail_stop_do:nn {#3} { \__xparse_bad_arg_spec:wn }
\__xparse_count_mandatory:N
}
-\cs_new_protected:Npn \__xparse_count_type_g:w
- { \__xparse_count_mandatory:N }
-\cs_new_protected:Npn \__xparse_count_type_G:w #1
+\cs_new_protected:Npn \__xparse_count_type_e:w #1
{
\quark_if_recursion_tail_stop_do:nn {#1} { \__xparse_bad_arg_spec:wn }
\__xparse_count_mandatory:N
}
-\cs_new_protected:Npn \__xparse_count_type_k:w #1
+\cs_new_protected:Npn \__xparse_count_type_E:w #1#2
{
- \__xparse_single_token_check:n {#1}
- \quark_if_recursion_tail_stop_do:Nn #1 { \__xparse_bad_arg_spec:wn }
+ \quark_if_recursion_tail_stop_do:nn {#2} { \__xparse_bad_arg_spec:wn }
\__xparse_count_mandatory:N
}
-\cs_new_protected:Npn \__xparse_count_type_K:w #1#2
+\cs_new_protected:Npn \__xparse_count_type_g:w
+ { \__xparse_count_mandatory:N }
+\cs_new_protected:Npn \__xparse_count_type_G:w #1
{
- \__xparse_single_token_check:n {#1}
- \quark_if_recursion_tail_stop_do:nn {#2} { \__xparse_bad_arg_spec:wn }
+ \quark_if_recursion_tail_stop_do:nn {#1} { \__xparse_bad_arg_spec:wn }
\__xparse_count_mandatory:N
}
\cs_new_protected:Npn \__xparse_count_type_m:w
@@ -350,8 +350,8 @@
\cs_new_protected:Npn \__xparse_prepare_signature_bypass:N #1
{
\quark_if_recursion_tail_stop:N #1
- \prop_get:NnNTF \c__xparse_shorthands_prop {#1} \l__xparse_tmp_tl
- { \exp_after:wN \__xparse_prepare_signature:N \l__xparse_tmp_tl }
+ \prop_get:NnNTF \c__xparse_shorthands_prop {#1} \l__xparse_tmpa_tl
+ { \exp_after:wN \__xparse_prepare_signature:N \l__xparse_tmpa_tl }
{
\int_incr:N \l__xparse_current_arg_int
\__xparse_prepare_signature_add:N #1
@@ -397,6 +397,15 @@
\tl_put_right:Nn \l__xparse_signature_tl { #1 #2 {#3} }
\__xparse_prepare_signature:N
}
+\cs_new_protected:Npn \__xparse_add_type_e:w #1
+ { \__xparse_add_type_E:w {#1} { } }
+\cs_new_protected:Npn \__xparse_add_type_E:w #1#2
+ {
+ \__xparse_flush_m_args:
+ \__xparse_add_grabber_optional:N E
+ \tl_put_right:Nn \l__xparse_signature_tl { {#1} {#2} }
+ \__xparse_prepare_signature:N
+ }
\cs_new_protected:Npn \__xparse_add_type_g:w
{ \exp_args:No \__xparse_add_type_G:w \c__xparse_no_value_tl }
\cs_new_protected:Npn \__xparse_add_type_G:w #1
@@ -406,15 +415,6 @@
\tl_put_right:Nn \l__xparse_signature_tl { {#1} }
\__xparse_prepare_signature:N
}
-\cs_new_protected:Npn \__xparse_add_type_k:w #1
- { \exp_args:NNo \__xparse_add_type_K:w #1 \c__xparse_no_value_tl }
-\cs_new_protected:Npn \__xparse_add_type_K:w #1#2
- {
- \__xparse_flush_m_args:
- \__xparse_add_grabber_optional:N K
- \tl_put_right:Nn \l__xparse_signature_tl { #1 {#2} }
- \__xparse_prepare_signature:N
- }
\cs_new_protected:Npn \__xparse_add_type_l:w
{
\__xparse_flush_m_args:
@@ -573,27 +573,6 @@
{ G }
\__xparse_add_expandable_type_m:w
}
-\cs_new_protected:Npn \__xparse_add_expandable_type_k:w #1
- {
- \exp_args:NNo
- \__xparse_add_expandable_type_K:w #1 \c__xparse_no_value_tl
- }
-\cs_new_protected:Npn \__xparse_add_expandable_type_K:w #1#2
- {
- \__xparse_add_expandable_grabber_optional:n { K }
- \bool_if:NTF \l__xparse_all_long_bool
- { \cs_set:cpx }
- { \cs_set_nopar:cpx }
- { \l__xparse_expandable_aux_name_tl } ##1 #1 ##2
- { ##1 {##2} }
- \tl_put_right:Nx \l__xparse_signature_tl
- {
- \exp_not:c { \l__xparse_expandable_aux_name_tl }
- \exp_not:n { #1 {#2} }
- }
- \bool_set_false:N \l__xparse_long_bool
- \__xparse_prepare_signature:N
- }
\cs_new_protected:Npn \__xparse_add_expandable_type_l:w
{
\__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
@@ -753,10 +732,10 @@
{ \__xparse_grab_D_nested:w \q_nil ##2 \q_stop }
\tl_if_in:NnTF \l__xparse_nesting_b_tl {#1}
{
- \tl_set_eq:NN \l__xparse_tmp_tl \l__xparse_nesting_b_tl
+ \tl_set_eq:NN \l__xparse_tmpa_tl \l__xparse_nesting_b_tl
\tl_clear:N \l__xparse_nesting_b_tl
\exp_after:wN \l__xparse_fn_tl \exp_after:wN
- \q_nil \l__xparse_tmp_tl \q_nil \q__xparse \ERROR
+ \q_nil \l__xparse_tmpa_tl \q_nil \q__xparse \ERROR
}
{
\tl_put_right:No \l__xparse_nesting_a_tl
@@ -770,6 +749,80 @@
}
\cs_new:Npn \__xparse_grab_D_nested:w #1 \q_nil \q_stop
{ \exp_not:o { \use_none:n #1 } }
+\cs_new_protected:Npn \__xparse_grab_E:w #1#2#3 \l__xparse_args_tl
+ {
+ \__xparse_grab_E:nnnNn
+ {#1} {#2} {#3}
+ \cs_set_protected_nopar:Npn
+ { _ignore_spaces }
+ }
+\cs_new_protected:Npn \__xparse_grab_E_long:w #1#2#3 \l__xparse_args_tl
+ {
+ \__xparse_grab_E:nnnNn
+ {#1} {#2} {#3}
+ \cs_set_protected:Npn
+ { _ignore_spaces }
+ }
+\cs_new_protected:Npn \__xparse_grab_E_trailing:w #1#2#3 \l__xparse_args_tl
+ {
+ \__xparse_grab_E:nnnNn
+ {#1} {#2} {#3}
+ \cs_set_protected_nopar:Npn
+ { }
+ }
+\cs_new_protected:Npn \__xparse_grab_E_long_trailing:w #1#2#3 \l__xparse_args_tl
+ {
+ \__xparse_grab_E:nnnNn
+ {#1} {#2} {#3}
+ \cs_set_protected:Npn
+ { }
+ }
+\cs_new_protected:Npn \__xparse_grab_E:nnnNn #1#2#3#4#5
+ {
+ \exp_after:wN #4 \l__xparse_fn_tl ##1##2##3
+ {
+ \prop_put:Nnn \l__xparse_tmp_prop {##1} {##3}
+ \__xparse_grab_E_loop:nnN {#5} { } ##2 \q_recursion_stop
+ }
+ \prop_clear:N \l__xparse_tmp_prop
+ \__xparse_grab_E_setup:Nw
+ #1 \q_recursion_tail \q_mark #2 \q_recursion_tail \q_recursion_stop
+ \cs_set_protected:Npn \__xparse_grab_E_finalise:
+ {
+ \tl_clear:N \l__xparse_tmpa_tl
+ \tl_map_inline:nn {#1}
+ {
+ \prop_get:NnNF \l__xparse_tmp_prop {####1} \l__xparse_tmpb_tl
+ { \tl_set_eq:NN \l__xparse_tmpb_tl \c__xparse_no_value_tl }
+ \tl_set:Nx \l__xparse_tmpa_tl
+ {
+ \exp_not:V \l__xparse_tmpa_tl
+ { \exp_not:V \l__xparse_tmpb_tl }
+ }
+ }
+ \__xparse_add_arg:V \l__xparse_tmpa_tl
+ #3 \l__xparse_args_tl
+ }
+ \__xparse_grab_E_loop:nnN {#5} { } #1 \q_recursion_tail \q_recursion_stop
+ }
+\cs_new_protected:Npn \__xparse_grab_E_setup:Nw #1#2 \q_mark #3
+ {
+ \quark_if_recursion_tail_stop:N #1
+ \quark_if_recursion_tail_stop:n {#3}
+ \prop_put:Nnn \l__xparse_tmp_prop {#1} {#3}
+ \__xparse_grab_E_setup:Nw #2 \q_mark
+ }
+\cs_new_protected:Npn \__xparse_grab_E_loop:nnN #1#2#3#4 \q_recursion_stop
+ {
+ \cs_if_eq:NNTF #3 \q_recursion_tail
+ { \__xparse_grab_E_finalise: }
+ {
+ \use:c { peek_meaning_remove #1 :NTF } #3
+ { \l__xparse_fn_tl #3 {#2#4} }
+ { \__xparse_grab_E_loop:nnN {#1} {#2#3} #4 \q_recursion_stop }
+ }
+ }
+\cs_new_protected:Npn \__xparse_grab_E_finalise: { }
\cs_new_protected:Npn \__xparse_grab_G:w #1#2 \l__xparse_args_tl
{
\__xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected_nopar:Npn
@@ -797,48 +850,6 @@
#2 \l__xparse_args_tl
}
}
-\cs_new_protected:Npn \__xparse_grab_K:w #1#2#3 \l__xparse_args_tl
- {
- \__xparse_grab_K_aux:nnnNn
- {#1} {#2} {#3}
- \cs_set_protected_nopar:Npn
- { _ignore_spaces }
- }
-\cs_new_protected:Npn \__xparse_grab_K_long:w #1#2#3 \l__xparse_args_tl
- {
- \__xparse_grab_K_aux:nnnNn
- {#1} {#2} {#3}
- \cs_set_protected:Npn
- { _ignore_spaces }
- }
-\cs_new_protected:Npn \__xparse_grab_K_trailing:w #1#2#3 \l__xparse_args_tl
- {
- \__xparse_grab_K_aux:nnnNn
- {#1} {#2} {#3}
- \cs_set_protected_nopar:Npn
- { }
- }
-\cs_new_protected:Npn \__xparse_grab_K_long_trailing:w #1#2#3 \l__xparse_args_tl
- {
- \__xparse_grab_K_aux:nnnNn
- {#1} {#2} {#3}
- \cs_set_protected:Npn
- { }
- }
-\cs_new_protected:Npn \__xparse_grab_K_aux:nnnNn #1#2#3#4#5
- {
- \exp_after:wN #4 \l__xparse_fn_tl ##1
- {
- \__xparse_add_arg:n {##1}
- #3 \l__xparse_args_tl
- }
- \use:c { peek_meaning_remove #5 :NTF } #1
- { \l__xparse_fn_tl }
- {
- \__xparse_add_arg:n {#2}
- #3 \l__xparse_args_tl
- }
- }
\cs_new_protected:Npn \__xparse_grab_l:w #1 \l__xparse_args_tl
{ \__xparse_grab_l_aux:nN {#1} \cs_set_protected_nopar:Npn }
\cs_new_protected:Npn \__xparse_grab_l_long:w #1 \l__xparse_args_tl
@@ -1255,20 +1266,6 @@
}
#2 \q__xparse #1
}
-\cs_new:Npn \__xparse_expandable_grab_K:w #1 \q__xparse #2
- { #2 { \__xparse_expandable_grab_K_aux:NNwn #1 \q__xparse #2 } }
-\cs_new:Npn \__xparse_expandable_grab_K_aux:NNwn #1#2#3#4 \q__xparse #5#6
- {
- \str_if_eq:onTF { #1 { } #6 { } #2 { } } { { } #2 { } }
- {
- #1
- { \__xparse_expandable_grab_K_aux:Nwn #5 #4 \q__xparse }
- #6
- }
- { #4 {#3} \q__xparse #5 {#6} }
- }
-\cs_new:Npn \__xparse_expandable_grab_K_aux:Nwn #1#2 \q__xparse #3
- { #2 {#3} \q__xparse #1 }
\cs_new:Npn \__xparse_expandable_grab_m:w #1 \q__xparse #2
{ #2 { \__xparse_expandable_grab_m_aux:wNn #1 \q__xparse #2 } }
\cs_new:Npn \__xparse_expandable_grab_m_aux:wNn #1 \q__xparse #2#3
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 8f389e34ab5..1303b35589d 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{xtemplate}{Support package l3kernel too old}
@@ -65,8 +65,8 @@
}
\def\ExplFileName{xtemplate}
\def\ExplFileDescription{L3 Experimental prototype document functions}
-\def\ExplFileDate{2016/10/19}
-\def\ExplFileVersion{6730}
+\def\ExplFileDate{2016/11/21}
+\def\ExplFileVersion{6760}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\tl_const:Nn \c__xtemplate_code_root_tl { template~code~>~ }