diff options
author | Karl Berry <karl@freefriends.org> | 2018-02-23 21:54:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-02-23 21:54:14 +0000 |
commit | 87d871a3d83784d48b71fa3712b9f525bfc710d2 (patch) | |
tree | f12f9ffdc697b5af9ee14c06874ec0e2f72c9f94 /Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def | |
parent | ccc63194ce7813106830c8a8755c54d89de831b4 (diff) |
l3 (22feb18)
git-svn-id: svn://tug.org/texlive/trunk@46720 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def | 102 |
1 files changed, 24 insertions, 78 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def index 0b0b7a183bb..a3448270a51 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def @@ -6,7 +6,7 @@ %% %% l3drivers.dtx (with options: `package,xdvipdfmx') %% -%% Copyright (C) 1990-2017 The LaTeX3 Project +%% Copyright (C) 1990-2018 The LaTeX3 Project %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -22,12 +22,12 @@ \ProvidesExplFile {l3xdvidpfmx.def}{2017/03/18}{} {L3 Experimental driver: xdvipdfmx} -\cs_new_protected:Npn \__driver_color_pickup:N #1 { } +\cs_new_protected:Npn \driver_color_pickup:N #1 { } \AtBeginDocument { \@ifpackageloaded { color } { - \cs_set_protected:Npn \__driver_color_pickup:N #1 + \cs_set_protected:Npn \driver_color_pickup:N #1 { \exp_args:NV \tl_if_head_is_space:nTF \current@color { @@ -37,31 +37,24 @@ \exp_after:wN \use:n \current@color \c_space_tl 1 } } - { \exp_after:wN \__driver_color_pickup_aux:w \current@color \q_stop #1 } + { \exp_after:wN \__driver_color_pickup:w \current@color \q_stop #1 } } - \cs_new_protected:Npn \__driver_color_pickup_aux:w #1 ~ #2 \q_stop #3 + \cs_new_protected:Npn \__driver_color_pickup:w #1 ~ #2 \q_stop #3 { \tl_set:Nn #3 { #1 ~ #2 } } } { } } +\cs_new_protected:Npn \driver_color_cmyk:nnnn #1#2#3#4 + { \__driver_color_select:n { cmyk~ #1 ~ #2 ~ #3 ~ #4 } } +\cs_new_protected:Npn \driver_color_gray:n #1 + { \__driver_color_select:n { gray~ #1 } } +\cs_new_protected:Npn \driver_color_rgb:nnn #1#2#3 + { \__driver_color_select:n { rgb~ #1 ~ #2 ~ #3 } } +\cs_new_protected:Npn \driver_color_spot:nn #1#2 + { \__driver_color_select:n { color~push~\c_space_tl #1 } } \cs_new_protected:Npn \__driver_color_select:n #1 - { - \tex_special:D - { - color~push~ - \cs_if_exist_use:cF - { __driver_color_convert_ \__driver_convert_model:w #1 \q_stop :n } - { \use:n } - {#1} - } - } -\cs_generate_variant:Nn \__driver_color_select:n { V } -\cs_new:Npn \__driver_convert_model:w #1 ~ #2 \q_stop {#1} -\cs_new:Npn \__driver_color_convert_spot:n #1 - { \__driver_color_convert_spot:w #1 \q_stop } -\cs_new:Npn \__driver_color_convert_spot:w #1 ~ #2 ~ #3 \q_stop - { \c_space_tl #2 } -\cs_new_protected:Npn \__driver_color_reset: + { \tex_special:D { color~push~ #1 } } +\cs_new_protected:Npn \driver_color_reset: { \tex_special:D { color~pop } } \cs_new_protected:Npn \__driver_literal:n #1 { \tex_special:D { pdf:literal~ #1 } } @@ -319,7 +312,7 @@ { \dim_to_decimal_in_bp:n {#1} ~ w } } \cs_new_protected:Npn \driver_draw_miterlimit:n #1 - { \__driver_draw_literal:x { \fp_eval:n {#1} ~ M } } + { \__driver_draw_literal:x { #1 ~ M } } \cs_new_protected:Npn \driver_draw_cap_butt: { \__driver_draw_literal:n { 0 ~ J } } \cs_new_protected:Npn \driver_draw_cap_round: @@ -334,82 +327,35 @@ { \__driver_draw_literal:n { 2 ~ j } } \cs_new_protected:Npn \driver_draw_color_cmyk:nnnn #1#2#3#4 { - \use:x - { - \__driver_draw_color_cmyk_aux:nnnn - { \fp_eval:n {#1} } - { \fp_eval:n {#2} } - { \fp_eval:n {#3} } - { \fp_eval:n {#4} } - } - } -\cs_new_protected:Npn \__driver_draw_color_cmyk_aux:nnnn #1#2#3#4 - { \__driver_draw_literal:n { #1 ~ #2 ~ #3 ~ #4 ~ k ~ #1 ~ #2 ~ #3 ~ #4 ~ K } } \cs_new_protected:Npn \driver_draw_fill_cmyk:nnnn #1#2#3#4 { - \__driver_draw_literal:x - { - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} ~ - k - } + \__driver_draw_literal:n { #1 ~ #2 ~ #3 ~ #4 ~ k } } \cs_new_protected:Npn \driver_draw_stroke_cmyk:nnnn #1#2#3#4 - { - \__driver_draw_literal:x - { - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} ~ - K - } - } + { \__driver_draw_literal:n { #1 ~ #2 ~ #3 ~ #4 ~ K } } \cs_new_protected:Npn \driver_draw_color_gray:n #1 - { - \use:x - { \__driver_draw_color_gray_aux:n { \fp_eval:n {#1} } } - } -\cs_new_protected:Npn \__driver_draw_color_gray_aux:n #1 - { - \__driver_draw_literal:n { #1 ~ g ~ #1 ~ G } - } + { \__driver_draw_literal:n { #1 ~ g ~ #1 ~ G } } \cs_new_protected:Npn \driver_draw_fill_gray:n #1 - { \__driver_draw_literal:x { \fp_eval:n {#1} ~ g } } + { \__driver_draw_literal:n { #1 ~ g } } \cs_new_protected:Npn \driver_draw_stroke_gray:n #1 - { \__driver_draw_literal:x { \fp_eval:n {#1} ~ G } } + { \__driver_draw_literal:n { #1 ~ G } } \cs_new_protected:Npn \driver_draw_color_rgb:nnn #1#2#3 { - \use:x - { - \__driver_draw_color_rgb_aux:nnn - { \fp_eval:n {#1} } - { \fp_eval:n {#2} } - { \fp_eval:n {#3} } - } - } -\cs_new_protected:Npn \__driver_draw_color_rgb_aux:nnn #1#2#3 - { \__driver_draw_literal:n { #1 ~ #2 ~ #3 ~ rg ~ #1 ~ #2 ~ #3 ~ RG } } \cs_new_protected:Npn \driver_draw_fill_rgb:nnn #1#2#3 - { - \__driver_draw_literal:x - { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ rg } - } + { \__driver_draw_literal:n { #1 ~ #2 ~ #3 ~ rg } } \cs_new_protected:Npn \driver_draw_stroke_rgb:nnn #1#2#3 - { - \__driver_draw_literal:x - { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ RG } - } + { \__driver_draw_literal:n { #1 ~ #2 ~ #3 ~ RG } } \cs_new_protected:Npn \driver_draw_transformcm:nnnnnn #1#2#3#4#5#6 { \__driver_draw_literal:x { - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} ~ + #1 ~ #2 ~ #3 ~ #4 ~ \dim_to_decimal_in_bp:n {#5} ~ \dim_to_decimal_in_bp:n {#6} ~ cm } |