summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-05 22:35:14 +0000
committerKarl Berry <karl@freefriends.org>2019-03-05 22:35:14 +0000
commit68872ff6a2a91fa0e84763fc9316493d82075c95 (patch)
tree0546ec4c414553802e31a423aec44f74d252f645 /Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx
parent541c4ddf7c5b402b9cfe8af5ef4e49ffa15d3e83 (diff)
l3 (5mar19)
git-svn-id: svn://tug.org/texlive/trunk@50246 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx58
1 files changed, 29 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx
index e7b74452852..226d626030e 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-01-28}
+% \date{Released 2019-03-05}
%
% \maketitle
%
@@ -121,14 +121,14 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\draw_transform_matrix:nnnn}
-% \begin{macro}{\draw_transform_shift:n}
-% \begin{macro}{\@@_transform_shift:nn}
+% \begin{macro}{\draw_transform_matrix_absolute:nnnn}
+% \begin{macro}{\draw_transform_shift_absolute:n}
+% \begin{macro}{\@@_transform_shift_absolute:nn}
% 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.
% \begin{macrocode}
-\cs_new_protected:Npn \draw_transform_matrix:nnnn #1#2#3#4
+\cs_new_protected:Npn \draw_transform_matrix_absolute:nnnn #1#2#3#4
{
\fp_set:Nn \l_@@_matrix_a_fp {#1}
\fp_set:Nn \l_@@_matrix_b_fp {#2}
@@ -144,12 +144,12 @@
{ \bool_set_false:N \l_@@_matrix_active_bool }
{ \bool_set_true:N \l_@@_matrix_active_bool }
}
-\cs_new_protected:Npn \draw_transform_shift:n #1
+\cs_new_protected:Npn \draw_transform_shift_absolute:n #1
{
\@@_point_process:nn
- { \@@_transform_shift:nn } {#1}
+ { \@@_transform_shift_absolute:nn } {#1}
}
-\cs_new_protected:Npn \@@_transform_shift:nn #1#2
+\cs_new_protected:Npn \@@_transform_shift_absolute:nn #1#2
{
\dim_set:Nn \l_@@_xshift_dim {#1}
\dim_set:Nn \l_@@_yshift_dim {#2}
@@ -159,41 +159,41 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\draw_transform_matrix_concat:nnnn}
-% \begin{macro}{\@@_transform_concat:nnnn}
-% \begin{macro}{\draw_transform_shift_concat:n}
-% \begin{macro}{\@@_transform_shift_concat:nn}
+% \begin{macro}{\draw_transform_matrix:nnnn}
+% \begin{macro}{\@@_transform:nnnn}
+% \begin{macro}{\draw_transform_shift:n}
+% \begin{macro}{\@@_transform_shift:nn}
% Much the same story for adding to an existing matrix, with a bit of
% pre-expansion so that the calculation uses \enquote{frozen} values.
% \begin{macrocode}
-\cs_new_protected:Npn \draw_transform_matrix_concat:nnnn #1#2#3#4
+\cs_new_protected:Npn \draw_transform_matrix:nnnn #1#2#3#4
{
\use:x
{
- \@@_transform_concat:nnnn
+ \@@_transform:nnnn
{ \fp_eval:n {#1} }
{ \fp_eval:n {#2} }
{ \fp_eval:n {#3} }
{ \fp_eval:n {#4} }
}
}
-\cs_new_protected:Npn \@@_transform_concat:nnnn #1#2#3#4
+\cs_new_protected:Npn \@@_transform:nnnn #1#2#3#4
{
\use:x
{
- \draw_transform_matrix:nnnn
+ \draw_transform_matrix_absolute:nnnn
{ #1 * \l_@@_matrix_a_fp + #2 * \l_@@_matrix_c_fp }
{ #1 * \l_@@_matrix_b_fp + #2 * \l_@@_matrix_d_fp }
{ #3 * \l_@@_matrix_a_fp + #4 * \l_@@_matrix_c_fp }
{ #3 * \l_@@_matrix_b_fp + #4 * \l_@@_matrix_d_fp }
}
}
-\cs_new_protected:Npn \draw_transform_shift_concat:n #1
+\cs_new_protected:Npn \draw_transform_shift:n #1
{
\@@_point_process:nn
- { \@@_transform_shift_concat:nn } {#1}
+ { \@@_transform_shift:nn } {#1}
}
-\cs_new_protected:Npn \@@_transform_shift_concat:nn #1#2
+\cs_new_protected:Npn \@@_transform_shift:nn #1#2
{
\dim_set:Nn \l_@@_xshift_dim { \l_@@_xshift_dim + #1 }
\dim_set:Nn \l_@@_yshift_dim { \l_@@_yshift_dim + #2 }
@@ -267,12 +267,12 @@
{
\use:x
{
- \draw_transform_matrix:nnnn
+ \draw_transform_matrix_absolute:nnnn
{ #3 - #1 }
{ #4 - #2 }
{ #5 - #1 }
{ #6 - #2 }
- \draw_transform_shift:n { #1 , #2 }
+ \draw_transform_shift_absolute:n { #1 , #2 }
}
}
% \end{macrocode}
@@ -287,19 +287,19 @@
% Lots of shortcuts.
% \begin{macrocode}
\cs_new_protected:Npn \draw_transform_scale:n #1
- { \draw_transform_matrix_concat:nnnn { #1 } { 0 } { 0 } { #1 } }
+ { \draw_transform_matrix:nnnn { #1 } { 0 } { 0 } { #1 } }
\cs_new_protected:Npn \draw_transform_xscale:n #1
- { \draw_transform_matrix_concat:nnnn { #1 } { 0 } { 0 } { 1 } }
+ { \draw_transform_matrix:nnnn { #1 } { 0 } { 0 } { 1 } }
\cs_new_protected:Npn \draw_transform_yscale:n #1
- { \draw_transform_matrix_concat:nnnn { 1 } { 0 } { 0 } { #1 } }
+ { \draw_transform_matrix:nnnn { 1 } { 0 } { 0 } { #1 } }
\cs_new_protected:Npn \draw_transform_xshift:n #1
- { \draw_transform_shift_concat:n { #1 , 0 } }
+ { \draw_transform_shift:n { #1 , 0pt } }
\cs_new_protected:Npn \draw_transform_yshift:n #1
- { \draw_transform_shift_concat:n { 0 , #1 } }
+ { \draw_transform_shift:n { 0pt , #1 } }
\cs_new_protected:Npn \draw_transform_xslant:n #1
- { \draw_transform_matrix_concat:nnnn { 1 } { 0 } { #1 } { 1 } }
+ { \draw_transform_matrix:nnnn { 1 } { 0 } { #1 } { 1 } }
\cs_new_protected:Npn \draw_transform_yslant:n #1
- { \draw_transform_matrix_concat:nnnn { 1 } { #1 } { 0 } { 1 } }
+ { \draw_transform_matrix:nnnn { 1 } { #1 } { 0 } { 1 } }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -324,7 +324,7 @@
}
\cs_generate_variant:Nn \@@_transform_rotate:n { f }
\cs_new_protected:Npn \@@_transform_rotate:nn #1#2
- { \draw_transform_matrix_concat:nnnn {#1} {#2} { -#2 } { #1 } }
+ { \draw_transform_matrix:nnnn {#1} {#2} { -#2 } { #1 } }
\cs_generate_variant:Nn \@@_transform_rotate:nn { ff }
% \end{macrocode}
% \end{macro}