[latex3-commits] [git/LaTeX3-latex3-latex3] master: Avoid "set" for non-variables (d6974aa)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Feb 19 14:02:25 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/d6974aa7cbf64cc9faacf22f61652844f1d58f89
>---------------------------------------------------------------
commit d6974aa7cbf64cc9faacf22f61652844f1d58f89
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Feb 19 12:58:24 2018 +0000
Avoid "set" for non-variables
>---------------------------------------------------------------
d6974aa7cbf64cc9faacf22f61652844f1d58f89
l3experimental/l3draw/l3draw-points.dtx | 30 ++++++++++++-------------
l3experimental/l3draw/testfiles/m3draw001.lvt | 14 ++++++------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/l3experimental/l3draw/l3draw-points.dtx b/l3experimental/l3draw/l3draw-points.dtx
index e29dc60..beb98a7 100644
--- a/l3experimental/l3draw/l3draw-points.dtx
+++ b/l3experimental/l3draw/l3draw-points.dtx
@@ -776,22 +776,22 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\draw_xvec_set:n, \draw_yvec_set:n, \draw_zvec_set:n}
-% \begin{macro}{\@@_vec_set:nn}
-% \begin{macro}{\@@_vec_set:nnn}
+% \begin{macro}{\draw_xvec:n, \draw_yvec:n, \draw_zvec:n}
+% \begin{macro}{\@@_vec:nn}
+% \begin{macro}{\@@_vec:nnn}
% Calculate the underlying position and store it.
% \begin{macrocode}
-\cs_new_protected:Npn \draw_xvec_set:n #1
- { \@@_vec_set:nn { x } {#1} }
-\cs_new_protected:Npn \draw_yvec_set:n #1
- { \@@_vec_set:nn { y } {#1} }
-\cs_new_protected:Npn \draw_zvec_set:n #1
- { \@@_vec_set:nn { z } {#1} }
-\cs_new_protected:Npn \@@_vec_set:nn #1#2
+\cs_new_protected:Npn \draw_xvec:n #1
+ { \@@_vec:nn { x } {#1} }
+\cs_new_protected:Npn \draw_yvec:n #1
+ { \@@_vec:nn { y } {#1} }
+\cs_new_protected:Npn \draw_zvec:n #1
+ { \@@_vec:nn { z } {#1} }
+\cs_new_protected:Npn \@@_vec:nn #1#2
{
- \@@_point_process:nn { \@@_vec_set:nnn {#1} } {#2}
+ \@@_point_process:nn { \@@_vec:nnn {#1} } {#2}
}
-\cs_new_protected:Npn \@@_vec_set:nnn #1#2#3
+\cs_new_protected:Npn \@@_vec:nnn #1#2#3
{
\dim_set:cn { l_@@_ #1 vec_x_dim } {#2}
\dim_set:cn { l_@@_ #1 vec_y_dim } {#3}
@@ -803,9 +803,9 @@
%
% Initialise the vectors.
% \begin{macrocode}
-\draw_xvec_set:n { 1cm , 0cm }
-\draw_yvec_set:n { 0cm , 1cm }
-\draw_zvec_set:n { -0.385cm , -0.385cm }
+\draw_xvec:n { 1cm , 0cm }
+\draw_yvec:n { 0cm , 1cm }
+\draw_zvec:n { -0.385cm , -0.385cm }
% \end{macrocode}
%
% \begin{macro}[EXP]{\draw_point_vec:nn}
diff --git a/l3experimental/l3draw/testfiles/m3draw001.lvt b/l3experimental/l3draw/testfiles/m3draw001.lvt
index 5db8f65..aad1c7c 100644
--- a/l3experimental/l3draw/testfiles/m3draw001.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw001.lvt
@@ -143,17 +143,17 @@
\TEST { \draw_set_<axis>vec:n }
{
\exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
- \draw_xvec_set:n { 1cm , 1cm }
+ \draw_xvec:n { 1cm , 1cm }
\exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
- \draw_yvec_set:n { 1cm , 1cm }
+ \draw_yvec:n { 1cm , 1cm }
\exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
- \draw_zvec_set:n { 1cm , 1cm }
+ \draw_zvec:n { 1cm , 1cm }
\exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
}
\OMIT
- \draw_xvec_set:n { 1cm , 1cm }
- \draw_yvec_set:n { 0cm , 1cm }
+ \draw_xvec:n { 1cm , 1cm }
+ \draw_yvec:n { 0cm , 1cm }
\TIMO
\TESTEXP { \draw_point_vec:nn }
@@ -168,8 +168,8 @@
}
\OMIT
- \draw_xvec_set:n { 1cm , 0cm }
- \draw_yvec_set:n { 0cm , 1cm }
+ \draw_xvec:n { 1cm , 0cm }
+ \draw_yvec:n { 0cm , 1cm }
\TIMO
\TESTEXP { \draw_point_vec:nnn }
More information about the latex3-commits
mailing list