l3 (21apr16)

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

4 files changed, 41 insertions, 20 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
index c4bc414c605..27394c1d22e 100644
--- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
@@ -36,8 +36,8 @@
 %<*driver|generic|package>
 \def\ExplFileName{expl3}%
 \def\ExplFileDescription{L3 programming layer}%
-\def\ExplFileDate{2016/03/28}%
-\def\ExplFileVersion{6468}%
+\def\ExplFileDate{2016/04/20}%
+\def\ExplFileVersion{6476}%
 %</driver|generic|package>
 %<*driver>
 \documentclass[full]{l3doc}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
index 0a7199928e0..c7148f54747 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
@@ -75,7 +75,7 @@ Do not distribute a modified version of this file.
 %
 %<*driver|class>
 \RequirePackage{expl3,xparse,calc}
-\GetIdInfo$Id: l3doc.dtx 6448 2016-03-25 12:27:53Z bruno $
+\GetIdInfo$Id: l3doc.dtx 6474 2016-04-11 18:09:21Z qinglee $
           {L3 Experimental documentation class}
 %</driver|class>
 %
@@ -2252,13 +2252,12 @@ Do not distribute a modified version of this file.
 %     \item Macro/function/whatever name; input has already been
 %       sanitised.
 %   \end{arguments}
-%   The assignment to \cs{saved@macroname} is used by \pkg{doc}'s
-%   \cs{changes} mechanism.
+%   The assignments to \cs{saved@macroname} and \cs{saved@indexname}
+%   are used by \pkg{doc}'s \cs{changes} mechanism.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_macro_single:n #1
   {
     \tl_set:Nn \saved@macroname {#1}
-
     \@@_macro_typeset_one:n {#1}
     \exp_args:Nx \@@_macro_index:n
       {
@@ -2270,15 +2269,15 @@ Do not distribute a modified version of this file.
   {
     \bool_if:NF \l_@@_macro_aux_bool
       { \seq_gput_right:Nn \g_doc_macros_seq {#1} }
-    \hbox_set:Nn \l_@@_macro_index_box
-      {
-        % This box only contains targets... it seems inefficient.
-        \hbox_unpack_clear:N \l_@@_macro_index_box
-        \int_gincr:N \c@CodelineNo
-        \@@_special_index:nn {#1} { main }
-        \DoNotIndex {#1}
-        \int_gdecr:N \c@CodelineNo
-      }
+    \hbox_set:Nw \l_@@_macro_index_box
+      % This box only contains targets... it seems inefficient.
+      \hbox_unpack_clear:N \l_@@_macro_index_box
+      \int_gincr:N \c@CodelineNo
+      \@@_special_index:nn {#1} { main }
+      \DoNotIndex {#1}
+      \int_gdecr:N \c@CodelineNo
+    \exp_args:NNNo \hbox_set_end:
+      \tl_set:Nn \saved@indexname { \l_@@_index_key_tl }
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
index a18533f82c7..a3569329cd5 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: l3drivers.dtx Copyright(C) 2011-2015 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2016 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
@@ -38,7 +38,7 @@
 \documentclass[full]{l3doc}
 %</driver>
 %<*driver|package>
-\GetIdInfo$Id: l3drivers.dtx 6281 2015-11-17 07:11:52Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 6472 2016-04-05 13:26:17Z joseph $
   {L3 Experimental drivers}
 %</driver|package>
 %<*driver>
@@ -498,7 +498,8 @@
 %
 % \begin{variable}{\l_@@_current_color_tl}
 %   The current color is needed by all of the engines, but the way this
-%   is stored varies.
+%   is stored varies. In package mode if the \pkg{color} package is loaded
+%   simply pick up what it is using.
 %    \begin{macrocode}
 \tl_new:N \l_@@_current_color_tl
 %<*dvipdfmx|dvips|xdvipdfmx>
@@ -507,6 +508,14 @@
 %<*pdfmode>
 \tl_set:Nn \l_@@_current_color_tl { 0~g~0~G }
 %</pdfmode>
+%<*package>
+\AtBeginDocument
+  {
+    \@ifpackageloaded { color }
+      { \tl_set:Nn \l_@@_current_color_tl { \current@color } }
+      { }
+  }
+%</package>
 %    \end{macrocode}
 % \end{variable}
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
index 3485c03c978..ac7ed290c36 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
@@ -37,7 +37,7 @@
 \documentclass[full]{l3doc}
 %</driver>
 %<*driver|package>
-\GetIdInfo$Id: l3token.dtx 6465 2016-03-26 16:15:09Z joseph $
+\GetIdInfo$Id: l3token.dtx 6470 2016-04-03 11:29:18Z joseph $
   {L3 Experimental token manipulation}
 %</driver|package>
 %<*driver>
@@ -1411,8 +1411,21 @@
       \tl_set:Nx \l_@@_tmp_tl { \l_@@_tmp_tl }
       \char_set_catcode_math_toggle:n { 0 }
       \tl_put_right:Nn \l_@@_tmp_tl { \or: ^^@ }
+%    \end{macrocode}
+%   As \TeX{} will be very unhappy if if finds an alignment character inside
+%   a primitive \tn{halign} even when skipping false branches, some precautions
+%   are required. \TeX{} will be happy if the token is hidden inside
+%   \tn{unexpanded} (which needs to be the primitive). The expansion chain here
+%   is required so that the conditional gets cleaned up correctly (other code
+%   assumes there is exactly one token to skip during the clean-up).
+%    \begin{macrocode}
       \char_set_catcode_alignment:n { 0 }
-      \tl_put_right:Nn \l_@@_tmp_tl { \or: ^^@ }
+      \tl_put_right:Nn \l_@@_tmp_tl
+        {
+          \or:
+            \etex_unexpanded:D \exp_after:wN
+              { \exp_after:wN ^^@ \exp_after:wN }
+        }
       \tl_put_right:Nn \l_@@_tmp_tl { \or: }
       \char_set_catcode_parameter:n { 0 }
       \tl_put_right:Nn \l_@@_tmp_tl { \or: ^^@ }