summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-12-21 23:31:35 +0000
committerKarl Berry <karl@freefriends.org>2012-12-21 23:31:35 +0000
commit8bcf0c7ef3cd19666c206271cea9280846b5c7e6 (patch)
treeee538c7e2a14ad105a169fdd2e745356147577cc /Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx
parentef0453041a9700a2d974c3c76e3398e40c4e4aeb (diff)
l3 (21dec12)
git-svn-id: svn://tug.org/texlive/trunk@28608 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.dtx72
1 files changed, 36 insertions, 36 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 792cdcb105f..ea6c38e6564 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx
@@ -227,13 +227,13 @@
% \begin{macro}[aux, EXP]{\@@_format_parse:n}
% \begin{macro}[aux, EXP]
% {
-% \@@_format_parse_i:NN,
-% \@@_format_parse_ii:nN,
-% \@@_format_parse_iii:nN,
-% \@@_format_parse_iv:nwN,
-% \@@_format_parse_v:nN,
-% \@@_format_parse_vi:nwN,
-% \@@_format_parse_vii:nN,
+% \@@_format_parse_auxi:NN,
+% \@@_format_parse_auxii:nN,
+% \@@_format_parse_auxiii:nN,
+% \@@_format_parse_auxiv:nwN,
+% \@@_format_parse_auxv:nN,
+% \@@_format_parse_auxvi:nwN,
+% \@@_format_parse_auxvii:nN,
% \@@_format_parse_end:nwn,
% }
% The goal is to parse
@@ -244,51 +244,51 @@
% \begin{macrocode}
\cs_new:Npn \@@_format_parse:n #1
{
- \exp_last_unbraced:Nf \@@_format_parse_i:NN
+ \exp_last_unbraced:Nf \@@_format_parse_auxi:NN
\@@_to_other:n {#1} \s__stop \s__stop {#1}
}
-\cs_new:Npx \@@_format_parse_i:NN #1#2
+\cs_new:Npx \@@_format_parse_auxi:NN #1#2
{
\exp_not:N \@@_if_contains_char:nNTF { < > = ^ } #2
- { \exp_not:N \@@_format_parse_iii:nN { #1 #2 } }
+ { \exp_not:N \@@_format_parse_auxiii:nN { #1 #2 } }
{
- \exp_not:N \@@_format_parse_ii:nN
+ \exp_not:N \@@_format_parse_auxii:nN
{ \c_catcode_other_space_tl } #1 #2
}
}
-\cs_new:Npn \@@_format_parse_ii:nN #1#2
+\cs_new:Npn \@@_format_parse_auxii:nN #1#2
{
\@@_if_contains_char:nNTF { < > = ^ } #2
- { \@@_format_parse_iii:nN { #1 #2 } }
- { \@@_format_parse_iii:nN { #1 ? } #2 }
+ { \@@_format_parse_auxiii:nN { #1 #2 } }
+ { \@@_format_parse_auxiii:nN { #1 ? } #2 }
}
-\cs_new:Npx \@@_format_parse_iii:nN #1#2
+\cs_new:Npx \@@_format_parse_auxiii:nN #1#2
{
\exp_not:N \@@_if_contains_char:nNTF
{ + - \c_catcode_other_space_tl }
#2
- { \exp_not:N \@@_format_parse_iv:nwN { #1 #2 } ; }
- { \exp_not:N \@@_format_parse_iv:nwN { #1 ? } ; #2 }
+ { \exp_not:N \@@_format_parse_auxiv:nwN { #1 #2 } ; }
+ { \exp_not:N \@@_format_parse_auxiv:nwN { #1 ? } ; #2 }
}
-\cs_new:Npn \@@_format_parse_iv:nwN #1#2; #3
+\cs_new:Npn \@@_format_parse_auxiv:nwN #1#2; #3
{
\@@_format_if_digit:NTF #3
- { \@@_format_parse_iv:nwN {#1} #2 #3 ; }
- { \@@_format_parse_v:nN { #1 {#2} } #3 }
+ { \@@_format_parse_auxiv:nwN {#1} #2 #3 ; }
+ { \@@_format_parse_auxv:nN { #1 {#2} } #3 }
}
-\cs_new:Npn \@@_format_parse_v:nN #1#2
+\cs_new:Npn \@@_format_parse_auxv:nN #1#2
{
\token_if_eq_charcode:NNTF . #2
- { \@@_format_parse_vi:nwN {#1} 0 ; }
- { \@@_format_parse_vii:nN { #1 { } } #2 }
+ { \@@_format_parse_auxvi:nwN {#1} 0 ; }
+ { \@@_format_parse_auxvii:nN { #1 { } } #2 }
}
-\cs_new:Npn \@@_format_parse_vi:nwN #1#2; #3
+\cs_new:Npn \@@_format_parse_auxvi:nwN #1#2; #3
{
\@@_format_if_digit:NTF #3
- { \@@_format_parse_vi:nwN {#1} #2 #3 ; }
- { \@@_format_parse_vii:nN { #1 {#2} } #3 }
+ { \@@_format_parse_auxvi:nwN {#1} #2 #3 ; }
+ { \@@_format_parse_auxvii:nN { #1 {#2} } #3 }
}
-\cs_new:Npn \@@_format_parse_vii:nN #1#2
+\cs_new:Npn \@@_format_parse_auxvii:nN #1#2
{
\token_if_eq_meaning:NNTF \s__stop #2
{ \@@_format_parse_end:nwn { #1 ? } #2 }
@@ -791,7 +791,7 @@
% \end{macro}
%
% \begin{macro}[aux, EXP]{\@@_format_fp_e:wn}
-% \begin{macro}[aux, EXP]{\@@_format_fp_e_ii:wn}
+% \begin{macro}[aux, EXP]{\@@_format_fp_e_aux:wn}
% With the |e| type, first filter out special cases. In the normal
% case, round to |#4+1| significant figures (one before the decimal
% separator, |#4| after).
@@ -810,12 +810,12 @@
{3} { nan }
}
{
- \exp_last_unbraced:Nf \@@_format_fp_e_ii:wn
+ \exp_last_unbraced:Nf \@@_format_fp_e_aux:wn
\@@_format_fp_round:wn \s__fp \__fp_chk:w #1#2#3 ; { #4 + 1 }
{#4}
}
}
- \cs_new:Npn \@@_format_fp_e_ii:wn
+ \cs_new:Npn \@@_format_fp_e_aux:wn
\s__fp \__fp_chk:w #1#2 #3 #4#5#6#7 ; #8
{
\@@_format_put:fw { \int_eval:n { #3 - 1 } }
@@ -838,7 +838,7 @@
% \end{macro}
%
% \begin{macro}[aux, EXP]{\@@_format_fp_f:wn}
-% \begin{macro}[aux, EXP]{\@@_format_fp_f_ii:wwn}
+% \begin{macro}[aux, EXP]{\@@_format_fp_f_aux:wwwn}
% With the |f| type, first filter out special cases. In the normal
% case, round to |#4| (absolute) decimal places.
% \begin{macrocode}
@@ -851,14 +851,14 @@
{3} { nan }
}
{
- \exp_last_unbraced:Nf \@@_format_fp_f_ii:wwwn
+ \exp_last_unbraced:Nf \@@_format_fp_f_aux:wwwn
\fp_to_decimal:n
{ abs ( round ( \s__fp \__fp_chk:w #1#2#3 ; , #4 ) ) }
. . ;
{#4}
}
}
-\cs_new:Npn \@@_format_fp_f_ii:wwwn #1 . #2 . #3 ; #4
+\cs_new:Npn \@@_format_fp_f_aux:wwwn #1 . #2 . #3 ; #4
{
\use:nf
{ #1 . #2 }
@@ -869,7 +869,7 @@
% \end{macro}
%
% \begin{macro}[aux, EXP]{\@@_format_fp_g:wn}
-% \begin{macro}[aux, EXP]{\@@_format_fp_g_ii:wn}
+% \begin{macro}[aux, EXP]{\@@_format_fp_g_aux:wn}
% With the |g| type, first filter out special cases. In the normal
% case, round to |#4| significant figures, then test the exponent: if
% $-4\leq \meta{exponent} < \meta{precision}$, use the presentation
@@ -889,13 +889,13 @@
{3} { nan }
}
{
- \exp_last_unbraced:Nf \@@_format_fp_g_ii:wn
+ \exp_last_unbraced:Nf \@@_format_fp_g_aux:wn
\@@_format_fp_round:wn \s__fp \__fp_chk:w #1#2 ;
{ \int_max:nn {1} {#3} }
{ \int_max:nn {1} {#3} }
}
}
-\cs_new:Npn \@@_format_fp_g_ii:wn #1; #2
+\cs_new:Npn \@@_format_fp_g_aux:wn #1; #2
{
\int_compare:nNnTF { \__fp_exponent:w #1; } < { -3 }
{ \fp_to_scientific:n }