summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3experimental/l3draw
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/l3draw')
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx24
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx9
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx16
9 files changed, 35 insertions, 26 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx
index 7f23d1f4ab4..0859e7a2f9d 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-03-05}
+% \date{Released 2019-05-03}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx
index c59359fd02e..7d5ae3948d6 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-03-05}
+% \date{Released 2019-05-03}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx
index 3cded354fe2..874d1910d09 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-03-05}
+% \date{Released 2019-05-03}
%
% \maketitle
%
@@ -880,7 +880,7 @@
{ \bool_set_true:c { l_@@_path_use_ ##1 _ bool } }
{
\cs_if_exist_use:cF { @@_path_use_action_ ##1 : }
- { \ERROR }
+ { \msg_error:nnn { draw } { invalid-path-action } {##1} }
}
}
\@@_softpath_round_corners:
@@ -888,11 +888,15 @@
{ \l_draw_bb_update_bool }
{ \l_@@_path_use_stroke_bool }
{ \@@_path_use_stroke_bb: }
- \bool_if:NTF \l_@@_path_use_clear_bool
- { \@@_softpath_use_clear: }
- { \@@_softpath_use: }
+ \@@_softpath_use:
\bool_if:NT \l_@@_path_use_clip_bool
- { \driver_draw_clip: }
+ {
+ \driver_draw_clip:
+ \bool_lazy_or:nnF
+ { \l_@@_path_use_fill_bool }
+ { \l_@@_path_use_stroke_bool }
+ { \driver_draw_discardpath: }
+ }
\bool_lazy_or:nnT
{ \l_@@_path_use_fill_bool }
{ \l_@@_path_use_stroke_bool }
@@ -905,6 +909,8 @@
:
}
}
+ \bool_if:NT \l_@@_path_use_clear_bool
+ { \@@_softpath_clear: }
}
\cs_new_protected:Npn \@@_path_use_action_draw:
{
@@ -1016,6 +1022,12 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macrocode}
+\msg_new:nnnn { draw } { invalid-path-action }
+ { Invalid~action~'#1'~for~path. }
+ { Paths~can~be~used~with~actions~'draw',~'clip',~'fill'~or~'stroke'. }
+% \end{macrocode}
+%
% \begin{macrocode}
%</initex|package>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx
index f8d729ca030..bda4d40370a 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-03-05}
+% \date{Released 2019-05-03}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx
index 5f28fc920d9..d360a1ccba5 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-03-05}
+% \date{Released 2019-05-03}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx
index ef5f38d68c8..13d77d0fdc9 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-03-05}
+% \date{Released 2019-05-03}
%
% \maketitle
%
@@ -105,7 +105,7 @@
% \end{macro}
%
% \begin{macro}
-% {\@@_softpath_use:, \@@_softpath_clear:, \@@_softpath_use_clear:}
+% {\@@_softpath_use:, \@@_softpath_clear:}
% Using and clearing is trivial.
% \begin{macrocode}
\cs_new_protected:Npn \@@_softpath_use:
@@ -118,11 +118,6 @@
\tl_build_gclear:N \g_@@_softpath_main_tl
\bool_gset_false:N \g_@@_softpath_corners_bool
}
-\cs_new_protected:Npn \@@_softpath_use_clear:
- {
- \@@_softpath_use:
- \@@_softpath_clear:
- }
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx
index 0e51979e19c..2cf0bf5d500 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-03-05}
+% \date{Released 2019-05-03}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx
index 226d626030e..e8393ec9ee2 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-03-05}
+% \date{Released 2019-05-03}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx
index 73ed6390dcd..b4a3ed383bd 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx
@@ -27,7 +27,6 @@
%</driver|package>
%<*driver>
\documentclass[full]{l3doc}
-\usepackage[utf8]{inputenc}
\usepackage{l3draw}
% For creating code demonstrations
% This needs access to some code-level interfaces in listings
@@ -111,7 +110,7 @@
% }^^A
% }
%
-% \date{Released 2019-03-05}
+% \date{Released 2019-05-03}
%
% \maketitle
%
@@ -609,13 +608,16 @@
% Inserts the current path, carrying out one ore more possible \meta{actions}
% (a comma list):
% \begin{itemize}
-% \item \texttt{clear} Resets the path to empty
-% \item \texttt{clip} Clips any content outside of the path
-% \item \texttt{draw}
+% \item \texttt{stroke} Draws a line along the current path
+% \item \texttt{draw} A synonym for \texttt{stroke}
% \item \texttt{fill} Fills the interior of the path with the current
% file color
-% \item \texttt{stroke} Draws a line along the current path
+% \item \texttt{clip} Clips any content outside of the path
% \end{itemize}
+% Actions are applied in the order given irrespective of the input order.
+% Note that whilst it is possible to use a path without clearing it, the
+% normal use case would be to clear the path (this resets data structures
+% at the macro level).
% \end{function}
%
% \subsubsection{Path operations on drawing axes}
@@ -1143,7 +1145,7 @@
%
% \begin{macrocode}
%<*package>
-\ProvidesExplPackage{l3draw}{2019-03-05}{}
+\ProvidesExplPackage{l3draw}{2019-05-03}{}
{L3 Experimental core drawing support}
%</package>
% \end{macrocode}