[latex3-commits] [git/LaTeX3-latex3-latex3] master: Use new tuple support in l3draw transforms (27c5361)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Feb 12 10:35:23 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/27c536188ee555b554c7fc257bb076abb7f5dd50
>---------------------------------------------------------------
commit 27c536188ee555b554c7fc257bb076abb7f5dd50
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Feb 12 09:35:23 2018 +0000
Use new tuple support in l3draw transforms
>---------------------------------------------------------------
27c536188ee555b554c7fc257bb076abb7f5dd50
l3trial/l3draw/l3draw-transforms.dtx | 40 ++++++++++++++------------------
l3trial/l3draw/l3draw.dtx | 4 ++--
l3trial/l3draw/testfiles/m3draw002.lvt | 12 +++++-----
3 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/l3trial/l3draw/l3draw-transforms.dtx b/l3trial/l3draw/l3draw-transforms.dtx
index bf92f1e..24dd8df 100644
--- a/l3trial/l3draw/l3draw-transforms.dtx
+++ b/l3trial/l3draw/l3draw-transforms.dtx
@@ -102,7 +102,7 @@
% \end{macro}
%
% \begin{macro}{\draw_transform_set:nnnnn}
-% \begin{macro}{\@@_transform_set:nnnnnn}
+% \begin{macro}{\@@_transform_set:nnnnnw}
% Setting the transform matrix is straight-forward, with just a bit
% of expansion to sort out. With the mechanism active, the identity
% matrix is set.
@@ -110,16 +110,16 @@
\cs_new_protected:Npn \draw_transform_set:nnnnn #1#2#3#4#5
{
\use:x
- { \@@_transform_set:nnnnnn {#1} {#2} {#3} {#4} #5 }
+ { \@@_transform_set:nnnnnw {#1} {#2} {#3} {#4} \fp_eval:n {#5} }
}
-\cs_new_protected:Npn \@@_transform_set:nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \@@_transform_set:nnnnnw #1#2#3#4 ( #5 , #6 )
{
\fp_set:Nn \l_@@_transformcm_aa_fp {#1}
\fp_set:Nn \l_@@_transformcm_ab_fp {#2}
\fp_set:Nn \l_@@_transformcm_ba_fp {#3}
\fp_set:Nn \l_@@_transformcm_bb_fp {#4}
- \dim_set:Nn \l_@@_transformcm_xshift_dim {#5}
- \dim_set:Nn \l_@@_transformcm_yshift_dim {#6}
+ \dim_set:Nn \l_@@_transformcm_xshift_dim { #5pt }
+ \dim_set:Nn \l_@@_transformcm_yshift_dim { #6pt }
\bool_lazy_all:nTF
{
{ \fp_compare_p:nNn \l_@@_transformcm_aa_fp = \c_one_fp }
@@ -130,14 +130,14 @@
{ \bool_set_false:N \l_@@_transformcm_active_bool }
{ \bool_set_true:N \l_@@_transformcm_active_bool }
}
-\draw_transform_set:nnnnn { 1 } { 0 } { 0 } { 1 } { { 0pt } { 0pt } }
+\draw_transform_set:nnnnn { 1 } { 0 } { 0 } { 1 } { ( 0pt , 0pt ) }
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
%
% \begin{macro}{\draw_transform_add:nnnnn}
-% \begin{macro}{\@@_transform_add:nnnnnn}
+% \begin{macro}{\@@_transform_add:nnnnnw}
% \begin{macro}{\@@_transform_add_aux:nnnnnn}
% Much the same story for adding to an existing matrix. The part that is more
% complex is the calculations required: everything gets passed back to
@@ -148,9 +148,9 @@
\cs_new_protected:Npn \draw_transform_add:nnnnn #1#2#3#4#5
{
\use:x
- { \@@_transform_add:nnnnnn {#1} {#2} {#3} {#4} #5 }
+ { \@@_transform_add:nnnnnw {#1} {#2} {#3} {#4} \fp_eval:n {#5} }
}
-\cs_new_protected:Npn \@@_transform_add:nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \@@_transform_add:nnnnnw #1#2#3#4 ( #5 , #6 )
{
\use:x
{
@@ -159,35 +159,31 @@
{ \fp_eval:n {#2} }
{ \fp_eval:n {#3} }
{ \fp_eval:n {#4} }
- { \fp_to_dim:n {#5} }
- { \fp_to_dim:n {#6} }
+ {#5}
+ {#6}
}
}
\cs_new_protected:Npn \@@_transform_add_aux:nnnnnn #1#2#3#4#5#6
{
\use:x
{
- \@@_transform_set:nnnnnn
+ \@@_transform_set:nnnnnw
{ #1 * \l_@@_transformcm_aa_fp + #2 * \l_@@_transformcm_ba_fp }
{ #1 * \l_@@_transformcm_ab_fp + #2 * \l_@@_transformcm_bb_fp }
{ #3 * \l_@@_transformcm_aa_fp + #4 * \l_@@_transformcm_ba_fp }
{ #3 * \l_@@_transformcm_ab_fp + #4 * \l_@@_transformcm_bb_fp }
- {
- \exp_not:N \fp_to_dim:n
- {
+ \fp_eval:n
+ {
+ (
\l_@@_transformcm_xshift_dim
+ \l_@@_transformcm_aa_fp * #5
+ \l_@@_transformcm_ba_fp * #6
- }
- }
- {
- \exp_not:N \fp_to_dim:n
- {
+ ,
\l_@@_transformcm_yshift_dim
+ \l_@@_transformcm_ab_fp * #5
+ \l_@@_transformcm_bb_fp * #6
- }
- }
+ )
+ }
}
}
% \end{macrocode}
diff --git a/l3trial/l3draw/l3draw.dtx b/l3trial/l3draw/l3draw.dtx
index aee4c77..4ee40f5 100644
--- a/l3trial/l3draw/l3draw.dtx
+++ b/l3trial/l3draw/l3draw.dtx
@@ -193,14 +193,14 @@
% \begin{function}{\draw_transform_add:nnnnn}
% \begin{syntax}
% \cs{draw_transform_add:nnnnn}
-% \marg{a} \marg{b} \marg{c} \marg{d} \marg{point expr}
+% \marg{a} \marg{b} \marg{c} \marg{d} \marg{coord expr}
% \end{syntax}
% \end{function}
%
% \begin{function}{\draw_transform_set:nnnnn}
% \begin{syntax}
% \cs{draw_transform_set:nnnnn}
-% \marg{a} \marg{b} \marg{c} \marg{d} \marg{point expr}
+% \marg{a} \marg{b} \marg{c} \marg{d} \marg{coord expr}
% \end{syntax}
% \end{function}
%
diff --git a/l3trial/l3draw/testfiles/m3draw002.lvt b/l3trial/l3draw/testfiles/m3draw002.lvt
index 04b7e16..4947b0d 100644
--- a/l3trial/l3draw/testfiles/m3draw002.lvt
+++ b/l3trial/l3draw/testfiles/m3draw002.lvt
@@ -20,24 +20,24 @@
\TEST { \draw_transform_set:nnnnn }
{
\exp_args:Nx \tl_show:n { \draw_point_transform:n { { 1 } { 1 } } }
- \draw_transform_set:nnnnn { 1 } { 1 } { 1 } { 1 } { { 0pt } { 0pt } }
+ \draw_transform_set:nnnnn { 1 } { 1 } { 1 } { 1 } { ( 0pt , 0pt ) }
\exp_args:Nx \tl_show:n { \draw_point_transform:n { { 1 } { 1 } } }
- \draw_transform_set:nnnnn { 1 } { 0 } { 0 } { 1 } { { 10pt } { -10pt } }
+ \draw_transform_set:nnnnn { 1 } { 0 } { 0 } { 1 } { ( 10pt , -10pt ) }
\exp_args:Nx \tl_show:n { \draw_point_transform:n { { 1 } { 1 } } }
}
\TEST { \draw_transform_add:nnnnn }
{
\exp_args:Nx \tl_show:n { \draw_point_transform:n { { 1 } { 1 } } }
- \draw_transform_add:nnnnn { 1 } { 1 } { 1 } { 1 } { { 0pt } { 0pt } }
+ \draw_transform_add:nnnnn { 1 } { 1 } { 1 } { 1 } { ( 0pt , 0pt ) }
\exp_args:Nx \tl_show:n { \draw_point_transform:n { { 1 } { 1 } } }
- \draw_transform_add:nnnnn { 1 } { 0 } { 0 } { 1 } { { 10pt } { -10pt } }
+ \draw_transform_add:nnnnn { 1 } { 0 } { 0 } { 1 } { ( 10pt , -10pt ) }
\exp_args:Nx \tl_show:n { \draw_point_transform:n { { 1 } { 1 } } }
}
\TEST { \draw_transform_invert: }
{
- \draw_transform_set:nnnnn { 1 } { 0 } { 1 } { 1 } { { 10pt } { 0pt } }
+ \draw_transform_set:nnnnn { 1 } { 0 } { 1 } { 1 } { ( 10pt , 0pt ) }
\tl_set:Nx \l_tmpa_tl { \draw_point_transform:n { { 1 } { 1 } } }
\tl_show:N \l_tmpa_tl
\draw_transform_invert:
@@ -46,7 +46,7 @@
\TEST { \draw_transform_reset: }
{
- \draw_transform_set:nnnnn { 1 } { 0 } { 1 } { 1 } { { 10pt } { 0pt } }
+ \draw_transform_set:nnnnn { 1 } { 0 } { 1 } { 1 } { ( 10pt , 0pt ) }
\draw_transform_reset:
\exp_args:Nx \tl_show:n { \draw_point_transform:n { { 1 } { 1 } } }
}
More information about the latex3-commits
mailing list