summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/expl3.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty24
1 files changed, 10 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index b72e6e3ac4b..ffdcd396e0b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx Copyright (C) 1990-2017 The LaTeX3 Project
-\def\ExplFileDate{2017/04/01}%
+\def\ExplFileDate{2017/05/13}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
@@ -95,11 +95,9 @@
\sys_if_output_pdf:TF
{ pdfmode }
{
- \bool_if:nTF
- {
- \sys_if_engine_pdftex_p: ||
- \sys_if_engine_luatex_p:
- }
+ \bool_lazy_or:nnTF
+ { \sys_if_engine_pdftex_p: }
+ { \sys_if_engine_luatex_p: }
{ dvips }
{ dvipdfmx }
}
@@ -226,7 +224,7 @@
}
\cs_set_protected:Npn \box_rotate:Nn #1#2
{ \hbox_set:Nn #1 { \rotatebox {#2} { \box_use:N #1 } } }
- \cs_set_protected:Npn \box_resize:Nnn #1#2#3
+ \cs_set_protected:Npn \box_resize_to_wd_and_ht_plus_dp:Nnn #1#2#3
{
\hbox_set:Nn #1
{
@@ -252,15 +250,13 @@
{ \box_use:N #1 }
}
}
- \cs_set_protected:Npn \box_scale:Nnn #1#2#3
+ \cs_set_protected:Npn \__box_scale_aux:N #1
{
- \hbox_set:Nn #1
- {
- \exp_last_unbraced:Nx \scalebox
- { { \fp_eval:n {#2} } [ \fp_eval:n {#3} ] }
- { \box_use:N #1 }
- }
+ \exp_last_unbraced:Nx \scalebox
+ { { \fp_use:N \l__box_scale_x_fp } [ \fp_use:N \l__box_scale_y_fp ] }
+ { \box_use:N #1 }
}
+ \cs_set_protected:Npn \color_ensure_current: { \set@color }
}
{
\group_begin: