l3 (29jan17)

git-svn-id: svn://tug.org/texlive/trunk@43088 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2017-01-29 22:34:57 +0000
committer: Karl Berry <karl@freefriends.org> 2017-01-29 22:34:57 +0000
commit: fabbcd2656be5dca3e1986ddcc8c827a23e9aedf (patch)
tree: 4f669dff01da1c31477e1e876fc878cddd5c06ab /Master/texmf-dist/tex/latex/l3kernel
parent: ebc35af4250051fed5186c59ba4eaff9949142e2 (diff)
33 files changed, 776 insertions, 2617 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 6fa4e32f964..0447f49538b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -42,49 +42,23 @@
 %% l3candidates.dtx  (with options: `package')
 %% l3luatex.dtx  (with options: `package,tex')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: expl3.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: expl3.dtx Copyright (C) 1990-2016 The LaTeX3 Project
 \def\ExplFileName{expl3}%
 \def\ExplFileDescription{L3 programming layer}%
-\def\ExplFileDate{2016/11/21}%
-\def\ExplFileVersion{6760}%
+\def\ExplFileDate{2017/01/28}%
+\def\ExplFileVersion{6834}%
 \begingroup
   \def\next{\endgroup}%
   \expandafter\ifx\csname PackageError\endcsname\relax
@@ -143,37 +117,6 @@
       (code)%
   }%
 %% File: l3bootstrap.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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
 \begingroup
   \csname protected\endcsname\gdef\GetIdInfo
     {%
@@ -243,7 +186,7 @@
         }%
     }%
 \endgroup
-\GetIdInfo$Id: l3bootstrap.dtx 6596 2016-06-13 21:29:58Z joseph $
+\GetIdInfo$Id: l3bootstrap.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Bootstrap code}%
 \begingroup
   \expandafter\ifx\csname directlua\endcsname\relax
@@ -419,38 +362,7 @@
     \bool_set_true:N \l__kernel_expl_bool
   }
 %% File: l3names.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3names.dtx 6722 2016-10-13 10:22:35Z joseph $
+\GetIdInfo$Id: l3names.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Namespace for primitives}
 \let \tex_global:D \global
 \let \tex_let:D    \let
@@ -1451,38 +1363,7 @@
   \tex_let:D \tex_right:D  \normalright
 \tex_fi:D
 %% File: l3basics.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3basics.dtx 6696 2016-09-01 16:09:52Z bruno $
+\GetIdInfo$Id: l3basics.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Basic definitions}
 \tex_let:D \if_true:           \tex_iftrue:D
 \tex_let:D \if_false:          \tex_iffalse:D
@@ -1533,8 +1414,6 @@
     { \tl_to_str:n {undefined} }
   }
 \tex_let:D \token_to_meaning:c = \cs_meaning:c
-\tex_let:D \c_minus_one \m@ne
-\tex_chardef:D \c_sixteen = 16 ~
 \tex_chardef:D \c_zero    = 0 ~
 \etex_ifdefined:D \luatex_luatexversion:D
   \tex_chardef:D \c_max_register_int = 65 535 ~
@@ -1885,9 +1764,9 @@
 \cs_set:Npn \cs_if_exist_use:c #1
   { \cs_if_exist:cTF {#1} { \use:c {#1} } { } }
 \cs_set_protected:Npn \iow_log:x
-  { \tex_immediate:D \tex_write:D \c_minus_one }
+  { \tex_immediate:D \tex_write:D -1 }
 \cs_set_protected:Npn \iow_term:x
-  { \tex_immediate:D \tex_write:D \c_sixteen }
+  { \tex_immediate:D \tex_write:D 16 }
 \tex_ifodd:D \l@expl@log@functions@bool
   \cs_set_protected:Npn \__chk_log:x { \iow_log:x }
   \cs_set_protected:Npn \__chk_suspend_log:
@@ -2073,7 +1952,7 @@
     \if_meaning:w \c_true_bool #3
       \tl_count:n {#2}
     \else:
-      \c_minus_one
+      -1
     \fi:
   }
 \cs_new:Npn \__cs_count_signature:c
@@ -2226,38 +2105,7 @@
 \cs_new:Npn \__prg_break: #1 \__prg_break_point: { }
 \cs_new:Npn \__prg_break:n #1#2 \__prg_break_point: {#1}
 %% File: l3expan.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3expan.dtx 6684 2016-08-19 15:21:49Z bruno $
+\GetIdInfo$Id: l3expan.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Argument expansion}
 \cs_new:Npn \__exp_arg_next:nnn #1#2#3 { #2 \::: { #3 {#1} } }
 \cs_new:Npn \__exp_arg_next:Nnn #1#2#3 { #2 \::: { #3 #1 } }
@@ -2706,38 +2554,7 @@
     \__cs_generate_internal_variant_loop:n
   }
 %% File: l3tl.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3tl.dtx 6692 2016-08-19 22:29:47Z bruno $
