summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-28 21:17:44 +0000
committerKarl Berry <karl@freefriends.org>2015-09-28 21:17:44 +0000
commit472e2dc119ba3eca6a8672e7606df6a7dc847a19 (patch)
tree7c10e4ee61b72663387bc5e19e97ddb6c8e57c62 /Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx
parent3b599d9910b4fe668c87ddd32a48d48f8a377560 (diff)
l3 (28sep15)
git-svn-id: svn://tug.org/texlive/trunk@38490 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx22
1 files changed, 11 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx
index e1298f9ca9d..89e650c53ca 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{expl3}
-\GetIdInfo$Id: l3str-format.dtx 5906 2015-09-02 13:17:05Z mittelba $
+\GetIdInfo$Id: l3str-format.dtx 6009 2015-09-18 08:09:21Z joseph $
{L3 Experimental string formatting}
%</driver|package>
%<*driver>
@@ -355,7 +355,7 @@
\use:nf { #2 #1 }
{
\prg_replicate:nn
- { \int_max:nn { #3 - \__str_count_unsafe:n { #2 #1 } } { 0 } }
+ { \int_max:nn { #3 - \__str_count:n { #2 #1 } } { 0 } }
{#4}
}
}
@@ -374,7 +374,7 @@
\cs_new:cpn { @@_align_>:nnnN } #1#2#3#4
{
\prg_replicate:nn
- { \int_max:nn { #3 - \__str_count_unsafe:n { #2 #1 } } { 0 } }
+ { \int_max:nn { #3 - \__str_count:n { #2 #1 } } { 0 } }
{#4}
#2 #1
}
@@ -399,7 +399,7 @@
\prg_replicate:nn
{
\int_max:nn \c_zero
- { #3 - \__str_count_unsafe:n { #2 #1 } - \c_one }
+ { #3 - \__str_count:n { #2 #1 } - \c_one }
/ \c_two
}
{#4}
@@ -409,7 +409,7 @@
\prg_replicate:nn
{
\int_max:nn \c_zero
- { #3 - \__str_count_unsafe:n { #2 #1 } }
+ { #3 - \__str_count:n { #2 #1 } }
/ \c_two
}
{#4}
@@ -433,7 +433,7 @@
\use:nf {#2}
{
\prg_replicate:nn
- { \int_max:nn { #3 - \__str_count_unsafe:n { #2 #1 } } { 0 } }
+ { \int_max:nn { #3 - \__str_count:n { #2 #1 } } { 0 } }
{#4}
}
#1
@@ -472,9 +472,9 @@
% a trailing \cs{s__stop} for later retrieval. Then check that there
% was no \meta{sign}. The width will be useful later, store it after
% \cs{s__stop}. Afterwards, store the precision, and the function
-% \cs{__str_range_unsafe:nnn} that will be used to extract the first
+% \cs{__str_range:nnn} that will be used to extract the first
% |#5| characters of the string.
-% There is a need to use the \enquote{unsafe} function, as otherwise
+% There is a need to use the internal function, as otherwise
% leading spaces would get stripped by |f|-expansion. Finally, check
% that the \meta{style} is |?| or |s|.
% \begin{macrocode}
@@ -498,8 +498,8 @@
}
\@@_put:nw { {#4} }
\tl_if_empty:nTF {#5}
- { \@@_put:nw { \__str_range_unsafe:nnn { {1} {-1} } } }
- { \@@_put:nw { \__str_range_unsafe:nnn { {1} {#5} } } }
+ { \@@_put:nw { \__str_range:nnn { {1} {-1} } } }
+ { \@@_put:nw { \__str_range:nnn { {1} {#5} } } }
\token_if_eq_charcode:NNF #6 s
{
\token_if_eq_charcode:NNF #6 ?
@@ -891,7 +891,7 @@
{
\use:nf
{ #1 . #2 }
- { \prg_replicate:nn { #4 - \__str_count_unsafe:n {#2} } {0} }
+ { \prg_replicate:nn { #4 - \__str_count:n {#2} } {0} }
}
% \end{macrocode}
% \end{macro}