l3experimental (18may20)

git-svn-id: svn://tug.org/texlive/trunk@55205 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 13 insertions, 13 deletions

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 2d974506bf6..90025ff46e5 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
@@ -20,7 +20,7 @@
 %% 
 %% File: l3str-format.dtx
 \RequirePackage{expl3}
-\ProvidesExplPackage{l3str-format}{2020-01-12}{}
+\ProvidesExplPackage{l3str-format}{2020-05-18}{}
   {L3 Experimental string formatting}
 \cs_generate_variant:Nn \use:nn { nf }
 \cs_generate_variant:Nn \use:nnn { fnf }
@@ -30,7 +30,7 @@
     \if_int_compare:w 9 < 1 #1 \exp_stop_f:
       \prg_return_true: \else: \prg_return_false: \fi:
   }
-\cs_new:Npn \__str_format_put:nw #1 #2 \s_stop { #2 \s_stop #1 }
+\cs_new:Npn \__str_format_put:nw #1 #2 \s__str_stop { #2 \s__str_stop #1 }
 \cs_generate_variant:Nn \__str_format_put:nw { o , f }
 \prg_new_conditional:Npnn \__str_format_if_in:nN #1#2 { TF }
   {
@@ -49,7 +49,7 @@
 \cs_new:Npn \__str_format_parse:n #1
   {
     \exp_last_unbraced:Nf \__str_format_parse_auxi:NN
-      { \__kernel_str_to_other:n {#1} } \s_stop \s_stop {#1}
+      { \__kernel_str_to_other:n {#1} } \s__str_stop \s__str_stop {#1}
   }
 \cs_new:Npx \__str_format_parse_auxi:NN #1#2
   {
@@ -94,11 +94,11 @@
   }
 \cs_new:Npn \__str_format_parse_auxvii:nN #1#2
   {
-    \token_if_eq_meaning:NNTF \s_stop #2
+    \token_if_eq_meaning:NNTF \s__str_stop #2
       { \__str_format_parse_end:nwn { #1 ? } #2 }
       { \__str_format_parse_end:nwn { #1 #2 } }
   }
-\cs_new:Npn \__str_format_parse_end:nwn #1 #2 \s_stop \s_stop #3
+\cs_new:Npn \__str_format_parse_end:nwn #1 #2 \s__str_stop \s__str_stop #3
   {
     \tl_if_empty:nF {#2}
       { \__kernel_msg_expandable_error:nnn { str } { invalid-format } {#3} }
@@ -195,7 +195,7 @@
           }
       }
     \__str_format_tl_s:NNnnNNn
-    \s_stop
+    \s__str_stop
   }
 \cs_new:Npn \__str_format_tl_s:NNnnNNn #1#2#3#4#5#6#7
   {
@@ -275,9 +275,9 @@
           { str } { invalid-style-format } {#6} { int }
         \__str_format_int:NwnnNNn \use:n
       }
-    \s_stop {#7}
+    \s__str_stop {#7}
   }
-\cs_new:Npn \__str_format_int:NwnnNNn #1#2 \s_stop #3#4#5#6#7
+\cs_new:Npn \__str_format_int:NwnnNNn #1#2 \s__str_stop #3#4#5#6#7
   {
     \exp_args:Nc \exp_args:Nf
       { __str_format_align_#6:nnnN }
@@ -332,10 +332,10 @@
           { str } { invalid-style-format } {#6} { fp }
         \__str_format_fp:wnnnNNn \__str_format_fp_g:nn
       }
-    \s_stop {#7}
+    \s__str_stop {#7}
   }
 \cs_new:Npn \__str_format_fp:wnnnNNn
-    #1 \s_stop #2 #3 #4 #5#6 #7
+    #1 \s__str_stop #2 #3 #4 #5#6 #7
   {
     \exp_args:Nc \exp_args:Nf
       { __str_format_align_#6:nnnN }
@@ -377,7 +377,7 @@
           { \prg_replicate:nn { #4 - \c__fp_prec_int + 1 } { 0 } }
         \__str_format_put:nw { #1 . #2 }
       }
-    \use_none:n \s_stop
+    \use_none:n \s__str_stop
   }
 \cs_new:Npn \__str_format_fp_f:nn #1#2
   {
@@ -431,11 +431,11 @@
 \cs_new:Npn \__str_format_fp_trim:w #1 e
   {
     \__str_format_fp_trim_loop:w #1
-      ; \__str_format_fp_trim_loop:w 0; \__str_format_fp_trim_dot:w .; \s_stop e
+      ; \__str_format_fp_trim_loop:w 0; \__str_format_fp_trim_dot:w .; \s__str_stop e
   }
 \cs_new:Npn \__str_format_fp_trim_loop:w #1 0; #2 { #2 #1 ; #2 }
 \cs_new:Npn \__str_format_fp_trim_dot:w #1 .; { \__str_format_fp_trim_end:w #1 ; }
-\cs_new:Npn \__str_format_fp_trim_end:w #1 ; #2 \s_stop { #1 }
+\cs_new:Npn \__str_format_fp_trim_end:w #1 ; #2 \s__str_stop { #1 }
 \__kernel_msg_new:nnn { str } { invalid-format }
   { Invalid~format~'#1'. }
 \__kernel_msg_new:nnn { str } { invalid-align-format }