diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3dvips.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3dvips.def | 136 |
1 files changed, 51 insertions, 85 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def index ad402056269..858d736bd45 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def @@ -18,7 +18,7 @@ %% This file is part of the "l3kernel bundle" (The Work in LPPL) %% and all files in that bundle must be distributed together. %% -%% File: l3drivers.dtx Copyright(C) 2011-2017 The LaTeX3 Project +%% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project \ProvidesExplFile {l3dvips.def}{2017/03/18}{} {L3 Experimental driver: dvips} @@ -51,10 +51,14 @@ \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 } } + { \__driver_color_select:n { \c_space_tl #1 } } \cs_new_protected:Npn \__driver_color_select:n #1 - { \tex_special:D { color~push~ #1 } } -\cs_new_protected:Npn \driver_color_reset: + { + \tex_special:D { color~push~ #1 } + \tex_special:D { ps::/l3fc~{ }~def } + \group_insert_after:N \__driver_color_reset: + } +\cs_new_protected:Npn \__driver_color_reset: { \tex_special:D { color~pop } } \cs_new_protected:Npn \__driver_literal:n #1 { @@ -128,20 +132,21 @@ \tex_special:D { PSfile = #1 } } \cs_new_protected:Npn \__driver_draw_literal:n #1 - { \tex_special:D { ps:: ~ #1 } } + { \tex_special:D { ps:: #1 } } \cs_generate_variant:Nn \__driver_draw_literal:n { x } \cs_new_protected:Npn \driver_draw_begin: { - \tex_special:D { ps::[begin] } - \tex_special:D { ps::~save } - \tex_special:D { ps::~/l3x~currentpoint~/l3y~exch~def~def } - \tex_special:D { ps::~@beginspecial } + \__driver_draw_literal:n { [begin] } + \__driver_draw_literal:n { save } + \__driver_draw_literal:n { /l3x~currentpoint~/l3y~exch~def~def } + \__driver_draw_literal:n { @beginspecial } + \__driver_draw_literal:n { /l3fc~{ }~def } } \cs_new_protected:Npn \driver_draw_end: { - \tex_special:D { ps::~@endspecial } - \tex_special:D { ps::~restore } - \tex_special:D { ps::[end] } + \__driver_draw_literal:n { @endspecial } + \__driver_draw_literal:n { restore } + \__driver_draw_literal:n { [end] } } \cs_new_protected:Npn \driver_draw_scope_begin: { \__driver_draw_literal:n { save } } @@ -185,9 +190,7 @@ { \__driver_draw_literal:n { closepath } } \cs_new_protected:Npn \driver_draw_stroke: { - \__driver_draw_literal:n { currentdict~/l3sc~known~{gsave~l3sc}~if } - \__driver_draw_literal:n { stroke } - \__driver_draw_literal:n { currentdict~/l3sc~known~{grestore}~if } + \__driver_draw_literal:n { stroke } \bool_if:NT \g__driver_draw_clip_bool { \__driver_draw_literal:x @@ -206,13 +209,14 @@ } \cs_new_protected:Npn \driver_draw_fill: { - \__driver_draw_literal:n { currentdict~/l3fc~known~{gsave~l3fc}~if } + \__driver_draw_literal:n { gsave } + \__driver_draw_literal:n { l3fc } \__driver_draw_literal:x { \bool_if:NT \g__driver_draw_eor_bool { eo } fill } - \__driver_draw_literal:n { currentdict~/l3fc~known~{grestore}~if } + \__driver_draw_literal:n { grestore } \bool_if:NT \g__driver_draw_clip_bool { \__driver_draw_literal:x @@ -226,16 +230,15 @@ } \cs_new_protected:Npn \driver_draw_fillstroke: { - \__driver_draw_literal:n { currentdict~/l3fc~known~{gsave~l3fc}~if } + \__driver_draw_literal:n { gsave } + \__driver_draw_literal:n { l3fc } \__driver_draw_literal:x { \bool_if:NT \g__driver_draw_eor_bool { eo } fill } - \__driver_draw_literal:n { currentdict~/l3fc~known~{grestore}~if } - \__driver_draw_literal:n { currentdict~/l3sc~known~{gsave~l3sc}~if } + \__driver_draw_literal:n { grestore } \__driver_draw_literal:n { stroke } - \__driver_draw_literal:n { currentdict~/l3sc~known~{grestore}~if } \bool_if:NT \g__driver_draw_clip_bool { \__driver_draw_literal:x @@ -294,74 +297,37 @@ { \__driver_draw_literal:n { 1 ~ setlinejoin } } \cs_new_protected:Npn \driver_draw_join_bevel: { \__driver_draw_literal:n { 2 ~ setlinejoin } } -\cs_new_protected:Npn \__driver_draw_color_reset: - { - \__driver_draw_literal:n { currentdic~/l3fc~known~{ /l3fc~ { } ~def }~if } - \__driver_draw_literal:n { currentdic~/l3sc~known~{ /l3sc~ { } ~def }~if } - } -\cs_new_protected:Npn \driver_draw_color_cmyk:nnnn #1#2#3#4 - { - \__driver_draw_literal:n { #1 ~ #2 ~ #3 ~ #4 ~ setcmykcolor } - \__driver_draw_color_reset: - } -\cs_new_protected:Npn \driver_draw_fill_cmyk:nnnn #1#2#3#4 - { - \__driver_draw_literal:n - { /l3fc ~ { #1 ~ #2 ~ #3 ~ #4 ~ setcmykcolor ~ } ~ def } - } -\cs_new_protected:Npn \driver_draw_stroke_cmyk:nnnn #1#2#3#4 - { - \__driver_draw_literal:n - { /l3sc ~ { #1 ~ #2 ~ #3 ~ #4 ~ setcmykcolor ~ } ~ def } - } -\cs_new_protected:Npn \driver_draw_color_gray:n #1 - { - \__driver_draw_literal:n { #1 ~ setgray } - \__driver_draw_color_reset: - } -\cs_new_protected:Npn \driver_draw_fill_gray:n #1 - { \__driver_draw_literal:n { /l3fc ~ { #1 ~ setgray } ~ def } } -\cs_new_protected:Npn \driver_draw_stroke_gray:n #1 - { \__driver_draw_literal:n { /l3sc ~ { #1 ~ setgray } ~ def } } -\cs_new_protected:Npn \driver_draw_color_rgb:nnn #1#2#3 - { - \__driver_draw_literal:n { #1 ~ #2 ~ #3 ~ setrgbcolor } - \__driver_draw_color_reset: - } -\cs_new_protected:Npn \driver_draw_fill_rgb:nnn #1#2#3 - { - \__driver_draw_literal:n - { /l3fc ~ { #1 ~ #2 ~ #3 ~ setrgbcolor } ~ def } - } -\cs_new_protected:Npn \driver_draw_stroke_rgb:nnn #1#2#3 - { - \__driver_draw_literal:n - { /l3sc ~ { #1 ~ #2 ~ #3 ~ setrgbcolor } ~ def } - } -\cs_new_protected:Npn \driver_draw_transformcm:nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \driver_draw_color_fill_cmyk:nnnn #1#2#3#4 + { \__driver_draw_fill:n { #1 ~ #2 ~ #3 ~ #4 ~ setcmykcolor } } +\cs_new_protected:Npn \driver_draw_color_stroke_cmyk:nnnn #1#2#3#4 + { \__driver_draw_stroke:n { cmyk ~ #1 ~ #2 ~ #3 ~ #4 } } +\cs_new_protected:Npn \driver_draw_color_fill_gray:n #1 + { \__driver_draw_fill:n { #1 ~ setgray } } +\cs_new_protected:Npn \driver_draw_color_stroke_gray:n #1 + { \__driver_draw_stroke:n { gray ~ #1 } } +\cs_new_protected:Npn \driver_draw_color_fill_rgb:nnn #1#2#3 + { \__driver_draw_fill:n { #1 ~ #2 ~ #3 ~ setrgbcolor } } +\cs_new_protected:Npn \driver_draw_color_stroke_rgb:nnn #1#2#3 + { \__driver_draw_stroke:n { rgb ~ #1 ~ #2 ~ #3 } } +\cs_new_protected:Npn \__driver_draw_color_fill:n #1 + { \__driver_draw_literal:n { /l3fc ~ { #1 } ~ def } } +\cs_new_protected:Npn \__driver_draw_color_stroke:n #1 { - \__driver_draw_literal:x - { - [ - #1 ~ #2 ~ #3 ~ #4 ~ - \dim_to_decimal_in_bp:n {#5} ~ \dim_to_decimal_in_bp:n {#6} ~ - ] ~ - concat - } + \tex_special:D { color~push~#1 } + \group_insert_after:N \__driver_color_reset: } -\cs_new_protected:Npn \driver_draw_hbox:Nnnnnnn #1#2#3#4#5#6#7 +\cs_new_protected:Npn \driver_draw_cm:nnnn #1#2#3#4 + { \__driver_draw_literal:n { [#1 ~ #2 ~ #3 ~ #4 ~ 0 ~ 0 ] ~ concat } } +\cs_new_protected:Npn \driver_draw_box_use:Nnnnn #1#2#3#4#5 { \__driver_scope_begin: - \tex_special:D { ps::[end] } - \driver_draw_transformcm:nnnnnn {#2} {#3} {#4} {#5} {#6} {#7} - \tex_special:D { ps::~72~Resolution~div~72~VResolution~div~neg~scale } - \tex_special:D { ps::~magscale~{1~DVImag~div~dup~scale}~if } - \tex_special:D { ps::~l3x~neg~l3y~neg~translate } - \box_set_wd:Nn #1 { 0pt } - \box_set_ht:Nn #1 { 0pt } - \box_set_dp:Nn #1 { 0pt } - \box_use:N #1 - \tex_special:D { ps::[begin] } + \__driver_draw_literal:n { [end] } + \driver_draw_cm:nnnn {#2} {#3} {#4} {#5} + \__driver_draw_literal:n { 72~Resolution~div~72~VResolution~div~neg~scale } + \__driver_draw_literal:n { magscale~{1~DVImag~div~dup~scale}~if } + \__driver_draw_literal:n { l3x~neg~l3y~neg~translate } + \hbox_overlap_right:n { \box_use:N #1 } + \__driver_draw_literal:n { [begin] } \__driver_scope_end: } %% |