summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3experimental
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty13
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty13
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty22
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty2
5 files changed, 31 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
index 71ce3d901e9..e1129ef82da 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
@@ -47,7 +47,7 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{expl3}
-\GetIdInfo$Id: l3sort.dtx 4491 2013-05-12 16:22:18Z bruno $
+\GetIdInfo$Id: l3sort.dtx 4566 2013-07-24 19:34:45Z bruno $
{L3 Experimental sorting functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -85,13 +85,13 @@
{
\__sort_main:NNNnNn \tl_set:Nn
\seq_map_inline:Nn \seq_map_break:
- { \__sort_toks:NNw \exp_not:N \__seq_item:n 0 ; }
+ { \s__seq \__sort_toks:NNw \exp_not:N \__seq_item:n 0 ; \s_obj_end }
}
\cs_new_protected_nopar:Npn \seq_gsort:Nn
{
\__sort_main:NNNnNn \tl_gset:Nn
\seq_map_inline:Nn \seq_map_break:
- { \__sort_toks:NNw \exp_not:N \__seq_item:n 0 ; }
+ { \s__seq \__sort_toks:NNw \exp_not:N \__seq_item:n 0 ; \s_obj_end }
}
\cs_new_protected_nopar:Npn \tl_sort:Nn
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
index a06c2d882db..16337136351 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{expl3}
-\GetIdInfo$Id: l3regex.dtx 4482 2013-04-24 21:05:12Z joseph $
+\GetIdInfo$Id: l3regex.dtx 4576 2013-07-24 21:40:24Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -973,13 +973,12 @@
{
\token_if_eq_meaning:NNT \__regex_compile_special:N #1
{
- \str_case:nnn { #2 }
+ \str_case:nn { #2 }
{
: { \__regex_compile_class_posix:NNNNw }
= { \__msg_kernel_warning:nnx { regex } { posix-unsupported } { = } }
. { \__msg_kernel_warning:nnx { regex } { posix-unsupported } { . } }
}
- { }
}
\__regex_compile_raw:N [ #1 #2
}
@@ -1387,7 +1386,7 @@
\__regex_show_push:n {~}
#2
\exp_last_unbraced:Nf
- \int_case:nnn { \l__regex_show_lines_int }
+ \int_case:nnF { \l__regex_show_lines_int }
{
{0}
{
@@ -1422,7 +1421,7 @@
\cs_new:Npn \__regex_show_anchor_to_str:N #1
{
anchor~at~
- \str_case:nnn { #1 }
+ \str_case:nnF { #1 }
{
{ \l__regex_min_pos_int } { start~(\iow_char:N\\A) }
{ \l__regex_start_pos_int } { start~of~match~(\iow_char:N\\G) }
@@ -2434,11 +2433,13 @@
\flag_clear:n { __regex_end }
\tl_set:Nx \l__regex_internal_a_tl
{
+ \s__seq
\int_step_function:nnnN
{ \c_two * \l__regex_max_state_int }
\c_one
{ \l__regex_submatch_int - \c_one }
\__regex_extract_seq_aux:n
+ \s_obj_end
}
\int_compare:nNnF
{ \flag_height:n { __regex_begin } + \flag_height:n { __regex_end } }
@@ -2804,7 +2805,7 @@
\str_if_eq_x:nnF { #1 #2 } { 1 0 }
{
, ~ repeated ~
- \int_case:nnn {#2}
+ \int_case:nnF {#2}
{
{ -1 } { #1~or~more~times,~\bool_if:NTF #3 { lazy } { greedy } }
{ 0 } { #1~times }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
index f3438ed74f6..a04fee919c5 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{expl3}
-\GetIdInfo$Id: l3regex.dtx 4482 2013-04-24 21:05:12Z joseph $
+\GetIdInfo$Id: l3regex.dtx 4576 2013-07-24 21:40:24Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -971,13 +971,12 @@
{
\token_if_eq_meaning:NNT \__regex_compile_special:N #1
{
- \str_case:nnn { #2 }
+ \str_case:nn { #2 }
{
: { \__regex_compile_class_posix:NNNNw }
= { \__msg_kernel_warning:nnx { regex } { posix-unsupported } { = } }
. { \__msg_kernel_warning:nnx { regex } { posix-unsupported } { . } }
}
- { }
}
\__regex_compile_raw:N [ #1 #2
}
@@ -1385,7 +1384,7 @@
\__regex_show_push:n {~}
#2
\exp_last_unbraced:Nf
- \int_case:nnn { \l__regex_show_lines_int }
+ \int_case:nnF { \l__regex_show_lines_int }
{
{0}
{
@@ -1420,7 +1419,7 @@
\cs_new:Npn \__regex_show_anchor_to_str:N #1
{
anchor~at~
- \str_case:nnn { #1 }
+ \str_case:nnF { #1 }
{
{ \l__regex_min_pos_int } { start~(\iow_char:N\\A) }
{ \l__regex_start_pos_int } { start~of~match~(\iow_char:N\\G) }
@@ -2407,11 +2406,13 @@
\flag_clear:n { __regex_end }
\tl_set:Nx \l__regex_internal_a_tl
{
+ \s__seq
\int_step_function:nnnN
{ \c_two * \l__regex_max_state_int }
\c_one
{ \l__regex_submatch_int - \c_one }
\__regex_extract_seq_aux:n
+ \s_obj_end
}
\int_compare:nNnF
{ \flag_height:n { __regex_begin } + \flag_height:n { __regex_end } }
@@ -2777,7 +2778,7 @@
\str_if_eq_x:nnF { #1 #2 } { 1 0 }
{
, ~ repeated ~
- \int_case:nnn {#2}
+ \int_case:nnF {#2}
{
{ -1 } { #1~or~more~times,~\bool_if:NTF #3 { lazy } { greedy } }
{ 0 } { #1~times }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
index bbf68b78646..0cdd5c2bbcf 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
@@ -237,16 +237,20 @@
\cs_new:Npn \seq_format:Nn #1#2
{
\tl_to_str:f
- { \__str_format_seq:of {#1} { \__str_format_parse:n {#2} } }
+ {
+ \__str_format_seq:ff { \exp_after:wN \__str_format_seq_extract:w #1 }
+ { \__str_format_parse:n {#2} }
+ }
}
\cs_generate_variant:Nn \seq_format:Nn { c }
+\cs_new:Npn \__str_format_seq_extract:w \s__seq #1 \s_obj_end { \exp_stop_f: #1 }
\cs_new:Npn \__str_format_seq:nn #1#2
{
\__str_format_seq_loop:nnNn { } {#2}
#1
{ ? \__str_format_seq_end:w } { }
}
-\cs_generate_variant:Nn \__str_format_seq:nn { of }
+\cs_generate_variant:Nn \__str_format_seq:nn { ff }
\cs_new:Npn \__str_format_seq_loop:nnNn #1#2#3#4
{
\use_none:n #3
@@ -274,7 +278,7 @@
\int_compare:nNnTF {#7} < \c_zero
{ \__str_format_put:nw { - } }
{
- \str_case:nnn {#3}
+ \str_case:nnF {#3}
{
{ ~ } { \__str_format_put:ow { \c_catcode_other_space_tl } }
{ + } { \__str_format_put:nw { + } }
@@ -287,7 +291,7 @@
\__msg_kernel_expandable_error:nnnn
{ str } { invalid-precision-format } {#5} {int}
}
- \str_case:nnn {#6}
+ \str_case:nnF {#6}
{
{ ? } { \__str_format_int:NwnnNNn \use:n }
{ d } { \__str_format_int:NwnnNNn \use:n }
@@ -330,7 +334,7 @@
\token_if_eq_meaning:NNTF 2 #8
{ \__str_format_put:nw { - } }
{
- \str_case:nnn {#3}
+ \str_case:nnF {#3}
{
{ ~ } { \__str_format_put:ow { \c_catcode_other_space_tl } }
{ + } { \__str_format_put:nw { + } }
@@ -341,7 +345,7 @@
\tl_if_empty:nTF {#5}
{ \__str_format_put:nw { { 6} } }
{ \__str_format_put:nw { {#5} } }
- \str_case:nnn {#6}
+ \str_case:nnF {#6}
{
{ e } { \__str_format_fp:wnnnNNw \__str_format_fp_e:wn }
{ f } { \__str_format_fp:wnnnNNw \__str_format_fp_f:wn }
@@ -374,7 +378,7 @@
\group_end:
\cs_new:Npn \__str_format_fp_e:wn \s__fp \__fp_chk:w #1#2#3 ; #4
{
- \int_case:nnn {#1}
+ \int_case:nnF {#1}
{
{0} { \use:nf { 0 . } { \prg_replicate:nn {#4} { 0 } } e 0 }
{2} { inf }
@@ -406,7 +410,7 @@
}
\cs_new:Npn \__str_format_fp_f:wn \s__fp \__fp_chk:w #1#2#3 ; #4
{
- \int_case:nnn {#1}
+ \int_case:nnF {#1}
{
{0} { \use:nf { 0 . } { \prg_replicate:nn {#4} { 0 } } }
{2} { inf }
@@ -428,7 +432,7 @@
}
\cs_new:Npn \__str_format_fp_g:wn \s__fp \__fp_chk:w #1#2 ; #3
{
- \int_case:nnn {#1}
+ \int_case:nnF {#1}
{
{0} { 0 }
{2} { inf }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
index 40b503280e3..e374955c56b 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{expl3}
-\GetIdInfo$Id: l3str.dtx 4482 2013-04-24 21:05:12Z joseph $
+\GetIdInfo$Id: l3str.dtx 4576 2013-07-24 21:40:24Z joseph $
{L3 Experimental strings}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}