[latex3-commits] [git/LaTeX3-latex3-latex3] master: l3draw: Close paths (05c4828)

[Joseph Wright]

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

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

commit 05c4828be3aa70a4dec6d10e82e5adac3e944859
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Feb 11 12:24:18 2018 +0000

    l3draw: Close paths


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

05c4828be3aa70a4dec6d10e82e5adac3e944859
 l3trial/l3draw/l3draw-paths.dtx              |    8 ++++++++
 l3trial/l3draw/l3draw.dtx                    |    6 ++++++
 l3trial/l3draw/testfiles/m3draw003.lvt       |   12 ++++++++++++
 l3trial/l3draw/testfiles/m3draw003.ptex.tlg  |   17 +++++++++++++++++
 l3trial/l3draw/testfiles/m3draw003.tlg       |   17 +++++++++++++++++
 l3trial/l3draw/testfiles/m3draw003.uptex.tlg |   17 +++++++++++++++++
 l3trial/l3draw/testfiles/m3draw003.xetex.tlg |   17 +++++++++++++++++
 7 files changed, 94 insertions(+)

diff --git a/l3trial/l3draw/l3draw-paths.dtx b/l3trial/l3draw/l3draw-paths.dtx
index e30cdf7..9b59633 100644
--- a/l3trial/l3draw/l3draw-paths.dtx
+++ b/l3trial/l3draw/l3draw-paths.dtx
@@ -191,6 +191,14 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{\draw_path_close:}
+%   A simple wrapper (though will need curved corner support).
+%    \begin{macrocode}
+\cs_new_protected:Npn \draw_path_close:
+  { \driver_draw_closepath: }
+%    \end{macrocode}
+% \end{macro}
+%
 %    \begin{macrocode}
 %</initex|package>
 %    \end{macrocode}
diff --git a/l3trial/l3draw/l3draw.dtx b/l3trial/l3draw/l3draw.dtx
index 4bfdf4f..aee4c77 100644
--- a/l3trial/l3draw/l3draw.dtx
+++ b/l3trial/l3draw/l3draw.dtx
@@ -176,6 +176,12 @@
 %   \end{syntax}
 % \end{function}
 %
+% \begin{function}{\draw_path_close:}
+%   \begin{syntax}
+%     \cs{draw_path_close:}
+%   \end{syntax}
+% \end{function}
+%
 % \subsection{Transformations}
 %
 % \begin{function}{\draw_transform_reset:}
diff --git a/l3trial/l3draw/testfiles/m3draw003.lvt b/l3trial/l3draw/testfiles/m3draw003.lvt
index 44e91f1..80c781c 100644
--- a/l3trial/l3draw/testfiles/m3draw003.lvt
+++ b/l3trial/l3draw/testfiles/m3draw003.lvt
@@ -51,4 +51,16 @@
       }
   }
 
+\TEST { \draw_path_close: }
+  {
+    \test:n
+      {
+        \draw_path_moveto:n { { 0 } { 0 } }
+        \draw_path_lineto:n { { 1 } { 0 } }
+        \draw_path_lineto:n { { 1 } { 1 } }
+        \draw_path_lineto:n { { 0 } { 1 } }
+        \draw_path_close:
+      }
+  }
+
 \END
diff --git a/l3trial/l3draw/testfiles/m3draw003.ptex.tlg b/l3trial/l3draw/testfiles/m3draw003.ptex.tlg
index 3cf19cc..3696db5 100644
--- a/l3trial/l3draw/testfiles/m3draw003.ptex.tlg
+++ b/l3trial/l3draw/testfiles/m3draw003.ptex.tlg
@@ -39,3 +39,20 @@ TEST 3: \draw_path_curveto:nnn
 <argument> \l_tmpa_box 
 l. ...  }
 ============================================================
