diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3backend')
5 files changed, 126 insertions, 312 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: diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index 4c768d9628a..bf161ed1b35 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvips.def}{2020-06-03}{} + {l3backend-dvips.def}{2020-06-18}{} {L3 backend support: dvips} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -73,8 +73,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 } } } { @@ -83,34 +83,23 @@ } } \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 } \__kernel_backend_postscript:n { /color.fc~{ }~def } \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 @@ -324,7 +313,7 @@ { \dim_to_decimal_in_bp:n {#1} ~ setlinewidth } } \cs_new_protected:Npn \__draw_backend_miterlimit:n #1 - { \__draw_backend_literal:x { \fp_eval:n {#1} ~ setmiterlimit } } + { \__draw_backend_literal:n { #1 ~ setmiterlimit } } \cs_new_protected:Npn \__draw_backend_cap_butt: { \__draw_backend_literal:n { 0 ~ setlinecap } } \cs_new_protected:Npn \__draw_backend_cap_round: @@ -337,61 +326,32 @@ { \__draw_backend_literal:n { 1 ~ setlinejoin } } \cs_new_protected:Npn \__draw_backend_join_bevel: { \__draw_backend_literal:n { 2 ~ setlinejoin } } -\cs_new_protected:Npn \__draw_backend_color_fill_cmyk:nnnn #1#2#3#4 - { - \__draw_backend_color_fill:x - { - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} ~ - setcmykcolor - } - } -\cs_new_protected:Npn \__draw_backend_color_stroke_cmyk:nnnn #1#2#3#4 - { - \__draw_backend_color_stroke:x - { - cmyk ~ - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} - } - } -\cs_new_protected:Npn \__draw_backend_color_fill_gray:n #1 - { \__draw_backend_color_fill:x { \fp_eval:n {#1} ~ setgray } } +\cs_new_protected:Npn \__draw_backend_color_fill_cmyk:n #1 + { \__draw_backend_color_fill:n { #1 ~ setcmykcolor } } +\cs_new_protected:Npn \__draw_backend_color_stroke_cmyk:n #1 + { \__draw_backend_color_stroke:n { cmyk ~ #1 } } \cs_new_protected:Npn \__draw_backend_color_stroke_gray:n #1 - { \__draw_backend_color_stroke:x { gray ~ \fp_eval:n {#1} } } -\cs_new_protected:Npn \__draw_backend_color_fill_rgb:nnn #1#2#3 - { - \__draw_backend_color_fill:x - { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ setrgbcolor } - } -\cs_new_protected:Npn \__draw_backend_color_stroke_rgb:nnn #1#2#3 - { - \__draw_backend_color_stroke:x - { rgb ~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} } - } + { \__draw_backend_color_fill:n { #1 ~ setgray } } +\cs_new_protected:Npn \__draw_backend_color_fill_gray:n #1 + { \__draw_backend_color_stroke:n { gray ~ #1 } } +\cs_new_protected:Npn \__draw_backend_color_fill_rgb:n #1 + { \__draw_backend_color_fill:n { #1 ~ setrgbcolor } } +\cs_new_protected:Npn \__draw_backend_color_stroke_rgb:n #1 + { \__draw_backend_color_stroke:n { rgb ~ #1 } } \cs_new_protected:Npn \__draw_backend_color_fill:n #1 { \__kernel_backend_postscript:n { /color.fc ~ { #1 } ~ def } } -\cs_generate_variant:Nn \__draw_backend_color_fill:n { x } \cs_new_protected:Npn \__draw_backend_color_stroke:n #1 { \__kernel_backend_literal:n { color~push~#1 } \group_insert_after:N \__draw_color_reset: } -\cs_generate_variant:Nn \__draw_backend_color_stroke:n { x } \cs_new_protected:Npn \__draw_backend_cm:nnnn #1#2#3#4 { \__draw_backend_literal:n - { - [ - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} ~ - 0 ~ 0 - ] ~ - concat - } + { [ #1 ~ #2 ~ #3 ~ #4 ~ 0 ~ 0 ] ~ concat } } \cs_new_protected:Npn \__draw_backend_box_use:Nnnnn #1#2#3#4#5 { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def index 06d084a246d..a8c31ce3c10 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvisvgm.def}{2020-06-03}{} + {l3backend-dvisvgm.def}{2020-06-18}{} {L3 backend support: dvisvgm} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -53,8 +53,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 } } } { @@ -63,33 +63,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 @@ -353,7 +342,7 @@ \cs_new_protected:Npn \__draw_backend_linewidth:n #1 { \__draw_backend_scope:x { stroke-width=" \dim_to_decimal:n {#1} " } } \cs_new_protected:Npn \__draw_backend_miterlimit:n #1 - { \__draw_backend_scope:x { stroke-miterlimit=" \fp_eval:n {#1} " } } + { \__draw_backend_scope:x { stroke-miterlimit=" #1 " } } \cs_new_protected:Npn \__draw_backend_cap_butt: { \__draw_backend_scope:n { stroke-linecap="butt" } } \cs_new_protected:Npn \__draw_backend_cap_round: @@ -366,25 +355,21 @@ { \__draw_backend_scope:n { stroke-linejoin="round" } } \cs_new_protected:Npn \__draw_backend_join_bevel: { \__draw_backend_scope:n { stroke-linejoin="bevel" } } -\cs_new_protected:Npn \__draw_backend_color_fill_cmyk:nnnn #1#2#3#4 +\cs_new_protected:Npn \__draw_backend_color_fill_cmyk:n #1 + { \__draw_backend_color_fill_cmyk:w #1 \s__draw_stop } +\cs_new_protected:Npn \__draw_backend_color_fill_cmyk:w + #1 ~ #2 ~ #3 ~ #4 \s__draw_stop { \use:x { \__draw_backend_color_fill:nnn - { \fp_eval:n { -100 * ( (#1) * ( 1 - (#4) ) - 1 ) } } - { \fp_eval:n { -100 * ( (#2) * ( 1 - (#4) ) + #4 - 1 ) } } - { \fp_eval:n { -100 * ( (#3) * ( 1 - (#4) ) + #4 - 1 ) } } - } - } -\cs_new_protected:Npn \__draw_backend_color_stroke_cmyk:nnnn #1#2#3#4 - { - \__draw_backend_select:x - { - cmyk~ - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} + { \fp_eval:n { -100 * ( 1 - min ( 1 , #1 + #4 ) ) } } + { \fp_eval:n { -100 * ( 1 - min ( 1 , #2 + #4 ) ) } } + { \fp_eval:n { -100 * ( 1 - min ( 1 , #3 + #4 ) ) } } } } +\cs_new_protected:Npn \__draw_backend_color_stroke_cmyk:n #1 + { \__draw_backend_select:n { cmyk ~ #1 } } \cs_new_protected:Npn \__draw_backend_color_fill_gray:n #1 { \use:x @@ -397,7 +382,7 @@ { \__draw_backend_color_fill:nnn {#1} {#1} {#1} } \cs_new_protected:Npn \__draw_backend_color_stroke_gray:n #1 { \__draw_backend_select:x { gray~ \fp_eval:n {#1} } } -\cs_new_protected:Npn \__draw_backend_color_fill_rgb:nnn #1#2#3 +\cs_new_protected:Npn \__draw_backend_color_fill_rgb:n #1 { \use:x { @@ -422,24 +407,14 @@ " } } -\cs_new_protected:Npn \__draw_backend_color_stroke_rgb:nnn #1#2#3 - { - \__draw_backend_select:x - { rgb~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} } - } +\cs_new_protected:Npn \__draw_backend_color_stroke_rgb:n #1 + { \__draw_backend_select:n { rgb ~ #1 } } \cs_new_protected:Npn \__draw_backend_cm:nnnn #1#2#3#4 { \__draw_backend_scope:n { transform = - " - matrix - ( - \fp_eval:n {#1} , \fp_eval:n {#2} , - \fp_eval:n {#3} , \fp_eval:n {#4} , - 0pt , 0pt - ) - " + " matrix ( #1 , #2 , #3 , #4 , 0pt , 0pt ) " } } \cs_new_protected:Npn \__draw_backend_box_use:Nnnnn #1#2#3#4#5#6#7 diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def index 1e89dc857e6..688d84b9c79 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdfmode.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-pdfmode.def}{2020-06-03}{} + {l3backend-pdfmode.def}{2020-06-18}{} {L3 backend support: PDF mode} \cs_new_eq:NN \__kernel_backend_literal:e \tex_special:D \cs_new_protected:Npn \__kernel_backend_literal:n #1 @@ -82,20 +82,20 @@ #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \s__color_stop #7 { \str_if_eq:nnTF {#2} { g } - { \tl_set:Nn #7 { gray ~ #1 } } + { \tl_set:Nn #7 { { gray } {#1} } } { \str_if_eq:nnTF {#4} { rg } - { \tl_set:Nn #7 { rgb ~ #1 ~ #2 ~ #3 } } + { \tl_set:Nn #7 { { rgb } { #1 ~ #2 ~ #3 } } } { \str_if_eq:nnTF {#5} { k } - { \tl_set:Nn #7 { cmyk ~ #1 ~ #2 ~ #3 ~ #4 } } + { \tl_set:Nn #7 { { cmyk } { #1 ~ #2 ~ #3 ~ #4 } } } { \str_if_eq:nnTF {#2} { cs } { - \tl_set:Nx #7 { spot ~ \use_none:n #1 ~ #5 } + \tl_set:Nx #7 { { spot } { \use_none:n #1 ~ #5 } } } { - \tl_set:Nn #7 { gray ~ 0 } + \tl_set:Nn #7 { { gray } { 0 } } } } } @@ -104,40 +104,16 @@ } } \int_new:N \l__kernel_color_stack_int -\cs_new_protected:Npn \__color_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop - { - \use:x - { - \__color_backend_cmyk:nnnn - { \fp_eval:n {#1} } - { \fp_eval:n {#2} } - { \fp_eval:n {#3} } - { \fp_eval:n {#4} } - } - } -\cs_new_protected:Npn \__color_backend_cmyk:nnnn #1#2#3#4 - { - \__color_backend_select:n - { #1 ~ #2 ~ #3 ~ #4 ~ k ~ #1 ~ #2 ~ #3 ~ #4 ~ K } - } -\cs_new_protected:Npn \__color_backend_gray:w #1 \s__color_stop - { \exp_args:Nx \__color_backend_gray:n { \fp_eval:n {#1} } } +\cs_new_protected:Npn \__color_backend_cmyk:n #1 + { \__color_backend_select:n { #1 ~ k ~ #1 ~ K } } \cs_new_protected:Npn \__color_backend_gray:n #1 { \__color_backend_select:n { #1 ~ g ~ #1 ~ G } } -\cs_new_protected:Npn \__color_backend_rgb:w #1~ #2 ~ #3 \s__color_stop - { - \use:x - { - \__color_backend_rgb:nnn - { \fp_eval:n {#1} } - { \fp_eval:n {#2} } - { \fp_eval:n {#3} } - } - } -\cs_new_protected:Npn \__color_backend_rgb:nnn #1#2#3 - { \__color_backend_select:n { #1 ~ #2 ~ #3 ~ rg ~ #1 ~ #2 ~ #3 ~ RG } } +\cs_new_protected:Npn \__color_backend_rgb:n #1 + { \__color_backend_select:n { #1 ~ rg ~ #1 ~ RG } } +\cs_new_protected:Npn \__color_backend_spot:n #1 + { \__color_backend_spot:w #1 \s__color_stop } \cs_new_protected:Npn \__color_backend_spot:w #1 ~ #2 \s__color_stop - { \__color_backend_select:n { /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ sc ~ #2 ~ SC } } + { \__color_backend_select:n { /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ scn ~ #2 ~ SCN } } \cs_new_protected:Npx \__color_backend_select:n #1 { \cs_if_exist:NTF \tex_pdfextension:D @@ -146,7 +122,6 @@ \exp_not:N \l__kernel_color_stack_int push {#1} \group_insert_after:N \exp_not:N \__color_backend_reset: } -\cs_generate_variant:Nn \__color_backend_select:n { x } \cs_new_protected:Npx \__color_backend_reset: { \cs_if_exist:NTF \tex_pdfextension:D @@ -295,7 +270,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: @@ -308,38 +283,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_protected:Npx \__draw_backend_color_select:n #1 { \cs_if_exist:NTF \tex_pdfextension:D @@ -358,11 +313,7 @@ \cs_generate_variant:Nn \__draw_backend_color_select:n { x } \cs_new_protected:Npn \__draw_backend_cm:nnnn #1#2#3#4 { - \__kernel_backend_matrix:x - { - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} - } + \__kernel_backend_matrix:n { #1 ~ #2 ~ #3 ~ #4 } } \cs_new_protected:Npn \__draw_backend_box_use:Nnnnn #1#2#3#4#5 { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def index e385c1bcf80..2a093aae8dc 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xdvipdfmx.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-xdvipdfmx.def}{2020-06-03}{} + {l3backend-xdvipdfmx.def}{2020-06-18}{} {L3 backend support: xdvipdfmx} \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: |