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 | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty index e6a07862985..5b152e2b9b3 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-05-28}{} +\ProvidesExplPackage{l3draw}{2019-07-01}{} {L3 Experimental core drawing support} \RequirePackage { l3color } %% File: l3draw-boxes.dtx @@ -60,7 +60,7 @@ { \use:x { - \driver_draw_box_use:Nnnnn #1 + \__draw_backend_box_use:Nnnnn #1 { \fp_use:N \l__draw_matrix_a_fp } { \fp_use:N \l__draw_matrix_b_fp } { \fp_use:N \l__draw_matrix_c_fp } @@ -149,10 +149,10 @@ \box_use_drop:N \l__draw_layer_main_box } { - \driver_draw_scope_begin: + \__draw_backend_scope_begin: \box_gset_wd:cn { g__draw_layer_ ##1 _box } { 0pt } \box_use_drop:c { g__draw_layer_ ##1 _box } - \driver_draw_scope_end: + \__draw_backend_scope_end: } } } @@ -696,11 +696,11 @@ \__draw_softpath_use: \bool_if:NT \l__draw_path_use_clip_bool { - \driver_draw_clip: + \__draw_backend_clip: \bool_lazy_or:nnF { \l__draw_path_use_fill_bool } { \l__draw_path_use_stroke_bool } - { \driver_draw_discardpath: } + { \__draw_backend_discardpath: } } \bool_lazy_or:nnT { \l__draw_path_use_fill_bool } @@ -708,7 +708,7 @@ { \use:c { - driver_draw_ + __draw_backend_ \bool_if:NT \l__draw_path_use_fill_bool { fill } \bool_if:NT \l__draw_path_use_stroke_bool { stroke } : @@ -1218,7 +1218,7 @@ \group_begin: \int_gincr:N \g__draw_id_int \hbox_set:Nw \l__draw_main_box - \driver_draw_begin: + \__draw_backend_begin: \__draw_reset_bb: \__draw_path_reset_limits: \bool_set_true:N \l_draw_bb_update_bool @@ -1239,7 +1239,7 @@ \exp_args:NNNV \hbox_set_end: \clist_set:Nn \l_draw_layers_clist \l_draw_layers_clist \__draw_layers_insert: - \driver_draw_end: + \__draw_backend_end: \hbox_set_end: \dim_compare:nNnT \g__draw_xmin_dim = \c_max_dim { @@ -1268,7 +1268,7 @@ \tl_new:N \l__draw_stroke_color_tl \cs_new_protected:Npn \draw_scope_begin: { - \driver_draw_scope_begin: + \__draw_backend_scope_begin: \group_begin: \dim_set_eq:NN \l__draw_linewidth_dim \g__draw_linewidth_dim \draw_path_scope_begin: @@ -1278,7 +1278,7 @@ \draw_path_scope_end: \dim_gset_eq:NN \g__draw_linewidth_dim \l__draw_linewidth_dim \group_end: - \driver_draw_scope_end: + \__draw_backend_scope_end: } \dim_new:N \l__draw_xmax_dim \dim_new:N \l__draw_xmin_dim @@ -1385,24 +1385,24 @@ } \cs_generate_variant:Nn \__draw_softpath_roundpoint:nn { VV } \cs_new_protected:Npn \__draw_softpath_close_op:nn #1#2 - { \driver_draw_closepath: } + { \__draw_backend_closepath: } \cs_new_protected:Npn \__draw_softpath_curveto_opi:nn #1#2 { \__draw_softpath_curveto_opi:nnNnnNnn {#1} {#2} } \cs_new_protected:Npn \__draw_softpath_curveto_opi:nnNnnNnn #1#2#3#4#5#6#7#8 - { \driver_draw_curveto:nnnnnn {#1} {#2} {#4} {#5} {#7} {#8} } + { \__draw_backend_curveto:nnnnnn {#1} {#2} {#4} {#5} {#7} {#8} } \cs_new_protected:Npn \__draw_softpath_curveto_opii:nn #1#2 { \__draw_softpath_curveto_opii:nn } \cs_new_protected:Npn \__draw_softpath_curveto_opiii:nn #1#2 { \__draw_softpath_curveto_opiii:nn } \cs_new_protected:Npn \__draw_softpath_lineto_op:nn #1#2 - { \driver_draw_lineto:nn {#1} {#2} } + { \__draw_backend_lineto:nn {#1} {#2} } \cs_new_protected:Npn \__draw_softpath_moveto_op:nn #1#2 - { \driver_draw_moveto:nn {#1} {#2} } + { \__draw_backend_moveto:nn {#1} {#2} } \cs_new_protected:Npn \__draw_softpath_roundpoint_op:nn #1#2 { } \cs_new_protected:Npn \__draw_softpath_rectangle_opi:nn #1#2 { \__draw_softpath_rectangle_opi:nnNnn {#1} {#2} } \cs_new_protected:Npn \__draw_softpath_rectangle_opi:nnNnn #1#2#3#4#5 - { \driver_draw_rectangle:nnnn {#1} {#2} {#4} {#5} } + { \__draw_backend_rectangle:nnnn {#1} {#2} {#4} {#5} } \cs_new_protected:Npn \__draw_softpath_rectangle_opii:nn #1#2 { } \tl_new:N \l__draw_softpath_main_tl \tl_new:N \l__draw_softpath_part_tl @@ -1641,7 +1641,7 @@ \cs_new_protected:Npn \draw_linewidth:n #1 { \dim_gset:Nn \g__draw_linewidth_dim { \fp_to_dim:n {#1} } - \driver_draw_linewidth:n \g__draw_linewidth_dim + \__draw_backend_linewidth:n \g__draw_linewidth_dim } \cs_new_protected:Npn \draw_dash_pattern:nn #1#2 { @@ -1651,7 +1651,7 @@ { \fp_to_dim:n {##1} } \use:x { - \driver_draw_dash_pattern:nn + \__draw_backend_dash_pattern:nn { \seq_use:Nn \l__draw_tmp_seq { , } } { \fp_to_dim:n {#2} } } @@ -1659,15 +1659,15 @@ } \seq_new:N \l__draw_tmp_seq \cs_new_protected:Npn \draw_miterlimit:n #1 - { \driver_draw_miterlimit:n { \fp_eval:n {#1} } } -\cs_new_protected:Npn \draw_cap_butt: { \driver_draw_cap_butt: } -\cs_new_protected:Npn \draw_cap_rectangle: { \driver_draw_cap_rectangle: } -\cs_new_protected:Npn \draw_cap_round: { \driver_draw_cap_round: } -\cs_new_protected:Npn \draw_evenodd_rule: { \driver_draw_evenodd_rule: } -\cs_new_protected:Npn \draw_nonzero_rule: { \driver_draw_nonzero_rule: } -\cs_new_protected:Npn \draw_join_bevel: { \driver_draw_join_bevel: } -\cs_new_protected:Npn \draw_join_miter: { \driver_draw_join_miter: } -\cs_new_protected:Npn \draw_join_round: { \driver_draw_join_round: } + { \__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: } +\cs_new_protected:Npn \draw_evenodd_rule: { \__draw_backend_evenodd_rule: } +\cs_new_protected:Npn \draw_nonzero_rule: { \__draw_backend_nonzero_rule: } +\cs_new_protected:Npn \draw_join_bevel: { \__draw_backend_join_bevel: } +\cs_new_protected:Npn \draw_join_miter: { \__draw_backend_join_miter: } +\cs_new_protected:Npn \draw_join_round: { \__draw_backend_join_round: } \tl_new:N \l__draw_color_tmp_tl \cs_new_eq:NN \draw_color:n \color_select:n \cs_new_protected:Npn \draw_color_fill:n #1 @@ -1685,13 +1685,13 @@ \cs_new_protected:Npn \__draw_color:nw #1#2 ~ #3 \q_stop { \use:c { __draw_color_ #2 :nw } {#1} #3 \q_stop } \cs_new_protected:Npn \__draw_color_cmyk:nw #1#2 ~ #3 ~ #4 ~ #5 \q_stop - { \use:c { driver_draw_color_ #1 _cmyk:nnnn } {#2} {#3} {#4} {#5} } + { \use:c { __draw_backend_color_ #1 _cmyk:nnnn } {#2} {#3} {#4} {#5} } \cs_new_protected:Npn \__draw_color_gray:nw #1#2 \q_stop - { \use:c { driver_draw_color_ #1 _gray:n } {#2} } + { \use:c { __draw_backend_color_ #1 _gray:n } {#2} } \cs_new_protected:Npn \__draw_color_rgb:nw #1#2 ~ #3 ~ #4 \q_stop - { \use:c { driver_draw_color_ #1 _rgb:nnn } {#2} {#3} {#4} } + { \use:c { __draw_backend_color_ #1 _rgb:nnn } {#2} {#3} {#4} } \cs_new_protected:Npn \__draw_color_spot:nw #1#2 ~ #3 \q_stop - { \use:c { driver_draw_color_ #1 _spot:nn } {#2} {#3} } + { \use:c { __draw_backend_color_ #1 _spot:nn } {#2} {#3} } %% File: l3draw-transforms.dtx \bool_new:N \l__draw_matrix_active_bool \fp_new:N \l__draw_matrix_a_fp |