summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty21
1 files changed, 11 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
index f916146b61e..645282820f0 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/07/28]
-\@ifpackagelater{expl3}{2015/07/28}
+\RequirePackage{expl3}[2015/09/06]
+\@ifpackagelater{expl3}{2015/09/06}
{}
{%
\PackageError{l3str}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3str-expl.dtx 5700 2015-07-28 19:26:39Z joseph $
+\GetIdInfo$Id: l3str-expl.dtx 5925 2015-09-06 09:25:46Z joseph $
{L3 Experimental strings}
\def\ExplFileName{l3str}
\ProvidesExplPackage
@@ -80,7 +80,8 @@
{ \exp_not:c { tl_ #1 :Nx } ##1 { \exp_not:N \tl_to_str:n {##2} } }
\exp_args:Nc \cs_generate_variant:Nn { str_ #1 :Nn } { Nx , cn , cx }
}
-\str_const:Nx \c_backslash_str { \cs_to_str:N \\ }
+\cs_if_exist:NF \c_backslash_str
+ { \str_const:Nx \c_backslash_str { \cs_to_str:N \\ } }
\str_const:Nx \c_left_brace_str { \cs_to_str:N \{ }
\str_const:Nx \c_right_brace_str { \cs_to_str:N \} }
\str_const:Nx \c_hash_str { \cs_to_str:N \# }
@@ -197,7 +198,7 @@
\cs_new:Npn \__str_to_other_end:w \fi: #1 \q_mark #2 * A #3 \q_stop
{ \fi: #2 }
}
-\cs_new:Npn \__str_skip_c_zero:w #1;
+\cs_new:Npn \__str_skip_exp_end:w #1;
{
\if_int_compare:w #1 > \c_eight
\exp_after:wN \__str_skip_loop:wNNNNNNNN
@@ -208,13 +209,13 @@
#1 ;
}
\cs_new:Npn \__str_skip_loop:wNNNNNNNN #1; #2#3#4#5#6#7#8#9
- { \exp_after:wN \__str_skip_c_zero:w \int_use:N \__int_eval:w #1 - \c_eight ; }
+ { \exp_after:wN \__str_skip_exp_end:w \int_use:N \__int_eval:w #1 - \c_eight ; }
\cs_new:Npn \__str_skip_end:w #1 ;
{
\exp_after:wN \__str_skip_end:NNNNNNNN
\if_case:w #1 \exp_stop_f: \or: \or: \or: \or: \or: \or: \or: \or:
}
-\cs_new:Npn \__str_skip_end:NNNNNNNN #1#2#3#4#5#6#7#8 { \fi: \c_zero }
+\cs_new:Npn \__str_skip_end:NNNNNNNN #1#2#3#4#5#6#7#8 { \fi: \exp_end: }
\cs_new:Npn \__str_collect_delimit_by_q_stop:w #1;
{ \__str_collect_loop:wn #1 ; { } }
\cs_new:Npn \__str_collect_loop:wn #1 ;
@@ -266,7 +267,7 @@
{ \use_none_delimit_by_q_stop:w }
{
\exp_after:wN \use_i_delimit_by_q_stop:nw
- \tex_romannumeral:D \exp_after:wN \__str_skip_c_zero:w
+ \exp:w \exp_after:wN \__str_skip_exp_end:w
\int_use:N \__int_eval:w #1 + #2 ;
}
}
@@ -275,7 +276,7 @@
{ \use_none_delimit_by_q_stop:w }
{
\exp_after:wN \use_i_delimit_by_q_stop:nw
- \tex_romannumeral:D \__str_skip_c_zero:w #1 ; { }
+ \exp:w \__str_skip_exp_end:w #1 ; { }
}
}
}
@@ -327,7 +328,7 @@
{
\exp_after:wN \__str_collect_delimit_by_q_stop:w
\int_use:N \__int_eval:w #2 - #1 \exp_after:wN ;
- \tex_romannumeral:D \__str_skip_c_zero:w #1 ;
+ \exp:w \__str_skip_exp_end:w #1 ;
}
\prg_new_conditional:Npnn \str_if_eq:NN #1#2 { p , TF , T , F }
{