diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def | 149 |
1 files changed, 69 insertions, 80 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def index d218e1f3741..6441a44a021 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def @@ -117,7 +117,7 @@ { \pdftex_pdfsetmatrix:D } {#1} } -\cs_new_protected:Npn \__driver_box_use_clip:N #1 +\cs_new_protected:Npn \driver_box_use_clip:N #1 { \__driver_scope_begin: \__driver_literal:n @@ -132,7 +132,7 @@ \__driver_scope_end: \skip_horizontal:n { \box_wd:N #1 } } -\cs_new_protected:Npn \__driver_box_use_rotate:Nn #1#2 +\cs_new_protected:Npn \driver_box_use_rotate:Nn #1#2 { \__driver_scope_begin: \box_set_wd:Nn #1 { 0pt } @@ -158,7 +158,7 @@ } \fp_new:N \l__driver_cos_fp \fp_new:N \l__driver_sin_fp -\cs_new_protected:Npn \__driver_box_use_scale:Nnn #1#2#3 +\cs_new_protected:Npn \driver_box_use_scale:Nnn #1#2#3 { \__driver_scope_begin: \__driver_matrix:n @@ -173,13 +173,13 @@ \tl_new:N \l__driver_image_attr_tl \cs_new_protected:Npn \__driver_image_getbb_jpg:n #1 { - \int_zero:N \l__image_page_int - \tl_clear:N \l__image_pagebox_tl + \int_zero:N \l_image_page_int + \tl_clear:N \l_image_pagebox_tl \tl_set:Nx \l__driver_image_attr_tl { - \tl_if_empty:NF \l__image_decode_tl - { :D \l__image_decode_tl } - \bool_if:NT \l__image_interpolate_bool + \tl_if_empty:NF \l_image_decode_tl + { :D \l_image_decodearray_tl } + \bool_if:NT \l_image_interpolate_bool { :I } } \tl_clear:N \l__driver_image_attr_tl @@ -188,88 +188,77 @@ \cs_new_eq:NN \__driver_image_getbb_png:n \__driver_image_getbb_jpg:n \cs_new_protected:Npn \__driver_image_getbb_pdf:n #1 { - \tl_clear:N \l__image_decode_tl - \bool_set_false:N \l__image_interpolate_bool + \tl_clear:N \l_image_decode_tl + \bool_set_false:N \l_image_interpolate_bool \tl_set:Nx \l__driver_image_attr_tl { - : \l__image_pagebox_tl - \int_compare:nNnT \l__image_page_int > 1 - { :P \int_use:N \l__image_page_int } + : \l_image_pagebox_tl + \int_compare:nNnT \l_image_page_int > 1 + { :P \int_use:N \l_image_page_int } } \__driver_image_getbb_auxi:n {#1} } \cs_new_protected:Npn \__driver_image_getbb_auxi:n #1 { - \dim_zero:N \l__image_llx_dim - \dim_zero:N \l__image_lly_dim - \dim_if_exist:cTF { c__image_ #1 \l__driver_image_attr_tl _urx_dim } - { - \dim_set_eq:Nc \l__image_urx_dim - { c__image_ #1 \l__driver_image_attr_tl _urx_dim } - \dim_set_eq:Nc \l__image_ury_dim - { c__image_ #1 \l__driver_image_attr_tl _ury_dim } - } + \image_bb_restore:xF { #1 \l__driver_image_attr_tl } { \__driver_image_getbb_auxii:n {#1} } } \cs_new_protected:Npn \__driver_image_getbb_auxii:n #1 { \tex_immediate:D \pdftex_pdfximage:D \bool_lazy_or:nnT - { \l__image_interpolate_bool } - { ! \tl_if_empty_p:N \l__image_decode_tl } + { \l_image_interpolate_bool } + { ! \tl_if_empty_p:N \l_image_decodearray_tl } { attr ~ { - \tl_if_empty:NF \l__image_decode_tl - { /Decode~[ \l__image_decode_tl ] } - \bool_if:NT \l__image_interpolate_bool + \tl_if_empty:NF \l_image_decode_tl + { /Decode~[ \l_image_decodearray_tl ] } + \bool_if:NT \l_image_interpolate_bool { /Interpolate~true } } } - \int_compare:nNnT \l__image_page_int > 0 - { page ~ \int_use:N \l__image_page_int } - \tl_if_empty:NF \l__image_pagebox_tl - { \l__image_pagebox_tl } + \int_compare:nNnT \l_image_page_int > 0 + { page ~ \int_use:N \l_image_page_int } + \tl_if_empty:NF \l_image_pagebox_tl + { \l_image_pagebox_tl } {#1} - \hbox_set:Nn \l__image_tmp_box + \hbox_set:Nn \l__driver_tmp_box { \pdftex_pdfrefximage:D \pdftex_pdflastximage:D } - \dim_set:Nn \l__image_urx_dim { \box_wd:N \l__image_tmp_box } - \dim_set:Nn \l__image_ury_dim { \box_ht:N \l__image_tmp_box } - \int_const:cn { c__image_ #1 \l__driver_image_attr_tl _int } + \dim_set:Nn \l_image_urx_dim { \box_wd:N \l__driver_tmp_box } + \dim_set:Nn \l_image_ury_dim { \box_ht:N \l__driver_tmp_box } + \int_const:cn { c__driver_image_ #1 \l__driver_image_attr_tl _int } { \tex_the:D \pdftex_pdflastximage:D } - \dim_const:cn { c__image_ #1 \l__driver_image_attr_tl _urx_dim } - { \l__image_urx_dim } - \dim_const:cn { c__image_ #1 \l__driver_image_attr_tl _ury_dim } - { \l__image_ury_dim } + \image_bb_save:x { #1 \l__driver_image_attr_tl } } \cs_new_protected:Npn \__driver_image_include_jpg:n #1 { \pdftex_pdfrefximage:D - \int_use:c { c__image_ #1 \l__driver_image_attr_tl _int } + \int_use:c { c__driver_image_ #1 \l__driver_image_attr_tl _int } } \cs_new_eq:NN \__driver_image_include_pdf:n \__driver_image_include_jpg:n \cs_new_eq:NN \__driver_image_include_png:n \__driver_image_include_jpg:n \cs_new_eq:NN \__driver_draw_literal:n \__driver_literal:n \cs_generate_variant:Nn \__driver_draw_literal:n { x } -\cs_new_protected:Npn \__driver_draw_begin: - { \__driver_draw_scope_begin: } -\cs_new_protected:Npn \__driver_draw_end: - { \__driver_draw_scope_end: } -\cs_new_protected:Npn \__driver_draw_scope_begin: +\cs_new_protected:Npn \driver_draw_begin: + { \driver_draw_scope_begin: } +\cs_new_protected:Npn \driver_draw_end: + { \driver_draw_scope_end: } +\cs_new_protected:Npn \driver_draw_scope_begin: { \__driver_draw_literal:n { q } } -\cs_new_protected:Npn \__driver_draw_scope_end: +\cs_new_protected:Npn \driver_draw_scope_end: { \__driver_draw_literal:n { Q } } -\cs_new_protected:Npn \__driver_draw_moveto:nn #1#2 +\cs_new_protected:Npn \driver_draw_moveto:nn #1#2 { \__driver_draw_literal:x { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ m } } -\cs_new_protected:Npn \__driver_draw_lineto:nn #1#2 +\cs_new_protected:Npn \driver_draw_lineto:nn #1#2 { \__driver_draw_literal:x { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ l } } -\cs_new_protected:Npn \__driver_draw_curveto:nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \driver_draw_curveto:nnnnnn #1#2#3#4#5#6 { \__driver_draw_literal:x { @@ -279,7 +268,7 @@ c } } -\cs_new_protected:Npn \__driver_draw_rectangle:nnnn #1#2#3#4 +\cs_new_protected:Npn \driver_draw_rectangle:nnnn #1#2#3#4 { \__driver_draw_literal:x { @@ -288,35 +277,35 @@ re } } -\cs_new_protected:Npn \__driver_draw_evenodd_rule: +\cs_new_protected:Npn \driver_draw_evenodd_rule: { \bool_gset_true:N \g__driver_draw_eor_bool } -\cs_new_protected:Npn \__driver_draw_nonzero_rule: +\cs_new_protected:Npn \driver_draw_nonzero_rule: { \bool_gset_false:N \g__driver_draw_eor_bool } \bool_new:N \g__driver_draw_eor_bool -\cs_new_protected:Npn \__driver_draw_closepath: +\cs_new_protected:Npn \driver_draw_closepath: { \__driver_draw_literal:n { h } } -\cs_new_protected:Npn \__driver_draw_stroke: +\cs_new_protected:Npn \driver_draw_stroke: { \__driver_draw_literal:n { S } } -\cs_new_protected:Npn \__driver_draw_closestroke: +\cs_new_protected:Npn \driver_draw_closestroke: { \__driver_draw_literal:n { s } } -\cs_new_protected:Npn \__driver_draw_fill: +\cs_new_protected:Npn \driver_draw_fill: { \__driver_draw_literal:x { f \bool_if:NT \g__driver_draw_eor_bool * } } -\cs_new_protected:Npn \__driver_draw_fillstroke: +\cs_new_protected:Npn \driver_draw_fillstroke: { \__driver_draw_literal:x { B \bool_if:NT \g__driver_draw_eor_bool * } } -\cs_new_protected:Npn \__driver_draw_clip: +\cs_new_protected:Npn \driver_draw_clip: { \__driver_draw_literal:x { W \bool_if:NT \g__driver_draw_eor_bool * } } -\cs_new_protected:Npn \__driver_draw_discardpath: +\cs_new_protected:Npn \driver_draw_discardpath: { \__driver_draw_literal:n { n } } -\cs_new_protected:Npn \__driver_draw_dash:nn #1#2 +\cs_new_protected:Npn \driver_draw_cap_dash:nn #1#2 { \__driver_draw_literal:x { @@ -328,26 +317,26 @@ } \cs_new:Npn \__driver_draw_dash:n #1 { \dim_to_decimal_in_bp:n {#1} ~ } -\cs_new_protected:Npn \__driver_draw_linewidth:n #1 +\cs_new_protected:Npn \driver_draw_linewidth:n #1 { \__driver_draw_literal:x { \dim_to_decimal_in_bp:n {#1} ~ w } } -\cs_new_protected:Npn \__driver_draw_miterlimit:n #1 +\cs_new_protected:Npn \driver_draw_miterlimit:n #1 { \__driver_draw_literal:x { \fp_eval:n {#1} ~ M } } -\cs_new_protected:Npn \__driver_draw_cap_butt: +\cs_new_protected:Npn \driver_draw_cap_butt: { \__driver_draw_literal:n { 0 ~ J } } -\cs_new_protected:Npn \__driver_draw_cap_round: +\cs_new_protected:Npn \driver_draw_cap_round: { \__driver_draw_literal:n { 1 ~ J } } -\cs_new_protected:Npn \__driver_draw_cap_rectangle: +\cs_new_protected:Npn \driver_draw_cap_rectangle: { \__driver_draw_literal:n { 2 ~ J } } -\cs_new_protected:Npn \__driver_draw_join_miter: +\cs_new_protected:Npn \driver_draw_join_miter: { \__driver_draw_literal:n { 0 ~ j } } -\cs_new_protected:Npn \__driver_draw_join_round: +\cs_new_protected:Npn \driver_draw_join_round: { \__driver_draw_literal:n { 1 ~ j } } -\cs_new_protected:Npn \__driver_draw_join_bevel: +\cs_new_protected:Npn \driver_draw_join_bevel: { \__driver_draw_literal:n { 2 ~ j } } -\cs_new_protected:Npn \__driver_draw_color_cmyk:nnnn #1#2#3#4 +\cs_new_protected:Npn \driver_draw_color_cmyk:nnnn #1#2#3#4 { \use:x { @@ -363,7 +352,7 @@ \__driver_draw_literal:n { #1 ~ #2 ~ #3 ~ #4 ~ k ~ #1 ~ #2 ~ #3 ~ #4 ~ K } } -\cs_new_protected:Npn \__driver_draw_color_cmyk_fill:nnnn #1#2#3#4 +\cs_new_protected:Npn \driver_draw_fill_cmyk:nnnn #1#2#3#4 { \__driver_draw_literal:x { @@ -372,7 +361,7 @@ k } } -\cs_new_protected:Npn \__driver_draw_color_cmyk_stroke:nnnn #1#2#3#4 +\cs_new_protected:Npn \driver_draw_stroke_cmyk:nnnn #1#2#3#4 { \__driver_draw_literal:x { @@ -381,7 +370,7 @@ K } } -\cs_new_protected:Npn \__driver_draw_color_gray:n #1 +\cs_new_protected:Npn \driver_draw_color_gray:n #1 { \use:x { \__driver_draw_color_gray_aux:n { \fp_eval:n {#1} } } @@ -390,11 +379,11 @@ { \__driver_draw_literal:n { #1 ~ g ~ #1 ~ G } } -\cs_new_protected:Npn \__driver_draw_color_gray_fill:n #1 +\cs_new_protected:Npn \driver_draw_fill_gray:n #1 { \__driver_draw_literal:x { \fp_eval:n {#1} ~ g } } -\cs_new_protected:Npn \__driver_draw_color_gray_stroke:n #1 +\cs_new_protected:Npn \driver_draw_stroke_gray:n #1 { \__driver_draw_literal:x { \fp_eval:n {#1} ~ G } } -\cs_new_protected:Npn \__driver_draw_color_rgb:nnn #1#2#3 +\cs_new_protected:Npn \driver_draw_color_rgb:nnn #1#2#3 { \use:x { @@ -409,17 +398,17 @@ \__driver_draw_literal:n { #1 ~ #2 ~ #3 ~ rg ~ #1 ~ #2 ~ #3 ~ RG } } -\cs_new_protected:Npn \__driver_draw_color_rgb_fill:nnn #1#2#3 +\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 } } -\cs_new_protected:Npn \__driver_draw_color_rgb_stroke:nnn #1#2#3 +\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 } } -\cs_new_protected:Npn \__driver_draw_transformcm:nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \driver_draw_transformcm:nnnnnn #1#2#3#4#5#6 { \__driver_draw_literal:x { @@ -429,13 +418,13 @@ cm } } -\cs_new_protected:Npn \__driver_draw_hbox:Nnnnnnn #1#2#3#4#5#6#7 +\cs_new_protected:Npn \driver_draw_hbox:Nnnnnnn #1#2#3#4#5#6#7 { \hbox_set:Nn \l__driver_tmp_box { \tex_kern:D \__dim_eval:n {#6} \__driver_scope_begin: - \__driver_draw_transformcm:nnnnnn {#2} {#3} {#4} {#5} + \driver_draw_transformcm:nnnnnn {#2} {#3} {#4} {#5} { 0pt } { 0pt } \box_move_up:nn {#7} { \box_use:N #1 } \__driver_scope_end: |