+============================================================
+TEST 4: \draw_path_close: 
+============================================================
+> \box...=
+\hbox(0.0+0.0)x0.0
+.\hbox(0.0+0.0)x0.0
+..\special{pdf:literal q}
+..\special{pdf:literal 0 0 m}
+..\special{pdf:literal 0.99626 0 l}
+..\special{pdf:literal 0.99626 0.99626 l}
+..\special{pdf:literal 0 0.99626 l}
+..\special{pdf:literal h}
+..\special{pdf:literal Q}
+! OK.
+<argument> \l_tmpa_box 
+l. ...  }
+============================================================
diff --git a/l3trial/l3draw/testfiles/m3draw003.tlg b/l3trial/l3draw/testfiles/m3draw003.tlg
index 6884d71..2e4d4fa 100644
--- a/l3trial/l3draw/testfiles/m3draw003.tlg
+++ b/l3trial/l3draw/testfiles/m3draw003.tlg
@@ -39,3 +39,20 @@ TEST 3: \draw_path_curveto:nnn
 <argument> \l_tmpa_box 
 l. ...  }
 ============================================================
+============================================================
+TEST 4: \draw_path_close: 
+============================================================
+> \box...=
+\hbox(0.0+0.0)x0.0
+.\hbox(0.0+0.0)x0.0
+..\pdfliteral{q}
+..\pdfliteral{0 0 m}
+..\pdfliteral{0.99626 0 l}
+..\pdfliteral{0.99626 0.99626 l}
+..\pdfliteral{0 0.99626 l}
+..\pdfliteral{h}
+..\pdfliteral{Q}
+! OK.
+<argument> \l_tmpa_box 
+l. ...  }
+============================================================
diff --git a/l3trial/l3draw/testfiles/m3draw003.uptex.tlg b/l3trial/l3draw/testfiles/m3draw003.uptex.tlg
index 3cf19cc..3696db5 100644
--- a/l3trial/l3draw/testfiles/m3draw003.uptex.tlg
+++ b/l3trial/l3draw/testfiles/m3draw003.uptex.tlg
@@ -39,3 +39,20 @@ TEST 3: \draw_path_curveto:nnn
 <argument> \l_tmpa_box 
 l. ...  }
 ============================================================
+============================================================
+TEST 4: \draw_path_close: 
+============================================================
+> \box...=
+\hbox(0.0+0.0)x0.0
+.\hbox(0.0+0.0)x0.0
+..\special{pdf:literal q}
+..\special{pdf:literal 0 0 m}
+..\special{pdf:literal 0.99626 0 l}
+..\special{pdf:literal 0.99626 0.99626 l}
+..\special{pdf:literal 0 0.99626 l}
+..\special{pdf:literal h}
+..\special{pdf:literal Q}
+! OK.
+<argument> \l_tmpa_box 
+l. ...  }
+============================================================
diff --git a/l3trial/l3draw/testfiles/m3draw003.xetex.tlg b/l3trial/l3draw/testfiles/m3draw003.xetex.tlg
index 3cf19cc..3696db5 100644
--- a/l3trial/l3draw/testfiles/m3draw003.xetex.tlg
+++ b/l3trial/l3draw/testfiles/m3draw003.xetex.tlg
@@ -39,3 +39,20 @@ TEST 3: \draw_path_curveto:nnn
 <argument> \l_tmpa_box 
 l. ...  }
 ============================================================
+============================================================
+TEST 4: \draw_path_close: 
+============================================================
+> \box...=
+\hbox(0.0+0.0)x0.0
+.\hbox(0.0+0.0)x0.0
+..\special{pdf:literal q}
+..\special{pdf:literal 0 0 m}
+..\special{pdf:literal 0.99626 0 l}
+..\special{pdf:literal 0.99626 0.99626 l}
+..\special{pdf:literal 0 0.99626 l}
+..\special{pdf:literal h}
+..\special{pdf:literal Q}
+! OK.
+<argument> \l_tmpa_box 
+l. ...  }
+============================================================