[latex3-commits] [git/LaTeX3-latex3-latex3] master: Better name (f7610f8)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Feb 18 15:09:03 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/f7610f84d758282c453c76f4a24f171faf96689e
>---------------------------------------------------------------
commit f7610f84d758282c453c76f4a24f171faf96689e
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Feb 18 13:44:33 2018 +0000
Better name
>---------------------------------------------------------------
f7610f84d758282c453c76f4a24f171faf96689e
l3trial/l3draw/l3draw-transforms.dtx | 16 ++++++++--------
l3trial/l3draw/l3draw.dtx | 4 ++--
l3trial/l3draw/testfiles/m3draw002.lvt | 6 +++---
l3trial/l3draw/testfiles/m3draw002.tlg | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/l3trial/l3draw/l3draw-transforms.dtx b/l3trial/l3draw/l3draw-transforms.dtx
index b74b181..886248a 100644
--- a/l3trial/l3draw/l3draw-transforms.dtx
+++ b/l3trial/l3draw/l3draw-transforms.dtx
@@ -136,26 +136,26 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\draw_transform_add:nnnnn}
-% \begin{macro}{\@@_transform_add:nnnnnn}
-% \begin{macro}{\@@_transform_add_aux:nnnnnn}
+% \begin{macro}{\draw_transform_concat:nnnnn}
+% \begin{macro}{\@@_transform_concat:nnnnnn}
+% \begin{macro}{\@@_transform_concat_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
% \cs{@@_transform_set:nnnnnn}, with pre-expansion just in case there are
% \emph{e.g}~random values. The final step is \texttt{x}-type expanded as
% otherwise later values affect earlier ones.
% \begin{macrocode}
-\cs_new_protected:Npn \draw_transform_add:nnnnn #1#2#3#4#5
+\cs_new_protected:Npn \draw_transform_concat:nnnnn #1#2#3#4#5
{
\@@_point_process:nn
- { \@@_transform_add:nnnnnn {#1} {#2} {#3} {#4} }
+ { \@@_transform_concat:nnnnnn {#1} {#2} {#3} {#4} }
{#5}
}
-\cs_new_protected:Npn \@@_transform_add:nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \@@_transform_concat:nnnnnn #1#2#3#4#5#6
{
\use:x
{
- \@@_transform_add_aux:nnnnnn
+ \@@_transform_concat_aux:nnnnnn
{ \fp_eval:n {#1} }
{ \fp_eval:n {#2} }
{ \fp_eval:n {#3} }
@@ -164,7 +164,7 @@
{#6}
}
}
-\cs_new_protected:Npn \@@_transform_add_aux:nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \@@_transform_concat_aux:nnnnnn #1#2#3#4#5#6
{
\use:x
{
diff --git a/l3trial/l3draw/l3draw.dtx b/l3trial/l3draw/l3draw.dtx
index a57128e..f63157f 100644
--- a/l3trial/l3draw/l3draw.dtx
+++ b/l3trial/l3draw/l3draw.dtx
@@ -303,9 +303,9 @@
% \end{syntax}
% \end{function}
%
-% \begin{function}{\draw_transform_add:nnnnn}
+% \begin{function}{\draw_transform_concat:nnnnn}
% \begin{syntax}
-% \cs{draw_transform_add:nnnnn}
+% \cs{draw_transform_concat:nnnnn}
% \Arg{a} \Arg{b} \Arg{c} \Arg{d} \Arg{coord expr}
% \end{syntax}
% \end{function}
diff --git a/l3trial/l3draw/testfiles/m3draw002.lvt b/l3trial/l3draw/testfiles/m3draw002.lvt
index 3b426e3..7918c85 100644
--- a/l3trial/l3draw/testfiles/m3draw002.lvt
+++ b/l3trial/l3draw/testfiles/m3draw002.lvt
@@ -26,12 +26,12 @@
\exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
}
-\TEST { \draw_transform_add:nnnnn }
+\TEST { \draw_transform_concat: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_concat: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_concat:nnnnn { 1 } { 0 } { 0 } { 1 } { 10pt , -10pt }
\exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
}
diff --git a/l3trial/l3draw/testfiles/m3draw002.tlg b/l3trial/l3draw/testfiles/m3draw002.tlg
index 31cfd2d..8acf7ef 100644
--- a/l3trial/l3draw/testfiles/m3draw002.tlg
+++ b/l3trial/l3draw/testfiles/m3draw002.tlg
@@ -14,7 +14,7 @@ l. ... }
l. ... }
============================================================
============================================================
-TEST 2: \draw_transform_add:nnnnn
+TEST 2: \draw_transform_concat:nnnnn
============================================================
> 1pt,1pt.
<recently read> }
More information about the latex3-commits
mailing list