[latex3-commits] [git/LaTeX3-latex3-latex3] master: l3draw: Use softpaths in path set up (1db8faf)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/1db8fafbf8cd502342d68d7dd0d4b01dfbeca24d

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

commit 1db8fafbf8cd502342d68d7dd0d4b01dfbeca24d
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Feb 14 21:43:20 2018 +0000

    l3draw: Use softpaths in path set up
    
    Only basic ones at the present, and with a hack in the
    test files to make sure it actually works.
    
    Lots of path stuff to do before these are 'really' active.


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

1db8fafbf8cd502342d68d7dd0d4b01dfbeca24d
 l3trial/l3draw/l3draw-paths.dtx        |   10 +++++-----
 l3trial/l3draw/l3draw-softpath.dtx     |    2 +-
 l3trial/l3draw/testfiles/m3draw003.lvt |    1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/l3trial/l3draw/l3draw-paths.dtx b/l3trial/l3draw/l3draw-paths.dtx
index a6c8608..3785d2d 100644
--- a/l3trial/l3draw/l3draw-paths.dtx
+++ b/l3trial/l3draw/l3draw-paths.dtx
@@ -152,7 +152,7 @@
 \cs_new_protected:Npn \@@_path_moveto:nn #1#2
   {
      \@@_path_update_limits:nn {#1} {#2}
-     \driver_draw_moveto:nn {#1} {#2}
+     \@@_softpath_moveto:nn {#1} {#2}
      \@@_path_update_last:nn {#1} {#2}
   }
 \cs_new_protected:Npn \draw_path_lineto:n #1
@@ -164,7 +164,7 @@
 \cs_new_protected:Npn \@@_path_lineto:nn #1#2
   {
      \@@_path_update_limits:nn {#1} {#2}
-     \driver_draw_lineto:nn {#1} {#2}
+     \@@_softpath_lineto:nn {#1} {#2}
      \@@_path_update_last:nn {#1} {#2}
   }
 \cs_new_protected:Npn \draw_path_curveto:nnn #1#2#3
@@ -183,7 +183,7 @@
      \@@_path_update_limits:nn {#1} {#2}
      \@@_path_update_limits:nn {#3} {#4}
      \@@_path_update_limits:nn {#5} {#6}
-     \driver_draw_curveto:nnnnnn {#1} {#2} {#3} {#4} {#5} {#6}
+     \@@_softpath_curveto:nnnnnn {#1} {#2} {#3} {#4} {#5} {#6}
      \@@_path_update_last:nn {#5} {#6}
   }
 %    \end{macrocode}
@@ -193,10 +193,10 @@
 % \end{macro}
 %
 % \begin{macro}{\draw_path_close:}
-%   A simple wrapper (though will need curved corner support).
+%   A simple wrapper (though will need curved corer support).
 %    \begin{macrocode}
 \cs_new_protected:Npn \draw_path_close:
-  { \driver_draw_closepath: }
+  { \@@_softpath_closepath: }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3trial/l3draw/l3draw-softpath.dtx b/l3trial/l3draw/l3draw-softpath.dtx
index d411c7e..ac3e2e7 100644
--- a/l3trial/l3draw/l3draw-softpath.dtx
+++ b/l3trial/l3draw/l3draw-softpath.dtx
@@ -289,7 +289,7 @@
 \cs_new_protected:Npn \@@_softpath_curveto_opi:nn #1#2 
   { \@@_softpath_curveto_opi:nnNnnNnn {#1} {#2} }
 \cs_new_protected:Npn \@@_softpath_curveto_opi:nnNnnNnn #1#2#3#4#5#6#7#8
-  { \driver_draw_curevto:nnnnnn {#1} {#2} {#4} {#5} {#7} {#8} }
+  { \driver_draw_curveto:nnnnnn {#1} {#2} {#4} {#5} {#7} {#8} }
 \cs_new_protected:Npn \@@_softpath_curveto_opii:nn #1#2 { }
 \cs_new_protected:Npn \@@_softpath_curveto_opiii:nn #1#2 { }
 \cs_new_protected:Npn \@@_softpath_lineto_op:nn #1#2
diff --git a/l3trial/l3draw/testfiles/m3draw003.lvt b/l3trial/l3draw/testfiles/m3draw003.lvt
index 96bcc34..0a762be 100644
--- a/l3trial/l3draw/testfiles/m3draw003.lvt
+++ b/l3trial/l3draw/testfiles/m3draw003.lvt
@@ -21,6 +21,7 @@
       {
         \draw_begin:
         #1
+        \__draw_softpath_use_clear:
         \draw_end:
       }
     \box_show:N \l_tmpa_box