[latex3-commits] [git/LaTeX3-latex3-latex3] master: Drop \draw_point:nn, etc. (cca9d16)

Joseph Wright joseph.wright at morningstar2.co.uk
Thu Mar 8 22:07:33 CET 2018 

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

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

commit cca9d161eacb838eb775fc9afaef9b6b7a6ad127
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Mar 8 21:07:33 2018 +0000

    Drop \draw_point:nn, etc.
    
    At least at present, keep the API here down to those
    parts which are required. Compatibility with pgf here
    is easy to do and can be handled in a 'wrapper' file.


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

cca9d161eacb838eb775fc9afaef9b6b7a6ad127
 l3experimental/l3draw/l3draw-points.dtx       |   29 ++------------
 l3experimental/l3draw/testfiles/m3draw001.lvt |   37 ------------------
 l3experimental/l3draw/testfiles/m3draw001.tlg |   50 ++++++-------------------
 3 files changed, 15 insertions(+), 101 deletions(-)

diff --git a/l3experimental/l3draw/l3draw-points.dtx b/l3experimental/l3draw/l3draw-points.dtx
index 69ca8b6..0839b6a 100644
--- a/l3experimental/l3draw/l3draw-points.dtx
+++ b/l3experimental/l3draw/l3draw-points.dtx
@@ -64,7 +64,9 @@
 % and return a co-ordinate pair in the form |{|\meta{x}|}{|\meta{y}|}|.
 % Equivalents of following \pkg{pgf} functions are deliberately omitted:
 % \begin{itemize}
-%   \item \cs{pgfpointorigin}: Can be given explicitly as |{0pt}{0pt}|.
+%   \item \cs{pgfpointorigin}: Can be given explicitly as |0pt,0pt|.
+%   \item \cs{pgfpoint}, \cs{pgfpointadd}, \cs{pgfpointdiff},
+%     \cs{pgfpointscale}: Can be given explicitly.
 %   \item \cs{pgfextractx}, \cs{pgfextracty}: Available by applying
 %     \cs{use_i:nn}/\cs{use_ii:nn} or similar to the \texttt{x}-type
 %     expansion of a point expression.
@@ -145,18 +147,6 @@
 % \end{macro}
 % \end{macro}
 %
