[latex3-commits] [git/LaTeX3-latex3-latex3] master: l3draw: Rename some functions (02dad12)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Feb 12 13:17:47 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/02dad123fe4bff247a9e9a143d0cf28cb7e60857
>---------------------------------------------------------------
commit 02dad123fe4bff247a9e9a143d0cf28cb7e60857
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Feb 12 12:17:47 2018 +0000
l3draw: Rename some functions
With the new tuple support in l3fp, "coord" seems wrong here.
>---------------------------------------------------------------
02dad123fe4bff247a9e9a143d0cf28cb7e60857
l3trial/l3draw/l3draw-points.dtx | 28 +++++-----
l3trial/l3draw/l3draw.dtx | 10 ++--
l3trial/l3draw/testfiles/m3draw001.lvt | 92 ++++++++++++++++----------------
l3trial/l3draw/testfiles/m3draw001.tlg | 6 +--
l3trial/l3draw/testfiles/m3draw003.lvt | 6 +--
5 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/l3trial/l3draw/l3draw-points.dtx b/l3trial/l3draw/l3draw-points.dtx
index 8f6e328..8bf5e5e 100644
--- a/l3trial/l3draw/l3draw-points.dtx
+++ b/l3trial/l3draw/l3draw-points.dtx
@@ -128,10 +128,10 @@
%
% The most basic way of giving points is as simple $(x,y)$ co-ordinates.
%
-% \begin{macro}[rEXP]{\draw_point_coord:nn}
+% \begin{macro}[rEXP]{\draw_point:nn}
% Simply turn the given values into dimensions.
% \begin{macrocode}
-\cs_new:Npn \draw_point_coord:nn #1#2
+\cs_new:Npn \draw_point:nn #1#2
{
{ \fp_to_dim:n {#1} }
{ \fp_to_dim:n {#2} }
@@ -871,16 +871,16 @@
\draw_zvec_set:n { { -0.385cm } { -0.385cm } }
% \end{macrocode}
%
-% \begin{macro}[rEXP]{\draw_point_vec_coord:nn}
-% \begin{macro}[rEXP]{\@@_point_vec_coord:nn, \@@_point_vec_coord:ff}
-% \begin{macro}[rEXP]{\draw_point_vec_coord:nnn}
-% \begin{macro}[rEXP]{\@@_point_vec_coord:nnn, \@@_point_vec_coord:fff}
+% \begin{macro}[rEXP]{\draw_point_vec:nn}
+% \begin{macro}[rEXP]{\@@_point_vec:nn, \@@_point_vec:ff}
+% \begin{macro}[rEXP]{\draw_point_vec:nnn}
+% \begin{macro}[rEXP]{\@@_point_vec:nnn, \@@_point_vec:fff}
% Force a single evaluation of each factor, then use these to work out the
% underlying point.
% \begin{macrocode}
-\cs_new:Npn \draw_point_vec_coord:nn #1#2
- { \@@_point_vec_coord:ff { \fp_eval:n {#1} } { \fp_eval:n {#2} } }
-\cs_new:Npn \@@_point_vec_coord:nn #1#2
+\cs_new:Npn \draw_point_vec:nn #1#2
+ { \@@_point_vec:ff { \fp_eval:n {#1} } { \fp_eval:n {#2} } }
+\cs_new:Npn \@@_point_vec:nn #1#2
{
{
\fp_to_dim:n
@@ -891,13 +891,13 @@
{ #1 * \l_@@_xvec_y_dim + #2 * \l_@@_yvec_y_dim }
}
}
-\cs_generate_variant:Nn \@@_point_vec_coord:nn { ff }
-\cs_new:Npn \draw_point_vec_coord:nnn #1#2#3
+\cs_generate_variant:Nn \@@_point_vec:nn { ff }
+\cs_new:Npn \draw_point_vec:nnn #1#2#3
{
- \@@_point_vec_coord:fff
+ \@@_point_vec:fff
{ \fp_eval:n {#1} } { \fp_eval:n {#2} } { \fp_eval:n {#3} }
}
-\cs_new:Npn \@@_point_vec_coord:nnn #1#2#3
+\cs_new:Npn \@@_point_vec:nnn #1#2#3
{
{
\fp_to_dim:n
@@ -916,7 +916,7 @@
}
}
}
-\cs_generate_variant:Nn \@@_point_vec_coord:nnn { fff }
+\cs_generate_variant:Nn \@@_point_vec:nnn { fff }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3trial/l3draw/l3draw.dtx b/l3trial/l3draw/l3draw.dtx
index 4ee40f5..4646353 100644
--- a/l3trial/l3draw/l3draw.dtx
+++ b/l3trial/l3draw/l3draw.dtx
@@ -62,9 +62,9 @@
%
% \subsection{Points}
%
-% \begin{function}[rEXP]{\draw_point_coord:nn}
+% \begin{function}[rEXP]{\draw_point:nn}
% \begin{syntax}
-% \cs{draw_point_coord:nn} \marg{x} \marg{y}
+% \cs{draw_point:nn} \marg{x} \marg{y}
% \end{syntax}
% \end{function}
%
@@ -104,10 +104,10 @@
% \end{syntax}
% \end{function}
%
-% \begin{function}[rEXP]{\draw_point_vec_coord:nn, \draw_point_vec_coord:nnn}
+% \begin{function}[rEXP]{\draw_point_vec:nn, \draw_point_vec:nnn}
% \begin{syntax}
-% \cs{draw_point_vec_coord:nn} \marg{xscale} \marg{yscale}
-% \cs{draw_point_vec_coord:nnn} \marg{xscale} \marg{yscale} \marg{zscale}
+% \cs{draw_point_vec:nn} \marg{xscale} \marg{yscale}
+% \cs{draw_point_vec:nnn} \marg{xscale} \marg{yscale} \marg{zscale}
% \end{syntax}
% \end{function}
%
diff --git a/l3trial/l3draw/testfiles/m3draw001.lvt b/l3trial/l3draw/testfiles/m3draw001.lvt
index fd5bd85..22b0060 100644
--- a/l3trial/l3draw/testfiles/m3draw001.lvt
+++ b/l3trial/l3draw/testfiles/m3draw001.lvt
@@ -17,15 +17,15 @@
\START
-\TESTEXP { \draw_point_coord:nn }
+\TESTEXP { \draw_point:nn }
{
- \draw_point_coord:nn { 2pt + 3cm } { 3cm }
+ \draw_point:nn { 2pt + 3cm } { 3cm }
\NEWLINE
- \draw_point_coord:nn { 10pt } { 1cm }
+ \draw_point:nn { 10pt } { 1cm }
\NEWLINE
- \draw_point_coord:nn { 10 } { 1 }
+ \draw_point:nn { 10 } { 1 }
\NEWLINE
- \draw_point_coord:nn { 10 * 3.5cm } { sqrt(2) }
+ \draw_point:nn { 10 * 3.5cm } { sqrt(2) }
}
\TESTEXP { \draw_point_polar:nn }
@@ -41,8 +41,8 @@
\TESTEXP { \draw_point_add:nn }
{
\draw_point_add:nn
- { \draw_point_vec_coord:nn { 0 } { 1 } }
- { \draw_point_vec_coord:nn { 2 } { 3 } }
+ { \draw_point_vec:nn { 0 } { 1 } }
+ { \draw_point_vec:nn { 2 } { 3 } }
\NEWLINE
\draw_point_add:nn { { 1cm } { 1cm } } { { 2cm } { 2cm } }
}
@@ -50,8 +50,8 @@
\TESTEXP { \draw_point_diff:nn }
{
\draw_point_diff:nn
- { \draw_point_vec_coord:nn { 1 } { 1 } }
- { \draw_point_vec_coord:nn { 2 } { 3 } }
+ { \draw_point_vec:nn { 1 } { 1 } }
+ { \draw_point_vec:nn { 2 } { 3 } }
\NEWLINE
\draw_point_diff:nn { { 1cm } { 1cm } } { { 2cm } { 2cm } }
}
@@ -59,7 +59,7 @@
\TESTEXP { \draw_point_scale:nn }
{
\draw_point_scale:nn { 2 }
- { \draw_point_vec_coord:nn { 0 } { 1 } }
+ { \draw_point_vec:nn { 0 } { 1 } }
\NEWLINE
\draw_point_scale:nn { 0.5 ^ 2 } { { 2cm } { 2cm } }
}
@@ -67,33 +67,33 @@
\TESTEXP { \draw_point_unit_vector:n }
{
\draw_point_unit_vector:n
- { \draw_point_vec_coord:nn { 2 } { 1 } }
+ { \draw_point_vec:nn { 2 } { 1 } }
\NEWLINE
\draw_point_unit_vector:n
- { \draw_point_vec_coord:nn { -2 } { 1 } }
+ { \draw_point_vec:nn { -2 } { 1 } }
}
\TESTEXP { \draw_point_intersect_lines:nnnn }
{
\draw_point_intersect_lines:nnnn
- { \draw_point_vec_coord:nn { 0 } { 1 } }
- { \draw_point_vec_coord:nn { 1 } { 0 } }
- { \draw_point_vec_coord:nn { 2 } { 2 } }
- { \draw_point_vec_coord:nn { 3 } { 4 } }
+ { \draw_point_vec:nn { 0 } { 1 } }
+ { \draw_point_vec:nn { 1 } { 0 } }
+ { \draw_point_vec:nn { 2 } { 2 } }
+ { \draw_point_vec:nn { 3 } { 4 } }
\NEWLINE
\draw_point_intersect_lines:nnnn
- { \draw_point_vec_coord:nn { 0 } { 0 } }
- { \draw_point_vec_coord:nn { 1 } { 1 } }
- { \draw_point_vec_coord:nn { 0 } { 1 } }
- { \draw_point_vec_coord:nn { sqrt(2) } { -sqrt(2) } }
+ { \draw_point_vec:nn { 0 } { 0 } }
+ { \draw_point_vec:nn { 1 } { 1 } }
+ { \draw_point_vec:nn { 0 } { 1 } }
+ { \draw_point_vec:nn { sqrt(2) } { -sqrt(2) } }
}
\TESTEXP { \draw_point_intersect_circles:nnnnn }
{
\draw_point_intersect_circles:nnnnn
- { \draw_point_vec_coord:nn { 0 } { 1 } }
+ { \draw_point_vec:nn { 0 } { 1 } }
{ 1cm }
- { \draw_point_vec_coord:nn { 1 } { 0 } }
+ { \draw_point_vec:nn { 1 } { 0 } }
{ 1cm }
{ 1 }
}
@@ -102,31 +102,31 @@
{
\draw_point_interpolate_line:nnn
{ 0.5 }
- { \draw_point_vec_coord:nn { 0 } { 1 } }
- { \draw_point_vec_coord:nn { 2 } { 3 } }
+ { \draw_point_vec:nn { 0 } { 1 } }
+ { \draw_point_vec:nn { 2 } { 3 } }
}
\TESTEXP { \draw_point_interpolate_distance:nnn }
{
\draw_point_interpolate_distance:nnn
{ 2pt }
- { \draw_point_vec_coord:nn { 0 } { 1 } }
- { \draw_point_vec_coord:nn { 2 } { 3 } }
+ { \draw_point_vec:nn { 0 } { 1 } }
+ { \draw_point_vec:nn { 2 } { 3 } }
\NEWLINE
\draw_point_interpolate_distance:nnn
{ 3pt }
- { \draw_point_vec_coord:nn { 2 } { 3 } }
- { \draw_point_vec_coord:nn { 0 } { 1 } }
+ { \draw_point_vec:nn { 2 } { 3 } }
+ { \draw_point_vec:nn { 0 } { 1 } }
}
\TESTEXP { \draw_point_interpolate_curve:nnnnnn }
{
\draw_point_interpolate_curve:nnnnnn
{ 0.5 }
- { \draw_point_vec_coord:nn { 0 } { 1 } }
- { \draw_point_vec_coord:nn { 1 } { 1 } }
- { \draw_point_vec_coord:nn { 1 } { 1 } }
- { \draw_point_vec_coord:nn { 2 } { 3 } }
+ { \draw_point_vec:nn { 0 } { 1 } }
+ { \draw_point_vec:nn { 1 } { 1 } }
+ { \draw_point_vec:nn { 1 } { 1 } }
+ { \draw_point_vec:nn { 2 } { 3 } }
}
\TESTEXP { \draw_point_interpolate_arc:nnnnnn }
@@ -142,13 +142,13 @@
\TEST { \draw_set_<axis>vec:n }
{
- \exp_args:Nx \tl_show:n { \draw_point_vec_coord:nnn { 1 } { 1 } { 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
\draw_xvec_set:n { { 1cm } { 1cm } }
- \exp_args:Nx \tl_show:n { \draw_point_vec_coord:nnn { 1 } { 1 } { 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
\draw_yvec_set:n { { 1cm } { 1cm } }
- \exp_args:Nx \tl_show:n { \draw_point_vec_coord:nnn { 1 } { 1 } { 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
\draw_zvec_set:n { { 1cm } { 1cm } }
- \exp_args:Nx \tl_show:n { \draw_point_vec_coord:nnn { 1 } { 1 } { 1 } }
+ \exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
}
\OMIT
@@ -156,15 +156,15 @@
\draw_yvec_set:n { { 0cm } { 1cm } }
\TIMO
-\TESTEXP { \draw_point_vec_coord:nn }
+\TESTEXP { \draw_point_vec:nn }
{
- \draw_point_vec_coord:nn { 0 } { 0 }
+ \draw_point_vec:nn { 0 } { 0 }
\NEWLINE
- \draw_point_vec_coord:nn { 1 } { 0 }
+ \draw_point_vec:nn { 1 } { 0 }
\NEWLINE
- \draw_point_vec_coord:nn { 1 } { 1 }
+ \draw_point_vec:nn { 1 } { 1 }
\NEWLINE
- \draw_point_vec_coord:nn { 1 } { 0 }
+ \draw_point_vec:nn { 1 } { 0 }
}
\OMIT
@@ -172,15 +172,15 @@
\draw_yvec_set:n { { 0cm } { 1cm } }
\TIMO
-\TESTEXP { \draw_point_vec_coord:nnn }
+\TESTEXP { \draw_point_vec:nnn }
{
- \draw_point_vec_coord:nnn { 0 } { 0 } { 0 }
+ \draw_point_vec:nnn { 0 } { 0 } { 0 }
\NEWLINE
- \draw_point_vec_coord:nnn { 0 } { 0 } { 1 }
+ \draw_point_vec:nnn { 0 } { 0 } { 1 }
\NEWLINE
- \draw_point_vec_coord:nnn { 0 } { 1 } { 0 }
+ \draw_point_vec:nnn { 0 } { 1 } { 0 }
\NEWLINE
- \draw_point_vec_coord:nnn { 0 } { 1 } { 1 }
+ \draw_point_vec:nnn { 0 } { 1 } { 1 }
}
\TESTEXP { \draw_point_vec_polar:nn }
diff --git a/l3trial/l3draw/testfiles/m3draw001.tlg b/l3trial/l3draw/testfiles/m3draw001.tlg
index 0f31001..38067e8 100644
--- a/l3trial/l3draw/testfiles/m3draw001.tlg
+++ b/l3trial/l3draw/testfiles/m3draw001.tlg
@@ -1,7 +1,7 @@
This is a generated file for the LaTeX (2e + expl3) validation system.
Don't change this file in any respect.
============================================================
-TEST 1: \draw_point_coord:nn
+TEST 1: \draw_point:nn
============================================================
{87.35826771653543pt}{85.35826771653543pt}
{10pt}{28.45275590551181pt}
@@ -88,7 +88,7 @@ l. ... }
l. ... }
============================================================
============================================================
-TEST 14: \draw_point_vec_coord:nn
+TEST 14: \draw_point_vec:nn
============================================================
{0pt}{0pt}
{28.45274353027344pt}{28.45274353027344pt}
@@ -96,7 +96,7 @@ TEST 14: \draw_point_vec_coord:nn
{28.45274353027344pt}{28.45274353027344pt}
============================================================
============================================================
-TEST 15: \draw_point_vec_coord:nnn
+TEST 15: \draw_point_vec:nnn
============================================================
{0pt}{0pt}
{-10.95414733886719pt}{-10.95414733886719pt}
diff --git a/l3trial/l3draw/testfiles/m3draw003.lvt b/l3trial/l3draw/testfiles/m3draw003.lvt
index 80c781c..9a077e9 100644
--- a/l3trial/l3draw/testfiles/m3draw003.lvt
+++ b/l3trial/l3draw/testfiles/m3draw003.lvt
@@ -45,9 +45,9 @@
\test:n
{
\draw_path_curveto:nnn
- { \draw_point_vec_coord:nn { 0 } { 1 } }
- { \draw_point_vec_coord:nn { 1 } { 1 } }
- { \draw_point_vec_coord:nn { 1 } { 2 } }
+ { \draw_point_vec:nn { 0 } { 1 } }
+ { \draw_point_vec:nn { 1 } { 1 } }
+ { \draw_point_vec:nn { 1 } { 2 } }
}
}
More information about the latex3-commits
mailing list