summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3token.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3token.sty146
1 files changed, 73 insertions, 73 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
index 4546eabd5f0..1a744a15610 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
@@ -46,107 +46,107 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3token.dtx 2931 2011-10-22 13:48:28Z bruno $
+\GetIdInfo$Id: l3token.dtx 3099 2011-12-27 21:41:02Z joseph $
{L3 Experimental token manipulation}
%% \begin{function}[EXP,pTF]{\token_if_protected_long_macro:N}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\package_check_loaded_expl:
-\cs_new_protected_nopar:Npn \char_set_catcode:nn #1#2
+\cs_new_protected:Npn \char_set_catcode:nn #1#2
{ \tex_catcode:D #1 = \int_eval:w #2 \int_eval_end: }
-\cs_new_nopar:Npn \char_value_catcode:n #1
+\cs_new:Npn \char_value_catcode:n #1
{ \tex_the:D \tex_catcode:D \int_eval:w #1\int_eval_end: }
-\cs_new_nopar:Npn \char_show_value_catcode:n #1
+\cs_new_protected:Npn \char_show_value_catcode:n #1
{ \tex_showthe:D \tex_catcode:D \int_eval:w #1 \int_eval_end: }
-\cs_new_protected_nopar:Npn \char_set_catcode_escape:N #1
+\cs_new_protected:Npn \char_set_catcode_escape:N #1
{ \char_set_catcode:nn { `#1 } \c_zero }
-\cs_new_protected_nopar:Npn \char_set_catcode_group_begin:N #1
+\cs_new_protected:Npn \char_set_catcode_group_begin:N #1
{ \char_set_catcode:nn { `#1 } \c_one }
-\cs_new_protected_nopar:Npn \char_set_catcode_group_end:N #1
+\cs_new_protected:Npn \char_set_catcode_group_end:N #1
{ \char_set_catcode:nn { `#1 } \c_two }
-\cs_new_protected_nopar:Npn \char_set_catcode_math_toggle:N #1
+\cs_new_protected:Npn \char_set_catcode_math_toggle:N #1
{ \char_set_catcode:nn { `#1 } \c_three }
-\cs_new_protected_nopar:Npn \char_set_catcode_alignment:N #1
+\cs_new_protected:Npn \char_set_catcode_alignment:N #1
{ \char_set_catcode:nn { `#1 } \c_four }
-\cs_new_protected_nopar:Npn \char_set_catcode_end_line:N #1
+\cs_new_protected:Npn \char_set_catcode_end_line:N #1
{ \char_set_catcode:nn { `#1 } \c_five }
-\cs_new_protected_nopar:Npn \char_set_catcode_parameter:N #1
+\cs_new_protected:Npn \char_set_catcode_parameter:N #1
{ \char_set_catcode:nn { `#1 } \c_six }
-\cs_new_protected_nopar:Npn \char_set_catcode_math_superscript:N #1
+\cs_new_protected:Npn \char_set_catcode_math_superscript:N #1
{ \char_set_catcode:nn { `#1 } \c_seven }
-\cs_new_protected_nopar:Npn \char_set_catcode_math_subscript:N #1
+\cs_new_protected:Npn \char_set_catcode_math_subscript:N #1
{ \char_set_catcode:nn { `#1 } \c_eight }
-\cs_new_protected_nopar:Npn \char_set_catcode_ignore:N #1
+\cs_new_protected:Npn \char_set_catcode_ignore:N #1
{ \char_set_catcode:nn { `#1 } \c_nine }
-\cs_new_protected_nopar:Npn \char_set_catcode_space:N #1
+\cs_new_protected:Npn \char_set_catcode_space:N #1
{ \char_set_catcode:nn { `#1 } \c_ten }
-\cs_new_protected_nopar:Npn \char_set_catcode_letter:N #1
+\cs_new_protected:Npn \char_set_catcode_letter:N #1
{ \char_set_catcode:nn { `#1 } \c_eleven }
-\cs_new_protected_nopar:Npn \char_set_catcode_other:N #1
+\cs_new_protected:Npn \char_set_catcode_other:N #1
{ \char_set_catcode:nn { `#1 } \c_twelve }
-\cs_new_protected_nopar:Npn \char_set_catcode_active:N #1
+\cs_new_protected:Npn \char_set_catcode_active:N #1
{ \char_set_catcode:nn { `#1 } \c_thirteen }
-\cs_new_protected_nopar:Npn \char_set_catcode_comment:N #1
+\cs_new_protected:Npn \char_set_catcode_comment:N #1
{ \char_set_catcode:nn { `#1 } \c_fourteen }
-\cs_new_protected_nopar:Npn \char_set_catcode_invalid:N #1
+\cs_new_protected:Npn \char_set_catcode_invalid:N #1
{ \char_set_catcode:nn { `#1 } \c_fifteen }
-\cs_new_protected_nopar:Npn \char_set_catcode_escape:n #1
+\cs_new_protected:Npn \char_set_catcode_escape:n #1
{ \char_set_catcode:nn {#1} \c_zero }
-\cs_new_protected_nopar:Npn \char_set_catcode_group_begin:n #1
+\cs_new_protected:Npn \char_set_catcode_group_begin:n #1
{ \char_set_catcode:nn {#1} \c_one }
-\cs_new_protected_nopar:Npn \char_set_catcode_group_end:n #1
+\cs_new_protected:Npn \char_set_catcode_group_end:n #1
{ \char_set_catcode:nn {#1} \c_two }
-\cs_new_protected_nopar:Npn \char_set_catcode_math_toggle:n #1
+\cs_new_protected:Npn \char_set_catcode_math_toggle:n #1
{ \char_set_catcode:nn {#1} \c_three }
-\cs_new_protected_nopar:Npn \char_set_catcode_alignment:n #1
+\cs_new_protected:Npn \char_set_catcode_alignment:n #1
{ \char_set_catcode:nn {#1} \c_four }
-\cs_new_protected_nopar:Npn \char_set_catcode_end_line:n #1
+\cs_new_protected:Npn \char_set_catcode_end_line:n #1
{ \char_set_catcode:nn {#1} \c_five }
-\cs_new_protected_nopar:Npn \char_set_catcode_parameter:n #1
+\cs_new_protected:Npn \char_set_catcode_parameter:n #1
{ \char_set_catcode:nn {#1} \c_six }
-\cs_new_protected_nopar:Npn \char_set_catcode_math_superscript:n #1
+\cs_new_protected:Npn \char_set_catcode_math_superscript:n #1
{ \char_set_catcode:nn {#1} \c_seven }
-\cs_new_protected_nopar:Npn \char_set_catcode_math_subscript:n #1
+\cs_new_protected:Npn \char_set_catcode_math_subscript:n #1
{ \char_set_catcode:nn {#1} \c_eight }
-\cs_new_protected_nopar:Npn \char_set_catcode_ignore:n #1
+\cs_new_protected:Npn \char_set_catcode_ignore:n #1
{ \char_set_catcode:nn {#1} \c_nine }
-\cs_new_protected_nopar:Npn \char_set_catcode_space:n #1
+\cs_new_protected:Npn \char_set_catcode_space:n #1
{ \char_set_catcode:nn {#1} \c_ten }
-\cs_new_protected_nopar:Npn \char_set_catcode_letter:n #1
+\cs_new_protected:Npn \char_set_catcode_letter:n #1
{ \char_set_catcode:nn {#1} \c_eleven }
-\cs_new_protected_nopar:Npn \char_set_catcode_other:n #1
+\cs_new_protected:Npn \char_set_catcode_other:n #1
{ \char_set_catcode:nn {#1} \c_twelve }
-\cs_new_protected_nopar:Npn \char_set_catcode_active:n #1
+\cs_new_protected:Npn \char_set_catcode_active:n #1
{ \char_set_catcode:nn {#1} \c_thirteen }
-\cs_new_protected_nopar:Npn \char_set_catcode_comment:n #1
+\cs_new_protected:Npn \char_set_catcode_comment:n #1
{ \char_set_catcode:nn {#1} \c_fourteen }
-\cs_new_protected_nopar:Npn \char_set_catcode_invalid:n #1
+\cs_new_protected:Npn \char_set_catcode_invalid:n #1
{ \char_set_catcode:nn {#1} \c_fifteen }
-\cs_new_protected_nopar:Npn \char_set_mathcode:nn #1#2
+\cs_new_protected:Npn \char_set_mathcode:nn #1#2
{ \tex_mathcode:D #1 = \int_eval:w #2 \int_eval_end: }
-\cs_new_nopar:Npn \char_value_mathcode:n #1
+\cs_new:Npn \char_value_mathcode:n #1
{ \tex_the:D \tex_mathcode:D \int_eval:w #1\int_eval_end: }
-\cs_new_nopar:Npn \char_show_value_mathcode:n #1
+\cs_new_protected:Npn \char_show_value_mathcode:n #1
{ \tex_showthe:D \tex_mathcode:D \int_eval:w #1 \int_eval_end: }
-\cs_new_protected_nopar:Npn \char_set_lccode:nn #1#2
+\cs_new_protected:Npn \char_set_lccode:nn #1#2
{ \tex_lccode:D #1 = \int_eval:w #2 \int_eval_end: }
-\cs_new_nopar:Npn \char_value_lccode:n #1
+\cs_new:Npn \char_value_lccode:n #1
{ \tex_the:D \tex_lccode:D \int_eval:w #1\int_eval_end: }
-\cs_new_nopar:Npn \char_show_value_lccode:n #1
+\cs_new_protected:Npn \char_show_value_lccode:n #1
{ \tex_showthe:D \tex_lccode:D \int_eval:w #1 \int_eval_end: }
-\cs_new_protected_nopar:Npn \char_set_uccode:nn #1#2
+\cs_new_protected:Npn \char_set_uccode:nn #1#2
{ \tex_uccode:D #1 = \int_eval:w #2 \int_eval_end: }
-\cs_new_nopar:Npn \char_value_uccode:n #1
+\cs_new:Npn \char_value_uccode:n #1
{ \tex_the:D \tex_uccode:D \int_eval:w #1\int_eval_end: }
-\cs_new_nopar:Npn \char_show_value_uccode:n #1
+\cs_new_protected:Npn \char_show_value_uccode:n #1
{ \tex_showthe:D \tex_uccode:D \int_eval:w #1 \int_eval_end: }
-\cs_new_protected_nopar:Npn \char_set_sfcode:nn #1#2
+\cs_new_protected:Npn \char_set_sfcode:nn #1#2
{ \tex_sfcode:D #1 = \int_eval:w #2 \int_eval_end: }
-\cs_new_nopar:Npn \char_value_sfcode:n #1
+\cs_new:Npn \char_value_sfcode:n #1
{ \tex_the:D \tex_sfcode:D \int_eval:w #1\int_eval_end: }
-\cs_new_nopar:Npn \char_show_value_sfcode:n #1
+\cs_new_protected:Npn \char_show_value_sfcode:n #1
{ \tex_showthe:D \tex_sfcode:D \int_eval:w #1 \int_eval_end: }
-\cs_new_protected_nopar:Npn \token_new:Nn #1#2 { \cs_new_eq:NN #1 #2 }
+\cs_new_protected:Npn \token_new:Nn #1#2 { \cs_new_eq:NN #1 #2 }
\cs_new_eq:NN \c_group_begin_token {
\cs_new_eq:NN \c_group_end_token }
\group_begin:
@@ -253,7 +253,7 @@
\exp_after:wN \token_if_macro_p_aux:w
\token_to_meaning:N #1 MA; \q_stop
}
- \cs_new_nopar:Npn \token_if_macro_p_aux:w #1 MA #2 ; #3 \q_stop
+ \cs_new:Npn \token_if_macro_p_aux:w #1 MA #2 ; #3 \q_stop
{
\if_int_compare:w \pdftex_strcmp:D { #2 } { cro } = \c_zero
\prg_return_true:
@@ -293,14 +293,14 @@
\exp_after:wN \token_if_chardef_aux:w
\token_to_meaning:N #1 ?CHAR" \q_stop
}
- \cs_new_nopar:Npn \token_if_chardef_aux:w #1 ?CHAR" #2 \q_stop
+ \cs_new:Npn \token_if_chardef_aux:w #1 ?CHAR" #2 \q_stop
{ \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } }
\prg_new_conditional:Npnn \token_if_mathchardef:N #1 { p , T , F , TF }
{
\exp_after:wN \token_if_mathchardef_aux:w
\token_to_meaning:N #1 ?MAYHCHAR" \q_stop
}
- \cs_new_nopar:Npn \token_if_mathchardef_aux:w #1 ?MAYHCHAR" #2 \q_stop
+ \cs_new:Npn \token_if_mathchardef_aux:w #1 ?MAYHCHAR" #2 \q_stop
{ \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } }
\prg_new_conditional:Npnn \token_if_int_register:N #1 { p , T , F , TF }
{
@@ -311,7 +311,7 @@
\token_to_meaning:N #1 ?COUXY \q_stop
\fi:
}
- \cs_new_nopar:Npn \token_if_int_register_aux:w #1 ?COUXY #2 \q_stop
+ \cs_new:Npn \token_if_int_register_aux:w #1 ?COUXY #2 \q_stop
{ \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } }
\prg_new_conditional:Npnn \token_if_skip_register:N #1 { p , T , F , TF }
{
@@ -322,7 +322,7 @@
\token_to_meaning:N #1?SKIP\q_stop
\fi:
}
- \cs_new_nopar:Npn \token_if_skip_register_aux:w #1 ?SKIP #2 \q_stop
+ \cs_new:Npn \token_if_skip_register_aux:w #1 ?SKIP #2 \q_stop
{ \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } }
\prg_new_conditional:Npnn \token_if_dim_register:N #1 { p , T , F , TF }
{
@@ -333,7 +333,7 @@
\token_to_meaning:N #1 ?ZIMEX \q_stop
\fi:
}
- \cs_new_nopar:Npn \token_if_dim_register_aux:w #1 ?ZIMEX #2 \q_stop
+ \cs_new:Npn \token_if_dim_register_aux:w #1 ?ZIMEX #2 \q_stop
{ \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } }
\prg_new_conditional:Npnn \token_if_toks_register:N #1 { p , T , F , TF }
{
@@ -344,7 +344,7 @@
\token_to_meaning:N #1 ?YOKS \q_stop
\fi:
}
- \cs_new_nopar:Npn \token_if_toks_register_aux:w #1 ?YOKS #2 \q_stop
+ \cs_new:Npn \token_if_toks_register_aux:w #1 ?YOKS #2 \q_stop
{ \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } }
\prg_new_conditional:Npnn \token_if_protected_macro:N #1
{ p , T , F , TF }
@@ -352,7 +352,7 @@
\exp_after:wN \token_if_protected_macro_aux:w
\token_to_meaning:N #1 ?PROYECYEZ~MACRO \q_stop
}
- \cs_new_nopar:Npn \token_if_protected_macro_aux:w
+ \cs_new:Npn \token_if_protected_macro_aux:w
#1 ?PROYECYEZ~MACRO #2 \q_stop
{ \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } }
\prg_new_conditional:Npnn \token_if_long_macro:N #1 { p , T , F , TF }
@@ -360,7 +360,7 @@
\exp_after:wN \token_if_long_macro_aux:w
\token_to_meaning:N #1 ?LOXG~MACRO \q_stop
}
- \cs_new_nopar:Npn \token_if_long_macro_aux:w #1 ?LOXG~MACRO #2 \q_stop
+ \cs_new:Npn \token_if_long_macro_aux:w #1 ?LOXG~MACRO #2 \q_stop
{ \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } }
\prg_new_conditional:Npnn \token_if_protected_long_macro:N #1
{ p , T , F , TF }
@@ -368,7 +368,7 @@
\exp_after:wN \token_if_protected_long_macro_aux:w
\token_to_meaning:N #1 ?PROYECYEZ?LOXG~MACRO \q_stop
}
- \cs_new_nopar:Npn \token_if_protected_long_macro_aux:w
+ \cs_new:Npn \token_if_protected_long_macro_aux:w
#1 ?PROYECYEZ?LOXG~MACRO #2 \q_stop
{ \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } }
}
@@ -389,14 +389,14 @@
\token_to_meaning:N #1 ; ; ; \q_stop #1
}
}
- \cs_new_nopar:Npn \token_if_primitive_aux:NNw #1#2 #3 ; #4 \q_stop
+ \cs_new:Npn \token_if_primitive_aux:NNw #1#2 #3 ; #4 \q_stop
{
\tl_if_empty:oTF { \token_if_primitive_aux_space:w #3 ~ }
{ \token_if_primitive_aux_loop:N #3 ; \q_stop }
{ \token_if_primitive_aux_nullfont:N }
}
}
-\cs_new_nopar:Npn \token_if_primitive_aux_space:w #1 ~ { }
+\cs_new:Npn \token_if_primitive_aux_space:w #1 ~ { }
\cs_new:Npn \token_if_primitive_aux_nullfont:N #1
{
\if_meaning:w \tex_nullfont:D #1
@@ -405,7 +405,7 @@
\prg_return_false:
\fi:
}
-\cs_new_nopar:Npn \token_if_primitive_aux_loop:N #1
+\cs_new:Npn \token_if_primitive_aux_loop:N #1
{
\if_num:w `#1 < \c_token_A_int %
\exp_after:wN \token_if_primitive_auxii:Nw
@@ -414,7 +414,7 @@
\exp_after:wN \token_if_primitive_aux_loop:N
\fi:
}
-\cs_new_nopar:Npn \token_if_primitive_auxii:Nw #1 #2 \q_stop
+\cs_new:Npn \token_if_primitive_auxii:Nw #1 #2 \q_stop
{
\if:w : #1
\exp_after:wN \token_if_primitive_aux_undefined:N
@@ -434,7 +434,7 @@
\cs_new_eq:NN \l_peek_token ?
\cs_new_eq:NN \g_peek_token ?
\cs_new_eq:NN \l_peek_search_token ?
-\cs_new_nopar:Npn \l_peek_search_tl { }
+\tl_new:N \l_peek_search_tl
\cs_new_nopar:Npn \peek_true:w { }
\cs_new_nopar:Npn \peek_true_aux:w { }
\cs_new_nopar:Npn \peek_false:w { }
@@ -540,13 +540,13 @@
\cs_new_protected_nopar:Npn \peek_ignore_spaces_execute_branches_aux:
{ \peek_after:Nw \peek_ignore_spaces_execute_branches: }
\group_begin:
- \cs_set_nopar:Npn \peek_def:nnnn #1#2#3#4
+ \cs_set:Npn \peek_def:nnnn #1#2#3#4
{
\peek_def_aux:nnnnn {#1} {#2} {#3} {#4} { TF }
\peek_def_aux:nnnnn {#1} {#2} {#3} {#4} { T }
\peek_def_aux:nnnnn {#1} {#2} {#3} {#4} { F }
}
- \cs_set_nopar:Npn \peek_def_aux:nnnnn #1#2#3#4#5
+ \cs_set:Npn \peek_def_aux:nnnnn #1#2#3#4#5
{
\cs_gset_nopar:cpx { #1 #5 }
{
@@ -606,7 +606,7 @@
{ \peek_ignore_spaces_execute_branches: }
\group_end:
\exp_args:Nno \use:nn
- { \cs_new_nopar:Npn \token_get_prefix_arg_replacement_aux:wN #1 }
+ { \cs_new:Npn \token_get_prefix_arg_replacement_aux:wN #1 }
{ \tl_to_str:n { macro : } #2 -> #3 \q_stop #4 }
{ #4 {#1} {#2} {#3} }
\cs_new:Npn \token_get_prefix_spec:N #1
@@ -648,12 +648,12 @@
\tl_to_lowercase:n { \group_end: #2 ^^@ }
}
}
- \char_tmp:NN \char_active_set:Npn \cs_set:Npn
- \char_tmp:NN \char_active_set:Npx \cs_set:Npx
- \char_tmp:NN \char_active_gset:Npn \cs_gset:Npn
- \char_tmp:NN \char_active_gset:Npx \cs_gset:Npx
- \char_tmp:NN \char_active_set_eq:NN \cs_set_eq:NN
- \char_tmp:NN \char_active_gset_eq:NN \cs_gset_eq:NN
+ \char_tmp:NN \char_set_active:Npn \cs_set:Npn
+ \char_tmp:NN \char_set_active:Npx \cs_set:Npx
+ \char_tmp:NN \char_gset_active:Npn \cs_gset:Npn
+ \char_tmp:NN \char_gset_active:Npx \cs_gset:Npx
+ \char_tmp:NN \char_set_active_eq:NN \cs_set_eq:NN
+ \char_tmp:NN \char_gset_active_eq:NN \cs_gset_eq:NN
\group_end:
\cs_new_protected_nopar:Npn \peek_execute_branches_N_type:
{