diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def | 86 |
1 files changed, 25 insertions, 61 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index a82491c6aaa..8f5e5c407e6 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvipdfmx.def}{2020-06-03}{} + {l3backend-dvipdfmx.def}{2020-06-18}{} {L3 backend support: dvipdfmx} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -52,8 +52,8 @@ { \tl_set:Nx #1 { - spot ~ - \exp_after:wN \use:n \current@color \c_space_tl 1 + { spot } + { \exp_after:wN \use:n \current@color \c_space_tl 1 } } } { @@ -62,33 +62,22 @@ } } \cs_new_protected:Npn \__color_backend_pickup:w #1 ~ #2 \s__color_stop #3 - { \tl_set:Nn #3 { #1 ~ #2 } } + { \tl_set:Nn #3 { {#1} {#2} } } } } -\cs_new_protected:Npn \__color_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop - { - \__color_backend_select:x - { - cmyk~ - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} - } - } -\cs_new_protected:Npn \__color_backend_gray:w #1 \s__color_stop - { \__color_backend_select:x { gray~ \fp_eval:n {#1} } } -\cs_new_protected:Npn \__color_backend_rgb:w #1 ~ #2 ~ #3 \s__color_stop - { - \__color_backend_select:x - { rgb~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} } - } -\cs_new_protected:Npn \__color_backend_spot:w #1 ~ #2 \s__color_stop - { \__color_backend_select:n { #1 } } +\cs_new_protected:Npn \__color_backend_cmyk:n #1 + { \__color_backend_select:n { cmyk ~ #1 } } +\cs_new_protected:Npn \__color_backend_gray:n #1 + { \__color_backend_select:n { gray ~ #1 } } +\cs_new_protected:Npn \__color_backend_rgb:n #1 + { \__color_backend_select:n { rgb ~ #1 } } +\cs_new_protected:Npn \__color_backend_spot:n #1 + { \__color_backend_select:n {#1} } \cs_new_protected:Npn \__color_backend_select:n #1 { \__kernel_backend_literal:n { color~push~ #1 } \group_insert_after:N \__color_backend_reset: } -\cs_generate_variant:Nn \__color_backend_select:n { x } \cs_new_protected:Npn \__color_backend_reset: { \__kernel_backend_literal:n { color~pop } } %% File: l3backend-box.dtx @@ -219,7 +208,7 @@ { \dim_to_decimal_in_bp:n {#1} ~ w } } \cs_new_protected:Npn \__draw_backend_miterlimit:n #1 - { \__draw_backend_literal:x { \fp_eval:n {#1} ~ M } } + { \__draw_backend_literal:x { #1 ~ M } } \cs_new_protected:Npn \__draw_backend_cap_butt: { \__draw_backend_literal:n { 0 ~ J } } \cs_new_protected:Npn \__draw_backend_cap_round: @@ -232,38 +221,18 @@ { \__draw_backend_literal:n { 1 ~ j } } \cs_new_protected:Npn \__draw_backend_join_bevel: { \__draw_backend_literal:n { 2 ~ j } } -\cs_new_protected:Npn \__draw_backend_color_fill_cmyk:nnnn #1#2#3#4 - { - \__draw_backend_color_select:x - { - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} ~ - k - } - } -\cs_new_protected:Npn \__draw_backend_color_stroke_cmyk:nnnn #1#2#3#4 - { - \__draw_backend_color_select:x - { - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} ~ - k - } - } +\cs_new_protected:Npn \__draw_backend_color_fill_cmyk:n #1 + { \__draw_backend_color_select:n { #1 ~ k } } +\cs_new_protected:Npn \__draw_backend_color_stroke_cmyk:n #1 + { \__draw_backend_color_select:n { #1 ~ K } } \cs_new_protected:Npn \__draw_backend_color_fill_gray:n #1 - { \__draw_backend_color_select:x { \fp_eval:n {#1} ~ g } } + { \__draw_backend_color_select:n { #1 ~ g } } \cs_new_protected:Npn \__draw_backend_color_stroke_gray:n #1 - { \__draw_backend_color_select:x { \fp_eval:n {#1} ~ G } } -\cs_new_protected:Npn \__draw_backend_color_fill_rgb:nnn #1#2#3 - { - \__draw_backend_color_select:x - { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ rg } - } -\cs_new_protected:Npn \__draw_backend_color_stroke_rgb:nnn #1#2#3 - { - \__draw_backend_color_select:x - { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ RG } - } + { \__draw_backend_color_select:n { #1 ~ G } } +\cs_new_protected:Npn \__draw_backend_color_fill_rgb:n #1 + { \__draw_backend_color_select:n { #1 ~ rg } } +\cs_new_protected:Npn \__draw_backend_color_stroke_rgb:n #1 + { \__draw_backend_color_select:n { #1 ~ RG } } \cs_new_eq:NN \__draw_backend_color_select:n \__kernel_backend_literal_pdf:n \cs_generate_variant:Nn \__draw_backend_color_select:n { x } \cs_new_protected:Npn \__draw_backend_cm:nnnn #1#2#3#4 @@ -339,13 +308,8 @@ \cs_new_protected:Npn \__draw_backend_box_use:Nnnnn #1#2#3#4#5 { \__kernel_backend_scope_begin: - \__kernel_backend_literal:x - { - pdf:btrans~matrix~ - \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ - \fp_eval:n {#4} ~ \fp_eval:n {#5} ~ - 0 ~ 0 - } + \__kernel_backend_literal:n + { pdf:btrans~matrix~ #2 ~ #3 ~ #4 ~ #5 ~ 0 ~ 0 } \hbox_overlap_right:n { \box_use:N #1 } \__kernel_backend_literal:n { pdf:etrans } \__kernel_backend_scope_end: |