expl3 1733 (21nov09)

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

15 files changed, 374 insertions, 382 deletions

diff --git a/Master/texmf-dist/tex/latex/expl3/expl3.sty b/Master/texmf-dist/tex/latex/expl3/expl3.sty
index 8b493deed0d..684dab217f2 100644
--- a/Master/texmf-dist/tex/latex/expl3/expl3.sty
+++ b/Master/texmf-dist/tex/latex/expl3/expl3.sty
@@ -49,7 +49,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: expl3.dtx 1458 2009-08-12 03:35:07Z will $
+\GetIdInfo$Id: expl3.dtx 1677 2009-11-02 08:24:04Z joseph $
        {L3 Experimental code bundle wrapper}%
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3basics.sty b/Master/texmf-dist/tex/latex/expl3/l3basics.sty
index ba4a2431289..21d986edb7d 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3basics.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3basics.dtx 1453 2009-08-08 14:38:49Z joseph $
+\GetIdInfo$Id: l3basics.dtx 1700 2009-11-04 21:15:58Z joseph $
        {L3 Experimental basic definitions}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -412,6 +412,7 @@
   \iow_log:x{Defining~\token_to_str:N #1~on~
                 line~\tex_the:D \tex_inputlineno:D}
 }
+\cs_set_nopar:Npn \chk_if_free_cs:c { \exp_args:Nc \chk_if_free_cs:N }
 \cs_set_nopar:Npn \chk_if_exist_cs:N #1 {
   \cs_if_exist:NF #1
   {
diff --git a/Master/texmf-dist/tex/latex/expl3/l3clist.sty b/Master/texmf-dist/tex/latex/expl3/l3clist.sty
index b9dacde3d00..1af37298751 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3clist.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3clist.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3clist.dtx 1441 2009-08-05 19:23:23Z joseph $
+\GetIdInfo$Id: l3clist.dtx 1713 2009-11-06 07:02:42Z will $
        {L3 Experimental comma separated lists}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -71,15 +71,6 @@
 \cs_new_eq:NN \clist_gset_eq:cN \cs_gset_eq:cN
 \cs_new_eq:NN \clist_gset_eq:Nc \cs_gset_eq:Nc
 \cs_new_eq:NN \clist_gset_eq:cc \cs_gset_eq:cc
-\cs_new:Npn \clist_set_from_seq_aux:NNN #1#2#3 {
-  \cs_set:Npn \seq_elt:w ##1 \seq_elt_end: ##2 {
-    \exp_not:n {##1}
-    \quark_if_nil:NF ##2 { , ##2 }
-  }
-  #1 #2 { #3 \q_nil }
-}
-\cs_new:Npn \clist_set_from_seq:NN  { \clist_set_from_seq_aux:NNN \tl_set:Nx  }
-\cs_new:Npn \clist_gset_from_seq:NN { \clist_set_from_seq_aux:NNN \tl_gset:Nx }
 \prg_new_eq_conditional:NNn \clist_if_empty:N \tl_if_empty:N {p,TF,T,F}
 \prg_new_eq_conditional:NNn \clist_if_empty:c \tl_if_empty:c {p,TF,T,F}
 \cs_new_nopar:Npn \clist_if_empty_err:N #1 {
@@ -234,12 +225,12 @@
 \cs_generate_variant:Nn \clist_concat:NNN {ccc}
 \cs_generate_variant:Nn \clist_gconcat:NNN {ccc}
 \clist_new:N \l_clist_remove_clist
-\cs_new:Nn \clist_remove_duplicates_aux:NN {
+\cs_new:Npn \clist_remove_duplicates_aux:NN #1#2 {
   \clist_clear:N \l_clist_remove_clist
   \clist_map_function:NN #2 \clist_remove_duplicates_aux:n
   #1 #2 \l_clist_remove_clist
 }
