l3kernel (7jan14)

git-svn-id: svn://tug.org/texlive/trunk@32599 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 118 insertions, 94 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 37b1f86053f..dd27359ed69 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: expl3.dtx Copyright (C) 1990-2013 The LaTeX3 Project
+%% File: expl3.dtx Copyright (C) 1990-2014 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -60,8 +60,8 @@
   }
 \def\ExplFileName{expl3}
 \def\ExplFileDescription{L3 Experimental code bundle wrapper}
-\def\ExplFileDate{2013/12/31}
-\def\ExplFileVersion{4634}
+\def\ExplFileDate{2014/01/07}
+\def\ExplFileVersion{4646}
 \RequirePackage{etex}
 \relax
 \reserveinserts{32}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
index 27ccd762525..7835917a66b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3basics.dtx Copyright (C) 1990-2013 The LaTeX3 project
+%% File: l3basics.dtx Copyright (C) 1990-2014 The LaTeX3 project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3basics.dtx 4581 2013-07-28 08:38:50Z joseph $
+\GetIdInfo$Id: l3basics.dtx 4642 2014-01-04 17:28:32Z joseph $
   {L3 Basic definitions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
index e8217993546..dacc6a0203a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3bootstrap.dtx Copyright (C) 2011-2013 The LaTeX3 project
+%% File: l3bootstrap.dtx Copyright (C) 2011-2014 The LaTeX3 project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -102,44 +102,58 @@
   {%
     \def\ExplFileDate{#1/#2/#3}%
   }
-\GetIdInfo$Id: l3bootstrap.dtx 4629 2013-12-29 20:59:49Z joseph $
+\GetIdInfo$Id: l3bootstrap.dtx 4640 2014-01-04 16:03:52Z joseph $
   {L3 Bootstrap code}
 \ProvidesPackage{l3bootstrap}
   [%
     \ExplFileDate\space v\ExplFileVersion\space
     L3 Experimental bootstrap code%
   ]
-\def\@tempa%
-  {%
-    \def\@tempa{}%
-    \RequirePackage{luatex}%
-    \RequirePackage{pdftexcmds}%
-    \let\pdfstrcmp\pdf@strcmp
-  }
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname directlua\endcsname\relax
 \else
+  \begingroup
+  \def\@tempa
+    {%
+      \endgroup
+      \RequirePackage{luatex}%
+      \RequirePackage{pdftexcmds}%
+    }%
   \expandafter\@tempa
 \fi
 \begingroup\expandafter\expandafter\expandafter\endgroup
   \expandafter\ifx\csname pdfstrcmp\endcsname\relax
   \let\pdfstrcmp\strcmp
 \fi
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdfstrcmp\endcsname\relax
-  \PackageError{expl3}{Required primitives not found}
+\begingroup
+  \def\ShortText{Required primitives not found}%
+  \def\LongText%
     {%
-      LaTeX3 requires the e-TeX primitives and \string\pdfstrcmp.\MessageBreak
-      \MessageBreak
-      These are available in engine versions:\MessageBreak
-      - pdfTeX 1.30\MessageBreak
-      - XeTeX 0.9994\MessageBreak
-      - LuaTeX 0.40\MessageBreak
-      or later.\MessageBreak
-      \MessageBreak
-      Loading of expl3 will abort!%
-    }
-  \expandafter\endinput
+      LaTeX3 requires the e-TeX primitives and \string\pdfstrcmp.\LineBreak
+      \LineBreak
+      These are available in engine versions:\LineBreak
+      - pdfTeX 1.30\LineBreak
+      - XeTeX 0.9994\LineBreak
+      - LuaTeX 0.40\LineBreak
+      or later.\LineBreak
+      \LineBreak
+    }%
+  \expandafter\ifx\csname pdfstrcmp\endcsname\relax
+    \expandafter\ifx\csname pdf@strcmp\endcsname\relax
+      \def\LineBreak{\noexpand\MessageBreak}%
+      \edef\Error%
+        {%
+          \endgroup
+          \noexpand\PackageError{expl3}{\ShortText}
+            {\LongText Loading of expl3 will abort!}%
+          \noexpand\endinput
+        }%
+      \expandafter\expandafter\expandafter\Error
+    \else
+      \endgroup
+    \fi
+\else
+  \endgroup
 \fi
 \protected\edef\ExplSyntaxOff
   {%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
index 868dfd992ee..34161b8360d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
@@ -47,7 +47,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3candidates.dtx 4633 2013-12-31 17:28:46Z joseph $
+\GetIdInfo$Id: l3candidates.dtx 4643 2014-01-06 13:28:06Z joseph $
   {L3 Experimental additions to l3kernel}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -810,18 +810,17 @@
   }
 \cs_generate_variant:Nn \seq_item:Nn { c }
 \cs_new:Npn \seq_mapthread_function:NNN #1#2#3
+  { \exp_after:wN \__seq_mapthread_function:wNN #2 \q_stop #1 #3 }
+\cs_new:Npn \__seq_mapthread_function:wNN \s__seq #1 \q_stop #2#3
   {
-    \exp_after:wN \__seq_mapthread_function:NNw
-    \exp_after:wN #3
-    \exp_after:wN #1
-    #2 { ? \__prg_break: } { }
+    \exp_after:wN \__seq_mapthread_function:wNw #2 \q_stop #3
+      #1 { ? \__prg_break: } { }
     \__prg_break_point:
   }
-\cs_new:Npn \__seq_mapthread_function:NNw #1#2
+\cs_new:Npn \__seq_mapthread_function:wNw \s__seq #1 \q_stop #2
   {
-    \exp_after:wN \__seq_mapthread_function:Nnnwnn
-    \exp_after:wN #1
-    #2 { ? \__prg_break: } { }
+    \__seq_mapthread_function:Nnnwnn #2
+      #1 { ? \__prg_break: } { }
     \q_stop
   }
 \cs_new:Npn \__seq_mapthread_function:Nnnwnn #1#2#3#4 \q_stop #5#6
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
index 154d3c8d659..d1d70fb39d9 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3drivers.dtx Copyright(C) 2011-2013 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2014 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -47,38 +47,35 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3drivers.dtx 4632 2013-12-31 17:09:37Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 4641 2014-01-04 17:05:41Z joseph $
   {L3 Experimental drivers}
 \ProvidesExplFile
   {l3dvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
   {L3 Experimental driver: dvipdfmx}
 \__expl_package_check:
 \cs_new_protected_nopar:Npn \__driver_state_save:
-  { \tex_special:D { pdf:bcontent } }
+  { \tex_special:D { pdf:literal~q } }
 \cs_new_protected_nopar:Npn \__driver_state_restore:
-  { \tex_special:D { pdf:econtent } }
+  { \tex_special:D { pdf:literal~Q } }
 \cs_new_protected:Npn \__driver_literal:n #1
   { \tex_special:D { pdf:literal~ #1 } }
+\cs_new_protected:Npn \__driver_literal_direct:n #1
+  { \tex_special:D { pdf:literal~direct~ #1 } }
 \cs_new_protected:Npn \__driver_matrix:n #1
-  { \__driver_literal:n { direct~ #1 \c_space_tl 0~0~cm } }
+  { \__driver_literal:n { #1 \c_space_tl 0~0~cm } }
 \cs_new_protected:Npn \__driver_box_use_clip:N #1
   {
-    \__driver_literal:n { q }
+    \__driver_state_save:
     \__driver_literal:n
       {
-        direct~
         0~
         \__dim_strip_bp:n { - \box_dp:N #1 } ~
         \__dim_strip_bp:n { \box_wd:N #1 } ~
         \__dim_strip_bp:n { \box_ht:N #1 + \box_dp:N #1 } ~
         re~W~n
       }
-    \__driver_matrix:n { -1~0~0~-1 }
-    \__driver_literal:n { q }
-    \__driver_matrix:n { -1~0~0~-1 }
     \hbox_overlap_right:n { \box_use:N #1 }
-    \__driver_literal:n { Q }
-    \__driver_literal:n { Q }
+    \__driver_state_restore:
     \skip_horizontal:n { \box_wd:N #1 }
   }
 \cs_new_protected_nopar:Npn \__driver_box_rotate_begin:
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
index 5c22f8648e9..5b0d1ff96a1 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3drivers.dtx Copyright(C) 2011-2013 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2014 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -47,7 +47,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3drivers.dtx 4632 2013-12-31 17:09:37Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 4641 2014-01-04 17:05:41Z joseph $
   {L3 Experimental drivers}
 \ProvidesExplFile
   {l3dvips.def}{\ExplFileDate}{\ExplFileVersion}
@@ -58,25 +58,40 @@
 \cs_new_protected_nopar:Npn \__driver_state_restore:
   { \tex_special:D { ps:grestore } }
 \cs_new_protected:Npn \__driver_literal:n #1
-  { \tex_special:D { ps: #1 } }
-\cs_new_protected:Npn \__driver_box_use_clip:N #1
   {
-    \__driver_state_save:
-    \__driver_literal:n
+    \tex_special:D
       {
-        /savedmatrix~matrix~currentmatrix~def~
-        currentpoint~translate~
-        Resolution~72~div~VResolution~72~div~scale
+        ps:
+          currentpoint~
+          currentpoint~translate~
+          #1 ~
+          neg~exch~neg~exch~translate
       }
+  }
+\cs_new_protected:Npn \__driver_literal_direct:n #1
+  { \tex_special:D { ps:: #1 } }
+\cs_new:Npn \__driver_absolute_lengths:n #1
+  {
+     /savedmatrix~matrix~currentmatrix~def~
+     Resolution~72~div~VResolution~72~div~scale~
+     DVImag~dup~scale~
+     #1 ~
+     savedmatrix~setmatrix
+  }
+\cs_new_protected:Npn \__driver_box_use_clip:N #1
+  {
+    \__driver_state_save:
     \__driver_literal:n
       {
-        0~
-        \__dim_strip_bp:n { \box_dp:N #1 } ~
-        \__dim_strip_bp:n { \box_wd:N #1 } ~
-        \__dim_strip_bp:n { - \box_ht:N #1 - \box_dp:N #1 } ~
-        rectclip
+        \__driver_absolute_lengths:n
+          {
+            0~
+            \__dim_strip_bp:n { \box_dp:N #1 } ~
+            \__dim_strip_bp:n { \box_wd:N #1 } ~
+            \__dim_strip_bp:n { - \box_ht:N #1 - \box_dp:N #1 } ~
+            rectclip
+          }
       }
-    \__driver_literal:n { savedmatrix~setmatrix }
     \hbox_overlap_right:n { \box_use:N #1 }
     \__driver_state_restore:
     \skip_horizontal:n { \box_wd:N #1 }
@@ -87,13 +102,11 @@
     \fp_set:Nn \l__box_angle_fp { round ( \l__box_angle_fp , 5 ) }
     \__driver_literal:n
       {
-        currentpoint~
-        currentpoint~translate~
         \fp_compare:nNnTF \l__box_angle_fp = \c_zero_fp
           { 0 }
           { \fp_eval:n { - \l__box_angle_fp } }
-        \c_space_tl rotate~
-        neg~exch~neg~exch~translate
+        \c_space_tl
+        rotate
       }
   }
 \cs_new_eq:NN \__driver_box_rotate_end: \__driver_state_restore:
@@ -104,11 +117,9 @@
     \fp_set:Nn \l__box_scale_y_fp { round ( \l__box_scale_y_fp , 5 ) }
     \__driver_literal:n
       {
-        currentpoint~
-        currentpoint~translate~
         \fp_use:N \l__box_scale_x_fp \c_space_tl
-        \fp_use:N \l__box_scale_y_fp \c_space_tl scale~
-        neg~exch~neg~exch~translate
+        \fp_use:N \l__box_scale_y_fp \c_space_tl
+        scale
       }
   }
 \cs_new_eq:NN \__driver_box_scale_end: \__driver_state_restore:
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
index 58cd3eba906..40c33448806 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3expan.dtx Copyright (C) 1990-2013 The LaTeX3 project
+%% File: l3expan.dtx Copyright (C) 1990-2014 The LaTeX3 project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3expan.dtx 4584 2013-08-17 15:37:05Z joseph $
+\GetIdInfo$Id: l3expan.dtx 4642 2014-01-04 17:28:32Z joseph $
   {L3 Argument expansion}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
index b304cbda2d0..5ec5c9c034c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
@@ -25,7 +25,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3fp.dtx Copyright (C) 2011-2013 The LaTeX3 Project
+%% File: l3fp.dtx Copyright (C) 2011-2014 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -59,7 +59,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3fp.dtx 4633 2013-12-31 17:28:46Z joseph $
+\GetIdInfo$Id: l3fp.dtx 4642 2014-01-04 17:28:32Z joseph $
   {L3 Floating points}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
index ff822e0f362..4746f4e17b4 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3names.dtx Copyright (C) 1990-2013 The LaTeX3 project
+%% File: l3names.dtx Copyright (C) 1990-2014 The LaTeX3 project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3bootstrap}[2012/07/15]
-\GetIdInfo$Id: l3names.dtx 4630 2013-12-29 21:04:05Z joseph $
+\GetIdInfo$Id: l3names.dtx 4640 2014-01-04 16:03:52Z joseph $
   {L3 Namespace for primitives}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -497,6 +497,10 @@
 \tex_let:D \luatex_pagedir:D           \luatexpagedir
 \tex_let:D \luatex_pardir:D            \luatexpardir
 \tex_let:D \luatex_textdir:D           \luatextextdir
+\etex_ifdefined:D \pdftex_strcmp:D
+\tex_else:D
+  \tex_let:D \pdftex_strcmp:D \pdf@strcmp
+\tex_fi:D
 %% 
 %%
 %% End of file `l3names.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
index ef13e1888a2..d6054191278 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3drivers.dtx Copyright(C) 2011-2013 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2014 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -47,7 +47,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3drivers.dtx 4632 2013-12-31 17:09:37Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 4641 2014-01-04 17:05:41Z joseph $
   {L3 Experimental drivers}
 \ProvidesExplFile
   {l3pdfmode.def}{\ExplFileDate}{\ExplFileVersion}
@@ -66,6 +66,8 @@
   }
 \cs_new_protected:Npn \__driver_literal:n #1
   { \pdftex_pdfliteral:D {#1} }
+\cs_new_protected:Npn \__driver_literal_direct:n #1
+  { \pdftex_pdfliteral:D direct {#1} }
 \cs_if_exist:NTF \pdftex_pdfsetmatrix:D
   {
     \cs_new_protected:Npn \__driver_matrix:n #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
index a4120116cfe..53b96ee65c3 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3prg.dtx Copyright (C) 2005-2013 The LaTeX3 Project
+%% File: l3prg.dtx Copyright (C) 2005-2014 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3prg.dtx 4587 2013-08-25 21:30:10Z joseph $
+\GetIdInfo$Id: l3prg.dtx 4642 2014-01-04 17:28:32Z joseph $
   {L3 Control structures}
 %%
 \ProvidesExplPackage
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
index cc5c9beb713..3cb19f3088d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3drivers.dtx Copyright(C) 2011-2013 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2014 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -47,38 +47,35 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3drivers.dtx 4632 2013-12-31 17:09:37Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 4641 2014-01-04 17:05:41Z joseph $
   {L3 Experimental drivers}
 \ProvidesExplFile
   {l3xdvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
   {L3 Experimental driver: xdvipdfmx}
 \__expl_package_check:
 \cs_new_protected_nopar:Npn \__driver_state_save:
-  { \tex_special:D { pdf:bcontent } }
+  { \tex_special:D { pdf:literal~q } }
 \cs_new_protected_nopar:Npn \__driver_state_restore:
-  { \tex_special:D { pdf:econtent } }
+  { \tex_special:D { pdf:literal~Q } }
 \cs_new_protected:Npn \__driver_literal:n #1
   { \tex_special:D { pdf:literal~ #1 } }
+\cs_new_protected:Npn \__driver_literal_direct:n #1
+  { \tex_special:D { pdf:literal~direct~ #1 } }
 \cs_new_protected:Npn \__driver_matrix:n #1
-  { \__driver_literal:n { direct~ #1 \c_space_tl 0~0~cm } }
+  { \__driver_literal:n { #1 \c_space_tl 0~0~cm } }
 \cs_new_protected:Npn \__driver_box_use_clip:N #1
   {
-    \__driver_literal:n { q }
+    \__driver_state_save:
     \__driver_literal:n
       {
-        direct~
         0~
         \__dim_strip_bp:n { - \box_dp:N #1 } ~
         \__dim_strip_bp:n { \box_wd:N #1 } ~
         \__dim_strip_bp:n { \box_ht:N #1 + \box_dp:N #1 } ~
         re~W~n
       }
-    \__driver_matrix:n { -1~0~0~-1 }
-    \__driver_literal:n { q }
-    \__driver_matrix:n { -1~0~0~-1 }
     \hbox_overlap_right:n { \box_use:N #1 }
-    \__driver_literal:n { Q }
-    \__driver_literal:n { Q }
+    \__driver_state_restore:
     \skip_horizontal:n { \box_wd:N #1 }
   }
 \cs_new_protected_nopar:Npn \__driver_box_rotate_begin: