[latex3-commits] [git/LaTeX3-latex3-latex3] master: Fix a naming issue (2d71d81)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/2d71d816aaecf9aa6e53bbefe49cc8da4c2a77d1

>---------------------------------------------------------------

commit 2d71d816aaecf9aa6e53bbefe49cc8da4c2a77d1
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Feb 19 07:36:46 2018 +0000

    Fix a naming issue


>---------------------------------------------------------------

2d71d816aaecf9aa6e53bbefe49cc8da4c2a77d1
 l3experimental/l3draw/l3draw-points.dtx       |   40 ++++++++++++-------------
 l3experimental/l3draw/testfiles/m3draw001.lvt |    4 +--
 l3experimental/l3draw/testfiles/m3draw001.tlg |    2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/l3experimental/l3draw/l3draw-points.dtx b/l3experimental/l3draw/l3draw-points.dtx
index 1f199bb..e29dc60 100644
--- a/l3experimental/l3draw/l3draw-points.dtx
+++ b/l3experimental/l3draw/l3draw-points.dtx
@@ -524,41 +524,41 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}[EXP]{\draw_point_interpolate_curve:nnnnnn}
-% \begin{macro}[EXP]{\@@_point_interpolate_curve_auxi:nnnnnnnnn}
+% \begin{macro}[EXP]{\draw_point_interpolate_arcaxes:nnnnnn}
+% \begin{macro}[EXP]{\@@_point_interpolate_arcaxes_auxi:nnnnnnnnn}
 % \begin{macro}[EXP]
 %   {
-%     \@@_point_interpolate_curve_auxii:nnnnnnnnn,
-%     \@@_point_interpolate_curve_auxii:fnnnnnnnn
+%     \@@_point_interpolate_arcaxes_auxii:nnnnnnnnn,
+%     \@@_point_interpolate_arcaxes_auxii:fnnnnnnnn
 %   }
 % \begin{macro}[EXP]
 %   {
-%     \@@_point_interpolate_curve_auxiii:nnnnnnn,
-%     \@@_point_interpolate_curve_auxiii:fnnnnnn
+%     \@@_point_interpolate_arcaxes_auxiii:nnnnnnn,
+%     \@@_point_interpolate_arcaxes_auxiii:fnnnnnn
 %   }
 % \begin{macro}[EXP]
 %   {
-%     \@@_point_interpolate_curve_auxiv:nnnnnnnn,
-%     \@@_point_interpolate_curve_auxiv:ffnnnnnn
+%     \@@_point_interpolate_arcaxes_auxiv:nnnnnnnn,
+%     \@@_point_interpolate_arcaxes_auxiv:ffnnnnnn
 %   }
 %   Finding a point on an ellipse arc is relatively easy: find the correct
 %   angle between the two given, use the sine and cosine of that angle,
 %   apply to the axes. We just have to work a bit with the co-ordinate
 %   expansion.
 %    \begin{macrocode}
