[latex3-commits] [git/LaTeX3-latex3-latex3] main: Rename \__draw_point_to_dim:n to \draw_point:n (f84e3da9b)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Jul 19 13:30:09 CEST 2021
Repository : https://github.com/latex3/latex3
On branch : main
Link : https://github.com/latex3/latex3/commit/f84e3da9be5eb34e27b2a9ca418f7a8494da87a1
>---------------------------------------------------------------
commit f84e3da9be5eb34e27b2a9ca418f7a8494da87a1
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Jul 19 12:30:09 2021 +0100
Rename \__draw_point_to_dim:n to \draw_point:n
As it always produces a dim tuple, we will want it for
implementing higher-level material. This is easiest
to explain with a public name.
>---------------------------------------------------------------
f84e3da9be5eb34e27b2a9ca418f7a8494da87a1
l3experimental/CHANGELOG.md | 1 +
l3experimental/l3draw/l3draw-points.dtx | 68 ++++++++++++++-------------
l3experimental/l3draw/testfiles/m3draw001.lvt | 7 +++
l3experimental/l3draw/testfiles/m3draw001.tlg | 30 +++++++-----
4 files changed, 61 insertions(+), 45 deletions(-)
diff --git a/l3experimental/CHANGELOG.md b/l3experimental/CHANGELOG.md
index 600a8ee9e..fc5f4b51b 100644
--- a/l3experimental/CHANGELOG.md
+++ b/l3experimental/CHANGELOG.md
@@ -9,6 +9,7 @@ this project uses date-based 'snapshot' version identifiers.
### Added
- `\draw_baseline:n`
+- `\draw_point:n`
## [2021-07-12]
diff --git a/l3experimental/l3draw/l3draw-points.dtx b/l3experimental/l3draw/l3draw-points.dtx
index 527194b8e..5a6a61198 100644
--- a/l3experimental/l3draw/l3draw-points.dtx
+++ b/l3experimental/l3draw/l3draw-points.dtx
@@ -112,7 +112,7 @@
\cs_new:Npn \@@_point_process:nn #1#2
{
\exp_args:Nf \@@_point_process_auxi:nn
- { \@@_point_to_dim:n {#2} }
+ { \draw_point:n {#2} }
{#1}
}
\cs_new:Npn \@@_point_process_auxi:nn #1#2
@@ -122,8 +122,8 @@
\cs_new:Npn \@@_point_process:nnn #1#2#3
{
\exp_args:Nff \@@_point_process_auxiii:nnn
- { \@@_point_to_dim:n {#2} }
- { \@@_point_to_dim:n {#3} }
+ { \draw_point:n {#2} }
+ { \draw_point:n {#3} }
{#1}
}
\cs_new:Npn \@@_point_process_auxiii:nnn #1#2#3
@@ -133,9 +133,9 @@
\cs_new:Npn \@@_point_process:nnnn #1#2#3#4
{
\exp_args:Nfff \@@_point_process_auxv:nnnn
- { \@@_point_to_dim:n {#2} }
- { \@@_point_to_dim:n {#3} }
- { \@@_point_to_dim:n {#4} }
+ { \draw_point:n {#2} }
+ { \draw_point:n {#3} }
+ { \draw_point:n {#4} }
{#1}
}
\cs_new:Npn \@@_point_process_auxv:nnnn #1#2#3#4
@@ -146,10 +146,10 @@
\cs_new:Npn \@@_point_process:nnnnn #1#2#3#4#5
{
\exp_args:Nffff \@@_point_process_auxvii:nnnnn
- { \@@_point_to_dim:n {#2} }
- { \@@_point_to_dim:n {#3} }
- { \@@_point_to_dim:n {#4} }
- { \@@_point_to_dim:n {#5} }
+ { \draw_point:n {#2} }
+ { \draw_point:n {#3} }
+ { \draw_point:n {#4} }
+ { \draw_point:n {#5} }
{#1}
}
\cs_new:Npn \@@_point_process_auxvii:nnnnn #1#2#3#4#5
@@ -174,17 +174,19 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}[EXP]{\@@_point_to_dim:n}
-% \begin{macro}[EXP]{\@@_point_to_dim_aux:n, \@@_point_to_dim_aux:f}
-% \begin{macro}[EXP]{\@@_point_to_dim_aux:w}
+% \subsection{Basic points}
+%
+% \begin{macro}[EXP]{\draw_point:n}
+% \begin{macro}[EXP]{\@@_point_to_dim:n, \@@_point_to_dim:f}
+% \begin{macro}[EXP]{\@@_point_to_dim:w}
% Co-ordinates are always returned as two dimensions.
% \begin{macrocode}
+\cs_new:Npn \draw_point:n #1
+ { \@@_point_to_dim:f { \fp_eval:n {#1} } }
\cs_new:Npn \@@_point_to_dim:n #1
- { \@@_point_to_dim_aux:f { \fp_eval:n {#1} } }
-\cs_new:Npn \@@_point_to_dim_aux:n #1
- { \@@_point_to_dim_aux:w #1 }
-\cs_generate_variant:Nn \@@_point_to_dim_aux:n { f }
-\cs_new:Npn \@@_point_to_dim_aux:w ( #1 , ~ #2 ) { #1pt , #2pt }
+ { \@@_point_to_dim:w #1 }
+\cs_generate_variant:Nn \@@_point_to_dim:n { f }
+\cs_new:Npn \@@_point_to_dim:w ( #1 , ~ #2 ) { #1pt , #2pt }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -203,7 +205,7 @@
\cs_new:Npn \draw_point_polar:nnn #1#2#3
{ \@@_draw_polar:fnn { \fp_eval:n {#3} } {#1} {#2} }
\cs_new:Npn \@@_draw_polar:nnn #1#2#3
- { \@@_point_to_dim:n { cosd(#1) * (#2) , sind(#1) * (#3) } }
+ { \draw_point:n { cosd(#1) * (#2) , sind(#1) * (#3) } }
\cs_generate_variant:Nn \@@_draw_polar:nnn { f }
% \end{macrocode}
% \end{macro}
@@ -239,7 +241,7 @@
\fp_compare:nNnTF {#1} = \c_zero_fp
{ 0pt, 1pt }
{
- \@@_point_to_dim:n
+ \draw_point:n
{ ( #2 , #3 ) / #1 }
}
}
@@ -308,7 +310,7 @@
}
\cs_new:Npn \@@_point_intersect_lines_aux:nnnnnn #1#2#3#4#5#6
{
- \@@_point_to_dim:n
+ \draw_point:n
{
( #2 * #3 - #1 * #4 , #2 * #5 - #1 * #6 )
/ ( #4 * #5 - #6 * #3 )
@@ -462,7 +464,7 @@
\cs_generate_variant:Nn \@@_point_intersect_circles_auxvi:nnnnnnnn { f }
\cs_new:Npn \@@_point_intersect_circles_auxvii:nnnnnnn #1#2#3#4#5#6#7
{
- \@@_point_to_dim:n
+ \draw_point:n
{ #6 + #4 * #1 + #2 * #3 * #5 , #7 + #5 * #1 + -1 * #2 * #3 * #4 }
}
\cs_generate_variant:Nn \@@_point_intersect_circles_auxvii:nnnnnnn { fff }
@@ -503,7 +505,7 @@
}
\cs_generate_variant:Nn \@@_point_interpolate_line_aux:nnnnn { f }
\cs_new:Npn \@@_point_interpolate_line_aux:nnnnnn #1#2#3#4#5#6
- { \@@_point_to_dim:n { #2 * #3 + #1 * #5 , #2 * #4 + #1 * #6 } }
+ { \draw_point:n { #2 * #3 + #1 * #5 , #2 * #4 + #1 * #6 } }
\cs_generate_variant:Nn \@@_point_interpolate_line_aux:nnnnnn { f }
% \end{macrocode}
% \end{macro}
@@ -537,7 +539,7 @@
{ \draw_point_unit_vector:n { ( #2 ) - ( #3 , #4 ) } }
}
\cs_new:Npn \@@_point_interpolate_distance:nnnnn #1#2#3#4#5
- { \@@_point_to_dim:n { #2 + #1 * #4 , #3 + #1 * #5 } }
+ { \draw_point:n { #2 + #1 * #4 , #3 + #1 * #5 } }
\cs_generate_variant:Nn \@@_point_interpolate_distance:nnnnn { f }
% \end{macrocode}
% \end{macro}
@@ -612,7 +614,7 @@
\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
+ \draw_point:n
{ #3 + #1 * #5 + #2 * #7 , #4 + #1 * #6 + #2 * #8 }
}
\cs_generate_variant:Nn \@@_point_interpolate_arcaxes_auxiv:nnnnnnnn { ff }
@@ -749,7 +751,7 @@
}
\cs_new:Npn \@@_point_interpolate_curve_auxviii:nnnnnn #1#2#3#4#5#6
{
- \@@_point_to_dim:n
+ \draw_point:n
{ #5 * #3 + #6 * #1 , #5 * #4 + #6 * #2 }
}
\cs_generate_variant:Nn \@@_point_interpolate_curve_auxviii:nnnnnn { ffff }
@@ -831,7 +833,7 @@
{ \@@_point_vec:ff { \fp_eval:n {#1} } { \fp_eval:n {#2} } }
\cs_new:Npn \@@_point_vec:nn #1#2
{
- \@@_point_to_dim:n
+ \draw_point:n
{
#1 * \l_@@_xvec_x_dim + #2 * \l_@@_yvec_x_dim ,
#1 * \l_@@_xvec_y_dim + #2 * \l_@@_yvec_y_dim
@@ -845,7 +847,7 @@
}
\cs_new:Npn \@@_point_vec:nnn #1#2#3
{
- \@@_point_to_dim:n
+ \draw_point:n
{
#1 * \l_@@_xvec_x_dim
+ #2 * \l_@@_yvec_x_dim
@@ -874,7 +876,7 @@
{ \@@_draw_vec_polar:fnn { \fp_eval:n {#3} } {#1} {#2} }
\cs_new:Npn \@@_draw_vec_polar:nnn #1#2#3
{
- \@@_point_to_dim:n
+ \draw_point:n
{
cosd(#1) * (#2) * \l_@@_xvec_x_dim ,
sind(#1) * (#3) * \l_@@_yvec_y_dim
@@ -903,7 +905,7 @@
{
\bool_if:NTF \l_@@_matrix_active_bool
{
- \@@_point_to_dim:n
+ \draw_point:n
{
(
\l_@@_matrix_a_fp * #1
@@ -919,7 +921,7 @@
}
}
{
- \@@_point_to_dim:n
+ \draw_point:n
{
(#1, #2)
+ ( \l_@@_xshift_dim , \l_@@_yshift_dim )
@@ -943,7 +945,7 @@
{
\bool_if:NTF \l_@@_matrix_active_bool
{
- \@@_point_to_dim:n
+ \draw_point:n
{
(
\l_@@_matrix_a_fp * #1
@@ -956,7 +958,7 @@
)
}
}
- { \@@_point_to_dim:n { (#1, #2) } }
+ { \draw_point:n { (#1, #2) } }
}
% \end{macrocode}
% \end{macro}
diff --git a/l3experimental/l3draw/testfiles/m3draw001.lvt b/l3experimental/l3draw/testfiles/m3draw001.lvt
index 5b7a59860..84abb2f2f 100644
--- a/l3experimental/l3draw/testfiles/m3draw001.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw001.lvt
@@ -13,6 +13,13 @@
\START
+\TESTEXP { \draw_point:n }
+ {
+ \draw_point:n { 1 , 2 }
+ \NEWLINE
+ \draw_point:n { 2cm , 3cm }
+ }
+
\TESTEXP { \draw_point_polar:nn(n) }
{
\draw_point_polar:nn { 1cm } { 30 }
diff --git a/l3experimental/l3draw/testfiles/m3draw001.tlg b/l3experimental/l3draw/testfiles/m3draw001.tlg
index 8da9fb23d..3dbfc6a7a 100644
--- a/l3experimental/l3draw/testfiles/m3draw001.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw001.tlg
@@ -1,53 +1,59 @@
This is a generated file for the LaTeX (2e + expl3) validation system.
Don't change this file in any respect.
============================================================
-TEST 1: \draw_point_polar:nn (n)
+TEST 1: \draw_point:n
+============================================================
+1pt,2pt
+56.90551181102362pt,85.35826771653543pt
+============================================================
+============================================================
+TEST 2: \draw_point_polar:nn (n)
============================================================
24.64080942185094pt,14.2263779527559pt
24.64080942185094pt,28.45275590551181pt
24.64080942185093pt,28.45275590551181pt
============================================================
============================================================
-TEST 2: \draw_point_unit_vector:n
+TEST 3: \draw_point_unit_vector:n
============================================================
0.894427190999916pt,0.447213595499958pt
-0.894427190999916pt,0.447213595499958pt
0pt,1pt
============================================================
============================================================
-TEST 3: \draw_point_intersect_lines:nnnn
+TEST 4: \draw_point_intersect_lines:nnnn
============================================================
28.4527587890625pt,-0.000000000000004117465614979737pt
10.51039396997536pt,10.51039396997536pt
============================================================
============================================================
-TEST 4: \draw_point_intersect_circles:nnnnn
+TEST 5: \draw_point_intersect_circles:nnnnn
============================================================
0.00000288355082pt,0.00000288355084pt
============================================================
============================================================
-TEST 5: \draw_point_interpolate_line:nnn
+TEST 6: \draw_point_interpolate_line:nnn
============================================================
28.4527587890625pt,56.905517578125pt
============================================================
============================================================
-TEST 6: \draw_point_interpolate_distance:nnn
+TEST 7: \draw_point_interpolate_distance:nnn
============================================================
1.414213562373095pt,29.8669723514356pt
54.78419723456536pt,83.23695602362786pt
============================================================
============================================================
-TEST 7: \draw_point_interpolate_arcaxes:nnnnnn
+TEST 8: \draw_point_interpolate_arcaxes:nnnnnn
============================================================
52.44956684602254pt,43.74041050993108pt
============================================================
============================================================
-TEST 8: \draw_point_interpolate_curve:nnnnnn
+TEST 9: \draw_point_interpolate_curve:nnnnnn
============================================================
28.4527587890625pt,35.56594848632813pt
============================================================
============================================================
-TEST 9: \draw_set_ <axis>vec:n
+TEST 10: \draw_set_ <axis>vec:n
============================================================
> 17.49844360351562pt,17.49844360351562pt.
<recently read> }
@@ -63,7 +69,7 @@ l. ... }
l. ... }
============================================================
============================================================
-TEST 10: \draw_point_vec:nn
+TEST 11: \draw_point_vec:nn
============================================================
0pt,0pt
28.4527587890625pt,28.4527587890625pt
@@ -71,7 +77,7 @@ TEST 10: \draw_point_vec:nn
28.4527587890625pt,28.4527587890625pt
============================================================
============================================================
-TEST 11: \draw_point_vec:nnn
+TEST 12: \draw_point_vec:nnn
============================================================
0pt,0pt
-10.95431518554688pt,-10.95431518554688pt
@@ -79,7 +85,7 @@ TEST 11: \draw_point_vec:nnn
-10.95431518554688pt,17.49844360351562pt
============================================================
============================================================
-TEST 12: \draw_point_vec_polar:nn (n)
+TEST 13: \draw_point_vec_polar:nn (n)
============================================================
49.28162383815817pt,28.4527587890625pt
24.64081191907909pt,28.4527587890625pt
More information about the latex3-commits
mailing list.