summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2009-07-11 00:46:31 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2009-07-11 00:46:31 +0000
commitaf8f869831d4976ff671f8f0b0ed8de0bb5dc7e8 (patch)
treed5f531a67e24d8b5b16030c5d50750cf8d3fea3e /Master/texmf-dist/tex
parent0c5054c55e1f737f4ecea5cde8f2d552a3d7ffd8 (diff)
expl3 update
git-svn-id: svn://tug.org/texlive/trunk@14222 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3basics.sty5
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3expan.sty10
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3keyval.sty2
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3prop.sty4
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3seq.sty19
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3tl.sty31
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3toks.sty7
7 files changed, 45 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3basics.sty b/Master/texmf-dist/tex/latex/expl3/l3basics.sty
index 4d9e49664c5..08ce70bc2ee 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3basics.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3basics.dtx 1365 2009-05-31 17:26:17Z mittelba $
+\GetIdInfo$Id: l3basics.dtx 1414 2009-06-16 07:34:57Z joseph $
{L3 Experimental basic definitions}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -515,6 +515,9 @@
\cs_new_nopar:Npn \cs_gnew_eq:Nc { \exp_args:NNc \cs_gnew_eq:NN }
\cs_new_nopar:Npn \cs_gnew_eq:cc { \exp_args:Ncc \cs_gnew_eq:NN }
\cs_new_nopar:Npn \cs_gundefine:N #1{\cs_gset_eq:NN #1\c_undefined:D}
+\cs_new_nopar:Npn \cs_gundefine:c #1{
+ \cs_gset_eq:cN {#1} \c_undefined:D
+}
\if_cs_exist:N \xetex_version:D
\cs_new_eq:NN \c_xetex_is_engine_bool \c_true_bool
\else:
diff --git a/Master/texmf-dist/tex/latex/expl3/l3expan.sty b/Master/texmf-dist/tex/latex/expl3/l3expan.sty
index c4929513b38..7cb632f1fd9 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3expan.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3expan.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3expan.dtx 1376 2009-06-01 17:01:30Z morten $
+\GetIdInfo$Id: l3expan.dtx 1418 2009-07-04 08:24:17Z joseph $
{L3 Experimental Argument Expansion module}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -126,10 +126,6 @@
\cs_gset:Npn\exp_eval_error_msg:w#1\tex_the:D#2{%
\fi:\fi:\erroneous variable used!}%
\group_end:%
-\cs_new:Npn\::d#1\:::#2#3{
- \exp_after:wN\exp_after:wN\exp_after:wN\exp_arg_next:nnn
- \exp_after:wN\exp_after:wN\exp_after:wN{#3}{#1}{#2}
-}
\cs_new:Npn \exp_args:No #1#2{\exp_after:wN#1\exp_after:wN{#2}}
\cs_new:Npn \exp_args:NNo #1#2#3{\exp_after:wN#1\exp_after:wN#2
\exp_after:wN{#3}}
@@ -146,12 +142,10 @@
\cs_end:\cs:w #4\cs_end:}
\cs_new:Npn \exp_args:Nco #1#2#3{\exp_after:wN#1\cs:w#2\exp_after:wN
\cs_end:\exp_after:wN{#3}}
-\cs_set_nopar:Npn \exp_args:Nd {\::d\:::}
\cs_set_nopar:Npn \exp_args:Nf {\::f\:::}
\cs_set_nopar:Npn \exp_args:Nv {\::v\:::}
\cs_set_nopar:Npn \exp_args:NV {\::V\:::}
\cs_set_nopar:Npn \exp_args:Nx {\::x\:::}
-\cs_set_nopar:Npn \exp_args:NNd {\::N\::d\:::}
\cs_set_nopar:Npn \exp_args:NNf {\::N\::f\:::}
\cs_set_nopar:Npn \exp_args:NNv {\::N\::v\:::}
\cs_set_nopar:Npn \exp_args:NNV {\::N\::V\:::}
@@ -173,6 +167,8 @@
\cs_set_nopar:Npn \exp_args:Nxo {\::x\::o\:::}
\cs_set_nopar:Npn \exp_args:Nxx {\::x\::x\:::}
+\cs_set_nopar:Npn \exp_args:NNNV {\::N\::N\::V\:::}
+
\cs_set_nopar:Npn \exp_args:NNno {\::N\::n\::o\:::}
\cs_set_nopar:Npn \exp_args:NNnx {\::N\::n\::x\:::}
\cs_set_nopar:Npn \exp_args:NNoo {\::N\::o\::o\:::}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3keyval.sty b/Master/texmf-dist/tex/latex/expl3/l3keyval.sty
index d74b9ef62be..5ce6a6f8893 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3keyval.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3keyval.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3keyval.dtx 1362 2009-05-28 20:19:21Z joseph $
+\GetIdInfo$Id: l3keyval.dtx 1412 2009-06-14 17:55:48Z joseph $
{L3 Experimental keyval processing}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3prop.sty b/Master/texmf-dist/tex/latex/expl3/l3prop.sty
index e18fb8e2b7f..a7a24f6b530 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3prop.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3prop.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3prop.dtx 1365 2009-05-31 17:26:17Z mittelba $
+\GetIdInfo$Id: l3prop.dtx 1420 2009-07-08 19:07:14Z joseph $
{L3 Experimental Property Lists}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -130,7 +130,7 @@
\prop_tmp:w #5
}
}
-\cs_generate_variant:Nn \prop_put:Nnn {cnn}
+\cs_generate_variant:Nn \prop_put:Nnn { NnV, cnn }
\cs_generate_variant:Nn \prop_gput:Nnn {NnV,Nno,Nnx,Nox,cnn,ccx}
\cs_new:Npn \prop_del:Nn #1#2{
\prop_split_aux:Nnn #1{#2}{\prop_del_aux:w {\toks_set:Nn #1}{#2}}}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3seq.sty b/Master/texmf-dist/tex/latex/expl3/l3seq.sty
index a28d9f64ad7..446e898e857 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3seq.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3seq.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3seq.dtx 1362 2009-05-28 20:19:21Z joseph $
+\GetIdInfo$Id: l3seq.dtx 1415 2009-06-17 19:37:24Z will $
{L3 Experimental sequences and stacks}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -177,6 +177,23 @@
\cs_set_eq:NN \seq_elt:w \ERROR
}
\cs_generate_variant:Nn \seq_map_inline:Nn {c}
+\seq_new:N \l_seq_remove_seq
+\cs_new:Nn \seq_remove_duplicates_aux:NN {
+ \seq_clear:N \l_seq_remove_seq
+ \seq_map_function:NN #2 \seq_remove_duplicates_aux:n
+ #1 #2 \l_seq_remove_seq
+}
+\cs_new:Nn \seq_remove_duplicates_aux:n {
+ \seq_if_in:NnF \l_seq_remove_seq {#1} {
+ \seq_put_right:Nn \l_seq_remove_seq {#1}
+ }
+}
+\cs_new_nopar:Npn \seq_remove_duplicates:N {
+ \seq_remove_duplicates_aux:NN \seq_set_eq:NN
+}
+\cs_new_nopar:Npn \seq_gremove_duplicates:N {
+ \seq_remove_duplicates_aux:NN \seq_gset_eq:NN
+}
\cs_new_eq:NN \seq_push:Nn \seq_put_left:Nn
\cs_new_eq:NN \seq_push:NV \seq_put_left:NV
\cs_new_eq:NN \seq_push:No \seq_put_left:No
diff --git a/Master/texmf-dist/tex/latex/expl3/l3tl.sty b/Master/texmf-dist/tex/latex/expl3/l3tl.sty
index 2e5c8294ac1..ef0a0ac8af4 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3tl.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3tl.dtx 1365 2009-05-31 17:26:17Z mittelba $
+\GetIdInfo$Id: l3tl.dtx 1421 2009-07-10 21:10:59Z joseph $
{L3 Experimental Token Lists}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -80,8 +80,8 @@
\cs_new:Npn\tl_set:Nx#1#2{\cs_set_nopar:Npx#1{#2}}
\cs_new:Npn\tl_gset:Nn#1#2{\cs_gset_nopar:Npn#1{#2}}
\cs_new:Npn\tl_gset:Nx#1#2{\cs_gset_nopar:Npx#1{#2}}
-\cs_generate_variant:Nn \tl_set:Nn {NV,No,Nv,Nd,Nf,cn,cV,co,cx}
-\cs_generate_variant:Nn \tl_gset:Nn {NV,No,Nv,Nd,cn,cx}
+\cs_generate_variant:Nn \tl_set:Nn {NV,No,Nv,Nf,cn,cV,co,cx}
+\cs_generate_variant:Nn \tl_gset:Nn {NV,No,Nv,cn,cx}
\cs_new_eq:NN \tl_set_eq:NN \cs_set_eq:NN
\cs_new_eq:NN \tl_gset_eq:NN \cs_gset_eq:NN
\cs_generate_variant:Nn \tl_set_eq:NN {Nc,c,cc}
@@ -122,8 +122,7 @@
\cs_new:Npn \tl_gput_left:Nx #1#2{
\tl_gset:Nx #1 { #2 \exp_not:V #1 }
}
-\cs_generate_variant:Nn \tl_put_left:Nn {cn,co}
-\cs_generate_variant:Nn \tl_put_left:NV {cV}
+\cs_generate_variant:Nn \tl_put_left:Nn {cn,co,cV}
\cs_generate_variant:Nn \tl_gput_left:Nn {cn,co}
\cs_generate_variant:Nn \tl_gput_left:NV {cV}
\cs_new:Npn \tl_put_right:Nn #1#2 {
@@ -156,8 +155,7 @@
}
\cs_generate_variant:Nn \tl_put_right:Nn {cn,co}
\cs_generate_variant:Nn \tl_put_right:NV {cV}
-\cs_generate_variant:Nn \tl_gput_right:Nn {cn,co}
-\cs_generate_variant:Nn \tl_gput_right:NV {cV}
+\cs_generate_variant:Nn \tl_gput_right:Nn {cn,co,cV}
\cs_new_nopar:Npn \tl_gset:Nc {
\pref_global:D
\tl_set:Nc}
@@ -453,19 +451,19 @@
}
\cs_new:Npn \tl_set_rescan_aux:NNnn #1#2#3#4 {
\group_begin:
- \toks_set:No \etex_everyeof:D { \c_two_ats_with_two_catcodes_tl }
+ \toks_set:NV \etex_everyeof:D \c_two_ats_with_two_catcodes_tl
\tex_endlinechar:D = \c_minus_one
#3
\exp_after:wN \tl_rescan_aux:w \etex_scantokens:D {#4}
- \exp_args:NNNo
+ \exp_args:NNNV
\group_end:
- #1 #2 { \l_tmpa_tl }
+ #1 #2 \l_tmpa_toks
}
\exp_after:wN \cs_set:Npn
\exp_after:wN \tl_rescan_aux:w
\exp_after:wN #
\exp_after:wN 1 \c_two_ats_with_two_catcodes_tl {
- \tl_set:Nn \l_tmpa_tl {#1}
+ \tl_set:Nn \l_tmpa_toks {#1}
}
\cs_new:Npn \tl_set_rescan:Nnx #1#2#3 {
\group_begin:
@@ -473,9 +471,9 @@
\tex_endlinechar:D = \c_minus_one
#2
\tl_set:Nx \l_tmpa_tl { \etex_scantokens:D {#3} }
- \exp_args:NNNo
+ \exp_args:NNNV
\group_end:
- \tl_set:Nn #1 { \l_tmpa_tl }
+ \tl_set:Nn #1 \l_tmpa_tl
}
\cs_new:Npn \tl_gset_rescan:Nnx #1#2#3 {
\group_begin:
@@ -487,11 +485,12 @@
}
\cs_new:Npn \tl_rescan:nn #1#2 {
\group_begin:
- \etex_everyeof:D { \exp_not:N }
+ \toks_set:NV \etex_everyeof:D \c_two_ats_with_two_catcodes_tl
\tex_endlinechar:D = \c_minus_one
#1
- \toks_set:Nx \l_tmpa_toks { \etex_scantokens:D {#2} }
- \exp_args:NV \group_end: \l_tmpa_toks
+ \exp_after:wN \tl_rescan_aux:w \etex_scantokens:D {#2}
+ \exp_args:NV \group_end:
+ \l_tmpa_toks
}
\prg_new_protected_conditional:Npnn \tl_if_in:Nn #1#2 {TF,T,F} {
\cs_set:Npn \tl_tmp:w ##1 #2 ##2 \q_stop {
diff --git a/Master/texmf-dist/tex/latex/expl3/l3toks.sty b/Master/texmf-dist/tex/latex/expl3/l3toks.sty
index 79de834fd71..2ed07333187 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3toks.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3toks.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3toks.dtx 1362 2009-05-28 20:19:21Z joseph $
+\GetIdInfo$Id: l3toks.dtx 1412 2009-06-14 17:55:48Z joseph $
{L3 Experimental Token Registers}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -65,13 +65,10 @@
#1 \exp_after:wN { \int_to_roman:w -`0 \exp_eval_register:c {#2} }
}
\cs_new:Npn \toks_set:No #1#2 { #1 \exp_after:wN {#2} }
-\cs_new:Npn \toks_set:Nd #1#2 {
- #1 \exp_after:wN \exp_after:wN \exp_after:wN {#2}
-}
\cs_new:Npn \toks_set:Nf #1#2 {
#1 \exp_after:wN { \int_to_roman:w -`0#2 }
}
-\cs_generate_variant:Nn \toks_set:Nn {Nx,cn,cV,cv,co,cx,cd,cf}
+\cs_generate_variant:Nn \toks_set:Nn {Nx,cn,cV,cv,co,cx,cf}
\cs_new_eq:NN \toks_gset:Nn \pref_global:D
\cs_generate_variant:Nn \toks_gset:Nn {NV,No,Nx,cn,cV,co,cx}
\cs_new_eq:NN \toks_set_eq:NN \prg_do_nothing: