summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/expl3.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty57
1 files changed, 39 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 7b8c68154f9..6adfc5fed60 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -60,8 +60,8 @@
}
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 Experimental code bundle wrapper}
-\def\ExplFileDate{2012/07/16}
-\def\ExplFileVersion{3990}
+\def\ExplFileDate{2012/08/14}
+\def\ExplFileVersion{4091}
\RequirePackage{etex}
\reserveinserts{32}
\ProvidesExplPackage
@@ -88,37 +88,58 @@
{ \token_to_str:N #1 }
}
}
- \cs_set_protected:Npn \tl_set:Nn #1#2
+ \cs_set_protected:Npn \__cs_tmp:w #1
{
- \__cs_check_exists:N #1
- \cs_set_nopar:Npx #1 { \exp_not:n {#2} }
- }
- \cs_set_protected:Npn \tl_set:Nx #1#2
- {
- \__cs_check_exists:N #1
- \cs_set_nopar:Npx #1 {#2}
+ \if_meaning:w ? #1
+ \exp_after:wN \use_none_delimit_by_q_recursion_stop:w
+ \fi:
+ \use:x
+ {
+ \cs_set_protected:Npn #1 \exp_not:n { ##1 ##2 }
+ {
+ \__cs_check_exists:N \exp_not:n {##1}
+ \exp_not:o { #1 {##1} {##2} }
+ }
+ }
+ \__cs_tmp:w
}
- \cs_set_protected:Npn \tl_gset:Nn #1#2
+ \__cs_tmp:w
+ \tl_set:Nn \tl_set:No \tl_set:Nx
+ \tl_gset:Nn \tl_gset:No \tl_gset:Nx
+ \tl_put_left:Nn \tl_put_left:NV
+ \tl_put_left:No \tl_put_left:Nx
+ \tl_gput_left:Nn \tl_gput_left:NV
+ \tl_gput_left:No \tl_gput_left:Nx
+ \tl_put_right:Nn \tl_put_right:NV
+ \tl_put_right:No \tl_put_right:Nx
+ \tl_gput_right:Nn \tl_gput_right:NV
+ \tl_gput_right:No \tl_gput_right:Nx
+ ? \q_recursion_stop
+ \cs_set_protected:Npn \tl_set_eq:NN #1#2
{
\__cs_check_exists:N #1
- \cs_gset_nopar:Npx #1 { \exp_not:n {#2} }
+ \__cs_check_exists:N #2
+ \cs_set_eq:NN #1 #2
}
- \cs_set_protected:Npn \tl_gset:Nx #1#2
+ \cs_set_protected:Npn \tl_gset_eq:NN #1#2
{
\__cs_check_exists:N #1
- \cs_gset_nopar:Npx #1 {#2}
+ \__cs_check_exists:N #2
+ \cs_gset_eq:NN #1 #2
}
- \cs_set_protected:Npn \tl_set_eq:NN #1#2
+ \cs_set_protected:Npn \tl_concat:NNN #1#2#3
{
\__cs_check_exists:N #1
\__cs_check_exists:N #2
- \cs_set_eq:NN #1 #2
+ \__cs_check_exists:N #3
+ \tl_set:Nx #1 { \exp_not:o {#2} \exp_not:o {#3} }
}
- \cs_set_protected:Npn \tl_gset_eq:NN #1#2
+ \cs_set_protected:Npn \tl_gconcat:NNN #1#2#3
{
\__cs_check_exists:N #1
\__cs_check_exists:N #2
- \cs_gset_eq:NN #1 #2
+ \__cs_check_exists:N #3
+ \tl_gset:Nx #1 { \exp_not:o {#2} \exp_not:o {#3} }
}
\fi
\RequirePackage { l3seq, l3int, l3quark, l3prg }