[latex3-commits] [git/LaTeX3-latex3-latex3] master: l3draw: Clearer names for interpolation (30b6c49)
Joseph Wright
joseph.wright at morningstar2.co.uk
Fri Feb 9 16:41:41 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/30b6c490df7aab087b77f926417ccfc8c88a1b77
>---------------------------------------------------------------
commit 30b6c490df7aab087b77f926417ccfc8c88a1b77
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Feb 9 15:41:41 2018 +0000
l3draw: Clearer names for interpolation
>---------------------------------------------------------------
30b6c490df7aab087b77f926417ccfc8c88a1b77
l3trial/l3draw/l3draw-points.dtx | 54 ++++++++++++++++----------------
l3trial/l3draw/l3draw.dtx | 8 ++---
l3trial/l3draw/testfiles/m3draw001.lvt | 10 +++---
l3trial/l3draw/testfiles/m3draw001.tlg | 2 +-
4 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/l3trial/l3draw/l3draw-points.dtx b/l3trial/l3draw/l3draw-points.dtx
index cc1bd1c..a9eb993 100644
--- a/l3trial/l3draw/l3draw-points.dtx
+++ b/l3trial/l3draw/l3draw-points.dtx
@@ -465,81 +465,81 @@
%
% \subsection{Interpolation on a line (vector) or arc}
%
-% \begin{macro}[EXP]{\draw_point_line_part:nnn}
-% \begin{macro}[EXP]{\@@_point_line_part:nnnnn}
+% \begin{macro}[EXP]{\draw_point_interpolate_line:nnn}
+% \begin{macro}[EXP]{\@@_point_interpolate_line:nnnnn}
% \begin{macro}[EXP]
% {
-% \@@_point_line_part_aux:nnnnn,
-% \@@_point_line_part_aux:fnnnn,
+% \@@_point_interpolate_line_aux:nnnnn,
+% \@@_point_interpolate_line_aux:fnnnn,
% }
% \begin{macro}[EXP]
% {
-% \@@_point_line_part_aux:nnnnnn,
-% \@@_point_line_part_aux:fnnnnn,
+% \@@_point_interpolate_line_aux:nnnnnn,
+% \@@_point_interpolate_line_aux:fnnnnn,
% }
% Simple maths after expansion.
% \begin{macrocode}
-\cs_new:Npn \draw_point_line_part:nnn #1#2#3
+\cs_new:Npn \draw_point_interpolate_line:nnn #1#2#3
{
\@@_point_expand:nnN {#2} {#3}
- \@@_point_line_part:nnnnn
+ \@@_point_interpolate_line:nnnnn
{#1}
}
-\cs_new:Npn \@@_point_line_part:nnnnn #1#2#3#4#5
+\cs_new:Npn \@@_point_interpolate_line:nnnnn #1#2#3#4#5
{
- \@@_point_line_part_aux:fnnnn { \fp_eval:n {#5} }
+ \@@_point_interpolate_line_aux:fnnnn { \fp_eval:n {#5} }
{#1} {#2} {#3} {#4}
}
-\cs_new:Npn \@@_point_line_part_aux:nnnnn #1#2#3#4#5
+\cs_new:Npn \@@_point_interpolate_line_aux:nnnnn #1#2#3#4#5
{
- \@@_point_line_part_aux:fnnnnn { \fp_eval:n { 1 - #1 } }
+ \@@_point_interpolate_line_aux:fnnnnn { \fp_eval:n { 1 - #1 } }
{#1} {#2} {#3} {#4} {#5}
}
-\cs_generate_variant:Nn \@@_point_line_part_aux:nnnnn { f }
-\cs_new:Npn \@@_point_line_part_aux:nnnnnn #1#2#3#4#5#6
+\cs_generate_variant:Nn \@@_point_interpolate_line_aux:nnnnn { f }
+\cs_new:Npn \@@_point_interpolate_line_aux:nnnnnn #1#2#3#4#5#6
{
{ \fp_to_dim:n { #2 * #3 + #1 * #5 } }
{ \fp_to_dim:n { #2 * #4 + #1 * #6 } }
}
-\cs_generate_variant:Nn \@@_point_line_part_aux:nnnnnn { f }
+\cs_generate_variant:Nn \@@_point_interpolate_line_aux:nnnnnn { f }
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
%
-% \begin{macro}[EXP]{\draw_point_line_distance:nnn}
-% \begin{macro}[EXP]{\@@_point_line_distance:nnnnn}
+% \begin{macro}[EXP]{\draw_point_interpolate_distance:nnn}
+% \begin{macro}[EXP]{\@@_point_interpolate_distance:nnnnn}
% \begin{macro}[EXP]
% {
-% \@@_point_line_distance_aux:nnnnn,
-% \@@_point_line_distance_aux:fnnnn,
+% \@@_point_interpolate_distance_aux:nnnnn,
+% \@@_point_interpolate_distance_aux:fnnnn,
% }
% \begin{macro}[EXP]
% {
-% \@@_point_line_distance_aux:nnnnnn,
-% \@@_point_line_distance_aux:fnnnnn,
+% \@@_point_interpolate_distance_aux:nnnnnn,
+% \@@_point_interpolate_distance_aux:fnnnnn,
% }
% Same idea but using the normalised length to obtain the scale factor.
% \begin{macrocode}
-\cs_new:Npn \draw_point_line_distance:nnn #1#2#3
+\cs_new:Npn \draw_point_interpolate_distance:nnn #1#2#3
{
\@@_point_expand:nnN {#2} {#3}
- \@@_point_line_distance:nnnnn
+ \@@_point_interpolate_distance:nnnnn
{#1}
}
-\cs_new:Npn \@@_point_line_distance:nnnnn #1#2#3#4#5
+\cs_new:Npn \@@_point_interpolate_distance:nnnnn #1#2#3#4#5
{
- \@@_point_line_distance_aux:fnnnn
+ \@@_point_interpolate_distance_aux:fnnnn
{ \fp_eval:n { (#5) / sqrt ( ( #3 - #1 ) ^ 2 + ( #4 - #2 ) ^ 2 ) } }
{#1} {#2} {#3} {#4}
}
-\cs_new:Npn \@@_point_line_distance_aux:nnnnn #1#2#3#4#5
+\cs_new:Npn \@@_point_interpolate_distance_aux:nnnnn #1#2#3#4#5
{
{ \fp_to_dim:n { #2 + #1 * #4 } }
{ \fp_to_dim:n { #3 + #1 * #5 } }
}
-\cs_generate_variant:Nn \@@_point_line_distance_aux:nnnnn { f }
+\cs_generate_variant:Nn \@@_point_interpolate_distance_aux:nnnnn { f }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3trial/l3draw/l3draw.dtx b/l3trial/l3draw/l3draw.dtx
index 559beb4..1d0942a 100644
--- a/l3trial/l3draw/l3draw.dtx
+++ b/l3trial/l3draw/l3draw.dtx
@@ -130,15 +130,15 @@
% % Note interface, cf. pgf
% \end{function}
%
-% \begin{function}[EXP]{\draw_point_line_part:nnn}
+% \begin{function}[EXP]{\draw_point_interpolate_line:nnn}
% \begin{syntax}
-% \cs{draw_point_line_part:nnn} \marg{part} \marg{point expr1} \marg{point expr2}
+% \cs{draw_point_interpolate_line:nnn} \marg{part} \marg{point expr1} \marg{point expr2}
% \end{syntax}
% \end{function}
%
-% \begin{function}[EXP]{\draw_point_line_distance:nnn}
+% \begin{function}[EXP]{\draw_point_interpolate_distance:nnn}
% \begin{syntax}
-% \cs{draw_point_line_distance:nnn} \marg{distance} \marg{point expr1} \marg{point expr2}
+% \cs{draw_point_interpolate_distance:nnn} \marg{distance} \marg{point expr1} \marg{point expr2}
% \end{syntax}
% \end{function}
%
diff --git a/l3trial/l3draw/testfiles/m3draw001.lvt b/l3trial/l3draw/testfiles/m3draw001.lvt
index a530c8e..5d978fe 100644
--- a/l3trial/l3draw/testfiles/m3draw001.lvt
+++ b/l3trial/l3draw/testfiles/m3draw001.lvt
@@ -98,22 +98,22 @@
{ 1 }
}
-\TESTEXP { \draw_point_line_part:nnn }
+\TESTEXP { \draw_point_interpolate_line:nnn }
{
- \draw_point_line_part:nnn
+ \draw_point_interpolate_line:nnn
{ 0.5 }
{ \draw_point_vec_coord:nn { 0 } { 1 } }
{ \draw_point_vec_coord:nn { 2 } { 3 } }
}
-\TESTEXP { \draw_point_line_distance:nnn }
+\TESTEXP { \draw_point_interpolate_distance:nnn }
{
- \draw_point_line_distance:nnn
+ \draw_point_interpolate_distance:nnn
{ 2pt }
{ \draw_point_vec_coord:nn { 0 } { 1 } }
{ \draw_point_vec_coord:nn { 2 } { 3 } }
\NEWLINE
- \draw_point_line_distance:nnn
+ \draw_point_interpolate_distance:nnn
{ 3pt }
{ \draw_point_vec_coord:nn { 2 } { 3 } }
{ \draw_point_vec_coord:nn { 0 } { 1 } }
diff --git a/l3trial/l3draw/testfiles/m3draw001.tlg b/l3trial/l3draw/testfiles/m3draw001.tlg
index dbf2f62..d6db6d8 100644
--- a/l3trial/l3draw/testfiles/m3draw001.tlg
+++ b/l3trial/l3draw/testfiles/m3draw001.tlg
@@ -51,7 +51,7 @@ TEST 8: \draw_point_intersect_circles:nnnnn
{-0.00001237523567pt}{-0.00001237523569pt}
============================================================
============================================================
-TEST 9: \draw_point_line_part:nnn
+TEST 9: \draw_point_interpolate_line:nnn
============================================================
{28.45274353027344pt}{56.90548706054688pt}
============================================================
More information about the latex3-commits
mailing list