[latex3-commits] [git/LaTeX3-latex3-latex3] master: \draw_transform_reset_retain_shift: (eef148e)

[Joseph Wright]

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

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

commit eef148e12fe33917ce62a9b51265ba9b333b7869
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Feb 23 07:27:11 2018 +0000

    \draw_transform_reset_retain_shift:


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

eef148e12fe33917ce62a9b51265ba9b333b7869
 l3experimental/l3draw/l3draw-transforms.dtx   |   11 ++++++++---
 l3experimental/l3draw/l3draw.dtx              |   10 +++++++++-
 l3experimental/l3draw/testfiles/m3draw002.lvt |    6 ++++++
 l3experimental/l3draw/testfiles/m3draw002.tlg |    7 +++++++
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/l3experimental/l3draw/l3draw-transforms.dtx b/l3experimental/l3draw/l3draw-transforms.dtx
index bad502f..eaedecd 100644
--- a/l3experimental/l3draw/l3draw-transforms.dtx
+++ b/l3experimental/l3draw/l3draw-transforms.dtx
@@ -63,8 +63,6 @@
 % following are currently absent:
 % \begin{itemize}
 %   \item \cs{pgfgettransform}, \cs{pgfgettransformentries}: Awaiting use cases.
-%   \item \cs{pgftransformresetnontranslations}: Ideally trying to come up
-%     with a \enquote{cleaner} name.
 %   \item \cs{pgftransformlineattime}, \cs{pgftransformarcaxesattime}, 
 %     \cs{pgftransformcurveattime}: Need to look at the use cases for
 %     these to fully understand them.
@@ -99,7 +97,7 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\draw_transform_reset:}
+% \begin{macro}{\draw_transform_reset:, \draw_transform_reset_retain_shift:}
 %   Fast resetting.
 %    \begin{macrocode}
 \cs_new_protected:Npn \draw_transform_reset:
@@ -112,6 +110,13 @@
     \dim_zero:N \l_@@_transformcm_yshift_dim
   }
 \draw_transform_reset:
+\cs_new_protected:Npn \draw_transform_reset_retain_shift:
+  {
+    \fp_set:Nn \l_@@_transformcm_aa_fp { 1}
+    \fp_zero:N \l_@@_transformcm_ab_fp
+    \fp_zero:N \l_@@_transformcm_ba_fp
+    \fp_set:Nn \l_@@_transformcm_bb_fp { 1 }
+  }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3experimental/l3draw/l3draw.dtx b/l3experimental/l3draw/l3draw.dtx
index 5bdfabd..d9c9455 100644
--- a/l3experimental/l3draw/l3draw.dtx
+++ b/l3experimental/l3draw/l3draw.dtx
@@ -629,7 +629,15 @@
 %   \begin{syntax}
 %     \cs{draw_transform_reset:}
 %   \end{syntax}
-%   Resets the matrix to the identity.
+%   Resets all transformation operations.
+% \end{function}
+%
+% \begin{function}{\draw_transform_reset_retain_shift:}
+%   \begin{syntax}
+%     \cs{draw_transform_reset:}
+%   \end{syntax}
+%   Resets rotations, scalings and slants, but retains any shifts which
+%   are active.
 % \end{function}
 %
 % \end{documentation}
diff --git a/l3experimental/l3draw/testfiles/m3draw002.lvt b/l3experimental/l3draw/testfiles/m3draw002.lvt
index b09de97..f3bc422 100644
--- a/l3experimental/l3draw/testfiles/m3draw002.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw002.lvt
@@ -97,5 +97,11 @@
     \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
   }
 
+\TEST { \draw_transform_reset_retain_shift: }
+  {
+    \draw_transform:nnnnn { 1 } { 0 } { 1 } { 1 } { 10pt , 0pt }
+    \draw_transform_reset_retain_shift:
+    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+  }
 
 \END
diff --git a/l3experimental/l3draw/testfiles/m3draw002.tlg b/l3experimental/l3draw/testfiles/m3draw002.tlg
index 560a4e5..5d2bb63 100644
--- a/l3experimental/l3draw/testfiles/m3draw002.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw002.tlg
@@ -108,3 +108,10 @@ TEST 9: \draw_transform_reset:
 <recently read> }
 l. ...  }
 ============================================================
+============================================================
+TEST 10: \draw_transform_reset_retain_shift: 
+============================================================
+> 11pt,1pt.
+<recently read> }
+l. ...  }
+============================================================