diff options
author | Karl Berry <karl@freefriends.org> | 2020-06-18 21:08:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-06-18 21:08:59 +0000 |
commit | 700211024849d94938004ff91e0a3928b1578e98 (patch) | |
tree | a577e99bdf389f5e3a443561cb0162e4a13cd8ad /Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty | |
parent | 0e574a322aeab7e91f801eec35e961965f597e7a (diff) |
l3 (18jun20)
git-svn-id: svn://tug.org/texlive/trunk@55586 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty index 76faead77f0..8c812a5529c 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}{2020-06-03}{} +\ProvidesExplPackage{l3draw}{2020-06-18}{} {L3 Experimental core drawing support} \RequirePackage { l3color } \scan_new:N \s__draw_mark @@ -1677,7 +1677,7 @@ } \seq_new:N \l__draw_tmp_seq \cs_new_protected:Npn \draw_miterlimit:n #1 - { \__draw_backend_miterlimit:n { \fp_eval:n {#1} } } + { \exp_args:Nx \__draw_backend_miterlimit:n { \fp_eval:n {#1} } } \cs_new_protected:Npn \draw_cap_butt: { \__draw_backend_cap_butt: } \cs_new_protected:Npn \draw_cap_rectangle: { \__draw_backend_cap_rectangle: } \cs_new_protected:Npn \draw_cap_round: { \__draw_backend_cap_round: } @@ -1695,21 +1695,10 @@ \cs_new_protected:Npn \__draw_color:nn #1#2 { \color_parse:nN {#2} \l__draw_color_tmp_tl - \__draw_color_aux:Vn \l__draw_color_tmp_tl {#1} - } -\cs_new_protected:Npn \__draw_color_aux:nn #1#2 - { \__draw_color:nw {#2} #1 \s__draw_stop } -\cs_generate_variant:Nn \__draw_color_aux:nn { V } -\cs_new_protected:Npn \__draw_color:nw #1#2 ~ #3 \s__draw_stop - { \use:c { __draw_color_ #2 :nw } {#1} #3 \s__draw_stop } -\cs_new_protected:Npn \__draw_color_cmyk:nw #1#2 ~ #3 ~ #4 ~ #5 \s__draw_stop - { \use:c { __draw_backend_color_ #1 _cmyk:nnnn } {#2} {#3} {#4} {#5} } -\cs_new_protected:Npn \__draw_color_gray:nw #1#2 \s__draw_stop - { \use:c { __draw_backend_color_ #1 _gray:n } {#2} } -\cs_new_protected:Npn \__draw_color_rgb:nw #1#2 ~ #3 ~ #4 \s__draw_stop - { \use:c { __draw_backend_color_ #1 _rgb:nnn } {#2} {#3} {#4} } -\cs_new_protected:Npn \__draw_color_spot:nw #1#2 ~ #3 \s__draw_stop - { \use:c { __draw_backend_color_ #1 _spot:nn } {#2} {#3} } + \exp_after:wN \__draw_color:nnn \l__draw_color_tmp_tl {#1} + } +\cs_new_protected:Npn \__draw_color:nnn #1#2#3 + { \use:c { __draw_backend_color_ #3 _ #1 :n } {#2} } %% File: l3draw-transforms.dtx \bool_new:N \l__draw_matrix_active_bool \fp_new:N \l__draw_matrix_a_fp |