summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-07-23 17:15:15 +0000
committerKarl Berry <karl@freefriends.org>2012-07-23 17:15:15 +0000
commitdadf86ec2d90ed4529037604a8dcea9f660045b8 (patch)
tree819b3708bda1e2a087ebd5fb0f0f55ebe0b4d157 /Master/texmf-dist/tex
parent134349701bddf7cbbacf6030c6b9f9838aff96fa (diff)
l3packages 3990 (17jul12)
git-svn-id: svn://tug.org/texlive/trunk@27109 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty68
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty258
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty1495
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty1156
4 files changed, 1504 insertions, 1473 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 5d4ecde4e55..fdd3f37a919 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -46,30 +46,30 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2012/04/23]
-\@ifpackagelater{expl3}{2012/04/23}
+\RequirePackage{expl3}[2012/07/16]
+\@ifpackagelater{expl3}{2012/07/16}
{}
- {
+ {%
\PackageError{l3keys2e}{Support package l3kernel too old.}
- {
+ {%
Please install an up to date version of l3kernel
using your TeX package manager or from CTAN.\\ \\
- Loading l3keys2e will abort!
- }
+ Loading l3keys2e will abort!%
+ }%
\endinput
}
\RequirePackage{xparse}
-\GetIdInfo$Id: l3keys2e.dtx 3570 2012-04-23 13:24:55Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 3990 2012-07-16 07:46:03Z joseph $
{LaTeX2e option processing using LaTeX3 keys}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\clist_new:N \keys_latexe_options_clist
-\bool_new:N \_l_keys_process_class_bool
-\cs_new_protected:Npn \keys_latexe_options:n #1
+\clist_new:N \__keys_latexe_options_clist
+\bool_new:N \l__keys_process_class_bool
+\cs_new_protected:Npn \__keys_latexe_options:n #1
{
- \clist_clear:N \keys_latexe_options_clist
- \keys_latexe_options_global:n {#1}
- \keys_latexe_options_local:
+ \clist_clear:N \__keys_latexe_options_clist
+ \__keys_latexe_options_global:n {#1}
+ \__keys_latexe_options_local:
\keys_if_exist:nnF {#1} { unknown }
{
\keys_define:nn {#1}
@@ -81,68 +81,68 @@
}
}
}
- \keys_set:nV {#1} \keys_latexe_options_clist
+ \keys_set:nV {#1} \__keys_latexe_options_clist
\AtEndOfPackage { \cs_set_eq:NN \@unprocessedoptions \scan_stop: }
}
-\cs_new_protected:Npn \keys_latexe_options_global:n #1
+\cs_new_protected:Npn \__keys_latexe_options_global:n #1
{
\cs_if_eq:NNF \@classoptionslist \scan_stop:
{
\cs_if_eq:NNTF \@currext \@clsextension
- { \keys_latexe_options_class:n {#1} }
+ { \__keys_latexe_options_class:n {#1} }
{
- \bool_if:NT \_l_keys_process_class_bool
- { \keys_latexe_options_package:n {#1} }
+ \bool_if:NT \l__keys_process_class_bool
+ { \__keys_latexe_options_package:n {#1} }
}
}
}
-\cs_new_protected:Npn \keys_latexe_options_class:n #1
+\cs_new_protected:Npn \__keys_latexe_options_class:n #1
{
\keys_if_exist:nnTF {#1} { unknown }
- { \clist_put_right:No \keys_latexe_options_clist \@classoptionslist }
+ { \clist_put_right:No \__keys_latexe_options_clist \@classoptionslist }
{
\clist_map_inline:Nn \@classoptionslist
{
- \keys_if_exist:nnTF {#1} { \keys_latexe_remove_equals:n {##1} }
- { \clist_put_right:Nn \keys_latexe_options_clist {##1} }
+ \keys_if_exist:nnTF {#1} { \__keys_latexe_remove_equals:n {##1} }
+ { \clist_put_right:Nn \__keys_latexe_options_clist {##1} }
{ \clist_put_right:Nn \@unusedoptionlist {##1} }
}
}
}
-\cs_new_protected:Npn \keys_latexe_options_package:n #1
+\cs_new_protected:Npn \__keys_latexe_options_package:n #1
{
\clist_map_inline:Nn \@classoptionslist
{
- \keys_if_exist:nnT {#1} { \keys_latexe_remove_equals:n {##1} }
+ \keys_if_exist:nnT {#1} { \__keys_latexe_remove_equals:n {##1} }
{
- \clist_put_right:Nn \keys_latexe_options_clist {##1}
+ \clist_put_right:Nn \__keys_latexe_options_clist {##1}
\clist_remove_all:Nn \@unusedoptionlist {##1}
}
}
}
-\cs_new_protected_nopar:Npn \keys_latexe_options_local:
+\cs_new_protected_nopar:Npn \__keys_latexe_options_local:
{
\cs_if_eq:NNF \@currext \@clsextension
{
\cs_if_exist:cT { opt@ \@currname . \@currext }
{
- \exp_args:NNc \clist_put_right:NV \keys_latexe_options_clist
+ \exp_args:NNc \clist_put_right:NV \__keys_latexe_options_clist
{ opt@ \@currname . \@currext }
}
}
}
-\cs_new:Npn \keys_latexe_remove_equals:n #1
- { \keys_latexe_remove_equals:w #1 = \q_stop }
-\cs_new:Npn \keys_latexe_remove_equals:w #1 = #2 \q_stop {#1}
+\cs_new:Npn \__keys_latexe_remove_equals:n #1
+ { \__keys_latexe_remove_equals:w #1 = \q_stop }
+\cs_new:Npn \__keys_latexe_remove_equals:w #1 = #2 \q_stop {#1}
\cs_new_protected_nopar:Npn \ProcessKeysOptions #1
{
- \bool_set_true:N \_l_keys_process_class_bool
- \keys_latexe_options:n {#1}
+ \bool_set_true:N \l__keys_process_class_bool
+ \__keys_latexe_options:n {#1}
}
\cs_new_protected_nopar:Npn \ProcessKeysPackageOptions #1
{
- \bool_set_false:N \_l_keys_process_class_bool
- \keys_latexe_options:n {#1}
+ \bool_set_false:N \l__keys_process_class_bool
+ \__keys_latexe_options:n {#1}
}
\@onlypreamble \ProcessKeysOptions
\@onlypreamble \ProcessKeysPackageOptions
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
index b9bee5a0762..989c77fde0a 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -14,7 +14,7 @@
%% Do not distribute a modified version of this file.
%%
%% File: xfrac.dtx Copyright (C) 2004, 2008-2010 Morten Hoegholm
-%% (C) 2011 The LaTeX3 Project
+%% (C) 2011,2012 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
@@ -48,7 +48,7 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
-\GetIdInfo$Id: xfrac.dtx 3465 2012-02-26 15:31:13Z bruno $
+\GetIdInfo$Id: xfrac.dtx 3875 2012-06-30 12:38:05Z joseph $
{L3 Experimental split-level fractions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -57,42 +57,42 @@
cm-recommended .choice:,
cm-recommended /
false .code:n =
- { \bool_set_true:N \l_xfrac_cm_std_bool },
+ { \bool_set_true:N \l__xfrac_cm_std_bool },
cm-recommended /
true .code:n =
- { \bool_set_false:N \l_xfrac_cm_std_bool },
+ { \bool_set_false:N \l__xfrac_cm_std_bool },
cm-recommended .default:n = { true },
- cm-standard .bool_set:N = \l_xfrac_cm_std_bool
+ cm-standard .bool_set:N = \l__xfrac_cm_std_bool
}
\ProcessKeysOptions { xfrac }
-\box_new:N \l_xfrac_slash_box
-\box_new:N \l_xfrac_tmp_box
-\cs_new:Npn \xfrac_tmp:w { }
-\dim_new:N \l_xfrac_denominator_bot_sep_dim
-\dim_new:N \l_xfrac_numerator_bot_sep_dim
-\dim_new:N \l_xfrac_numerator_top_sep_dim
-\dim_new:N \l_xfrac_slash_left_sep_dim
-\dim_new:N \l_xfrac_slash_right_sep_dim
-\muskip_new:N \l_xfrac_slash_left_muskip
-\muskip_new:N \l_xfrac_slash_right_muskip
-\fp_new:N \l_xfrac_hscale_fp
-\fp_new:N \l_xfrac_scale_factor_fp
-\fp_new:N \l_xfrac_vscale_fp
-\tl_new:N \l_xfrac_denominator_font_tl
-\tl_new:N \l_xfrac_numerator_font_tl
-\tl_new:N \l_xfrac_phantom_tl
-\tl_new:N \l_xfrac_slash_symbol_tl
-\tl_new:N \l_xfrac_slash_symbol_font_tl
-\cs_new_nopar:Npn \xfrac_fontscale:
-\cs_new:Npn \xfrac_math:n #1 { }
-\cs_new_nopar:Npn \xfrac_denominator_font_change: { }
-\cs_new:Npn \xfrac_denominator_format:n #1 { }
-\cs_new_nopar:Npn \xfrac_numerator_font_change: { }
-\cs_new:Npn \xfrac_numerator_format:n #1 { }
-\cs_new_nopar:Npn \xfrac_relscale: { }
-\cs_new_nopar:Npn \xfrac_slash_symbol_font_change: { }
-\cs_new:Npn \xfrac_slash_symbol_format:n #1 { }
-\cs_new:Npn \xfrac_text_or_math:n #1 { }
+\box_new:N \l__xfrac_slash_box
+\box_new:N \l__xfrac_tmp_box
+\cs_new:Npn \__xfrac_tmp:w { }
+\dim_new:N \l__xfrac_denominator_bot_sep_dim
+\dim_new:N \l__xfrac_numerator_bot_sep_dim
+\dim_new:N \l__xfrac_numerator_top_sep_dim
+\dim_new:N \l__xfrac_slash_left_sep_dim
+\dim_new:N \l__xfrac_slash_right_sep_dim
+\muskip_new:N \l__xfrac_slash_left_muskip
+\muskip_new:N \l__xfrac_slash_right_muskip
+\fp_new:N \l__xfrac_hscale_fp
+\fp_new:N \l__xfrac_scale_factor_fp
+\fp_new:N \l__xfrac_vscale_fp
+\tl_new:N \l__xfrac_denominator_font_tl
+\tl_new:N \l__xfrac_numerator_font_tl
+\tl_new:N \l__xfrac_phantom_tl
+\tl_new:N \l__xfrac_slash_symbol_tl
+\tl_new:N \l__xfrac_slash_symbol_font_tl
+\cs_new_nopar:Npn \__xfrac_fontscale:
+\cs_new:Npn \__xfrac_math:n #1 { }
+\cs_new_nopar:Npn \__xfrac_denominator_font_change: { }
+\cs_new:Npn \__xfrac_denominator_format:n #1 { }
+\cs_new_nopar:Npn \__xfrac_numerator_font_change: { }
+\cs_new:Npn \__xfrac_numerator_format:n #1 { }
+\cs_new_nopar:Npn \__xfrac_relscale: { }
+\cs_new_nopar:Npn \__xfrac_slash_symbol_font_change: { }
+\cs_new:Npn \__xfrac_slash_symbol_format:n #1 { }
+\cs_new:Npn \__xfrac_text_or_math:n #1 { }
\DeclareObjectType { xfrac } { 3 }
\DeclareTemplateInterface { xfrac } { text } { 3 }
{
@@ -123,142 +123,142 @@
}
\DeclareTemplateCode { xfrac } { text } { 3 }
{
- denominator-bot-sep = \l_xfrac_denominator_bot_sep_dim ,
- denominator-font = \l_xfrac_denominator_font_tl ,
- denominator-format = \xfrac_denominator_format:n ,
- h-scale = \l_xfrac_hscale_fp ,
+ denominator-bot-sep = \l__xfrac_denominator_bot_sep_dim ,
+ denominator-font = \l__xfrac_denominator_font_tl ,
+ denominator-format = \__xfrac_denominator_format:n ,
+ h-scale = \l__xfrac_hscale_fp ,
math-mode =
{
- false = \cs_set_eq:NN \xfrac_math:n \use:n,
- true = \cs_set_eq:NN \xfrac_math:n \ensuremath
+ false = \cs_set_eq:NN \__xfrac_math:n \use:n,
+ true = \cs_set_eq:NN \__xfrac_math:n \ensuremath
},
- numerator-font = \l_xfrac_numerator_font_tl ,
- numerator-format = \xfrac_numerator_format:n ,
- numerator-bot-sep = \l_xfrac_numerator_bot_sep_dim ,
- numerator-top-sep = \l_xfrac_numerator_top_sep_dim ,
- phantom = \l_xfrac_phantom_tl ,
- scale-factor = \l_xfrac_scale_factor_fp ,
+ numerator-font = \l__xfrac_numerator_font_tl ,
+ numerator-format = \__xfrac_numerator_format:n ,
+ numerator-bot-sep = \l__xfrac_numerator_bot_sep_dim ,
+ numerator-top-sep = \l__xfrac_numerator_top_sep_dim ,
+ phantom = \l__xfrac_phantom_tl ,
+ scale-factor = \l__xfrac_scale_factor_fp ,
scale-relative =
{
false =
- \cs_set_nopar:Npn \xfrac_relscale:
+ \cs_set_nopar:Npn \__xfrac_relscale:
{
- \dim_eval:w
- \box_ht:N \l_xfrac_tmp_box + \box_dp:N \l_xfrac_tmp_box
- \dim_eval_end:
+ \__dim_eval:w
+ \box_ht:N \l__xfrac_tmp_box + \box_dp:N \l__xfrac_tmp_box
+ \__dim_eval_end:
},
true =
- \cs_set_nopar:Npn \xfrac_relscale:
- { \box_ht:N \l_xfrac_slash_box }
+ \cs_set_nopar:Npn \__xfrac_relscale:
+ { \box_ht:N \l__xfrac_slash_box }
},
scaling =
{
- false = \cs_set_eq:NN \xfrac_fontscale: \prg_do_nothing:,
+ false = \cs_set_eq:NN \__xfrac_fontscale: \prg_do_nothing:,
true =
- \cs_set_nopar:Npn \xfrac_fontscale:
+ \cs_set_nopar:Npn \__xfrac_fontscale:
{
\fontsize
- { \fp_use:N \l_xfrac_scale_factor_fp \xfrac_relscale: }
+ { \fp_use:N \l__xfrac_scale_factor_fp \__xfrac_relscale: }
{ \c_zero_dim }
\selectfont
}
},
- slash-left-kern = \l_xfrac_slash_left_sep_dim ,
- slash-left-mkern = \l_xfrac_slash_left_muskip ,
- slash-right-kern = \l_xfrac_slash_right_sep_dim ,
- slash-right-mkern = \l_xfrac_slash_right_muskip ,
- slash-symbol = \l_xfrac_slash_symbol_tl ,
- slash-symbol-font = \l_xfrac_slash_symbol_font_tl ,
- slash-symbol-format = \xfrac_slash_symbol_format:n ,
- v-scale = \l_xfrac_vscale_fp
+ slash-left-kern = \l__xfrac_slash_left_sep_dim ,
+ slash-left-mkern = \l__xfrac_slash_left_muskip ,
+ slash-right-kern = \l__xfrac_slash_right_sep_dim ,
+ slash-right-mkern = \l__xfrac_slash_right_muskip ,
+ slash-symbol = \l__xfrac_slash_symbol_tl ,
+ slash-symbol-font = \l__xfrac_slash_symbol_font_tl ,
+ slash-symbol-format = \__xfrac_slash_symbol_format:n ,
+ v-scale = \l__xfrac_vscale_fp
}
{
\AssignTemplateKeys
\mode_if_math:TF
{
- \cs_set_eq:NN \xfrac_text_or_math:n \text
- \cs_set_nopar:Npx \xfrac_denominator_font_change:
- { \tex_fam:D \l_xfrac_denominator_font_tl }
- \cs_set_nopar:Npx \xfrac_numerator_font_change:
- { \tex_fam:D \l_xfrac_numerator_font_tl }
- \cs_set_nopar:Npx \xfrac_slash_symbol_font_change:
- { \tex_fam:D \l_xfrac_slash_symbol_font_tl }
+ \cs_set_eq:NN \__xfrac_text_or_math:n \text
+ \cs_set_nopar:Npx \__xfrac_denominator_font_change:
+ { \tex_fam:D \l__xfrac_denominator_font_tl }
+ \cs_set_nopar:Npx \__xfrac_numerator_font_change:
+ { \tex_fam:D \l__xfrac_numerator_font_tl }
+ \cs_set_nopar:Npx \__xfrac_slash_symbol_font_change:
+ { \tex_fam:D \l__xfrac_slash_symbol_font_tl }
}
{
- \cs_set_eq:NN \xfrac_text_or_math:n \mbox
- \cs_set_nopar:Npn \xfrac_denominator_font_change:
+ \cs_set_eq:NN \__xfrac_text_or_math:n \mbox
+ \cs_set_nopar:Npn \__xfrac_denominator_font_change:
{
- \fontfamily { \l_xfrac_denominator_font_tl }
+ \fontfamily { \l__xfrac_denominator_font_tl }
\selectfont
}
- \cs_set_nopar:Npn \xfrac_numerator_font_change:
+ \cs_set_nopar:Npn \__xfrac_numerator_font_change:
{
- \fontfamily { \l_xfrac_numerator_font_tl }
+ \fontfamily { \l__xfrac_numerator_font_tl }
\selectfont
}
- \cs_set_nopar:Npn \xfrac_slash_symbol_font_change:
+ \cs_set_nopar:Npn \__xfrac_slash_symbol_font_change:
{
- \fontfamily { \l_xfrac_slash_symbol_font_tl }
+ \fontfamily { \l__xfrac_slash_symbol_font_tl }
\selectfont
}
}
- \xfrac_text_or_math:n
+ \__xfrac_text_or_math:n
{
\m@th
- \hbox_set:Nn \l_xfrac_tmp_box
- { \xfrac_math:n { \vphantom { ( ) } } }
- \hbox_set:Nn \l_xfrac_slash_box
+ \hbox_set:Nn \l__xfrac_tmp_box
+ { \__xfrac_math:n { \vphantom { ( ) } } }
+ \hbox_set:Nn \l__xfrac_slash_box
{
- \xfrac_math:n
+ \__xfrac_math:n
{
- \xfrac_slash_symbol_format:n
+ \__xfrac_slash_symbol_format:n
{
- \xfrac_math:n
+ \__xfrac_math:n
{
- \xfrac_slash_symbol_font_change:
+ \__xfrac_slash_symbol_font_change:
\IfNoValueTF {#2}
- { \l_xfrac_slash_symbol_tl } {#2}
+ { \l__xfrac_slash_symbol_tl } {#2}
}
}
}
}
- \cs_set_nopar:Npn \xfrac_tmp:w
+ \cs_set_nopar:Npn \__xfrac_tmp:w
{
\raisebox
{
- \dim_eval:w
- \box_ht:N \l_xfrac_slash_box
- - \box_dp:N \l_xfrac_slash_box
+ \__dim_eval:w
+ \box_ht:N \l__xfrac_slash_box
+ - \box_dp:N \l__xfrac_slash_box
- \height
- \dim_eval_end:
+ \__dim_eval_end:
}
}
\dim_compare:nNnTF
- { \l_xfrac_numerator_top_sep_dim } = { \c_max_dim }
+ { \l__xfrac_numerator_top_sep_dim } = { \c_max_dim }
{
\dim_compare:nNnF
- { \l_xfrac_numerator_bot_sep_dim } = { \c_max_dim }
+ { \l__xfrac_numerator_bot_sep_dim } = { \c_max_dim }
{
- \cs_set_nopar:Npn \xfrac_tmp:w
+ \cs_set_nopar:Npn \__xfrac_tmp:w
{
\raisebox
- { \dim_use:N \l_xfrac_numerator_bot_sep_dim }
+ { \dim_use:N \l__xfrac_numerator_bot_sep_dim }
}
}
}
{
\dim_compare:nNnTF
- { \l_xfrac_numerator_bot_sep_dim } = { \c_max_dim }
+ { \l__xfrac_numerator_bot_sep_dim } = { \c_max_dim }
{
- \cs_set_nopar:Npn \xfrac_tmp:w
+ \cs_set_nopar:Npn \__xfrac_tmp:w
{
\raisebox
{
- \dim_eval:w
- \box_ht:N \l_xfrac_slash_box
- - \dim_use:N \l_xfrac_numerator_top_sep_dim
+ \__dim_eval:w
+ \box_ht:N \l__xfrac_slash_box
+ - \dim_use:N \l__xfrac_numerator_top_sep_dim
- \height
- \dim_eval_end:
+ \__dim_eval_end:
}
}
}
@@ -267,67 +267,67 @@
{ over-specified-numerator-sep }
}
}
- \xfrac_tmp:w
+ \__xfrac_tmp:w
{
- \xfrac_fontscale:
- \xfrac_numerator_format:n
+ \__xfrac_fontscale:
+ \__xfrac_numerator_format:n
{
\scalebox
- { \fp_use:N \l_xfrac_hscale_fp }
- [ \fp_use:N \l_xfrac_vscale_fp ]
+ { \fp_use:N \l__xfrac_hscale_fp }
+ [ \fp_use:N \l__xfrac_vscale_fp ]
{
- \xfrac_math:n
+ \__xfrac_math:n
{
- \xfrac_numerator_font_change:
+ \__xfrac_numerator_font_change:
{
- \vphantom { \l_xfrac_phantom_tl }
+ \vphantom { \l__xfrac_phantom_tl }
#1
}
}
}
}
}
- \xfrac_math:n
+ \__xfrac_math:n
{ % THIS IS JUST WRONG!
\scan_align_safe_stop:
\mode_if_math:TF
- { \tex_mskip:D \l_xfrac_slash_right_muskip }
- { \tex_hskip:D \l_xfrac_slash_right_sep_dim }
+ { \tex_mskip:D \l__xfrac_slash_right_muskip }
+ { \tex_hskip:D \l__xfrac_slash_right_sep_dim }
}
- \box_use:N \l_xfrac_slash_box
- \xfrac_math:n
+ \box_use:N \l__xfrac_slash_box
+ \__xfrac_math:n
{
\mode_if_math:TF
- { \tex_mskip:D \l_xfrac_slash_left_muskip }
- { \tex_hskip:D \l_xfrac_slash_left_sep_dim }
+ { \tex_mskip:D \l__xfrac_slash_left_muskip }
+ { \tex_hskip:D \l__xfrac_slash_left_sep_dim }
}
\dim_compare:nNnTF
- { \l_xfrac_denominator_bot_sep_dim } = { \c_max_dim }
+ { \l__xfrac_denominator_bot_sep_dim } = { \c_max_dim }
{
- \cs_set_nopar:Npn \xfrac_tmp:w
- { \raisebox { - \box_dp:N \l_xfrac_slash_box } }
+ \cs_set_nopar:Npn \__xfrac_tmp:w
+ { \raisebox { - \box_dp:N \l__xfrac_slash_box } }
}
{
- \cs_set_nopar:Npn \xfrac_tmp:w
+ \cs_set_nopar:Npn \__xfrac_tmp:w
{
\raisebox
- { \dim_use:N \l_xfrac_denominator_bot_sep_dim }
+ { \dim_use:N \l__xfrac_denominator_bot_sep_dim }
}
}
- \xfrac_tmp:w
+ \__xfrac_tmp:w
{
- \xfrac_fontscale:
- \xfrac_denominator_format:n
+ \__xfrac_fontscale:
+ \__xfrac_denominator_format:n
{
\scalebox
- { \fp_use:N \l_xfrac_hscale_fp }
- [ \fp_use:N \l_xfrac_vscale_fp ]
+ { \fp_use:N \l__xfrac_hscale_fp }
+ [ \fp_use:N \l__xfrac_vscale_fp ]
{
- \xfrac_math:n
+ \__xfrac_math:n
{
- \xfrac_denominator_font_change:
+ \__xfrac_denominator_font_change:
{
- \vphantom { \l_xfrac_phantom_tl }
+ \vphantom { \l__xfrac_phantom_tl }
#3
}
}
@@ -384,7 +384,7 @@
slash-left-kern = -0.1 em ,
slash-right-kern = -0.1 em
}
-\bool_if:NF \l_xfrac_cm_std_bool
+\bool_if:NF \l__xfrac_cm_std_bool
{
\DeclareInstance { xfrac } { cmr } { text }
{ slash-symbol-font = ptm }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 2af1a14b3c9..c5eb78daecf 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -50,159 +50,168 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2012/04/23]
-\@ifpackagelater{expl3}{2012/04/23}
+\RequirePackage{expl3}[2012/07/16]
+\@ifpackagelater{expl3}{2012/07/16}
{}
- {
+ {%
\PackageError{xparse}{Support package l3kernel too old.}
- {
+ {%
Please install an up to date version of l3kernel
using your TeX package manager or from CTAN.\\ \\
- Loading xparse will abort!
- }
+ Loading xparse will abort!%
+ }%
\endinput
}
-\GetIdInfo$Id: xparse.dtx 3570 2012-04-23 13:24:55Z joseph $
+\GetIdInfo$Id: xparse.dtx 3990 2012-07-16 07:46:03Z joseph $
{L3 Experimental document command parser}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\prop_new:N \c_xparse_shorthands_prop
-\prop_put:Nnn \c_xparse_shorthands_prop { o } { d[] }
-\prop_put:Nnn \c_xparse_shorthands_prop { O } { D[] }
-\prop_put:Nnn \c_xparse_shorthands_prop { s } { t* }
-\bool_new:N \l_xparse_all_long_bool
-\tl_new:N \l_xparse_args_tl
-\prop_new:N \l_xparse_command_arg_specs_prop
-\int_new:N \l_xparse_current_arg_int
-\bool_new:N \l_xparse_environment_bool
-\prop_new:N \l_xparse_environment_arg_specs_prop
-\bool_new:N \l_xparse_expandable_bool
-\tl_new:N \l_xparse_expandable_aux_name_tl
-\tl_set:Nn \l_xparse_expandable_aux_name_tl
- {
- \l_xparse_function_tl \c_space_tl
- ( arg~ \int_use:N \l_xparse_current_arg_int )
- }
-\tl_new:N \l_xparse_fn_tl
-\tl_new:N \l_xparse_function_tl
-\bool_new:N \l_xparse_long_bool
-\int_new:N \l_xparse_m_args_int
-\int_new:N \l_xparse_mandatory_args_int
-\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
-\cs_new_protected_nopar:Npn \xparse_declare_cmd:Nnn
- {
- \bool_set_false:N \l_xparse_expandable_bool
- \xparse_declare_cmd_aux:Nnn
- }
-\cs_new_protected_nopar:Npn \xparse_declare_expandable_cmd:Nnn
- {
- \bool_set_true:N \l_xparse_expandable_bool
- \xparse_declare_cmd_aux:Nnn
- }
-\cs_new_protected:Npn \xparse_declare_cmd_aux:Nnn #1#2
+\group_begin:
+\char_set_lccode:nn { `\Q } { `\- }
+\char_set_lccode:nn { `\N } { `\N }
+\char_set_lccode:nn { `\V } { `\V }
+\tl_to_lowercase:n
+ {
+ \group_end:
+ \tl_const:Nn \c__xparse_no_value_tl { QNoValue- }
+ }
+\prop_new:N \c__xparse_shorthands_prop
+\prop_put:Nnn \c__xparse_shorthands_prop { o } { d[] }
+\prop_put:Nnn \c__xparse_shorthands_prop { O } { D[] }
+\prop_put:Nnn \c__xparse_shorthands_prop { s } { t* }
+\bool_new:N \l__xparse_all_long_bool
+\tl_new:N \l__xparse_args_tl
+\prop_new:N \l__xparse_command_arg_specs_prop
+\int_new:N \l__xparse_current_arg_int
+\bool_new:N \l__xparse_environment_bool
+\prop_new:N \l__xparse_environment_arg_specs_prop
+\bool_new:N \l__xparse_expandable_bool
+\tl_new:N \l__xparse_expandable_aux_name_tl
+\tl_set:Nn \l__xparse_expandable_aux_name_tl
+ {
+ \l__xparse_function_tl \c_space_tl
+ ( arg~ \int_use:N \l__xparse_current_arg_int )
+ }
+\tl_new:N \l__xparse_fn_tl
+\tl_new:N \l__xparse_function_tl
+\bool_new:N \l__xparse_long_bool
+\int_new:N \l__xparse_m_args_int
+\int_new:N \l__xparse_mandatory_args_int
+\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
+\cs_new_protected_nopar:Npn \__xparse_declare_cmd:Nnn
+ {
+ \bool_set_false:N \l__xparse_expandable_bool
+ \__xparse_declare_cmd_aux:Nnn
+ }
+\cs_new_protected_nopar:Npn \__xparse_declare_expandable_cmd:Nnn
+ {
+ \bool_set_true:N \l__xparse_expandable_bool
+ \__xparse_declare_cmd_aux:Nnn
+ }
+\cs_new_protected:Npn \__xparse_declare_cmd_aux:Nnn #1#2
{
\cs_if_exist:NTF #1
{
- \msg_kernel_warning:nnxx { xparse } { redefine-command }
+ \__msg_kernel_warning:nnxx { xparse } { redefine-command }
{ \token_to_str:N #1 } { \tl_to_str:n {#2} }
}
{
- \msg_kernel_info:nnxx { xparse } { define-command }
+ \__msg_kernel_info:nnxx { xparse } { define-command }
{ \token_to_str:N #1 } { \tl_to_str:n {#2} }
}
- \prop_put:Nnn \l_xparse_command_arg_specs_prop {#1} {#2}
- \bool_set_false:N \l_xparse_environment_bool
- \xparse_declare_cmd_internal:Nnn #1 {#2}
+ \prop_put:Nnn \l__xparse_command_arg_specs_prop {#1} {#2}
+ \bool_set_false:N \l__xparse_environment_bool
+ \__xparse_declare_cmd_internal:Nnn #1 {#2}
}
-\cs_new_protected:Npn \xparse_declare_cmd_internal:Nnn #1#2#3
+\cs_new_protected:Npn \__xparse_declare_cmd_internal:Nnn #1#2#3
{
- \tl_set:Nx \l_xparse_function_tl { \cs_to_str:N #1 }
- \xparse_count_mandatory:n {#2}
- \xparse_prepare_signature:n {#2}
- \int_compare:nNnTF \l_xparse_current_arg_int = \l_xparse_m_args_int
+ \tl_set:Nx \l__xparse_function_tl { \cs_to_str:N #1 }
+ \__xparse_count_mandatory:n {#2}
+ \__xparse_prepare_signature:n {#2}
+ \int_compare:nNnTF \l__xparse_current_arg_int = \l__xparse_m_args_int
{
- \bool_if:NTF \l_xparse_environment_bool
- { \xparse_declare_cmd_mixed:Nn #1 {#3} }
- { \xparse_declare_cmd_all_m:Nn #1 {#3} }
+ \bool_if:NTF \l__xparse_environment_bool
+ { \__xparse_declare_cmd_mixed:Nn #1 {#3} }
+ { \__xparse_declare_cmd_all_m:Nn #1 {#3} }
}
- { \xparse_declare_cmd_mixed:Nn #1 {#3} }
- \xparse_break_point:n {#2}
+ { \__xparse_declare_cmd_mixed:Nn #1 {#3} }
+ \__xparse_break_point:n {#2}
}
-\cs_generate_variant:Nn \xparse_declare_cmd_internal:Nnn { cnx }
-\cs_new_eq:NN \xparse_break_point:n \use_none:n
-\cs_new_protected:Npn \xparse_declare_cmd_all_m:Nn #1#2
+\cs_generate_variant:Nn \__xparse_declare_cmd_internal:Nnn { cnx }
+\cs_new_eq:NN \__xparse_break_point:n \use_none:n
+\cs_new_protected:Npn \__xparse_declare_cmd_all_m:Nn #1#2
{
\cs_generate_from_arg_count:Ncnn #1
{
cs_set
- \bool_if:NF \l_xparse_expandable_bool { _protected }
- \bool_if:NF \l_xparse_all_long_bool { _nopar }
+ \bool_if:NF \l__xparse_expandable_bool { _protected }
+ \bool_if:NF \l__xparse_all_long_bool { _nopar }
:Npn
}
- \l_xparse_current_arg_int {#2}
+ \l__xparse_current_arg_int {#2}
}
-\cs_new_protected:Npn \xparse_declare_cmd_mixed:Nn
+\cs_new_protected:Npn \__xparse_declare_cmd_mixed:Nn
{
- \bool_if:NTF \l_xparse_expandable_bool
- { \xparse_declare_cmd_mixed_expandable:Nn }
- { \xparse_declare_cmd_mixed_aux:Nn }
+ \bool_if:NTF \l__xparse_expandable_bool
+ { \__xparse_declare_cmd_mixed_expandable:Nn }
+ { \__xparse_declare_cmd_mixed_aux:Nn }
}
-\cs_new_protected:Npn \xparse_declare_cmd_mixed_aux:Nn #1#2
+\cs_new_protected:Npn \__xparse_declare_cmd_mixed_aux:Nn #1#2
{
- \xparse_flush_m_args:
+ \__xparse_flush_m_args:
\cs_generate_from_arg_count:cNnn
- { \l_xparse_function_tl \c_space_tl code }
- \cs_set_protected:Npn \l_xparse_current_arg_int {#2}
+ { \l__xparse_function_tl \c_space_tl code }
+ \cs_set_protected:Npn \l__xparse_current_arg_int {#2}
\cs_set_protected_nopar:Npx #1
{
- \int_zero:N \l_xparse_processor_int
- \tl_set:Nn \exp_not:N \l_xparse_args_tl
- { \exp_not:c { \l_xparse_function_tl \c_space_tl code } }
- \tl_set:Nn \exp_not:N \l_xparse_fn_tl
- { \exp_not:c { \l_xparse_function_tl \c_space_tl } }
- \exp_not:o \l_xparse_signature_tl
- \exp_not:N \l_xparse_args_tl
+ \int_zero:N \l__xparse_processor_int
+ \tl_set:Nn \exp_not:N \l__xparse_args_tl
+ { \exp_not:c { \l__xparse_function_tl \c_space_tl code } }
+ \tl_set:Nn \exp_not:N \l__xparse_fn_tl
+ { \exp_not:c { \l__xparse_function_tl \c_space_tl } }
+ \exp_not:o \l__xparse_signature_tl
+ \exp_not:N \l__xparse_args_tl
}
}
-\cs_new_protected:Npn \xparse_declare_cmd_mixed_expandable:Nn #1#2
+\cs_new_protected:Npn \__xparse_declare_cmd_mixed_expandable:Nn #1#2
{
\cs_generate_from_arg_count:cNnn
- { \l_xparse_function_tl \c_space_tl code }
- \cs_set:Npn \l_xparse_current_arg_int {#2}
+ { \l__xparse_function_tl \c_space_tl code }
+ \cs_set:Npn \l__xparse_current_arg_int {#2}
\cs_set_nopar:Npx #1
{
- \exp_not:o \l_xparse_signature_tl
- \exp_not:N \xparse_grab_expandable_end:wN
- \exp_not:c { \l_xparse_function_tl \c_space_tl code }
- \exp_not:N \q_xparse
- \exp_not:c { \l_xparse_function_tl \c_space_tl }
+ \exp_not:o \l__xparse_signature_tl
+ \exp_not:N \__xparse_grab_expandable_end:wN
+ \exp_not:c { \l__xparse_function_tl \c_space_tl code }
+ \exp_not:N \q__xparse
+ \exp_not:c { \l__xparse_function_tl \c_space_tl }
}
- \bool_if:NTF \l_xparse_long_bool
+ \bool_if:NTF \l__xparse_all_long_bool
{ \cs_set:cpx }
{ \cs_set_nopar:cpx }
- { \l_xparse_function_tl \c_space_tl } ##1##2 { ##1 {##2} }
+ { \l__xparse_function_tl \c_space_tl } ##1##2 { ##1 {##2} }
}
-\cs_new_protected:Npn \xparse_declare_env:nnnn #1#2
+\cs_new_protected:Npn \__xparse_declare_env:nnnn #1#2
{
\cs_if_exist:cTF {#1}
{
- \msg_kernel_warning:nnxx { xparse } { redefine-environment }
+ \__msg_kernel_warning:nnxx { xparse } { redefine-environment }
{#1} { \tl_to_str:n {#2} }
}
{
- \msg_kernel_info:nnxx { xparse } { define-environment }
+ \__msg_kernel_info:nnxx { xparse } { define-environment }
{#1} { \tl_to_str:n {#2} }
}
- \prop_put:Nnn \l_xparse_environment_arg_specs_prop {#1} {#2}
- \bool_set_true:N \l_xparse_environment_bool
- \xparse_declare_env_internal:nnnn {#1} {#2}
+ \prop_put:Nnn \l__xparse_environment_arg_specs_prop {#1} {#2}
+ \bool_set_true:N \l__xparse_environment_bool
+ \__xparse_declare_env_internal:nnnn {#1} {#2}
}
-\cs_new_protected:Npn \xparse_declare_env_internal:nnnn #1#2#3#4
+\cs_new_protected:Npn \__xparse_declare_env_internal:nnnn #1#2#3#4
{
- \xparse_declare_cmd_internal:cnx { environment~ #1 } {#2}
+ \__xparse_declare_cmd_internal:cnx { environment~ #1 } {#2}
{
\group_begin:
\cs_set_protected_nopar:Npx \exp_not:c { environment_ #1 _end_aux: }
@@ -211,7 +220,7 @@
\exp_not:n
{
\exp_args:No \exp_not:o
- { \exp_after:wN \use_none:n \l_xparse_args_tl }
+ { \exp_after:wN \use_none:n \l__xparse_args_tl }
\exp_not:n
{
\if@endpe
@@ -229,442 +238,448 @@
{ \exp_not:c { environment_ #1 _end_aux: } }
\cs_generate_from_arg_count:cNnn
{ environment_ #1 _end_aux:w } \cs_set_protected:Npn
- \l_xparse_current_arg_int {#4}
+ \l__xparse_current_arg_int {#4}
\cs_set_eq:cc {#1} { environment~ #1 }
\cs_set_eq:cc { end #1 } { environment~ #1 ~end }
}
-\cs_new_protected:Npn \xparse_count_mandatory:n #1
+\cs_new_protected:Npn \__xparse_count_mandatory:n #1
{
- \int_zero:N \l_xparse_mandatory_args_int
- \xparse_count_mandatory:N #1
+ \int_zero:N \l__xparse_mandatory_args_int
+ \__xparse_count_mandatory:N #1
\q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop
}
-\cs_new_protected:Npn \xparse_count_mandatory:N #1
+\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 }
- { \xparse_count_mandatory_aux: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 }
+ { \__xparse_count_mandatory_aux:N #1 }
}
-\cs_new_protected:Npn \xparse_count_mandatory_aux:N #1
+\cs_new_protected:Npn \__xparse_count_mandatory_aux:N #1
{
- \cs_if_free:cTF { xparse_count_type_ \token_to_str:N #1 :w }
- { \xparse_count_type_m:w }
- { \use:c { xparse_count_type_ \token_to_str:N #1 :w } }
+ \cs_if_free:cTF { __xparse_count_type_ \token_to_str:N #1 :w }
+ { \__xparse_count_type_m:w }
+ { \use:c { __xparse_count_type_ \token_to_str:N #1 :w } }
}
-\cs_new_protected:cpn { xparse_count_type_>:w } #1
+\cs_new_protected:cpn { __xparse_count_type_>:w } #1
{
- \quark_if_recursion_tail_stop_do:nn {#1} { \xparse_bad_arg_spec:wn }
- \xparse_count_mandatory:N
+ \quark_if_recursion_tail_stop_do:nn {#1} { \__xparse_bad_arg_spec:wn }
+ \__xparse_count_mandatory:N
}
-\cs_new_protected_nopar:cpn { xparse_count_type_+:w }
- { \xparse_count_mandatory:N }
-\cs_new_protected:Npn \xparse_count_type_d:w #1#2
+\cs_new_protected_nopar:cpn { __xparse_count_type_+:w }
+ { \__xparse_count_mandatory:N }
+\cs_new_protected:Npn \__xparse_count_type_d:w #1#2
{
- \xparse_single_token_check:n {#1}
- \xparse_single_token_check:n {#2}
- \quark_if_recursion_tail_stop_do:Nn #2 { \xparse_bad_arg_spec:wn }
- \xparse_count_mandatory:N
+ \__xparse_single_token_check:n {#1}
+ \__xparse_single_token_check:n {#2}
+ \quark_if_recursion_tail_stop_do:Nn #2 { \__xparse_bad_arg_spec:wn }
+ \__xparse_count_mandatory:N
}
-\cs_new_protected:Npn \xparse_count_type_D:w #1#2#3
+\cs_new_protected:Npn \__xparse_count_type_D:w #1#2#3
{
- \xparse_single_token_check:n {#1}
- \xparse_single_token_check:n {#2}
- \quark_if_recursion_tail_stop_do:nn {#3} { \xparse_bad_arg_spec:wn }
- \xparse_count_mandatory:N
+ \__xparse_single_token_check:n {#1}
+ \__xparse_single_token_check:n {#2}
+ \quark_if_recursion_tail_stop_do:nn {#3} { \__xparse_bad_arg_spec:wn }
+ \__xparse_count_mandatory:N
}
-\cs_new_protected_nopar:Npn \xparse_count_type_g:w
- { \xparse_count_mandatory:N }
-\cs_new_protected:Npn \xparse_count_type_G:w #1
+\cs_new_protected_nopar:Npn \__xparse_count_type_g:w
+ { \__xparse_count_mandatory:N }
+\cs_new_protected:Npn \__xparse_count_type_G:w #1
{
- \quark_if_recursion_tail_stop_do:nn {#1} { \xparse_bad_arg_spec:wn }
- \xparse_count_mandatory:N
+ \quark_if_recursion_tail_stop_do:nn {#1} { \__xparse_bad_arg_spec:wn }
+ \__xparse_count_mandatory:N
}
-\cs_new_protected_nopar:Npn \xparse_count_type_m:w
+\cs_new_protected_nopar:Npn \__xparse_count_type_m:w
{
- \int_incr:N \l_xparse_mandatory_args_int
- \xparse_count_mandatory:N
+ \int_incr:N \l__xparse_mandatory_args_int
+ \__xparse_count_mandatory:N
}
-\cs_new_protected:Npn \xparse_count_type_r:w #1#2
+\cs_new_protected:Npn \__xparse_count_type_r:w #1#2
{
- \xparse_single_token_check:n {#1}
- \xparse_single_token_check:n {#2}
- \quark_if_recursion_tail_stop_do:Nn #2 { \xparse_bad_arg_spec:wn }
- \int_incr:N \l_xparse_mandatory_args_int
- \xparse_count_mandatory:N
+ \__xparse_single_token_check:n {#1}
+ \__xparse_single_token_check:n {#2}
+ \quark_if_recursion_tail_stop_do:Nn #2 { \__xparse_bad_arg_spec:wn }
+ \int_incr:N \l__xparse_mandatory_args_int
+ \__xparse_count_mandatory:N
}
-\cs_new_protected:Npn \xparse_count_type_R:w #1#2#3
+\cs_new_protected:Npn \__xparse_count_type_R:w #1#2#3
{
- \xparse_single_token_check:n {#1}
- \xparse_single_token_check:n {#2}
- \quark_if_recursion_tail_stop_do:nn {#3} { \xparse_bad_arg_spec:wn }
- \int_incr:N \l_xparse_mandatory_args_int
- \xparse_count_mandatory:N
+ \__xparse_single_token_check:n {#1}
+ \__xparse_single_token_check:n {#2}
+ \quark_if_recursion_tail_stop_do:nn {#3} { \__xparse_bad_arg_spec:wn }
+ \int_incr:N \l__xparse_mandatory_args_int
+ \__xparse_count_mandatory:N
}
-\cs_new_protected:Npn \xparse_count_type_t:w #1
+\cs_new_protected:Npn \__xparse_count_type_t:w #1
{
- \xparse_single_token_check:n {#1}
- \quark_if_recursion_tail_stop_do:Nn #1 { \xparse_bad_arg_spec:wn }
- \xparse_count_mandatory:N
+ \__xparse_single_token_check:n {#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_u:w #1
+\cs_new_protected:Npn \__xparse_count_type_u:w #1
{
- \quark_if_recursion_tail_stop_do:nn {#1} { \xparse_bad_arg_spec:wn }
- \int_incr:N \l_xparse_mandatory_args_int
- \xparse_count_mandatory:N
+ \quark_if_recursion_tail_stop_do:nn {#1} { \__xparse_bad_arg_spec:wn }
+ \int_incr:N \l__xparse_mandatory_args_int
+ \__xparse_count_mandatory:N
}
-\cs_new_protected:Npn \xparse_single_token_check:n #1
+\cs_new_protected:Npn \__xparse_single_token_check:n #1
{
\tl_if_single:nF {#1}
- { \xparse_single_token_check_aux:nwn {#1} }
+ { \__xparse_single_token_check_aux:nwn {#1} }
}
-\cs_new_protected:Npn \xparse_single_token_check_aux:nwn
- #1#2 \xparse_break_point:n #3
+\cs_new_protected:Npn \__xparse_single_token_check_aux:nwn
+ #1#2 \__xparse_break_point:n #3
{
- \msg_kernel_error:nnx { xparse } { not-single-token }
+ \__msg_kernel_error:nnx { xparse } { not-single-token }
{ \tl_to_str:n {#1} } { \tl_to_str:n {#3} }
}
-\cs_new_protected:Npn \xparse_bad_arg_spec:wn #1 \xparse_break_point:n #2
- { \msg_kernel_error:nnx { xparse } { bad-arg-spec } { \tl_to_str:n {#2} } }
-\cs_new_protected:Npn \xparse_prepare_signature:n #1
+\cs_new_protected:Npn \__xparse_bad_arg_spec:wn #1 \__xparse_break_point:n #2
+ { \__msg_kernel_error:nnx { xparse } { bad-arg-spec } { \tl_to_str:n {#2} } }
+\cs_new_protected:Npn \__xparse_prepare_signature:n #1
{
- \bool_set_false:N \l_xparse_all_long_bool
- \int_zero:N \l_xparse_current_arg_int
- \bool_set_false:N \l_xparse_long_bool
- \int_zero:N \l_xparse_m_args_int
- \bool_set_false:N \l_xparse_processor_bool
- \tl_clear:N \l_xparse_signature_tl
- \xparse_prepare_signature:N #1 \q_recursion_tail \q_recursion_stop
+ \bool_set_false:N \l__xparse_all_long_bool
+ \int_zero:N \l__xparse_current_arg_int
+ \bool_set_false:N \l__xparse_long_bool
+ \int_zero:N \l__xparse_m_args_int
+ \bool_set_false:N \l__xparse_processor_bool
+ \tl_clear:N \l__xparse_signature_tl
+ \__xparse_prepare_signature:N #1 \q_recursion_tail \q_recursion_stop
}
-\cs_new_protected_nopar:Npn \xparse_prepare_signature:N
+\cs_new_protected_nopar:Npn \__xparse_prepare_signature:N
{
- \bool_set_false:N \l_xparse_processor_bool
- \xparse_prepare_signature_bypass:N
+ \bool_set_false:N \l__xparse_processor_bool
+ \__xparse_prepare_signature_bypass:N
}
-\cs_new_protected:Npn \xparse_prepare_signature_bypass:N #1
+\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_tmp_tl
+ { \exp_after:wN \__xparse_prepare_signature:N \l__xparse_tmp_tl }
{
- \int_incr:N \l_xparse_current_arg_int
- \xparse_prepare_signature_add:N #1
+ \int_incr:N \l__xparse_current_arg_int
+ \__xparse_prepare_signature_add:N #1
}
}
-\cs_new_protected:Npn \xparse_prepare_signature_add:N #1
+\cs_new_protected:Npn \__xparse_prepare_signature_add:N #1
{
\cs_if_exist_use:cF
{
- xparse_add
- \bool_if:NT \l_xparse_expandable_bool { _expandable }
+ __xparse_add
+ \bool_if:NT \l__xparse_expandable_bool { _expandable }
_type_ \token_to_str:N #1 :w
}
{
- \msg_kernel_error:nnx { xparse } { unknown-argument-type }
+ \__msg_kernel_error:nnx { xparse } { unknown-argument-type }
{ \token_to_str:N #1 }
- \bool_if:NTF \l_xparse_expandable_bool
- { \xparse_add_expandable_type_m:w }
- { \xparse_add_type_m:w }
+ \bool_if:NTF \l__xparse_expandable_bool
+ { \__xparse_add_expandable_type_m:w }
+ { \__xparse_add_type_m:w }
}
}
-\cs_new_protected_nopar:cpn { xparse_add_type_+:w }
+\cs_new_protected_nopar:cpn { __xparse_add_type_+:w }
{
- \xparse_flush_m_args:
- \bool_set_true:N \l_xparse_long_bool
- \int_decr:N \l_xparse_current_arg_int
- \xparse_prepare_signature:N
+ \__xparse_flush_m_args:
+ \bool_set_true:N \l__xparse_long_bool
+ \int_decr:N \l__xparse_current_arg_int
+ \__xparse_prepare_signature:N
}
-\cs_new_protected:cpn { xparse_add_type_>:w } #1
+\cs_new_protected:cpn { __xparse_add_type_>:w } #1
{
- \bool_set_true:N \l_xparse_processor_bool
- \xparse_flush_m_args:
- \int_decr:N \l_xparse_current_arg_int
- \tl_put_right:Nn \l_xparse_signature_tl { \xparse_process_arg:n {#1} }
- \xparse_prepare_signature_bypass:N
+ \bool_set_true:N \l__xparse_processor_bool
+ \__xparse_flush_m_args:
+ \int_decr:N \l__xparse_current_arg_int
+ \tl_put_right:Nn \l__xparse_signature_tl { \__xparse_process_arg:n {#1} }
+ \__xparse_prepare_signature_bypass:N
}
-\cs_new_protected:Npn \xparse_add_type_d:w #1#2
- { \xparse_add_type_D:w #1 #2 { \NoValue } }
-\cs_new_protected:Npn \xparse_add_type_D:w #1#2#3
+\cs_new_protected:Npn \__xparse_add_type_d:w #1#2
+ { \exp_args:NNNo \__xparse_add_type_D:w #1 #2 \c__xparse_no_value_tl }
+\cs_new_protected:Npn \__xparse_add_type_D:w #1#2#3
{
- \xparse_flush_m_args:
- \xparse_add_grabber_optional:N D
- \tl_put_right:Nn \l_xparse_signature_tl { #1 #2 {#3} }
- \xparse_prepare_signature:N
+ \__xparse_flush_m_args:
+ \__xparse_add_grabber_optional:N D
+ \tl_put_right:Nn \l__xparse_signature_tl { #1 #2 {#3} }
+ \__xparse_prepare_signature:N
}
-\cs_new_protected_nopar:Npn \xparse_add_type_g:w
- { \xparse_add_type_G:w { \NoValue } }
-\cs_new_protected:Npn \xparse_add_type_G:w #1
+\cs_new_protected_nopar: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
{
- \xparse_flush_m_args:
- \xparse_add_grabber_optional:N G
- \tl_put_right:Nn \l_xparse_signature_tl { {#1} }
- \xparse_prepare_signature:N
+ \__xparse_flush_m_args:
+ \__xparse_add_grabber_optional:N G
+ \tl_put_right:Nn \l__xparse_signature_tl { {#1} }
+ \__xparse_prepare_signature:N
}
-\cs_new_protected_nopar:Npn \xparse_add_type_l:w
+\cs_new_protected_nopar:Npn \__xparse_add_type_l:w
{
- \xparse_flush_m_args:
- \xparse_add_grabber_mandatory:N l
- \xparse_prepare_signature:N
+ \__xparse_flush_m_args:
+ \__xparse_add_grabber_mandatory:N l
+ \__xparse_prepare_signature:N
}
-\cs_new_protected_nopar:Npn \xparse_add_type_m:w
+\cs_new_protected_nopar:Npn \__xparse_add_type_m:w
{
- \bool_if:nTF { \l_xparse_long_bool || \l_xparse_processor_bool }
+ \bool_if:nTF { \l__xparse_long_bool || \l__xparse_processor_bool }
{
- \xparse_flush_m_args:
- \xparse_add_grabber_mandatory:N m
+ \__xparse_flush_m_args:
+ \__xparse_add_grabber_mandatory:N m
}
- { \int_incr:N \l_xparse_m_args_int }
- \xparse_prepare_signature:N
+ { \int_incr:N \l__xparse_m_args_int }
+ \__xparse_prepare_signature:N
}
-\cs_new_protected:Npn \xparse_add_type_r:w #1#2
- { \xparse_add_type_R:w #1 #2 { \NoValue } }
-\cs_new_protected:Npn \xparse_add_type_R:w #1#2#3
+\cs_new_protected:Npn \__xparse_add_type_r:w #1#2
+ { \exp_args:NNNo \__xparse_add_type_R:w #1 #2 \c__xparse_no_value_tl }
+\cs_new_protected:Npn \__xparse_add_type_R:w #1#2#3
{
- \xparse_flush_m_args:
- \xparse_add_grabber_mandatory:N R
- \tl_put_right:Nn \l_xparse_signature_tl { #1 #2 {#3} }
- \xparse_prepare_signature:N
+ \__xparse_flush_m_args:
+ \__xparse_add_grabber_mandatory:N R
+ \tl_put_right:Nn \l__xparse_signature_tl { #1 #2 {#3} }
+ \__xparse_prepare_signature:N
}
-\cs_new_protected:Npn \xparse_add_type_t:w #1
+\cs_new_protected:Npn \__xparse_add_type_t:w #1
{
- \xparse_flush_m_args:
- \xparse_add_grabber_optional:N t
- \tl_put_right:Nn \l_xparse_signature_tl { #1 }
- \xparse_prepare_signature:N
+ \__xparse_flush_m_args:
+ \__xparse_add_grabber_optional:N t
+ \tl_put_right:Nn \l__xparse_signature_tl { #1 }
+ \__xparse_prepare_signature:N
}
-\cs_new_protected:Npn \xparse_add_type_u:w #1
+\cs_new_protected:Npn \__xparse_add_type_u:w #1
{
- \xparse_flush_m_args:
- \xparse_add_grabber_mandatory:N u
- \tl_put_right:Nn \l_xparse_signature_tl { {#1} }
- \xparse_prepare_signature:N
+ \__xparse_flush_m_args:
+ \__xparse_add_grabber_mandatory:N u
+ \tl_put_right:Nn \l__xparse_signature_tl { {#1} }
+ \__xparse_prepare_signature:N
}
-\cs_new_protected_nopar:Npn \xparse_add_type_v:w
+\cs_new_protected_nopar:Npn \__xparse_add_type_v:w
{
- \xparse_flush_m_args:
- \xparse_add_grabber_mandatory:N v
- \xparse_prepare_signature:N
+ \__xparse_flush_m_args:
+ \__xparse_add_grabber_mandatory:N v
+ \__xparse_prepare_signature:N
}
-\cs_new_protected_nopar:Npn \xparse_flush_m_args:
+\cs_new_protected_nopar:Npn \__xparse_flush_m_args:
{
- \int_compare:nNnT \l_xparse_m_args_int > \c_zero
+ \int_compare:nNnT \l__xparse_m_args_int > \c_zero
{
- \tl_put_right:Nx \l_xparse_signature_tl
- { \exp_not:c { xparse_grab_m_ \int_use:N \l_xparse_m_args_int :w } }
- \int_set:Nn \l_xparse_mandatory_args_int
- { \l_xparse_mandatory_args_int - \l_xparse_m_args_int }
+ \tl_put_right:Nx \l__xparse_signature_tl
+ { \exp_not:c { __xparse_grab_m_ \int_use:N \l__xparse_m_args_int :w } }
+ \int_set:Nn \l__xparse_mandatory_args_int
+ { \l__xparse_mandatory_args_int - \l__xparse_m_args_int }
}
- \int_zero:N \l_xparse_m_args_int
+ \int_zero:N \l__xparse_m_args_int
}
-\cs_new_protected_nopar:Npn \xparse_add_grabber_mandatory:N #1
+\cs_new_protected_nopar:Npn \__xparse_add_grabber_mandatory:N #1
{
- \tl_put_right:Nx \l_xparse_signature_tl
+ \tl_put_right:Nx \l__xparse_signature_tl
{
\exp_not:c
- { xparse_grab_ #1 \bool_if:NT \l_xparse_long_bool { _long } :w }
+ { __xparse_grab_ #1 \bool_if:NT \l__xparse_long_bool { _long } :w }
}
- \bool_set_false:N \l_xparse_long_bool
- \int_decr:N \l_xparse_mandatory_args_int
+ \bool_set_false:N \l__xparse_long_bool
+ \int_decr:N \l__xparse_mandatory_args_int
}
-\cs_new_protected_nopar:Npn \xparse_add_grabber_optional:N #1
+\cs_new_protected_nopar:Npn \__xparse_add_grabber_optional:N #1
{
- \tl_put_right:Nx \l_xparse_signature_tl
+ \tl_put_right:Nx \l__xparse_signature_tl
{
\exp_not:c
{
- xparse_grab_ #1
- \bool_if:NT \l_xparse_long_bool { _long }
- \int_compare:nNnF \l_xparse_mandatory_args_int > \c_zero
+ __xparse_grab_ #1
+ \bool_if:NT \l__xparse_long_bool { _long }
+ \int_compare:nNnF \l__xparse_mandatory_args_int > \c_zero
{ _trailing }
:w
}
}
- \bool_set_false:N \l_xparse_long_bool
+ \bool_set_false:N \l__xparse_long_bool
}
-\cs_new_protected_nopar:cpn { xparse_add_expandable_type_+:w }
+\cs_new_protected_nopar:cpn { __xparse_add_expandable_type_+:w }
{
- \bool_set_true:N \l_xparse_long_bool
- \int_compare:nNnTF \l_xparse_current_arg_int = \c_one
- { \bool_set_true:N \l_xparse_all_long_bool }
+ \bool_set_true:N \l__xparse_long_bool
+ \int_compare:nNnTF \l__xparse_current_arg_int = \c_one
+ { \bool_set_true:N \l__xparse_all_long_bool }
{
- \bool_if:NF \l_xparse_all_long_bool
- { \msg_kernel_error:nn { xparse } { inconsistent-long } }
+ \bool_if:NF \l__xparse_all_long_bool
+ { \__msg_kernel_error:nn { xparse } { inconsistent-long } }
}
- \int_decr:N \l_xparse_current_arg_int
- \xparse_prepare_signature:N
+ \int_decr:N \l__xparse_current_arg_int
+ \__xparse_prepare_signature:N
}
-\cs_new_protected:cpn { xparse_add_expandable_type_>:w } #1
+\cs_new_protected:cpn { __xparse_add_expandable_type_>:w } #1
{
- \msg_kernel_error:nnx { xparse } { processor-in-expandable }
- { \token_to_str:c { \l_xparse_function_tl } }
- \int_decr:N \l_xparse_current_arg_int
- \xparse_prepare_signature:N
+ \__msg_kernel_error:nnx { xparse } { processor-in-expandable }
+ { \token_to_str:c { \l__xparse_function_tl } }
+ \int_decr:N \l__xparse_current_arg_int
+ \__xparse_prepare_signature:N
}
-\cs_new_protected:Npn \xparse_add_expandable_type_d:w #1#2
- { \xparse_add_expandable_type_D:w #1 #2 { \NoValue } }
-\cs_new_protected:Npn \xparse_add_expandable_type_D:w #1#2
+\cs_new_protected:Npn \__xparse_add_expandable_type_d:w #1#2
+ {
+ \exp_args:NNNo
+ \__xparse_add_expandable_type_D:w #1 #2 \c__xparse_no_value_tl
+ }
+\cs_new_protected:Npn \__xparse_add_expandable_type_D:w #1#2
{
\token_if_eq_meaning:NNTF #1 #2
{
- \xparse_add_expandable_grabber_optional:n { D_alt }
- \xparse_add_expandable_type_D_aux:Nn #1
+ \__xparse_add_expandable_grabber_optional:n { D_alt }
+ \__xparse_add_expandable_type_D_aux:Nn #1
}
{
- \xparse_add_expandable_grabber_optional:n { D }
- \xparse_add_expandable_type_D_aux:NNn #1#2
+ \__xparse_add_expandable_grabber_optional:n { D }
+ \__xparse_add_expandable_type_D_aux:NNn #1#2
}
}
-\cs_new_protected:Npn \xparse_add_expandable_type_D_aux:NNn #1#2#3
+\cs_new_protected:Npn \__xparse_add_expandable_type_D_aux:NNn #1#2#3
{
- \bool_if:NTF \l_xparse_long_bool
+ \bool_if:NTF \l__xparse_all_long_bool
{ \cs_set:cpx }
{ \cs_set_nopar:cpx }
- { \l_xparse_expandable_aux_name_tl } ##1 ##2 #1 ##3 \q_xparse ##4 #2
+ { \l__xparse_expandable_aux_name_tl } ##1 ##2 #1 ##3 \q__xparse ##4 #2
{ ##1 {##2} {##3} {##4} }
- \tl_put_right:Nx \l_xparse_signature_tl
+ \tl_put_right:Nx \l__xparse_signature_tl
{
- \exp_not:c { \l_xparse_expandable_aux_name_tl }
+ \exp_not:c { \l__xparse_expandable_aux_name_tl }
\exp_not:n { #1 #2 {#3} }
}
- \bool_set_false:N \l_xparse_long_bool
- \xparse_prepare_signature:N
+ \bool_set_false:N \l__xparse_long_bool
+ \__xparse_prepare_signature:N
}
-\cs_new_protected:Npn \xparse_add_expandable_type_D_aux:Nn #1#2
+\cs_new_protected:Npn \__xparse_add_expandable_type_D_aux:Nn #1#2
{
- \bool_if:NTF \l_xparse_long_bool
+ \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
+ { \l__xparse_expandable_aux_name_tl } ##1 #1 ##2 #1
{ ##1 {##2} }
- \tl_put_right:Nx \l_xparse_signature_tl
+ \tl_put_right:Nx \l__xparse_signature_tl
{
- \exp_not:c { \l_xparse_expandable_aux_name_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
+ \bool_set_false:N \l__xparse_long_bool
+ \__xparse_prepare_signature:N
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_g:w
+\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_g:w
{
- \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { g }
- \xparse_add_expandable_type_m:w
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { g }
+ \__xparse_add_expandable_type_m:w
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_G:w #1
+\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_G:w #1
{
- \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { G }
- \xparse_add_expandable_type_m:w
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { G }
+ \__xparse_add_expandable_type_m:w
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_l:w
+\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_l:w
{
- \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { l }
- \xparse_add_expandable_type_m:w
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { l }
+ \__xparse_add_expandable_type_m:w
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_m:w
+\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_m:w
{
- \int_incr:N \l_xparse_m_args_int
- \xparse_add_expandable_grabber_mandatory:n { m }
- \bool_set_false:N \l_xparse_long_bool
- \xparse_prepare_signature:N
+ \int_incr:N \l__xparse_m_args_int
+ \__xparse_add_expandable_grabber_mandatory:n { m }
+ \bool_set_false:N \l__xparse_long_bool
+ \__xparse_prepare_signature:N
}
-\cs_new_protected:Npn \xparse_add_expandable_type_r:w #1#2
- { \xparse_add_expandable_type_R:w #1 #2 { \NoValue } }
-\cs_new_protected:Npn \xparse_add_expandable_type_R:w #1#2
+\cs_new_protected:Npn \__xparse_add_expandable_type_r:w #1#2
+ {
+ \exp_args:NNNo
+ \__xparse_add_expandable_type_R:w #1 #2 \c__xparse_no_value_tl
+ }
+\cs_new_protected:Npn \__xparse_add_expandable_type_R:w #1#2
{
\token_if_eq_meaning:NNTF #1 #2
{
- \xparse_add_expandable_grabber_optional:n { R_alt }
- \xparse_add_expandable_type_D_aux:Nn #1
+ \__xparse_add_expandable_grabber_optional:n { R_alt }
+ \__xparse_add_expandable_type_D_aux:Nn #1
}
{
- \xparse_add_expandable_grabber_optional:n { R }
- \xparse_add_expandable_type_D_aux:NNn #1#2
+ \__xparse_add_expandable_grabber_optional:n { R }
+ \__xparse_add_expandable_type_D_aux:NNn #1#2
}
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_t:w #1
+\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_t:w #1
{
- \xparse_add_expandable_grabber_optional:n { t }
- \bool_if:NTF \l_xparse_long_bool
+ \__xparse_add_expandable_grabber_optional:n { t }
+ \bool_if:NTF \l__xparse_all_long_bool
{ \cs_set:cpn }
{ \cs_set_nopar:cpn }
- { \l_xparse_expandable_aux_name_tl } ##1 #1 {##1}
- \tl_put_right:Nx \l_xparse_signature_tl
+ { \l__xparse_expandable_aux_name_tl } ##1 #1 {##1}
+ \tl_put_right:Nx \l__xparse_signature_tl
{
- \exp_not:c { \l_xparse_expandable_aux_name_tl }
+ \exp_not:c { \l__xparse_expandable_aux_name_tl }
\exp_not:N #1
}
- \bool_set_false:N \l_xparse_long_bool
- \xparse_prepare_signature:N
+ \bool_set_false:N \l__xparse_long_bool
+ \__xparse_prepare_signature:N
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_u:w #1
+\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_u:w #1
{
- \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { u }
- \xparse_add_expandable_type_m:w
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { u }
+ \__xparse_add_expandable_type_m:w
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_v:w
+\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_v:w
{
- \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { v }
- \xparse_add_expandable_type_m:w
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { v }
+ \__xparse_add_expandable_type_m:w
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_grabber_mandatory:n #1
+\cs_new_protected_nopar:Npn \__xparse_add_expandable_grabber_mandatory:n #1
{
- \xparse_add_expandable_long_check:
- \tl_put_right:Nx \l_xparse_signature_tl
- { \exp_not:c { xparse_expandable_grab_ #1 :w } }
- \bool_set_false:N \l_xparse_long_bool
- \int_decr:N \l_xparse_mandatory_args_int
+ \__xparse_add_expandable_long_check:
+ \tl_put_right:Nx \l__xparse_signature_tl
+ { \exp_not:c { __xparse_expandable_grab_ #1 :w } }
+ \bool_set_false:N \l__xparse_long_bool
+ \int_decr:N \l__xparse_mandatory_args_int
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_grabber_optional:n #1
+\cs_new_protected_nopar:Npn \__xparse_add_expandable_grabber_optional:n #1
{
- \xparse_add_expandable_long_check:
- \int_compare:nNnF \l_xparse_mandatory_args_int > \c_zero
- { \msg_kernel_error:nn { xparse } { expandable-ending-optional } }
- \tl_put_right:Nx \l_xparse_signature_tl
- { \exp_not:c { xparse_expandable_grab_ #1 :w } }
- \bool_set_false:N \l_xparse_long_bool
+ \__xparse_add_expandable_long_check:
+ \int_compare:nNnF \l__xparse_mandatory_args_int > \c_zero
+ { \__msg_kernel_error:nn { xparse } { expandable-ending-optional } }
+ \tl_put_right:Nx \l__xparse_signature_tl
+ { \exp_not:c { __xparse_expandable_grab_ #1 :w } }
+ \bool_set_false:N \l__xparse_long_bool
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_long_check:
+\cs_new_protected_nopar:Npn \__xparse_add_expandable_long_check:
{
- \bool_if:nT { \l_xparse_all_long_bool && ! ( \l_xparse_long_bool ) }
- { \msg_kernel_error:nn { xparse } { inconsistent-long } }
+ \bool_if:nT { \l__xparse_all_long_bool && ! ( \l__xparse_long_bool ) }
+ { \__msg_kernel_error:nn { xparse } { inconsistent-long } }
}
-\cs_new_protected:Npn \xparse_grab_arg:w { }
-\cs_new_protected:Npn \xparse_grab_arg_aux_i:w { }
-\cs_new_protected:Npn \xparse_grab_arg_aux_ii:w { }
-\cs_new_protected:Npn \xparse_grab_D:w #1#2#3#4 \l_xparse_args_tl
+\cs_new_protected:Npn \__xparse_grab_arg:w { }
+\cs_new_protected:Npn \__xparse_grab_arg_aux_i:w { }
+\cs_new_protected:Npn \__xparse_grab_arg_aux_ii:w { }
+\cs_new_protected:Npn \__xparse_grab_D:w #1#2#3#4 \l__xparse_args_tl
{
- \xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn
+ \__xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn
{ _ignore_spaces }
}
-\cs_new_protected:Npn \xparse_grab_D_long:w #1#2#3#4 \l_xparse_args_tl
+\cs_new_protected:Npn \__xparse_grab_D_long:w #1#2#3#4 \l__xparse_args_tl
{
- \xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected:Npn
+ \__xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected:Npn
{ _ignore_spaces }
}
-\cs_new_protected:Npn \xparse_grab_D_trailing:w #1#2#3#4 \l_xparse_args_tl
- { \xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn { } }
-\cs_new_protected:Npn \xparse_grab_D_long_trailing:w #1#2#3#4 \l_xparse_args_tl
- { \xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected:Npn { } }
-\cs_new_protected:Npn \xparse_grab_D_aux:NNnnNn #1#2#3#4#5#6
+\cs_new_protected:Npn \__xparse_grab_D_trailing:w #1#2#3#4 \l__xparse_args_tl
+ { \__xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn { } }
+\cs_new_protected:Npn \__xparse_grab_D_long_trailing:w #1#2#3#4 \l__xparse_args_tl
+ { \__xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected:Npn { } }
+\cs_new_protected:Npn \__xparse_grab_D_aux:NNnnNn #1#2#3#4#5#6
{
- \xparse_grab_D_aux:NNnN #1#2 {#4} #5
+ \__xparse_grab_D_aux:NNnN #1#2 {#4} #5
\use:c { peek_meaning_remove #6 :NTF } #1
- { \xparse_grab_arg:w }
+ { \__xparse_grab_arg:w }
{
- \xparse_add_arg:n {#3}
- #4 \l_xparse_args_tl
+ \__xparse_add_arg:n {#3}
+ #4 \l__xparse_args_tl
}
}
-\cs_new_protected:Npn \xparse_grab_D_aux:NNnN #1#2#3#4
+\cs_new_protected:Npn \__xparse_grab_D_aux:NNnN #1#2#3#4
{
- \cs_set_protected_nopar:Npn \xparse_grab_arg:w
+ \cs_set_protected_nopar:Npn \__xparse_grab_arg:w
{
- \exp_after:wN #4 \l_xparse_fn_tl ####1 #2
+ \exp_after:wN #4 \l__xparse_fn_tl ####1 #2
{
\tl_if_in:nnTF {####1} {#1}
- { \xparse_grab_D_nested:NNnnN #1 #2 {####1} {#3} #4 }
+ { \__xparse_grab_D_nested:NNnnN #1 #2 {####1} {#3} #4 }
{
- \xparse_add_arg:o { \use_none:n ####1 }
- #3 \l_xparse_args_tl
+ \__xparse_add_arg:o { \use_none:n ####1 }
+ #3 \l__xparse_args_tl
}
}
\group_begin:
@@ -674,7 +689,7 @@
\tl_to_lowercase:n
{
\group_end:
- \l_xparse_fn_tl A
+ \l__xparse_fn_tl A
}
}
{
@@ -682,585 +697,585 @@
\tl_to_lowercase:n
{
\group_end:
- \l_xparse_fn_tl ^
+ \l__xparse_fn_tl ^
}
}
}
}
-\tl_new:N \l_xparse_nesting_a_tl
-\tl_new:N \l_xparse_nesting_b_tl
-\quark_new:N \q_xparse
-\cs_new_protected:Npn \xparse_grab_D_nested:NNnnN #1#2#3#4#5
+\tl_new:N \l__xparse_nesting_a_tl
+\tl_new:N \l__xparse_nesting_b_tl
+\quark_new:N \q__xparse
+\cs_new_protected:Npn \__xparse_grab_D_nested:NNnnN #1#2#3#4#5
{
- \tl_clear:N \l_xparse_nesting_a_tl
- \tl_clear:N \l_xparse_nesting_b_tl
- \exp_after:wN #5 \l_xparse_fn_tl ##1 #1 ##2 \q_xparse ##3 #2
+ \tl_clear:N \l__xparse_nesting_a_tl
+ \tl_clear:N \l__xparse_nesting_b_tl
+ \exp_after:wN #5 \l__xparse_fn_tl ##1 #1 ##2 \q__xparse ##3 #2
{
- \tl_put_right:No \l_xparse_nesting_a_tl { \use_none:n ##1 #1 }
- \tl_put_right:No \l_xparse_nesting_b_tl { \use_i:nn #2 ##3 }
+ \tl_put_right:No \l__xparse_nesting_a_tl { \use_none:n ##1 #1 }
+ \tl_put_right:No \l__xparse_nesting_b_tl { \use_i:nn #2 ##3 }
\tl_if_in:nnTF {##2} {#1}
{
- \l_xparse_fn_tl
- \q_nil ##2 \q_xparse \ERROR
+ \l__xparse_fn_tl
+ \q_nil ##2 \q__xparse \ERROR
}
{
- \tl_put_right:Nx \l_xparse_nesting_a_tl
- { \xparse_grab_D_nested:w \q_nil ##2 \q_stop }
- \tl_if_in:NnTF \l_xparse_nesting_b_tl {#1}
+ \tl_put_right:Nx \l__xparse_nesting_a_tl
+ { \__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_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
+ \tl_set_eq:NN \l__xparse_tmp_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
}
{
- \tl_put_right:No \l_xparse_nesting_a_tl
- \l_xparse_nesting_b_tl
- \xparse_add_arg:V \l_xparse_nesting_a_tl
- #4 \l_xparse_args_tl
+ \tl_put_right:No \l__xparse_nesting_a_tl
+ \l__xparse_nesting_b_tl
+ \__xparse_add_arg:V \l__xparse_nesting_a_tl
+ #4 \l__xparse_args_tl
}
}
}
- \l_xparse_fn_tl #3 \q_nil \q_xparse \ERROR
+ \l__xparse_fn_tl #3 \q_nil \q__xparse \ERROR
}
-\cs_new:Npn \xparse_grab_D_nested:w #1 \q_nil \q_stop
+\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_G:w #1#2 \l_xparse_args_tl
+\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
+ \__xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected_nopar:Npn
{ _ignore_spaces }
}
-\cs_new_protected:Npn \xparse_grab_G_long:w #1#2 \l_xparse_args_tl
+\cs_new_protected:Npn \__xparse_grab_G_long:w #1#2 \l__xparse_args_tl
{
- \xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected:Npn { _ignore_spaces }
+ \__xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected:Npn { _ignore_spaces }
}
-\cs_new_protected:Npn \xparse_grab_G_trailing:w #1#2 \l_xparse_args_tl
- { \xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected_nopar:Npn { } }
-\cs_new_protected:Npn \xparse_grab_G_long_trailing:w #1#2 \l_xparse_args_tl
- { \xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected:Npn { } }
-\cs_new_protected:Npn \xparse_grab_G_aux:nnNn #1#2#3#4
+\cs_new_protected:Npn \__xparse_grab_G_trailing:w #1#2 \l__xparse_args_tl
+ { \__xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected_nopar:Npn { } }
+\cs_new_protected:Npn \__xparse_grab_G_long_trailing:w #1#2 \l__xparse_args_tl
+ { \__xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected:Npn { } }
+\cs_new_protected:Npn \__xparse_grab_G_aux:nnNn #1#2#3#4
{
- \exp_after:wN #3 \l_xparse_fn_tl ##1
+ \exp_after:wN #3 \l__xparse_fn_tl ##1
{
- \xparse_add_arg:n {##1}
- #2 \l_xparse_args_tl
+ \__xparse_add_arg:n {##1}
+ #2 \l__xparse_args_tl
}
\use:c { peek_meaning #4 :NTF } \c_group_begin_token
- { \l_xparse_fn_tl }
+ { \l__xparse_fn_tl }
{
- \xparse_add_arg:n {#1}
- #2 \l_xparse_args_tl
+ \__xparse_add_arg:n {#1}
+ #2 \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
- { \xparse_grab_l_aux:nN {#1} \cs_set_protected:Npn }
-\cs_new_protected:Npn \xparse_grab_l_aux:nN #1#2
+\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
+ { \__xparse_grab_l_aux:nN {#1} \cs_set_protected:Npn }
+\cs_new_protected:Npn \__xparse_grab_l_aux:nN #1#2
{
- \exp_after:wN #2 \l_xparse_fn_tl ##1##
+ \exp_after:wN #2 \l__xparse_fn_tl ##1##
{
- \xparse_add_arg:n {##1}
- #1 \l_xparse_args_tl
+ \__xparse_add_arg:n {##1}
+ #1 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:Npn \xparse_grab_m:w #1 \l_xparse_args_tl
+\cs_new_protected:Npn \__xparse_grab_m:w #1 \l__xparse_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl ##1
+ \exp_after:wN \cs_set_protected_nopar:Npn \l__xparse_fn_tl ##1
{
- \xparse_add_arg:n {##1}
- #1 \l_xparse_args_tl
+ \__xparse_add_arg:n {##1}
+ #1 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:Npn \xparse_grab_m_long:w #1 \l_xparse_args_tl
+\cs_new_protected:Npn \__xparse_grab_m_long:w #1 \l__xparse_args_tl
{
- \exp_after:wN \cs_set_protected:Npn \l_xparse_fn_tl ##1
+ \exp_after:wN \cs_set_protected:Npn \l__xparse_fn_tl ##1
{
- \xparse_add_arg:n {##1}
- #1 \l_xparse_args_tl
+ \__xparse_add_arg:n {##1}
+ #1 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_1:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { __xparse_grab_m_1:w } #1 \l__xparse_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl ##1
+ \exp_after:wN \cs_set_protected_nopar:Npn \l__xparse_fn_tl ##1
{
- \tl_put_right:Nn \l_xparse_args_tl { {##1} }
- #1 \l_xparse_args_tl
+ \tl_put_right:Nn \l__xparse_args_tl { {##1} }
+ #1 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_2:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { __xparse_grab_m_2:w } #1 \l__xparse_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l__xparse_fn_tl
##1##2
{
- \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} }
- #1 \l_xparse_args_tl
+ \tl_put_right:Nn \l__xparse_args_tl { {##1} {##2} }
+ #1 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_3:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { __xparse_grab_m_3:w } #1 \l__xparse_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l__xparse_fn_tl
##1##2##3
{
- \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} {##3} }
- #1 \l_xparse_args_tl
+ \tl_put_right:Nn \l__xparse_args_tl { {##1} {##2} {##3} }
+ #1 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_4:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { __xparse_grab_m_4:w } #1 \l__xparse_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l__xparse_fn_tl
##1##2##3##4
{
- \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} {##3} {##4} }
- #1 \l_xparse_args_tl
+ \tl_put_right:Nn \l__xparse_args_tl { {##1} {##2} {##3} {##4} }
+ #1 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_5:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { __xparse_grab_m_5:w } #1 \l__xparse_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l__xparse_fn_tl
##1##2##3##4##5
{
- \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} {##3} {##4} {##5} }
- #1 \l_xparse_args_tl
+ \tl_put_right:Nn \l__xparse_args_tl { {##1} {##2} {##3} {##4} {##5} }
+ #1 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_6:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { __xparse_grab_m_6:w } #1 \l__xparse_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l__xparse_fn_tl
##1##2##3##4##5##6
{
- \tl_put_right:Nn \l_xparse_args_tl
+ \tl_put_right:Nn \l__xparse_args_tl
{ {##1} {##2} {##3} {##4} {##5} {##6} }
- #1 \l_xparse_args_tl
+ #1 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_7:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { __xparse_grab_m_7:w } #1 \l__xparse_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l__xparse_fn_tl
##1##2##3##4##5##6##7
{
- \tl_put_right:Nn \l_xparse_args_tl
+ \tl_put_right:Nn \l__xparse_args_tl
{ {##1} {##2} {##3} {##4} {##5} {##6} {##7} }
- #1 \l_xparse_args_tl
+ #1 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_8:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { __xparse_grab_m_8:w } #1 \l__xparse_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l__xparse_fn_tl
##1##2##3##4##5##6##7##8
{
- \tl_put_right:Nn \l_xparse_args_tl
+ \tl_put_right:Nn \l__xparse_args_tl
{ {##1} {##2} {##3} {##4} {##5} {##6} {##7} {##8} }
- #1 \l_xparse_args_tl
+ #1 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:Npn \xparse_grab_R:w #1#2#3#4 \l_xparse_args_tl
- { \xparse_grab_R_aux:NNnnN #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn }
-\cs_new_protected:Npn \xparse_grab_R_long:w #1#2#3#4 \l_xparse_args_tl
- { \xparse_grab_R_aux:NNnnN #1 #2 {#3} {#4} \cs_set_protected:Npn }
-\cs_new_protected:Npn \xparse_grab_R_aux:NNnnN #1#2#3#4#5
+\cs_new_protected:Npn \__xparse_grab_R:w #1#2#3#4 \l__xparse_args_tl
+ { \__xparse_grab_R_aux:NNnnN #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn }
+\cs_new_protected:Npn \__xparse_grab_R_long:w #1#2#3#4 \l__xparse_args_tl
+ { \__xparse_grab_R_aux:NNnnN #1 #2 {#3} {#4} \cs_set_protected:Npn }
+\cs_new_protected:Npn \__xparse_grab_R_aux:NNnnN #1#2#3#4#5
{
- \xparse_grab_D_aux:NNnN #1 #2 {#4} #5
+ \__xparse_grab_D_aux:NNnN #1 #2 {#4} #5
\peek_meaning_remove_ignore_spaces:NTF #1
- { \xparse_grab_arg:w }
+ { \__xparse_grab_arg:w }
{
- \msg_kernel_error:nnxx { xparse } { missing-required }
+ \__msg_kernel_error:nnxx { xparse } { missing-required }
{ \token_to_str:N #1 } { \tl_to_str:n {#3} }
- \xparse_add_arg:n {#3}
- #4 \l_xparse_args_tl
+ \__xparse_add_arg:n {#3}
+ #4 \l__xparse_args_tl
}
}
-\cs_new_protected:Npn \xparse_grab_t:w #1#2 \l_xparse_args_tl
+\cs_new_protected:Npn \__xparse_grab_t:w #1#2 \l__xparse_args_tl
{
- \xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected_nopar:Npn
+ \__xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected_nopar:Npn
{ _ignore_spaces }
}
-\cs_new_protected:Npn \xparse_grab_t_long:w #1#2 \l_xparse_args_tl
- { \xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected:Npn { _ignore_spaces } }
-\cs_new_protected:Npn \xparse_grab_t_trailing:w #1#2 \l_xparse_args_tl
- { \xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected_nopar:Npn { } }
-\cs_new_protected:Npn \xparse_grab_t_long_trailing:w #1#2 \l_xparse_args_tl
- { \xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected:Npn { } }
-\cs_new_protected:Npn \xparse_grab_t_aux:NnNn #1#2#3#4
+\cs_new_protected:Npn \__xparse_grab_t_long:w #1#2 \l__xparse_args_tl
+ { \__xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected:Npn { _ignore_spaces } }
+\cs_new_protected:Npn \__xparse_grab_t_trailing:w #1#2 \l__xparse_args_tl
+ { \__xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected_nopar:Npn { } }
+\cs_new_protected:Npn \__xparse_grab_t_long_trailing:w #1#2 \l__xparse_args_tl
+ { \__xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected:Npn { } }
+\cs_new_protected:Npn \__xparse_grab_t_aux:NnNn #1#2#3#4
{
- \exp_after:wN #3 \l_xparse_fn_tl
+ \exp_after:wN #3 \l__xparse_fn_tl
{
\use:c { peek_meaning_remove #4 :NTF } #1
{
- \xparse_add_arg:n { \BooleanTrue }
- #2 \l_xparse_args_tl
+ \__xparse_add_arg:n { \BooleanTrue }
+ #2 \l__xparse_args_tl
}
{
- \xparse_add_arg:n { \BooleanFalse }
- #2 \l_xparse_args_tl
+ \__xparse_add_arg:n { \BooleanFalse }
+ #2 \l__xparse_args_tl
}
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\cs_new_protected:Npn \xparse_grab_u:w #1#2 \l_xparse_args_tl
- { \xparse_grab_u_aux:nnN {#1} {#2} \cs_set_protected_nopar:Npn }
-\cs_new_protected:Npn \xparse_grab_u_long:w #1#2 \l_xparse_args_tl
- { \xparse_grab_u_aux:nnN {#1} {#2} \cs_set_protected:Npn }
-\cs_new_protected:Npn \xparse_grab_u_aux:nnN #1#2#3
+\cs_new_protected:Npn \__xparse_grab_u:w #1#2 \l__xparse_args_tl
+ { \__xparse_grab_u_aux:nnN {#1} {#2} \cs_set_protected_nopar:Npn }
+\cs_new_protected:Npn \__xparse_grab_u_long:w #1#2 \l__xparse_args_tl
+ { \__xparse_grab_u_aux:nnN {#1} {#2} \cs_set_protected:Npn }
+\cs_new_protected:Npn \__xparse_grab_u_aux:nnN #1#2#3
{
- \exp_after:wN #3 \l_xparse_fn_tl ##1 #1
+ \exp_after:wN #3 \l__xparse_fn_tl ##1 #1
{
- \xparse_add_arg:n {##1}
- #2 \l_xparse_args_tl
+ \__xparse_add_arg:n {##1}
+ #2 \l__xparse_args_tl
}
- \l_xparse_fn_tl
+ \l__xparse_fn_tl
}
-\tl_new:N \l_xparse_v_rest_of_signature_tl
-\tl_new:N \l_xparse_v_arg_tl
-\cs_new_protected_nopar:Npn \xparse_grab_v:w
+\tl_new:N \l__xparse_v_rest_of_signature_tl
+\tl_new:N \l__xparse_v_arg_tl
+\cs_new_protected_nopar:Npn \__xparse_grab_v:w
{
- \bool_set_false:N \l_xparse_long_bool
- \xparse_grab_v_aux:w
+ \bool_set_false:N \l__xparse_long_bool
+ \__xparse_grab_v_aux:w
}
-\cs_new_protected_nopar:Npn \xparse_grab_v_long:w
+\cs_new_protected_nopar:Npn \__xparse_grab_v_long:w
{
- \bool_set_true:N \l_xparse_long_bool
- \xparse_grab_v_aux:w
+ \bool_set_true:N \l__xparse_long_bool
+ \__xparse_grab_v_aux:w
}
-\cs_new_protected:Npn \xparse_grab_v_aux:w #1 \l_xparse_args_tl
+\cs_new_protected:Npn \__xparse_grab_v_aux:w #1 \l__xparse_args_tl
{
- \tl_set:Nn \l_xparse_v_rest_of_signature_tl {#1}
+ \tl_set:Nn \l__xparse_v_rest_of_signature_tl {#1}
\group_begin:
\group_align_safe_begin:
\tex_escapechar:D = 92 \scan_stop:
- \tl_clear:N \l_xparse_v_arg_tl
+ \tl_clear:N \l__xparse_v_arg_tl
\peek_N_type:TF
- { \xparse_grab_v_aux_test:N }
+ { \__xparse_grab_v_aux_test:N }
{
\peek_meaning_remove:NTF \c_group_begin_token
{
\group_align_safe_end:
- \xparse_grab_v_bgroup:
+ \__xparse_grab_v_bgroup:
}
- { \xparse_grab_v_aux_abort: }
+ { \__xparse_grab_v_aux_abort: }
}
}
-\cs_new_protected_nopar:Npn \xparse_grab_v_group_end:
+\cs_new_protected_nopar:Npn \__xparse_grab_v_group_end:
{
\group_align_safe_end:
\exp_args:NNNo
\group_end:
- \tl_set:Nn \l_xparse_v_arg_tl { \l_xparse_v_arg_tl }
+ \tl_set:Nn \l__xparse_v_arg_tl { \l__xparse_v_arg_tl }
}
-\cs_new_protected:Npn \xparse_grab_v_aux_test:N #1
+\cs_new_protected:Npn \__xparse_grab_v_aux_test:N #1
{
- \xparse_grab_v_aux_put:N #1
- \xparse_grab_v_token_if_char:NTF #1
+ \__xparse_grab_v_aux_put:N #1
+ \__xparse_grab_v_token_if_char:NTF #1
{
- \xparse_grab_v_aux_catcodes:
- \xparse_grab_v_aux_loop:N #1
+ \__xparse_grab_v_aux_catcodes:
+ \__xparse_grab_v_aux_loop:N #1
}
- { \xparse_grab_v_aux_abort: }
+ { \__xparse_grab_v_aux_abort: }
}
-\cs_new_protected:Npn \xparse_grab_v_aux_loop:N #1
+\cs_new_protected:Npn \__xparse_grab_v_aux_loop:N #1
{
\peek_N_type:TF
- { \xparse_grab_v_aux_loop_ii:NN #1 }
- { \xparse_grab_v_aux_abort: }
+ { \__xparse_grab_v_aux_loop_ii:NN #1 }
+ { \__xparse_grab_v_aux_abort: }
}
-\cs_new_protected:Npn \xparse_grab_v_aux_loop_ii:NN #1 #2
+\cs_new_protected:Npn \__xparse_grab_v_aux_loop_ii:NN #1 #2
{
- \xparse_grab_v_token_if_char:NTF #2
+ \__xparse_grab_v_token_if_char:NTF #2
{
\token_if_eq_charcode:NNTF #1 #2
- { \xparse_grab_v_aux_loop_end: }
+ { \__xparse_grab_v_aux_loop_end: }
{
- \xparse_grab_v_aux_put:N #2
- \xparse_grab_v_aux_loop:N #1
+ \__xparse_grab_v_aux_put:N #2
+ \__xparse_grab_v_aux_loop:N #1
}
}
- { \xparse_grab_v_aux_abort: #2 }
+ { \__xparse_grab_v_aux_abort: #2 }
}
-\cs_new_protected_nopar:Npn \xparse_grab_v_aux_loop_end:
+\cs_new_protected_nopar:Npn \__xparse_grab_v_aux_loop_end:
{
- \xparse_grab_v_group_end:
- \exp_args:Nx \xparse_add_arg:n { \tl_tail:N \l_xparse_v_arg_tl }
- \l_xparse_v_rest_of_signature_tl \l_xparse_args_tl
+ \__xparse_grab_v_group_end:
+ \exp_args:Nx \__xparse_add_arg:n { \tl_tail:N \l__xparse_v_arg_tl }
+ \l__xparse_v_rest_of_signature_tl \l__xparse_args_tl
}
-\int_new:N \l_xparse_v_nesting_int
-\cs_new_protected_nopar:Npx \xparse_grab_v_bgroup:
+\int_new:N \l__xparse_v_nesting_int
+\cs_new_protected_nopar:Npx \__xparse_grab_v_bgroup:
{
- \exp_not:N \xparse_grab_v_aux_catcodes:
- \exp_not:n { \int_set_eq:NN \l_xparse_v_nesting_int \c_one }
- \exp_not:N \xparse_grab_v_aux_put:N \iow_char:N \{
- \exp_not:N \xparse_grab_v_bgroup_loop:
+ \exp_not:N \__xparse_grab_v_aux_catcodes:
+ \exp_not:n { \int_set_eq:NN \l__xparse_v_nesting_int \c_one }
+ \exp_not:N \__xparse_grab_v_aux_put:N \iow_char:N \{
+ \exp_not:N \__xparse_grab_v_bgroup_loop:
}
-\cs_new_protected:Npn \xparse_grab_v_bgroup_loop:
+\cs_new_protected:Npn \__xparse_grab_v_bgroup_loop:
{
\peek_N_type:TF
- { \xparse_grab_v_bgroup_loop_ii:N }
- { \xparse_grab_v_aux_abort: }
+ { \__xparse_grab_v_bgroup_loop_ii:N }
+ { \__xparse_grab_v_aux_abort: }
}
-\cs_new_protected:Npn \xparse_grab_v_bgroup_loop_ii:N #1
+\cs_new_protected:Npn \__xparse_grab_v_bgroup_loop_ii:N #1
{
- \xparse_grab_v_token_if_char:NTF #1
+ \__xparse_grab_v_token_if_char:NTF #1
{
\token_if_eq_charcode:NNTF \c_group_end_token #1
{
- \int_decr:N \l_xparse_v_nesting_int
- \int_compare:nNnTF \l_xparse_v_nesting_int > \c_zero
+ \int_decr:N \l__xparse_v_nesting_int
+ \int_compare:nNnTF \l__xparse_v_nesting_int > \c_zero
{
- \xparse_grab_v_aux_put:N #1
- \xparse_grab_v_bgroup_loop:
+ \__xparse_grab_v_aux_put:N #1
+ \__xparse_grab_v_bgroup_loop:
}
- { \xparse_grab_v_aux_loop_end: }
+ { \__xparse_grab_v_aux_loop_end: }
}
{
\token_if_eq_charcode:NNT \c_group_begin_token #1
- { \int_incr:N \l_xparse_v_nesting_int }
- \xparse_grab_v_aux_put:N #1
- \xparse_grab_v_bgroup_loop:
+ { \int_incr:N \l__xparse_v_nesting_int }
+ \__xparse_grab_v_aux_put:N #1
+ \__xparse_grab_v_bgroup_loop:
}
}
- { \xparse_grab_v_aux_abort: #1 }
+ { \__xparse_grab_v_aux_abort: #1 }
}
-\cs_new_protected_nopar:Npn \xparse_grab_v_aux_catcodes:
+\cs_new_protected_nopar:Npn \__xparse_grab_v_aux_catcodes:
{
\cs_set_eq:NN \do \char_set_catcode_other:N
\dospecials
\tex_endlinechar:D = `\^^M \scan_stop:
- \bool_if:NTF \l_xparse_long_bool
+ \bool_if:NTF \l__xparse_long_bool
{ \char_set_catcode_other:n { \tex_endlinechar:D } }
{ \char_set_catcode_parameter:n { \tex_endlinechar:D } }
}
-\cs_new_protected_nopar:Npn \xparse_grab_v_aux_abort:
+\cs_new_protected_nopar:Npn \__xparse_grab_v_aux_abort:
{
- \xparse_grab_v_group_end:
- \xparse_add_arg:n { \NoValue }
- \exp_after:wN \xparse_grab_v_aux_abort_ii:w \l_xparse_args_tl \q_stop
+ \__xparse_grab_v_group_end:
+ \__xparse_add_arg:o \c__xparse_no_value_tl
+ \exp_after:wN \__xparse_grab_v_aux_abort_ii:w \l__xparse_args_tl \q_stop
}
-\cs_new_protected:Npn \xparse_grab_v_aux_abort_ii:w #1 #2 \q_stop
+\cs_new_protected:Npn \__xparse_grab_v_aux_abort_ii:w #1 #2 \q_stop
{
\group_begin:
\char_set_lccode:nn { `\# } { \tex_endlinechar:D }
\tl_to_lowercase:n
{ \group_end: \peek_meaning_remove:NTF ## }
{
- \msg_kernel_error:nnxx { xparse } { verbatim-newline }
+ \__msg_kernel_error:nnxx { xparse } { verbatim-newline }
{ \token_to_str:N #1 }
- { \tl_to_str:N \l_xparse_v_arg_tl }
- \l_xparse_v_rest_of_signature_tl \l_xparse_args_tl
+ { \tl_to_str:N \l__xparse_v_arg_tl }
+ \l__xparse_v_rest_of_signature_tl \l__xparse_args_tl
}
{
- \msg_kernel_error:nnxx { xparse } { verbatim-already-tokenized }
+ \__msg_kernel_error:nnxx { xparse } { verbatim-already-tokenized }
{ \token_to_str:N #1 }
- { \tl_to_str:N \l_xparse_v_arg_tl }
- \l_xparse_v_rest_of_signature_tl \l_xparse_args_tl
+ { \tl_to_str:N \l__xparse_v_arg_tl }
+ \l__xparse_v_rest_of_signature_tl \l__xparse_args_tl
}
}
-\cs_new_protected:Npn \xparse_grab_v_aux_put:N #1
+\cs_new_protected:Npn \__xparse_grab_v_aux_put:N #1
{
- \tl_put_right:Nx \l_xparse_v_arg_tl
+ \tl_put_right:Nx \l__xparse_v_arg_tl
{
\token_if_active:NTF #1
{ \exp_not:N #1 } { \token_to_str:N #1 }
}
}
-\cs_new_protected:Npn \xparse_grab_v_token_if_char:NTF #1
- { \str_if_eq:xxTF { } { \str_tail:n {#1} } }
-\cs_new_protected:Npn \xparse_add_arg:n #1
+\cs_new_protected:Npn \__xparse_grab_v_token_if_char:NTF #1
+ { \str_if_eq_x:nnTF { } { \str_tail:n {#1} } }
+\cs_new_protected:Npn \__xparse_add_arg:n #1
{
- \int_compare:nNnTF \l_xparse_processor_int = \c_zero
- { \tl_put_right:Nn \l_xparse_args_tl { {#1} } }
+ \int_compare:nNnTF \l__xparse_processor_int = \c_zero
+ { \tl_put_right:Nn \l__xparse_args_tl { {#1} } }
{
\tl_clear:N \ProcessedArgument
- \xparse_if_no_value:nTF {#1}
+ \__xparse_if_no_value:nTF {#1}
{
- \int_zero:N \l_xparse_processor_int
- \tl_put_right:Nn \l_xparse_args_tl { {#1} }
+ \int_zero:N \l__xparse_processor_int
+ \tl_put_right:Nn \l__xparse_args_tl { {#1} }
}
- { \xparse_add_arg_aux:n {#1} }
+ { \__xparse_add_arg_aux:n {#1} }
}
}
-\cs_generate_variant:Nn \xparse_add_arg:n { V , o }
-\cs_new_protected:Npn \xparse_add_arg_aux:n #1
+\cs_generate_variant:Nn \__xparse_add_arg:n { V , o }
+\cs_new_protected:Npn \__xparse_add_arg_aux:n #1
{
- \use:c { xparse_processor_ \int_use:N \l_xparse_processor_int :n } {#1}
- \int_decr:N \l_xparse_processor_int
- \int_compare:nNnTF \l_xparse_processor_int = \c_zero
+ \use:c { __xparse_processor_ \int_use:N \l__xparse_processor_int :n } {#1}
+ \int_decr:N \l__xparse_processor_int
+ \int_compare:nNnTF \l__xparse_processor_int = \c_zero
{
- \tl_put_right:Nx \l_xparse_args_tl
+ \tl_put_right:Nx \l__xparse_args_tl
{ { \exp_not:V \ProcessedArgument } }
}
- { \xparse_add_arg_aux:V \ProcessedArgument }
+ { \__xparse_add_arg_aux:V \ProcessedArgument }
}
-\cs_generate_variant:Nn \xparse_add_arg_aux:n { V }
-\cs_new:Npn \xparse_expandable_grab_D:w #1 \q_xparse #2
- { #2 { \xparse_expandable_grab_D_i:NNNnwNn #1 \q_xparse #2 } }
-\cs_new:Npn \xparse_expandable_grab_D_i:NNNnwNn #1#2#3#4#5 \q_xparse #6#7
+\cs_generate_variant:Nn \__xparse_add_arg_aux:n { V }
+\cs_new:Npn \__xparse_expandable_grab_D:w #1 \q__xparse #2
+ { #2 { \__xparse_expandable_grab_D_i:NNNnwNn #1 \q__xparse #2 } }
+\cs_new:Npn \__xparse_expandable_grab_D_i:NNNnwNn #1#2#3#4#5 \q__xparse #6#7
{
\str_if_eq:onTF
- { #1 { } { } #7 #2 \q_xparse #3 }
+ { #1 { } { } #7 #2 \q__xparse #3 }
{ { } { #2 } { } }
{
#1
- { \xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#5 \q_xparse #6 }
- \q_nil { } #2 \ERROR \q_xparse \ERROR
+ { \__xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#5 \q__xparse #6 }
+ \q_nil { } #2 \ERROR \q__xparse \ERROR
}
- { #5 {#4} \q_xparse #6 {#7} }
+ { #5 {#4} \q__xparse #6 {#7} }
}
-\cs_new:Npn \xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#4 \q_xparse #5#6#7#8
+\cs_new:Npn \__xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#4 \q__xparse #5#6#7#8
{
- \exp_args:Nof \xparse_expandable_grab_D_iv:nnNNNwN
+ \exp_args:Nof \__xparse_expandable_grab_D_iv:nnNNNwN
{ \use_ii:nn #6 #2 }
- { \xparse_expandable_grab_D_iii:Nw #3 \exp_stop_f: #7 #8 }
- #1#2#3 #4 \q_xparse #5
+ { \__xparse_expandable_grab_D_iii:Nw #3 \exp_stop_f: #7 #8 }
+ #1#2#3 #4 \q__xparse #5
}
-\cs_new:Npn \xparse_expandable_grab_D_iii:Nw #1#2 \ERROR \ERROR { #2 #1 }
-\cs_new:Npn \xparse_expandable_grab_D_iv:nnNNNwN #1#2#3#4#5#6 \q_xparse #7
+\cs_new:Npn \__xparse_expandable_grab_D_iii:Nw #1#2 \ERROR \ERROR { #2 #1 }
+\cs_new:Npn \__xparse_expandable_grab_D_iv:nnNNNwN #1#2#3#4#5#6 \q__xparse #7
{
\exp_args:No \tl_if_empty:oTF
- { #3 { \use_none:nnn } #2 \q_xparse #5 #4 \q_xparse #5 }
+ { #3 { \use_none:nnn } #2 \q__xparse #5 #4 \q__xparse #5 }
{
- \xparse_put_arg_expandable:ow { \use_none:nn #1#2 }
- #6 \q_xparse #7
+ \__xparse_put_arg_expandable:ow { \use_none:nn #1#2 }
+ #6 \q__xparse #7
}
{
#3
- { \xparse_expandable_grab_D_ii:NNNwNnnn #3#4#5#6 \q_xparse #7 }
- \q_nil {#1} #2 \ERROR \q_xparse \ERROR
+ { \__xparse_expandable_grab_D_ii:NNNwNnnn #3#4#5#6 \q__xparse #7 }
+ \q_nil {#1} #2 \ERROR \q__xparse \ERROR
}
}
-\cs_new:Npn \xparse_expandable_grab_D_alt:w #1 \q_xparse #2
- { #2 { \xparse_expandable_grab_D_alt_i:NNnwNn #1 \q_xparse #2 } }
-\cs_new:Npn \xparse_expandable_grab_D_alt_i:NNnwNn #1#2#3#4 \q_xparse #5#6
+\cs_new:Npn \__xparse_expandable_grab_D_alt:w #1 \q__xparse #2
+ { #2 { \__xparse_expandable_grab_D_alt_i:NNnwNn #1 \q__xparse #2 } }
+\cs_new:Npn \__xparse_expandable_grab_D_alt_i:NNnwNn #1#2#3#4 \q__xparse #5#6
{
\str_if_eq:onTF
{ #1 { } #6 #2 #2 }
{ { } #2 }
{
#1
- { \xparse_expandable_grab_D_alt_ii:Nwn #5 #4 \q_xparse }
+ { \__xparse_expandable_grab_D_alt_ii:Nwn #5 #4 \q__xparse }
#6 \ERROR
}
- { #4 {#3} \q_xparse #5 {#6} }
+ { #4 {#3} \q__xparse #5 {#6} }
}
-\cs_new:Npn \xparse_expandable_grab_D_alt_ii:Nwn #1#2 \q_xparse #3
- { \xparse_put_arg_expandable:ow { \use_none:n #3 } #2 \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
- { #1 {#3} \q_xparse #2 }
-\cs_new:Npn \xparse_expandable_grab_R:w #1 \q_xparse #2
- { #2 { \xparse_expandable_grab_R_aux:NNNnwNn #1 \q_xparse #2 } }
-\cs_new:Npn \xparse_expandable_grab_R_aux:NNNnwNn #1#2#3#4#5 \q_xparse #6#7
+\cs_new:Npn \__xparse_expandable_grab_D_alt_ii:Nwn #1#2 \q__xparse #3
+ { \__xparse_put_arg_expandable:ow { \use_none:n #3 } #2 \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
+ { #1 {#3} \q__xparse #2 }
+\cs_new:Npn \__xparse_expandable_grab_R:w #1 \q__xparse #2
+ { #2 { \__xparse_expandable_grab_R_aux:NNNnwNn #1 \q__xparse #2 } }
+\cs_new:Npn \__xparse_expandable_grab_R_aux:NNNnwNn #1#2#3#4#5 \q__xparse #6#7
{
\str_if_eq:onTF
- { #1 { } { } #7 #2 \q_xparse #3 }
+ { #1 { } { } #7 #2 \q__xparse #3 }
{ { } { #2 } { } }
{
#1
- { \xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#5 \q_xparse #6 }
- \q_nil { } #2 \ERROR \q_xparse \ERROR
+ { \__xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#5 \q__xparse #6 }
+ \q_nil { } #2 \ERROR \q__xparse \ERROR
}
{
- \msg_expandable_kernel_error:nnn
+ \__msg_kernel_expandable_error:nnn
{ xparse } { missing-required } {#2}
- #5 {#4} \q_xparse #6 {#7}
+ #5 {#4} \q__xparse #6 {#7}
}
}
-\cs_new:Npn \xparse_expandable_grab_R_alt:w #1 \q_xparse #2
- { #2 { \xparse_expandable_grab_R_alt_aux:NNnwNn #1 \q_xparse #2 } }
-\cs_new:Npn \xparse_expandable_grab_R_alt_aux:NNnwNn #1#2#3#4 \q_xparse #5#6
+\cs_new:Npn \__xparse_expandable_grab_R_alt:w #1 \q__xparse #2
+ { #2 { \__xparse_expandable_grab_R_alt_aux:NNnwNn #1 \q__xparse #2 } }
+\cs_new:Npn \__xparse_expandable_grab_R_alt_aux:NNnwNn #1#2#3#4 \q__xparse #5#6
{
\str_if_eq:onTF
{ #1 { } #6 #2 #2 }
{ { } #2 }
{
#1
- { \xparse_expandable_grab_D_alt_ii:Nwn #5 #4 \q_xparse }
+ { \__xparse_expandable_grab_D_alt_ii:Nwn #5 #4 \q__xparse }
#6 \ERROR
}
{
- \msg_expandable_kernel_error:nnn
+ \__msg_kernel_expandable_error:nnn
{ xparse } { missing-required } {#2}
- #4 {#3} \q_xparse #5 {#6}
+ #4 {#3} \q__xparse #5 {#6}
}
}
-\cs_new:Npn \xparse_expandable_grab_t:w #1 \q_xparse #2
- { #2 { \xparse_expandable_grab_t_aux:NNwn #1 \q_xparse #2 } }
-\cs_new:Npn \xparse_expandable_grab_t_aux:NNwn #1#2#3 \q_xparse #4#5
+\cs_new:Npn \__xparse_expandable_grab_t:w #1 \q__xparse #2
+ { #2 { \__xparse_expandable_grab_t_aux:NNwn #1 \q__xparse #2 } }
+\cs_new:Npn \__xparse_expandable_grab_t_aux:NNwn #1#2#3 \q__xparse #4#5
{
\str_if_eq:onTF { #1 { } #5 #2 } { #2 }
- { #3 { \BooleanTrue } \q_xparse #4 }
- { #3 { \BooleanFalse } \q_xparse #4 {#5} }
+ { #3 { \BooleanTrue } \q__xparse #4 }
+ { #3 { \BooleanFalse } \q__xparse #4 {#5} }
}
-\cs_new:Npn \xparse_put_arg_expandable:nw #1#2 \q_xparse { #2 {#1} \q_xparse }
-\cs_generate_variant:Nn \xparse_put_arg_expandable:nw { o }
-\cs_new:Npn \xparse_grab_expandable_end:wN #1 \q_xparse #2 {#1}
-\cs_new_protected:Npn \xparse_process_arg:n #1
+\cs_new:Npn \__xparse_put_arg_expandable:nw #1#2 \q__xparse { #2 {#1} \q__xparse }
+\cs_generate_variant:Nn \__xparse_put_arg_expandable:nw { o }
+\cs_new:Npn \__xparse_grab_expandable_end:wN #1 \q__xparse #2 {#1}
+\cs_new_protected:Npn \__xparse_process_arg:n #1
{
- \int_incr:N \l_xparse_processor_int
- \cs_set:cpn { xparse_processor_ \int_use:N \l_xparse_processor_int :n } ##1
+ \int_incr:N \l__xparse_processor_int
+ \cs_set:cpn { __xparse_processor_ \int_use:N \l__xparse_processor_int :n } ##1
{ #1 {##1} }
}
-\cs_new_protected:Npn \xparse_process_to_str:n #1
+\cs_new_protected:Npn \__xparse_process_to_str:n #1
{ \tl_set:Nx \ProcessedArgument { \tl_to_str:n {#1} } }
-\cs_new_protected:Npn \xparse_bool_reverse:N #1
+\cs_new_protected:Npn \__xparse_bool_reverse:N #1
{
\bool_if:NTF #1
{ \tl_set:Nn \ProcessedArgument { \c_false_bool } }
{ \tl_set:Nn \ProcessedArgument { \c_true_bool } }
}
-\seq_new:N \l_xparse_split_list_seq
-\tl_new:N \l_xparse_split_list_tl
-\cs_new_protected:Npn \xparse_split_list:nn #1#2
+\seq_new:N \l__xparse_split_list_seq
+\tl_new:N \l__xparse_split_list_tl
+\cs_new_protected:Npn \__xparse_split_list:nn #1#2
{
\bool_if:nTF
{
\tl_if_single_p:n {#1} &&
! ( \token_if_cs_p:N #1 )
}
- { \xparse_split_list_single:Nn #1 {#2} }
- { \xparse_split_list_multi:nn {#1} {#2} }
+ { \__xparse_split_list_single:Nn #1 {#2} }
+ { \__xparse_split_list_multi:nn {#1} {#2} }
}
-\cs_set_protected:Npn \xparse_split_list_multi:nn #1#2
+\cs_set_protected:Npn \__xparse_split_list_multi:nn #1#2
{
- \seq_set_split:Nnn \l_xparse_split_list_seq {#1} {#2}
+ \seq_set_split:Nnn \l__xparse_split_list_seq {#1} {#2}
\tl_clear:N \ProcessedArgument
- \seq_map_inline:Nn \l_xparse_split_list_seq
+ \seq_map_inline:Nn \l__xparse_split_list_seq
{ \tl_put_right:Nn \ProcessedArgument { {##1} } }
}
-\cs_generate_variant:Nn \xparse_split_list_multi:nn { nV }
+\cs_generate_variant:Nn \__xparse_split_list_multi:nn { nV }
\group_begin:
\char_set_catcode_active:N \@
-\cs_new_protected:Npn \xparse_split_list_single:Nn #1#2
+\cs_new_protected:Npn \__xparse_split_list_single:Nn #1#2
{
- \tl_set:Nn \l_xparse_split_list_tl {#2}
+ \tl_set:Nn \l__xparse_split_list_tl {#2}
\group_begin:
\char_set_lccode:nn { `\@ } { `#1 }
\tl_to_lowercase:n
{
\group_end:
- \tl_replace_all:Nnn \l_xparse_split_list_tl { @ } {#1}
+ \tl_replace_all:Nnn \l__xparse_split_list_tl { @ } {#1}
}
- \xparse_split_list_multi:nV {#1} \l_xparse_split_list_tl
+ \__xparse_split_list_multi:nV {#1} \l__xparse_split_list_tl
}
\group_end:
-\cs_new_protected:Npn \xparse_split_argument:nnn #1#2#3
+\cs_new_protected:Npn \__xparse_split_argument:nnn #1#2#3
{
- \xparse_split_list:nn {#2} {#3}
- \exp_args:Nf \xparse_split_argument_aux:nnnn
- { \tl_length:N \ProcessedArgument }
+ \__xparse_split_list:nn {#2} {#3}
+ \exp_args:Nf \__xparse_split_argument_aux:nnnn
+ { \tl_count:N \ProcessedArgument }
{#1} {#2} {#3}
}
-\cs_new_protected:Npn \xparse_split_argument_aux:nnnn #1#2#3#4
+\cs_new_protected:Npn \__xparse_split_argument_aux:nnnn #1#2#3#4
{
\int_compare:nNnF {#1} = { #2 + \c_one }
{
@@ -1269,13 +1284,13 @@
\tl_set:Nx \ProcessedArgument
{
\exp_last_unbraced:NnNo
- \xparse_split_argument_aux:n
+ \__xparse_split_argument_aux:n
{ #2 + \c_one }
\use_none_delimit_by_q_stop:w
\ProcessedArgument
\q_stop
}
- \msg_kernel_error:nnxxx { xparse } { split-excess-tokens }
+ \__msg_kernel_error:nnxxx { xparse } { split-excess-tokens }
{ \tl_to_str:n {#3} } { \int_eval:n { #2 + \c_one } }
{ \tl_to_str:n {#4} }
}
@@ -1283,63 +1298,80 @@
\tl_put_right:Nx \ProcessedArgument
{
\prg_replicate:nn { #2 + \c_one - (#1) }
- { { \exp_not:n { \NoValue } } }
+ { { \exp_not:V \c__xparse_no_value_tl } }
}
}
}
}
-\cs_new:Npn \xparse_split_argument_aux:n #1
- { \prg_replicate:nn {#1} { \xparse_split_argument_aux:wn } }
-\cs_new:Npn \xparse_split_argument_aux:wn #1 \use_none_delimit_by_q_stop:w #2
+\cs_new:Npn \__xparse_split_argument_aux:n #1
+ { \prg_replicate:nn {#1} { \__xparse_split_argument_aux:wn } }
+\cs_new:Npn \__xparse_split_argument_aux:wn #1 \use_none_delimit_by_q_stop:w #2
{
\exp_not:n { {#2} }
#1
\use_none_delimit_by_q_stop:w
}
-\cs_new_protected:Npn \xparse_trim_spaces:n #1
+\cs_new_protected:Npn \__xparse_trim_spaces:n #1
{ \tl_set:Nx \ProcessedArgument { \tl_trim_spaces:n {#1} } }
-\cs_new_protected:Npn \xparse_get_arg_spec:N #1
+\cs_new_protected:Npn \__xparse_get_arg_spec:N #1
{
- \prop_get:NnNF \l_xparse_command_arg_specs_prop {#1}
+ \prop_get:NnNF \l__xparse_command_arg_specs_prop {#1}
\ArgumentSpecification
{
- \msg_kernel_error:nnx { xparse } { unknown-document-command }
+ \__msg_kernel_error:nnx { xparse } { unknown-document-command }
{ \token_to_str:N #1 }
}
}
-\cs_new_protected:Npn \xparse_get_arg_spec:n #1
+\cs_new_protected:Npn \__xparse_get_arg_spec:n #1
{
- \prop_get:NnNF \l_xparse_environment_arg_specs_prop {#1}
+ \prop_get:NnNF \l__xparse_environment_arg_specs_prop {#1}
\ArgumentSpecification
{
- \msg_kernel_error:nnx { xparse } { unknown-document-environment }
+ \__msg_kernel_error:nnx { xparse } { unknown-document-environment }
{ \tl_to_str:n {#1} }
}
}
\tl_new:N \ArgumentSpecification
-\cs_new_protected:Npn \xparse_show_arg_spec:N #1
+\cs_new_protected:Npn \__xparse_show_arg_spec:N #1
{
- \prop_get:NnNTF \l_xparse_command_arg_specs_prop {#1}
+ \prop_get:NnNTF \l__xparse_command_arg_specs_prop {#1}
\ArgumentSpecification
{ \tl_show:N \ArgumentSpecification }
{
- \msg_kernel_error:nnx { xparse } { unknown-document-command }
+ \__msg_kernel_error:nnx { xparse } { unknown-document-command }
{ \token_to_str:N #1 }
}
}
-\cs_new_protected:Npn \xparse_show_arg_spec:n #1
+\cs_new_protected:Npn \__xparse_show_arg_spec:n #1
{
- \prop_get:NnNTF \l_xparse_environment_arg_specs_prop {#1}
+ \prop_get:NnNTF \l__xparse_environment_arg_specs_prop {#1}
\ArgumentSpecification
{ \tl_show:N \ArgumentSpecification }
{
- \msg_kernel_error:nnx { xparse } { unknown-document-environment }
+ \__msg_kernel_error:nnx { xparse } { unknown-document-environment }
{ \tl_to_str:n {#1} }
}
}
-\prg_new_conditional:Npnn \xparse_if_no_value:n #1 { T , F , TF }
- { \str_if_eq:nnTF {#1} { \NoValue } \prg_return_true: \prg_return_false: }
-\msg_kernel_new:nnnn { xparse } { bad-arg-spec }
+\group_begin:
+\char_set_lccode:nn { `\Q } { `\- }
+\char_set_lccode:nn { `\F } { `\F }
+\char_set_lccode:nn { `\N } { `\N }
+\char_set_lccode:nn { `\T } { `\T }
+\char_set_lccode:nn { `\V } { `\V }
+\tl_to_lowercase:n
+ {
+ \group_end:
+ \prg_new_conditional:Npnn \__xparse_if_no_value:n #1 { T , F , TF }
+ {
+ \str_if_eq:onTF
+ { \__xparse_if_value_aux:w ? #1 { } QNoValue- }
+ { ? { } QNoValue- }
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+ \cs_new:Npn \__xparse_if_value_aux:w #1 QNoValue- { #1 }
+ }
+\__msg_kernel_new:nnnn { xparse } { bad-arg-spec }
{ Bad~argument~specification~'#1'. }
{
\c_msg_coding_error_text_tl
@@ -1347,48 +1379,48 @@
one~or~more~mandatory~pieces~of~information~were~missing. \\ \\
LaTeX~will~ignore~this~entire~definition.
}
-\msg_kernel_new:nnnn { xparse } { command-already-defined }
+\__msg_kernel_new:nnnn { xparse } { command-already-defined }
{ Command~'#1'~already~defined! }
{
You~have~used~\NewDocumentCommand
with~a~command~that~already~has~a~definition. \\
The~existing~definition~of~'#1'~will~be~overwritten.
}
-\msg_kernel_new:nnnn { xparse } { command-not-yet-defined }
+\__msg_kernel_new:nnnn { xparse } { command-not-yet-defined }
{ Command ~'#1'~not~yet~defined! }
{
You~have~used~\RenewDocumentCommand
with~a~command~that~was~never~defined.\\
A~new~command~'#1'~will~be~created.
}
-\msg_kernel_new:nnnn { xparse } { environment-already-defined }
+\__msg_kernel_new:nnnn { xparse } { environment-already-defined }
{ Environment~'#1'~already~defined! }
{
You~have~used~\NewDocumentEnvironment
with~an~environment~that~already~has~a~definition.\\
The~existing~definition~of~'#1'~will~be~overwritten.
}
-\msg_kernel_new:nnnn { xparse } { environment-mismatch }
+\__msg_kernel_new:nnnn { xparse } { environment-mismatch }
{ Mismatch~between~start~and~end~of~environment. }
{
The~current~environment~is~called~'#1',~but~you~have~tried~to~
end~one~called~'#2'.~Environments~have~to~be~properly~nested.
}
-\msg_kernel_new:nnnn { xparse } { environment-not-yet-defined }
+\__msg_kernel_new:nnnn { xparse } { environment-not-yet-defined }
{ Environment~'#1'~not~yet~defined! }
{
You~have~used~\RenewDocumentEnvironment
with~an~environment~that~was~never~defined.\\
A~new~environment~'#1'~will~be~created.
}
-\msg_kernel_new:nnnn { xparse } { environment-unknown }
+\__msg_kernel_new:nnnn { xparse } { environment-unknown }
{ Environment~'#1'~undefined. }
{
You~have~tried~to~start~an~environment~called~'#1',~
but~this~has~never~been~defined.\\
The~command~will~be~ignored.
}
-\msg_kernel_new:nnnn { xparse } { expandable-ending-optional }
+\__msg_kernel_new:nnnn { xparse } { expandable-ending-optional }
{ Argument~specification~for~expandable~command~ends~with~optional~argument. }
{
\c_msg_coding_error_text_tl
@@ -1396,14 +1428,14 @@
(or~no~arguments~at~all).~You~cannot~have~a~terminal~optional~
argument~with~expandable~commands.
}
-\msg_kernel_new:nnnn { xparse } { inconsistent-long }
+\__msg_kernel_new:nnnn { xparse } { inconsistent-long }
{ Inconsistent~long~arguments~for~expandable~command. }
{
\c_msg_coding_error_text_tl
The~arguments~for~an~expandable~command~must~either~all~be~
short~or~all~be~long.~You~have~tried~to~mix~the~two~types.
}
-\msg_kernel_new:nnnn { xparse } { invalid-expandable-argument-type }
+\__msg_kernel_new:nnnn { xparse } { invalid-expandable-argument-type }
{ Argument~type~'#1'~not~available~for~an~expandable~function. }
{
\c_msg_coding_error_text_tl
@@ -1412,14 +1444,14 @@
\\ \\
LaTeX~will~assume~you~want~a~standard~mandatory~argument~(type~'m').
}
-\msg_kernel_new:nnnn { xparse } { missing-required }
+\__msg_kernel_new:nnnn { xparse } { missing-required }
{ Failed~to~find~required~argument~starting~with~'#1'. }
{
There~is~supposed~to~be~an~argument~to~the~current~function~starting~with~
'#1'.~LaTeX~did~not~find~it,~and~will~insert~'#2'~as~the~value~to~be~
processed.
}
-\msg_kernel_new:nnnn { xparse } { not-single-token }
+\__msg_kernel_new:nnnn { xparse } { not-single-token }
{ Argument~delimiter~should~be~a~single~token:~'#1'. }
{
\c_msg_coding_error_text_tl
@@ -1427,40 +1459,40 @@
in~a~place~where~a~single~token~is~required,~LaTeX~found~'#1'. \\ \\
LaTeX~will~ignore~this~entire~definition.
}
-\msg_kernel_new:nnnn { xparse } { processor-in-expandable }
+\__msg_kernel_new:nnnn { xparse } { processor-in-expandable }
{ Argument~processors~cannot~be~used~with~expandable~functions. }
{
\c_msg_coding_error_text_tl
The~argument~specification~for~#1~contains~a~processor~function:~
this~is~only~supported~for~standard~robust~functions.
}
-\msg_kernel_new:nnnn { xparse } { split-excess-tokens }
+\__msg_kernel_new:nnnn { xparse } { split-excess-tokens }
{ Too~many~'#1'~tokens~when~trying~to~split~argument. }
{
LaTeX~was~asked~to~split~the~input~'#3'~
at~each~occurrence~of~the~token~'#1',~up~to~a~maximum~of~#2~parts.~
There~were~too~many~'#1'~tokens.
}
-\msg_kernel_new:nnnn { xparse } { unknown-argument-type }
+\__msg_kernel_new:nnnn { xparse } { unknown-argument-type }
{ Unknown~argument~type~'#1'~replaced~by~'m'. }
{
\c_msg_coding_error_text_tl
The~letter~'#1'~does~not~specify~a~known~argument~type.~
LaTeX~will~assume~you~want~a~standard~mandatory~argument~(type~'m').
}
-\msg_kernel_new:nnnn { xparse } { unknown-document-command }
+\__msg_kernel_new:nnnn { xparse } { unknown-document-command }
{ Unknown~document~command~'#1'. }
{
You~have~asked~for~the~argument~specification~for~a~command~'#1',~
but~this~is~not~a~document~command.
}
-\msg_kernel_new:nnnn { xparse } { unknown-document-environment }
+\__msg_kernel_new:nnnn { xparse } { unknown-document-environment }
{ Unknown~document~environment~'#1'. }
{
You~have~asked~for~the~argument~specification~for~a~command~'#1',~
but~this~is~not~a~document~environment.
}
-\msg_kernel_new:nnnn { xparse } { verbatim-newline }
+\__msg_kernel_new:nnnn { xparse } { verbatim-newline }
{ Verbatim~argument~of~#1~ended~by~end~of~line. }
{
The~verbatim~argument~of~#1~cannot~contain~more~than~one~line,~but~the~end~
@@ -1469,7 +1501,7 @@
\\ \\
LaTeX~will~ignored~'#2'.
}
-\msg_kernel_new:nnnn { xparse } { verbatim-already-tokenized }
+\__msg_kernel_new:nnnn { xparse } { verbatim-already-tokenized }
{ Verbatim~command~#1~illegal~in~command~argument. }
{
The~command~#1~takes~a~verbatim~argument.~It~may~not~appear~within~
@@ -1477,22 +1509,22 @@
\\ \\
LaTeX~will~ignore~'#2'.
}
-\msg_kernel_new:nnn { xparse } { define-command }
+\__msg_kernel_new:nnn { xparse } { define-command }
{
Defining~document~command~#1~
with~arg.~spec.~'#2'~\msg_line_context:.
}
-\msg_kernel_new:nnn { xparse } { define-environment }
+\__msg_kernel_new:nnn { xparse } { define-environment }
{
Defining~document~environment~'#1'~
with~arg.~spec.~'#2'~\msg_line_context:.
}
-\msg_kernel_new:nnn { xparse } { redefine-command }
+\__msg_kernel_new:nnn { xparse } { redefine-command }
{
Redefining~document~command~#1~
with~arg.~spec.~'#2'~\msg_line_context:.
}
-\msg_kernel_new:nnn { xparse } { redefine-environment }
+\__msg_kernel_new:nnn { xparse } { redefine-environment }
{
Redefining~document~environment~'#1'~
with~arg.~spec.~'#2'~\msg_line_context:.
@@ -1500,65 +1532,64 @@
\cs_new_eq:NN \BooleanFalse \c_false_bool
\cs_new_eq:NN \BooleanTrue \c_true_bool
\cs_new_protected:Npn \DeclareDocumentCommand #1#2#3
- { \xparse_declare_cmd:Nnn #1 {#2} {#3} }
+ { \__xparse_declare_cmd:Nnn #1 {#2} {#3} }
\cs_new_protected:Npn \NewDocumentCommand #1#2#3
{
\cs_if_exist:NTF #1
{
- \msg_kernel_error:nnx { xparse } { command-already-defined }
+ \__msg_kernel_error:nnx { xparse } { command-already-defined }
{ \token_to_str:N #1 }
}
- { \xparse_declare_cmd:Nnn #1 {#2} {#3} }
+ { \__xparse_declare_cmd:Nnn #1 {#2} {#3} }
}
\cs_new_protected:Npn \RenewDocumentCommand #1#2#3
{
\cs_if_exist:NTF #1
- { \xparse_declare_cmd:Nnn #1 {#2} {#3} }
+ { \__xparse_declare_cmd:Nnn #1 {#2} {#3} }
{
- \msg_kernel_error:nnx { xparse } { command-not-yet-defined }
+ \__msg_kernel_error:nnx { xparse } { command-not-yet-defined }
{ \token_to_str:N #1 }
}
}
\cs_new_protected:Npn \ProvideDocumentCommand #1#2#3
- { \cs_if_exist:NF #1 { \xparse_declare_cmd:Nnn #1 {#2} {#3} } }
+ { \cs_if_exist:NF #1 { \__xparse_declare_cmd:Nnn #1 {#2} {#3} } }
\cs_new_protected:Npn \DeclareDocumentEnvironment #1#2#3#4
- { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
+ { \__xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
\cs_new_protected:Npn \NewDocumentEnvironment #1#2#3#4
{
\cs_if_exist:cTF {#1}
- { \msg_kernel_error:nnx { xparse } { environment-already-defined } {#1} }
- { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
+ { \__msg_kernel_error:nnx { xparse } { environment-already-defined } {#1} }
+ { \__xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
}
\cs_new_protected:Npn \RenewDocumentEnvironment #1#2#3#4
{
\cs_if_exist:cTF {#1}
- { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
- { \msg_kernel_error:nnx { xparse } { environment-not-yet-defined } {#1} }
+ { \__xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
+ { \__msg_kernel_error:nnx { xparse } { environment-not-yet-defined } {#1} }
}
\cs_new_protected:Npn \ProvideDocumentEnvironment #1#2#3#4
- { \cs_if_exist:cF { #1 } { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} } }
+ { \cs_if_exist:cF { #1 } { \__xparse_declare_env:nnnn {#1} {#2} {#3} {#4} } }
\cs_new_protected:Npn \DeclareExpandableDocumentCommand #1#2#3
- { \xparse_declare_expandable_cmd:Nnn #1 {#2} {#3} }
+ { \__xparse_declare_expandable_cmd:Nnn #1 {#2} {#3} }
\cs_new_eq:NN \IfBooleanTF \bool_if:NTF
\cs_new_eq:NN \IfBooleanT \bool_if:NT
\cs_new_eq:NN \IfBooleanF \bool_if:NF
-\cs_new_eq:NN \IfNoValueF \xparse_if_no_value:nF
-\cs_new_eq:NN \IfNoValueT \xparse_if_no_value:nT
-\cs_new_eq:NN \IfNoValueTF \xparse_if_no_value:nTF
-\cs_set:Npn \IfValueF { \xparse_if_no_value:nT }
-\cs_set:Npn \IfValueT { \xparse_if_no_value:nF }
-\cs_set:Npn \IfValueTF #1#2#3 { \xparse_if_no_value:nTF {#1} {#3} {#2} }
-\cs_new_protected:Npn \NoValue { -NoValue- }
+\cs_new_eq:NN \IfNoValueF \__xparse_if_no_value:nF
+\cs_new_eq:NN \IfNoValueT \__xparse_if_no_value:nT
+\cs_new_eq:NN \IfNoValueTF \__xparse_if_no_value:nTF
+\cs_set:Npn \IfValueF { \__xparse_if_no_value:nT }
+\cs_set:Npn \IfValueT { \__xparse_if_no_value:nF }
+\cs_set:Npn \IfValueTF #1#2#3 { \__xparse_if_no_value:nTF {#1} {#3} {#2} }
\tl_new:N \ProcessedArgument
-\cs_new_eq:NN \ReverseBoolean \xparse_bool_reverse:N
-\cs_new_eq:NN \SplitArgument \xparse_split_argument:nnn
-\cs_new_eq:NN \SplitList \xparse_split_list:nn
-\cs_new_eq:NN \TrimSpaces \xparse_trim_spaces:n
+\cs_new_eq:NN \ReverseBoolean \__xparse_bool_reverse:N
+\cs_new_eq:NN \SplitArgument \__xparse_split_argument:nnn
+\cs_new_eq:NN \SplitList \__xparse_split_list:nn
+\cs_new_eq:NN \TrimSpaces \__xparse_trim_spaces:n
\cs_new_eq:NN \ProcessList \tl_map_function:nN
-\cs_new_eq:NN \GetDocumentCommandArgSpec \xparse_get_arg_spec:N
-\cs_new_eq:NN \GetDocumentEnvironmmentArgSpec \xparse_get_arg_spec:n
-\cs_new_eq:NN \ShowDocumentCommandArgSpec \xparse_show_arg_spec:N
-\cs_new_eq:NN \ShowDocumentEnvironmentArgSpec \xparse_show_arg_spec:n
+\cs_new_eq:NN \GetDocumentCommandArgSpec \__xparse_get_arg_spec:N
+\cs_new_eq:NN \GetDocumentEnvironmmentArgSpec \__xparse_get_arg_spec:n
+\cs_new_eq:NN \ShowDocumentCommandArgSpec \__xparse_show_arg_spec:N
+\cs_new_eq:NN \ShowDocumentEnvironmentArgSpec \__xparse_show_arg_spec:n
\DeclareOption { log-declarations = true } { }
\DeclareOption { log-declarations = false }
{
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index be5aca383b4..bda0b918cce 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -50,191 +50,191 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2012/04/23]
-\@ifpackagelater{expl3}{2012/04/23}
+\RequirePackage{expl3}[2012/07/16]
+\@ifpackagelater{expl3}{2012/07/16}
{}
- {
+ {%
\PackageError{xtemplate}{Support package l3kernel too old.}
- {
+ {%
Please install an up to date version of l3kernel
using your TeX package manager or from CTAN.\\ \\
- Loading xtemplate will abort!
- }
+ Loading xtemplate will abort!%
+ }%
\endinput
}
-\GetIdInfo$Id: xtemplate.dtx 3570 2012-04-23 13:24:55Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 3990 2012-07-16 07:46:03Z joseph $
{L3 Experimental prototype document functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\tl_const:Nn \c_xtemplate_code_root_tl { template~code~>~ }
-\tl_const:Nn \c_xtemplate_defaults_root_tl { template~defaults~>~ }
-\tl_const:Nn \c_xtemplate_instances_root_tl { template~instance~>~ }
-\tl_const:Nn \c_xtemplate_keytypes_root_tl { template~key~types~>~ }
-\tl_const:Nn \c_xtemplate_key_order_root_tl { template~key~order~>~ }
-\tl_const:Nn \c_xtemplate_restrict_root_tl { template~restrictions~>~ }
-\tl_const:Nn \c_xtemplate_values_root_tl { template~values~>~ }
-\tl_const:Nn \c_xtemplate_vars_root_tl { template~vars~>~ }
-\seq_new:N \c_xtemplate_keytypes_arg_seq
-\seq_put_right:Nn \c_xtemplate_keytypes_arg_seq { choice }
-\seq_put_right:Nn \c_xtemplate_keytypes_arg_seq { function }
-\seq_put_right:Nn \c_xtemplate_keytypes_arg_seq { instance }
-\prop_new:N \g_xtemplate_object_type_prop
-\tl_new:N \l_xtemplate_assignments_tl
-\tl_new:N \l_xtemplate_collection_tl
-\prop_new:N \l_xtemplate_collections_prop
-\tl_new:N \l_xtemplate_default_tl
-\bool_new:N \l_xtemplate_error_bool
-\bool_new:N \l_xtemplate_global_bool
-\bool_new:N \l_xtemplate_restrict_bool
-\clist_new:N \l_xtemplate_restrict_clist
-\tl_new:N \l_xtemplate_key_name_tl
-\tl_new:N \l_xtemplate_keytype_tl
-\tl_new:N \l_xtemplate_keytype_arg_tl
-\tl_new:N \l_xtemplate_value_tl
-\tl_new:N \l_xtemplate_var_tl
-\prop_new:N \l_xtemplate_keytypes_prop
-\seq_new:N \l_xtemplate_key_order_seq
-\prop_new:N \l_xtemplate_values_prop
-\prop_new:N \l_xtemplate_vars_prop
-\clist_new:N \l_xtemplate_tmp_clist
-\dim_new:N \l_xtemplate_tmp_dim
-\int_new:N \l_xtemplate_tmp_int
-\muskip_new:N \l_xtemplate_tmp_muskip
-\skip_new:N \l_xtemplate_tmp_skip
-\tl_new:N \l_xtemplate_tmp_tl
+\tl_const:Nn \c__xtemplate_code_root_tl { template~code~>~ }
+\tl_const:Nn \c__xtemplate_defaults_root_tl { template~defaults~>~ }
+\tl_const:Nn \c__xtemplate_instances_root_tl { template~instance~>~ }
+\tl_const:Nn \c__xtemplate_keytypes_root_tl { template~key~types~>~ }
+\tl_const:Nn \c__xtemplate_key_order_root_tl { template~key~order~>~ }
+\tl_const:Nn \c__xtemplate_restrict_root_tl { template~restrictions~>~ }
+\tl_const:Nn \c__xtemplate_values_root_tl { template~values~>~ }
+\tl_const:Nn \c__xtemplate_vars_root_tl { template~vars~>~ }
+\seq_new:N \c__xtemplate_keytypes_arg_seq
+\seq_put_right:Nn \c__xtemplate_keytypes_arg_seq { choice }
+\seq_put_right:Nn \c__xtemplate_keytypes_arg_seq { function }
+\seq_put_right:Nn \c__xtemplate_keytypes_arg_seq { instance }
+\prop_new:N \g__xtemplate_object_type_prop
+\tl_new:N \l__xtemplate_assignments_tl
+\tl_new:N \l__xtemplate_collection_tl
+\prop_new:N \l__xtemplate_collections_prop
+\tl_new:N \l__xtemplate_default_tl
+\bool_new:N \l__xtemplate_error_bool
+\bool_new:N \l__xtemplate_global_bool
+\bool_new:N \l__xtemplate_restrict_bool
+\clist_new:N \l__xtemplate_restrict_clist
+\tl_new:N \l__xtemplate_key_name_tl
+\tl_new:N \l__xtemplate_keytype_tl
+\tl_new:N \l__xtemplate_keytype_arg_tl
+\tl_new:N \l__xtemplate_value_tl
+\tl_new:N \l__xtemplate_var_tl
+\prop_new:N \l__xtemplate_keytypes_prop
+\seq_new:N \l__xtemplate_key_order_seq
+\prop_new:N \l__xtemplate_values_prop
+\prop_new:N \l__xtemplate_vars_prop
+\clist_new:N \l__xtemplate_tmp_clist
+\dim_new:N \l__xtemplate_tmp_dim
+\int_new:N \l__xtemplate_tmp_int
+\muskip_new:N \l__xtemplate_tmp_muskip
+\skip_new:N \l__xtemplate_tmp_skip
+\tl_new:N \l__xtemplate_tmp_tl
\cs_generate_variant:Nn \prop_get:NnNTF { No }
\cs_generate_variant:Nn \prop_get:NnNT { No }
\cs_generate_variant:Nn \prop_get:NnNF { No }
-\cs_new_protected:Npn \xtemplate_execute_if_arg_agree:nnT #1#2#3
+\cs_new_protected:Npn \__xtemplate_execute_if_arg_agree:nnT #1#2#3
{
- \prop_get:NnN \g_xtemplate_object_type_prop {#1} \l_xtemplate_tmp_tl
- \int_compare:nNnTF {#2} = \l_xtemplate_tmp_tl
+ \prop_get:NnN \g__xtemplate_object_type_prop {#1} \l__xtemplate_tmp_tl
+ \int_compare:nNnTF {#2} = \l__xtemplate_tmp_tl
{#3}
{
\msg_error:nnxxx { xtemplate }
- { argument-number-mismatch } {#1} { \l_xtemplate_tmp_tl } {#2}
+ { argument-number-mismatch } {#1} { \l__xtemplate_tmp_tl } {#2}
}
}
-\cs_new_protected:Npn \xtemplate_execute_if_code_exist:nnT #1#2#3
+\cs_new_protected:Npn \__xtemplate_execute_if_code_exist:nnT #1#2#3
{
- \cs_if_exist:cTF { \c_xtemplate_code_root_tl #1 / #2 }
+ \cs_if_exist:cTF { \c__xtemplate_code_root_tl #1 / #2 }
{#3}
{
\msg_error:nnxx { xtemplate } { no-template-code }
{#1} {#2}
}
}
-\cs_new_protected:Npn \xtemplate_execute_if_keytype_exist:nT #1#2
+\cs_new_protected:Npn \__xtemplate_execute_if_keytype_exist:nT #1#2
{
- \cs_if_exist:cTF { xtemplate_store_value_ #1 :n }
+ \cs_if_exist:cTF { __xtemplate_store_value_ #1 :n }
{#2}
{ \msg_error:nnx { xtemplate } { unknown-keytype } {#1} }
}
-\cs_generate_variant:Nn \xtemplate_execute_if_keytype_exist:nT { o }
-\cs_new_protected:Npn \xtemplate_execute_if_type_exist:nT #1#2
+\cs_generate_variant:Nn \__xtemplate_execute_if_keytype_exist:nT { o }
+\cs_new_protected:Npn \__xtemplate_execute_if_type_exist:nT #1#2
{
- \prop_if_in:NnTF \g_xtemplate_object_type_prop {#1}
+ \prop_if_in:NnTF \g__xtemplate_object_type_prop {#1}
{#2}
{ \msg_error:nnx { xtemplate } { unknown-object-type } {#1} }
}
-\cs_new_protected:Npn \xtemplate_if_keys_exist:nnT #1#2#3
+\cs_new_protected:Npn \__xtemplate_if_keys_exist:nnT #1#2#3
{
- \cs_if_exist:cTF { \c_xtemplate_keytypes_root_tl #1 / #2 }
+ \cs_if_exist:cTF { \c__xtemplate_keytypes_root_tl #1 / #2 }
{#3}
{
\msg_error:nnxx { xtemplate } { unknown-template }
{#1} {#2}
}
}
-\prg_new_conditional:Npnn \xtemplate_if_key_value:n #1 { T }
+\prg_new_conditional:Npnn \__xtemplate_if_key_value:n #1 { T }
{
\str_if_eq:noTF { \KeyValue } { \tl_head:w #1 \q_nil \q_stop }
{\prg_return_true: }
{ \prg_return_false: }
}
-\cs_generate_variant:Nn \xtemplate_if_key_value:nT { o }
-\prg_new_conditional:Npnn \xtemplate_if_eval_now:n #1 { TF }
+\cs_generate_variant:Nn \__xtemplate_if_key_value:nT { o }
+\prg_new_conditional:Npnn \__xtemplate_if_eval_now:n #1 { TF }
{
\str_if_eq:noTF { \EvaluateNow } { \tl_head:w #1 \q_nil \q_stop }
{ \prg_return_true: }
{ \prg_return_false: }
}
-\prg_new_conditional:Npnn \xtemplate_if_instance_exist:nnn #1#2#3
+\prg_new_conditional:Npnn \__xtemplate_if_instance_exist:nnn #1#2#3
{ T, F, TF }
{
- \cs_if_exist:cTF { \c_xtemplate_instances_root_tl #1 / #2 / #3 }
+ \cs_if_exist:cTF { \c__xtemplate_instances_root_tl #1 / #2 / #3 }
{ \prg_return_true: }
{ \prg_return_false: }
}
-\prg_new_conditional:Npnn \xtemplate_if_use_template:n #1 { TF }
+\prg_new_conditional:Npnn \__xtemplate_if_use_template:n #1 { TF }
{
\str_if_eq:noTF { \UseTemplate } { \tl_head:w #1 \q_nil \q_stop }
{ \prg_return_true: }
{ \prg_return_false: }
}
-\cs_new_protected:Npn \xtemplate_store_defaults:n #1
+\cs_new_protected:Npn \__xtemplate_store_defaults:n #1
{
- \prop_gclear_new:c { \c_xtemplate_defaults_root_tl #1 }
- \prop_gset_eq:cN { \c_xtemplate_defaults_root_tl #1 }
- \l_xtemplate_values_prop
+ \prop_gclear_new:c { \c__xtemplate_defaults_root_tl #1 }
+ \prop_gset_eq:cN { \c__xtemplate_defaults_root_tl #1 }
+ \l__xtemplate_values_prop
}
-\cs_new_protected:Npn \xtemplate_store_keytypes:n #1
+\cs_new_protected:Npn \__xtemplate_store_keytypes:n #1
{
- \prop_gclear_new:c { \c_xtemplate_keytypes_root_tl #1 }
- \prop_gset_eq:cN { \c_xtemplate_keytypes_root_tl #1 }
- \l_xtemplate_keytypes_prop
- \seq_gclear_new:c { \c_xtemplate_key_order_root_tl #1 }
- \seq_gset_eq:cN { \c_xtemplate_key_order_root_tl #1 }
- \l_xtemplate_key_order_seq
+ \prop_gclear_new:c { \c__xtemplate_keytypes_root_tl #1 }
+ \prop_gset_eq:cN { \c__xtemplate_keytypes_root_tl #1 }
+ \l__xtemplate_keytypes_prop
+ \seq_gclear_new:c { \c__xtemplate_key_order_root_tl #1 }
+ \seq_gset_eq:cN { \c__xtemplate_key_order_root_tl #1 }
+ \l__xtemplate_key_order_seq
}
-\cs_new_protected:Npn \xtemplate_store_values:n #1
+\cs_new_protected:Npn \__xtemplate_store_values:n #1
{
- \prop_clear_new:c { \c_xtemplate_values_root_tl #1 }
- \prop_set_eq:cN { \c_xtemplate_values_root_tl #1 }
- \l_xtemplate_values_prop
+ \prop_clear_new:c { \c__xtemplate_values_root_tl #1 }
+ \prop_set_eq:cN { \c__xtemplate_values_root_tl #1 }
+ \l__xtemplate_values_prop
}
-\cs_new_protected:Npn \xtemplate_store_restrictions:n #1
+\cs_new_protected:Npn \__xtemplate_store_restrictions:n #1
{
- \clist_gclear_new:c { \c_xtemplate_restrict_root_tl #1 }
- \clist_gset_eq:cN { \c_xtemplate_restrict_root_tl #1 }
- \l_xtemplate_restrict_clist
+ \clist_gclear_new:c { \c__xtemplate_restrict_root_tl #1 }
+ \clist_gset_eq:cN { \c__xtemplate_restrict_root_tl #1 }
+ \l__xtemplate_restrict_clist
}
-\cs_new_protected:Npn \xtemplate_store_vars:n #1
+\cs_new_protected:Npn \__xtemplate_store_vars:n #1
{
- \prop_gclear_new:c { \c_xtemplate_vars_root_tl #1 }
- \prop_gset_eq:cN { \c_xtemplate_vars_root_tl #1 }
- \l_xtemplate_vars_prop
+ \prop_gclear_new:c { \c__xtemplate_vars_root_tl #1 }
+ \prop_gset_eq:cN { \c__xtemplate_vars_root_tl #1 }
+ \l__xtemplate_vars_prop
}
-\cs_new_protected:Npn \xtemplate_recover_defaults:n #1
+\cs_new_protected:Npn \__xtemplate_recover_defaults:n #1
{
- \prop_set_eq:Nc \l_xtemplate_values_prop
- { \c_xtemplate_defaults_root_tl #1 }
+ \prop_set_eq:Nc \l__xtemplate_values_prop
+ { \c__xtemplate_defaults_root_tl #1 }
}
-\cs_new_protected:Npn \xtemplate_recover_keytypes:n #1
+\cs_new_protected:Npn \__xtemplate_recover_keytypes:n #1
{
- \prop_set_eq:Nc \l_xtemplate_keytypes_prop
- { \c_xtemplate_keytypes_root_tl #1 }
- \seq_set_eq:Nc \l_xtemplate_key_order_seq
- { \c_xtemplate_key_order_root_tl #1 }
+ \prop_set_eq:Nc \l__xtemplate_keytypes_prop
+ { \c__xtemplate_keytypes_root_tl #1 }
+ \seq_set_eq:Nc \l__xtemplate_key_order_seq
+ { \c__xtemplate_key_order_root_tl #1 }
}
-\cs_new_protected:Npn \xtemplate_recover_restrictions:n #1
+\cs_new_protected:Npn \__xtemplate_recover_restrictions:n #1
{
- \clist_set_eq:Nc \l_xtemplate_restrict_clist
- { \c_xtemplate_restrict_root_tl #1 }
+ \clist_set_eq:Nc \l__xtemplate_restrict_clist
+ { \c__xtemplate_restrict_root_tl #1 }
}
-\cs_new_protected:Npn \xtemplate_recover_values:n #1
+\cs_new_protected:Npn \__xtemplate_recover_values:n #1
{
- \prop_set_eq:Nc \l_xtemplate_values_prop
- { \c_xtemplate_values_root_tl #1 }
+ \prop_set_eq:Nc \l__xtemplate_values_prop
+ { \c__xtemplate_values_root_tl #1 }
}
-\cs_new_protected:Npn \xtemplate_recover_vars:n #1
+\cs_new_protected:Npn \__xtemplate_recover_vars:n #1
{
- \prop_set_eq:Nc \l_xtemplate_vars_prop
- { \c_xtemplate_vars_root_tl #1 }
+ \prop_set_eq:Nc \l__xtemplate_vars_prop
+ { \c__xtemplate_vars_root_tl #1 }
}
-\cs_new_protected:Npn \xtemplate_declare_object_type:nn #1#2
+\cs_new_protected:Npn \__xtemplate_declare_object_type:nn #1#2
{
- \int_set:Nn \l_xtemplate_tmp_int {#2}
+ \int_set:Nn \l__xtemplate_tmp_int {#2}
\bool_if:nTF
{
\int_compare_p:nNn {#2} > \c_nine ||
@@ -242,88 +242,88 @@
}
{
\msg_error:nnxx { xtemplate } { bad-number-of-arguments }
- {#1} { \exp_not:V \l_xtemplate_tmp_int }
+ {#1} { \exp_not:V \l__xtemplate_tmp_int }
}
{
\msg_info:nnxx { xtemplate } { declare-object-type }
{#1} {#2}
- \prop_gput:NnV \g_xtemplate_object_type_prop {#1}
- \l_xtemplate_tmp_int
+ \prop_gput:NnV \g__xtemplate_object_type_prop {#1}
+ \l__xtemplate_tmp_int
}
}
-\cs_new_protected:Npn \xtemplate_declare_template_keys:nnnn #1#2#3#4
+\cs_new_protected:Npn \__xtemplate_declare_template_keys:nnnn #1#2#3#4
{
- \xtemplate_execute_if_type_exist:nT {#1}
+ \__xtemplate_execute_if_type_exist:nT {#1}
{
- \xtemplate_execute_if_arg_agree:nnT {#1} {#3}
+ \__xtemplate_execute_if_arg_agree:nnT {#1} {#3}
{
- \prop_clear:N \l_xtemplate_values_prop
- \prop_clear:N \l_xtemplate_keytypes_prop
- \seq_clear:N \l_xtemplate_key_order_seq
+ \prop_clear:N \l__xtemplate_values_prop
+ \prop_clear:N \l__xtemplate_keytypes_prop
+ \seq_clear:N \l__xtemplate_key_order_seq
\keyval_parse:NNn
- \xtemplate_parse_keys_elt:n \xtemplate_parse_keys_elt:nn {#4}
- \xtemplate_store_defaults:n { #1 / #2 }
- \xtemplate_store_keytypes:n { #1 / #2 }
+ \__xtemplate_parse_keys_elt:n \__xtemplate_parse_keys_elt:nn {#4}
+ \__xtemplate_store_defaults:n { #1 / #2 }
+ \__xtemplate_store_keytypes:n { #1 / #2 }
}
}
}
-\cs_new_protected:Npn \xtemplate_parse_keys_elt:n #1
+\cs_new_protected:Npn \__xtemplate_parse_keys_elt:n #1
{
- \xtemplate_split_keytype:n {#1}
- \bool_if:NF \l_xtemplate_error_bool
+ \__xtemplate_split_keytype:n {#1}
+ \bool_if:NF \l__xtemplate_error_bool
{
- \xtemplate_execute_if_keytype_exist:oT \l_xtemplate_keytype_tl
+ \__xtemplate_execute_if_keytype_exist:oT \l__xtemplate_keytype_tl
{
- \seq_map_function:NN \c_xtemplate_keytypes_arg_seq
- \xtemplate_parse_keys_elt_aux:n
- \bool_if:NF \l_xtemplate_error_bool
+ \seq_map_function:NN \c__xtemplate_keytypes_arg_seq
+ \__xtemplate_parse_keys_elt_aux:n
+ \bool_if:NF \l__xtemplate_error_bool
{
- \seq_if_in:NoTF \l_xtemplate_key_order_seq
- \l_xtemplate_key_name_tl
+ \seq_if_in:NoTF \l__xtemplate_key_order_seq
+ \l__xtemplate_key_name_tl
{
\msg_error:nnx { xtemplate }
{ duplicate-key-interface }
- { \l_xtemplate_key_name_tl }
+ { \l__xtemplate_key_name_tl }
}
- { \xtemplate_parse_keys_elt_aux: }
+ { \__xtemplate_parse_keys_elt_aux: }
}
}
}
}
-\cs_new_protected_nopar:Npn \xtemplate_parse_keys_elt_aux:n #1
+\cs_new_protected_nopar:Npn \__xtemplate_parse_keys_elt_aux:n #1
{
- \str_if_eq:onT \l_xtemplate_keytype_tl {#1}
+ \str_if_eq:onT \l__xtemplate_keytype_tl {#1}
{
- \tl_if_empty:NT \l_xtemplate_keytype_arg_tl
+ \tl_if_empty:NT \l__xtemplate_keytype_arg_tl
{
\msg_error:nnx { xtemplate }
{ keytype-requires-argument } {#1}
- \bool_set_true:N \l_xtemplate_error_bool
+ \bool_set_true:N \l__xtemplate_error_bool
\seq_map_break:
}
}
}
-\cs_new_nopar:Npn \xtemplate_parse_keys_elt_aux:
+\cs_new_nopar:Npn \__xtemplate_parse_keys_elt_aux:
{
- \tl_set:Nx \l_xtemplate_tmp_tl
+ \tl_set:Nx \l__xtemplate_tmp_tl
{
- \l_xtemplate_keytype_tl
- \tl_if_empty:NF \l_xtemplate_keytype_arg_tl
- { { \l_xtemplate_keytype_arg_tl } }
+ \l__xtemplate_keytype_tl
+ \tl_if_empty:NF \l__xtemplate_keytype_arg_tl
+ { { \l__xtemplate_keytype_arg_tl } }
}
- \prop_put:Noo \l_xtemplate_keytypes_prop \l_xtemplate_key_name_tl
- \l_xtemplate_tmp_tl
- \seq_put_right:No \l_xtemplate_key_order_seq \l_xtemplate_key_name_tl
- \str_if_eq:onT \l_xtemplate_keytype_tl { choice }
+ \prop_put:Noo \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+ \l__xtemplate_tmp_tl
+ \seq_put_right:No \l__xtemplate_key_order_seq \l__xtemplate_key_name_tl
+ \str_if_eq:onT \l__xtemplate_keytype_tl { choice }
{
- \clist_if_in:NnT \l_xtemplate_keytype_arg_tl { unknown }
+ \clist_if_in:NnT \l__xtemplate_keytype_arg_tl { unknown }
{ \msg_error:nn { xtemplate } { choice-unknown-reserved } }
}
}
-\cs_new_protected:Npn \xtemplate_parse_keys_elt:nn #1#2
+\cs_new_protected:Npn \__xtemplate_parse_keys_elt:nn #1#2
{
- \xtemplate_parse_keys_elt:n {#1}
- \use:c { xtemplate_store_value_ \l_xtemplate_keytype_tl :n } {#2}
+ \__xtemplate_parse_keys_elt:n {#1}
+ \use:c { __xtemplate_store_value_ \l__xtemplate_keytype_tl :n } {#2}
}
\group_begin:
\char_set_lccode:nn { `\@ } { `\: }
@@ -331,209 +331,209 @@
\tl_to_lowercase:n
{
\group_end:
- \cs_new_protected:Npn \xtemplate_split_keytype:n #1
+ \cs_new_protected:Npn \__xtemplate_split_keytype:n #1
{
- \bool_set_false:N \l_xtemplate_error_bool
- \tl_set:Nn \l_xtemplate_tmp_tl {#1}
- \tl_remove_all:Nn \l_xtemplate_tmp_tl { ~ }
- \tl_replace_all:Nnn \l_xtemplate_tmp_tl { : } { @ }
- \tl_if_in:onTF \l_xtemplate_tmp_tl { @ }
+ \bool_set_false:N \l__xtemplate_error_bool
+ \tl_set:Nn \l__xtemplate_tmp_tl {#1}
+ \tl_remove_all:Nn \l__xtemplate_tmp_tl { ~ }
+ \tl_replace_all:Nnn \l__xtemplate_tmp_tl { : } { @ }
+ \tl_if_in:onTF \l__xtemplate_tmp_tl { @ }
{
- \tl_clear:N \l_xtemplate_key_name_tl
- \exp_after:wN \xtemplate_split_keytype_aux:w
- \l_xtemplate_tmp_tl \q_stop
+ \tl_clear:N \l__xtemplate_key_name_tl
+ \exp_after:wN \__xtemplate_split_keytype_aux:w
+ \l__xtemplate_tmp_tl \q_stop
}
{
- \bool_set_true:N \l_xtemplate_error_bool
+ \bool_set_true:N \l__xtemplate_error_bool
\msg_error:nnx { xtemplate } { missing-keytype } {#1}
}
}
- \cs_new_protected:Npn \xtemplate_split_keytype_aux:w #1 @ #2 \q_stop
+ \cs_new_protected:Npn \__xtemplate_split_keytype_aux:w #1 @ #2 \q_stop
{
- \tl_put_right:Nx \l_xtemplate_key_name_tl { \tl_to_str:n {#1} }
+ \tl_put_right:Nx \l__xtemplate_key_name_tl { \tl_to_str:n {#1} }
\tl_if_in:nnTF {#2} { @ }
{
- \tl_put_right:Nn \l_xtemplate_key_name_tl { @ }
- \xtemplate_split_keytype_aux:w #2 \q_stop
+ \tl_put_right:Nn \l__xtemplate_key_name_tl { @ }
+ \__xtemplate_split_keytype_aux:w #2 \q_stop
}
{
- \tl_if_empty:NTF \l_xtemplate_key_name_tl
+ \tl_if_empty:NTF \l__xtemplate_key_name_tl
{ \msg_error:nnx { xtemplate } { empty-key-name } { @ #2 } }
- { \xtemplate_split_keytype_arg:n {#2} }
+ { \__xtemplate_split_keytype_arg:n {#2} }
}
}
}
-\cs_new_protected:Npn \xtemplate_split_keytype_arg:n #1
+\cs_new_protected:Npn \__xtemplate_split_keytype_arg:n #1
{
- \tl_set:Nn \l_xtemplate_keytype_tl {#1}
- \tl_clear:N \l_xtemplate_keytype_arg_tl
- \cs_set_protected_nopar:Npn \xtemplate_split_keytype_arg_aux:n ##1
+ \tl_set:Nn \l__xtemplate_keytype_tl {#1}
+ \tl_clear:N \l__xtemplate_keytype_arg_tl
+ \cs_set_protected_nopar:Npn \__xtemplate_split_keytype_arg_aux:n ##1
{
\tl_if_in:nnT {#1} {##1}
{
- \cs_set:Npn \xtemplate_split_keytype_arg_aux:w
+ \cs_set:Npn \__xtemplate_split_keytype_arg_aux:w
####1 ##1 ####2 \q_stop
{
\tl_if_empty:nT {####1}
{
- \tl_set:Nn \l_xtemplate_keytype_tl {##1}
- \tl_set:Nn \l_xtemplate_keytype_arg_tl {####2}
+ \tl_set:Nn \l__xtemplate_keytype_tl {##1}
+ \tl_set:Nn \l__xtemplate_keytype_arg_tl {####2}
\seq_map_break:
}
}
- \xtemplate_split_keytype_arg_aux:w #1 \q_stop
+ \__xtemplate_split_keytype_arg_aux:w #1 \q_stop
}
}
- \seq_map_function:NN \c_xtemplate_keytypes_arg_seq
- \xtemplate_split_keytype_arg_aux:n
+ \seq_map_function:NN \c__xtemplate_keytypes_arg_seq
+ \__xtemplate_split_keytype_arg_aux:n
}
-\cs_generate_variant:Nn \xtemplate_split_keytype_arg:n { o }
-\cs_new_nopar:Npn \xtemplate_split_keytype_arg_aux:n #1 { }
-\cs_new_nopar:Npn \xtemplate_split_keytype_arg_aux:w #1 \q_stop { }
-\cs_new_protected:Npn \xtemplate_store_value_boolean:n #1
+\cs_generate_variant:Nn \__xtemplate_split_keytype_arg:n { o }
+\cs_new_nopar:Npn \__xtemplate_split_keytype_arg_aux:n #1 { }
+\cs_new_nopar:Npn \__xtemplate_split_keytype_arg_aux:w #1 \q_stop { }
+\cs_new_protected:Npn \__xtemplate_store_value_boolean:n #1
{
- \xtemplate_if_eval_now:nTF {#1}
+ \__xtemplate_if_eval_now:nTF {#1}
{
\bool_if:cTF { c_ #1 _bool }
{
- \prop_put:Non \l_xtemplate_values_prop \l_xtemplate_key_name_tl
+ \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl
{ true }
}
{
- \prop_put:Non \l_xtemplate_values_prop \l_xtemplate_key_name_tl
+ \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl
{ false }
}
}
{
- \prop_put:Non \l_xtemplate_values_prop \l_xtemplate_key_name_tl {#1}
+ \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#1}
}
}
-\cs_new_protected:Npn \xtemplate_store_value_code:n #1
- { \prop_put:Non \l_xtemplate_values_prop \l_xtemplate_key_name_tl {#1} }
-\cs_new_eq:NN \xtemplate_store_value_choice:n \xtemplate_store_value_code:n
-\cs_new_eq:NN \xtemplate_store_value_commalist:n \xtemplate_store_value_code:n
-\cs_new_eq:NN \xtemplate_store_value_function:n \xtemplate_store_value_code:n
-\cs_new_eq:NN \xtemplate_store_value_instance:n \xtemplate_store_value_code:n
-\cs_new_eq:NN \xtemplate_store_value_real:n \xtemplate_store_value_code:n
-\cs_new_eq:NN \xtemplate_store_value_tokenlist:n \xtemplate_store_value_code:n
-\cs_new_protected:Npn \xtemplate_store_value_integer:n #1
- {
- \xtemplate_if_eval_now:nTF {#1}
+\cs_new_protected:Npn \__xtemplate_store_value_code:n #1
+ { \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#1} }
+\cs_new_eq:NN \__xtemplate_store_value_choice:n \__xtemplate_store_value_code:n
+\cs_new_eq:NN \__xtemplate_store_value_commalist:n \__xtemplate_store_value_code:n
+\cs_new_eq:NN \__xtemplate_store_value_function:n \__xtemplate_store_value_code:n
+\cs_new_eq:NN \__xtemplate_store_value_instance:n \__xtemplate_store_value_code:n
+\cs_new_eq:NN \__xtemplate_store_value_real:n \__xtemplate_store_value_code:n
+\cs_new_eq:NN \__xtemplate_store_value_tokenlist:n \__xtemplate_store_value_code:n
+\cs_new_protected:Npn \__xtemplate_store_value_integer:n #1
+ {
+ \__xtemplate_if_eval_now:nTF {#1}
{
- \int_set:Nn \l_xtemplate_tmp_int {#1}
- \prop_put:NVV \l_xtemplate_values_prop \l_xtemplate_key_name_int
- \l_xtemplate_tmp_int
+ \int_set:Nn \l__xtemplate_tmp_int {#1}
+ \prop_put:NVV \l__xtemplate_values_prop \l__xtemplate_key_name_int
+ \l__xtemplate_tmp_int
}
{
- \prop_put:Non \l_xtemplate_values_prop \l_xtemplate_key_name_tl {#1}
+ \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#1}
}
}
-\cs_new_protected:Npn \xtemplate_store_value_length:n #1
+\cs_new_protected:Npn \__xtemplate_store_value_length:n #1
{
- \xtemplate_if_eval_now:nTF {#1}
+ \__xtemplate_if_eval_now:nTF {#1}
{
- \dim_set:Nn \l_xtemplate_tmp_dim {#1}
- \prop_put:NVV \l_xtemplate_values_prop \l_xtemplate_key_name_tl
- \l_xtemplate_tmp_dim
+ \dim_set:Nn \l__xtemplate_tmp_dim {#1}
+ \prop_put:NVV \l__xtemplate_values_prop \l__xtemplate_key_name_tl
+ \l__xtemplate_tmp_dim
}
{
- \prop_put:Non \l_xtemplate_values_prop \l_xtemplate_key_name_tl {#1}
+ \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#1}
}
}
-\cs_new_protected:Npn \xtemplate_store_value_muskip:n #1
+\cs_new_protected:Npn \__xtemplate_store_value_muskip:n #1
{
- \xtemplate_if_eval_now:nTF {#1}
+ \__xtemplate_if_eval_now:nTF {#1}
{
- \muskip_set:Nn \l_xtemplate_tmp_muskip {#1}
- \prop_put:NVV \l_xtemplate_values_prop \l_xtemplate_key_name_tl
- \l_xtemplate_tmp_muskip
+ \muskip_set:Nn \l__xtemplate_tmp_muskip {#1}
+ \prop_put:NVV \l__xtemplate_values_prop \l__xtemplate_key_name_tl
+ \l__xtemplate_tmp_muskip
}
{
- \prop_put:Non \l_xtemplate_values_prop \l_xtemplate_key_name_tl {#1}
+ \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#1}
}
}
-\cs_new_protected:Npn \xtemplate_store_value_skip:n #1
+\cs_new_protected:Npn \__xtemplate_store_value_skip:n #1
{
- \xtemplate_if_eval_now:nTF {#1}
+ \__xtemplate_if_eval_now:nTF {#1}
{
- \skip_set:Nn \l_xtemplate_tmp_skip {#1}
- \prop_put:NVV \l_xtemplate_values_prop \l_xtemplate_key_name_tl
- \l_xtemplate_tmp_skip
+ \skip_set:Nn \l__xtemplate_tmp_skip {#1}
+ \prop_put:NVV \l__xtemplate_values_prop \l__xtemplate_key_name_tl
+ \l__xtemplate_tmp_skip
}
{
- \prop_put:Non \l_xtemplate_values_prop \l_xtemplate_key_name_tl {#1}
+ \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#1}
}
}
-\cs_new_protected:Npn \xtemplate_declare_template_code:nnnnn #1#2#3#4#5
+\cs_new_protected:Npn \__xtemplate_declare_template_code:nnnnn #1#2#3#4#5
{
- \xtemplate_execute_if_type_exist:nT {#1}
+ \__xtemplate_execute_if_type_exist:nT {#1}
{
- \xtemplate_execute_if_arg_agree:nnT {#1}{#3}
+ \__xtemplate_execute_if_arg_agree:nnT {#1}{#3}
{
- \xtemplate_if_keys_exist:nnT {#1} {#2}
+ \__xtemplate_if_keys_exist:nnT {#1} {#2}
{
- \xtemplate_store_key_implementation:nnn {#1} {#2} {#4}
+ \__xtemplate_store_key_implementation:nnn {#1} {#2} {#4}
\cs_generate_from_arg_count:cNnn
- { \c_xtemplate_code_root_tl #1 / #2 }
+ { \c__xtemplate_code_root_tl #1 / #2 }
\cs_gset_protected:Npn {#3} {#5}
}
}
}
}
-\cs_new_protected:Npn \xtemplate_store_key_implementation:nnn #1#2#3
+\cs_new_protected:Npn \__xtemplate_store_key_implementation:nnn #1#2#3
{
- \xtemplate_recover_defaults:n { #1 / #2 }
- \xtemplate_recover_keytypes:n { #1 / #2 }
- \prop_clear:N \l_xtemplate_vars_prop
+ \__xtemplate_recover_defaults:n { #1 / #2 }
+ \__xtemplate_recover_keytypes:n { #1 / #2 }
+ \prop_clear:N \l__xtemplate_vars_prop
\keyval_parse:NNn
- \xtemplate_parse_vars_elt:n \xtemplate_parse_vars_elt:nn {#3}
- \xtemplate_store_vars:n { #1 / #2 }
- \clist_clear:N \l_xtemplate_restrict_clist
- \xtemplate_store_restrictions:n { #1 / #2 }
- \prop_map_inline:Nn \l_xtemplate_keytypes_prop
+ \__xtemplate_parse_vars_elt:n \__xtemplate_parse_vars_elt:nn {#3}
+ \__xtemplate_store_vars:n { #1 / #2 }
+ \clist_clear:N \l__xtemplate_restrict_clist
+ \__xtemplate_store_restrictions:n { #1 / #2 }
+ \prop_map_inline:Nn \l__xtemplate_keytypes_prop
{
\msg_error:nnxxx { xtemplate } { key-not-implemented }
{##1} {#2} {#1}
}
}
-\cs_new_protected:Npn \xtemplate_parse_vars_elt:n #1
+\cs_new_protected:Npn \__xtemplate_parse_vars_elt:n #1
{ \msg_error:nnx { xtemplate } { key-no-variable } {#1} }
-\cs_new_protected:Npn \xtemplate_parse_vars_elt:nn #1#2
+\cs_new_protected:Npn \__xtemplate_parse_vars_elt:nn #1#2
{
- \tl_set:Nx \l_xtemplate_key_name_tl { \tl_to_str:n {#1} }
- \tl_remove_all:Nn \l_xtemplate_key_name_tl { ~ }
+ \tl_set:Nx \l__xtemplate_key_name_tl { \tl_to_str:n {#1} }
+ \tl_remove_all:Nn \l__xtemplate_key_name_tl { ~ }
\prop_get:NoNTF
- \l_xtemplate_keytypes_prop
- \l_xtemplate_key_name_tl
- \l_xtemplate_keytype_tl
+ \l__xtemplate_keytypes_prop
+ \l__xtemplate_key_name_tl
+ \l__xtemplate_keytype_tl
{
- \xtemplate_split_keytype_arg:o \l_xtemplate_keytype_tl
- \xtemplate_parse_vars_elt_aux:n {#2}
- \prop_del:NV \l_xtemplate_keytypes_prop \l_xtemplate_key_name_tl
+ \__xtemplate_split_keytype_arg:o \l__xtemplate_keytype_tl
+ \__xtemplate_parse_vars_elt_aux:n {#2}
+ \prop_remove:NV \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
}
{ \msg_error:nnx { xtemplate } { unknown-key } {#1} }
}
-\cs_new_protected:Npn \xtemplate_parse_vars_elt_aux:n #1
+\cs_new_protected:Npn \__xtemplate_parse_vars_elt_aux:n #1
{
- \str_if_eq:onTF \l_xtemplate_keytype_tl { choice }
- { \xtemplate_implement_choices:n {#1} }
+ \str_if_eq:onTF \l__xtemplate_keytype_tl { choice }
+ { \__xtemplate_implement_choices:n {#1} }
{
- \str_if_eq:onTF \l_xtemplate_keytype_tl { code }
+ \str_if_eq:onTF \l__xtemplate_keytype_tl { code }
{
- \prop_put:Non \l_xtemplate_vars_prop
- \l_xtemplate_key_name_tl {#1}
+ \prop_put:Non \l__xtemplate_vars_prop
+ \l__xtemplate_key_name_tl {#1}
}
{
\tl_if_single:nTF {#1}
{
\cs_if_exist:NF #1
- { \xtemplate_create_variable:N #1 }
- \prop_put:Non \l_xtemplate_vars_prop
- \l_xtemplate_key_name_tl {#1}
+ { \__xtemplate_create_variable:N #1 }
+ \prop_put:Non \l__xtemplate_vars_prop
+ \l__xtemplate_key_name_tl {#1}
}
{
\tl_if_in:nnTF {#1} { global }
- { \xtemplate_parse_vars_elt_aux:w #1 \q_stop }
+ { \__xtemplate_parse_vars_elt_aux:w #1 \q_stop }
{
\msg_error:nnx { xtemplate } { bad-variable }
{ \tl_to_str:n {#1} }
@@ -542,16 +542,16 @@
}
}
}
-\cs_new_protected:Npn \xtemplate_parse_vars_elt_aux:w #1 global #2 \q_stop
+\cs_new_protected:Npn \__xtemplate_parse_vars_elt_aux:w #1 global #2 \q_stop
{
\tl_if_empty:nTF {#1}
{
\tl_if_single:nTF {#2}
{
\cs_if_exist:NF #2
- { \xtemplate_create_variable:N #2 }
- \prop_put:Non \l_xtemplate_vars_prop
- \l_xtemplate_key_name_tl { #1 global #2 }
+ { \__xtemplate_create_variable:N #2 }
+ \prop_put:Non \l__xtemplate_vars_prop
+ \l__xtemplate_key_name_tl { #1 global #2 }
}
{
\msg_error:nnx { xtemplate } { bad-variable }
@@ -563,9 +563,9 @@
{ \tl_to_str:n { #1 global #2 } }
}
}
-\cs_new_protected_nopar:Npn \xtemplate_create_variable:N #1
+\cs_new_protected_nopar:Npn \__xtemplate_create_variable:N #1
{
- \prg_case_str:onn \l_xtemplate_keytype_tl
+ \str_case:onn \l__xtemplate_keytype_tl
{
{ boolean } { \bool_new:N #1 }
{ commalist } { \clist_new:N #1 }
@@ -576,196 +576,196 @@
{ real } { \fp_new:N #1 }
{ tokenlist } { \tl_new:N #1 }
}
- { \use:c { \l_xtemplate_keytype_tl _ new:N } #1 }
+ { \use:c { \l__xtemplate_keytype_tl _ new:N } #1 }
}
-\cs_new_protected:Npn \xtemplate_implement_choices:n #1
+\cs_new_protected:Npn \__xtemplate_implement_choices:n #1
{
- \clist_set_eq:NN \l_xtemplate_tmp_clist \l_xtemplate_keytype_arg_tl
- \prop_put:Non \l_xtemplate_vars_prop \l_xtemplate_key_name_tl { }
+ \clist_set_eq:NN \l__xtemplate_tmp_clist \l__xtemplate_keytype_arg_tl
+ \prop_put:Non \l__xtemplate_vars_prop \l__xtemplate_key_name_tl { }
\keyval_parse:NNn
- \xtemplate_implement_choice_elt:n \xtemplate_implement_choice_elt:nn
+ \__xtemplate_implement_choice_elt:n \__xtemplate_implement_choice_elt:nn
{#1}
- \prop_get:NoNT \l_xtemplate_values_prop \l_xtemplate_key_name_tl
- \l_xtemplate_tmp_tl
- { \xtemplate_implement_choices_default: }
- \clist_if_empty:NF \l_xtemplate_tmp_clist
+ \prop_get:NoNT \l__xtemplate_values_prop \l__xtemplate_key_name_tl
+ \l__xtemplate_tmp_tl
+ { \__xtemplate_implement_choices_default: }
+ \clist_if_empty:NF \l__xtemplate_tmp_clist
{
- \clist_map_inline:Nn \l_xtemplate_tmp_clist
+ \clist_map_inline:Nn \l__xtemplate_tmp_clist
{
\msg_error:nnx { xtemplate } { choice-not-implemented }
{##1}
}
}
}
-\cs_new_protected_nopar:Npn \xtemplate_implement_choices_default:
+\cs_new_protected_nopar:Npn \__xtemplate_implement_choices_default:
{
- \tl_set:Nx \l_xtemplate_tmp_tl
- { \l_xtemplate_key_name_tl \c_space_tl \l_xtemplate_tmp_tl }
- \prop_if_in:NoF \l_xtemplate_vars_prop \l_xtemplate_tmp_tl
+ \tl_set:Nx \l__xtemplate_tmp_tl
+ { \l__xtemplate_key_name_tl \c_space_tl \l__xtemplate_tmp_tl }
+ \prop_if_in:NoF \l__xtemplate_vars_prop \l__xtemplate_tmp_tl
{
- \tl_set:Nx \l_xtemplate_tmp_tl
- { \l_xtemplate_key_name_tl \c_space_tl \l_xtemplate_tmp_tl }
- \prop_if_in:NoF \l_xtemplate_vars_prop \l_xtemplate_tmp_tl
+ \tl_set:Nx \l__xtemplate_tmp_tl
+ { \l__xtemplate_key_name_tl \c_space_tl \l__xtemplate_tmp_tl }
+ \prop_if_in:NoF \l__xtemplate_vars_prop \l__xtemplate_tmp_tl
{
- \prop_get:NoN \l_xtemplate_keytypes_prop \l_xtemplate_key_name_tl
- \l_xtemplate_tmp_tl
- \xtemplate_split_keytype_arg:o \l_xtemplate_tmp_tl
- \prop_get:NoN \l_xtemplate_values_prop \l_xtemplate_key_name_tl
- \l_xtemplate_tmp_tl
+ \prop_get:NoN \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+ \l__xtemplate_tmp_tl
+ \__xtemplate_split_keytype_arg:o \l__xtemplate_tmp_tl
+ \prop_get:NoN \l__xtemplate_values_prop \l__xtemplate_key_name_tl
+ \l__xtemplate_tmp_tl
\msg_error:nnxxx { xtemplate } { unknown-default-choice }
- { \l_xtemplate_key_name_tl } { \l_xtemplate_key_name_tl }
- { \l_xtemplate_keytype_arg_tl }
+ { \l__xtemplate_key_name_tl } { \l__xtemplate_key_name_tl }
+ { \l__xtemplate_keytype_arg_tl }
}
}
}
-\cs_new_protected:Npn \xtemplate_implement_choice_elt:n #1
+\cs_new_protected:Npn \__xtemplate_implement_choice_elt:n #1
{
- \clist_if_empty:NTF \l_xtemplate_tmp_clist
+ \clist_if_empty:NTF \l__xtemplate_tmp_clist
{
\str_if_eq:nnF {#1} { unknown }
{
- \prop_get:NoN \l_xtemplate_keytypes_prop \l_xtemplate_key_name_tl
- \l_xtemplate_tmp_tl
- \xtemplate_split_keytype_arg:o \l_xtemplate_tmp_tl
+ \prop_get:NoN \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+ \l__xtemplate_tmp_tl
+ \__xtemplate_split_keytype_arg:o \l__xtemplate_tmp_tl
\msg_error:nnxxx { xtemplate } { unknown-choice }
- { \l_xtemplate_key_name_tl } {#1}
- { \l_xtemplate_keytype_arg_tl }
+ { \l__xtemplate_key_name_tl } {#1}
+ { \l__xtemplate_keytype_arg_tl }
}
}
{
- \clist_if_in:NnTF \l_xtemplate_tmp_clist {#1}
- { \clist_remove_all:Nn \l_xtemplate_tmp_clist {#1} }
+ \clist_if_in:NnTF \l__xtemplate_tmp_clist {#1}
+ { \clist_remove_all:Nn \l__xtemplate_tmp_clist {#1} }
{
- \prop_get:NoN \l_xtemplate_keytypes_prop \l_xtemplate_key_name_tl
- \l_xtemplate_tmp_tl
- \xtemplate_split_keytype_arg:o \l_xtemplate_tmp_tl
+ \prop_get:NoN \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+ \l__xtemplate_tmp_tl
+ \__xtemplate_split_keytype_arg:o \l__xtemplate_tmp_tl
\msg_error:nnxxx { xtemplate } { unknown-choice }
- { \l_xtemplate_key_name_tl } {#1}
- { \l_xtemplate_keytype_arg_tl }
+ { \l__xtemplate_key_name_tl } {#1}
+ { \l__xtemplate_keytype_arg_tl }
}
}
}
-\cs_new_protected:Npn \xtemplate_implement_choice_elt:nn #1#2
+\cs_new_protected:Npn \__xtemplate_implement_choice_elt:nn #1#2
{
- \xtemplate_implement_choice_elt:n {#1}
- \tl_set:Nx \l_xtemplate_tmp_tl
- { \l_xtemplate_key_name_tl \c_space_tl #1 }
- \prop_put:Non \l_xtemplate_vars_prop \l_xtemplate_tmp_tl {#2}
+ \__xtemplate_implement_choice_elt:n {#1}
+ \tl_set:Nx \l__xtemplate_tmp_tl
+ { \l__xtemplate_key_name_tl \c_space_tl #1 }
+ \prop_put:Non \l__xtemplate_vars_prop \l__xtemplate_tmp_tl {#2}
}
-\cs_new_protected:Npn \xtemplate_declare_restricted:nnnn #1#2#3#4
+\cs_new_protected:Npn \__xtemplate_declare_restricted:nnnn #1#2#3#4
{
- \xtemplate_if_keys_exist:nnT {#1} {#2}
+ \__xtemplate_if_keys_exist:nnT {#1} {#2}
{
- \xtemplate_set_template_eq:nn { #1 / #3 } { #1 / #2 }
- \bool_set_true:N \l_xtemplate_restrict_bool
- \xtemplate_edit_defaults_aux:nnn {#1} {#3} {#4}
+ \__xtemplate_set_template_eq:nn { #1 / #3 } { #1 / #2 }
+ \bool_set_true:N \l__xtemplate_restrict_bool
+ \__xtemplate_edit_defaults_aux:nnn {#1} {#3} {#4}
}
}
-\cs_new_protected:Npn \xtemplate_edit_defaults:nnn
+\cs_new_protected:Npn \__xtemplate_edit_defaults:nnn
{
- \bool_set_false:N \l_xtemplate_restrict_bool
- \xtemplate_edit_defaults_aux:nnn
+ \bool_set_false:N \l__xtemplate_restrict_bool
+ \__xtemplate_edit_defaults_aux:nnn
}
-\cs_new_protected:Npn \xtemplate_edit_defaults_aux:nnn #1#2#3
+\cs_new_protected:Npn \__xtemplate_edit_defaults_aux:nnn #1#2#3
{
- \xtemplate_if_keys_exist:nnT {#1} {#2}
+ \__xtemplate_if_keys_exist:nnT {#1} {#2}
{
- \xtemplate_recover_defaults:n { #1 / #2 }
- \xtemplate_recover_restrictions:n { #1 / #2 }
- \xtemplate_parse_values:nn { #1 / #2 } {#3}
- \xtemplate_store_defaults:n { #1 / #2 }
- \xtemplate_store_restrictions:n { #1 / #2 }
+ \__xtemplate_recover_defaults:n { #1 / #2 }
+ \__xtemplate_recover_restrictions:n { #1 / #2 }
+ \__xtemplate_parse_values:nn { #1 / #2 } {#3}
+ \__xtemplate_store_defaults:n { #1 / #2 }
+ \__xtemplate_store_restrictions:n { #1 / #2 }
}
}
-\cs_new_protected:Npn \xtemplate_parse_values:nn #1#2
+\cs_new_protected:Npn \__xtemplate_parse_values:nn #1#2
{
- \xtemplate_recover_keytypes:n {#1}
- \clist_clear:N \l_xtemplate_restrict_clist
+ \__xtemplate_recover_keytypes:n {#1}
+ \clist_clear:N \l__xtemplate_restrict_clist
\keyval_parse:NNn
- \xtemplate_parse_values_elt:n \xtemplate_parse_values_elt:nn {#2}
+ \__xtemplate_parse_values_elt:n \__xtemplate_parse_values_elt:nn {#2}
}
-\cs_new_protected:Npn \xtemplate_parse_values_elt:n #1
+\cs_new_protected:Npn \__xtemplate_parse_values_elt:n #1
{
- \bool_set_true:N \l_xtemplate_error_bool
+ \bool_set_true:N \l__xtemplate_error_bool
\msg_error:nnx { xtemplate } { key-no-value } {#1}
}
-\cs_new_protected:Npn \xtemplate_parse_values_elt:nn #1#2
+\cs_new_protected:Npn \__xtemplate_parse_values_elt:nn #1#2
{
- \tl_set:Nx \l_xtemplate_key_name_tl { \tl_to_str:n {#1} }
- \tl_remove_all:Nn \l_xtemplate_key_name_tl { ~ }
- \prop_get:NoNTF \l_xtemplate_keytypes_prop \l_xtemplate_key_name_tl
- \l_xtemplate_tmp_tl
+ \tl_set:Nx \l__xtemplate_key_name_tl { \tl_to_str:n {#1} }
+ \tl_remove_all:Nn \l__xtemplate_key_name_tl { ~ }
+ \prop_get:NoNTF \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+ \l__xtemplate_tmp_tl
{
- \bool_if:NTF \l_xtemplate_restrict_bool
+ \bool_if:NTF \l__xtemplate_restrict_bool
{
- \clist_if_in:NoF \l_xtemplate_restrict_clist
- \l_xtemplate_key_name_tl
- { \xtemplate_parse_values_elt_aux:n {#2} }
+ \clist_if_in:NoF \l__xtemplate_restrict_clist
+ \l__xtemplate_key_name_tl
+ { \__xtemplate_parse_values_elt_aux:n {#2} }
}
- { \xtemplate_parse_values_elt_aux:n {#2} }
+ { \__xtemplate_parse_values_elt_aux:n {#2} }
}
{
\msg_error:nnx { xtemplate } { unknown-key }
- { \l_xtemplate_key_name_tl }
+ { \l__xtemplate_key_name_tl }
}
}
-\cs_new_protected:Npn \xtemplate_parse_values_elt_aux:n #1
+\cs_new_protected:Npn \__xtemplate_parse_values_elt_aux:n #1
{
- \clist_put_right:No \l_xtemplate_restrict_clist \l_xtemplate_key_name_tl
- \xtemplate_split_keytype_arg:o \l_xtemplate_tmp_tl
- \use:c { xtemplate_store_value_ \l_xtemplate_keytype_tl :n } {#1}
+ \clist_put_right:No \l__xtemplate_restrict_clist \l__xtemplate_key_name_tl
+ \__xtemplate_split_keytype_arg:o \l__xtemplate_tmp_tl
+ \use:c { __xtemplate_store_value_ \l__xtemplate_keytype_tl :n } {#1}
}
-\cs_new_protected:Npn \xtemplate_set_template_eq:nn #1#2
+\cs_new_protected:Npn \__xtemplate_set_template_eq:nn #1#2
{
- \xtemplate_recover_defaults:n {#2}
- \xtemplate_store_defaults:n {#1}
- \xtemplate_recover_keytypes:n {#2}
- \xtemplate_store_keytypes:n {#1}
- \xtemplate_recover_vars:n {#2}
- \xtemplate_store_vars:n {#1}
- \cs_gset_eq:cc { \c_xtemplate_code_root_tl #1 }
- { \c_xtemplate_code_root_tl #2 }
+ \__xtemplate_recover_defaults:n {#2}
+ \__xtemplate_store_defaults:n {#1}
+ \__xtemplate_recover_keytypes:n {#2}
+ \__xtemplate_store_keytypes:n {#1}
+ \__xtemplate_recover_vars:n {#2}
+ \__xtemplate_store_vars:n {#1}
+ \cs_gset_eq:cc { \c__xtemplate_code_root_tl #1 }
+ { \c__xtemplate_code_root_tl #2 }
}
-\cs_new_protected:Npn \xtemplate_declare_instance:nnnnn #1#2#3#4#5
+\cs_new_protected:Npn \__xtemplate_declare_instance:nnnnn #1#2#3#4#5
{
- \xtemplate_execute_if_code_exist:nnT {#1} {#2}
+ \__xtemplate_execute_if_code_exist:nnT {#1} {#2}
{
- \xtemplate_recover_defaults:n { #1 / #2 }
- \xtemplate_recover_vars:n { #1 / #2 }
- \xtemplate_declare_instance_aux:nnnnn {#1} {#2} {#3} {#4} {#5}
+ \__xtemplate_recover_defaults:n { #1 / #2 }
+ \__xtemplate_recover_vars:n { #1 / #2 }
+ \__xtemplate_declare_instance_aux:nnnnn {#1} {#2} {#3} {#4} {#5}
}
}
-\cs_new_protected:Npn \xtemplate_declare_instance_aux:nnnnn #1#2#3#4#5
+\cs_new_protected:Npn \__xtemplate_declare_instance_aux:nnnnn #1#2#3#4#5
{
- \bool_set_false:N \l_xtemplate_error_bool
- \xtemplate_parse_values:nn { #1 / #2 } {#5}
- \bool_if:NF \l_xtemplate_error_bool
+ \bool_set_false:N \l__xtemplate_error_bool
+ \__xtemplate_parse_values:nn { #1 / #2 } {#5}
+ \bool_if:NF \l__xtemplate_error_bool
{
- \prop_put:Nnn \l_xtemplate_values_prop { from~template } {#2}
- \xtemplate_store_values:n { #1 / #3 / #4 }
- \xtemplate_convert_to_assignments:
- \cs_set_protected:cpx { \c_xtemplate_instances_root_tl #1 / #3 / #4 }
+ \prop_put:Nnn \l__xtemplate_values_prop { from~template } {#2}
+ \__xtemplate_store_values:n { #1 / #3 / #4 }
+ \__xtemplate_convert_to_assignments:
+ \cs_set_protected:cpx { \c__xtemplate_instances_root_tl #1 / #3 / #4 }
{
- \exp_not:N \xtemplate_assignments_push:n
- { \exp_not:o \l_xtemplate_assignments_tl }
- \exp_not:c { \c_xtemplate_code_root_tl #1 / #2 }
+ \exp_not:N \__xtemplate_assignments_push:n
+ { \exp_not:o \l__xtemplate_assignments_tl }
+ \exp_not:c { \c__xtemplate_code_root_tl #1 / #2 }
}
- \xtemplate_if_instance_exist:nnnF {#1} { } {#4}
+ \__xtemplate_if_instance_exist:nnnF {#1} { } {#4}
{
\cs_set_eq:cc
- { \c_xtemplate_instances_root_tl #1 / / #4 }
- { \c_xtemplate_instances_root_tl #1 / #3 / #4 }
+ { \c__xtemplate_instances_root_tl #1 / / #4 }
+ { \c__xtemplate_instances_root_tl #1 / #3 / #4 }
}
}
}
-\cs_new_protected:Npn \xtemplate_edit_instance:nnnn #1#2#3
+\cs_new_protected:Npn \__xtemplate_edit_instance:nnnn #1#2#3
{
- \xtemplate_if_instance_exist:nnnTF {#1} {#2} {#3}
+ \__xtemplate_if_instance_exist:nnnTF {#1} {#2} {#3}
{
- \xtemplate_recover_values:n { #1 / #2 / #3 }
- \prop_get:NnN \l_xtemplate_values_prop { from~template }
- \l_xtemplate_tmp_tl
- \xtemplate_edit_instance_aux:nonnn {#1} \l_xtemplate_tmp_tl
+ \__xtemplate_recover_values:n { #1 / #2 / #3 }
+ \prop_get:NnN \l__xtemplate_values_prop { from~template }
+ \l__xtemplate_tmp_tl
+ \__xtemplate_edit_instance_aux:nonnn {#1} \l__xtemplate_tmp_tl
{#2} {#3}
}
{
@@ -773,331 +773,331 @@
{#1} {#3}
}
}
-\cs_new_protected:Npn \xtemplate_edit_instance_aux:nnnnn #1#2
+\cs_new_protected:Npn \__xtemplate_edit_instance_aux:nnnnn #1#2
{
- \xtemplate_recover_vars:n { #1 / #2 }
- \xtemplate_declare_instance_aux:nnnnn {#1} {#2}
+ \__xtemplate_recover_vars:n { #1 / #2 }
+ \__xtemplate_declare_instance_aux:nnnnn {#1} {#2}
}
-\cs_generate_variant:Nn \xtemplate_edit_instance_aux:nnnnn { no }
-\cs_new_protected_nopar:Npn \xtemplate_convert_to_assignments:
+\cs_generate_variant:Nn \__xtemplate_edit_instance_aux:nnnnn { no }
+\cs_new_protected_nopar:Npn \__xtemplate_convert_to_assignments:
{
- \tl_clear:N \l_xtemplate_assignments_tl
- \seq_map_function:NN \l_xtemplate_key_order_seq
- \xtemplate_convert_to_assignments_aux:n
+ \tl_clear:N \l__xtemplate_assignments_tl
+ \seq_map_function:NN \l__xtemplate_key_order_seq
+ \__xtemplate_convert_to_assignments_aux:n
}
-\cs_new_protected:Npn \xtemplate_convert_to_assignments_aux:n #1
+\cs_new_protected:Npn \__xtemplate_convert_to_assignments_aux:n #1
{
- \prop_get:NnN \l_xtemplate_keytypes_prop {#1} \l_xtemplate_tmp_tl
- \xtemplate_convert_to_assignments_aux:no {#1} \l_xtemplate_tmp_tl
+ \prop_get:NnN \l__xtemplate_keytypes_prop {#1} \l__xtemplate_tmp_tl
+ \__xtemplate_convert_to_assignments_aux:no {#1} \l__xtemplate_tmp_tl
}
-\cs_new_protected:Npn \xtemplate_convert_to_assignments_aux:nn #1#2
+\cs_new_protected:Npn \__xtemplate_convert_to_assignments_aux:nn #1#2
{
- \prop_get:NnNT \l_xtemplate_values_prop {#1} \l_xtemplate_value_tl
+ \prop_get:NnNT \l__xtemplate_values_prop {#1} \l__xtemplate_value_tl
{
- \prop_get:NnNTF \l_xtemplate_vars_prop {#1} \l_xtemplate_var_tl
+ \prop_get:NnNTF \l__xtemplate_vars_prop {#1} \l__xtemplate_var_tl
{
- \xtemplate_split_keytype_arg:n {#2}
- \str_if_eq:onF \l_xtemplate_keytype_tl { choice }
+ \__xtemplate_split_keytype_arg:n {#2}
+ \str_if_eq:onF \l__xtemplate_keytype_tl { choice }
{
- \str_if_eq:onF \l_xtemplate_keytype_tl { code }
- { \xtemplate_find_global: }
+ \str_if_eq:onF \l__xtemplate_keytype_tl { code }
+ { \__xtemplate_find_global: }
}
- \tl_set:Nn \l_xtemplate_key_name_tl {#1}
- \use:c { xtemplate_assign_ \l_xtemplate_keytype_tl : }
+ \tl_set:Nn \l__xtemplate_key_name_tl {#1}
+ \use:c { __xtemplate_assign_ \l__xtemplate_keytype_tl : }
}
{ \msg_error:nnx { xtemplate } { unknown-attribute } {#1} }
}
}
-\cs_generate_variant:Nn \xtemplate_convert_to_assignments_aux:nn { no }
-\cs_new_protected_nopar:Npn \xtemplate_find_global:
+\cs_generate_variant:Nn \__xtemplate_convert_to_assignments_aux:nn { no }
+\cs_new_protected_nopar:Npn \__xtemplate_find_global:
{
- \bool_set_false:N \l_xtemplate_global_bool
- \tl_if_in:onT \l_xtemplate_var_tl { global }
+ \bool_set_false:N \l__xtemplate_global_bool
+ \tl_if_in:onT \l__xtemplate_var_tl { global }
{
- \exp_after:wN \xtemplate_find_global_aux:w \l_xtemplate_var_tl \q_stop
+ \exp_after:wN \__xtemplate_find_global_aux:w \l__xtemplate_var_tl \q_stop
}
}
-\cs_new_protected:Npn \xtemplate_find_global_aux:w #1 global #2 \q_stop
+\cs_new_protected:Npn \__xtemplate_find_global_aux:w #1 global #2 \q_stop
{
- \tl_set:Nn \l_xtemplate_var_tl {#2}
- \bool_set_true:N \l_xtemplate_global_bool
+ \tl_set:Nn \l__xtemplate_var_tl {#2}
+ \bool_set_true:N \l__xtemplate_global_bool
}
-\cs_new_protected:Npn \xtemplate_use_template:nnn #1#2#3
+\cs_new_protected:Npn \__xtemplate_use_template:nnn #1#2#3
{
- \xtemplate_execute_if_code_exist:nnT {#1} {#2}
+ \__xtemplate_execute_if_code_exist:nnT {#1} {#2}
{
- \xtemplate_recover_defaults:n { #1 / #2 }
- \xtemplate_recover_vars:n { #1 / #2 }
- \xtemplate_parse_values:nn { #1 / #2 } {#3}
- \xtemplate_convert_to_assignments:
- \use:c { \c_xtemplate_code_root_tl #1 / #2 }
+ \__xtemplate_recover_defaults:n { #1 / #2 }
+ \__xtemplate_recover_vars:n { #1 / #2 }
+ \__xtemplate_parse_values:nn { #1 / #2 } {#3}
+ \__xtemplate_convert_to_assignments:
+ \use:c { \c__xtemplate_code_root_tl #1 / #2 }
}
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_boolean:
+\cs_new_protected_nopar:Npn \__xtemplate_assign_boolean:
{
- \bool_if:NTF \l_xtemplate_global_bool
- { \xtemplate_assign_boolean_aux:n { bool_gset } }
- { \xtemplate_assign_boolean_aux:n { bool_set } }
+ \bool_if:NTF \l__xtemplate_global_bool
+ { \__xtemplate_assign_boolean_aux:n { bool_gset } }
+ { \__xtemplate_assign_boolean_aux:n { bool_set } }
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_boolean_aux:n #1
+\cs_new_protected_nopar:Npn \__xtemplate_assign_boolean_aux:n #1
{
- \xtemplate_if_key_value:oT \l_xtemplate_value_tl
- { \xtemplate_key_to_value: }
- \tl_put_left:Nx \l_xtemplate_assignments_tl
+ \__xtemplate_if_key_value:oT \l__xtemplate_value_tl
+ { \__xtemplate_key_to_value: }
+ \tl_put_left:Nx \l__xtemplate_assignments_tl
{
- \exp_not:c { #1 _ \l_xtemplate_value_tl :N }
- \exp_not:o \l_xtemplate_var_tl
+ \exp_not:c { #1 _ \l__xtemplate_value_tl :N }
+ \exp_not:o \l__xtemplate_var_tl
}
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_choice:
+\cs_new_protected_nopar:Npn \__xtemplate_assign_choice:
{
- \xtemplate_assign_choice_aux:xF
- { \l_xtemplate_key_name_tl \c_space_tl \l_xtemplate_value_tl }
+ \__xtemplate_assign_choice_aux:xF
+ { \l__xtemplate_key_name_tl \c_space_tl \l__xtemplate_value_tl }
{
- \xtemplate_assign_choice_aux:xF
- { \l_xtemplate_key_name_tl \c_space_tl unknown }
+ \__xtemplate_assign_choice_aux:xF
+ { \l__xtemplate_key_name_tl \c_space_tl unknown }
{
- \prop_get:NoN \l_xtemplate_keytypes_prop \l_xtemplate_key_name_tl
- \l_xtemplate_tmp_tl
- \xtemplate_split_keytype_arg:o \l_xtemplate_tmp_tl
+ \prop_get:NoN \l__xtemplate_keytypes_prop \l__xtemplate_key_name_tl
+ \l__xtemplate_tmp_tl
+ \__xtemplate_split_keytype_arg:o \l__xtemplate_tmp_tl
\msg_error:nnxxx { xtemplate } { unknown-choice }
- { \l_xtemplate_key_name_tl } { \l_xtemplate_value_tl }
- { \l_xtemplate_keytype_arg_tl }
+ { \l__xtemplate_key_name_tl } { \l__xtemplate_value_tl }
+ { \l__xtemplate_keytype_arg_tl }
}
}
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_choice_aux:nF #1
+\cs_new_protected_nopar:Npn \__xtemplate_assign_choice_aux:nF #1
{
\prop_get:NnNTF
- \l_xtemplate_vars_prop
+ \l__xtemplate_vars_prop
{#1}
- \l_xtemplate_tmp_tl
- { \tl_put_right:No \l_xtemplate_assignments_tl \l_xtemplate_tmp_tl }
+ \l__xtemplate_tmp_tl
+ { \tl_put_right:No \l__xtemplate_assignments_tl \l__xtemplate_tmp_tl }
}
-\cs_generate_variant:Nn \xtemplate_assign_choice_aux:nF { x }
-\cs_new_protected_nopar:Npn \xtemplate_assign_code:
+\cs_generate_variant:Nn \__xtemplate_assign_choice_aux:nF { x }
+\cs_new_protected_nopar:Npn \__xtemplate_assign_code:
{
- \tl_put_left:Nx \l_xtemplate_assignments_tl
+ \tl_put_left:Nx \l__xtemplate_assignments_tl
{
- \cs_set_protected:Npn \xtemplate_assign_code:n \exp_not:n {##1}
- { \exp_not:o \l_xtemplate_var_tl }
- \xtemplate_assign_code:n { \exp_not:o \l_xtemplate_value_tl }
+ \cs_set_protected:Npn \__xtemplate_assign_code:n \exp_not:n {##1}
+ { \exp_not:o \l__xtemplate_var_tl }
+ \__xtemplate_assign_code:n { \exp_not:o \l__xtemplate_value_tl }
}
}
-\cs_new_protected:Npn \xtemplate_assign_code:n #1 { }
-\cs_new_protected_nopar:Npn \xtemplate_assign_function:
+\cs_new_protected:Npn \__xtemplate_assign_code:n #1 { }
+\cs_new_protected_nopar:Npn \__xtemplate_assign_function:
{
- \bool_if:NTF \l_xtemplate_global_bool
- { \xtemplate_assign_function_aux:N \cs_gset:Npn }
- { \xtemplate_assign_function_aux:N \cs_set:Npn }
+ \bool_if:NTF \l__xtemplate_global_bool
+ { \__xtemplate_assign_function_aux:N \cs_gset:Npn }
+ { \__xtemplate_assign_function_aux:N \cs_set:Npn }
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_function_aux:N #1
+\cs_new_protected_nopar:Npn \__xtemplate_assign_function_aux:N #1
{
- \tl_put_left:Nx \l_xtemplate_assignments_tl
+ \tl_put_left:Nx \l__xtemplate_assignments_tl
{
\cs_generate_from_arg_count:NNnn
- \exp_not:o \l_xtemplate_var_tl
+ \exp_not:o \l__xtemplate_var_tl
\exp_not:N #1
- { \exp_not:o \l_xtemplate_keytype_arg_tl }
- { \exp_not:o \l_xtemplate_value_tl }
+ { \exp_not:o \l__xtemplate_keytype_arg_tl }
+ { \exp_not:o \l__xtemplate_value_tl }
}
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_instance:
+\cs_new_protected_nopar:Npn \__xtemplate_assign_instance:
{
- \bool_if:NTF \l_xtemplate_global_bool
- { \xtemplate_assign_instance_aux:N \cs_gset_protected:Npn }
- { \xtemplate_assign_instance_aux:N \cs_set_protected:Npn }
+ \bool_if:NTF \l__xtemplate_global_bool
+ { \__xtemplate_assign_instance_aux:N \cs_gset_protected:Npn }
+ { \__xtemplate_assign_instance_aux:N \cs_set_protected:Npn }
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_instance_aux:N #1
+\cs_new_protected_nopar:Npn \__xtemplate_assign_instance_aux:N #1
{
- \tl_put_left:Nx \l_xtemplate_assignments_tl
+ \tl_put_left:Nx \l__xtemplate_assignments_tl
{
- \exp_not:N #1 \exp_not:o \l_xtemplate_var_tl
+ \exp_not:N #1 \exp_not:o \l__xtemplate_var_tl
{
- \xtemplate_use_instance:nn
- { \exp_not:o \l_xtemplate_keytype_arg_tl }
- { \exp_not:o \l_xtemplate_value_tl }
+ \__xtemplate_use_instance:nn
+ { \exp_not:o \l__xtemplate_keytype_arg_tl }
+ { \exp_not:o \l__xtemplate_value_tl }
}
}
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_integer:
+\cs_new_protected_nopar:Npn \__xtemplate_assign_integer:
{
- \bool_if:NTF \l_xtemplate_global_bool
- { \xtemplate_assign_variable:N \int_gset:Nn }
- { \xtemplate_assign_variable:N \int_set:Nn }
+ \bool_if:NTF \l__xtemplate_global_bool
+ { \__xtemplate_assign_variable:N \int_gset:Nn }
+ { \__xtemplate_assign_variable:N \int_set:Nn }
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_length:
+\cs_new_protected_nopar:Npn \__xtemplate_assign_length:
{
- \bool_if:NTF \l_xtemplate_global_bool
- { \xtemplate_assign_variable:N \dim_gset:Nn }
- { \xtemplate_assign_variable:N \dim_set:Nn }
+ \bool_if:NTF \l__xtemplate_global_bool
+ { \__xtemplate_assign_variable:N \dim_gset:Nn }
+ { \__xtemplate_assign_variable:N \dim_set:Nn }
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_muskip:
+\cs_new_protected_nopar:Npn \__xtemplate_assign_muskip:
{
- \bool_if:NTF \l_xtemplate_global_bool
- { \xtemplate_assign_variable:N \muskip_gset:Nn }
- { \xtemplate_assign_variable:N \muskip_set:Nn }
+ \bool_if:NTF \l__xtemplate_global_bool
+ { \__xtemplate_assign_variable:N \muskip_gset:Nn }
+ { \__xtemplate_assign_variable:N \muskip_set:Nn }
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_real:
+\cs_new_protected_nopar:Npn \__xtemplate_assign_real:
{
- \bool_if:NTF \l_xtemplate_global_bool
- { \xtemplate_assign_variable:N \fp_gset:Nn }
- { \xtemplate_assign_variable:N \fp_set:Nn }
+ \bool_if:NTF \l__xtemplate_global_bool
+ { \__xtemplate_assign_variable:N \fp_gset:Nn }
+ { \__xtemplate_assign_variable:N \fp_set:Nn }
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_skip:
+\cs_new_protected_nopar:Npn \__xtemplate_assign_skip:
{
- \bool_if:NTF \l_xtemplate_global_bool
- { \xtemplate_assign_variable:N \skip_gset:Nn }
- { \xtemplate_assign_variable:N \skip_set:Nn }
+ \bool_if:NTF \l__xtemplate_global_bool
+ { \__xtemplate_assign_variable:N \skip_gset:Nn }
+ { \__xtemplate_assign_variable:N \skip_set:Nn }
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_tokenlist:
+\cs_new_protected_nopar:Npn \__xtemplate_assign_tokenlist:
{
- \bool_if:NTF \l_xtemplate_global_bool
- { \xtemplate_assign_tokenlist_aux:N \tl_gset:Nn }
- { \xtemplate_assign_tokenlist_aux:N \tl_set:Nn }
+ \bool_if:NTF \l__xtemplate_global_bool
+ { \__xtemplate_assign_tokenlist_aux:N \tl_gset:Nn }
+ { \__xtemplate_assign_tokenlist_aux:N \tl_set:Nn }
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_tokenlist_aux:N #1
+\cs_new_protected_nopar:Npn \__xtemplate_assign_tokenlist_aux:N #1
{
- \xtemplate_if_key_value:oT \l_xtemplate_value_tl
- { \xtemplate_key_to_value: }
- \tl_put_left:Nx \l_xtemplate_assignments_tl
+ \__xtemplate_if_key_value:oT \l__xtemplate_value_tl
+ { \__xtemplate_key_to_value: }
+ \tl_put_left:Nx \l__xtemplate_assignments_tl
{
- #1 \exp_not:o \l_xtemplate_var_tl
- { \exp_not:o \l_xtemplate_value_tl }
+ #1 \exp_not:o \l__xtemplate_var_tl
+ { \exp_not:o \l__xtemplate_value_tl }
}
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_commalist:
+\cs_new_protected_nopar:Npn \__xtemplate_assign_commalist:
{
- \bool_if:NTF \l_xtemplate_global_bool
- { \xtemplate_assign_tokenlist_aux:N \clist_gset:Nn }
- { \xtemplate_assign_tokenlist_aux:N \clist_set:Nn }
+ \bool_if:NTF \l__xtemplate_global_bool
+ { \__xtemplate_assign_tokenlist_aux:N \clist_gset:Nn }
+ { \__xtemplate_assign_tokenlist_aux:N \clist_set:Nn }
}
-\cs_new_protected_nopar:Npn \xtemplate_assign_variable:N #1
+\cs_new_protected_nopar:Npn \__xtemplate_assign_variable:N #1
{
- \xtemplate_if_key_value:oT \l_xtemplate_value_tl
- { \xtemplate_key_to_value: }
- \tl_put_left:Nx \l_xtemplate_assignments_tl
+ \__xtemplate_if_key_value:oT \l__xtemplate_value_tl
+ { \__xtemplate_key_to_value: }
+ \tl_put_left:Nx \l__xtemplate_assignments_tl
{
- #1 \exp_not:o \l_xtemplate_var_tl
- { \exp_not:o \l_xtemplate_value_tl }
+ #1 \exp_not:o \l__xtemplate_var_tl
+ { \exp_not:o \l__xtemplate_value_tl }
}
}
-\cs_new_protected_nopar:Npn \xtemplate_key_to_value:
- { \exp_after:wN \xtemplate_key_to_value_aux:w \l_xtemplate_value_tl }
-\cs_new_protected:Npn \xtemplate_key_to_value_aux:w \KeyValue #1
+\cs_new_protected_nopar:Npn \__xtemplate_key_to_value:
+ { \exp_after:wN \__xtemplate_key_to_value_aux:w \l__xtemplate_value_tl }
+\cs_new_protected:Npn \__xtemplate_key_to_value_aux:w \KeyValue #1
{
- \tl_set:Nx \l_xtemplate_tmp_tl { \tl_to_str:n {#1} }
- \tl_remove_all:Nn \l_xtemplate_key_name_tl { ~ }
+ \tl_set:Nx \l__xtemplate_tmp_tl { \tl_to_str:n {#1} }
+ \tl_remove_all:Nn \l__xtemplate_key_name_tl { ~ }
\prop_get:NoNF
- \l_xtemplate_vars_prop
- \l_xtemplate_tmp_tl
- \l_xtemplate_value_tl
+ \l__xtemplate_vars_prop
+ \l__xtemplate_tmp_tl
+ \l__xtemplate_value_tl
{
\msg_error:nnx { xtemplate } { unknown-attribute }
- { \l_xtemplate_tmp_tl }
+ { \l__xtemplate_tmp_tl }
}
}
-\cs_new_protected:Npn \xtemplate_use_instance:nn #1#2
+\cs_new_protected:Npn \__xtemplate_use_instance:nn #1#2
{
- \xtemplate_if_use_template:nTF {#2}
- { \xtemplate_use_instance_aux:nNnnn {#1} #2 }
- { \xtemplate_use_instance_aux:nn {#1} {#2} }
+ \__xtemplate_if_use_template:nTF {#2}
+ { \__xtemplate_use_instance_aux:nNnnn {#1} #2 }
+ { \__xtemplate_use_instance_aux:nn {#1} {#2} }
}
-\cs_new_protected:Npn \xtemplate_use_instance_aux:nNnnn #1#2#3#4#5
+\cs_new_protected:Npn \__xtemplate_use_instance_aux:nNnnn #1#2#3#4#5
{
\str_if_eq:nnTF {#1} {#3}
- { \xtemplate_use_template:nnn {#3} {#4} {#5} }
+ { \__xtemplate_use_template:nnn {#3} {#4} {#5} }
{ \msg_error:nnxx { xtemplate } { type-mismatch } {#1} {#3} }
}
-\cs_new_protected:Npn \xtemplate_use_instance_aux:nn #1#2
+\cs_new_protected:Npn \__xtemplate_use_instance_aux:nn #1#2
{
- \xtemplate_get_collection:n {#1}
- \xtemplate_if_instance_exist:nnnTF
- {#1} { \l_xtemplate_collection_tl } {#2}
+ \__xtemplate_get_collection:n {#1}
+ \__xtemplate_if_instance_exist:nnnTF
+ {#1} { \l__xtemplate_collection_tl } {#2}
{
\use:c
{
- \c_xtemplate_instances_root_tl #1 /
- \l_xtemplate_collection_tl / #2
+ \c__xtemplate_instances_root_tl #1 /
+ \l__xtemplate_collection_tl / #2
}
}
{
- \xtemplate_if_instance_exist:nnnTF {#1} { } {#2}
- { \use:c { \c_xtemplate_instances_root_tl #1 / / #2 } }
+ \__xtemplate_if_instance_exist:nnnTF {#1} { } {#2}
+ { \use:c { \c__xtemplate_instances_root_tl #1 / / #2 } }
{
\msg_error:nnxx { xtemplate } { unknown-instance }
{#1} {#2}
}
}
}
-\cs_new_protected:Npn \xtemplate_use_collection:nn #1#2
- { \prop_put:Nnn \l_xtemplate_collections_prop {#1} {#2} }
-\cs_new_protected:Npn \xtemplate_get_collection:n #1
+\cs_new_protected:Npn \__xtemplate_use_collection:nn #1#2
+ { \prop_put:Nnn \l__xtemplate_collections_prop {#1} {#2} }
+\cs_new_protected:Npn \__xtemplate_get_collection:n #1
{
- \prop_get:NnNF \l_xtemplate_collections_prop {#1}
- \l_xtemplate_collection_tl
- { \tl_clear:N \l_xtemplate_collection_tl }
+ \prop_get:NnNF \l__xtemplate_collections_prop {#1}
+ \l__xtemplate_collection_tl
+ { \tl_clear:N \l__xtemplate_collection_tl }
}
-\cs_new_nopar:Npn \xtemplate_assignments_pop: { \l_xtemplate_assignments_tl }
-\cs_new_protected:Npn \xtemplate_assignments_push:n #1
- { \tl_set:Nn \l_xtemplate_assignments_tl {#1} }
-\cs_new_protected_nopar:Npn \xtemplate_show_code:nn #1#2
- { \cs_show:c { \c_xtemplate_code_root_tl #1 / #2 } }
-\cs_new_protected_nopar:Npn \xtemplate_show_defaults:nn #1#2
+\cs_new_nopar:Npn \__xtemplate_assignments_pop: { \l__xtemplate_assignments_tl }
+\cs_new_protected:Npn \__xtemplate_assignments_push:n #1
+ { \tl_set:Nn \l__xtemplate_assignments_tl {#1} }
+\cs_new_protected_nopar:Npn \__xtemplate_show_code:nn #1#2
+ { \cs_show:c { \c__xtemplate_code_root_tl #1 / #2 } }
+\cs_new_protected_nopar:Npn \__xtemplate_show_defaults:nn #1#2
{
- \xtemplate_if_keys_exist:nnT {#1} {#2}
+ \__xtemplate_if_keys_exist:nnT {#1} {#2}
{
- \xtemplate_recover_defaults:n { #1 / #2 }
- \xtemplate_show:Nnnn \l_xtemplate_values_prop
+ \__xtemplate_recover_defaults:n { #1 / #2 }
+ \__xtemplate_show:Nnnn \l__xtemplate_values_prop
{#1} {#2} { default~values }
}
}
-\cs_new_protected_nopar:Npn \xtemplate_show_keytypes:nn #1#2
+\cs_new_protected_nopar:Npn \__xtemplate_show_keytypes:nn #1#2
{
- \xtemplate_if_keys_exist:nnT {#1} {#2}
+ \__xtemplate_if_keys_exist:nnT {#1} {#2}
{
- \xtemplate_recover_keytypes:n { #1 / #2 }
- \xtemplate_show:Nnnn \l_xtemplate_keytypes_prop
+ \__xtemplate_recover_keytypes:n { #1 / #2 }
+ \__xtemplate_show:Nnnn \l__xtemplate_keytypes_prop
{#1} {#2} { interface }
}
}
-\cs_new_protected_nopar:Npn \xtemplate_show_vars:nn #1#2
+\cs_new_protected_nopar:Npn \__xtemplate_show_vars:nn #1#2
{
- \xtemplate_execute_if_code_exist:nnT {#1} {#2}
+ \__xtemplate_execute_if_code_exist:nnT {#1} {#2}
{
- \xtemplate_recover_vars:n { #1 / #2 }
- \xtemplate_show:Nnnn \l_xtemplate_vars_prop
+ \__xtemplate_recover_vars:n { #1 / #2 }
+ \__xtemplate_show:Nnnn \l__xtemplate_vars_prop
{#1} {#2} { variable~mapping }
}
}
-\cs_new_protected_nopar:Npn \xtemplate_show:Nnnn #1#2#3#4
+\cs_new_protected_nopar:Npn \__xtemplate_show:Nnnn #1#2#3#4
{
- \msg_aux_use:nnxxxx { xtemplate }
+ \__msg_term:nnnnn { xtemplate }
{ \prop_if_empty:NTF #1 { show-no-attribute } { show-attribute } }
- {#2} {#3} {#4} { }
- \msg_aux_show:x
- { \prop_map_function:NN #1 \msg_aux_show_unbraced:nn }
+ {#2} {#3} {#4}
+ \__msg_show_variable:x
+ { \prop_map_function:NN #1 \__msg_show_item_unbraced:nn }
}
-\cs_new_protected_nopar:Npn \xtemplate_show_values:nnn #1#2#3
+\cs_new_protected_nopar:Npn \__xtemplate_show_values:nnn #1#2#3
{
- \xtemplate_if_instance_exist:nnnT {#1} {#2} {#3}
+ \__xtemplate_if_instance_exist:nnnT {#1} {#2} {#3}
{
- \xtemplate_recover_values:n { #1 / #2 / #3 }
- \prop_if_empty:NTF \l_xtemplate_values_prop
+ \__xtemplate_recover_values:n { #1 / #2 / #3 }
+ \prop_if_empty:NTF \l__xtemplate_values_prop
{
- \msg_aux_use:nnxxxx { xtemplate } { show-no-values }
- {#1} {#2} {#3} { }
- \msg_aux_show:x { }
+ \__msg_term:nnnnn { xtemplate } { show-no-values }
+ {#1} {#2} {#3}
+ \__msg_show_variable:x { }
}
{
- \prop_pop:NnN \l_xtemplate_values_prop { from~template }
- \l_xtemplate_tmp_tl
- \msg_aux_use:nnxxxx { xtemplate } { show-values }
- {#1} {#2} {#3} { \l_xtemplate_tmp_tl }
- \msg_aux_show:x
+ \prop_pop:NnN \l__xtemplate_values_prop { from~template }
+ \l__xtemplate_tmp_tl
+ \__msg_term:nnnnnV { xtemplate } { show-values }
+ {#1} {#2} {#3} \l__xtemplate_tmp_tl
+ \__msg_show_variable:x
{
- \prop_map_function:NN \l_xtemplate_values_prop
- \msg_aux_show_unbraced:nn
+ \prop_map_function:NN \l__xtemplate_values_prop
+ \__msg_show_item_unbraced:nn
}
}
}
@@ -1299,55 +1299,55 @@
The~ \tl_if_empty:nF {#2} {collection~} instance~'#3'~
\tl_if_empty:nF {#2} { (from~collection~'#2')~ }
of~object~type~'#1'~
- \quark_if_no_value:NF #4 { (from~template~'#4')~ }
+ \str_if_eq:nnF { \q_no_value } {#4} { (from~template~'#4')~ }
has~values:
}
\cs_new_protected_nopar:Npn \DeclareObjectType #1#2
- { \xtemplate_declare_object_type:nn {#1} {#2} }
+ { \__xtemplate_declare_object_type:nn {#1} {#2} }
\cs_new_protected:Npn \DeclareTemplateInterface #1#2#3#4
- { \xtemplate_declare_template_keys:nnnn {#1} {#2} {#3} {#4} }
+ { \__xtemplate_declare_template_keys:nnnn {#1} {#2} {#3} {#4} }
\cs_new_protected:Npn \DeclareTemplateCode #1#2#3#4#5
- { \xtemplate_declare_template_code:nnnnn {#1} {#2} {#3} {#4} {#5} }
+ { \__xtemplate_declare_template_code:nnnnn {#1} {#2} {#3} {#4} {#5} }
\cs_new_protected:Npn \DeclareRestrictedTemplate #1#2#3#4
- { \xtemplate_declare_restricted:nnnn {#1} {#2} {#3} {#4} }
+ { \__xtemplate_declare_restricted:nnnn {#1} {#2} {#3} {#4} }
\cs_new_protected:Npn \DeclareInstance #1#2#3#4
- { \xtemplate_declare_instance:nnnnn {#1} {#3} { } {#2} {#4} }
+ { \__xtemplate_declare_instance:nnnnn {#1} {#3} { } {#2} {#4} }
\cs_new_protected:Npn \DeclareCollectionInstance #1#2#3#4#5
- { \xtemplate_declare_instance:nnnnn {#2} {#4} {#1} {#3} {#5} }
+ { \__xtemplate_declare_instance:nnnnn {#2} {#4} {#1} {#3} {#5} }
\cs_new_protected:Npn \EditTemplateDefaults #1#2#3
- { \xtemplate_edit_defaults:nnn {#1} {#2} {#3} }
+ { \__xtemplate_edit_defaults:nnn {#1} {#2} {#3} }
\cs_new_protected:Npn \EditInstance #1#2#3
- { \xtemplate_edit_instance:nnnn {#1} { } {#2} {#3} }
+ { \__xtemplate_edit_instance:nnnn {#1} { } {#2} {#3} }
\cs_new_protected:Npn \EditCollectionInstance #1#2#3#4
- { \xtemplate_edit_instance:nnnn {#2} {#1} {#3} {#4} }
+ { \__xtemplate_edit_instance:nnnn {#2} {#1} {#3} {#4} }
\cs_new_protected_nopar:Npn \UseTemplate #1#2#3
- { \xtemplate_use_template:nnn {#1} {#2} {#3} }
+ { \__xtemplate_use_template:nnn {#1} {#2} {#3} }
\cs_new_protected_nopar:Npn \UseInstance #1#2
- { \xtemplate_use_instance:nn {#1} {#2} }
+ { \__xtemplate_use_instance:nn {#1} {#2} }
\cs_new_protected_nopar:Npn \UseCollection #1#2
- { \xtemplate_use_collection:nn {#1} {#2} }
+ { \__xtemplate_use_collection:nn {#1} {#2} }
\cs_new_protected_nopar:Npn \ShowTemplateCode #1#2
- { \xtemplate_show_code:nn {#1} {#2} }
+ { \__xtemplate_show_code:nn {#1} {#2} }
\cs_new_protected_nopar:Npn \ShowTemplateDefaults #1#2
- { \xtemplate_show_defaults:nn {#1} {#2} }
+ { \__xtemplate_show_defaults:nn {#1} {#2} }
\cs_new_protected_nopar:Npn \ShowTemplateInterface #1#2
- { \xtemplate_show_keytypes:nn {#1} {#2} }
+ { \__xtemplate_show_keytypes:nn {#1} {#2} }
\cs_new_protected_nopar:Npn \ShowTemplateVariables #1#2
- { \xtemplate_show_vars:nn {#1} {#2} }
+ { \__xtemplate_show_vars:nn {#1} {#2} }
\cs_new_protected_nopar:Npn \ShowInstanceValues #1#2
- { \xtemplate_show_values:nnn {#1} { } {#2} }
+ { \__xtemplate_show_values:nnn {#1} { } {#2} }
\cs_new_protected_nopar:Npn \ShowCollectionInstanceValues #1#2#3
- { \xtemplate_show_values:nnn {#1} {#2} {#3} }
+ { \__xtemplate_show_values:nnn {#1} {#2} {#3} }
\cs_new_nopar:Npn \IfInstanceExistTF #1#2
- { \xtemplate_if_instance_exist:nnnTF {#1} { } {#2} }
+ { \__xtemplate_if_instance_exist:nnnTF {#1} { } {#2} }
\cs_new_nopar:Npn \IfInstanceExistT #1#2
- { \xtemplate_if_instance_exist:nnnT {#1} { } {#2} }
+ { \__xtemplate_if_instance_exist:nnnT {#1} { } {#2} }
\cs_new_nopar:Npn \IfInstanceExistF #1#2
- { \xtemplate_if_instance_exist:nnnF {#1} { } {#2} }
+ { \__xtemplate_if_instance_exist:nnnF {#1} { } {#2} }
\cs_new_protected:Npn \EvaluateNow #1 {#1}
\cs_new_protected:Npn \KeyValue #1 {#1}
\cs_new_protected_nopar:Npn \AssignTemplateKeys
- { \xtemplate_assignments_pop: }
+ { \__xtemplate_assignments_pop: }
\cs_new_eq:NN \ShowTemplateKeytypes \ShowTemplateInterface
%%
%%