-\cs_new:Nn \clist_remove_duplicates_aux:n {
+\cs_new:Npn \clist_remove_duplicates_aux:n #1 {
   \clist_if_in:NnF \l_clist_remove_clist {#1} {
     \clist_put_right:Nn \l_clist_remove_clist {#1}
   }
@@ -256,9 +247,9 @@
 \cs_new_nopar:Npn \clist_gremove_element:Nn {
   \clist_remove_element_aux:NNn \clist_gset_eq:NN
 }
-\cs_new:Nn \clist_remove_element_aux:NNn {
+\cs_new:Npn \clist_remove_element_aux:NNn #1#2#3 {
   \clist_clear:N \l_clist_remove_clist
-  \cs_set:Nn \clist_remove_element_aux:n {
+  \cs_set:Npn \clist_remove_element_aux:n ##1 {
     \tl_if_eq:nnF {#3} {##1} {
       \clist_put_right:Nn \l_clist_remove_clist {##1}
     }
@@ -266,7 +257,7 @@
   \clist_map_function:NN #2 \clist_remove_element_aux:n
   #1 #2 \l_clist_remove_clist
 }
-\cs_new:Nn \clist_remove_element_aux:n { }
+\cs_new:Npn \clist_remove_element_aux:n #1 { }
 \cs_new_eq:NN \clist_push:Nn \clist_put_left:Nn
 \cs_new_eq:NN \clist_push:NV \clist_put_left:NV
 \cs_new_eq:NN \clist_push:No \clist_put_left:No
diff --git a/Master/texmf-dist/tex/latex/expl3/l3doc.cls b/Master/texmf-dist/tex/latex/expl3/l3doc.cls
index bfb198fecd3..8e39320c493 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/expl3/l3doc.cls
@@ -53,7 +53,7 @@
 \let        \filedateOld        \filedate
 \let     \fileversionOld     \fileversion
 \let \filedescriptionOld \filedescription
-\GetIdInfo$Id: l3doc.dtx 1538 2009-09-17 05:14:09Z will $
+\GetIdInfo$Id: l3doc.dtx 1733 2009-11-08 06:24:26Z will $
           {L3 Experimental documentation class}
 \ProvidesExplClass
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -71,21 +71,31 @@
   Javier~Bezos,~Will~Robertson,~Joseph~Wright}}
 \DeclareOption{a5paper}{\@latexerr{Option not supported}{}}
 \bool_new:N \g_doc_full_bool
-\bool_set_false:N \g_doc_full_bool
+\bool_new:N \g_doc_lmodern_bool
+\bool_new:N \g_doc_checkfunc_bool
 \DeclareOption{full}{ \bool_set_true:N \g_doc_full_bool }
 \DeclareOption{onlydoc}{ \bool_set_false:N \g_doc_full_bool }
-\bool_new:N \g_doc_checkfunc_bool
-\bool_set_true:N \g_doc_checkfunc_bool
 \DeclareOption{check}{ \bool_set_true:N \g_doc_checkfunc_bool }
 \DeclareOption{nocheck}{ \bool_set_false:N \g_doc_checkfunc_bool }
+\DeclareOption{cm-default}{ \bool_set_false:N \g_doc_lmodern_bool }
+\DeclareOption{lm-default}{ \bool_set_true:N \g_doc_lmodern_bool }
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
-\ExecuteOptions{full}
+\ExecuteOptions{full,a4paper,nocheck,lm-default}
+\InputIfFileExists{l3doc.cfg}
+  {
+    \typeout{*************************************^^J
+             *~Local~config~file~l3doc.cfg~used   ^^J
+             *************************************}
+  }
+  { \@input{l3doc.ltx} }
 \ProcessOptions
-\LoadClass[a4paper]{article}
+\LoadClass{article}
 \RequirePackage{doc}
-\RequirePackage{array,alphalph,color,fixltx2e,enumitem,trace,underscore}
-\RequirePackage[T1]{fontenc}
-\RequirePackage{lmodern,textcomp}
+\RequirePackage{array,alphalph,color,fixltx2e,enumitem,textcomp,trace,underscore}
+\bool_if:NT \g_doc_lmodern_bool {
+  \RequirePackage[T1]{fontenc}
+  \RequirePackage{lmodern}
+}
 \RequirePackage{hypdoc}
 \let\doc@verbatim\verbatim
 \let\enddoc@verbatim\endverbatim
@@ -407,7 +417,7 @@
      \HDorg@encapchar hdclindex{\the\c@HD@hypercount}{usage}
    }
    \index{
-     #1\actualchar{\protect\ttfamily#1} (option)
+     #1\actualchar{\protect\ttfamily#1}~(option)
      \encapchar usage
    }
    \index{
@@ -436,7 +446,7 @@
   \par\end{trivlist}
 }
 \newenvironment{TemplateInterfaceDescription}[1]
-  {\subsection{The~template~type~`#1'}%
+  {\subsection{The~object~type~`#1'}%
    \begingroup
    \@beginparpenalty\@M
    \description
@@ -446,7 +456,7 @@
   }
   {\par\bigskip}
 \newenvironment{TemplateDescription}[2]
-  {\subsection{The~template~`#2'~(type~#1)}%
+  {\subsection{The~template~`#2'~(object~type~#1)}%
    \subsubsection*{Attributes:}%
    \begingroup
    \@beginparpenalty\@M
@@ -646,7 +656,6 @@
 }
 \g@addto@macro\theindex{\MakePrivateLetters}
 \cs_set:Npn \verbatimchar {&}
-\cs_set:Npx \levelchar {\string#}
 \setcounter{IndexColumns}{2}
 \IndexPrologue{
   \part*{Index}
@@ -737,11 +746,6 @@
   \DisableCrossrefs
   \OnlyDescription
 }
-\InputIfFileExists{l3doc.cfg}{
-  \typeout{*************************************^^J
-           *~Local~config~file~l3doc.cfg~used   ^^J
-           *************************************}
-}{}
 %% 
 %%
 %% End of file `l3doc.cls'.
diff --git a/Master/texmf-dist/tex/latex/expl3/l3expan.sty b/Master/texmf-dist/tex/latex/expl3/l3expan.sty
index 8a3c64a26ab..6ee4c4d805f 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3expan.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3expan.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3expan.dtx 1464 2009-08-16 11:02:19Z joseph $
+\GetIdInfo$Id: l3expan.dtx 1673 2009-11-02 05:40:42Z will $
        {L3 Experimental Argument Expansion module}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -79,18 +79,19 @@
   {#1}{#2}
 }
 \cs_new_nopar:Npn \exp_stop_f: {~}
-\cs_new_eq:NN \exp_arg:x \expanded % Move eventually.
-\cs_if_free:NTF\exp_arg:x{
-  \cs_new:Npn\::x#1\:::#2#3{
-    \cs_set_nopar:Npx \l_exp_tl{{#3}}
-    \exp_after:wN\exp_arg_next:nnn\l_exp_tl{#1}{#2}}
-}
-{
-  \cs_new:Npn\::x#1\:::#2#3{
-    \exp_after:wN\exp_arg_next:nnn
-    \exp_after:wN{\exp_arg:x{{#3}}}{#1}{#2}
+%%\cs_new_eq:NN \exp_arg:x \expanded % Move eventually.
+%%\cs_if_free:NTF\exp_arg:x{
+  \cs_new:Npn \::x #1 \::: #2#3 {
+    \cs_set_nopar:Npx \l_exp_tl {{#3}}
+    \exp_after:wN \exp_arg_next:nnn \l_exp_tl {#1}{#2}
   }
-}
+%%}
+%%{
+%%  \cs_new:Npn\::x#1\:::#2#3{
+%%    \exp_after:wN\exp_arg_next:nnn
+%%    \exp_after:wN{\exp_arg:x{#3}}{#1}{#2}
+%%  }
+%%}
 \cs_new:Npn \::V#1\:::#2#3{
   \exp_after:wN\exp_arg_next:nnn
   \exp_after:wN{
diff --git a/Master/texmf-dist/tex/latex/expl3/l3file.sty b/Master/texmf-dist/tex/latex/expl3/l3file.sty
index 4e576422173..5a1df4c8349 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3file.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3file.sty
@@ -49,7 +49,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3file.dtx 1352 2009-05-28 11:50:39Z morten $
+\GetIdInfo$Id: l3file.dtx 1676 2009-11-02 08:18:16Z will $
   {L3 Experimental file loading}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -69,9 +69,9 @@
     \prg_return_true:
   }
 }
-\cs_new_nopar:Nn \file_if_exist_path:n {
+\cs_new_nopar:Npn \file_if_exist_path:n #1 {
   \bool_set_false:N \l_file_tmp_bool
-  \cs_set_nopar:Nn \file_if_exist_aux:n {
+  \cs_set_nopar:Npn \file_if_exist_aux:n ##1 {
     \ior_open:Nn \l_file_test_read_stream { #1 ##1 }
     \ior_if_eof:NF \l_file_test_read_stream {
       \bool_set_true:N \l_file_tmp_bool
@@ -89,8 +89,8 @@
     \prg_return_false:
   }
 }
-\cs_new_nopar:Nn \file_if_exist_aux:n { }
-\cs_new_nopar:Nn \file_add_path:nN {
+\cs_new_nopar:Npn \file_if_exist_aux:n #1 { }
+\cs_new_nopar:Npn \file_add_path:nN #1#2 {
   \tl_clear:N #2
   \ior_open:Nn \l_file_test_read_stream {#1}
   \ior_if_eof:NTF \l_file_test_read_stream {
@@ -100,8 +100,8 @@
   }
   \ior_close:N \l_file_test_read_stream
 }
-\cs_new_nopar:Nn \file_add_path_search:nN {
-  \cs_set_nopar:Nn \file_add_path_aux:n {
+\cs_new_nopar:Npn \file_add_path_search:nN #1#2 {
+  \cs_set_nopar:Npn \file_add_path_aux:n ##1 {
     \ior_open:Nn \l_file_test_read_stream { ##1 #1 }
     \ior_if_eof:NF \l_file_test_read_stream {
       \tl_set:Nn #2 { ##1 #1 }
@@ -113,43 +113,43 @@
   }
   \clist_map_function:NN \l_file_search_path_clist \file_add_path_aux:n
 }
-\cs_new_nopar:Nn \file_add_path_aux:n { }
-\cs_new:Nn \file_input:n {
+\cs_new_nopar:Npn \file_add_path_aux:n #1 { }
+\cs_new:Npn \file_input:n #1 {
   \file_add_path:nN {#1} \l_file_tmp_tl
   \tl_if_empty:NF \l_file_tmp_tl {
     \file_input_no_check:n \l_file_tmp_tl
   }
 }
-\cs_new:Nn \file_input_no_record:n {
+\cs_new:Npn \file_input_no_record:n #1 {
   \file_add_path:nN {#1} \l_file_tmp_tl
   \tl_if_empty:NF \l_file_tmp_tl {
     \file_input_no_check_no_record:n \l_file_tmp_tl
   }
 }
-\cs_new_nopar:Nn \file_input_no_check:n {
+\cs_new_nopar:Npn \file_input_no_check:n #1 {
   \clist_gput_right:Nx \g_file_record_clist {#1}
   \wlog{ADDING: #1}
   \@addtofilelist {#1}
   \clist_gput_right:Nx \g_file_record_full_clist {#1}
   \tex_input:D #1 ~
 }
-\cs_new_nopar:Nn \file_input_no_check_no_record:n {
+\cs_new_nopar:Npn \file_input_no_check_no_record:n #1 {
   \clist_gput_right:Nx \g_file_record_full_clist {#1}
   \tex_input:D #1 ~
 }
-\cs_new_nopar:Nn \file_list: {
+\cs_new_nopar:Npn \file_list: {
   \file_list:N \g_file_record_clist
 }
-\cs_new_nopar:Nn \file_list_full: {
+\cs_new_nopar:Npn \file_list_full: {
   \file_list:N \g_file_record_full_clist
 }
-\cs_new_nopar:Nn \file_list:N {
+\cs_new_nopar:Npn \file_list:N #1 {
   \clist_remove_duplicates:N #1
   \iow_log:x { *~File~List~* }
   \clist_map_function:NN #1 \file_list_aux:n
   \iow_log:x { ************* }
 }
-\cs_new_nopar:Nn \file_list_aux:n {
+\cs_new_nopar:Npn \file_list_aux:n #1 {
   \iow_log:x { #1 }
 }
 \AtBeginDocument{
diff --git a/Master/texmf-dist/tex/latex/expl3/l3int.sty b/Master/texmf-dist/tex/latex/expl3/l3int.sty
index 3ab5772e28a..533f2d80289 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3int.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3int.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3int.dtx 1362 2009-05-28 20:19:21Z joseph $
+\GetIdInfo$Id: l3int.dtx 1621 2009-10-25 06:36:19Z will $
           {L3 Experimental Integer module}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -349,6 +349,7 @@
     }
   }
 }
+\int_new:N \g_tl_inline_level_int
 %% 
 %%
 %% End of file `l3int.sty'.
diff --git a/Master/texmf-dist/tex/latex/expl3/l3io.sty b/Master/texmf-dist/tex/latex/expl3/l3io.sty
index 5ea97d6b61a..30212f76420 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3io.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3io.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3io.dtx 1369 2009-05-31 21:36:35Z joseph $
+\GetIdInfo$Id: l3io.dtx 1668 2009-11-01 22:13:36Z will $
           {L3 Experimental i/o module}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -94,7 +94,7 @@
 \cs_generate_variant:Nn \iow_shipout:Nn {Nx}
 \cs_new_nopar:Npn \iow_newline: {^^J}
 \cs_new_nopar:Npn \iow_space: {~}
-\cs_new:Nn \iow_char:N { \cs_to_str:N #1 }
+\cs_new:Npn \iow_char:N #1 { \cs_to_str:N #1 }
 \tl_new:Nx \c_iow_comment_char {\cs_to_str:N\%}
 \tl_new:Nx \c_iow_lbrace_char{\cs_to_str:N\{}
 \tl_new:Nx \c_iow_rbrace_char{\cs_to_str:N\}}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3keys.sty b/Master/texmf-dist/tex/latex/expl3/l3keys.sty
index f683a8357e2..d8531400ff4 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3keys.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3keys.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3keys.dtx 1542 2009-09-17 07:38:53Z joseph $
+\GetIdInfo$Id: l3keys.dtx 1716 2009-11-06 08:56:23Z joseph $
   {L3 Experimental key-value support}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -68,7 +68,7 @@
 \tl_new:Nn \l_keys_nesting_tl { none }
 \bool_new:N \l_keys_no_value_bool
 \toks_new:N \l_keys_value_toks
-\cs_new_nopar:Nn \keys_bool_set:NN {
+\cs_new_nopar:Npn \keys_bool_set:NN #1#2 {
   \keys_cmd_set:nx { \l_keys_path_tl / true } {
     \exp_not:c { bool_ #2 set_true:N }
       \exp_not:N #1
@@ -84,24 +84,24 @@
   }
   \keys_default_set:n { true }
 }
-\cs_new:Nn \keys_choice_code_store:x {
+\cs_new:Npn \keys_choice_code_store:x #1 {
   \tl_set:cx { \c_keys_root_tl \l_keys_path_tl .choice_code_tl } {#1}
 }
-\cs_new_nopar:Nn \keys_choice_find:n {
+\cs_new_nopar:Npn \keys_choice_find:n #1 {
   \keys_execute_aux:nn { \l_keys_path_tl / #1 } {
     \keys_execute_aux:nn { \l_keys_path_tl / unknown } { }
   }
 }
-\cs_new_nopar:Nn \keys_choice_make: {
+\cs_new_nopar:Npn \keys_choice_make: {
   \keys_cmd_set:nn { \l_keys_path_tl } {
     \keys_choice_find:n {##1}
   }
   \keys_cmd_set:nn { \l_keys_path_tl / unknown } {
-    \msg_kernel_error:nxx { key-choice-unknown } { \l_keys_path_tl }
-      {##1}
+    \msg_kernel_error:nnxx { keys } { choice-unknown }
+      { \l_keys_path_tl } {##1}
   }
 }
-\cs_new:Nn \keys_choices_generate:n {
+\cs_new:Npn \keys_choices_generate:n #1 {
   \keys_choice_make:
   \int_zero:N \l_keys_choice_int
   \cs_if_exist:cTF {
@@ -111,38 +111,39 @@
       \c_keys_root_tl \l_keys_path_tl .choice_code_tl
     }
   }{
-    \tl_clear:N \l_keys_choice_code_tl
+    \msg_kernel_error:nnx { keys } { generate-choices-before-code }
+      { \l_keys_path_tl }
   }
   \clist_map_function:nN {#1} \keys_choices_generate_aux:n
 }
-\cs_new_nopar:Nn \keys_choices_generate_aux:n {
-  \int_incr:N \l_keys_choice_int
+\cs_new_nopar:Npn \keys_choices_generate_aux:n #1 {
   \keys_cmd_set:nx { \l_keys_path_tl / #1 } {
     \exp_not:n { \tl_set:Nn \l_keys_choice_tl } {#1}
     \exp_not:n { \int_set:Nn \l_keys_choice_int }
       { \int_use:N \l_keys_choice_int }
     \exp_not:V \l_keys_choice_code_tl
   }
+  \int_incr:N \l_keys_choice_int
 }
-\cs_new:Nn \keys_cmd_set:nn {
+\cs_new:Npn \keys_cmd_set:nn #1#2 {
   \keys_cmd_set_aux:n {#1}
   \cs_generate_from_arg_count:cNnn { \c_keys_root_tl #1 .cmd:n }
     \cs_set:Npn 1 {#2}
 }
-\cs_new:Nn \keys_cmd_set:nx {
+\cs_new:Npn \keys_cmd_set:nx #1#2 {
   \keys_cmd_set_aux:n {#1}
   \cs_generate_from_arg_count:cNnn { \c_keys_root_tl #1 .cmd:n }
     \cs_set:Npx 1 {#2}
 }
-\cs_new_nopar:Nn \keys_cmd_set_aux:n {
+\cs_new_nopar:Npn \keys_cmd_set_aux:n #1 {
   \keys_property_undefine:n { #1 .default_tl }
   \tl_set:cn { \c_keys_root_tl #1 .req_tl } { }
 }
-\cs_new:Nn \keys_default_set:n {
+\cs_new:Npn \keys_default_set:n #1 {
   \tl_set:cn { \c_keys_root_tl \l_keys_path_tl .default_tl } {#1}
 }
 \cs_generate_variant:Nn \keys_default_set:n { V }
-\cs_new:Nn \keys_define:nn {
+\cs_new:Npn \keys_define:nn #1#2 {
   \tl_set:Nn \l_keys_module_tl {#1}
   \cs_set_eq:NN \KV_key_no_value_elt:n \keys_define_elt:n
   \cs_set_eq:NN \KV_key_value_elt:nn \keys_define_elt:nn
@@ -155,26 +156,26 @@
   \cs_set_eq:Nc \KV_key_value_elt:nn
     { keys_ \l_keys_nesting_tl _elt:nn }
 }
-\cs_new_nopar:Nn \keys_define_elt:n {
+\cs_new_nopar:Npn \keys_define_elt:n #1 {
   \bool_set_true:N \l_keys_no_value_bool
   \keys_define_elt_aux:nn {#1} { }
 }
-\cs_new:Nn \keys_define_elt:nn {
+\cs_new:Npn \keys_define_elt:nn #1#2 {
   \bool_set_false:N \l_keys_no_value_bool
   \keys_define_elt_aux:nn {#1} {#2}
 }
-\cs_new:Nn \keys_define_elt_aux:nn {
+\cs_new:Npn \keys_define_elt_aux:nn #1#2 {
   \keys_property_find:n {#1}
   \cs_set_eq:Nc \keys_tmp:w
     { \c_keys_properties_root_tl \l_keys_property_tl }
   \cs_if_exist:NTF \keys_tmp:w {
     \keys_define_key:n {#2}
   }{
-    \msg_kernel_error:nx { key-property-unknown }
-      { \l_keys_property_tl }
+    \msg_kernel_error:nnxx { keys } { property-unknown }
+      { \l_keys_property_tl } { \l_keys_path_tl }
   }
 }
-\cs_new:Nn \keys_define_key:n {
+\cs_new:Npn \keys_define_key:n #1 {
   \bool_if:NTF \l_keys_no_value_bool {
     \intexpr_compare:nTF {
       \exp_args:Nc \cs_get_arg_count_from_signature:N
@@ -182,24 +183,25 @@
     } {
       \keys_tmp:w
     }{
-      \msg_kernel_error:nx { key-property-value-required }
-        { \l_keys_property_tl }
+      \msg_kernel_error:nnxx { key } { property-requires-value }
+        { \l_keys_property_tl } { \l_keys_path_tl }
     }
   }{
     \keys_tmp:w {#1}
   }
 }
-\cs_new_nopar:Nn \keys_execute: {
+\cs_new_nopar:Npn \keys_execute: {
   \keys_execute_aux:nn { \l_keys_path_tl } {
     \keys_execute_unknown:
   }
 }
-\cs_new_nopar:Nn \keys_execute_unknown: {
+\cs_new_nopar:Npn \keys_execute_unknown: {
   \keys_execute_aux:nn { \l_keys_module_tl / unknown } {
-    \msg_kernel_error:nx { key-unknown } { \l_keys_path_tl }
+    \msg_kernel_error:nnxx { keys } { key-unknown } { \l_keys_path_tl }
+      { \l_keys_module_tl }
   }
 }
-\cs_new_nopar:Nn \keys_execute_aux:nn {
+\cs_new_nopar:Npn \keys_execute_aux:nn #1#2 {
   \cs_set_eq:Nc \keys_tmp:w { \c_keys_root_tl #1 .cmd:n }
   \cs_if_exist:NTF \keys_tmp:w {
     \exp_args:NV \keys_tmp:w \l_keys_value_toks
@@ -219,25 +221,25 @@
     \c_keys_root_tl \l_keys_path_tl .req_tl
   }
 }
-\cs_new_nopar:Nn \keys_meta_make:n {
+\cs_new_nopar:Npn \keys_meta_make:n #1 {
   \keys_cmd_set:nx { \l_keys_path_tl } {
     \exp_not:N \keys_set:nn { \l_keys_module_tl } {#1}
   }
 }
 \cs_generate_variant:Nn \keys_meta_make:n { x }
-\cs_new_nopar:Nn \keys_property_find:n {
+\cs_new_nopar:Npn \keys_property_find:n #1 {
   \tl_set:Nx \l_keys_path_tl { \l_keys_module_tl / }
   \tl_if_in:nnTF {#1} {.} {
     \keys_property_find_aux:n {#1}
   }{
-    \msg_kernel_error:nx { key-no-property } { #1 }
+    \msg_kernel_error:nnx { keys } { key-no-property } {#1}
   }
 }
-\cs_new_nopar:Nn \keys_property_find_aux:n {
+\cs_new_nopar:Npn \keys_property_find_aux:n #1 {
   \keys_property_find_aux:w #1 \q_stop
 }
 \cs_new_nopar:Npn \keys_property_find_aux:w #1 . #2 \q_stop {
-  \tl_if_in:nnTF {#2} {.} {
+  \tl_if_in:nnTF {#2} { . } {
     \tl_set:Nx \l_keys_path_tl {
       \l_keys_path_tl \tl_to_str:n {#1} .
     }
@@ -247,13 +249,16 @@
     \tl_set:Nn \l_keys_property_tl { . #2 }
   }
 }
-\cs_new_nopar:Nn \keys_property_new:nn {
-  \cs_new:cn { \c_keys_properties_root_tl #1 } {#2}
+\cs_new_nopar:Npn \keys_property_new:nn #1#2 {
+  \cs_new:cpn { \c_keys_properties_root_tl #1 } {#2}
+}
+\cs_new_nopar:Npn \keys_property_new_arg:nn #1#2 {
+  \cs_new:cpn { \c_keys_properties_root_tl #1 } ##1 {#2}
 }
-\cs_new_nopar:Nn \keys_property_undefine:n {
+\cs_new_nopar:Npn \keys_property_undefine:n #1 {
   \cs_set_eq:cN { \c_keys_root_tl #1 } \c_undefined
 }
-\cs_new:Nn \keys_set:nn {
+\cs_new:Npn \keys_set:nn #1#2 {
   \tl_set:Nn \l_keys_module_tl {#1}
   \cs_set_eq:NN \KV_key_no_value_elt:n \keys_set_elt:n
   \cs_set_eq:NN \KV_key_value_elt:nn \keys_set_elt:nn
@@ -267,21 +272,22 @@
     { keys_ \l_keys_nesting_tl _elt:nn }
 }
 \cs_generate_variant:Nn \keys_set:nn { nV, nv }
-\cs_new_nopar:Nn \keys_set_elt:n {
+\cs_new_nopar:Npn \keys_set_elt:n #1 {
   \bool_set_true:N \l_keys_no_value_bool
   \keys_set_elt_aux:nn {#1} { }
 }
-\cs_new:Nn \keys_set_elt:nn {
+\cs_new:Npn \keys_set_elt:nn #1#2 {
   \bool_set_false:N \l_keys_no_value_bool
   \keys_set_elt_aux:nn {#1} {#2}
 }
-\cs_new:Nn \keys_set_elt_aux:nn {
+\cs_new:Npn \keys_set_elt_aux:nn #1#2 {
   \tl_set:Nx \l_keys_key_tl { \tl_to_str:n {#1} }
   \tl_set:Nx \l_keys_path_tl { \l_keys_module_tl / \l_keys_key_tl }
   \keys_value_or_default:n {#2}
   \keys_if_value_requirement:nTF { required } {
     \bool_if:NTF \l_keys_no_value_bool {
-      \msg_kernel_error:nx  { key-value-required } { \l_keys_path_tl }
+      \msg_kernel_error:nnx  { keys } { value-required }
+        { \l_keys_path_tl }
     }{
       \keys_set_elt_aux:
     }
@@ -289,23 +295,23 @@
     \keys_set_elt_aux:
   }
 }
-\cs_new_nopar:Nn \keys_set_elt_aux: {
+\cs_new_nopar:Npn \keys_set_elt_aux: {
   \keys_if_value_requirement:nTF { forbidden } {
     \bool_if:NTF \l_keys_no_value_bool {
       \keys_execute:
     }{
-      \msg_kernel_error:nxx { key-value-forbidden } { \l_keys_path_tl }
-        { \toks_use:N \l_keys_value_toks }
+      \msg_kernel_error:nnxx { keys } { value-forbidden }
+        { \l_keys_path_tl } { \toks_use:N \l_keys_value_toks }
     }
   }{
     \keys_execute:
   }
 }
-\cs_new_nopar:Nn \keys_show:nn {
+\cs_new_nopar:Npn \keys_show:nn #1#2 {
   \cs_show:c { \c_keys_root_tl #1 / \tl_to_str:n {#2} .cmd:n }
 }
 \cs_new:Npn \keys_tmp:w {}
-\cs_new:Nn \keys_value_or_default:n {
+\cs_new:Npn \keys_value_or_default:n #1 {
   \toks_set:Nn \l_keys_value_toks  {#1}
   \bool_if:NT \l_keys_no_value_bool {
     \cs_if_exist:cT { \c_keys_root_tl \l_keys_path_tl .default_tl } {
@@ -315,11 +321,11 @@
     }
   }
 }
-\cs_new_nopar:Nn \keys_value_requirement:n {
+\cs_new_nopar:Npn \keys_value_requirement:n #1 {
   \tl_set_eq:cc { \c_keys_root_tl \l_keys_path_tl .req_tl }
     { c_keys_value_ #1 _tl }
 }
-\cs_new_nopar:Nn \keys_variable_set:NnNN {
+\cs_new_nopar:Npn \keys_variable_set:NnNN #1#2#3#4 {
   \cs_if_exist:NF #1 {
     \use:c { #2 _new:N } #1
   }
@@ -327,70 +333,70 @@
     \exp_not:c { #2 _ #3 set:N #4 } \exp_not:N #1 {##1}
   }
 }
-\keys_property_new:nn { .bool_set:N } {
+\keys_property_new_arg:nn { .bool_set:N } {
   \keys_bool_set:NN #1 { }
 }
-\keys_property_new:nn { .bool_gset:N } {
+\keys_property_new_arg:nn { .bool_gset:N } {
   \keys_bool_set:NN #1 n
 }
 \keys_property_new:nn { .choice: } {
   \keys_choice_make:
 }
-\keys_property_new:nn { .choice_code:n } {
+\keys_property_new_arg:nn { .choice_code:n } {
   \keys_choice_code_store:x { \exp_not:n {#1} }
 }
-\keys_property_new:nn { .choice_code:x } {
+\keys_property_new_arg:nn { .choice_code:x } {
   \keys_choice_code_store:x {#1}
 }
-\keys_property_new:nn { .code:n } {
+\keys_property_new_arg:nn { .code:n } {
   \keys_cmd_set:nn { \l_keys_path_tl } {#1}
 }
-\keys_property_new:nn { .code:x } {
+\keys_property_new_arg:nn { .code:x } {
   \keys_cmd_set:nx { \l_keys_path_tl } {#1}
 }
-\keys_property_new:nn { .default:n } {
+\keys_property_new_arg:nn { .default:n } {
   \keys_default_set:n  {#1}
 }
-\keys_property_new:nn { .default:V } {
+\keys_property_new_arg:nn { .default:V } {
   \keys_default_set:V #1
 }
-\keys_property_new:nn { .dim_set:N } {
+\keys_property_new_arg:nn { .dim_set:N } {
   \keys_variable_set:NnNN #1 { dim } { } n
 }
-\keys_property_new:nn { .dim_gset:N } {
+\keys_property_new_arg:nn { .dim_gset:N } {
   \keys_variable_set:NnNN #1 { dim } g n
 }
-\keys_property_new:nn { .generate_choices:n } {
+\keys_property_new_arg:nn { .generate_choices:n } {
   \keys_choices_generate:n {#1}
 }
-\keys_property_new:nn { .int_set:N } {
+\keys_property_new_arg:nn { .int_set:N } {
   \keys_variable_set:NnNN #1 { int } { } n
 }
-\keys_property_new:nn { .int_gset:N } {
+\keys_property_new_arg:nn { .int_gset:N } {
   \keys_variable_set:NnNN #1 { int } g n
 }
-\keys_property_new:nn { .meta:n } {
+\keys_property_new_arg:nn { .meta:n } {
   \keys_meta_make:n {#1}
 }
-\keys_property_new:nn { .meta:x } {
+\keys_property_new_arg:nn { .meta:x } {
   \keys_meta_make:x {#1}
 }
-\keys_property_new:nn { .skip_set:N } {
+\keys_property_new_arg:nn { .skip_set:N } {
   \keys_variable_set:NnNN #1 { skip } { } n
 }
-\keys_property_new:nn { .skip_gset:N } {
+\keys_property_new_arg:nn { .skip_gset:N } {
   \keys_variable_set:NnNN #1 { skip } g n
 }
-\keys_property_new:nn { .tl_set:N } {
+\keys_property_new_arg:nn { .tl_set:N } {
   \keys_variable_set:NnNN #1 { tl } { } n
 }
-\keys_property_new:nn { .tl_set_x:N } {
+\keys_property_new_arg:nn { .tl_set_x:N } {
   \keys_variable_set:NnNN #1 { tl } { } x
 }
-\keys_property_new:nn { .tl_gset:N } {
+\keys_property_new_arg:nn { .tl_gset:N } {
   \keys_variable_set:NnNN #1 { tl } g n
 }
-\keys_property_new:nn { .tl_gset_x:N } {
+\keys_property_new_arg:nn { .tl_gset_x:N } {
   \keys_variable_set:NnNN #1 { tl } g x
 }
 \keys_property_new:nn { .value_forbidden: } {
@@ -399,45 +405,69 @@
 \keys_property_new:nn { .value_required: } {
   \keys_value_requirement:n { required }
 }
-\msg_kernel_new:nn { key-choice-unknown } {%
-  Choice `#2' unknown for key `#1':\\%
-  the key is being ignored.%
-}
-\msg_kernel_new:nn { key-initial-without-code } {%
-  An initial value cannot be set for key `#1':
-  the key has not yet been created.%
-}
-\msg_kernel_new:nn { key-unknown } {%
-  The key `#1' is unknown and is being ignored.%
-}
-\msg_kernel_new:nn { key-value-forbidden }{%
-  The key `#1' cannot taken a value:\\%
-  the given input `#2' is being ignored.%
-}
-\msg_kernel_new:nn { key-value-required } {%
-  The key `#1' requires a value\\%
-  and is being ignored.%
-}
-\msg_kernel_new:nn { key-no-property } {%
-  No property given in definition of key `#1'.%
-}
-\msg_kernel_new:nnn { key-no-set-function } {%
-  There is no function #1\\%
-  for setting variable \exp_not:N #2.%
-}{%
-  LaTeX can only `set' variables which have a function\\%
-  \exp_not:N \<var>_(g)set:Nn, or in some cases
-  \exp_not:N \<var>_(g)set:Nx.\\%
-  You have asked to `set' some other kind of variable.%
-
-}
-\msg_kernel_new:nn { key-property-unknown } {%
-  The key property `#1' is unknown.%
-}
-\msg_kernel_new:nn { key-property-value-required } {%
-  The property `#1' requires a value\\%
-  and is being ignored.%
-}
+\msg_kernel_new:nnnn { keys } { choice-unknown }
+  {%
+    Choice `#2' unknown for key `#1':\\%
+    the key is being ignored.%
+  }
+  {%
+    The key `#1' takes a limited number of values.\\%
+    The input you gave, `#2', was not on the list accepted.\\%
+    Perhaps this is a typing error?%
+  }
+\msg_kernel_new:nnnn { keys } { generate-choices-before-code }
+  {%
+    Cannot create choices for key `#1':\\%
+    no code has been defined.%
+  }
+  {%
+    Code for use by .generate_choices:n should first be defined\\%
+    using .choice_code:n or .choice_code:x.%
+  }
+\msg_kernel_new:nnnn { keys } { key-no-property }
+  {No property given in definition of key `#1'.}
+  {%
+   Inside \token_to_str:N \keys_define:nn \msg_space: each key name
+   needs a property:\\%
+   \msg_two_spaces: #1 .<property>:\\%
+   I did not find a ``.'' to indicate the start of a property.%
+  }
+\msg_kernel_new:nnnn { keys } { key-unknown }
+  {The key `#1' is unknown and is being ignored.}
+  {%
+    The module `#2' does not seem to implement a key called `#1'.\\%
+    I also checked for code to handle a unknown key, and did not
+    find any.%
+    Check that you have spelled the key name correctly.%
+  }
+\msg_kernel_new:nnnn { keys } { property-unknown }
+  {The key property `#1' is unknown.}
+  {%
+    You have asked for key `#2' to have the property `#1'.\\%
+    However, I don't know the property `#1': this line will be ignored.%
+  }
+\msg_kernel_new:nnnn { keys } { property-requires-value }
+  {The property `#1' requires a value.}
+  {%
+  You have tried to set the property `#2' for key `#1'.\\%
+  However, you did not give a value for this property, and one is
+  needed.\\%
+  The entire line will be ignored.%
+  }
+\msg_kernel_new:nnnn { keys } { value-forbidden }
+  {The key `#1' does not taken a value.}
+  {%
+    The key `#1' should be given without a value.\\%
+    You gave `#1 = #2'; I will ignore `#2' and carry out whatever\\%
+    key `#1' is supposed to do.%
+  }
+\msg_kernel_new:nnnn { keys } { value-required }
+  {The key `#1' requires a value.}
+  {%
+    The key `#1' should be given with a value.\\%
+    You gave `#1', but should have given `#1 = <value>'.\\%
+    I will ignore the key entirely.\\%
+  }
 %% 
 %%
 %% End of file `l3keys.sty'.
diff --git a/Master/texmf-dist/tex/latex/expl3/l3msg.sty b/Master/texmf-dist/tex/latex/expl3/l3msg.sty
index 757394ff669..04d32519912 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3msg.sty
@@ -49,7 +49,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3msg.dtx 1502 2009-09-01 16:23:32Z joseph $
+\GetIdInfo$Id: l3msg.dtx 1722 2009-11-06 13:22:12Z joseph $
   {L3 Experimental LaTeX Messages module}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -95,88 +95,59 @@
 \tl_new:Nn \c_msg_on_line_tl { on~line }
 \tl_new:Nn \c_msg_text_prefix_tl      { msg_text ~>~ }
 \tl_new:Nn \c_msg_more_text_prefix_tl { msg_text_more ~>~ }
-\tl_new:Nn \c_msg_code_prefix_tl      { msg_code ~>~ }
 \tl_new:N \l_msg_class_tl
 \tl_new:N \l_msg_current_class_tl
 \clist_new:N \l_msg_names_clist
 \prop_new:N \l_msg_redirect_classes_prop
 \prop_new:N \l_msg_redirect_names_prop
 \clist_new:N \l_msg_redirect_classes_clist
-\cs_new_nopar:Nn { \msg_line_number: } {
+\cs_new_nopar:Npn \msg_line_number: {
   \toks_use:N \tex_inputlineno:D
 }
-\cs_new_nopar:Nn { \msg_line_context: } {
-  \msg_space:
+\cs_new_nopar:Npn \msg_line_context: {
   \c_msg_on_line_tl
   \msg_space:
   \msg_line_number:
 }
-\cs_new_nopar:Nn \msg_newline:      { ^^J }
-\cs_new_nopar:Nn \msg_two_newlines: { ^^J ^^J }
-\cs_new_nopar:Nn \msg_space:       { ~ }
-\cs_new_nopar:Nn \msg_two_spaces:  { \msg_space: \msg_space: }
-\cs_new_nopar:Nn \msg_four_spaces: { \msg_two_spaces: \msg_two_spaces: }
-\cs_new_nopar:Npn \msg_generic_new:nnnn #1 {
-  \exp_args:Nc \chk_if_free_cs:N { \c_msg_text_prefix_tl #1 :nn }
-  \msg_generic_set:nnnn {#1}
+\cs_new_nopar:Npn \msg_newline:      { ^^J }
+\cs_new_nopar:Npn \msg_two_newlines: { ^^J ^^J }
+\cs_new_nopar:Npn \msg_space:       { ~ }
+\cs_new_nopar:Npn \msg_two_spaces:  { \msg_space: \msg_space: }
+\cs_new_nopar:Npn \msg_four_spaces: {
+  \msg_two_spaces: \msg_two_spaces:
 }
 \cs_new_nopar:Npn \msg_generic_new:nnn #1 {
-  \exp_args:Nc \chk_if_free_cs:N { \c_msg_text_prefix_tl #1 :nn }
+  \chk_if_free_cs:c { \c_msg_text_prefix_tl #1 :xxxx }
   \msg_generic_set:nnn {#1}
 }
 \cs_new_nopar:Npn \msg_generic_new:nn #1 {
-  \exp_args:Nc \chk_if_free_cs:N { \c_msg_text_prefix_tl #1 :nn }
+  \chk_if_free_cs:c { \c_msg_text_prefix_tl #1 :xxxx }
   \msg_generic_set:nn {#1}
 }
-\cs_new_nopar:Npn \msg_generic_set:nnnn #1 {
-  \msg_generic_set_clist:n {#1}
-  \char_make_space:N \ %
-  \msg_generic_set_code:nnnn{#1}%
-}
 \cs_new_nopar:Npn \msg_generic_set:nnn #1 {
   \msg_generic_set_clist:n {#1}
-  \char_make_space:N \ %
-  \msg_generic_set_more_text:nnn{#1}%
+  \char_make_space:N \
+  \msg_generic_set_more_text:nnn {#1}
 }
 \cs_new_nopar:Npn \msg_generic_set:nn #1 {
   \msg_generic_set_clist:n {#1}
-  \char_make_space:N \ %
-  \msg_generic_set_text:nn{#1}%
+  \char_make_space:N \
+  \msg_generic_set_text:nn {#1}
 }
 \cs_new_nopar:Npn \msg_generic_set_clist:n #1 {
   \clist_if_in:NnF \l_msg_names_clist { // #1 / } {
     \clist_put_right:Nn \l_msg_names_clist { // #1 / }
   }
 }
-\cs_new:Nn \msg_generic_set_text:nn  {
-  \cs_set:cn { \c_msg_text_prefix_tl #1 :nn } {#2}
-  \char_make_ignore:N \
-}
-\cs_new:Nn \msg_generic_set_more_text:nnn {
-  \cs_set:cn { \c_msg_text_prefix_tl #1 :nn } {#2}
-  \tl_if_empty:nTF {#3} {
-    \cs_set_eq:cN { \c_msg_more_text_prefix_tl #1 } \c_undefined
-  }{
-    \cs_set:cn { \c_msg_more_text_prefix_tl #1 :nn } {#3}
-  }
+\cs_new:Npn \msg_generic_set_text:nn  #1#2 {
+  \cs_set:cpn { \c_msg_text_prefix_tl #1 :xxxx } ##1##2##3##4 {#2}
+  \cs_set_eq:cN { \c_msg_more_text_prefix_tl #1 :xxxx } \c_undefined
   \char_make_ignore:N \
 }
-\cs_new:Npn \msg_generic_set_code:nnnn #1#2#3 {
-  \cs_set:cn { \c_msg_text_prefix_tl #1 :nn } {#2}
-  \tl_if_empty:nTF {#3} {
-    \cs_set_eq:cN { \c_msg_more_text_prefix_tl #1 } \c_undefined
-  }{
-    \cs_set:cn { \c_msg_more_text_prefix_tl #1 :nn } {#3}
-  }
+\cs_new:Npn \msg_generic_set_more_text:nnn #1#2#3 {
+  \cs_set:cpn { \c_msg_text_prefix_tl #1 :xxxx } ##1##2##3##4 {#2}
+  \cs_set:cpn { \c_msg_more_text_prefix_tl #1 :xxxx } ##1##2##3##4 {#3}
   \char_make_ignore:N \
-  \msg_generic_set_code:nn {#1}
-}
-\cs_new:Nn \msg_generic_set_code:nn {
-  \tl_if_empty:nTF {#2} {
-    \cs_set_eq:cN { \c_msg_code_prefix_tl #1 : } \c_undefined
-  }{
-    \cs_set:cn { \c_msg_code_prefix_tl #1 : } {#2}
-  }
 }
 \group_begin:
   \char_set_lccode:nn {`\&} {`\ } % {
@@ -185,7 +156,7 @@
   \char_make_letter:N\ %
 \tl_to_lowercase:n{%
 \group_end:%
-\cs_new_protected:Nn\msg_direct_interrupt:xxxxn{%
+\cs_new_protected:Npn\msg_direct_interrupt:xxxx#1#2#3#4{%
 \group_begin:%
 \cs_set_eq:NN\\\msg_newline:%
 \cs_set_eq:NN\ \msg_space:%
@@ -202,42 +173,35 @@
 }%
 &%
 \group_end:%
-#5%
 }%
 }%
-\cs_new:Nn \msg_direct_interrupt_aux:n {
+\cs_new:Npn \msg_direct_interrupt_aux:n #1 {
   \tl_if_empty:nTF {#1} {
     \tl_set:Nx \l_msg_tmp_tl { { \c_msg_no_info_text_tl } }
   }{
-    \tl_set:Nx \l_msg_tmp_tl { {#1 } }
+    \tl_set:Nx \l_msg_tmp_tl { {#1} }
   }
 }
-\cs_new_protected:Nn \msg_direct_log:xx {
+\cs_new_protected:Npn \msg_direct_log:xx #1#2 {
   \group_begin:
     \cs_set:Npn \\ { \msg_newline: #2 }
     \cs_set_eq:NN \ \msg_space:
     \iow_log:x { #1 \msg_newline: }
   \group_end:
 }
-\cs_new_protected:Nn \msg_direct_term:xx {
+\cs_new_protected:Npn \msg_direct_term:xx #1#2 {
   \group_begin:
     \cs_set:Npn \\ { \msg_newline: #2 }
     \cs_set_eq:NN \ \msg_space:
     \iow_term:x { #1 \msg_newline: }
   \group_end:
 }
-\cs_new_nopar:Npn \msg_new:nnnnn #1#2 {
-  \msg_generic_new:nnnn { #1 / #2 }
-}
 \cs_new_nopar:Npn \msg_new:nnnn #1#2 {
   \msg_generic_new:nnn { #1 / #2 }
 }
 \cs_new_nopar:Npn \msg_new:nnn #1#2 {
   \msg_generic_new:nn { #1 / #2 }
 }
-\cs_new_nopar:Npn \msg_set:nnnnn #1#2 {
-  \msg_generic_set:nnnn { #1 / #2 }
-}
 \cs_new_nopar:Npn \msg_set:nnnn #1#2 {
   \msg_generic_set:nnn { #1 / #2 }
 }
@@ -245,48 +209,54 @@
   \msg_generic_set:nn { #1 / #2 }
 }
 \cs_new_nopar:Npn \msg_class_new:nn #1 {
-  \exp_args:Nc \chk_if_free_cs:N { msg_ #1 :nnxx }
+  \chk_if_free_cs:c { msg_ #1 :nnxxxx }
   \prop_new:c { l_msg_redirect_ #1 _prop }
   \msg_class_set:nn {#1}
 }
-\cs_new_nopar:Nn \msg_class_set:nn {
+\cs_new_nopar:Npn \msg_class_set:nn #1#2 {
   \prop_clear:c { l_msg_redirect_ #1 _prop }
-  \cs_set_protected:cn { msg_ #1 :nnxx } {
-    \msg_use:nnnnxx {#1} {#2} {##1} {##2} {##3} {##4}
+  \cs_set_protected:cpn { msg_ #1 :nnxxxx } ##1##2##3##4##5##6 {
+    \msg_use:nnnnxxxx {#1} {#2} {##1} {##2} {##3} {##4} {##5} {##6}
+  }
+  \cs_set_protected:cpx { msg_ #1 :nnxxx } ##1##2##3##4##5 {
+    \exp_not:c { msg_ #1 :nnxxxx } {##1} {##2} {##3} {##4} {##5} { }
   }
-  \cs_set_protected:cn { msg_ #1 :nnx } {
-    \use:c { msg_ #1 :nnxx } {##1} {##2} {##3} { }
+  \cs_set_protected:cpx { msg_ #1 :nnxx } ##1##2##3##4 {
+    \exp_not:c { msg_ #1 :nnxxxx } {##1} {##2} {##3} {##4} { } { }
   }
-  \cs_set_protected:cn { msg_ #1 :nn } {
-    \use:c { msg_ #1 :nnxx } {##1} {##2} { } { }
+  \cs_set_protected:cpx { msg_ #1 :nnx } ##1##2##3 {
+    \exp_not:c { msg_ #1 :nnxxxx } {##1} {##2} {##3} { } { } { }
+  }
+  \cs_set_protected:cpx { msg_ #1 :nn } ##1##2 {
+    \exp_not:c { msg_ #1 :nnxxxx } {##1} {##2} { } { } { } { }
   }
 }
-\cs_new:Nn \msg_use:nnnnxx {
-  \cs_set:Nn \msg_use_code: {
+\cs_new:Npn \msg_use:nnnnxxxx #1#2#3#4#5#6#7#8 {
+  \cs_set_nopar:Npn \msg_use_code: {
     \clist_clear:N \l_msg_redirect_classes_clist
     #2
   }
-  \cs_set:Nn \msg_use_loop:n {
+  \cs_set:Npn \msg_use_loop:n ##1 {
     \clist_if_in:NnTF \l_msg_redirect_classes_clist {#1} {
-      \msg_kernel_error:n { message-loop }
+      \msg_kernel_error:nn { msg } { redirect-loop } {#1}
     }{
       \clist_put_right:Nn \l_msg_redirect_classes_clist {#1}
-      \cs_if_exist:cTF { msg_ ##1 :nnxx } {
-        \use:c { msg_ ##1 :nnxx } {#3} {#4} {#5} {#6}
+      \cs_if_exist:cTF { msg_ ##1 :nnxxxx } {
+        \use:c { msg_ ##1 :nnxxxx } {#3} {#4} {#5} {#6} {#7} {#8}
       }{
-        \msg_kernel_error:nx { message-class-unknown } { ##1 }
+        \msg_kernel_error:nnx { msg } { message-class-unknown } {##1}
       }
     }
   }
-  \cs_if_exist:cTF { \c_msg_text_prefix_tl #3 / #4 :nn } {
+  \cs_if_exist:cTF { \c_msg_text_prefix_tl #3 / #4 :xxxx } {
     \msg_use_aux:nnn {#1} {#3} {#4}
   }{
-    \msg_kernel_error:nxx { message-unknown } { #3 } { #4 }
+    \msg_kernel_error:nnxx { msg } { message-unknown } {#3} {#4}
   }
 }
-\cs_new_nopar:Nn \msg_use_code: { }
-\cs_new_nopar:Nn \msg_use_loop:n { }
-\cs_new_nopar:Nn \msg_use_aux:nnn {
+\cs_new_nopar:Npn \msg_use_code: { }
+\cs_new:Npn \msg_use_loop:n #1 { }
+\cs_new_nopar:Npn \msg_use_aux:nnn #1#2#3 {
   \tl_set:Nn \l_msg_current_class_tl  {#1}
   \tl_set:Nn \l_msg_current_module_tl {#2}
   \prop_if_in:NnTF \l_msg_redirect_names_prop { // #2 / #3 / } {
@@ -295,18 +265,18 @@
     \msg_use_aux:nn {#1} {#2}
   }
 }
-\cs_new_nopar:Nn \msg_use_aux:nn {
+\cs_new_nopar:Npn \msg_use_aux:nn #1#2 {
   \prop_if_in:cnTF { l_msg_redirect_ #1 _prop } {#2} {
     \msg_use_loop_check:nn {#1} {#2}
   }{
-    \prop_if_in:cnTF { l_msg_redirect_ #1 _prop } {*} {
-      \msg_use_loop_check:nn {#1} {*}
+    \prop_if_in:cnTF { l_msg_redirect_ #1 _prop } { * } {
+      \msg_use_loop_check:nn {#1} { * }
     }{
       \msg_use_code:
     }
   }
 }
-\cs_new:Nn \msg_use_loop_check:nn {
+\cs_new:Npn \msg_use_loop_check:nn #1#2 {
   \prop_get:cnN { l_msg_redirect_ #1 _prop } {#2} \l_msg_class_tl
   \tl_if_eq:NNTF \l_msg_current_class_tl \l_msg_class_tl {
     \msg_use_code:
@@ -315,177 +285,172 @@
   }
 }
 \msg_class_new:nn { fatal } {
-  \msg_direct_interrupt:xxxxn
+  \msg_direct_interrupt:xxxx
     { \c_msg_fatal_tl \msg_two_newlines: }
     {
       ( \c_msg_fatal_tl ) \msg_space:
-      \use:c { \c_msg_text_prefix_tl #1 / #2 :nn } {#3} {#4}
+      \use:c { \c_msg_text_prefix_tl #1 / #2 :xxxx } {#3} {#4} {#5} {#6}
     }
     { ( \c_msg_fatal_tl ) \msg_space: }
     { \c_msg_fatal_text_tl }
-    { \tex_end:D }
+  \tex_end:D
 }
 \msg_class_new:nn { error } {
-  \msg_direct_interrupt:xxxxn
+  \msg_direct_interrupt:xxxx
     { #1~\c_msg_error_tl \msg_newline: }
     {
       ( #1 ) \msg_space:
-      \use:c { \c_msg_text_prefix_tl #1 / #2 :nn } {#3} {#4}
+      \use:c { \c_msg_text_prefix_tl #1 / #2 :xxxx } {#3} {#4} {#5} {#6}
     }
     { ( #1 ) \msg_space: }
     {
-      \cs_if_exist:cTF { \c_msg_more_text_prefix_tl #1 / #2 :nn } {
-        \use:c { \c_msg_more_text_prefix_tl #1 / #2 :nn } {#3} {#4}
-      }{
-        \c_msg_no_info_text_tl
-      }
-    }
-    {
-      \cs_if_exist:cT { \c_msg_code_prefix_tl #1 /#2 :nn } {
-        \use:c { \c_msg_code_prefix_tl #1 / #2 :nn} {#3} {#4}
-      }
+      \cs_if_exist:cTF { \c_msg_more_text_prefix_tl #1 / #2 :xxxx }
+        {
+          \use:c { \c_msg_more_text_prefix_tl #1 / #2 :xxxx }
+            {#3} {#4} {#5} {#6}
+        }
+        { \c_msg_no_info_text_tl }
     }
 }
 \msg_class_new:nn { warning } {
   \msg_direct_term:xx {
-    \msg_space: #1~\c_msg_warning_tl :~
-    \use:c { \c_msg_text_prefix_tl #1 / #2 :nn } {#3} {#4}
+    \msg_space: #1 ~ \c_msg_warning_tl :~
+    \use:c { \c_msg_text_prefix_tl #1 / #2 :xxxx } {#3} {#4} {#5} {#6}
   }
   { ( #1 ) \msg_two_spaces: }
 }
 \msg_class_new:nn { info } {
   \msg_direct_log:xx {
     \msg_space: #1~\c_msg_info_tl :~
-    \use:c { \c_msg_text_prefix_tl #1 / #2 :nn } {#3} {#4}
+    \use:c { \c_msg_text_prefix_tl #1 / #2 :xxxx } {#3} {#4} {#5} {#6}
   }
   { ( #1 ) \msg_two_spaces: }
 }
 \msg_class_new:nn { log } {
   \msg_direct_log:xx {
-    \use:c { \c_msg_text_prefix_tl #1 / #2 :nn } {#3} {#4}
+    \use:c { \c_msg_text_prefix_tl #1 / #2 :xxxx } {#3} {#4} {#5} {#6}
   }
   { }
 }
 \msg_class_new:nn { trace } {
   \msg_direct_log:xx {
-    \use:c { \c_msg_text_prefix_tl #1 / #2 :nn } {#3} {#4}
+    \use:c { \c_msg_text_prefix_tl #1 / #2 :xxxx } {#3} {#4} {#5} {#6}
   }
   { }
 }
 \msg_class_new:nn { none } { }
-\cs_new_nopar:Nn \msg_redirect_class:nn {
-  \prop_put:cnn { l_msg_redirect_ #1 _prop } {*} {#2}
+\cs_new_nopar:Npn \msg_redirect_class:nn #1#2 {
+  \prop_put:cnn { l_msg_redirect_ #1 _prop } { * } {#2}
 }
-\cs_new_nopar:Nn \msg_redirect_module:nnn {
+\cs_new_nopar:Npn \msg_redirect_module:nnn #1#2#3 {
   \prop_put:cnn { l_msg_redirect_ #2 _prop } {#1} {#3}
 }
-\cs_new_nopar:Nn \msg_redirect_name:nnn {
+\cs_new_nopar:Npn \msg_redirect_name:nnn #1#2#3 {
   \prop_put:Nnn \l_msg_redirect_names_prop { // #1 / #2 / } {#3}
 }
-\cs_new_nopar:Npn \msg_kernel_new:nnnn #1 {
-  \msg_new:nnnnn { LaTeX } {#1}
-}
-\cs_new_nopar:Npn \msg_kernel_new:nnn #1 {
-  \msg_new:nnnn { LaTeX } {#1}
-}
-\cs_new_nopar:Npn \msg_kernel_new:nn #1 {
-  \msg_new:nnn { LaTeX } {#1}
+\cs_new_nopar:Npn \msg_kernel_new:nnnn #1#2 {
+  \msg_new:nnnn { LaTeX } { #1 / #2 }
 }
-\cs_new_nopar:Npn \msg_kernel_set:nnnn #1 {
-  \msg_set:nnnnn { LaTeX } {#1}
+\cs_new_nopar:Npn \msg_kernel_new:nnn #1#2 {
+  \msg_new:nnn { LaTeX } { #1 / #2 }
 }
-\cs_new_nopar:Npn \msg_kernel_set:nnn #1 {
-  \msg_set:nnnn { LaTeX } {#1}
+\cs_new_nopar:Npn \msg_kernel_set:nnnn #1#2 {
+  \msg_set:nnnn { LaTeX } { #1 / #2 }
 }
-\cs_new_nopar:Npn \msg_kernel_set:nn #1 {
-  \msg_set:nnn { LaTeX } {#1}
+\cs_new_nopar:Npn \msg_kernel_set:nnn #1#2 {
+  \msg_set:nnn { LaTeX } { #1 / #2 }
 }
-\cs_new_nopar:Nn \msg_kernel_classes_new:n {
-  \cs_new_protected:cn { msg_kernel_ #1 :nx } {
-    \use:c { msg_kernel_ #1 :nxx } {##1} {##2} { }
+\cs_new_nopar:Npn \msg_kernel_classes_new:n #1 {
+  \cs_new_protected:cpx { msg_kernel_ #1 :nnxxx } ##1##2##3##4##5
+  {
+    \exp_not:c { msg_kernel_ #1 :nnxxxx }
+      {##1} {##2} {##3} {##4} {##5} { }
+  }
+  \cs_new_protected:cpx { msg_kernel_ #1 :nnxx } ##1##2##3##4
+  {
+    \exp_not:c { msg_kernel_ #1 :nnxxxx }
+      {##1} {##2} {##3} {##4} { } { }
+  }
+  \cs_new_protected:cpx { msg_kernel_ #1 :nnx } ##1##2##3
+  {
+    \exp_not:c { msg_kernel_ #1 :nnxxxx } {##1} {##2} {##3} { } { } { }
   }
-  \cs_new_protected:cn { msg_kernel_ #1 :n } {
-    \use:c { msg_kernel_ #1 :nxx } {##1} { } { }
+  \cs_new_protected:cpx { msg_kernel_ #1 :nn } ##1##2
+  {
+    \exp_not:c { msg_kernel_ #1 :nnxxxx } {##1} {##2} { } { } { } { }
   }
 }
-\cs_new_protected:Nn \msg_kernel_fatal:nxx {
-  \msg_direct_interrupt:xxxxn
+\cs_new_protected:Npn \msg_kernel_fatal:nnxxxx #1#2#3#4#5#6 {
+  \msg_direct_interrupt:xxxx
     { \c_msg_fatal_tl \msg_two_newlines: }
     {
       ( LaTeX ) \msg_space:
-      \use:c { \c_msg_text_prefix_tl LaTeX / #1 :nn } {#2} {#3}
+      \use:c { \c_msg_text_prefix_tl LaTeX / #1 / #2 :xxxx }
+        {#3} {#4} {#5} {#6}
     }
     { ( LaTeX ) \msg_space: }
     { \c_msg_fatal_text_tl }
-    { \tex_end:D }
+  \tex_end:D
 }
 \msg_kernel_classes_new:n { fatal }
-\cs_new_protected:Nn \msg_kernel_error:nxx {
-  \msg_direct_interrupt:xxxxn
+\cs_new_protected:Npn \msg_kernel_error:nnxxxx #1#2#3#4#5#6 {
+  \msg_direct_interrupt:xxxx
     { LaTeX~\c_msg_error_tl \msg_newline: }
     {
       ( LaTeX ) \msg_space:
-      \use:c { \c_msg_text_prefix_tl LaTeX / #1 :nn } {#2} {#3}
+      \use:c { \c_msg_text_prefix_tl LaTeX / #1 / #2 :xxxx }
+        {#3} {#4} {#5} {#6}
     }
     { ( LaTeX ) \msg_space: }
     {
-      \cs_if_exist:cTF { \c_msg_more_text_prefix_tl LaTeX / #1 :nn } {
-        \use:c { \c_msg_more_text_prefix_tl LaTeX / #1 :nn } {#2} {#3}
-      }{
-        \c_msg_no_info_text_tl
-      }
-    }
-    {
-      \cs_if_exist:cT { \c_msg_code_prefix_tl LaTeX /#1 :nn } {
-        \use:c { \c_msg_code_prefix_tl LaTeX / #1 :nn} {#2} {#3}
-      }
+      \cs_if_exist:cTF
+        { \c_msg_more_text_prefix_tl LaTeX / #1 / #2 :xxxx }
+        {
+          \use:c { \c_msg_more_text_prefix_tl LaTeX / #1 / #2 :xxxx }
+            {#3} {#4} {#5} {#6}
+        }
+        { \c_msg_no_info_text_tl }
     }
 }
 \msg_kernel_classes_new:n { error }
-\cs_new_protected_nopar:Npn \msg_kernel_warning:nxx {
-  \msg_warning:nnxx { LaTeX }
+\cs_new_protected_nopar:Npn \msg_kernel_warning:nnxxxx #1#2 {
+  \msg_warning:nnxxxx { LaTeX } { #1 / #2 }
 }
 \msg_kernel_classes_new:n { warning }
-\cs_new_protected_nopar:Npn \msg_kernel_info:nxx {
-  \msg_info:nnxx { LaTeX }
+\cs_new_protected_nopar:Npn \msg_kernel_info:nnxxxx #1#2 {
+  \msg_info:nnxxxx { LaTeX } { #1 / #2 }
 }
 \msg_kernel_classes_new:n { info }
-\msg_kernel_new:nnn { coding-bug } {%
-  This is a LaTeX bug: check coding!\\%
-  #1%
-}{%
-  #2%
-}
-\msg_kernel_new:nnn { message-unknown } {%
-  Unknown message `#2' for module `#1'.%
-}{%
-  LaTeX was asked to display a message by the `#1' module.\\%
-  The message was supposed to be called `#2', but I can't\\%
-  find a message with that name.
-  \c_msg_return_text_tl
-}
-\msg_kernel_new:nnn { message-class-unknown } {%
-  Unknown message class `#1'.%
-}{%
-  You have asked for a message to be redirected to class `#1'\\%
-  but this class is unknown.
-  \c_msg_return_text_tl
-}
-\msg_kernel_new:nnn { message-loop } {%
-  Message redirection loop.%
-}{%
-  You have asked for a message to be redirected,\\%
-  but the redirection instructions form a loop:\\%
-  you've lost the message.
-  \c_msg_return_text_tl
-}
-\cs_set_protected:Nn \msg_kernel_bug:x {
-  \msg_direct_interrupt:xxxxn
+\msg_kernel_new:nnnn { msg } { message-unknown }
+  {Unknown message `#2' for module `#1'.}
+  {%
+    LaTeX was asked to display a message by the `#1' module.\\%
+    The message was supposed to be called `#2', but I can't\\%
+    find a message with that name.%
+    \c_msg_return_text_tl
+  }
+\msg_kernel_new:nnnn { msg } { message-class-unknown }
+  {Unknown message class `#1'.}
+  {%
+    You have asked for a message to be redirected to class `#1'.\\%
+    The message class `#1' has not been set up:\\%
+    perhaps this is a typing error.%
+    \c_msg_return_text_tl
+  }
+\msg_kernel_new:nnnn { msg } { redirect-loop }
+  {Message redirection loop for message class `#1'.}
+  {%
+    You have asked for a message to be redirected,\\%
+    but the redirection instructions form a loop:\\%
+    you've lost the message.%
+    \c_msg_return_text_tl
+  }
+\cs_set_protected:Npn \msg_kernel_bug:x #1 {
+  \msg_direct_interrupt:xxxx
     { \c_msg_kernel_bug_text_tl }
     { !~#1 }
     { ! }
     { \c_msg_kernel_bug_more_text_tl }
-    { }
 }
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/expl3/l3names.sty b/Master/texmf-dist/tex/latex/expl3/l3names.sty
index dccba570136..ba040510d0d 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3names.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3names.sty
@@ -87,7 +87,7 @@
   \gdef\filedescription{#1}%
   \ProvidesPackage{[unknown package]}[0000/00/00 v0.0 #1]
 }
-\GetIdInfo$Id: l3names.dtx 1452 2009-08-08 14:09:32Z joseph $
+\GetIdInfo$Id: l3names.dtx 1677 2009-11-02 08:24:04Z joseph $
      {L3 Experimental Naming Scheme for TeX Primitives}
 \endgroup
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/expl3/l3prg.sty b/Master/texmf-dist/tex/latex/expl3/l3prg.sty
index ef18cc597ef..63354678065 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3prg.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3prg.dtx 1545 2009-09-20 06:57:55Z joseph $
+\GetIdInfo$Id: l3prg.dtx 1677 2009-11-02 08:24:04Z joseph $
        {L3 Experimental control structures}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -432,7 +432,7 @@
   \tex_catcode:D `\& = \c_twelve \tex_relax:D
 \tl_to_lowercase:n {
   \group_end:
-  \cs_new_nopar:Nn \prg_variable_get_scope:N {
+  \cs_new_nopar:Npn \prg_variable_get_scope:N #1 {
     \exp_last_unbraced:Nf \prg_variable_get_scope_aux:w
     { \cs_to_str:N #1 \exp_stop_f: \q_nil }
   }
@@ -445,7 +445,7 @@
   \tex_catcode:D `\& = \c_twelve \tex_relax:D
 \tl_to_lowercase:n {
   \group_end:
-  \cs_new_nopar:Nn \prg_variable_get_type:N {
+  \cs_new_nopar:Npn \prg_variable_get_type:N #1 {
     \exp_after:wN \p;rg_variable_get_type_aux:w
       \token_to_str:N #1 & a \q_nil
   }
diff --git a/Master/texmf-dist/tex/latex/expl3/l3prop.sty b/Master/texmf-dist/tex/latex/expl3/l3prop.sty
index 48aa3138d79..14c542416e8 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3prop.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3prop.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3prop.dtx 1536 2009-09-16 07:23:04Z joseph $
+\GetIdInfo$Id: l3prop.dtx 1622 2009-10-25 06:41:23Z will $
           {L3 Experimental Property Lists}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -176,14 +176,14 @@
   \prop_map_function_aux:w #1
 }
 \cs_generate_variant:Nn \prop_map_function:NN {c,Nc,cc}
-\num_new:N \g_prop_inline_level_num
+\int_new:N \g_prop_inline_level_int
 \cs_new_nopar:Npn \prop_map_inline:Nn #1#2 {
-  \num_gincr:N \g_prop_inline_level_num
-  \cs_gset:cpn {prop_map_inline_ \num_use:N \g_prop_inline_level_num :n}
+  \int_gincr:N \g_prop_inline_level_int
+  \cs_gset:cpn {prop_map_inline_ \int_use:N \g_prop_inline_level_int :n}
     ##1##2{#2}
   \prop_map_function:Nc #1
-    {prop_map_inline_ \num_use:N \g_prop_inline_level_num :n}
-  \num_gdecr:N \g_prop_inline_level_num
+    {prop_map_inline_ \int_use:N \g_prop_inline_level_int :n}
+  \int_gdecr:N \g_prop_inline_level_int
 }
 \cs_generate_variant:Nn\prop_map_inline:Nn {cn}
 \cs_new_eq:NN \prop_map_break: \use_none_delimit_by_q_stop:w
diff --git a/Master/texmf-dist/tex/latex/expl3/l3seq.sty b/Master/texmf-dist/tex/latex/expl3/l3seq.sty
index 446e898e857..a14df7ccef1 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3seq.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3seq.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3seq.dtx 1415 2009-06-17 19:37:24Z will $
+\GetIdInfo$Id: l3seq.dtx 1692 2009-11-03 21:02:34Z joseph $
           {L3 Experimental sequences and stacks}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -92,9 +92,9 @@
   }
   \exp_after:wN \seq_tmp:w #1 \seq_elt:w #2 \seq_elt_end: \q_no_value \q_stop
 }
-\cs_generate_variant:Nn \seq_if_in:NnTF {cV,co,c,cx}
-\cs_generate_variant:Nn \seq_if_in:NnT  {cV,co,c,cx}
-\cs_generate_variant:Nn \seq_if_in:NnF  {cV,co,c,cx}
+\cs_generate_variant:Nn \seq_if_in:NnTF { NV, cV, co, c, cx}
+\cs_generate_variant:Nn \seq_if_in:NnT  { NV, cV, co, c, cx}
+\cs_generate_variant:Nn \seq_if_in:NnF  { NV, cV, co, c, cx}
 \cs_new_nopar:Npn \seq_get:NN #1 {
   \seq_if_empty_err:N #1
   \exp_after:wN \seq_get_aux:w #1 \q_stop
@@ -178,12 +178,12 @@
 }
 \cs_generate_variant:Nn \seq_map_inline:Nn {c}
 \seq_new:N \l_seq_remove_seq
-\cs_new:Nn \seq_remove_duplicates_aux:NN {
+\cs_new:Npn \seq_remove_duplicates_aux:NN #1#2 {
   \seq_clear:N \l_seq_remove_seq
   \seq_map_function:NN #2 \seq_remove_duplicates_aux:n
   #1 #2 \l_seq_remove_seq
 }
-\cs_new:Nn \seq_remove_duplicates_aux:n {
+\cs_new:Npn \seq_remove_duplicates_aux:n #1 {
   \seq_if_in:NnF \l_seq_remove_seq {#1} {
     \seq_put_right:Nn \l_seq_remove_seq {#1}
   }
diff --git a/Master/texmf-dist/tex/latex/expl3/l3tl.sty b/Master/texmf-dist/tex/latex/expl3/l3tl.sty
index e6906d8952c..7ca05792d8e 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3tl.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3tl.dtx 1505 2009-09-03 20:29:19Z joseph $
+\GetIdInfo$Id: l3tl.dtx 1621 2009-10-25 06:36:19Z will $
           {L3 Experimental Token Lists}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -386,25 +386,24 @@
 }
 \cs_generate_variant:Nn \tl_map_function:NN {cN}
 \cs_new:Npn \tl_map_inline:nn #1#2{
-  \num_gincr:N \g_tl_inline_level_num
-  \cs_gset:cpn {tl_map_inline_ \num_use:N \g_tl_inline_level_num :n}
+  \int_gincr:N \g_tl_inline_level_int
+  \cs_gset:cpn {tl_map_inline_ \int_use:N \g_tl_inline_level_int :n}
   ##1{#2}
   \exp_args:Nc \tl_map_function_aux:Nn
-  {tl_map_inline_ \num_use:N \g_tl_inline_level_num :n}
+  {tl_map_inline_ \int_use:N \g_tl_inline_level_int :n}
   #1 \q_recursion_tail\q_recursion_stop
-  \num_gdecr:N \g_tl_inline_level_num
+  \int_gdecr:N \g_tl_inline_level_int
 }
 \cs_new:Npn \tl_map_inline:Nn #1#2{
-  \num_gincr:N \g_tl_inline_level_num
-  \cs_gset:cpn {tl_map_inline_ \num_use:N \g_tl_inline_level_num :n}
+  \int_gincr:N \g_tl_inline_level_int
+  \cs_gset:cpn {tl_map_inline_ \int_use:N \g_tl_inline_level_int :n}
   ##1{#2}
   \exp_last_unbraced:NcV \tl_map_function_aux:Nn
-  {tl_map_inline_ \num_use:N \g_tl_inline_level_num :n}
+  {tl_map_inline_ \int_use:N \g_tl_inline_level_int :n}
   #1 \q_recursion_tail\q_recursion_stop
-  \num_gdecr:N \g_tl_inline_level_num
+  \int_gdecr:N \g_tl_inline_level_int
 }
 \cs_generate_variant:Nn \tl_map_inline:Nn {c}
-\tl_new:Nn \g_tl_inline_level_num{0}
 \cs_new:Npn \tl_map_variable:nNn #1#2#3{
   \tl_map_variable_aux:Nnn #2 {#3} #1 \q_recursion_tail \q_recursion_stop
 }