l3 (6sep15)

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

8 files changed, 78 insertions, 80 deletions

diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
index 5fd4ada3ef3..b2f59ab27cd 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
@@ -46,8 +46,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2015/07/28]
-\@ifpackagelater{expl3}{2015/07/28}
+\RequirePackage{expl3}[2015/09/06]
+\@ifpackagelater{expl3}{2015/09/06}
   {}
   {%
     \PackageError{l3sort}{Support package l3kernel too old}
@@ -59,7 +59,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3sort.dtx 5700 2015-07-28 19:26:39Z joseph $
+\GetIdInfo$Id: l3sort.dtx 5925 2015-09-06 09:25:46Z joseph $
   {L3 Experimental sorting functions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
index a07319fa527..7ba07c8b626 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/07/28]
-\@ifpackagelater{expl3}{2015/07/28}
+\RequirePackage{expl3}[2015/09/06]
+\@ifpackagelater{expl3}{2015/09/06}
   {}
   {%
     \PackageError{l3flag}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3flag.dtx 5700 2015-07-28 19:26:39Z joseph $
+\GetIdInfo$Id: l3flag.dtx 5925 2015-09-06 09:25:46Z joseph $
   {L3 Experimental flags}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
index ccc1b802342..e8c92a8efda 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/07/28]
-\@ifpackagelater{expl3}{2015/07/28}
+\RequirePackage{expl3}[2015/09/06]
+\@ifpackagelater{expl3}{2015/09/06}
   {}
   {%
     \PackageError{l3regex}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3regex.dtx 5700 2015-07-28 19:26:39Z joseph $
+\GetIdInfo$Id: l3regex.dtx 5925 2015-09-06 09:25:46Z joseph $
   {L3 Experimental regular expressions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -1370,7 +1370,7 @@
       \__regex_show_push:n { ~ }
       #1
     \__tl_build_end:
-    \__msg_show_variable:n { >~Compiled~regex~#2: \l__regex_internal_a_tl }
+    \__msg_show_wrap:n { >~Compiled~regex~#2: \l__regex_internal_a_tl }
   }
 \cs_new_protected:Npn \__regex_show_one:n #1
   {
@@ -2628,7 +2628,7 @@
   { Character~code~`#1'~too~large~in~`\iow_char:N\\x'~hexadecimal~sequence. }
   {
     You~wrote~something~like~
-    `\iow_char:N\\x\{\int_to_hexadecimal:n{#1}\}'.~
+    `\iow_char:N\\x\{\int_to_Hex:n{#1}\}'.~
     The~character~code~#1~is~larger~than~
     the~maximum~value~\int_use:N \c_max_char_int.
   }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
index 64b70dc3449..5d58f570101 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/07/28]
-\@ifpackagelater{expl3}{2015/07/28}
+\RequirePackage{expl3}[2015/09/06]
+\@ifpackagelater{expl3}{2015/09/06}
   {}
   {%
     \PackageError{l3regex}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3regex.dtx 5700 2015-07-28 19:26:39Z joseph $
+\GetIdInfo$Id: l3regex.dtx 5925 2015-09-06 09:25:46Z joseph $
   {L3 Experimental regular expressions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -1368,7 +1368,7 @@
       \__regex_show_push:n { ~ }
       #1
     \__tl_build_end:
-    \__msg_show_variable:n { >~Compiled~regex~#2: \l__regex_internal_a_tl }
+    \__msg_show_wrap:n { >~Compiled~regex~#2: \l__regex_internal_a_tl }
   }
 \cs_new_protected:Npn \__regex_show_one:n #1
   {
@@ -2601,7 +2601,7 @@
   { Character~code~`#1'~too~large~in~`\iow_char:N\\x'~hexadecimal~sequence. }
   {
     You~wrote~something~like~
-    `\iow_char:N\\x\{\int_to_hexadecimal:n{#1}\}'.~
+    `\iow_char:N\\x\{\int_to_Hex:n{#1}\}'.~
     The~character~code~#1~is~larger~than~
     the~maximum~value~\int_use:N \c_max_char_int.
   }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
index 7fc8488d265..3449f5b7cac 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3str-format.dtx Copyright (C) 2012-2013 The LaTeX3 Project
+%% File: l3str-format.dtx Copyright (C) 2012-2013,2015 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{expl3}
-\GetIdInfo$Id: l3str-format.dtx 4745 2014-05-06 10:41:27Z joseph $
+\GetIdInfo$Id: l3str-format.dtx 5906 2015-09-02 13:17:05Z mittelba $
   {L3 Experimental string formatting}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -295,9 +295,9 @@
       {
         { ? } { \__str_format_int:NwnnNNn \use:n }
         { d } { \__str_format_int:NwnnNNn \use:n }
-        { b } { \__str_format_int:NwnnNNn \int_to_binary:n }
-        { o } { \__str_format_int:NwnnNNn \int_to_octal:n }
-        { X } { \__str_format_int:NwnnNNn \int_to_hexadecimal:n }
+        { b } { \__str_format_int:NwnnNNn \int_to_bin:n }
+        { o } { \__str_format_int:NwnnNNn \int_to_oct:n }
+        { X } { \__str_format_int:NwnnNNn \int_to_Hex:n }
       }
       {
         \__msg_kernel_expandable_error:nnnn
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
index f916146b61e..645282820f0 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
@@ -45,8 +45,8 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/07/28]
-\@ifpackagelater{expl3}{2015/07/28}
+\RequirePackage{expl3}[2015/09/06]
+\@ifpackagelater{expl3}{2015/09/06}
   {}
   {%
     \PackageError{l3str}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3str-expl.dtx 5700 2015-07-28 19:26:39Z joseph $
+\GetIdInfo$Id: l3str-expl.dtx 5925 2015-09-06 09:25:46Z joseph $
   {L3 Experimental strings}
 \def\ExplFileName{l3str}
 \ProvidesExplPackage
@@ -80,7 +80,8 @@
       { \exp_not:c { tl_ #1 :Nx } ##1 { \exp_not:N \tl_to_str:n {##2} } }
     \exp_args:Nc \cs_generate_variant:Nn { str_ #1 :Nn } { Nx , cn , cx }
   }
-\str_const:Nx \c_backslash_str { \cs_to_str:N \\ }
+\cs_if_exist:NF \c_backslash_str
+  { \str_const:Nx \c_backslash_str { \cs_to_str:N \\ } }
 \str_const:Nx \c_left_brace_str  { \cs_to_str:N \{ }
 \str_const:Nx \c_right_brace_str { \cs_to_str:N \} }
 \str_const:Nx \c_hash_str      { \cs_to_str:N \# }
@@ -197,7 +198,7 @@
     \cs_new:Npn \__str_to_other_end:w \fi: #1 \q_mark #2 * A #3 \q_stop
       { \fi: #2 }
   }
-\cs_new:Npn \__str_skip_c_zero:w #1;
+\cs_new:Npn \__str_skip_exp_end:w #1;
   {
     \if_int_compare:w #1 > \c_eight
       \exp_after:wN \__str_skip_loop:wNNNNNNNN
@@ -208,13 +209,13 @@
     #1 ;
   }
 \cs_new:Npn \__str_skip_loop:wNNNNNNNN #1; #2#3#4#5#6#7#8#9
-  { \exp_after:wN \__str_skip_c_zero:w \int_use:N \__int_eval:w #1 - \c_eight ; }
+  { \exp_after:wN \__str_skip_exp_end:w \int_use:N \__int_eval:w #1 - \c_eight ; }
 \cs_new:Npn \__str_skip_end:w #1 ;
   {
     \exp_after:wN \__str_skip_end:NNNNNNNN
     \if_case:w #1 \exp_stop_f: \or: \or: \or: \or: \or: \or: \or: \or:
   }
-\cs_new:Npn \__str_skip_end:NNNNNNNN #1#2#3#4#5#6#7#8 { \fi: \c_zero }
+\cs_new:Npn \__str_skip_end:NNNNNNNN #1#2#3#4#5#6#7#8 { \fi: \exp_end: }
 \cs_new:Npn \__str_collect_delimit_by_q_stop:w #1;
   { \__str_collect_loop:wn #1 ; { } }
 \cs_new:Npn \__str_collect_loop:wn #1 ;
@@ -266,7 +267,7 @@
           { \use_none_delimit_by_q_stop:w }
           {
             \exp_after:wN \use_i_delimit_by_q_stop:nw
-            \tex_romannumeral:D \exp_after:wN \__str_skip_c_zero:w
+            \exp:w \exp_after:wN \__str_skip_exp_end:w
               \int_use:N \__int_eval:w #1 + #2 ;
           }
       }
@@ -275,7 +276,7 @@
           { \use_none_delimit_by_q_stop:w }
           {
             \exp_after:wN \use_i_delimit_by_q_stop:nw
-            \tex_romannumeral:D \__str_skip_c_zero:w #1 ; { }
+            \exp:w \__str_skip_exp_end:w #1 ; { }
           }
       }
   }
@@ -327,7 +328,7 @@
   {
     \exp_after:wN \__str_collect_delimit_by_q_stop:w
     \int_use:N \__int_eval:w #2 - #1 \exp_after:wN ;
-    \tex_romannumeral:D \__str_skip_c_zero:w #1 ;
+    \exp:w \__str_skip_exp_end:w #1 ;
   }
 \prg_new_conditional:Npnn \str_if_eq:NN #1#2 { p , TF , T , F }
   {
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
index b0f064707f6..61a25616ef7 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3tl-analysis.dtx Copyright (C) 2011-2012 The LaTeX3 Project
+%% File: l3tl-analysis.dtx Copyright (C) 2011-2012,2015 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{expl3}
-\GetIdInfo$Id: l3tl-analysis.dtx 4745 2014-05-06 10:41:27Z joseph $
+\GetIdInfo$Id: l3tl-analysis.dtx 5899 2015-08-31 21:49:59Z joseph $
   {L3 Experimental token lists analysis}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -260,31 +260,26 @@
     \fi:
     #3 #1; #2;
   }
-\group_begin:
-  \char_set_catcode_other:N A
-  \char_set_catcode_other:N B
-  \char_set_catcode_other:N C
-  \char_set_uccode:nn { `? } { `D }
-  \tl_to_uppercase:n
-    {
-      \cs_new:Npn \__tl_analysis_b_char:Nww #1
-        {
-          \if_meaning:w #1 \tex_undefined:D          ? \else:
-          \if_catcode:w #1 \c_catcode_other_token    C \else:
-          \if_catcode:w #1 \c_catcode_letter_token   B \else:
-          \if_catcode:w #1 \c_math_toggle_token      3 \else:
-          \if_catcode:w #1 \c_alignment_token        4 \else:
-          \if_catcode:w #1 \c_math_superscript_token 7 \else:
-          \if_catcode:w #1 \c_math_subscript_token   8 \else:
-          \if_catcode:w #1 \c_space_token            A \else:
-            6
-          \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi:
-          \__int_value:w `#1 \s__tl
-          \exp_after:wN \__tl_analysis_b_normals:ww
-            \int_use:N \__int_eval:w \c_minus_one +
-        }
-    }
-\group_end:
+\cs_new:Npx \__tl_analysis_b_char:Nww #1
+  {
+    \exp_not:N \if_meaning:w #1 \exp_not:N \tex_undefined:D
+      \token_to_str:N D \exp_not:N \else:
+    \exp_not:N \if_catcode:w #1 \c_catcode_other_token
+      \token_to_str:N C \exp_not:N \else:
+    \exp_not:N \if_catcode:w #1 \c_catcode_letter_token
+      \token_to_str:N B \exp_not:N \else:
+    \exp_not:N \if_catcode:w #1 \c_math_toggle_token      3 \exp_not:N \else:
+    \exp_not:N \if_catcode:w #1 \c_alignment_token        4 \exp_not:N \else:
+    \exp_not:N \if_catcode:w #1 \c_math_superscript_token 7 \exp_not:N \else:
+    \exp_not:N \if_catcode:w #1 \c_math_subscript_token   8 \exp_not:N \else:
+    \exp_not:N \if_catcode:w #1 \c_space_token
+      \token_to_str:N A \exp_not:N \else:
+      6
+    \exp_not:n { \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: }
+    \exp_not:N \__int_value:w `#1 \s__tl
+   \exp_not:N \exp_after:wN \exp_not:N \__tl_analysis_b_normals:ww
+     \exp_not:N \int_use:N \exp_not:N \__int_eval:w \c_minus_one +
+  }
 \cs_new:Npn \__tl_analysis_b_cs:Nww #1
   {
     0 -1 \s__tl
@@ -360,28 +355,32 @@
   }
 \cs_new_protected:Npn \tl_show_analysis:N #1
   {
-    \exp_args:No \__tl_analysis:n {#1}
-    \__tl_analysis_show:N #1
+    \tl_if_exist:NTF #1
+      {
+        \exp_args:No \__tl_analysis:n {#1}
+        \__msg_show_pre:nnxxxx { LaTeX / kernel } { show-tl-analysis }
+          { \token_to_str:N #1 } { \tl_if_empty:NTF #1 { } { ? } } { } { }
+        \__tl_analysis_show:
+      }
+      { \tl_show:N #1 }
   }
 \cs_new_protected:Npn \tl_show_analysis:n #1
   {
     \__tl_analysis:n {#1}
-    \tl_set:Nn \l__tl_analysis_internal_tl {#1}
-    \__tl_analysis_show:N \l__tl_analysis_internal_tl
+    \__msg_show_pre:nnxxxx { LaTeX / kernel } { show-tl-analysis }
+      { } { \tl_if_empty:nTF {#1} { } { ? } } { } { }
+    \__tl_analysis_show:
   }
-\cs_new_protected:Npn \__tl_analysis_show:N #1
+\cs_new_protected:Npn \__tl_analysis_show:
   {
     \group_begin:
-    \use:x
+    \exp_args:NNx
+    \group_end:
+    \__msg_show_wrap:n
       {
-        \group_end:
-        \exp_not:n { \__msg_show_variable:Nnn #1 }
-          { tl-analysis }
-          {
-            \exp_after:wN \__tl_analysis_show_loop:wNw \g__tl_analysis_result_tl
-              \s__tl { ? \__prg_break: } \s__tl
-            \__prg_break_point:
-          }
+        \exp_after:wN \__tl_analysis_show_loop:wNw \g__tl_analysis_result_tl
+          \s__tl { ? \__prg_break: } \s__tl
+        \__prg_break_point:
       }
   }
 \cs_new:Npn \__tl_analysis_show_loop:wNw #1 \s__tl #2 #3 \s__tl
@@ -453,10 +452,8 @@
   { \token_to_str:N \ETC.) }
 \__msg_kernel_new:nnn { kernel } { show-tl-analysis }
   {
-    The~token~list~
-    \str_if_eq:nnF {#1} { \l__tl_analysis_internal_tl }
-      { \token_to_str:N #1 ~ }
-    \tl_if_empty:NTF #1
+    The~token~list~ \tl_if_empty:nF {#1} { #1 ~ }
+    \tl_if_empty:nTF {#2}
       { is~empty }
       { contains~the~tokens: }
   }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index 6ce235f7c03..129f34e20d2 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -47,8 +47,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2015/07/28]
-\@ifpackagelater{expl3}{2015/07/28}
+\RequirePackage{expl3}[2015/09/06]
+\@ifpackagelater{expl3}{2015/09/06}
   {}
   {%
     \PackageError{l3galley}{Support package l3kernel too old}
@@ -60,7 +60,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3galley.dtx 5700 2015-07-28 19:26:39Z joseph $
+\GetIdInfo$Id: l3galley.dtx 5925 2015-09-06 09:25:46Z joseph $
   {L3 Experimental galley code}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -222,7 +222,7 @@
 \cs_new_protected_nopar:Npn \galley_par:
   {
     \s__par_omit
-    \exp_after:wN \__galley_par_auxi: \tex_romannumeral:D - `0
+    \exp_after:wN \__galley_par_auxi: \exp:w \exp_continue_f:w
   }
 \cs_new_protected:Npn \__galley_par_auxi:
   {