l3draw: Very basic \draw_path_use:n

Just dumps the soft path: usable for many drawings.
latex3 · Feb 18, 2018 · 759be32 · 759be32
1 parent f7610f8
commit 759be32
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 1 deletion.
diff --git a/l3trial/l3draw/l3draw-paths.dtx b/l3trial/l3draw/l3draw-paths.dtx
@@ -764,6 +764,46 @@
 % \end{macro}
 % \end{macro}
 %
+% \subsection{Using paths}
+%
+% \begin{macro}{\draw_path_use:n}
+% \begin{macro}
+%   {
+%     \@@_path_use_clip: ,
+%     \@@_path_use_draw: ,
+%     \@@_path_use_drop: ,
+%     \@@_path_use_fill: ,
+%     \@@_path_use_stroke:
+%     
+%   }
+%    \begin{macrocode}
+\cs_new_protected:Npn \draw_path_use:n #1
+  {
+    \@@_softpath_use_clear:
+    \cs_if_exist_use:cF { @@_path_use_ #1 : }
+      { \ERROR }
+  }
+\cs_new_protected:Npn \@@_path_use_clip:
+  {
+    \driver_draw_clip:
+  }
+\cs_new_protected:Npn \@@_path_use_draw:
+  {
+    \driver_draw_stroke:
+  }
+\cs_new_protected:Npn \@@_path_use_drop: { }
+\cs_new_protected:Npn \@@_path_use_fill:
+  {
+    \driver_draw_fill:
+  }
+\cs_new_protected:Npn \@@_path_use_stroke:
+  {
+    \driver_draw_stroke:
+  }
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
 %    \begin{macrocode}
 %</initex|package>
 %    \end{macrocode}

diff --git a/l3trial/l3draw/testfiles/m3draw003.lvt b/l3trial/l3draw/testfiles/m3draw003.lvt
@@ -21,7 +21,7 @@
       {
         \draw_begin:
         #1
-        \__draw_softpath_use_clear:
+        \draw_path_use:n { stroke }
         \draw_end:
       }
     \box_show:N \l_tmpa_box

diff --git a/l3trial/l3draw/testfiles/m3draw003.ptex.tlg b/l3trial/l3draw/testfiles/m3draw003.ptex.tlg
@@ -11,6 +11,7 @@ TEST 1: \draw_path_moveto:n
 ...\special{pdf:literal q}
 ...\special{pdf:literal 0.3985 w}
 ...\special{pdf:literal 9.96265 9.96265 m}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -27,6 +28,7 @@ TEST 2: \draw_path_lineto:n
 ...\special{pdf:literal q}
 ...\special{pdf:literal 0.3985 w}
 ...\special{pdf:literal 9.96265 9.96265 l}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -43,6 +45,7 @@ TEST 3: \draw_path_curveto:nnn
 ...\special{pdf:literal q}
 ...\special{pdf:literal 0.3985 w}
 ...\special{pdf:literal 0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -63,6 +66,7 @@ TEST 4: \draw_path_close:
 ...\special{pdf:literal 0.99626 0.99626 l}
 ...\special{pdf:literal 0 0.99626 l}
 ...\special{pdf:literal h}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -79,6 +83,7 @@ TEST 5: \draw_path_curveto:nnn
 ...\special{pdf:literal q}
 ...\special{pdf:literal 0.3985 w}
 ...\special{pdf:literal 18.89764 19.22972 28.34647 37.79527 28.34647 56.69292 c}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -96,6 +101,7 @@ TEST 6: \draw_path_arc:nnn (n)
 ...\special{pdf:literal 0.3985 w}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -110,6 +116,7 @@ l. ...  }
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -125,6 +132,7 @@ l. ...  }
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
 ...\special{pdf:literal -113.38583 -13.32864 -108.6897 -26.23116 -100.12222 -36.4\ETC.}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -141,6 +149,7 @@ l. ...  }
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
 ...\special{pdf:literal -113.38583 -31.31062 -88.00356 -56.69292 -56.69292 -56.69\ETC.}
 ...\special{pdf:literal -25.3823 -56.69292 0 -31.31064 0 0 c}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -154,6 +163,7 @@ l. ...  }
 ...\special{pdf:literal 0.3985 w}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -168,6 +178,7 @@ l. ...  }
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -183,6 +194,7 @@ l. ...  }
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
 ...\special{pdf:literal -113.38583 31.31062 -88.00356 56.69292 -56.69292 56.69292\ETC.}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -199,6 +211,7 @@ l. ...  }
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
 ...\special{pdf:literal -113.38583 31.31062 -88.00356 56.69292 -56.69292 56.69292\ETC.}
 ...\special{pdf:literal -25.3823 56.69292 0 31.31064 0 0 c}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -212,6 +225,7 @@ l. ...  }
 ...\special{pdf:literal 0.3985 w}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -12.69115 56.69292 -28.34647 56.69292 c}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -228,6 +242,7 @@ TEST 7: \draw_path_arc_axes:nnnn
 ...\special{pdf:literal q}
 ...\special{pdf:literal 0.3985 w}
 ...\special{pdf:literal -28.34647 88.00356 -53.72874 113.38583 -85.03938 113.3858\ETC.}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -250,6 +265,7 @@ TEST 8: \draw_path_ellipse:nnn
 ...\special{pdf:literal 3.53902 -0.44603 3.09297 0.89209 1.99252 1.99252 c}
 ...\special{pdf:literal h}
 ...\special{pdf:literal 0.99626 0.99626 m}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -268,6 +284,7 @@ l. ...  }
 ...\special{pdf:literal 51.82942 -28.34647 70.86615 -15.65532 70.86615 0 c}
 ...\special{pdf:literal h}
 ...\special{pdf:literal 28.34647 0 m}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -290,6 +307,7 @@ TEST 9: \draw_path_circle:nn
 ...\special{pdf:literal 47.96222 -84.0431 86.03563 -45.96968 86.03563 0.99626 c}
 ...\special{pdf:literal h}
 ...\special{pdf:literal 0.99626 0.99626 m}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -306,6 +324,7 @@ TEST 10: \draw_path_rectangle:nn
 ...\special{pdf:literal q}
 ...\special{pdf:literal 0.3985 w}
 ...\special{pdf:literal 56.69292 56.69292 28.34647 28.34647 re}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -323,6 +342,7 @@ l. ...  }
 ...\special{pdf:literal 85.03938 56.69292 l}
 ...\special{pdf:literal h}
 ...\special{pdf:literal 56.69292 56.69292 m}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -335,6 +355,7 @@ l. ...  }
 ...\special{pdf:literal q}
 ...\special{pdf:literal 0.3985 w}
 ...\special{pdf:literal 56.69292 56.69292 28.34647 28.34647 re}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -374,6 +395,7 @@ TEST 11: \draw_path_rectangle:nn
 ...\special{pdf:literal 141.73228 113.38577 l}
 ...\special{pdf:literal 0 141.73222 m}
 ...\special{pdf:literal 141.73228 141.73222 l}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -409,6 +431,7 @@ l. ...  }
 ...\special{pdf:literal 0 113.38577 l}
 ...\special{pdf:literal 141.73228 141.73222 m}
 ...\special{pdf:literal 0 141.73222 l}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -444,6 +467,7 @@ l. ...  }
 ...\special{pdf:literal 141.73228 113.38577 l}
 ...\special{pdf:literal 0 141.73222 m}
 ...\special{pdf:literal 141.73228 141.73222 l}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box 
@@ -473,6 +497,7 @@ l. ...  }
 ...\special{pdf:literal 141.73228 56.6929 l}
 ...\special{pdf:literal 0 113.3858 m}
 ...\special{pdf:literal 141.73228 113.3858 l}
+...\special{pdf:literal S}
 ...\special{pdf:literal Q}
 ! OK.
 <argument> \l_tmpa_box