diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty index 624f7c7be13..4f63b4e692e 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty @@ -28,7 +28,7 @@ %% %% File: l3draw.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3draw}{2019-03-05}{} +\ProvidesExplPackage{l3draw}{2019-05-03}{} {L3 Experimental core drawing support} \RequirePackage { l3color } %% File: l3draw-boxes.dtx @@ -685,7 +685,7 @@ { \bool_set_true:c { l__draw_path_use_ ##1 _ bool } } { \cs_if_exist_use:cF { __draw_path_use_action_ ##1 : } - { \ERROR } + { \msg_error:nnn { draw } { invalid-path-action } {##1} } } } \__draw_softpath_round_corners: @@ -693,11 +693,15 @@ { \l_draw_bb_update_bool } { \l__draw_path_use_stroke_bool } { \__draw_path_use_stroke_bb: } - \bool_if:NTF \l__draw_path_use_clear_bool - { \__draw_softpath_use_clear: } - { \__draw_softpath_use: } + \__draw_softpath_use: \bool_if:NT \l__draw_path_use_clip_bool - { \driver_draw_clip: } + { + \driver_draw_clip: + \bool_lazy_or:nnF + { \l__draw_path_use_fill_bool } + { \l__draw_path_use_stroke_bool } + { \driver_draw_discardpath: } + } \bool_lazy_or:nnT { \l__draw_path_use_fill_bool } { \l__draw_path_use_stroke_bool } @@ -710,6 +714,8 @@ : } } + \bool_if:NT \l__draw_path_use_clear_bool + { \__draw_softpath_clear: } } \cs_new_protected:Npn \__draw_path_use_action_draw: { @@ -786,6 +792,9 @@ \dim_gset_eq:NN \g__draw_path_lasty_dim \l__draw_path_lasty_dim \group_end: } +\msg_new:nnnn { draw } { invalid-path-action } + { Invalid~action~'#1'~for~path. } + { Paths~can~be~used~with~actions~'draw',~'clip',~'fill'~or~'stroke'. } %% File: l3draw-points.dtx \cs_new:Npn \__draw_point_process:nn #1#2 { @@ -1323,11 +1332,6 @@ \tl_build_gclear:N \g__draw_softpath_main_tl \bool_gset_false:N \g__draw_softpath_corners_bool } -\cs_new_protected:Npn \__draw_softpath_use_clear: - { - \__draw_softpath_use: - \__draw_softpath_clear: - } \dim_new:N \g__draw_softpath_lastx_dim \dim_new:N \g__draw_softpath_lasty_dim \bool_new:N \g__draw_softpath_move_bool |