1 files changed, 7 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index acd8aaf809f..b0bdf9bc21c 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/11}
-\def\ExplFileVersion{6002}
+\def\ExplFileDate{2015/09/27}
+\def\ExplFileVersion{6111}
 \let\ExplLoaderFileVersion\ExplFileVersion
 \ProvidesPackage{\ExplFileName}
   [%
@@ -112,21 +112,6 @@
     active~engine.~LaTeX3~will~use~the~'#2'~driver~instead.
   }
 \tl_new:N \l__expl_driver_tl
-\bool_if:nTF
-  {
-       \cs_if_exist_p:N  \pdftex_pdfoutput:D
-    && \int_compare_p:nNn \pdftex_pdfoutput:D > \c_zero
-  }
-  {
-    \cs_new_eq:NN \__expl_if_pdf:T  \use:n
-    \cs_new_eq:NN \__expl_if_pdf:F  \use_none:n
-    \cs_new_eq:NN \__expl_if_pdf:TF \use_i:nn
-  }
-  {
-    \cs_new_eq:NN \__expl_if_pdf:T  \use_none:n
-    \cs_new_eq:NN \__expl_if_pdf:F  \use:n
-    \cs_new_eq:NN \__expl_if_pdf:TF \use_ii:nn
-  }
 \keys_define:nn { expl }
   {
     driver .choice:,
@@ -137,7 +122,7 @@
             \sys_if_engine_xetex:TF
               { xdvipdfmx }
               {
-                \__expl_if_pdf:TF
+                \sys_if_output_pdf:TF
                   { pdfmode }
                   {
                     \bool_if:nTF
@@ -161,7 +146,7 @@
             \tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
           }
           {
-            \__expl_if_pdf:T
+            \sys_if_output_pdf:T
               {
                 \__msg_kernel_error:nnnn { expl } { wrong-driver }
                   { dvipdfmx } { pdfmode }
@@ -179,7 +164,7 @@
             \tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
           }
           {
-            \__expl_if_pdf:T
+            \sys_if_output_pdf:T
               {
                 \__msg_kernel_error:nnnn { expl } { wrong-driver }
                   { dvips } { pdfmode }
@@ -199,7 +184,7 @@
             \tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
           }
           {
-            \__expl_if_pdf:F
+            \sys_if_output_pdf:F
               {
                 \__msg_kernel_error:nnnn { expl } { wrong-driver }
                   { pdfmode } { dvips }
@@ -212,7 +197,7 @@
         \tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
         \sys_if_engine_xetex:F
           {
-            \__expl_if_pdf:TF
+            \sys_if_output_pdf:TF
               {
                 \__msg_kernel_error:nnnn { expl } { wrong-driver }
                   { xdvipdfmx } { pdfmode }