-\cs_new:Npn \draw_point_interpolate_curve:nnnnnn #1#2#3#4#5#6
+\cs_new:Npn \draw_point_interpolate_arcaxes:nnnnnn #1#2#3#4#5#6
   {
     \@@_point_process:nnn
       {
         \@@_point_process:nn
-          { \@@_point_interpolate_curve_auxi:nnnnnnnnn {#1} {#5} {#6} }
+          { \@@_point_interpolate_arcaxes_auxi:nnnnnnnnn {#1} {#5} {#6} }
           {#4}
       }
       {#2} {#3}
   }
-\cs_new:Npn \@@_point_interpolate_curve_auxi:nnnnnnnnn #1#2#3#4#5#6#7#8#9
+\cs_new:Npn \@@_point_interpolate_arcaxes_auxi:nnnnnnnnn #1#2#3#4#5#6#7#8#9
   {
-    \@@_point_interpolate_curve_auxii:fnnnnnnnn
+    \@@_point_interpolate_arcaxes_auxii:fnnnnnnnn
       { \fp_eval:n {#1} } {#2} {#3} {#6} {#7} {#8} {#9} {#4} {#5}
   }
 %    \end{macrocode}
@@ -578,27 +578,27 @@
 %   We are now in a position to find the target angle, and from that
 %   the sine and cosine required.
 %    \begin{macrocode}
-\cs_new:Npn \@@_point_interpolate_curve_auxii:nnnnnnnnn #1#2#3#4#5#6#7#8#9
+\cs_new:Npn \@@_point_interpolate_arcaxes_auxii:nnnnnnnnn #1#2#3#4#5#6#7#8#9
   {
-    \@@_point_interpolate_curve_auxiii:fnnnnnn
+    \@@_point_interpolate_arcaxes_auxiii:fnnnnnn
       { \fp_eval:n { #1 * (#3) + ( 1 - #1 ) * (#2) } }
       {#4} {#5} {#6} {#7} {#8} {#9}
   }
-\cs_generate_variant:Nn \@@_point_interpolate_curve_auxii:nnnnnnnnn { f }
-\cs_new:Npn \@@_point_interpolate_curve_auxiii:nnnnnnn #1#2#3#4#5#6#7
+\cs_generate_variant:Nn \@@_point_interpolate_arcaxes_auxii:nnnnnnnnn { f }
+\cs_new:Npn \@@_point_interpolate_arcaxes_auxiii:nnnnnnn #1#2#3#4#5#6#7
   {
-    \@@_point_interpolate_curve_auxiv:ffnnnnnn
+    \@@_point_interpolate_arcaxes_auxiv:ffnnnnnn
       { \fp_eval:n { cosd (#1) } }
       { \fp_eval:n { sind (#1) } }
       {#2} {#3} {#4} {#5} {#6} {#7}
   }
-\cs_generate_variant:Nn \@@_point_interpolate_curve_auxiii:nnnnnnn { f }
-\cs_new:Npn \@@_point_interpolate_curve_auxiv:nnnnnnnn #1#2#3#4#5#6#7#8
+\cs_generate_variant:Nn \@@_point_interpolate_arcaxes_auxiii:nnnnnnn { f }
+\cs_new:Npn \@@_point_interpolate_arcaxes_auxiv:nnnnnnnn #1#2#3#4#5#6#7#8
   {
     \@@_point_to_dim:n
       { #3 + #1 * #5 + #2 * #7 , #4 + #1 * #6 + #2 * #8 }
   }
-\cs_generate_variant:Nn \@@_point_interpolate_curve_auxiv:nnnnnnnn { ff }
+\cs_generate_variant:Nn \@@_point_interpolate_arcaxes_auxiv:nnnnnnnn { ff }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/l3experimental/l3draw/testfiles/m3draw001.lvt b/l3experimental/l3draw/testfiles/m3draw001.lvt
index 0e4a8b6..5db8f65 100644
--- a/l3experimental/l3draw/testfiles/m3draw001.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw001.lvt
@@ -119,9 +119,9 @@
       { \draw_point_vec:nn { 0 } { 1 } }
   }
 
-\TESTEXP { \draw_point_interpolate_curve:nnnnnn }
+\TESTEXP { \draw_point_interpolate_arcaxes:nnnnnn }
   {
-    \draw_point_interpolate_curve:nnnnnn
+    \draw_point_interpolate_arcaxes:nnnnnn
       { 0.25 }
       { 1cm , 1cm }
       { 1cm , 0cm }
diff --git a/l3experimental/l3draw/testfiles/m3draw001.tlg b/l3experimental/l3draw/testfiles/m3draw001.tlg
index 5085c03..d9e5a05 100644
--- a/l3experimental/l3draw/testfiles/m3draw001.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw001.tlg
@@ -62,7 +62,7 @@ TEST 10: \draw_point_interpolate_distance:nnn
 56.905517578125pt,86.41893653896732pt
 ============================================================
 ============================================================
-TEST 11: \draw_point_interpolate_arc:nnnnnn 
+TEST 11: \draw_point_interpolate_arcaxes:nnnnnn 
 ============================================================
 52.44956684602254pt,43.74041050993108pt
 ============================================================