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, 16 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index fc1a2022831..acd8aaf809f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -47,8 +47,8 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2015/09/06}
-\def\ExplFileVersion{5925}
+\def\ExplFileDate{2015/09/11}
+\def\ExplFileVersion{6002}
\let\ExplLoaderFileVersion\ExplFileVersion
\ProvidesPackage{\ExplFileName}
[%
@@ -134,19 +134,27 @@
{
\tl_set:Nx \l__expl_driver_tl
{
- \xetex_if_engine:TF
+ \sys_if_engine_xetex:TF
{ xdvipdfmx }
{
\__expl_if_pdf:TF
{ pdfmode }
- { dvips }
+ {
+ \bool_if:nTF
+ {
+ \sys_if_engine_pdftex_p: ||
+ \sys_if_engine_luatex_p:
+ }
+ { dvips }
+ { dvipdfmx }
+ }
}
}
},
driver / dvipdfmx .code:n =
{
\tl_set:Nn \l__expl_driver_tl { dvipdfmx }
- \xetex_if_engine:TF
+ \sys_if_engine_xetex:TF
{
\__msg_kernel_error:nnnn { expl } { wrong-driver }
{ dvipdfmx } { xdvipdfmx }
@@ -164,7 +172,7 @@
driver / dvips .code:n =
{
\tl_set:Nn \l__expl_driver_tl { dvips }
- \xetex_if_engine:TF
+ \sys_if_engine_xetex:TF
{
\__msg_kernel_error:nnnn { expl } { wrong-driver }
{ dvips } { xdvipdfmx }
@@ -184,7 +192,7 @@
driver / pdfmode .code:n =
{
\tl_set:Nn \l__expl_driver_tl { pdfmode }
- \xetex_if_engine:TF
+ \sys_if_engine_xetex:TF
{
\__msg_kernel_error:nnnn { expl } { wrong-driver }
{ pdfmode } { xdvipdfmx }
@@ -202,7 +210,7 @@
driver / xdvipdfmx .code:n =
{
\tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
- \xetex_if_engine:F
+ \sys_if_engine_xetex:F
{
\__expl_if_pdf:TF
{