+\GetIdInfo$Id: l3tl.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Token lists}
 \cs_new_protected:Npn \tl_new:N #1
   {
@@ -2928,7 +2745,7 @@
         \group_begin:
           \exp_args:No \etex_everyeof:D { \c__tl_rescan_marker_tl \exp_not:N }
           \int_compare:nNnT \tex_endlinechar:D = { 32 }
-            { \tex_endlinechar:D \c_minus_one }
+            { \tex_endlinechar:D - \c_one }
           \tex_newlinechar:D \tex_endlinechar:D
           #3 \scan_stop:
           \exp_args:No \__tl_set_rescan:n { \tl_to_str:n {#4} }
@@ -2985,7 +2802,7 @@
     }
   \cs_new_protected:Npn \__tl_set_rescan_single_aux:nn #1#2
     {
-      \tex_endlinechar:D \c_minus_one
+      \tex_endlinechar:D - \c_one
       \use:x
         {
           \exp_not:N \use:n
@@ -3585,18 +3402,17 @@
 \cs_new:Npn \tl_item:nn #1#2
   {
     \exp_args:Nf \__tl_item:nn
-      {
-        \int_eval:n
-          {
-            \int_compare:nNnT {#2} < \c_zero
-              { \tl_count:n {#1} + \c_one + }
-            #2
-          }
-      }
+      { \exp_args:Nf \__tl_item_aux:nn { \int_eval:n {#2} } {#1} }
     #1
     \q_recursion_tail
     \__prg_break_point:
   }
+\cs_new:Npn \__tl_item_aux:nn #1#2
+  {
+    \int_compare:nNnTF {#1} < \c_zero
+      { \int_eval:n { \tl_count:n {#2} + \c_one + #1 } }
+      {#1}
+  }
 \cs_new:Npn \__tl_item:nn #1#2
   {
     \__quark_if_recursion_tail_break:nN {#2} \__prg_break:
@@ -3623,38 +3439,7 @@
 \cs_new_protected:Npn \tl_to_uppercase:n #1
   { \tex_uppercase:D {#1} }
 %% File: l3str.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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3str.dtx 6692 2016-08-19 22:29:47Z bruno $
+\GetIdInfo$Id: l3str.dtx 6809 2017-01-01 06:33:13Z bruno $
   {L3 Strings}
 \group_begin:
   \cs_set_protected:Npn \__str_tmp:n #1
@@ -4041,13 +3826,13 @@
   }
 \cs_new:Npn \str_head:N { \exp_args:No \str_head:n }
 \cs_generate_variant:Nn \str_head:N { c }
-\cs_set:Npn \str_head:n #1
+\cs_new:Npn \str_head:n #1
   {
     \exp_after:wN \__str_head:w
     \tl_to_str:n {#1}
     { { } } ~ \q_stop
   }
-\cs_set:Npn \__str_head:w #1 ~ %
+\cs_new:Npn \__str_head:w #1 ~ %
   { \use_i_delimit_by_q_stop:nw #1 { ~ } }
 \cs_new:Npn \str_head_ignore_spaces:n #1
   {
@@ -4056,13 +3841,13 @@
   }
 \cs_new:Npn \str_tail:N { \exp_args:No \str_tail:n }
 \cs_generate_variant:Nn \str_tail:N { c }
-\cs_set:Npn \str_tail:n #1
+\cs_new:Npn \str_tail:n #1
   {
     \exp_after:wN \__str_tail_auxi:w
     \reverse_if:N \if_charcode:w
         \scan_stop: \tl_to_str:n {#1} X X \q_stop
   }
-\cs_set:Npn \__str_tail_auxi:w #1 X #2 \q_stop { \fi: #1 }
+\cs_new:Npn \__str_tail_auxi:w #1 X #2 \q_stop { \fi: #1 }
 \cs_new:Npn \str_tail_ignore_spaces:n #1
   {
     \exp_after:wN \__str_tail_auxii:w
@@ -4125,9 +3910,9 @@
               { \utex_char:D \use:c { __str_lookup_ #1 :N } #2 ~ }
           }
       }
-    \cs_set_protected:Npn \__str_lookup_lower:N #1 { \tex_lccode:D `#1 }
-    \cs_set_protected:Npn \__str_lookup_upper:N #1 { \tex_uccode:D `#1 }
-    \cs_set_eq:NN \__str_lookup_fold:N \__str_lookup_lower:N
+    \cs_new_protected:Npn \__str_lookup_lower:N #1 { \tex_lccode:D `#1 }
+    \cs_new_protected:Npn \__str_lookup_upper:N #1 { \tex_uccode:D `#1 }
+    \cs_new_eq:NN \__str_lookup_fold:N \__str_lookup_lower:N
   }
   {
     \cs_new:Npn \__str_change_case_char_aux:nN #1#2
@@ -4280,38 +4065,7 @@
     }
 \group_end:
 %% File: l3seq.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3seq.dtx 6685 2016-08-19 16:26:52Z bruno $
+\GetIdInfo$Id: l3seq.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Sequences and stacks}
 \cs_new:Npn \__seq_item:n
   {
@@ -4669,18 +4423,17 @@
 \cs_new:Npn \__seq_item:wNn \s__seq #1 \q_stop #2#3
   {
     \exp_args:Nf \__seq_item:nnn
-      {
-        \int_eval:n
-          {
-            \int_compare:nNnT {#3} < \c_zero
-              { \seq_count:N #2 + \c_one + }
-            #3
-          }
-      }
+      { \exp_args:Nf \__seq_item:nN { \int_eval:n {#3} } #2 }
     #1
     { ? \__prg_break: } { }
     \__prg_break_point:
   }
+\cs_new:Npn \__seq_item:nN #1#2
+  {
+    \int_compare:nNnTF {#1} < \c_zero
+      { \int_eval:n { \seq_count:N #2 + \c_one + #1 } }
+      {#1}
+  }
 \cs_new:Npn \__seq_item:nnn #1#2#3
   {
     \use_none:n #2
@@ -4841,38 +4594,7 @@
 \seq_new:N \g_tmpa_seq
 \seq_new:N \g_tmpb_seq
 %% File: l3int.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3int.dtx 6700 2016-09-07 22:16:49Z bruno $
+\GetIdInfo$Id: l3int.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Integers}
 \cs_new_eq:NN \__int_value:w      \tex_number:D
 \cs_new_eq:NN \__int_eval:w       \etex_numexpr:D
@@ -5020,7 +4742,7 @@
 \cs_new_protected:Npn \int_incr:N #1
   { \tex_advance:D #1 \c_one }
 \cs_new_protected:Npn \int_decr:N #1
-  { \tex_advance:D #1 \c_minus_one }
+  { \tex_advance:D #1 - \c_one }
 \cs_new_protected:Npn \int_gincr:N
   { \tex_global:D \int_incr:N }
 \cs_new_protected:Npn \int_gdecr:N
@@ -5651,6 +5373,8 @@
 \int_const:Nn \c_thirteen { 13 }
 \int_const:Nn \c_fourteen { 14 }
 \int_const:Nn \c_fifteen  { 15 }
+\int_const:Nn \c_sixteen  { 16 }
+\cs_new_eq:NN \c_minus_one \m@ne
 \int_const:Nn \c_thirty_two { 32 }
 \int_const:Nn \c_two_hundred_fifty_five { 255 }
 \int_const:Nn \c_two_hundred_fifty_six  { 256 }
@@ -5672,39 +5396,8 @@
 \int_new:N \l_tmpb_int
 \int_new:N \g_tmpa_int
 \int_new:N \g_tmpb_int
-%% File: l3quark.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3quark.dtx 6685 2016-08-19 16:26:52Z bruno $
+%% File: l3quark.dtx Copyright (C) 1990-2016 The LaTeX3 Project
+\GetIdInfo$Id: l3quark.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Quarks}
 \cs_new_protected:Npn \quark_new:N #1 { \tl_const:Nn #1 {#1} }
 \quark_new:N \q_nil
@@ -5812,39 +5505,8 @@
 \__scan_new:N \s__stop
 \cs_new:Npn \__use_none_delimit_by_s__stop:w #1 \s__stop { }
 \__scan_new:N \s__seq
-%% File: l3prg.dtx Copyright (C) 2005-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3prg.dtx 6679 2016-08-18 20:54:06Z bruno $
+%% File: l3prg.dtx Copyright (C) 2005-2017 The LaTeX3 Project
+\GetIdInfo$Id: l3prg.dtx 6811 2017-01-01 08:50:54Z joseph $
   {L3 Control structures}
 \cs_new_eq:NN \if_bool:N      \tex_ifodd:D
 \cs_new_eq:NN \if_predicate:w \tex_ifodd:D
@@ -6136,42 +5798,10 @@
 \cs_new:Npn \group_align_safe_end:
   { \if_int_compare:w `{ = \c_zero } \fi: }
 \int_new:N \g__prg_map_int
-\cs_new_protected:Npn \scan_align_safe_stop: { }
 %% File: l3clist.dtx Copyright (C) 2004-2011 Frank Mittelbach,
 %%                                 The LaTeX3 project
 %%                             (C) 2012-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3clist.dtx 6685 2016-08-19 16:26:52Z bruno $
+\GetIdInfo$Id: l3clist.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Comma separated lists}
 \cs_new_eq:NN \c_empty_clist \c_empty_tl
 \tl_new:N \l__clist_internal_clist
@@ -6633,27 +6263,28 @@
 \cs_generate_variant:Nn \clist_use:Nn { c }
 \cs_new:Npn \clist_item:Nn #1#2
   {
-    \exp_args:Nfo \__clist_item:nnNn
+    \__clist_item:ffoN
       { \clist_count:N #1 }
+      { \int_eval:n {#2} }
       #1
       \__clist_item_N_loop:nw
-      {#2}
   }
-\cs_new:Npn \__clist_item:nnNn #1#2#3#4
+\cs_new:Npn \__clist_item:nnnN #1#2#3#4
   {
-    \int_compare:nNnTF {#4} < \c_zero
+    \int_compare:nNnTF {#2} < \c_zero
       {
-        \int_compare:nNnTF {#4} < { - #1 }
+        \int_compare:nNnTF {#2} < { - #1 }
           { \use_none_delimit_by_q_stop:w }
-          { \exp_args:Nf #3 { \int_eval:n { #4 + \c_one + #1 } } }
+          { \exp_args:Nf #4 { \int_eval:n { #2 + \c_one + #1 } } }
       }
       {
-        \int_compare:nNnTF {#4} > {#1}
+        \int_compare:nNnTF {#2} > {#1}
           { \use_none_delimit_by_q_stop:w }
-          { #3 {#4} }
+          { #4 {#2} }
       }
-    { } , #2 , \q_stop
+    { } , #3 , \q_stop
   }
+\cs_generate_variant:Nn \__clist_item:nnnN { ffo, ff }
 \cs_new:Npn \__clist_item_N_loop:nw #1 #2,
   {
     \int_compare:nNnTF {#1} = \c_zero
@@ -6663,11 +6294,11 @@
 \cs_generate_variant:Nn \clist_item:Nn { c }
 \cs_new:Npn \clist_item:nn #1#2
   {
-    \exp_args:Nf \__clist_item:nnNn
+    \__clist_item:ffnN
       { \clist_count:n {#1} }
+      { \int_eval:n {#2} }
       {#1}
       \__clist_item_n:nw
-      {#2}
   }
 \cs_new:Npn \__clist_item_n:nw #1
   { \__clist_item_n_loop:nw {#1} \prg_do_nothing: }
@@ -6710,38 +6341,7 @@
 \clist_new:N \g_tmpa_clist
 \clist_new:N \g_tmpb_clist
 %% File: l3token.dtx Copyright (C) 2005-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3token.dtx 6695 2016-09-01 15:38:50Z bruno $
+\GetIdInfo$Id: l3token.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Experimental token manipulation}
 \cs_new_protected:Npn \char_set_catcode:nn #1#2
   {
@@ -6856,7 +6456,7 @@
 \seq_set_split:Nnn \l_char_special_seq { }
   { \  \" \# \$ \% \& \\ \^ \_ \{ \} \~ }
 \seq_new:N \l_char_active_seq
-\seq_set_split:Nnn \l_char_special_seq { }
+\seq_set_split:Nnn \l_char_active_seq { }
   { \" \$ \& \^ \_ \~ }
 \group_begin:
   \char_set_catcode_active:N \^^@
@@ -6865,7 +6465,6 @@
       \cs_new_protected:cpn { #1 :nN } ##1
         {
           \group_begin:
-            \char_set_catcode_active:n { ##1 }
             \char_set_lccode:nn { `\^^@ } { ##1 }
           \tex_lowercase:D { \group_end: #2 ^^@ }
         }
@@ -7478,38 +7077,7 @@
       { \scan_stop: }
   }
 %% File: l3prop.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3prop.dtx 6685 2016-08-19 16:26:52Z bruno $
+\GetIdInfo$Id: l3prop.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Property lists}
 \__scan_new:N \s__prop
 \cs_new:Npn \__prop_pair:wn #1 \s__prop #2
@@ -7781,38 +7349,7 @@
   }
 \cs_generate_variant:Nn \prop_show:N { c }
 %% File: l3msg.dtx Copyright (C) 2009-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3msg.dtx 6691 2016-08-19 22:14:26Z bruno $
+\GetIdInfo$Id: l3msg.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Messages}
 \tl_new:N \l__msg_internal_tl
 \tl_const:Nn \c__msg_text_prefix_tl      { msg~text~>~ }
@@ -7951,7 +7488,7 @@
           }
         \__iow_with:Nnn \tex_newlinechar:D { `\^^J }
           {
-            \__iow_with:Nnn \tex_errorcontextlines:D \c_minus_one
+            \__iow_with:Nnn \tex_errorcontextlines:D { - \c_one }
               {
                 \group_begin:
                   \cs_set_protected:Npn &
@@ -8589,7 +8126,7 @@
       {
         \__iow_with:Nnn \tex_newlinechar:D { 10 }
           {
-            \__iow_with:Nnn \tex_errorcontextlines:D \c_minus_one
+            \__iow_with:Nnn \tex_errorcontextlines:D { - \c_one }
               {
                 \etex_showtokens:D \exp_after:wN \exp_after:wN \exp_after:wN
                   { \exp_after:wN \l__msg_internal_tl }
@@ -8613,38 +8150,7 @@
     \ \ => \ \ \tl_to_str:n {#2}
   }
 %% File: l3file.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3file.dtx 6685 2016-08-19 16:26:52Z bruno $
+\GetIdInfo$Id: l3file.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 File and I/O operations}
 \tl_new:N \g_file_current_name_tl
 \cs_if_exist:NT \@currname
@@ -8660,7 +8166,10 @@
   {
     \group_begin:
       \seq_map_inline:Nn \l_char_active_seq
-        { \char_set:active:Npx ##1 { \cs_to_str:N ##1 } }
+        {
+          \tl_set:Nx \l__file_internal_tl { \iow_char:N ##1 }
+          \char_set_active_eq:NN ##1 \l__file_internal_tl
+        }
       \tl_set:Nx \l__file_internal_name_tl {#1}
       \tl_set:Nx \l__file_internal_name_tl
         { \tl_to_str:N \l__file_internal_name_tl }
@@ -8874,7 +8383,7 @@
   }
 \cs_new_protected:Npn \ior_close:N #1
   {
-    \int_compare:nT { \c_minus_one < #1 < \c_sixteen }
+    \int_compare:nT { - \c_one < #1 < \c_sixteen }
       {
         \tex_closein:D #1
         \prop_gremove:NV \g__ior_streams_prop #1
@@ -8912,11 +8421,11 @@
   }
 \cs_new_protected:Npn \ior_get:NN #1#2
   { \tex_read:D #1 to #2 }
-\cs_new_protected:Npn \ior_get_str:NN #1#2
+\cs_new_protected:Npn \ior_str_get:NN #1#2
   {
     \use:x
       {
-        \int_set_eq:NN \tex_endlinechar:D \c_minus_one
+        \int_set:Nn \tex_endlinechar:D { - \c_one }
         \exp_not:n { \etex_readline:D #1 to #2 }
         \int_set:Nn \tex_endlinechar:D { \int_use:N \tex_endlinechar:D }
       }
@@ -8968,13 +8477,13 @@
   }
 \cs_new_protected:Npn \iow_close:N #1
   {
-    \int_compare:nT { \c_minus_one < #1 < \c_sixteen }
+    \int_compare:nT { - \c_one < #1 < \c_sixteen }
       {
         \tex_immediate:D \tex_closeout:D #1
         \prop_gremove:NV \g__iow_streams_prop #1
         \seq_if_in:NVF \g__iow_streams_seq #1
           { \seq_gpush:NV \g__iow_streams_seq #1 }
-        \cs_gset_eq:NN #1 \c_term_ior
+        \cs_gset_eq:NN #1 \c_term_iow
       }
   }
 \cs_generate_variant:Nn \iow_close:N { c }
@@ -9025,7 +8534,7 @@
 \bool_new:N \l__iow_line_start_bool
 \tl_const:Nx \c_catcode_other_space_tl { \char_generate:nn { `\  } { 12 } }
 \group_begin:
-  \int_set_eq:NN \tex_escapechar:D \c_minus_one
+  \int_set:Nn \tex_escapechar:D { - \c_one }
   \tl_const:Nx \c__iow_wrap_marker_tl
     { \tl_to_str:n { \^^I \^^O \^^W \^^_ \^^W \^^R \^^A \^^P } }
 \group_end:
@@ -9056,7 +8565,7 @@
 \cs_new_protected:Npn \iow_wrap:nnnN #1#2#3#4
   {
     \group_begin:
-      \int_set_eq:NN \tex_escapechar:D \c_minus_one
+      \int_set:Nn \tex_escapechar:D { - \c_one }
       \cs_set:Npx \{ { \token_to_str:N \{ }
       \cs_set:Npx \# { \token_to_str:N \# }
       \cs_set:Npx \} { \token_to_str:N \} }
@@ -9207,40 +8716,10 @@
   }
 \__msg_kernel_new:nnn { kernel } { indent-outside-wrapping-code }
   { Only~\iow_wrap:nnnN~(arg~1)~allows~\iow_indent:n }
+\cs_new_eq:NN \ior_get_str:NN \ior_str_get:NN
 %% File: l3skip.dtx Copyright (C) 2004-2011 Frank Mittelbach, The LaTeX3 Project
 %%                            (C) 2012-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3skip.dtx 6692 2016-08-19 22:29:47Z bruno $
+\GetIdInfo$Id: l3skip.dtx 6809 2017-01-01 06:33:13Z bruno $
   {L3 Dimensions and skips}
 \cs_new_eq:NN \if_dim:w      \tex_ifdim:D
 \cs_new_eq:NN \__dim_eval:w      \etex_dimexpr:D
@@ -9299,7 +8778,7 @@
   }
 \cs_new:Npn \__dim_abs:N #1
   { \if_meaning:w - #1 \else: \exp_after:wN #1 \fi: }
-\cs_set:Npn \dim_max:nn #1#2
+\cs_new:Npn \dim_max:nn #1#2
   {
     \dim_use:N \__dim_eval:w \exp_after:wN \__dim_maxmin:wwN
       \dim_use:N \__dim_eval:w #1 \exp_after:wN ;
@@ -9307,7 +8786,7 @@
       >
     \__dim_eval_end:
   }
-\cs_set:Npn \dim_min:nn #1#2
+\cs_new:Npn \dim_min:nn #1#2
   {
     \dim_use:N \__dim_eval:w \exp_after:wN \__dim_maxmin:wwN
       \dim_use:N \__dim_eval:w #1 \exp_after:wN ;
@@ -9397,7 +8876,7 @@
       { \__dim_case:nw {#1} }
   }
 \cs_new_eq:NN \__dim_case_end:nw \__prg_case_end:nw
-\cs_set:Npn \dim_while_do:nn #1#2
+\cs_new:Npn \dim_while_do:nn #1#2
   {
     \dim_compare:nT {#1}
       {
@@ -9405,7 +8884,7 @@
         \dim_while_do:nn {#1} {#2}
       }
   }
-\cs_set:Npn \dim_until_do:nn #1#2
+\cs_new:Npn \dim_until_do:nn #1#2
   {
     \dim_compare:nF {#1}
       {
@@ -9413,19 +8892,19 @@
         \dim_until_do:nn {#1} {#2}
       }
   }
-\cs_set:Npn \dim_do_while:nn #1#2
+\cs_new:Npn \dim_do_while:nn #1#2
   {
     #2
     \dim_compare:nT {#1}
       { \dim_do_while:nn {#1} {#2} }
   }
-\cs_set:Npn \dim_do_until:nn #1#2
+\cs_new:Npn \dim_do_until:nn #1#2
   {
     #2
     \dim_compare:nF {#1}
       { \dim_do_until:nn {#1} {#2} }
   }
-\cs_set:Npn \dim_while_do:nNnn #1#2#3#4
+\cs_new:Npn \dim_while_do:nNnn #1#2#3#4
   {
     \dim_compare:nNnT {#1} #2 {#3}
       {
@@ -9433,7 +8912,7 @@
         \dim_while_do:nNnn {#1} #2 {#3} {#4}
       }
   }
-\cs_set:Npn \dim_until_do:nNnn #1#2#3#4
+\cs_new:Npn \dim_until_do:nNnn #1#2#3#4
   {
   \dim_compare:nNnF {#1} #2 {#3}
     {
@@ -9441,13 +8920,13 @@
       \dim_until_do:nNnn {#1} #2 {#3} {#4}
     }
   }
-\cs_set:Npn \dim_do_while:nNnn #1#2#3#4
+\cs_new:Npn \dim_do_while:nNnn #1#2#3#4
   {
     #4
     \dim_compare:nNnT {#1} #2 {#3}
       { \dim_do_while:nNnn {#1} #2 {#3} {#4} }
   }
-\cs_set:Npn \dim_do_until:nNnn #1#2#3#4
+\cs_new:Npn \dim_do_until:nNnn #1#2#3#4
   {
     #4
     \dim_compare:nNnF {#1} #2 {#3}
@@ -9646,39 +9125,8 @@
 \muskip_new:N \l_tmpb_muskip
 \muskip_new:N \g_tmpa_muskip
 \muskip_new:N \g_tmpb_muskip
-%% File: l3keys.dtx Copyright (C) 2006-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3keys.dtx 6711 2016-09-21 07:04:35Z joseph $
+%% File: l3keys.dtx Copyright (C) 2006-2017 The LaTeX3 Project
+\GetIdInfo$Id: l3keys.dtx 6811 2017-01-01 08:50:54Z joseph $
   {L3 Key-value interfaces}
 \tl_new:N \l__keyval_key_tl
 \tl_new:N \l__keyval_value_tl
@@ -9812,7 +9260,8 @@
 \tl_const:Nn \c__keys_code_root_tl     { key~code~>~ }
 \tl_const:Nn \c__keys_default_root_tl  { key~default~>~ }
 \tl_const:Nn \c__keys_groups_root_tl   { key~groups~>~ }
-\tl_const:Nn \c__keys_info_root_tl     { key~info~>~ }
+\tl_const:Nn \c__keys_inherit_root_tl  { key~inherit~>~ }
+\tl_const:Nn \c__keys_type_root_tl     { key~type~>~ }
 \tl_const:Nn \c__keys_validate_root_tl { key~validate~>~ }
 \tl_const:Nn \c__keys_props_root_tl { key~prop~>~ }
 \int_new:N \l_keys_choice_int
@@ -9877,7 +9326,12 @@
       {
         \str_if_eq:nnTF {#3} { . }
           {
-            \tl_set:Nx \l_keys_path_tl { \l__keys_module_tl / #1 }
+            \tl_set:Nx \l_keys_path_tl
+              {
+                \tl_if_empty:NF \l__keys_module_tl
+                  { \l__keys_module_tl  / }
+                #1
+              }
             \tl_set:Nn \l__keys_property_tl { . #2 }
           }
           {
@@ -9919,20 +9373,6 @@
       ##1 \c_colon_str ##2 \exp_not:N \q_stop
   }
   { \tl_if_empty:nTF {#2} }
-\cs_new_protected:Npn \__keys_ensure_exist:n #1
-  {
-    \prop_if_exist:cF { \c__keys_info_root_tl #1 }
-      {
-        \prop_set_eq:cN { \c__keys_info_root_tl #1 } \c_empty_prop
-      }
-
-    \cs_if_exist:cF { \c__keys_code_root_tl #1 }
-      {
-        \__chk_log:x { Defining~key~#1~ \msg_line_context: }
-        \cs_set_protected:cpn { \c__keys_code_root_tl #1 } ##1 { }
-      }
-  }
-\cs_generate_variant:Nn \__keys_ensure_exist:n { V }
 \cs_new_protected:Npn \__keys_bool_set:Nn #1#2
   {
     \bool_if_exist:NF #1 { \bool_new:N #1 }
@@ -9971,12 +9411,12 @@
   { \__keys_choice_make:N \__keys_multichoice_find:n }
 \cs_new_protected:Npn \__keys_choice_make:N #1
   {
-    \prop_if_exist:cTF
-      { \c__keys_info_root_tl \__keys_parent:o \l_keys_path_tl }
+    \cs_if_exist:cTF
+      { \c__keys_type_root_tl \__keys_parent:o \l_keys_path_tl }
       {
-        \prop_get:cnNTF
-          { \c__keys_info_root_tl \__keys_parent:o \l_keys_path_tl }
-          { choice } \l_keys_value_tl
+        \str_if_eq_x:nnTF
+          { \exp_not:v { \c__keys_type_root_tl \__keys_parent:o \l_keys_path_tl } }
+          { choice }
           {
             \__msg_kernel_error:nnxx { kernel } { nested-choice-key }
               { \l_keys_path_tl } { \__keys_parent:o \l_keys_path_tl }
@@ -9987,26 +9427,14 @@
   }
 \cs_new_protected:Npn \__keys_choice_make_aux:N #1
   {
+    \cs_set_nopar:cpn { \c__keys_type_root_tl \l_keys_path_tl } { choice }
     \__keys_cmd_set:nn { \l_keys_path_tl } { #1 {##1} }
-    \prop_put:cnn { \c__keys_info_root_tl \l_keys_path_tl } { choice }
-      { true }
     \__keys_cmd_set:nn { \l_keys_path_tl / unknown }
       {
         \__msg_kernel_error:nnxx { kernel } { key-choice-unknown }
           { \l_keys_path_tl } {##1}
       }
   }
-\cs_new:Npn \__keys_parent:n #1
-  { \__keys_parent:wn #1 / / \q_stop { } }
-\cs_generate_variant:Nn \__keys_parent:n { o }
-\cs_new:Npn \__keys_parent:wn #1 / #2 / #3 \q_stop #4
-  {
-    \tl_if_blank:nTF {#2}
-      { \use_none:n #4 }
-      {
-        \__keys_parent:wn #2 / #3 \q_stop { #4 / #1 }
-      }
-  }
 \cs_new_protected:Npn \__keys_choices_make:nn
   { \__keys_choices_make:Nnn \__keys_choice_make: }
 \cs_new_protected:Npn \__keys_multichoices_make:nn
@@ -10029,7 +9457,8 @@
   }
 \cs_new_protected:Npn \__keys_cmd_set:nn #1#2
   {
-    \__keys_ensure_exist:V \l_keys_path_tl
+    \cs_if_exist:cF { \c__keys_code_root_tl #1 }
+      { \__chk_log:x { Defining~key~#1~\msg_line_context: } }
     \cs_set_protected:cpn { \c__keys_code_root_tl #1 } ##1 {#2}
   }
 \cs_generate_variant:Nn \__keys_cmd_set:nn { nx , Vn , Vo }
@@ -10049,18 +9478,22 @@
   }
 \cs_new_protected:Npn \__keys_groups_set:n #1
   {
-    \__keys_ensure_exist:V \l_keys_path_tl
     \clist_set:Nn \l__keys_groups_clist {#1}
     \clist_if_empty:NTF \l__keys_groups_clist
       {
-        \prop_remove:cn { \c__keys_info_root_tl \l_keys_path_tl }
-          { groups }
+        \cs_set_eq:cN { \c__keys_groups_root_tl \l_keys_path_tl }
+          \tex_undefined:D
       }
       {
-        \prop_put:cnV { \c__keys_info_root_tl \l_keys_path_tl }
-          { groups } \l__keys_groups_clist
+        \clist_set_eq:cN { \c__keys_groups_root_tl \l_keys_path_tl }
+          \l__keys_groups_clist
       }
   }
+\cs_new_protected:Npn \__keys_inherit:n #1
+  {
+    \__keys_undefine:
+    \cs_set_nopar:cpn { \c__keys_inherit_root_tl \l_keys_path_tl } {#1}
+  }
 \cs_new_protected:Npn \__keys_initialise:n #1
   {
     \cs_if_exist_use:cT { \c__keys_code_root_tl \l_keys_path_tl } { {#1} }
@@ -10078,7 +9511,7 @@
 \cs_new_protected:Npn \__keys_undefine:
   {
     \clist_map_inline:nn
-      { code , default , groups , info , validate }
+      { code , default , groups , inherit , type , validate }
       {
         \cs_set_eq:cN
           { \tl_use:c { c__keys_ ##1 _root_tl } \l_keys_path_tl }
@@ -10204,6 +9637,8 @@
   { \__keys_variable_set:cnnN {#1} { fp } { g } n }
 \cs_new_protected:cpn { \c__keys_props_root_tl .groups:n } #1
   { \__keys_groups_set:n {#1} }
+\cs_new_protected:cpn { \c__keys_props_root_tl .inherit:n } #1
+  { \__keys_inherit:n {#1} }
 \cs_new_protected:cpn { \c__keys_props_root_tl .initial:n } #1
   { \__keys_initialise:n {#1} }
 \cs_new_protected:cpn { \c__keys_props_root_tl .initial:V } #1
@@ -10333,7 +9768,12 @@
   }
 \cs_new_protected:Npn \__keys_set_aux:nnn #1#2#3
   {
-    \tl_set:Nx \l_keys_path_tl { #1 / \__keys_remove_spaces:n {#2} }
+    \tl_set:Nx \l_keys_path_tl
+      {
+        \tl_if_blank:nF {#1}
+          { #1 / }
+        \__keys_remove_spaces:n {#2}
+      }
     \tl_clear:N \l__keys_module_tl
     \exp_after:wN \__keys_find_key_module:w \l_keys_path_tl / \q_stop
     \__keys_value_or_default:n {#3}
@@ -10358,16 +9798,11 @@
   }
 \cs_new_protected:Npn \__keys_set_selective:
   {
-    \prop_if_exist:cTF { \c__keys_info_root_tl \l_keys_path_tl }
+    \cs_if_exist:cTF { \c__keys_groups_root_tl \l_keys_path_tl }
       {
-        \prop_get:cnNTF { \c__keys_info_root_tl \l_keys_path_tl }
-          { groups } \l__keys_groups_clist
-          { \__keys_check_groups: }
-          {
-            \bool_if:NTF \l__keys_filtered_bool
-              { \__keys_execute: }
-              { \__keys_store_unused: }
-          }
+        \clist_set_eq:Nc \l__keys_groups_clist
+          { \c__keys_groups_root_tl \l_keys_path_tl }
+        \__keys_check_groups:
       }
       {
         \bool_if:NTF \l__keys_filtered_bool
@@ -10430,23 +9865,41 @@
     \bool_if:NTF \l__keys_only_known_bool
       { \__keys_store_unused: }
       {
-        \cs_if_exist:cTF { \c__keys_code_root_tl \l__keys_module_tl / unknown }
+        \cs_if_exist:cTF
+          { \c__keys_inherit_root_tl \__keys_parent:o \l_keys_path_tl }
           {
-            \cs:w \c__keys_code_root_tl \l__keys_module_tl / unknown \exp_after:wN
-              \cs_end: \exp_after:wN { \l_keys_value_tl }
+            \clist_map_inline:cn
+              { \c__keys_inherit_root_tl \__keys_parent:o \l_keys_path_tl }
+              {
+                \cs_if_exist:cT
+                  { \c__keys_code_root_tl ##1 / \l_keys_key_tl }
+                  {
+                    \cs:w \c__keys_code_root_tl ##1 / \l_keys_key_tl
+                      \exp_after:wN \cs_end: \exp_after:wN
+                      { \l_keys_value_tl }
+                    \clist_map_break:
+                  }
+              }
           }
           {
-            \__msg_kernel_error:nnxx { kernel } { key-unknown }
-              { \l_keys_path_tl } { \l__keys_module_tl }
+            \cs_if_exist:cTF { \c__keys_code_root_tl \l__keys_module_tl / unknown }
+              {
+                \cs:w \c__keys_code_root_tl \l__keys_module_tl / unknown
+                  \exp_after:wN \cs_end: \exp_after:wN { \l_keys_value_tl }
+              }
+              {
+                \__msg_kernel_error:nnxx { kernel } { key-unknown }
+                  { \l_keys_path_tl } { \l__keys_module_tl }
+              }
           }
-      }
+       }
   }
 \cs_new:Npn \__keys_execute:nn #1#2
   {
     \cs_if_exist:cTF { \c__keys_code_root_tl #1 }
       {
-        \exp_args:Nc \exp_args:No { \c__keys_code_root_tl #1 }
-          \l_keys_value_tl
+        \cs:w \c__keys_code_root_tl #1 \exp_after:wN \cs_end:
+          \exp_after:wN { \l_keys_value_tl }
       }
       {#2}
   }
@@ -10466,6 +9919,17 @@
   }
 \cs_new:Npn \__keys_multichoice_find:n #1
   { \clist_map_function:nN {#1} \__keys_choice_find:n }
+\cs_new:Npn \__keys_parent:n #1
+  { \__keys_parent:w #1 / / \q_stop { } }
+\cs_generate_variant:Nn \__keys_parent:n { o }
+\cs_new:Npn \__keys_parent:w #1 / #2 / #3 \q_stop #4
+  {
+    \tl_if_blank:nTF {#2}
+      { \use_none:n #4 }
+      {
+        \__keys_parent:w #2 / #3 \q_stop { #4 / #1 }
+      }
+  }
 \cs_new:Npn \__keys_remove_spaces:n #1
   {
     \exp_after:wN \__keys_remove_spaces:w \tl_to_str:n {#1}
@@ -10494,9 +9958,8 @@
       {
         \__msg_show_pre:nnxxxx { LaTeX / kernel } { show-key }
           { \__keys_remove_spaces:n { #1 / #2 } } { t } { } { }
-        \exp_args:Ncc \__keys_show:NN
+        \exp_args:Nc \__keys_show:N
           { \c__keys_code_root_tl \__keys_remove_spaces:n { #1 / #2 } }
-          { \c__keys_info_root_tl \__keys_remove_spaces:n { #1 / #2 } }
       }
       {
         \__msg_show_pre:nnxxxx { LaTeX / kernel } { show-key }
@@ -10504,7 +9967,7 @@
         \__msg_show_wrap:n { }
       }
   }
-\cs_new_protected:Npn \__keys_show:NN #1#2
+\cs_new_protected:Npn \__keys_show:N #1
   {
     \use:x
       {
@@ -10512,8 +9975,6 @@
           {
             \exp_not:N \__msg_show_item_unbraced:nn { code }
               { \token_get_replacement_spec:N #1 }
-            \exp_not:n
-              { \prop_map_function:NN #2 \__msg_show_item_unbraced:nn }
           }
       }
   }
@@ -10586,78 +10047,10 @@
       { has~the~properties: }
       { is~undefined. }
   }
-\cs_new_protected:cpn { \c__keys_props_root_tl .value_forbidden: }
-  { \__keys_value_requirement:nn { forbidden } { true } }
-\cs_new_protected:cpn { \c__keys_props_root_tl .value_required: }
-  { \__keys_value_requirement:nn { required } { true } }
 %% File: l3fp.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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-\GetIdInfo$Id: l3fp.dtx 6761 2016-11-21 21:48:43Z joseph $
+\GetIdInfo$Id: l3fp.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Floating points}
 %% File: l3fp-aux.dtx Copyright(C) 2011-2014,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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
 \cs_new:Npn \__fp_use_none_stop_f:n #1 { \exp_stop_f: }
 \cs_new:Npn \__fp_use_s:n #1 { #1; }
 \cs_new:Npn \__fp_use_s:nn #1#2 { #1#2; }
@@ -10962,40 +10355,7 @@
     '\token_to_str:N \fp_to_scientific:N',~or~other~
     conversion~functions.
   }
-%%
 %% File: l3fp-traps.dtx Copyright (C) 2011-2014,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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
 \cs_new_protected:Npn \fp_flag_off:n #1
   { \cs_set_eq:cN { l__fp_ #1 _flag_token } \tex_undefined:D }
 \cs_new:Npn \fp_flag_on:n #1
@@ -11176,38 +10536,6 @@
 \__msg_kernel_new:nnn { kernel } { fp-invalid-ii }
   { Invalid~operation~ (#1) #3 (#2) }
 %% File: l3fp-round.dtx Copyright(C) 2011-2012,2014-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
 \cs_new:Npn \__fp_round_return_one:
   { \exp_after:wN \c_one \exp:w }
 \cs_new:Npn \__fp_round_to_ninf:NNN #1 #2 #3
@@ -11463,38 +10791,21 @@
     \__fp_sanitize:Nw #1#2; {1000}{0000}{0000}{0000};
   }
 %% File: l3fp-parse.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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
+\int_const:Nn \c__fp_prec_funcii_int { 16 }
+\int_const:Nn \c__fp_prec_func_int   { 15 }
+\int_const:Nn \c__fp_prec_hatii_int  { 14 }
+\int_const:Nn \c__fp_prec_hat_int    { 13 }
+\int_const:Nn \c__fp_prec_not_int    { 12 }
+\int_const:Nn \c__fp_prec_times_int  { 10 }
+\int_const:Nn \c__fp_prec_plus_int   { 9 }
+\int_const:Nn \c__fp_prec_comp_int   { 7 }
+\int_const:Nn \c__fp_prec_and_int    { 6 }
+\int_const:Nn \c__fp_prec_or_int     { 5 }
+\int_const:Nn \c__fp_prec_quest_int  { 4 }
+\int_const:Nn \c__fp_prec_colon_int  { 3 }
+\int_const:Nn \c__fp_prec_comma_int  { 2 }
+\int_const:Nn \c__fp_prec_paren_int  { 1 }
+\int_const:Nn \c__fp_prec_end_int    { 0 }
 \cs_new:Npn \__fp_parse_expand:w #1 { \exp_end_continue_f:w #1 }
 \cs_new:Npn \__fp_parse_return_semicolon:w
     #1 \fi: \__fp_parse_expand:w { \fi: ; #1 }
@@ -12097,8 +11408,8 @@
         \__fp_parse_expand:w
       }
   }
-\__fp_tmp:w - \c_twelve \__fp_set_sign_o:w 2
-\__fp_tmp:w ! \c_twelve \__fp_not_o:w ?
+\__fp_tmp:w - \c__fp_prec_not_int \__fp_set_sign_o:w 2
+\__fp_tmp:w ! \c__fp_prec_not_int \__fp_not_o:w ?
 \cs_new:cpn { __fp_parse_prefix_.:Nw } #1
   {
     \exp_after:wN \__fp_parse_infix_after_operand:NwN
@@ -12115,10 +11426,10 @@
       \exp_after:wN \__fp_parse_lparen_after:NwN
       \exp_after:wN #1
       \exp:w
-      \if_int_compare:w #1 = \c_sixteen
-        \__fp_parse_operand:Nw \c_one
+      \if_int_compare:w #1 = \c__fp_prec_funcii_int
+        \__fp_parse_operand:Nw \c__fp_prec_comma_int
       \else:
-        \__fp_parse_operand:Nw \c_zero
+        \__fp_parse_operand:Nw \c__fp_prec_paren_int
       \fi:
       \__fp_parse_expand:w
     }
@@ -12138,23 +11449,9 @@
         }
     }
 \group_end:
-\cs_new:cpn { __fp_parse_prefix_,:Nw } #1
-  {
-    \if_int_compare:w #1 = \c_one
-      \exp_after:wN \__fp_parse_one:Nw
-      \exp_after:wN #1
-    \else:
-      \__msg_kernel_expandable_error:nnn
-        { kernel } { fp-missing-number } { , }
-      \exp_after:wN \c_nan_fp \exp:w \exp_end_continue_f:w
-      \exp_after:wN \__fp_parse_infix:NN
-      \exp_after:wN #1
-      \exp_after:wN ,
-    \fi:
-  }
 \cs_new:cpn { __fp_parse_prefix_):Nw } #1
   {
-    \if_int_compare:w #1 = \c_one
+    \if_int_compare:w #1 = \c__fp_prec_comma_int
     \else:
       \__msg_kernel_expandable_error:nnn
         { kernel } { fp-missing-number } { ) }
@@ -12209,7 +11506,7 @@
     \exp_after:wN #2
     \cs:w __fp_#1_o:w \exp_after:wN \cs_end:
     \exp:w
-    \__fp_parse_operand:Nw \c_fifteen \__fp_parse_expand:w
+    \__fp_parse_operand:Nw \c__fp_prec_func_int \__fp_parse_expand:w
   }
 \cs_new:Npn \__fp_parse_function:NNN #1#2#3
   {
@@ -12218,7 +11515,7 @@
     \exp_after:wN #2
     \exp_after:wN #1
     \exp:w
-    \__fp_parse_operand:Nw \c_sixteen \__fp_parse_expand:w
+    \__fp_parse_operand:Nw \c__fp_prec_funcii_int \__fp_parse_expand:w
   }
 \cs_new:Npn \__fp_parse_word_acot:N
   { \__fp_parse_function:NNN \__fp_acot_o:Nw \use_i:nn }
@@ -12285,7 +11582,7 @@
     \exp:w
       \exp_after:wN \__fp_parse_after:ww
       \exp:w
-        \__fp_parse_operand:Nw \c_minus_one
+        \__fp_parse_operand:Nw \c__fp_prec_end_int
         \__fp_parse_expand:w #1
         \s__fp_mark \__fp_parse_infix_end:N
       \s__fp_stop
@@ -12377,7 +11674,7 @@
   \char_set_catcode_letter:N \)
   \cs_new:Npn \__fp_parse_infix_):N #1
     {
-      \if_int_compare:w #1 < \c_zero
+      \if_int_compare:w #1 < \c__fp_prec_paren_int
         \__msg_kernel_expandable_error:nnn { kernel } { fp-extra } { ) }
         \exp_after:wN \__fp_parse_infix:NN
         \exp_after:wN #1
@@ -12393,28 +11690,38 @@
   \char_set_catcode_letter:N \,
   \cs_new:Npn \__fp_parse_infix_,:N #1
     {
-      \if_int_compare:w #1 > \c_one
+      \if_int_compare:w #1 > \c__fp_prec_comma_int
         \exp_after:wN @
         \exp_after:wN \use_none:n
         \exp_after:wN \__fp_parse_infix_,:N
       \else:
-        \if_int_compare:w #1 = \c_one
-          \exp_after:wN \__fp_parse_infix_comma:w
-          \exp:w
-        \else:
-          \exp_after:wN \__fp_parse_infix_comma_gobble:w
-          \exp:w
+        \if_int_compare:w #1 < \c__fp_prec_comma_int
+          \__fp_parse_infix_comma_error:w
         \fi:
-        \__fp_parse_operand:Nw \c_one
+        \exp_after:wN \__fp_parse_infix_comma:w
+        \exp:w \__fp_parse_operand:Nw \c__fp_prec_comma_int
         \exp_after:wN \__fp_parse_expand:w
       \fi:
     }
   \cs_new:Npn \__fp_parse_infix_comma:w #1 @
     { #1 @ \use_none:n }
-  \cs_new:Npn \__fp_parse_infix_comma_gobble:w #1 @
+  \cs_new:Npn \__fp_parse_infix_comma_error:w #1 \exp:w
     {
+      \fi:
       \__msg_kernel_expandable_error:nn { kernel } { fp-extra-comma }
-      @ \use_none:n
+      \exp_after:wN @
+      \exp_after:wN \__fp_parse_apply_binary:NwNwN
+      \exp_after:wN ,
+      \exp:w
+    }
+  \cs_new:Npn \__fp_,_o:ww #1
+    {
+      \if_meaning:w \s__fp #1
+        \exp_after:wN \__fp_use_i_until_s:nw
+        \exp_after:wN \__fp_,_o:ww
+      \fi:
+      \exp_after:wN \c_nan_fp
+      #1
     }
 \group_end:
 \group_begin:
@@ -12442,23 +11749,23 @@
           \fi:
         }
     }
-  \__fp_tmp:w \__fp_parse_infix_^:N   ^ \c_fifteen \c_fourteen
-  \__fp_tmp:w \__fp_parse_infix_/:N   / \c_ten     \c_ten
-  \__fp_tmp:w \__fp_parse_infix_mul:N * \c_ten     \c_ten
-  \__fp_tmp:w \__fp_parse_infix_-:N   - \c_nine    \c_nine
-  \__fp_tmp:w \__fp_parse_infix_+:N   + \c_nine    \c_nine
-  \__fp_tmp:w \__fp_parse_infix_and:N & \c_five    \c_five
-  \__fp_tmp:w \__fp_parse_infix_or:N  | \c_four    \c_four
+  \__fp_tmp:w \__fp_parse_infix_^:N   ^ \c__fp_prec_hatii_int \c__fp_prec_hat_int
+  \__fp_tmp:w \__fp_parse_infix_/:N   / \c__fp_prec_times_int \c__fp_prec_times_int
+  \__fp_tmp:w \__fp_parse_infix_mul:N * \c__fp_prec_times_int \c__fp_prec_times_int
+  \__fp_tmp:w \__fp_parse_infix_-:N   - \c__fp_prec_plus_int  \c__fp_prec_plus_int
+  \__fp_tmp:w \__fp_parse_infix_+:N   + \c__fp_prec_plus_int  \c__fp_prec_plus_int
+  \__fp_tmp:w \__fp_parse_infix_and:N & \c__fp_prec_and_int   \c__fp_prec_and_int
+  \__fp_tmp:w \__fp_parse_infix_or:N  | \c__fp_prec_or_int    \c__fp_prec_or_int
 \group_end:
 \cs_new:cpn { __fp_parse_infix_(:N } #1
   { \__fp_parse_infix_juxtapose:N #1 ( }
 \cs_new:Npn \__fp_parse_infix_juxtapose:N #1
   {
-    \if_int_compare:w #1 < \c_ten
+    \if_int_compare:w #1 < \c__fp_prec_times_int
       \exp_after:wN @
       \exp_after:wN \__fp_parse_apply_juxtapose:NwwN
       \exp:w
-      \__fp_parse_operand:Nw \c_ten
+      \__fp_parse_operand:Nw \c__fp_prec_times_int
       \exp_after:wN \__fp_parse_expand:w
     \else:
       \exp_after:wN @
@@ -12523,11 +11830,11 @@
   \char_set_catcode_letter:N \?
   \cs_new:Npn \__fp_parse_infix_?:N #1
     {
-      \if_int_compare:w #1 < \c_three
+      \if_int_compare:w #1 < \c__fp_prec_quest_int
         \exp_after:wN @
         \exp_after:wN \__fp_ternary:NwwN
         \exp:w
-        \__fp_parse_operand:Nw \c_three
+        \__fp_parse_operand:Nw \c__fp_prec_quest_int
         \exp_after:wN \__fp_parse_expand:w
       \else:
         \exp_after:wN @
@@ -12537,13 +11844,13 @@
     }
   \cs_new:Npn \__fp_parse_infix_::N #1
     {
-      \if_int_compare:w #1 < \c_three
+      \if_int_compare:w #1 < \c__fp_prec_quest_int
         \__msg_kernel_expandable_error:nnnn
           { kernel } { fp-missing } { ? } { ~for~?: }
         \exp_after:wN @
         \exp_after:wN \__fp_ternary_auxii:NwwN
         \exp:w
-        \__fp_parse_operand:Nw \c_two
+        \__fp_parse_operand:Nw \c__fp_prec_colon_int
         \exp_after:wN \__fp_parse_expand:w
       \else:
         \exp_after:wN @
@@ -12584,7 +11891,7 @@
   }
 \cs_new:Npn \__fp_parse_compare:NNNNNNN #1
   {
-    \if_int_compare:w #1 < \c_seven
+    \if_int_compare:w #1 < \c__fp_prec_comp_int
       \exp_after:wN \__fp_parse_compare_auxi:NNNNNNN
       \exp_after:wN \__fp_parse_excl_error:
     \else:
@@ -12597,7 +11904,7 @@
   {
     \if_case:w
           \if_catcode:w \scan_stop: \exp_not:N #7
-            \c_minus_one
+            \c_four
           \else:
             \__int_eval:w `#7 - `< \__int_eval_end:
           \fi:
@@ -12630,7 +11937,7 @@
     \exp_after:wN #3
     \exp_after:wN #4
     \exp:w
-    \__fp_parse_operand:Nw \c_seven \__fp_parse_expand:w #5
+    \__fp_parse_operand:Nw \c__fp_prec_comp_int \__fp_parse_expand:w #5
   }
 \cs_new:Npn \__fp_parse_apply_compare:NwNNNNNwN
     #1 #2@ #3 #4#5#6#7 #8@ #9
@@ -12676,7 +11983,7 @@
     \exp_after:wN \__fp_function_apply:nw
     \exp_after:wN #1
     \exp:w
-      \__fp_parse_operand:Nw \c_sixteen \__fp_parse_expand:w
+      \__fp_parse_operand:Nw \c__fp_prec_funcii_int \__fp_parse_expand:w
   }
 \cs_new_protected:Npn \fp_new_function:Npn #1#2#
   {
@@ -12696,7 +12003,7 @@
             \__int_value:w #3 \exp_after:wN ; \exp_after:wN
           }
         \exp:w
-          \__fp_parse_operand:Nw \c_sixteen \__fp_parse_expand:w
+          \__fp_parse_operand:Nw \c__fp_prec_funcii_int \__fp_parse_expand:w
       }
     \cs_new:Npn #2 #4 {#5}
   }
@@ -12752,38 +12059,6 @@
       { Robust~command~#1 invalid~in~fp~expression! }
   }
 %% File: l3fp-logic.dtx Copyright (C) 2011-2014,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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
 \prg_new_eq_conditional:NNn \fp_if_exist:N \cs_if_exist:N { TF , T , F , p }
 \prg_new_eq_conditional:NNn \fp_if_exist:c \cs_if_exist:c { TF , T , F , p }
 \prg_new_conditional:Npnn \fp_compare:n #1 { p , T , F , TF }
@@ -12922,36 +12197,47 @@
 \cs_new:Npn \fp_step_function:nnnN #1#2#3
   {
     \exp_after:wN \__fp_step:wwwN
-      \exp:w \exp_end_continue_f:w \__fp_parse_o:n {#1} :
-      \exp:w \exp_end_continue_f:w \__fp_parse_o:n {#2} :
-      \exp:w \exp_end_continue_f:w \__fp_parse:n {#3} :
+      \exp:w \exp_end_continue_f:w \__fp_parse_o:n {#1}
+      \exp:w \exp_end_continue_f:w \__fp_parse_o:n {#2}
+      \exp:w \exp_end_continue_f:w \__fp_parse:n {#3}
   }
 \cs_generate_variant:Nn \fp_step_function:nnnN { nnnc }
-\cs_new:Npn \__fp_step:wwwN #1 : #2 : #3 : #4
+\cs_new:Npn \__fp_step:wwwN #1 ; \s__fp \__fp_chk:w #2#3#4 ; #5; #6
   {
-    \fp_compare:nNnTF {#2} > 0
-      { \__fp_step:NfnnN > }
+    \token_if_eq_meaning:NNTF #2 1
       {
-        \fp_compare:nNnTF {#2} = 0
+        \token_if_eq_meaning:NNTF #3 0
+          { \__fp_step:NnnnnN > }
+          { \__fp_step:NnnnnN < }
+      }
+      {
+        \token_if_eq_meaning:NNTF #2 0
+          { \__msg_kernel_expandable_error:nnn { kernel } { zero-step } {#6} }
           {
-            \__msg_kernel_expandable_error:nnn { kernel } { zero-step } {#4}
-            \use_none:nnnn
+            \__fp_error:nnfn { bad-step } { }
+              { \fp_to_tl:n { \s__fp \__fp_chk:w #2#3#4 ; } } {#6}
           }
-          { \__fp_step:NfnnN < }
+        \use_none:nnnnn
       }
-      { \fp_eval:n {#1} } {#2} {#3} #4
+      { #1 ; } { \c_nan_fp } { \s__fp \__fp_chk:w #2#3#4 ; } { #5 ; } #6
   }
-
-\cs_new:Npn \__fp_step:NnnnN #1#2#3#4#5
+\cs_new:Npn \__fp_step:NnnnnN #1#2#3#4#5#6
   {
-    \fp_compare:nNnF {#2} #1 {#4}
+    \fp_compare:nNnTF {#2} = {#3}
       {
-        #5 {#2}
-        \__fp_step:NfnnN
-          #1 { \fp_eval:n { #2 + #3 } } {#3} {#4} #5
+        \__fp_error:nffn { tiny-step }
+          { \fp_to_tl:n {#3} } { \fp_to_tl:n {#4} } {#6}
+      }
+      {
+        \fp_compare:nNnF {#2} #1 {#5}
+          {
+            \exp_args:Nf #6 { \__fp_to_decimal_dispatch:w #2 }
+            \__fp_step:NfnnnN
+              #1 { \__fp_parse:n { #2 + #4 } } {#2} {#4} {#5} #6
+          }
       }
   }
-\cs_generate_variant:Nn \__fp_step:NnnnN { Nf }
+\cs_generate_variant:Nn \__fp_step:NnnnnN { Nf }
 \cs_new_protected:Npn \fp_step_inline:nnnn #1#2#3#4
   {
     \int_gincr:N \g__prg_map_int
@@ -12961,12 +12247,16 @@
       { __prg_map_ \int_use:N \g__prg_map_int :w }
     \__prg_break_point:Nn \scan_stop: { \int_gdecr:N \g__prg_map_int }
   }
+\__msg_kernel_new:nnn { kernel } { fp-bad-step }
+  { Invalid~step~size~#2~in~step~function~#3. }
+\__msg_kernel_new:nnn { kernel } { fp-tiny-step }
+  { Tiny~step~size~(#1+#2=#1)~in~step~function~#3. }
 \cs_new:Npn \__fp_minmax_o:Nw #1#2 @
   {
     \if_meaning:w 0 #1
-      \exp_after:wN \__fp_minmax_loop:Nww \exp_after:wN \c_one
+      \exp_after:wN \__fp_minmax_loop:Nww \exp_after:wN +
     \else:
-      \exp_after:wN \__fp_minmax_loop:Nww \exp_after:wN \c_minus_one
+      \exp_after:wN \__fp_minmax_loop:Nww \exp_after:wN -
     \fi:
     #2
     \s__fp \__fp_chk:w 2 #1 \s__fp_exact ;
@@ -12986,7 +12276,7 @@
           \__fp_compare_back:ww
             \s__fp \__fp_chk:w #4#5;
             \s__fp \__fp_chk:w #2#3;
-          = #1
+          = #1 \c_one
         \__fp_minmax_auxii:ww
       \else:
         \__fp_minmax_auxi:ww
@@ -13035,7 +12325,7 @@
       \__fp_exp_after_array_f:w #3 \s__fp_stop
       \exp_after:wN @
       \exp:w
-        \__fp_parse_operand:Nw \c_two
+        \__fp_parse_operand:Nw \c__fp_prec_colon_int
         \__fp_parse_expand:w
     \else:
       \__msg_kernel_expandable_error:nnnn
@@ -13079,38 +12369,6 @@
     #4 #1
   }
 %% File: l3fp-basics.dtx Copyright (C) 2011-2014,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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
 \cs_new:Npn \__fp_basics_pack_low:NNNNNw #1 #2#3#4#5 #6;
   { + #1 - \c_one ; {#2#3#4#5} {#6} ; }
 \cs_new:Npn \__fp_basics_pack_high:NNNNNw #1 #2#3#4#5 #6;
@@ -13147,7 +12405,7 @@
         \if_int_compare:w #2 > #4 \exp_stop_f:
           \c_three
         \else:
-          \c_minus_one
+          \c_four
         \fi:
       \fi:
            \exp_after:wN \__fp_add_zeros_o:Nww \__int_value:w
@@ -13879,38 +13137,6 @@
     #4;
   }
 %% File: l3fp-extended.dtx Copyright (C) 2011-2014,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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
 \tl_const:Nn \c__fp_one_fixed_tl
   { {10000} {0000} {0000} {0000} {0000} {0000} }
 \cs_new:Npn \__fp_fixed_continue:wn #1; #2 { #2 #1; }
@@ -13955,7 +13181,7 @@
   {
     \exp_after:wN \__fp_fixed_div_int_after:Nw
     \exp_after:wN #8
-    \__int_value:w \__int_eval:w \c_minus_one
+    \__int_value:w \__int_eval:w - \c_one
       \__fp_fixed_div_int:wnN
       #1; {#7} \__fp_fixed_div_int_auxi:wnn
       #2; {#7} \__fp_fixed_div_int_auxi:wnn
@@ -14348,38 +13574,6 @@
       \__int_value:w \__int_eval:w 1 #3#4 + \c_one ;
   }
 %% File: l3fp-expo.dtx Copyright (C) 2011-2014,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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
 \tl_const:Nn \c__fp_ln_i_fixed_tl   { {0000}{0000}{0000}{0000}{0000}{0000} }
 \tl_const:Nn \c__fp_ln_ii_fixed_tl  { {6931}{4718}{0559}{9453}{0941}{7232} }
 \tl_const:Nn \c__fp_ln_iii_fixed_tl {{10986}{1228}{8668}{1096}{9139}{5245} }
@@ -15019,7 +14213,7 @@
 \cs_new:Npn \__fp_pow_neg_case:w \s__fp \__fp_chk:w #1#2#3;
   {
     \if_case:w #1 \exp_stop_f:
-           \c_minus_one
+           -\c_one
     \or:   \__fp_pow_neg_case_aux:nnnnn #3
     \else: \c_one
     \fi:
@@ -15028,7 +14222,7 @@
   {
     \if_int_compare:w #1 > \c_eight
       \if_int_compare:w #1 > \c_sixteen
-        \c_minus_one
+        -\c_one
       \else:
         \exp_after:wN \exp_after:wN
         \exp_after:wN \__fp_pow_neg_case_aux:NNNNNNNNw
@@ -15054,45 +14248,13 @@
       \if_int_odd:w #8 \exp_stop_f:
         \c_zero
       \else:
-        \c_minus_one
+        -\c_one
       \fi:
     \else:
       \c_one
     \fi:
   }
 %% File: l3fp-trig.dtx Copyright (C) 2011-2014,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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
 \cs_new:Npn \__fp_sin_o:w #1 \s__fp \__fp_chk:w #2#3#4; @
   {
     \if_case:w #2 \exp_stop_f:
@@ -15712,7 +14874,7 @@
   }
 \cs_new:Npn \__fp_atan_Taylor_loop:www #1; #2; #3;
   {
-    \if_int_compare:w #1 = \c_minus_one
+    \if_int_compare:w #1 = - \c_one
       \__fp_atan_Taylor_break:w
     \fi:
     \exp_after:wN \__fp_fixed_div_int:wwN \c__fp_one_fixed_tl ; #1;
@@ -15871,38 +15033,6 @@
       }
   }
 %% File: l3fp-convert.dtx Copyright(C) 2011-2014,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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
 \cs_new:Npn \__fp_trim_zeros:w #1 ;
   {
     \__fp_trim_zeros_loop:w #1
@@ -16148,71 +15278,80 @@
     \exp_not:N \__fp_array_to_clist_loop:Nw
   }
 %% File: l3fp-random.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-\cs_new:Npn \__fp_rand_o:Nw ? #1 @
+\cs_if_exist:NF \pdftex_uniformdeviate:D
   {
-    \tl_if_empty:nTF {#1}
-      { \__fp_rand_o: }
+    \__msg_kernel_new:nnn { kernel } { fp-no-random }
+      { Random~numbers~unavailable }
+    \cs_new:Npn \__fp_rand_o:Nw ? #1 @
       {
-        \__msg_kernel_expandable_error:nnnnn
-          { kernel } { fp-num-args } { rand() } { 0 } { 0 }
+        \__msg_kernel_expandable_error:nn { kernel } { fp-no-random }
         \exp_after:wN \c_nan_fp
       }
+    \cs_new_eq:NN \__fp_randint_o:Nw \__fp_rand_o:Nw
   }
-\cs_if_exist:NTF \pdftex_uniformdeviate:D
+\cs_if_exist:NT \pdftex_uniformdeviate:D
   {
-    \cs_new:Npn \__fp_rand_o:
-      {
-        \__fp_parse_o:n
-          {
-            .
-            \exp_after:wN \use_none:n
-            \__int_value:w \__int_eval:w 1 0000 0000 +
-              \pdftex_uniformdeviate:D 1 0000 0000 \__int_eval_end:
-            \exp_after:wN \use_none:n
-            \__int_value:w \__int_eval:w 1 0000 0000 +
-              \pdftex_uniformdeviate:D 1 0000 0000 \__int_eval_end:
-          }
-      }
+\cs_new:Npn \__fp_rand_uniform:
+  { \pdftex_uniformdeviate:D \c__fp_rand_size_int }
+\int_const:Nn \c__fp_rand_size_int   { 268 435 456 }
+\int_const:Nn \c__fp_rand_four_int   { 268 430 000 }
+\int_const:Nn \c__fp_rand_eight_int  { 200 000 000 }
+\cs_new:Npn \__fp_rand_myriads:n #1
+  {
+    \__fp_rand_myriads_loop:nn #1
+      { ? \use_i_delimit_by_q_stop:nw \__fp_rand_myriads_last: }
+      { ? \use_none_delimit_by_q_stop:w } \q_stop
+  }
+\cs_new:Npn \__fp_rand_myriads_loop:nn #1#2
+  {
+    \use_none:n #2
+    \exp_after:wN \__fp_rand_myriads_get:w
+    \__int_value:w \__fp_rand_uniform: ; {#1}{#2}
   }
+\cs_new:Npn \__fp_rand_myriads_get:w #1 ;
   {
-    \cs_new:Npn \__fp_rand_o:
+    \if_int_compare:w #1 < \c__fp_rand_eight_int
+      \exp_after:wN \use_none:n
+      \__int_value:w \__int_eval:w
+        \c__fp_rand_eight_int + #1 \__int_eval_end:
+      \exp_after:wN \use_i:nnn
+    \else:
+      \if_int_compare:w #1 < \c__fp_rand_four_int
+        \exp_after:wN \use_none:nnnnn
+        \__int_value:w \__int_eval:w
+          \c__fp_rand_four_int + #1 \__int_eval_end:
+        \exp_after:wN \exp_after:wN \exp_after:wN \use_i:nn
+      \fi:
+    \fi:
+    \__fp_rand_myriads_loop:nn
+  }
+\cs_new:Npn \__fp_rand_myriads_last:
+  {
+    \exp_after:wN \__fp_rand_myriads_last:w
+    \__int_value:w \__fp_rand_uniform: ;
+  }
+\cs_new:Npn \__fp_rand_myriads_last:w #1 ;
+  {
+    \if_int_compare:w #1 < \c__fp_rand_four_int
+      \exp_after:wN \use_none:nnnnn
+      \__int_value:w \__int_eval:w
+        \c__fp_rand_four_int + #1 \__int_eval_end:
+    \else:
+      \exp_after:wN \__fp_rand_myriads_last:
+    \fi:
+  }
+\cs_new:Npn \__fp_rand_o:Nw ? #1 @
+  {
+    \tl_if_empty:nTF {#1}
+      { \__fp_rand_o: }
       {
-        \__msg_kernel_expandable_error:nn { kernel } { fp-no-random }
+        \__msg_kernel_expandable_error:nnnnn
+          { kernel } { fp-num-args } { rand() } { 0 } { 0 }
         \exp_after:wN \c_nan_fp
       }
   }
+\cs_new:Npn \__fp_rand_o:
+  { \__fp_parse_o:n { . \__fp_rand_myriads:n { xxxx } } }
 \cs_new:Npn \__fp_randint_o:Nw ? #1 @
   {
     \if_case:w
@@ -16245,102 +15384,58 @@
         \__fp_randint_badarg:w #1;
         \__fp_randint_badarg:w #2;
         \fp_compare:nNnTF { #1; } > { #2; } { \c_one } { \c_zero }
-      \fp_compare:nNnTF { #1; + 2e9 } < { #2; }
-        { \__fp_randint_wide_e:nn }
-        { \__fp_randint_narrow_e:nn }
-        { #1; } { #2; }
+      \exp_after:wN \exp_after:wN \exp_after:wN \__fp_randint_e:wnn
+        \__fp_parse:n { #2; - #1; } { #1; } { #2; }
     \or:
       \__fp_invalid_operation_tl_o:ff
         { randint } { \__fp_array_to_clist:n { #1; #2; } }
       \exp:w
     \fi:
   }
-\cs_if_exist:NTF \pdftex_uniformdeviate:D
+\cs_new:Npn \__fp_randint_e:wnn #1;
   {
-    \cs_new:Npn \__fp_randint_narrow_e:nn #1#2
-      {
-        \__fp_parse_o:n
-          {
-            #1 +
-            \pdftex_uniformdeviate:D
-              \int_eval:n { \fp_to_int:n { #2 - #1 } + \c_one }
-          }
-        \exp:w
-      }
-    \cs_new:Npn \__fp_randint_wide_e:nn #1 #2
-      {
-        \exp_args:Nf \__fp_randint_wide_e:nnn
-          { \fp_to_int:n { ceil ( ( #2 - #1 + \c_six ) * 1e-8 ) } }
-          {#1} {#2}
-      }
-    \cs_new:Npn \__fp_randint_wide_e:nnn #1#2#3
-      {
-        \exp_args:Nf \__fp_randint_wide_e:nnnn
-          {
-            \__fp_parse:n
-              {
-                #2 +
-                \pdftex_uniformdeviate:D #1 e 8 +
-                \pdftex_uniformdeviate:D 1 0000 0000
-              }
-          }
-          {#1} {#2} {#3}
-      }
-    \cs_new:Npn \__fp_randint_wide_e:nnnn #1#2#3#4
-      {
-        \fp_compare:nNnTF {#1} > {#4}
-          { \__fp_randint_wide_e:nnn {#2} {#3} {#4} }
-          { \__fp_exp_after_o:w #1 \exp:w }
-      }
+    \exp_after:wN \__fp_randint_e:wwNnn
+    \__int_value:w \__fp_rand_uniform: \exp_after:wN ;
+    \exp:w \exp_end_continue_f:w
+      \fp_compare:nNnTF { #1 ; } < \c__fp_rand_size_int
+        { \fp_to_int:n { #1 ; + 1 } ; \__fp_randint_narrow_e:nnnn }
+        { \fp_to_int:n { floor(#1 ; * 1e-8 + 1) } ; \__fp_randint_wide_e:nnnn }
+  }
+\cs_new:Npn \__fp_randint_e:wwNnn #1 ; #2 ;
+  {
+    \exp_after:wN \__fp_randint_e:wwwNnn
+    \__int_value:w \int_mod:nn {#1} {#2} ; #1 ; #2 ;
   }
+\cs_new:Npn \__fp_randint_e:wwwNnn #1 ; #2 ; #3 ; #4
   {
-    \cs_new:Npn \__fp_randint_narrow_e:nn #1#2
+    \int_compare:nNnTF { #2 - #1 + #3 } > \c__fp_rand_size_int
       {
-        \__msg_kernel_expandable_error:nn { kernel } { fp-no-random }
-        \exp_after:wN \c_nan_fp \exp:w
+        \exp_after:wN \__fp_randint_e:wwNnn
+          \__int_value:w \__fp_rand_uniform: ; #3 ; #4
       }
-    \cs_new:Npn \__fp_randint_wide_e:nn #1#2
+      { #4 {#1} {#3} }
+  }
+\cs_new:Npn \__fp_randint_narrow_e:nnnn #1#2#3#4
+  { \__fp_parse_o:n { #3 + #1 } \exp:w }
+\cs_new:Npn \__fp_randint_wide_e:nnnn #1#2#3#4
+  {
+    \exp_after:wN \exp_after:wN
+    \exp_after:wN \__fp_randint_wide_e:wnnn
+      \__fp_parse:n { #3 + #1e8 + \__fp_rand_myriads:n { xx } }
+      {#2} {#3} {#4}
+  }
+\cs_new:Npn \__fp_randint_wide_e:wnnn #1 ; #2#3#4
+  {
+    \fp_compare:nNnTF { #1 ; } > {#4}
       {
-        \__msg_kernel_expandable_error:nn { kernel } { fp-no-random }
-        \exp_after:wN \c_nan_fp \exp:w
+        \exp_after:wN \__fp_randint_e:wwNnn
+          \__int_value:w \__fp_rand_uniform: ; #2 ;
+          \__fp_randint_wide_e:nnnn {#3} {#4}
       }
+      { \__fp_exp_after_o:w #1 ; \exp:w }
+  }
   }
-\__msg_kernel_new:nnn { kernel } { fp-no-random }
-  { Random~numbers~unavailable }
-%%
 %% File: l3fp-assign.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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
 \cs_new_protected:Npn \fp_new:N #1
   { \cs_new_eq:NN #1 \c_zero_fp }
 \cs_generate_variant:Nn \fp_new:N {c}
@@ -16394,38 +15489,7 @@
 \fp_new:N \g_tmpa_fp
 \fp_new:N \g_tmpb_fp
 %% File: l3box.dtx Copyright (C) 2005-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3box.dtx 6685 2016-08-19 16:26:52Z bruno $
+\GetIdInfo$Id: l3box.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Experimental boxes}
 \cs_new_protected:Npn \box_new:N #1
   {
@@ -16547,7 +15611,7 @@
       \int_set:Nn \tex_showboxbreadth:D {#3}
       \int_set:Nn \tex_showboxdepth:D   {#4}
       \int_set_eq:NN \tex_tracingonline:D #1
-      \int_set_eq:NN \tex_errorcontextlines:D \c_minus_one
+      \int_set:Nn \tex_errorcontextlines:D { - \c_one }
       \box_if_exist:NTF #2
         { \tex_showbox:D \use:n {#2} }
         {
@@ -16632,39 +15696,7 @@
 \cs_new_protected:Npn \vbox_set_split_to_ht:NNn #1#2#3
   { \tex_setbox:D #1 \tex_vsplit:D #2 to \__dim_eval:w #3 \__dim_eval_end: }
 %% File: l3coffins.dtx Copyright(C) 2010-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-\GetIdInfo$Id: l3coffins.dtx 6685 2016-08-19 16:26:52Z bruno $
+\GetIdInfo$Id: l3coffins.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Coffin code layer}
 \box_new:N \l__coffin_internal_box
 \dim_new:N \l__coffin_internal_dim
@@ -17469,39 +16501,7 @@
     Poles~of~coffin~#1 :
   }
 %% File: l3color.dtx Copyright(C) 2011,2012,2014,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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-\GetIdInfo$Id: l3color.dtx 6596 2016-06-13 21:29:58Z joseph $
+\GetIdInfo$Id: l3color.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Experimental color support}
 \cs_new_eq:NN \color_group_begin: \group_begin:
 \cs_new_protected:Npn \color_group_end:
@@ -17525,39 +16525,8 @@
           }
       }
   }
-%% File: l3sys.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3sys.dtx 6087 2015-09-25 10:29:53Z joseph $
+%% File: l3sys.dtx Copyright (C) 2015-2017 The LaTeX3 Project
+\GetIdInfo$Id: l3sys.dtx 6811 2017-01-01 08:50:54Z joseph $
   {L3 Experimental system/runtime functions}
 \str_const:Nx \c_sys_jobname_str { \tex_jobname:D }
 \int_const:Nn \c_sys_minute_int
@@ -17647,62 +16616,8 @@
     \cs_new_eq:NN \sys_if_output_pdf_p: \c_false_bool
     \str_const:Nn \c_sys_output_str { dvi }
   }
-\prg_new_eq_conditional:NNn \luatex_if_engine: \sys_if_engine_luatex:
-  { T , F , TF , p }
-\prg_new_eq_conditional:NNn \xetex_if_engine:  \sys_if_engine_xetex:
-  { T , F , TF , p }
-\bool_if:nTF
-  {
-    \sys_if_engine_luatex_p: ||
-    \sys_if_engine_xetex_p:
-  }
-  {
-    \cs_new_eq:NN \pdftex_if_engine:T  \use_none:n
-    \cs_new_eq:NN \pdftex_if_engine:F  \use:n
-    \cs_new_eq:NN \pdftex_if_engine:TF \use_ii:nn
-    \cs_new_eq:NN \pdftex_if_engine_p: \c_false_bool
-  }
-  {
-    \cs_new_eq:NN \pdftex_if_engine:T  \use:n
-    \cs_new_eq:NN \pdftex_if_engine:F  \use_none:n
-    \cs_new_eq:NN \pdftex_if_engine:TF \use_i:nn
-    \cs_new_eq:NN \pdftex_if_engine_p: \c_true_bool
-  }
-\cs_set_eq:NN \c_job_name_tl \c_sys_jobname_str
 %% File: l3candidates.dtx Copyright (C) 2012-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-\GetIdInfo$Id: l3candidates.dtx 6688 2016-08-19 19:21:48Z bruno $
+\GetIdInfo$Id: l3candidates.dtx 6809 2017-01-01 06:33:13Z bruno $
   {L3 Experimental additions to l3kernel}
 \cs_new_protected:Npn \cs_log:N
   { \__msg_log_next: \cs_show:N }
@@ -18103,6 +17018,19 @@
 \cs_new_protected:Npn \clist_log:n
   { \__msg_log_next: \clist_show:n }
 \cs_generate_variant:Nn \clist_log:N { c }
+\cs_new:Npn \clist_rand_item:n #1
+  { \exp_args:Nf \__clist_rand_item:nn { \clist_count:n {#1} } {#1} }
+\cs_new:Npn \__clist_rand_item:nn #1#2
+  {
+    \int_compare:nNnF {#1} = \c_zero
+      { \clist_item:nn {#2} { \int_rand:nn { 1 } {#1} } }
+  }
+\cs_new:Npn \clist_rand_item:N #1
+  {
+    \clist_if_empty:NF #1
+      { \clist_item:Nn #1 { \int_rand:nn { 1 } { \clist_count:N #1 } } }
+  }
+\cs_generate_variant:Nn \clist_rand_item:N { c }
 \fp_new:N \l__coffin_sin_fp
 \fp_new:N \l__coffin_cos_fp
 \prop_new:N \l__coffin_bounding_prop
@@ -18368,7 +17296,7 @@
 \cs_new_protected:Npn \ior_map_inline:Nn
   { \__ior_map_inline:NNn \ior_get:NN }
 \cs_new_protected:Npn \ior_str_map_inline:Nn
-  { \__ior_map_inline:NNn \ior_get_str:NN }
+  { \__ior_map_inline:NNn \ior_str_get:NN }
 \cs_new_protected:Npn \__ior_map_inline:NNn
   {
     \int_gincr:N \g__prg_map_int
@@ -18406,6 +17334,62 @@
 \cs_generate_variant:Nn \int_log:N { c }
 \cs_new_protected:Npn \int_log:n
   { \__msg_log_next: \int_show:n }
+\cs_if_exist:NTF \pdftex_uniformdeviate:D
+  {
+    \cs_new:Npn \int_rand:nn #1#2
+      {
+        \exp_after:wN \__int_rand:ww
+        \__int_value:w \__int_eval:w #1 \exp_after:wN ;
+        \__int_value:w \__int_eval:w #2 ;
+      }
+    \cs_new:Npn \__int_rand:ww #1; #2;
+      {
+        \int_compare:nNnTF {#1} > {#2}
+          {
+            \__msg_kernel_expandable_error:nnnn
+              { kernel } { backward-range } {#1} {#2}
+            \__int_rand:ww #2; #1;
+          }
+          {
+            \int_compare:nNnTF {#1} > \c_zero
+              { \int_compare:nNnTF { #2 - #1 } < \c__fp_rand_size_int }
+              { \int_compare:nNnTF {#2} < { #1 + \c__fp_rand_size_int } }
+                  {
+                    \exp_args:Nf \__int_rand_narrow:nn
+                      { \int_eval:n { #2 - #1 + \c_one } } {#1}
+                  }
+                  { \fp_to_int:n { randint(#1,#2) } }
+          }
+      }
+    \cs_new:Npn \__int_rand_narrow:nn
+      {
+        \exp_args:No \__int_rand_narrow:nnn
+          { \pdftex_uniformdeviate:D \c__fp_rand_size_int }
+      }
+    \cs_new:Npn \__int_rand_narrow:nnn #1#2
+      {
+        \exp_args:Nf \__int_rand_narrow:nnnn
+          { \int_mod:nn {#1} {#2} } {#1} {#2}
+      }
+    \cs_new:Npn \__int_rand_narrow:nnnn #1#2#3#4
+      {
+        \int_compare:nNnTF { #2 - #1 + #3 } > \c__fp_rand_size_int
+          { \__int_rand_narrow:nn {#3} {#4} }
+          { \int_eval:n { #4 + #1 } }
+      }
+  }
+  {
+    \cs_new:Npn \int_rand:nn #1#2
+      {
+        \__msg_kernel_expandable_error:nn { kernel } { fp-no-random }
+        \int_eval:n {#1}
+      }
+  }
+\cs_if_exist:NT \pdftex_uniformdeviate:D
+  {
+    \__msg_kernel_new:nnn { kernel } { backward-range }
+      { Bounds~ordered~backwards~in~\int_rand:nn {#1}~{#2}. }
+  }
 \cs_new_protected:Npn \keys_log:nn
   { \__msg_log_next: \keys_show:nn }
 \cs_new:Npn \msg_expandable_error:nnnnnn #1#2#3#4#5#6
@@ -18498,6 +17482,29 @@
 \cs_new_protected:Npn \prop_log:N
   { \__msg_log_next: \prop_show:N }
 \cs_generate_variant:Nn \prop_log:N { c }
+\cs_new:Npn \prop_rand_key:N { \__prop_rand:NN \use_i:nnn }
+\cs_new:Npn \prop_rand_value:N { \__prop_rand:NN \use_none:n }
+\cs_new:Npn \prop_rand_key_value:N { \__prop_rand:NN \__prop_rand:nNn }
+\cs_new:Npn \__prop_rand:nNn #1#2#3 { \exp_not:n { {#1} {#3} } }
+\cs_new:Npn \__prop_rand:NN #1#2
+  {
+    \prop_if_empty:NTF #2 { }
+      {
+        \exp_after:wN \__prop_rand_item:Nw \exp_after:wN #1
+        \__int_value:w \int_rand:nn { 1 } { \prop_count:N #2 } #2
+        \q_stop
+      }
+  }
+\cs_new:Npn \__prop_rand_item:Nw #1#2 \s__prop \__prop_pair:wn #3 \s__prop #4
+  {
+    \int_compare:nNnF {#2} > \c_one
+      { \use_i_delimit_by_q_stop:nw { #1 {#3} \exp_not:n {#4} } }
+    \exp_after:wN \__prop_rand_item:Nw \exp_after:wN #1
+    \__int_value:w \int_eval:n { #2 - \c_one } \s__prop
+  }
+\cs_generate_variant:Nn \prop_rand_key:N { c }
+\cs_generate_variant:Nn \prop_rand_value:N { c }
+\cs_generate_variant:Nn \prop_rand_key_value:N { 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
@@ -18544,6 +17551,12 @@
 \cs_new_protected:Npn \seq_log:N
   { \__msg_log_next: \seq_show:N }
 \cs_generate_variant:Nn \seq_log:N { c }
+\cs_new:Npn \seq_rand_item:N #1
+  {
+    \seq_if_empty:NF #1
+      { \seq_item:Nn #1 { \int_rand:nn { 1 } { \seq_count:N #1 } } }
+  }
+\cs_generate_variant:Nn \seq_rand_item:N { c }
 \cs_new:Npn \skip_split_finite_else_action:nnNN #1#2#3#4
   {
     \skip_if_finite:nTF {#1}
@@ -18641,7 +17654,7 @@
       }
   }
 \exp_args:Nno \use:nn
-  { \cs_set_protected:Npn \__tl_from_file_do:w #1 }
+  { \cs_new_protected:Npn \__tl_from_file_do:w #1 }
   { \c__tl_rescan_marker_tl }
   { \tl_set:No \l__tl_internal_a_tl {#1} }
 \cs_new_protected:Npn \tl_set_from_file_x:Nnn
@@ -19647,6 +18660,13 @@
 \cs_generate_variant:Nn \tl_log:N { c }
 \cs_new_protected:Npn \tl_log:n
   { \__msg_log_next: \tl_show:n }
+\cs_new:Npn \tl_rand_item:n #1
+  {
+    \tl_if_blank:nF {#1}
+      { \tl_item:nn {#1} { \int_rand:nn { 1 } { \tl_count:n {#1} } } }
+  }
+\cs_new:Npn \tl_rand_item:N { \exp_args:No \tl_rand_item:n }
+\cs_generate_variant:Nn \tl_rand_item:N { c }
 \group_begin:
   \cs_set_protected:Npn \__peek_tmp:w #1 \q_stop
     {
@@ -19686,38 +18706,7 @@
 \cs_new_protected:Npn \peek_N_type:F
   { \__peek_token_generic:NNF \__peek_execute_branches_N_type: \scan_stop: }
 %% File: l3luatex.dtx Copyright (C) 2010-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3luatex.dtx 6679 2016-08-18 20:54:06Z bruno $
+\GetIdInfo$Id: l3luatex.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Experimental LuaTeX-specific functions}
 \cs_new:Npn \lua_now_x:n #1 { \luatex_directlua:D {#1} }
 \cs_new:Npn \lua_now:n #1   { \lua_now_x:n { \exp_not:n {#1} } }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index 4c9fa9cd86f..31aacacb88d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -6,49 +6,23 @@
 %%
 %% expl3.dtx  (with options: `generic,loader')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: expl3.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: expl3.dtx Copyright (C) 1990-2016 The LaTeX3 Project
 \def\ExplFileName{expl3}%
 \def\ExplFileDescription{L3 programming layer}%
-\def\ExplFileDate{2016/11/21}%
-\def\ExplFileVersion{6760}%
+\def\ExplFileDate{2017/01/28}%
+\def\ExplFileVersion{6834}%
 \let\ExplLoaderFileVersion\ExplFileVersion
 \begingroup
   \def\tempa{LaTeX2e}%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
index e3ee46ccdea..3449bd8cad6 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
@@ -14,37 +14,6 @@
 -- Do not distribute a modified version of this file.
 -- 
 -- File: l3luatex.dtx Copyright (C) 2010-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
--- license or (at your option) any later version.  The latest version
--- of this license is in the file
---
---    http://www.latex-project.org/lppl.txt
---
--- This file is part of the "l3kernel bundle" (The Work in LPPL)
--- and all files in that bundle must be distributed together.
---
--- The released version of this bundle is available from CTAN.
---
--- -----------------------------------------------------------------------
---
--- The development version of the bundle can be found at
---
---    http://www.latex-project.org/svnroot/experimental/trunk/
---
--- for those people who are interested.
---
---%%%%%%%%%
--- NOTE: %%
---%%%%%%%%%
---
---   Snapshots taken from the repository represent work in progress and may
---   not work or may contain conflicting material!  We therefore ask
---   people _not_ to put them into distributions, archives, etc. without
---   prior consultation with the LaTeX3 Project.
---
--- -----------------------------------------------------------------------
 l3kernel = l3kernel or { }
 local tex_setcatcode    = tex.setcatcode
 local tex_sprint        = tex.sprint
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index f41857ca261..004918b186c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -6,49 +6,23 @@
 %%
 %% expl3.dtx  (with options: `package,loader')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: expl3.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: expl3.dtx Copyright (C) 1990-2016 The LaTeX3 Project
 \def\ExplFileName{expl3}%
 \def\ExplFileDescription{L3 programming layer}%
-\def\ExplFileDate{2016/11/21}%
-\def\ExplFileVersion{6760}%
+\def\ExplFileDate{2017/01/28}%
+\def\ExplFileVersion{6834}%
 \let\ExplLoaderFileVersion\ExplFileVersion
 \ProvidesPackage{\ExplFileName}
   [%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
index 705ca2f8522..a8c2feb562b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3basics,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
index d1669c7759a..753882b885b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3bootstrap,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
index bfd127c36ec..52758d5317a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3box,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
index 004da8ff0d0..13eedc16ec2 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3candidates,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
index cb6c2e0b83a..06a48900a1c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3clist,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
index 5744f91ebc8..2d259066156 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3coffins,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3color.sty b/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
index 704eef38903..5b291f99720 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3color,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index 0dc4351b3e7..7a4d0868b29 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -6,51 +6,25 @@
 %%
 %% l3doc.dtx  (with options: `class')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3doc.dtx Copyright (C) 1990-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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3doc.dtx Copyright (C) 1990-2016 The LaTeX3 project
 \let        \filenameOld        \ExplFileName
 \let        \filedateOld        \ExplFileDate
 \let     \fileversionOld        \ExplFileVersion
 \let \filedescriptionOld        \ExplFileDescription
 \RequirePackage{expl3,xparse,calc}
-\GetIdInfo$Id: l3doc.dtx 6701 2016-09-08 13:56:52Z qinglee $
+\GetIdInfo$Id: l3doc.dtx 6809 2017-01-01 06:33:13Z bruno $
           {L3 Experimental documentation class}
 \ProvidesExplClass
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -1927,8 +1901,8 @@
     \use:x
       {
         \__codedoc_special_index_module:nnnnN
-          { \quotechar #1 }
-          { \quotechar \bslash \quotechar #1 }
+          {#1}
+          { \bslash #1 }
           { }
           { }
           \c_false_bool
@@ -1948,6 +1922,7 @@
   }
 \cs_generate_variant:Nn \__codedoc_special_index:nn { o }
 \tl_new:N \l__codedoc_index_escaped_macro_tl
+\tl_new:N \l__codedoc_index_escaped_key_tl
 \cs_new_protected:Npn \__codedoc_special_index_module:nnnnN #1#2#3#4#5
   {
     \use:x
@@ -1973,6 +1948,8 @@
 \cs_generate_variant:Nn \__codedoc_special_index_module:nnnnN { ooo }
 \cs_new_protected:Npn \__codedoc_special_index_aux:nnnnnn #1#2#3#4#5#6
   {
+    \tl_set:Nn \l__codedoc_index_escaped_key_tl {#1}
+    \__codedoc_quote_special_char:N \l__codedoc_index_escaped_key_tl
     \__codedoc_special_index_set:Nn \l__codedoc_index_escaped_macro_tl {#2}
     \str_if_eq:onTF { \@currenvir } { macrocode }
       { \codeline@wrindex }
@@ -1987,7 +1964,7 @@
       {
         \tl_if_empty:nF { #3 #4 #5 }
           { #3 #5 \actualchar #4 #5 \levelchar }
-        #1
+        \l__codedoc_index_escaped_key_tl
         \actualchar
         {
           \token_to_str:N \verbatim@font \c_space_tl
@@ -2002,23 +1979,24 @@
     \tl_set:Nx #1 { \tl_to_str:n {#2} }
     \__codedoc_if_almost_str:nTF {#2}
       {
+        \tl_replace_all:Non #1 { \tl_to_str:n { __ } }
+          {
+            \verbatimchar
+            \token_to_str:N \_ \token_to_str:N \_
+            \token_to_str:N \verb * \verbatimchar
+          }
         \exp_args:Nx \tl_map_inline:nn
           { \tl_to_str:N \verbatimchar \token_to_str:N _ }
           {
             \tl_replace_all:Nnn #1 {##1}
               {
                 \verbatimchar \c__codedoc_backslash_tl ##1
-                \token_to_str:N \verb \quotechar * \verbatimchar
+                \token_to_str:N \verb * \verbatimchar
               }
           }
-        \tl_map_inline:nn { \actualchar \encapchar \levelchar }
-          {
-            \tl_replace_all:Nxn #1
-              { \tl_to_str:N ##1 } { \quotechar \tl_to_str:N ##1 }
-          }
         \tl_set:Nx #1
           {
-            \token_to_str:N \verb \quotechar * \verbatimchar
+            \token_to_str:N \verb * \verbatimchar
             #1 \verbatimchar
           }
       }
@@ -2028,6 +2006,15 @@
           { \c__codedoc_backslash_tl }
           { \token_to_str:N \bslash \c_space_tl }
       }
+    \__codedoc_quote_special_char:N #1
+  }
+\cs_new_protected:Npn \__codedoc_quote_special_char:N #1
+  {
+    \tl_map_inline:nn { \quotechar \actualchar \encapchar \levelchar }
+      {
+        \tl_replace_all:Nxn #1
+          { \tl_to_str:N ##1 } { \quotechar \tl_to_str:N ##1 }
+      }
   }
 \cs_new_protected:Npn \__codedoc_key_get:n #1
   {
@@ -2057,7 +2044,7 @@
     \tl_set:Nx \l__codedoc_index_key_tl
       { \tl_tail:N \l__codedoc_index_key_tl }
   }
-\cs_set:Npn \__codedoc_key_trim_module:n #1
+\cs_new_protected:Npn \__codedoc_key_trim_module:n #1
   {
     \cs_set:Npn \__codedoc_tmpa:w ##1 #1 ##2 \q_stop
       { \exp_not:n {##1} }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex b/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
index c4cb4792191..ec8740d148a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
@@ -6,46 +6,19 @@
 %%
 %% l3docstrip.dtx  (with options: `program')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File l3dosctrip.dtx Copyright (C) 2012 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
+%% 
+%% File l3dosctrip.dtx Copyright (C) 2012,2016 The LaTeX3 Project
 \def\ExplFileDate{2012/06/08}
 \def\ExplFileName{l3docstrip}
 \def\ExplFileVersion{3787}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
index 104fd7fc231..4730259262a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
@@ -6,47 +6,20 @@
 %%
 %% l3drivers.dtx  (with options: `package,dvipdfmx')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-\GetIdInfo$Id: l3drivers.dtx 6644 2016-08-13 20:22:11Z bruno $
+%% 
+%% File: l3drivers.dtx Copyright(C) 2011-2016 The LaTeX3 Project
+\GetIdInfo$Id: l3drivers.dtx 6809 2017-01-01 06:33:13Z bruno $
   {L3 Experimental drivers}
 \ProvidesExplFile
   {l3dvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
index 9b3a84513da..e5571e4acc4 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
@@ -6,47 +6,20 @@
 %%
 %% l3drivers.dtx  (with options: `package,dvips')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-\GetIdInfo$Id: l3drivers.dtx 6644 2016-08-13 20:22:11Z bruno $
+%% 
+%% File: l3drivers.dtx Copyright(C) 2011-2016 The LaTeX3 Project
+\GetIdInfo$Id: l3drivers.dtx 6809 2017-01-01 06:33:13Z bruno $
   {L3 Experimental drivers}
 \ProvidesExplFile
   {l3dvips.def}{\ExplFileDate}{\ExplFileVersion}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
index a82c56b1671..d47ec607807 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
@@ -6,47 +6,20 @@
 %%
 %% l3drivers.dtx  (with options: `package,dvisvgm')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-\GetIdInfo$Id: l3drivers.dtx 6644 2016-08-13 20:22:11Z bruno $
+%% 
+%% File: l3drivers.dtx Copyright(C) 2011-2016 The LaTeX3 Project
+\GetIdInfo$Id: l3drivers.dtx 6809 2017-01-01 06:33:13Z bruno $
   {L3 Experimental drivers}
 \ProvidesExplFile
   {l3dvisvgm.def}{\ExplFileDate}{\ExplFileVersion}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
index ab45c821045..7abe3952cd4 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3expan,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
index 07a5ab16937..600b8f5d0a7 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3file,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
index 0a9563d2b5f..fef88a5aac2 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3fp,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
index 3650814e2a4..ba483d8a837 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3int,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
index 6c9bc1f27b7..35daf44485f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3keys,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
index e0827eac14e..e800d405045 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3msg,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
index 6eb5b83c860..a449e54bfdd 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3names,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
index 50173240a0a..e8ead1b1c4c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
@@ -6,47 +6,20 @@
 %%
 %% l3drivers.dtx  (with options: `package,pdfmode')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-\GetIdInfo$Id: l3drivers.dtx 6644 2016-08-13 20:22:11Z bruno $
+%% 
+%% File: l3drivers.dtx Copyright(C) 2011-2016 The LaTeX3 Project
+\GetIdInfo$Id: l3drivers.dtx 6809 2017-01-01 06:33:13Z bruno $
   {L3 Experimental drivers}
 \ProvidesExplFile
   {l3pdfmode.def}{\ExplFileDate}{\ExplFileVersion}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
index 6f9460ef679..20eeedf4f2a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3prg,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
index 364c0050282..b24b3ba1e67 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3prop,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
index 69b178802a2..910caadcae2 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3quark,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
index 971f384f2cd..c15d41151a5 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3seq,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
index 2e03334e89c..3cfc2bc1853 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3skip,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str.sty b/Master/texmf-dist/tex/latex/l3kernel/l3str.sty
index c14980cd4e7..70f0bb1fe30 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3str,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
index 651480c07f1..8c8ab9af8b3 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3tl,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
index edb8f607254..64669857cfa 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
@@ -6,45 +6,19 @@
 %%
 %% l3oldmodules.dtx  (with options: `l3token,oldmodules')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3oldmodules.dtx Copyright (C) 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%% 
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
 \def\ExplFileDate{2014/09/06}
 
 \def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
index c3cae34968c..73c8733d7ed 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
@@ -6,47 +6,20 @@
 %%
 %% l3drivers.dtx  (with options: `package,xdvipdfmx')
 %% 
-%% EXPERIMENTAL CODE
+%% Copyright (C) 1990-2016 The LaTeX3 Project
 %% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
 %% 
-%% Do not distribute a modified version of this file.
-%% 
-%% 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
 %%    http://www.latex-project.org/lppl.txt
-%%
+%% 
 %% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-\GetIdInfo$Id: l3drivers.dtx 6644 2016-08-13 20:22:11Z bruno $
+%% 
+%% File: l3drivers.dtx Copyright(C) 2011-2016 The LaTeX3 Project
+\GetIdInfo$Id: l3drivers.dtx 6809 2017-01-01 06:33:13Z bruno $
   {L3 Experimental drivers}
 \ProvidesExplFile
   {l3xdvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
author	Karl Berry <karl@freefriends.org>	2017-01-29 22:34:57 +0000
committer	Karl Berry <karl@freefriends.org>	2017-01-29 22:34:57 +0000
commit	fabbcd2656be5dca3e1986ddcc8c827a23e9aedf (patch)
tree	4f669dff01da1c31477e1e876fc878cddd5c06ab /Master/texmf-dist/tex/latex/l3kernel
parent	ebc35af4250051fed5186c59ba4eaff9949142e2 (diff)