[latex3-commits] [l3svn] 01/02: Change :w+ to :w in l3str

noreply at latex-project.org noreply at latex-project.org
Sat Sep 19 08:00:17 CEST 2015 

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit 0ea5b639aa62b02ef4923a15746f0636e4a39cda
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Sep 19 06:57:50 2015 +0100

    Change :w+ to :w in l3str
---
 l3kernel/l3str.dtx                      |   22 +++++++++++-----------
 l3kernel/testfiles/m3expl001.luatex.tlg |    6 +++---
 l3kernel/testfiles/m3expl001.ptex.tlg   |    6 +++---
 l3kernel/testfiles/m3expl001.tlg        |    6 +++---
 l3kernel/testfiles/m3expl001.uptex.tlg  |    6 +++---
 l3kernel/testfiles/m3expl001.xetex.tlg  |    6 +++---
 l3kernel/testfiles/m3expl003.luatex.tlg |    6 +++---
 l3kernel/testfiles/m3expl003.ptex.tlg   |    6 +++---
 l3kernel/testfiles/m3expl003.tlg        |    6 +++---
 l3kernel/testfiles/m3expl003.uptex.tlg  |    6 +++---
 l3kernel/testfiles/m3expl003.xetex.tlg  |    6 +++---
 11 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 16b9373..1ceca1f 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -982,7 +982,7 @@
 %
 % \begin{macro}[EXP]
 %   {\str_item:Nn, \str_item:cn, \str_item:nn, \str_item_ignore_spaces:nn}
-% \begin{macro}[EXP, aux]{\@@_item:nn, \@@_item:ww}
+% \begin{macro}[EXP, aux]{\@@_item:nn, \@@_item:w}
 %   The \cs{str_item:nn} hands its argument with spaces escaped to
 %   \cs{@@_item:nn}, and makes sure to turn the result back into
 %   a proper string (with category code~$10$ spaces) eventually.  The
@@ -990,7 +990,7 @@
 %   which are thus ignored by \cs{@@_item:nn} since
 %   everything else is done with undelimited arguments.
 %   Evaluate the \meta{index} argument~|#2| and count characters in
-%   the string, passing those two numbers to \cs{@@_item:ww} for
+%   the string, passing those two numbers to \cs{@@_item:w} for
 %   further analysis.  If the \meta{index} is negative, shift it by
 %   the \meta{count} to know the how many character to discard, and if
 %   that is still negative give an empty result.  If the \meta{index}