-% \subsection{Co-ordinates}	
-%
-% The most basic way of giving points is as simple $(x,y)$ co-ordinates.
-%
-% \begin{macro}[EXP]{\draw_point:nn}
-%   Simply turn the given values into dimensions.
-%    \begin{macrocode}
-\cs_new:Npn \draw_point:nn #1#2
-  { \@@_point_to_dim:n { #1 , #2 } }
-%    \end{macrocode}
-% \end{macro}
-%
 % \subsection{Polar co-ordinates}
 %
 % \begin{macro}[EXP]{\draw_point_polar:nn}
@@ -182,19 +172,6 @@
 %
 % These functions all take point expressions as arguments.
 %
-% \begin{macro}[EXP]
-%   {\draw_point_add:nn, \draw_point_diff:nn, \draw_point_scale:nn}
-%   Simple mathematics.
-%    \begin{macrocode}
-\cs_new:Npn \draw_point_add:nn #1#2
-  { \@@_point_to_dim:n { (#1) + (#2) } }
-\cs_new:Npn \draw_point_diff:nn #1#2
-  { \@@_point_to_dim:n { (#2) - (#1) } }
-\cs_new:Npn \draw_point_scale:nn #1#2
-  { \@@_point_to_dim:n { #1 * (#2) } }
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}[EXP]{\draw_point_unit_vector:n}
 % \begin{macro}[EXP]{\@@_point_unit_vector:nn}
 %   Only a single point expression so the expansion is done here. The
diff --git a/l3experimental/l3draw/testfiles/m3draw001.lvt b/l3experimental/l3draw/testfiles/m3draw001.lvt
index aad1c7c..214ee02 100644
--- a/l3experimental/l3draw/testfiles/m3draw001.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw001.lvt
@@ -17,17 +17,6 @@
 
 \START
 
-\TESTEXP { \draw_point:nn }
-  {
-    \draw_point:nn { 2pt + 3cm } { 3cm }
-    \NEWLINE
-    \draw_point:nn { 10pt } { 1cm }
-    \NEWLINE
-    \draw_point:nn { 10 } { 1 }
-    \NEWLINE
-    \draw_point:nn { 10 * 3.5cm } { sqrt(2) }
-  }
-
 \TESTEXP { \draw_point_polar:nn(n) }
   {
     \draw_point_polar:nn { 30 } { 1cm }
@@ -38,32 +27,6 @@
     \NEWLINE
   }
 
-\TESTEXP { \draw_point_add:nn }
-  {
-    \draw_point_add:nn
-      { \draw_point_vec:nn { 0 } { 1 } }
-      { \draw_point_vec:nn { 2 } { 3 } }
-    \NEWLINE
-    \draw_point_add:nn { 1cm , 1cm } { 2cm , 2cm }
-  }
-
-\TESTEXP { \draw_point_diff:nn }
-  {
-    \draw_point_diff:nn
-      { \draw_point_vec:nn { 1 } { 1 } }
-      { \draw_point_vec:nn { 2 } { 3 } }
-    \NEWLINE
-    \draw_point_diff:nn { 1cm , 1cm } { 2cm , 2cm }
-  }
-
-\TESTEXP { \draw_point_scale:nn }
-  {
-    \draw_point_scale:nn { 2 }
-      { \draw_point_vec:nn { 0 } { 1 } }
-    \NEWLINE
-    \draw_point_scale:nn { 0.5 ^ 2 } { 2cm , 2cm }
-  }
-
 \TESTEXP { \draw_point_unit_vector:n }
   {
     \draw_point_unit_vector:n
diff --git a/l3experimental/l3draw/testfiles/m3draw001.tlg b/l3experimental/l3draw/testfiles/m3draw001.tlg
index 23e07e7..f8c56c7 100644
--- a/l3experimental/l3draw/testfiles/m3draw001.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw001.tlg
@@ -1,78 +1,52 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: \draw_point:nn 
-============================================================
-87.35826771653543pt,85.35826771653543pt
-10pt,28.45275590551181pt
-10pt,1pt
-995.8464566929134pt,1.414213562373095pt
-============================================================
-============================================================
-TEST 2: \draw_point_polar:nn (n)
+TEST 1: \draw_point_polar:nn (n)
 ============================================================
 24.64080942185094pt,14.2263779527559pt
 24.64080942185094pt,28.45275590551181pt
 24.64080942185094pt,28.45275590551181pt
 ============================================================
 ============================================================
-TEST 3: \draw_point_add:nn 
-============================================================
-56.905517578125pt,113.81103515625pt
-85.35826771653543pt,85.35826771653543pt
-============================================================
-============================================================
-TEST 4: \draw_point_diff:nn 
-============================================================
-28.4527587890625pt,56.905517578125pt
-28.45275590551181pt,28.45275590551181pt
-============================================================
-============================================================
-TEST 5: \draw_point_scale:nn 
-============================================================
-0pt,56.905517578125pt
-14.2263779527559pt,14.2263779527559pt
-============================================================
-============================================================
-TEST 6: \draw_point_unit_vector:n 
+TEST 2: \draw_point_unit_vector:n 
 ============================================================
 0.894427190999916pt,0.447213595499958pt
 -0.894427190999916pt,0.447213595499958pt
 ============================================================
 ============================================================
-TEST 7: \draw_point_intersect_lines:nnnn 
+TEST 3: \draw_point_intersect_lines:nnnn 
 ============================================================
 28.4527587890625pt,-0.000000000000004117465614979737pt
 10.51039396997536pt,10.51039396997536pt
 ============================================================
 ============================================================
-TEST 8: \draw_point_intersect_circles:nnnnn 
+TEST 4: \draw_point_intersect_circles:nnnnn 
 ============================================================
 0.00000288355082pt,0.00000288355084pt
 ============================================================
 ============================================================
-TEST 9: \draw_point_interpolate_line:nnn 
+TEST 5: \draw_point_interpolate_line:nnn 
 ============================================================
 28.4527587890625pt,56.905517578125pt
 ============================================================
 ============================================================
-TEST 10: \draw_point_interpolate_distance:nnn 
+TEST 6: \draw_point_interpolate_distance:nnn 
 ============================================================
 1.414213562373095pt,29.8669723514356pt
 54.78419723456536pt,83.23695602362786pt
 ============================================================
 ============================================================
-TEST 11: \draw_point_interpolate_arcaxes:nnnnnn 
+TEST 7: \draw_point_interpolate_arcaxes:nnnnnn 
 ============================================================
 52.44956684602254pt,43.74041050993108pt
 ============================================================
 ============================================================
-TEST 12: \draw_point_interpolate_curve:nnnnnn 
+TEST 8: \draw_point_interpolate_curve:nnnnnn 
 ============================================================
 28.4527587890625pt,35.56594848632813pt
 ============================================================
 ============================================================
-TEST 13: \draw_set_ <axis>vec:n
+TEST 9: \draw_set_ <axis>vec:n
 ============================================================
 > 17.49844360351562pt,17.49844360351562pt.
 <recently read> }
@@ -88,7 +62,7 @@ l. ...  }
 l. ...  }
 ============================================================
 ============================================================
-TEST 14: \draw_point_vec:nn 
+TEST 10: \draw_point_vec:nn 
 ============================================================
 0pt,0pt
 28.4527587890625pt,28.4527587890625pt
@@ -96,7 +70,7 @@ TEST 14: \draw_point_vec:nn
 28.4527587890625pt,28.4527587890625pt
 ============================================================
 ============================================================
-TEST 15: \draw_point_vec:nnn 
+TEST 11: \draw_point_vec:nnn 
 ============================================================
 0pt,0pt
 -10.95431518554688pt,-10.95431518554688pt
@@ -104,7 +78,7 @@ TEST 15: \draw_point_vec:nnn
 -10.95431518554688pt,17.49844360351562pt
 ============================================================
 ============================================================
-TEST 16: \draw_point_vec_polar:nn (n)
+TEST 12: \draw_point_vec_polar:nn (n)
 ============================================================
 49.28162383815817pt,28.4527587890625pt
 24.64081191907909pt,28.4527587890625pt

More information about the latex3-commits mailing list