summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3basics.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3basics.sty109
1 files changed, 55 insertions, 54 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
index 2193b30348f..182505d931f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3basics.dtx 3460 2012-02-26 12:16:41Z will $
+\GetIdInfo$Id: l3basics.dtx 3491 2012-03-04 06:13:18Z bruno $
{L3 Experimental basic definitions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -67,13 +67,13 @@
\tex_let:D \if_mode_inner: \tex_ifinner:D
\tex_let:D \if_cs_exist:N \etex_ifdefined:D
\tex_let:D \if_cs_exist:w \etex_ifcsname:D
+\tex_let:D \cs:w \tex_csname:D
+\tex_let:D \cs_end: \tex_endcsname:D
\tex_let:D \exp_after:wN \tex_expandafter:D
\tex_let:D \exp_not:N \tex_noexpand:D
\tex_let:D \exp_not:n \etex_unexpanded:D
\tex_let:D \token_to_meaning:N \tex_meaning:D
\tex_let:D \token_to_str:N \tex_string:D
-\tex_let:D \cs:w \tex_csname:D
-\tex_let:D \cs_end: \tex_endcsname:D
\tex_let:D \cs_meaning:N \tex_meaning:D
\tex_let:D \cs_show:N \tex_show:D
\tex_let:D \scan_stop: \tex_relax:D
@@ -398,11 +398,11 @@
{ \prg_return_true: }
}
\cs_set:Npn \cs_if_exist_use:NTF #1#2
- { \cs_if_exist:NTF #1 { #1 #2} }
+ { \cs_if_exist:NTF #1 { #1 #2 } }
\cs_set:Npn \cs_if_exist_use:NF #1
{ \cs_if_exist:NTF #1 { #1 } }
\cs_set:Npn \cs_if_exist_use:NT #1 #2
- { \cs_if_exist:NTF #1 { #1#2 } { } }
+ { \cs_if_exist:NTF #1 { #1 #2 } { } }
\cs_set:Npn \cs_if_exist_use:N #1
{ \cs_if_exist:NTF #1 { #1 } { } }
\cs_set:Npn \cs_if_exist_use:cTF #1#2
@@ -512,6 +512,10 @@
\cs_new_protected_nopar:Npn \cs_set_eq:cN { \exp_args:Nc \cs_set_eq:NN }
\cs_new_protected_nopar:Npn \cs_set_eq:Nc { \exp_args:NNc \cs_set_eq:NN }
\cs_new_protected_nopar:Npn \cs_set_eq:cc { \exp_args:Ncc \cs_set_eq:NN }
+\cs_new_protected_nopar:Npn \cs_gset_eq:NN { \tex_global:D \cs_set_eq:NN }
+\cs_new_protected_nopar:Npn \cs_gset_eq:Nc { \exp_args:NNc \cs_gset_eq:NN }
+\cs_new_protected_nopar:Npn \cs_gset_eq:cN { \exp_args:Nc \cs_gset_eq:NN }
+\cs_new_protected_nopar:Npn \cs_gset_eq:cc { \exp_args:Ncc \cs_gset_eq:NN }
\cs_new_protected:Npn \cs_new_eq:NN #1
{
\chk_if_free_cs:N #1
@@ -520,10 +524,6 @@
\cs_new_protected_nopar:Npn \cs_new_eq:cN { \exp_args:Nc \cs_new_eq:NN }
\cs_new_protected_nopar:Npn \cs_new_eq:Nc { \exp_args:NNc \cs_new_eq:NN }
\cs_new_protected_nopar:Npn \cs_new_eq:cc { \exp_args:Ncc \cs_new_eq:NN }
-\cs_new_protected_nopar:Npn \cs_gset_eq:NN { \tex_global:D \cs_set_eq:NN }
-\cs_new_protected_nopar:Npn \cs_gset_eq:Nc { \exp_args:NNc \cs_gset_eq:NN }
-\cs_new_protected_nopar:Npn \cs_gset_eq:cN { \exp_args:Nc \cs_gset_eq:NN }
-\cs_new_protected_nopar:Npn \cs_gset_eq:cc { \exp_args:Ncc \cs_gset_eq:NN }
\cs_new_protected:Npn \cs_undefine:N #1
{ \cs_gset_eq:NN #1 \c_undefined:D }
\cs_new_protected:Npn \cs_undefine:c #1
@@ -587,11 +587,11 @@
}
\cs_set:Npn \cs_tmp:w #1#2#3
{
- \cs_set_protected:cpx { cs_ #1 : #2 } ##1##2
+ \cs_new_protected:cpx { cs_ #1 : #2 } ##1##2
{
\exp_not:N \cs_generate_from_arg_count:NNnn ##1
\exp_after:wN \exp_not:N \cs:w cs_#1 : #3 \cs_end:
- { \exp_not:N\cs_get_arg_count_from_signature:N ##1 }{##2}
+ { \exp_not:N \cs_get_arg_count_from_signature:N ##1 }{##2}
}
}
\cs_tmp:w { set } { Nn } { Npn }
@@ -610,21 +610,22 @@
\cs_tmp:w { gset_protected } { Nx } { Npx }
\cs_tmp:w { gset_protected_nopar } { Nn } { Npn }
\cs_tmp:w { gset_protected_nopar } { Nx } { Npx }
-\cs_tmp:w { new } { Nn } { Npn }
-\cs_tmp:w { new } { Nx } { Npx }
-\cs_tmp:w { new_nopar } { Nn } { Npn }
-\cs_tmp:w { new_nopar } { Nx } { Npx }
-\cs_tmp:w { new_protected } { Nn } { Npn }
-\cs_tmp:w { new_protected } { Nx } { Npx }
-\cs_tmp:w { new_protected_nopar } { Nn } { Npn }
-\cs_tmp:w { new_protected_nopar } { Nx } { Npx }
+\cs_tmp:w { new } { Nn } { Npn }
+\cs_tmp:w { new } { Nx } { Npx }
+\cs_tmp:w { new_nopar } { Nn } { Npn }
+\cs_tmp:w { new_nopar } { Nx } { Npx }
+\cs_tmp:w { new_protected } { Nn } { Npn }
+\cs_tmp:w { new_protected } { Nx } { Npx }
+\cs_tmp:w { new_protected_nopar } { Nn } { Npn }
+\cs_tmp:w { new_protected_nopar } { Nx } { Npx }
\cs_set:Npn \cs_tmp:w #1#2#3
{
- \cs_set_protected:cpx {cs_#1:#2}##1##2{
- \exp_not:N\cs_generate_from_arg_count:cNnn {##1}
- \exp_after:wN \exp_not:N \cs:w cs_#1:#3 \cs_end:
- { \exp_not:N \cs_get_arg_count_from_signature:c {##1} } {##2}
- }
+ \cs_new_protected:cpx {cs_#1:#2} ##1##2
+ {
+ \exp_not:N \cs_generate_from_arg_count:cNnn {##1}
+ \exp_after:wN \exp_not:N \cs:w cs_#1:#3 \cs_end:
+ { \exp_not:N \cs_get_arg_count_from_signature:c {##1} } {##2}
+ }
}
\cs_tmp:w { set } { cn } { Npn }
\cs_tmp:w { set } { cx } { Npx }
@@ -642,14 +643,14 @@
\cs_tmp:w { gset_protected } { cx } { Npx }
\cs_tmp:w { gset_protected_nopar } { cn } { Npn }
\cs_tmp:w { gset_protected_nopar } { cx } { Npx }
-\cs_tmp:w { new } { cn } { Npn }
-\cs_tmp:w { new } { cx } { Npx }
-\cs_tmp:w { new_nopar } { cn } { Npn }
-\cs_tmp:w { new_nopar } { cx } { Npx }
-\cs_tmp:w { new_protected } { cn } { Npn }
-\cs_tmp:w { new_protected } { cx } { Npx }
-\cs_tmp:w { new_protected_nopar } { cn } { Npn }
-\cs_tmp:w { new_protected_nopar } { cx } { Npx }
+\cs_tmp:w { new } { cn } { Npn }
+\cs_tmp:w { new } { cx } { Npx }
+\cs_tmp:w { new_nopar } { cn } { Npn }
+\cs_tmp:w { new_nopar } { cx } { Npx }
+\cs_tmp:w { new_protected } { cn } { Npn }
+\cs_tmp:w { new_protected } { cx } { Npx }
+\cs_tmp:w { new_protected_nopar } { cn } { Npn }
+\cs_tmp:w { new_protected_nopar } { cx } { Npx }
\prg_new_conditional:Npnn \cs_if_eq:NN #1#2 { p , T , F , TF }
{
\if_meaning:w #1#2
@@ -670,11 +671,11 @@
\cs_new:Npn \kernel_register_show:N #1
{
\cs_if_exist:NTF #1
- { \tex_showthe:D \use:n #1 }
- {
- \msg_kernel_error:nnx { kernel } { variable-not-defined }
- { \token_to_str:N #1 }
- }
+ { \tex_showthe:D \use:n {#1} }
+ {
+ \msg_kernel_error:nnx { kernel } { variable-not-defined }
+ { \token_to_str:N #1 }
+ }
}
\cs_new_nopar:Npn \kernel_register_show:c
{ \exp_args:Nc \kernel_register_show:N }
@@ -692,32 +693,32 @@
\cs_new_eq:NN \xetex_if_engine_p: \c_false_bool
\cs_if_exist:NT \xetex_XeTeXversion:D
{
- \cs_set_eq:NN \pdftex_if_engine:T \use_none:n
- \cs_set_eq:NN \pdftex_if_engine:F \use:n
- \cs_set_eq:NN \pdftex_if_engine:TF \use_ii:nn
- \cs_set_eq:NN \xetex_if_engine:T \use:n
- \cs_set_eq:NN \xetex_if_engine:F \use_none:n
- \cs_set_eq:NN \xetex_if_engine:TF \use_i:nn
- \cs_set_eq:NN \pdftex_if_engine_p: \c_false_bool
- \cs_set_eq:NN \xetex_if_engine_p: \c_true_bool
+ \cs_gset_eq:NN \pdftex_if_engine:T \use_none:n
+ \cs_gset_eq:NN \pdftex_if_engine:F \use:n
+ \cs_gset_eq:NN \pdftex_if_engine:TF \use_ii:nn
+ \cs_gset_eq:NN \xetex_if_engine:T \use:n
+ \cs_gset_eq:NN \xetex_if_engine:F \use_none:n
+ \cs_gset_eq:NN \xetex_if_engine:TF \use_i:nn
+ \cs_gset_eq:NN \pdftex_if_engine_p: \c_false_bool
+ \cs_gset_eq:NN \xetex_if_engine_p: \c_true_bool
}
\cs_if_exist:NT \luatex_directlua:D
{
- \cs_set_eq:NN \luatex_if_engine:T \use:n
- \cs_set_eq:NN \luatex_if_engine:F \use_none:n
- \cs_set_eq:NN \luatex_if_engine:TF \use_i:nn
- \cs_set_eq:NN \pdftex_if_engine:T \use_none:n
- \cs_set_eq:NN \pdftex_if_engine:F \use:n
- \cs_set_eq:NN \pdftex_if_engine:TF \use_ii:nn
- \cs_set_eq:NN \luatex_if_engine_p: \c_true_bool
- \cs_set_eq:NN \pdftex_if_engine_p: \c_false_bool
+ \cs_gset_eq:NN \luatex_if_engine:T \use:n
+ \cs_gset_eq:NN \luatex_if_engine:F \use_none:n
+ \cs_gset_eq:NN \luatex_if_engine:TF \use_i:nn
+ \cs_gset_eq:NN \pdftex_if_engine:T \use_none:n
+ \cs_gset_eq:NN \pdftex_if_engine:F \use:n
+ \cs_gset_eq:NN \pdftex_if_engine:TF \use_ii:nn
+ \cs_gset_eq:NN \luatex_if_engine_p: \c_true_bool
+ \cs_gset_eq:NN \pdftex_if_engine_p: \c_false_bool
}
\cs_new_nopar:Npn \prg_do_nothing: { }
\prg_new_conditional:Npnn \str_if_eq:nn #1#2 { p , T , F , TF }
{
\if_int_compare:w \pdftex_strcmp:D { \exp_not:n {#1} } { \exp_not:n {#2} }
= \c_zero
- \prg_return_true: \else: \prg_return_false: \fi:
+ \prg_return_true: \else: \prg_return_false: \fi:
}
\prg_new_conditional:Npnn \str_if_eq:xx #1#2 { p , T , F , TF }
{