[latex3-commits] [git/LaTeX3-latex3-latex3] master: Avoid cm shift in some internals (9170924)

[Joseph Wright]

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

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

commit 9170924bf088fe5207087854dad6829b62ff0ebe
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Feb 17 16:50:12 2018 +0000

    Avoid cm shift in some internals


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

9170924bf088fe5207087854dad6829b62ff0ebe
 l3trial/l3draw/l3draw-paths.dtx  |   23 +++++++----------------
 l3trial/l3draw/l3draw-points.dtx |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/l3trial/l3draw/l3draw-paths.dtx b/l3trial/l3draw/l3draw-paths.dtx
index 338f53b..fca7475 100644
--- a/l3trial/l3draw/l3draw-paths.dtx
+++ b/l3trial/l3draw/l3draw-paths.dtx
@@ -481,7 +481,7 @@
     \@@_point_process:nn
       { \@@_path_arc_auxiii:nn }
       {
-        \draw_point_transform:n
+        \@@_point_transform_noshift:n
           { \draw_point_polar:nnn { #1 #4 90 } {#7} {#8} }
       }
     \@@_point_process:nn
@@ -500,7 +500,7 @@
     \@@_point_process:nn
       { \@@_path_arc_auxv:nn }
       {
-        \draw_point_transform:n
+        \@@_point_transform_noshift:n
           { \draw_point_polar:nnn { #2 #4 -90 } {#7} {#8} }
       }
     \exp_after:wN \@@_path_curveto:nnnnnn \l_@@_path_tmp_tl
@@ -508,22 +508,13 @@
     \fp_set:Nn \l_@@_path_arc_start_fp {#2}
   }
 %    \end{macrocode}
-%   The first control point: we have to undo any transformation shift
-%   here.
+%   The first control point.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_path_arc_auxiii:nn #1#2
   {
     \@@_path_arc_aux_add:nn
-      {
-          \g_@@_path_lastx_dim
-        - \l_@@_transformcm_xshift_dim
-        + #1
-      }
-      {
-          \g_@@_path_lasty_dim
-        - \l_@@_transformcm_yshift_dim
-        + #2
-      }
+      { \g_@@_path_lastx_dim + #1 }
+      { \g_@@_path_lasty_dim + #2 }
   }
 %    \end{macrocode}
 %   The end point: simple arithmetic.
@@ -547,8 +538,8 @@
   {
     \tl_set:Nn \l_@@_path_tmp_tl { {#1} {#2} }
     \@@_path_arc_aux_add:nn
-      { #5 + #3 - \l_@@_transformcm_xshift_dim }
-      { #6 + #4 - \l_@@_transformcm_yshift_dim }
+      { #5 + #3 }
+      { #6 + #4 }
     \tl_put_right:Nn \l_@@_path_tmp_tl { {#3} {#4} }
   }
 \cs_new_protected:Npn \@@_path_arc_aux_add:nn #1#2
diff --git a/l3trial/l3draw/l3draw-points.dtx b/l3trial/l3draw/l3draw-points.dtx
index eb244ef..a39bc35 100644
--- a/l3trial/l3draw/l3draw-points.dtx
+++ b/l3trial/l3draw/l3draw-points.dtx
@@ -919,6 +919,38 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}[EXP]{\@@_point_transform_noshift:n}
+% \begin{macro}[EXP]{\@@_point_transform_noshift:nn}
+%   A version with no shift: used for internal purposes.
+%    \begin{macrocode}
+\cs_new:Npn \@@_point_transform_noshift:n #1
+  {
+    \@@_point_process:nn
+      { \@@_point_transform_noshift:nn } {#1}
+  }
+\cs_new:Npn \@@_point_transform_noshift:nn #1#2
+  {
+    \bool_if:NTF \l_@@_transformcm_active_bool
+      {
+        \@@_point_to_dim:n
+          {
+            (
+                \l_@@_transformcm_aa_fp * #1
+              + \l_@@_transformcm_ba_fp * #2
+            )
+            ,
+            (
+                \l_@@_transformcm_ab_fp * #1
+              + \l_@@_transformcm_bb_fp * #2
+            )
+        }
+      }
+      { \@@_point_to_dim:n { (#1, #2) } }
+  }
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
 %    \begin{macrocode}
 %</initex|package>
 %    \end{macrocode}