summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def27
1 files changed, 13 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
index bb94bd8e8ac..8590bc67530 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
@@ -28,24 +28,23 @@
{
\cs_new_protected:Npn \__driver_color_pickup:
{
- \tl_set:Nx \l__color_current_tl
- {
- \exp_after:wN \exp_after:wN\exp_after:wN
- \__driver_color_pickup_aux:w \exp_after:wN
- \current@color \c_space_tl 0 ~ 0 ~ 0 \q_stop
- }
+ \exp_last_unbraced:Nx \__driver_color_pickup_aux:w
+ { \current@color } ~ 0 ~ 0 ~ 0 \q_stop
}
\cs_new:Npn \__driver_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 }
+ }
}
}
}
@@ -127,7 +126,7 @@
\cs_new_protected:Npn \__driver_box_use_rotate:Nn #1#2
{
\__driver_scope_begin:
- \box_set_wd:Nn #1 \c_zero_dim
+ \box_set_wd:Nn #1 { 0pt }
\fp_set:Nn \l__driver_cos_fp { round ( cosd ( #2 ) , 5 ) }
\fp_compare:nNnT \l__driver_cos_fp = \c_zero_fp
{ \fp_zero:N \l__driver_cos_fp }