@@ -1014,12 +1014,12 @@
   { \exp_args:No \@@_item:nn { \tl_to_str:n {#1} } }
 \cs_new:Npn \@@_item:nn #1#2
   {
-    \exp_after:wN \@@_item:ww
+    \exp_after:wN \@@_item:w
     \int_use:N \__int_eval:w #2 \exp_after:wN ;
     \__int_value:w \@@_count:n {#1} ;
     #1 \q_stop
   }
-\cs_new:Npn \@@_item:ww #1; #2;
+\cs_new:Npn \@@_item:w #1; #2;
   {
     \int_compare:nNnTF {#1} < \c_zero
       {
@@ -1086,7 +1086,7 @@
 % \begin{macro}[EXP]
 %   {\str_range:Nnn, \str_range:nnn, \str_range_ignore_spaces:nnn}
 % \begin{macro}[EXP, int]{\@@_range:nnn}
-% \begin{macro}[EXP, aux]{\@@_range:www, \@@_range:nnw}
+% \begin{macro}[EXP, aux]{\@@_range:w, \@@_range:nnw}
 %   Sanitize the string.  Then evaluate the arguments.  At this stage we
 %   also decrement the \meta{start index}, since our goal is to know how
 %   many characters should be removed.  Then limit the range to be
@@ -1110,13 +1110,13 @@
   { \exp_args:No \@@_range:nnn { \tl_to_str:n {#1} } }
 \cs_new:Npn \@@_range:nnn #1#2#3
   {
-    \exp_after:wN \@@_range:www
+    \exp_after:wN \@@_range:w
     \__int_value:w \@@_count:n {#1} \exp_after:wN ;
     \int_use:N \__int_eval:w #2 - \c_one \exp_after:wN ;
     \int_use:N \__int_eval:w #3 ;
     #1 \q_stop
   }
-\cs_new:Npn \@@_range:www #1; #2; #3;
+\cs_new:Npn \@@_range:w #1; #2; #3;
   {
     \exp_args:Nf \@@_range:nnw
       { \@@_range_normalize:nn {#2} {#1} }
@@ -1210,7 +1210,7 @@
 %
 % \begin{macro}[EXP]
 %   {\str_count_spaces:N, \str_count_spaces:c, \str_count_spaces:n}
-% \begin{macro}[EXP, aux]{\@@_count_spaces_loop:wwwwwwwww}
+% \begin{macro}[EXP, aux]{\@@_count_spaces_loop:w}
 %   To speed up this function, we grab and discard $9$ space-delimited
 %   arguments in each iteration of the loop.  The loop stops when the
 %   last argument is one of the trailing |X|\meta{number}, and that
@@ -1224,18 +1224,18 @@
   {
     \int_eval:n
       {
-        \exp_after:wN \@@_count_spaces_loop:wwwwwwwww
+        \exp_after:wN \@@_count_spaces_loop:w
         \tl_to_str:n {#1} ~
         X 7 ~ X 6 ~ X 5 ~ X 4 ~ X 3 ~ X 2 ~ X 1 ~ X 0 ~ X -1 ~
         \q_stop
       }
   }
-\cs_new:Npn \@@_count_spaces_loop:wwwwwwwww #1~#2~#3~#4~#5~#6~#7~#8~#9~
+\cs_new:Npn \@@_count_spaces_loop:w #1~#2~#3~#4~#5~#6~#7~#8~#9~
   {
     \if_meaning:w X #9
       \use_i_delimit_by_q_stop:nw
     \fi:
-    \c_nine + \@@_count_spaces_loop:wwwwwwwww
+    \c_nine + \@@_count_spaces_loop:w
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index ef869ca..8176d5b 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -736,7 +736,7 @@ Defining \str_item:cn on line ...
 Defining \str_item:nn on line ...
 Defining \str_item_ignore_spaces:nn on line ...
 Defining \__str_item:nn on line ...
-Defining \__str_item:ww on line ...
+Defining \__str_item:w on line ...
 Defining \__str_skip_exp_end:w on line ...
 Defining \__str_skip_loop:wNNNNNNNN on line ...
 Defining \__str_skip_end:w on line ...
@@ -746,7 +746,7 @@ Defining \str_range:cnn on line ...
 Defining \str_range:nnn on line ...
 Defining \str_range_ignore_spaces:nnn on line ...
 Defining \__str_range:nnn on line ...
-Defining \__str_range:www on line ...
+Defining \__str_range:w on line ...
 Defining \__str_range:nnw on line ...
 Defining \__str_range_normalize:nn on line ...
 Defining \__str_collect_delimit_by_q_stop:w on line ...
@@ -757,7 +757,7 @@ Defining \__str_collect_end:nnnnnnnnw on line ...
 Defining \str_count_spaces:N on line ...
 Defining \str_count_spaces:c on line ...
 Defining \str_count_spaces:n on line ...
-Defining \__str_count_spaces_loop:wwwwwwwww on line ...
+Defining \__str_count_spaces_loop:w on line ...
 Defining \str_count:N on line ...
 Defining \str_count:c on line ...
 Defining \str_count:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index fd6b07f..4200c29 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -735,7 +735,7 @@ Defining \str_item:cn on line ...
 Defining \str_item:nn on line ...
 Defining \str_item_ignore_spaces:nn on line ...
 Defining \__str_item:nn on line ...
-Defining \__str_item:ww on line ...
+Defining \__str_item:w on line ...
 Defining \__str_skip_exp_end:w on line ...
 Defining \__str_skip_loop:wNNNNNNNN on line ...
 Defining \__str_skip_end:w on line ...
@@ -745,7 +745,7 @@ Defining \str_range:cnn on line ...
 Defining \str_range:nnn on line ...
 Defining \str_range_ignore_spaces:nnn on line ...
 Defining \__str_range:nnn on line ...
-Defining \__str_range:www on line ...
+Defining \__str_range:w on line ...
 Defining \__str_range:nnw on line ...
 Defining \__str_range_normalize:nn on line ...
 Defining \__str_collect_delimit_by_q_stop:w on line ...
@@ -756,7 +756,7 @@ Defining \__str_collect_end:nnnnnnnnw on line ...
 Defining \str_count_spaces:N on line ...
 Defining \str_count_spaces:c on line ...
 Defining \str_count_spaces:n on line ...
-Defining \__str_count_spaces_loop:wwwwwwwww on line ...
+Defining \__str_count_spaces_loop:w on line ...
 Defining \str_count:N on line ...
 Defining \str_count:c on line ...
 Defining \str_count:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index fe1d9d2..4d38342 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -735,7 +735,7 @@ Defining \str_item:cn on line ...
 Defining \str_item:nn on line ...
 Defining \str_item_ignore_spaces:nn on line ...
 Defining \__str_item:nn on line ...
-Defining \__str_item:ww on line ...
+Defining \__str_item:w on line ...
 Defining \__str_skip_exp_end:w on line ...
 Defining \__str_skip_loop:wNNNNNNNN on line ...
 Defining \__str_skip_end:w on line ...
@@ -745,7 +745,7 @@ Defining \str_range:cnn on line ...
 Defining \str_range:nnn on line ...
 Defining \str_range_ignore_spaces:nnn on line ...
 Defining \__str_range:nnn on line ...
-Defining \__str_range:www on line ...
+Defining \__str_range:w on line ...
 Defining \__str_range:nnw on line ...
 Defining \__str_range_normalize:nn on line ...
 Defining \__str_collect_delimit_by_q_stop:w on line ...
@@ -756,7 +756,7 @@ Defining \__str_collect_end:nnnnnnnnw on line ...
 Defining \str_count_spaces:N on line ...
 Defining \str_count_spaces:c on line ...
 Defining \str_count_spaces:n on line ...
-Defining \__str_count_spaces_loop:wwwwwwwww on line ...
+Defining \__str_count_spaces_loop:w on line ...
 Defining \str_count:N on line ...
 Defining \str_count:c on line ...
 Defining \str_count:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index fd6b07f..4200c29 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -735,7 +735,7 @@ Defining \str_item:cn on line ...
 Defining \str_item:nn on line ...
 Defining \str_item_ignore_spaces:nn on line ...
 Defining \__str_item:nn on line ...
-Defining \__str_item:ww on line ...
+Defining \__str_item:w on line ...
 Defining \__str_skip_exp_end:w on line ...
 Defining \__str_skip_loop:wNNNNNNNN on line ...
 Defining \__str_skip_end:w on line ...
@@ -745,7 +745,7 @@ Defining \str_range:cnn on line ...
 Defining \str_range:nnn on line ...
 Defining \str_range_ignore_spaces:nnn on line ...
 Defining \__str_range:nnn on line ...
-Defining \__str_range:www on line ...
+Defining \__str_range:w on line ...
 Defining \__str_range:nnw on line ...
 Defining \__str_range_normalize:nn on line ...
 Defining \__str_collect_delimit_by_q_stop:w on line ...
@@ -756,7 +756,7 @@ Defining \__str_collect_end:nnnnnnnnw on line ...
 Defining \str_count_spaces:N on line ...
 Defining \str_count_spaces:c on line ...
 Defining \str_count_spaces:n on line ...
-Defining \__str_count_spaces_loop:wwwwwwwww on line ...
+Defining \__str_count_spaces_loop:w on line ...
 Defining \str_count:N on line ...
 Defining \str_count:c on line ...
 Defining \str_count:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 34b64d5..8db7624 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -735,7 +735,7 @@ Defining \str_item:cn on line ...
 Defining \str_item:nn on line ...
 Defining \str_item_ignore_spaces:nn on line ...
 Defining \__str_item:nn on line ...
-Defining \__str_item:ww on line ...
+Defining \__str_item:w on line ...
 Defining \__str_skip_exp_end:w on line ...
 Defining \__str_skip_loop:wNNNNNNNN on line ...
 Defining \__str_skip_end:w on line ...
@@ -745,7 +745,7 @@ Defining \str_range:cnn on line ...
 Defining \str_range:nnn on line ...
 Defining \str_range_ignore_spaces:nnn on line ...
 Defining \__str_range:nnn on line ...
-Defining \__str_range:www on line ...
+Defining \__str_range:w on line ...
 Defining \__str_range:nnw on line ...
 Defining \__str_range_normalize:nn on line ...
 Defining \__str_collect_delimit_by_q_stop:w on line ...
@@ -756,7 +756,7 @@ Defining \__str_collect_end:nnnnnnnnw on line ...
 Defining \str_count_spaces:N on line ...
 Defining \str_count_spaces:c on line ...
 Defining \str_count_spaces:n on line ...
-Defining \__str_count_spaces_loop:wwwwwwwww on line ...
+Defining \__str_count_spaces_loop:w on line ...
 Defining \str_count:N on line ...
 Defining \str_count:c on line ...
 Defining \str_count:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index af27508..ebf9e0b 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -736,7 +736,7 @@ Defining \str_item:cn on line ...
 Defining \str_item:nn on line ...
 Defining \str_item_ignore_spaces:nn on line ...
 Defining \__str_item:nn on line ...
-Defining \__str_item:ww on line ...
+Defining \__str_item:w on line ...
 Defining \__str_skip_exp_end:w on line ...
 Defining \__str_skip_loop:wNNNNNNNN on line ...
 Defining \__str_skip_end:w on line ...
@@ -746,7 +746,7 @@ Defining \str_range:cnn on line ...
 Defining \str_range:nnn on line ...
 Defining \str_range_ignore_spaces:nnn on line ...
 Defining \__str_range:nnn on line ...
-Defining \__str_range:www on line ...
+Defining \__str_range:w on line ...
 Defining \__str_range:nnw on line ...
 Defining \__str_range_normalize:nn on line ...
 Defining \__str_collect_delimit_by_q_stop:w on line ...
@@ -757,7 +757,7 @@ Defining \__str_collect_end:nnnnnnnnw on line ...
 Defining \str_count_spaces:N on line ...
 Defining \str_count_spaces:c on line ...
 Defining \str_count_spaces:n on line ...
-Defining \__str_count_spaces_loop:wwwwwwwww on line ...
+Defining \__str_count_spaces_loop:w on line ...
 Defining \str_count:N on line ...
 Defining \str_count:c on line ...
 Defining \str_count:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 6b56bb5..a55b4c4 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -735,7 +735,7 @@ Defining \str_item:cn on line ...
 Defining \str_item:nn on line ...
 Defining \str_item_ignore_spaces:nn on line ...
 Defining \__str_item:nn on line ...
-Defining \__str_item:ww on line ...
+Defining \__str_item:w on line ...
 Defining \__str_skip_exp_end:w on line ...
 Defining \__str_skip_loop:wNNNNNNNN on line ...
 Defining \__str_skip_end:w on line ...
@@ -745,7 +745,7 @@ Defining \str_range:cnn on line ...
 Defining \str_range:nnn on line ...
 Defining \str_range_ignore_spaces:nnn on line ...
 Defining \__str_range:nnn on line ...
-Defining \__str_range:www on line ...
+Defining \__str_range:w on line ...
 Defining \__str_range:nnw on line ...
 Defining \__str_range_normalize:nn on line ...
 Defining \__str_collect_delimit_by_q_stop:w on line ...
@@ -756,7 +756,7 @@ Defining \__str_collect_end:nnnnnnnnw on line ...
 Defining \str_count_spaces:N on line ...
 Defining \str_count_spaces:c on line ...
 Defining \str_count_spaces:n on line ...
-Defining \__str_count_spaces_loop:wwwwwwwww on line ...
+Defining \__str_count_spaces_loop:w on line ...
 Defining \str_count:N on line ...
 Defining \str_count:c on line ...
 Defining \str_count:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 86c3f18..2a71957 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -735,7 +735,7 @@ Defining \str_item:cn on line ...
 Defining \str_item:nn on line ...
 Defining \str_item_ignore_spaces:nn on line ...
 Defining \__str_item:nn on line ...
-Defining \__str_item:ww on line ...
+Defining \__str_item:w on line ...
 Defining \__str_skip_exp_end:w on line ...
 Defining \__str_skip_loop:wNNNNNNNN on line ...
 Defining \__str_skip_end:w on line ...
@@ -745,7 +745,7 @@ Defining \str_range:cnn on line ...
 Defining \str_range:nnn on line ...
 Defining \str_range_ignore_spaces:nnn on line ...
 Defining \__str_range:nnn on line ...
-Defining \__str_range:www on line ...
+Defining \__str_range:w on line ...
 Defining \__str_range:nnw on line ...
 Defining \__str_range_normalize:nn on line ...
 Defining \__str_collect_delimit_by_q_stop:w on line ...
@@ -756,7 +756,7 @@ Defining \__str_collect_end:nnnnnnnnw on line ...
 Defining \str_count_spaces:N on line ...
 Defining \str_count_spaces:c on line ...
 Defining \str_count_spaces:n on line ...
-Defining \__str_count_spaces_loop:wwwwwwwww on line ...
+Defining \__str_count_spaces_loop:w on line ...
 Defining \str_count:N on line ...
 Defining \str_count:c on line ...
 Defining \str_count:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 6b56bb5..a55b4c4 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -735,7 +735,7 @@ Defining \str_item:cn on line ...
 Defining \str_item:nn on line ...
 Defining \str_item_ignore_spaces:nn on line ...
 Defining \__str_item:nn on line ...
-Defining \__str_item:ww on line ...
+Defining \__str_item:w on line ...
 Defining \__str_skip_exp_end:w on line ...
 Defining \__str_skip_loop:wNNNNNNNN on line ...
 Defining \__str_skip_end:w on line ...
@@ -745,7 +745,7 @@ Defining \str_range:cnn on line ...
 Defining \str_range:nnn on line ...
 Defining \str_range_ignore_spaces:nnn on line ...
 Defining \__str_range:nnn on line ...
-Defining \__str_range:www on line ...
+Defining \__str_range:w on line ...
 Defining \__str_range:nnw on line ...
 Defining \__str_range_normalize:nn on line ...
 Defining \__str_collect_delimit_by_q_stop:w on line ...
@@ -756,7 +756,7 @@ Defining \__str_collect_end:nnnnnnnnw on line ...
 Defining \str_count_spaces:N on line ...
 Defining \str_count_spaces:c on line ...
 Defining \str_count_spaces:n on line ...
-Defining \__str_count_spaces_loop:wwwwwwwww on line ...
+Defining \__str_count_spaces_loop:w on line ...
 Defining \str_count:N on line ...
 Defining \str_count:c on line ...
 Defining \str_count:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 670e8f5..675f23e 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -735,7 +735,7 @@ Defining \str_item:cn on line ...
 Defining \str_item:nn on line ...
 Defining \str_item_ignore_spaces:nn on line ...
 Defining \__str_item:nn on line ...
-Defining \__str_item:ww on line ...
+Defining \__str_item:w on line ...
 Defining \__str_skip_exp_end:w on line ...
 Defining \__str_skip_loop:wNNNNNNNN on line ...
 Defining \__str_skip_end:w on line ...
@@ -745,7 +745,7 @@ Defining \str_range:cnn on line ...
 Defining \str_range:nnn on line ...
 Defining \str_range_ignore_spaces:nnn on line ...
 Defining \__str_range:nnn on line ...
-Defining \__str_range:www on line ...
+Defining \__str_range:w on line ...
 Defining \__str_range:nnw on line ...
 Defining \__str_range_normalize:nn on line ...
 Defining \__str_collect_delimit_by_q_stop:w on line ...
@@ -756,7 +756,7 @@ Defining \__str_collect_end:nnnnnnnnw on line ...
 Defining \str_count_spaces:N on line ...
 Defining \str_count_spaces:c on line ...
 Defining \str_count_spaces:n on line ...
-Defining \__str_count_spaces_loop:wwwwwwwww on line ...
+Defining \__str_count_spaces_loop:w on line ...
 Defining \str_count:N on line ...
 Defining \str_count:c on line ...
 Defining \str_count:n on line ...

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the latex3-commits mailing list