summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-19 22:02:28 +0000
committerKarl Berry <karl@freefriends.org>2017-09-19 22:02:28 +0000
commit435c95be6f25ed57497eb521c9885bc0712e17bf (patch)
tree83bc4b2a5535e959e1917265be06bcef908bcbaf /Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
parent25f52d925614aa8433200addac102a4b9a2dffe3 (diff)
l3 (19sep17)
git-svn-id: svn://tug.org/texlive/trunk@45340 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx62
1 files changed, 30 insertions, 32 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
index ff1503c1200..0ec3f3bd451 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
@@ -45,7 +45,7 @@
% }^^A
% }
%
-% \date{Released 2017/07/19}
+% \date{Released 2017/09/18}
%
% \maketitle
%
@@ -519,7 +519,7 @@
\@ifpackageloaded { color }
{
\cs_new_protected:Npn \@@_color_pickup:
- { \tl_set_eq:NN \l__color_current_tl \current@color }
+ { \tl_set:Nx \l__color_current_tl { \current@color } }
}
{ \cs_new_protected:Npn \@@_color_pickup: { } }
}
@@ -555,10 +555,13 @@
% \end{macrocode}
%
% \begin{macro}[aux]{\@@_color_pickup:}
-% \begin{macro}[aux]{\@@_color_pickup_aux:}
+% \begin{macro}[aux]{\@@_color_pickup_aux:w}
% The current color in driver-dependent format: pick up the package-mode
% data if available. We end up converting back and forward in this route as
% we store our color data in \texttt{dvips} format.
+% The \tn{current@color} needs to be \texttt{x}-expanded before
+% \cs{@@_color_pickup_aux:w} breaks it apart, because for instance
+% \pkg{xcolor} sets it to be instructions to generate a colour
% \begin{macrocode}
%<*package>
\AtBeginDocument
@@ -567,24 +570,23 @@
{
\cs_new_protected:Npn \@@_color_pickup:
{
- \tl_set:Nx \l__color_current_tl
- {
- \exp_after:wN \exp_after:wN\exp_after:wN
- \@@_color_pickup_aux:w \exp_after:wN
- \current@color \c_space_tl 0 ~ 0 ~ 0 \q_stop
- }
+ \exp_last_unbraced:Nx \@@_color_pickup_aux:w
+ { \current@color } ~ 0 ~ 0 ~ 0 \q_stop
}
\cs_new:Npn \@@_color_pickup_aux:w #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \q_stop
{
- \str_if_eq:nnTF {#2} { g }
- { gray ~ #1 }
+ \tl_set:Nx \l__color_current_tl
{
- \str_if_eq:nnTF {#4} { rg }
- { rgb ~ #1 ~ #2 ~ #3 }
+ \str_if_eq:nnTF {#2} { g }
+ { gray ~ #1 }
{
- \str_if_eq:nnTF {#5} { k }
- { cmyk ~ #1 ~ #2 ~ #3 ~ #4 }
- { gray ~ #1 }
+ \str_if_eq:nnTF {#4} { rg }
+ { rgb ~ #1 ~ #2 ~ #3 }
+ {
+ \str_if_eq:nnTF {#5} { k }
+ { cmyk ~ #1 ~ #2 ~ #3 ~ #4 }
+ { gray ~ #1 }
+ }
}
}
}
@@ -1218,12 +1220,10 @@
\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 }
- \group_begin:
- \box_set_wd:Nn #1 { 0pt }
- \box_set_ht:Nn #1 { 0pt }
- \box_set_dp:Nn #1 { 0pt }
- \box_use:N #1
- \group_end:
+ \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] }
\@@_scope_end:
}
@@ -1339,7 +1339,7 @@
\cs_new_protected:Npn \@@_box_use_rotate:Nn #1#2
{
\@@_scope_begin:
- \box_set_wd:Nn #1 \c_zero_dim
+ \box_set_wd:Nn #1 { 0pt }
\fp_set:Nn \l_@@_cos_fp { round ( cosd ( #2 ) , 5 ) }
\fp_compare:nNnT \l_@@_cos_fp = \c_zero_fp
{ \fp_zero:N \l_@@_cos_fp }
@@ -1733,11 +1733,11 @@
(#1)
\bool_lazy_or:nnT
{ \l__image_interpolate_bool }
- { ! \tl_if_empty_p:N \l__imge_decode_tl }
+ { ! \tl_if_empty_p:N \l__image_decode_tl }
{
<<
- \tl_if_empty:NF \l__imge_decode_tl
- { /Decode~[ \l__imge_decode_tl ] }
+ \tl_if_empty:NF \l__image_decode_tl
+ { /Decode~[ \l__image_decode_tl ] }
\bool_if:NT \l__image_interpolate_bool
{ /Interpolate~true> }
>>
@@ -2849,12 +2849,10 @@
transform="scale(-1,1)~translate({?x},{?y})~scale(-1,-1)"
>
}
- \group_begin:
- \box_set_wd:Nn #1 { 0pt }
- \box_set_ht:Nn #1 { 0pt }
- \box_set_dp:Nn #1 { 0pt }
- \box_use:N #1
- \group_end:
+ \box_set_wd:Nn #1 { 0pt }
+ \box_set_ht:Nn #1 { 0pt }
+ \box_set_dp:Nn #1 { 0pt }
+ \box_use:N #1
\@@_literal:n { </g> }
\@@_scope_end:
}