[latex3-commits] [git/LaTeX3-latex3-latex3] master: Corner arc interface should take two args (851e835)

Joseph Wright joseph.wright at morningstar2.co.uk
Mon Feb 26 10:09:21 CET 2018


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

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

commit 851e8358b0d8cdd935b9bd24735143261183c75f
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Feb 26 08:46:56 2018 +0000

    Corner arc interface should take two args
    
    This is not really a point/vector, just two values that
    are convenient to pass through the same mech!


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

851e8358b0d8cdd935b9bd24735143261183c75f
 l3experimental/l3draw/l3draw-paths.dtx        |   10 ++--------
 l3experimental/l3draw/l3draw.dtx              |   15 +++++++++------
 l3experimental/l3draw/testfiles/m3draw003.lvt |    2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/l3experimental/l3draw/l3draw-paths.dtx b/l3experimental/l3draw/l3draw-paths.dtx
index cd2e9ae..2e16122 100644
--- a/l3experimental/l3draw/l3draw-paths.dtx
+++ b/l3experimental/l3draw/l3draw-paths.dtx
@@ -185,15 +185,10 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\draw_path_corner_arc:n}
-% \begin{macro}{\@@_path_corner_arc:nn}
+% \begin{macro}{\draw_path_corner_arc:nn}
 %   Calculate the arcs, check they are non-zero.
 %    \begin{macrocode}
-\cs_new_protected:Npn \draw_path_corner_arc:n #1
-  {
-    \@@_point_process:nn { \@@_path_corner_arc:nn } {#1}
-  }
-\cs_new_protected:Npn \@@_path_corner_arc:nn #1#2
+\cs_new_protected:Npn \draw_path_corner_arc:nn #1#2
   {
     \dim_set:Nn \l_@@_corner_xarc_dim {#1}
     \dim_set:Nn \l_@@_corner_yarc_dim {#2}
@@ -205,7 +200,6 @@
   }
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\@@_path_mark_corner:}
 %   Mark up corners for arc post-processing.
diff --git a/l3experimental/l3draw/l3draw.dtx b/l3experimental/l3draw/l3draw.dtx
index c793918..418e0ab 100644
--- a/l3experimental/l3draw/l3draw.dtx
+++ b/l3experimental/l3draw/l3draw.dtx
@@ -470,14 +470,17 @@
 % manipulated or indeed discarded entirely. Only one path is active at
 % any one time, and the path is \emph{not} affected by \TeX{} grouping.
 %
-% \begin{function}{\draw_path_corner_arc:n}
+% \begin{function}{\draw_path_corner_arc:nn}
 %   \begin{syntax}
-%     \cs{draw_path_corner_arc:n} \Arg{length}
+%     \cs{draw_path_corner_arc:n} \Arg{length1} \Arg{length2}
 %   \end{syntax}
-%   Sets the degree of rounding applied to corners in a path: if the
-%   \meta{length} is \texttt{0pt} then no rounding applies. The value of the
-%   \meta{length} is local to the current \TeX{} group. \emph{At present,
-%   corner arcs are not activated in the code.}
+%   Sets the degree of rounding applied to corners in a path: the two
+%   \meta{length} values are the distances from the corner at which the curving
+%   should start. The first \meta{length} applies to the part of the path
+%   \enquote{leading in} to the corner (\emph{i.e.}~from the previous path
+%   operation), and the second to that \enquote{leading out}. If both
+%   values are \texttt{0pt} then corners will not be rounded. The values
+%   apply within the scope of the current \TeX{} group.
 % \end{function}
 %
 % \begin{function}{\draw_path_close:}
diff --git a/l3experimental/l3draw/testfiles/m3draw003.lvt b/l3experimental/l3draw/testfiles/m3draw003.lvt
index 57f25bc..5df6dd6 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw003.lvt
@@ -163,7 +163,7 @@
       }
     \test:n
       {
-        \draw_path_corner_arc:n { 2pt , 2pt }
+        \draw_path_corner_arc:nn { 2pt } { 2pt }
         \draw_path_rectangle:nn
           { \draw_point_vec:nn { 2 } { 2 } }
           { \draw_point_vec:nn { 1 } { 1 } }





More information about the latex3-commits mailing list