[latex3-commits] [l3svn] r6969 - Rename \flag_use:n into \flag_height:n (fixes #336)
noreply at latex-project.org
noreply at latex-project.org
Mon Feb 20 19:32:23 CET 2017
Author: bruno
Date: 2017-02-20 19:32:23 +0100 (Mon, 20 Feb 2017)
New Revision: 6969
Modified:
trunk/l3experimental/l3str/l3regex.dtx
trunk/l3experimental/l3str/l3str-convert.dtx
trunk/l3kernel/l3flag.dtx
trunk/l3kernel/testfiles/m3expl001.luatex.tlg
trunk/l3kernel/testfiles/m3expl001.ptex.tlg
trunk/l3kernel/testfiles/m3expl001.tlg
trunk/l3kernel/testfiles/m3expl001.uptex.tlg
trunk/l3kernel/testfiles/m3expl001.xetex.tlg
trunk/l3kernel/testfiles/m3expl003.luatex.tlg
trunk/l3kernel/testfiles/m3expl003.ptex.tlg
trunk/l3kernel/testfiles/m3expl003.tlg
trunk/l3kernel/testfiles/m3expl003.uptex.tlg
trunk/l3kernel/testfiles/m3expl003.xetex.tlg
Log:
Rename \flag_use:n into \flag_height:n (fixes #336)
Modified: trunk/l3experimental/l3str/l3regex.dtx
===================================================================
--- trunk/l3experimental/l3str/l3regex.dtx 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3experimental/l3str/l3regex.dtx 2017-02-20 18:32:23 UTC (rev 6969)
@@ -5532,13 +5532,13 @@
\@@_extract_seq_aux:n
}
\int_compare:nNnF
- { \flag_use:n { @@_begin } + \flag_use:n { @@_end } }
+ { \flag_height:n { @@_begin } + \flag_height:n { @@_end } }
= 0
{
\__msg_kernel_error:nnxxx { regex } { result-unbalanced }
{ splitting~or~extracting~submatches }
- { \flag_use:n { @@_end } }
- { \flag_use:n { @@_begin } }
+ { \flag_height:n { @@_end } }
+ { \flag_height:n { @@_begin } }
}
\use:x
{
Modified: trunk/l3experimental/l3str/l3str-convert.dtx
===================================================================
--- trunk/l3experimental/l3str/l3str-convert.dtx 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3experimental/l3str/l3str-convert.dtx 2017-02-20 18:32:23 UTC (rev 6969)
@@ -715,7 +715,7 @@
% error if it occurred, nothing otherwise.
% \begin{macrocode}
\cs_new:Npn \@@_if_flag_times:nT #1#2
- { \flag_if_raised:nT {#1} { #2~(x \flag_use:n {#1} ) } }
+ { \flag_if_raised:nT {#1} { #2~(x \flag_height:n {#1} ) } }
% \end{macrocode}
% \end{macro}
%
Modified: trunk/l3kernel/l3flag.dtx
===================================================================
--- trunk/l3kernel/l3flag.dtx 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3kernel/l3flag.dtx 2017-02-20 18:32:23 UTC (rev 6969)
@@ -144,9 +144,9 @@
% height, and \texttt{false} if the \meta{flag} has zero height.
% \end{function}
%
-% \begin{function}[EXP]{\flag_use:n}
+% \begin{function}[EXP]{\flag_height:n}
% \begin{syntax}
-% \cs{flag_use:n} \Arg{flag name}
+% \cs{flag_height:n} \Arg{flag name}
% \end{syntax}
% Expands to the height of the \meta{flag} as an integer denotation.
% \end{function}
@@ -234,7 +234,7 @@
\cs_new_protected:Npn \flag_show:n #1
{
\exp_args:Nc \__msg_show_variable:NNNnn { flag~#1 } \cs_if_exist:NTF ? { }
- { > ~ flag ~ #1 ~ height = \flag_use:n {#1} }
+ { > ~ flag ~ #1 ~ height = \flag_height:n {#1} }
}
\cs_new_protected:Npn \flag_log:n
{ \__msg_log_next: \flag_show:n }
@@ -269,12 +269,12 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[EXP]{\flag_use:n}
+% \begin{macro}[EXP]{\flag_height:n}
% \begin{macro}[EXP, aux]{\@@_height_loop:wn, \@@_height_end:wn}
% Extract the value of the flag by going through all of the
% control sequences starting from |0|.
% \begin{macrocode}
-\cs_new:Npn \flag_use:n { \@@_height_loop:wn 0; }
+\cs_new:Npn \flag_height:n { \@@_height_loop:wn 0; }
\cs_new:Npn \@@_height_loop:wn #1 ; #2
{
\if_cs_exist:w flag~#2~#1 \cs_end:
@@ -295,7 +295,7 @@
\cs_new:Npn \flag_raise:n #1
{
\cs:w flag~#1 \exp_after:wN \cs_end:
- \__int_value:w \flag_use:n {#1} ;
+ \__int_value:w \flag_height:n {#1} ;
}
% \end{macrocode}
% \end{macro}
@@ -323,7 +323,7 @@
{ kernel } { bad-variable } { flag~#1~ }
}
}
- \cs_set:Npn \flag_use:n #1
+ \cs_set:Npn \flag_height:n #1
{
\@@_chk_exist:n {#1}
\@@_height_loop:wn 0; {#1}
Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg 2017-02-20 18:32:23 UTC (rev 6969)
@@ -1680,7 +1680,7 @@
Defining \flag_if_raised:nT on line ...
Defining \flag_if_raised:nF on line ...
Defining \flag_if_raised:nTF on line ...
-Defining \flag_use:n on line ...
+Defining \flag_height:n on line ...
Defining \__flag_height_loop:wn on line ...
Defining \__flag_height_end:wn on line ...
Defining \flag_raise:n on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg 2017-02-20 18:32:23 UTC (rev 6969)
@@ -1412,7 +1412,7 @@
Defining \flag_if_raised:nT on line ...
Defining \flag_if_raised:nF on line ...
Defining \flag_if_raised:nTF on line ...
-Defining \flag_use:n on line ...
+Defining \flag_height:n on line ...
Defining \__flag_height_loop:wn on line ...
Defining \__flag_height_end:wn on line ...
Defining \flag_raise:n on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3kernel/testfiles/m3expl001.tlg 2017-02-20 18:32:23 UTC (rev 6969)
@@ -1412,7 +1412,7 @@
Defining \flag_if_raised:nT on line ...
Defining \flag_if_raised:nF on line ...
Defining \flag_if_raised:nTF on line ...
-Defining \flag_use:n on line ...
+Defining \flag_height:n on line ...
Defining \__flag_height_loop:wn on line ...
Defining \__flag_height_end:wn on line ...
Defining \flag_raise:n on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg 2017-02-20 18:32:23 UTC (rev 6969)
@@ -1412,7 +1412,7 @@
Defining \flag_if_raised:nT on line ...
Defining \flag_if_raised:nF on line ...
Defining \flag_if_raised:nTF on line ...
-Defining \flag_use:n on line ...
+Defining \flag_height:n on line ...
Defining \__flag_height_loop:wn on line ...
Defining \__flag_height_end:wn on line ...
Defining \flag_raise:n on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg 2017-02-20 18:32:23 UTC (rev 6969)
@@ -1678,7 +1678,7 @@
Defining \flag_if_raised:nT on line ...
Defining \flag_if_raised:nF on line ...
Defining \flag_if_raised:nTF on line ...
-Defining \flag_use:n on line ...
+Defining \flag_height:n on line ...
Defining \__flag_height_loop:wn on line ...
Defining \__flag_height_end:wn on line ...
Defining \flag_raise:n on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg 2017-02-20 18:32:23 UTC (rev 6969)
@@ -1680,7 +1680,7 @@
Defining \flag_if_raised:nT on line ...
Defining \flag_if_raised:nF on line ...
Defining \flag_if_raised:nTF on line ...
-Defining \flag_use:n on line ...
+Defining \flag_height:n on line ...
Defining \__flag_height_loop:wn on line ...
Defining \__flag_height_end:wn on line ...
Defining \flag_raise:n on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg 2017-02-20 18:32:23 UTC (rev 6969)
@@ -1412,7 +1412,7 @@
Defining \flag_if_raised:nT on line ...
Defining \flag_if_raised:nF on line ...
Defining \flag_if_raised:nTF on line ...
-Defining \flag_use:n on line ...
+Defining \flag_height:n on line ...
Defining \__flag_height_loop:wn on line ...
Defining \__flag_height_end:wn on line ...
Defining \flag_raise:n on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3kernel/testfiles/m3expl003.tlg 2017-02-20 18:32:23 UTC (rev 6969)
@@ -1412,7 +1412,7 @@
Defining \flag_if_raised:nT on line ...
Defining \flag_if_raised:nF on line ...
Defining \flag_if_raised:nTF on line ...
-Defining \flag_use:n on line ...
+Defining \flag_height:n on line ...
Defining \__flag_height_loop:wn on line ...
Defining \__flag_height_end:wn on line ...
Defining \flag_raise:n on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg 2017-02-20 18:32:23 UTC (rev 6969)
@@ -1412,7 +1412,7 @@
Defining \flag_if_raised:nT on line ...
Defining \flag_if_raised:nF on line ...
Defining \flag_if_raised:nTF on line ...
-Defining \flag_use:n on line ...
+Defining \flag_height:n on line ...
Defining \__flag_height_loop:wn on line ...
Defining \__flag_height_end:wn on line ...
Defining \flag_raise:n on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg 2017-02-20 16:08:44 UTC (rev 6968)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg 2017-02-20 18:32:23 UTC (rev 6969)
@@ -1678,7 +1678,7 @@
Defining \flag_if_raised:nT on line ...
Defining \flag_if_raised:nF on line ...
Defining \flag_if_raised:nTF on line ...
-Defining \flag_use:n on line ...
+Defining \flag_height:n on line ...
Defining \__flag_height_loop:wn on line ...
Defining \__flag_height_end:wn on line ...
Defining \flag_raise:n on line ...
More information about the latex3-commits
mailing list