summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def177
1 files changed, 84 insertions, 93 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
index 80962a52608..0b0b7a183bb 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
@@ -69,7 +69,7 @@
{ \tex_special:D { x:gsave } }
\cs_new_protected:Npn \__driver_scope_end:
{ \tex_special:D { x:grestore } }
-\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
@@ -84,7 +84,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:
\tex_special:D
@@ -97,7 +97,7 @@
\box_use:N #1
\__driver_scope_end:
}
-\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:
\tex_special:D
@@ -109,7 +109,7 @@
\hbox_overlap_right:n { \box_use:N #1 }
\__driver_scope_end:
}
-\cs_new_eq:NN \__driver_image_getbb_eps:n \__image_read_bb:n
+\cs_new_eq:NN \__driver_image_getbb_eps:n \image_read_bb:n
\int_new:N \g__driver_image_int
\cs_new_protected:Npn \__driver_image_include_eps:n #1
{
@@ -122,23 +122,23 @@
{
\__driver_image_include_auxii:xnn
{
- \tl_if_empty:NF \l__image_pagebox_tl
- { : \l__image_pagebox_tl }
- \int_compare:nNnT \l__image_page_int > 1
- { :P \int_use:N \l__image_page_int }
- \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_pagebox_tl
+ { : \l_image_pagebox_tl }
+ \int_compare:nNnT \l_image_page_int > 1
+ { :P \int_use:N \l_image_page_int }
+ \tl_if_empty:NF \l_image_decode_tl
+ { :D \l_image_decodearray_tl }
+ \bool_if:NT \l_image_interpolate_bool
{ :I }
}
{#1} {#2}
}
\cs_new_protected:Npn \__driver_image_include_auxii:nnn #1#2#3
{
- \int_if_exist:cTF { c__image_ #2#1 _int }
+ \int_if_exist:cTF { c__driver_image_ #2#1 _int }
{
\tex_special:D
- { pdf:usexobj~@image \int_use:c { c__image_ #2#1 _int } }
+ { pdf:usexobj~@image \int_use:c { c__driver_image_ #2#1 _int } }
}
{ \__driver_image_include_auxiii:nn {#2} {#1} {#3} }
}
@@ -146,31 +146,31 @@
\cs_new_protected:Npn \__driver_image_include_auxiii:nnn #1#2#3
{
\int_gincr:N \g__driver_image_int
- \int_const:cn { c__image_ #1#2 _int } { \g__driver_image_int }
+ \int_const:cn { c__driver_image_ #1#2 _int } { \g__driver_image_int }
\tex_special:D
{
pdf:#3~
- @image \int_use:c { c__image_ #1#2 _int }
- \int_compare:nNnT \l__image_page_int > 1
- { page ~ \int_use:N \l__image_page_int \c_space_tl }
- \tl_if_empty:NF \l__image_pagebox_tl
+ @image \int_use:c { c__driver_image_ #1#2 _int }
+ \int_compare:nNnT \l_image_page_int > 1
+ { page ~ \int_use:N \l_image_page_int \c_space_tl }
+ \tl_if_empty:NF \l_image_pagebox_tl
{
- pagebox ~ \l__image_pagebox_tl \c_space_tl
+ pagebox ~ \l_image_pagebox_tl \c_space_tl
bbox ~
- \dim_to_decimal_in_bp:n \l__image_llx_dim \c_space_tl
- \dim_to_decimal_in_bp:n \l__image_lly_dim \c_space_tl
- \dim_to_decimal_in_bp:n \l__image_urx_dim \c_space_tl
- \dim_to_decimal_in_bp:n \l__image_ury_dim \c_space_tl
+ \dim_to_decimal_in_bp:n \l_image_llx_dim \c_space_tl
+ \dim_to_decimal_in_bp:n \l_image_lly_dim \c_space_tl
+ \dim_to_decimal_in_bp:n \l_image_urx_dim \c_space_tl
+ \dim_to_decimal_in_bp:n \l_image_ury_dim \c_space_tl
}
(#1)
\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 }
{
<<
- \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> }
>>
}
@@ -178,21 +178,21 @@
}
\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
\__driver_image_getbb_auxi:nN {#1} \xetex_picfile:D
}
\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
\__driver_image_getbb_auxi:nN {#1} \xetex_pdffile:D
}
\cs_new_protected:Npn \__driver_image_getbb_auxi:nN #1#2
{
- \int_compare:nNnTF \l__image_page_int > 1
- { \__driver_image_getbb_auxii:VnN \l__image_page_int {#1} #2 }
+ \int_compare:nNnTF \l_image_page_int > 1
+ { \__driver_image_getbb_auxii:VnN \l_image_page_int {#1} #2 }
{ \__driver_image_getbb_auxiii:nNnn {#1} #2 }
}
\cs_new_protected:Npn \__driver_image_getbb_auxii:nnN #1#2#3
@@ -200,8 +200,8 @@
\cs_generate_variant:Nn \__driver_image_getbb_auxii:nnN { V }
\cs_new_protected:Npn \__driver_image_getbb_auxiii:nNnn #1#2#3#4
{
- \tl_if_empty:NTF \l__image_pagebox_tl
- { \__driver_image_getbb_auxiv:VnNnn \l__image_pagebox_tl }
+ \tl_if_empty:NTF \l_image_pagebox_tl
+ { \__driver_image_getbb_auxiv:VnNnn \l_image_pagebox_tl }
{ \__driver_image_getbb_auxv:nNnn }
{#1} #2 {#3} {#4}
}
@@ -216,54 +216,45 @@
\cs_generate_variant:Nn \__driver_image_getbb_auxiv:nnNnn { V }
\cs_new_protected:Npn \__driver_image_getbb_auxv:nNnn #1#2#3#4
{
- \dim_zero:N \l__image_llx_dim
- \dim_zero:N \l__image_lly_dim
- \dim_if_exist:cTF { c__image_ #1#3 _urx_dim }
- {
- \dim_set_eq:Nc \l__image_urx_dim { c__image_ #1#3 _urx_dim }
- \dim_set_eq:Nc \l__image_ury_dim { c__image_ #1#3 _ury_dim }
- }
+ \image_bb_restore:nF {#1#3}
{ \__driver_image_getbb_auxvi:nNnn {#1} #2 {#3} {#4} }
}
\cs_new_protected:Npn \__driver_image_getbb_auxvi:nNnn #1#2#3#4
{
- \hbox_set:Nn \l__image_tmp_box { #2 #1 ~ #4 }
- \dim_set:Nn \l__image_utx_dim { \box_wd:N \l__image_tmp_box }
- \dim_set:Nn \l__image_ury_dim { \box_ht:N \l__image_tmp_box }
- \dim_const:cn { c__image_ #1#3 _urx_dim }
- { \l__image_urx_dim }
- \dim_const:cn { c__image_ #1#3 _ury_dim }
- { \l__image_ury_dim }
+ \hbox_set:Nn \l__driver_tmp_box { #2 #1 ~ #4 }
+ \dim_set:Nn \l_image_utx_dim { \box_wd:N \l__driver_tmp_box }
+ \dim_set:Nn \l_image_ury_dim { \box_ht:N \l__driver_tmp_box }
+ \image_bb_save:n {#1#3}
}
\cs_new:Npn \__driver_image_getbb_pagebox:w #1 box {#1}
\cs_new_protected:Npn \__driver_image_include_pdf:n #1
{
\xetex_pdffile:D "#1" ~
- \int_compare:nNnT \l__image_page_int > 0
- { page~ \int_use:N \l__image_page_int }
- \__driver_image_getbb_auxiv:VnNnn \l__image_pagebox_tl
+ \int_compare:nNnT \l_image_page_int > 0
+ { page~ \int_use:N \l_image_page_int }
+ \__driver_image_getbb_auxiv:VnNnn \l_image_pagebox_tl
}
\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
{
@@ -273,7 +264,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
{
@@ -282,35 +273,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
{
@@ -322,26 +313,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
{
@@ -357,7 +348,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
{
@@ -366,7 +357,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
{
@@ -375,7 +366,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} } }
@@ -384,11 +375,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
{
@@ -403,17 +394,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
{
@@ -423,13 +414,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: