l3kernel 2966 (19nov11)

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

10 files changed, 226 insertions, 120 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 74a65cddb61..e1ef050b2bb 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -48,8 +48,8 @@
 \RequirePackage{l3names}
 \def\ExplFileName{expl3}
 \def\ExplFileDescription{L3 Experimental code bundle wrapper}
-\def\ExplFileDate{2011/10/09}
-\def\ExplFileVersion{2900}
+\def\ExplFileDate{2011/11/19}
+\def\ExplFileVersion{2966}
 \RequirePackage{etex}
 \reserveinserts{32}
 \RequirePackage{calc}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
index 2a432c83b9e..745f2e3421a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3basics.dtx 2896 2011-10-09 20:36:50Z joseph $
+\GetIdInfo$Id: l3basics.dtx 2915 2011-10-15 21:21:08Z bruno $
   {L3 Experimental basic definitions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -58,8 +58,6 @@
 \tex_let:D \fi:                \tex_fi:D
 \tex_let:D \reverse_if:N       \etex_unless:D
 \tex_let:D \if:w               \tex_if:D
-\tex_let:D \if_bool:N          \tex_ifodd:D
-\tex_let:D \if_predicate:w     \tex_ifodd:D
 \tex_let:D \if_charcode:w      \tex_if:D
 \tex_let:D \if_catcode:w       \tex_ifcat:D
 \tex_let:D \if_meaning:w       \tex_ifx:D
@@ -420,6 +418,22 @@
       }
       { \prg_return_true: }
   }
+\cs_set:Npn \cs_if_exist_use:NTF #1#2
+  { \cs_if_exist:NTF #1 { #1 #2} }
+\cs_set:Npn \cs_if_exist_use:NF #1
+  { \cs_if_exist:NTF #1 { #1 } }
+\cs_set:Npn \cs_if_exist_use:NT #1 #2
+  { \cs_if_exist:NTF #1 { #1#2 } { } }
+\cs_set:Npn \cs_if_exist_use:N #1
+  { \cs_if_exist:NTF #1 { #1 } { } }
+\cs_set:Npn \cs_if_exist_use:cTF #1#2
+  { \cs_if_exist:cTF {#1} { \use:c {#1} #2 } }
+\cs_set:Npn \cs_if_exist_use:cF #1
+  { \cs_if_exist:cTF {#1} { \use:c {#1} } }
+\cs_set:Npn \cs_if_exist_use:cT #1#2
+  { \cs_if_exist:cTF {#1} { \use:c {#1} #2 } { } }
+\cs_set:Npn \cs_if_exist_use:c #1
+  { \cs_if_exist:cTF {#1} { \use:c {#1} } { } }
 \tex_let:D \c_minus_one \m@ne
 \tex_chardef:D \c_sixteen = 16~
 \tex_chardef:D \c_zero    = 0~
@@ -553,7 +567,7 @@
   { \cs_split_function:NN #1 \cs_get_arg_count_from_signature_aux:nnN }
 \cs_new:Npn \cs_get_arg_count_from_signature_aux:nnN #1#2#3
   {
-    \if_predicate:w #3
+    \if_meaning:w \c_true_bool #3
       \exp_after:wN \use_i:nn
     \else:
       \exp_after:wN\use_ii:nn
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
index 1e25d4ea93d..817e1982e4f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3box.dtx 2896 2011-10-09 20:36:50Z joseph $
+\GetIdInfo$Id: l3box.dtx 2960 2011-11-15 08:50:21Z joseph $
   {L3 Experimental boxes}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -57,19 +57,19 @@
     \newbox #1
   }
 \cs_generate_variant:Nn \box_new:N { c }
-\cs_new_protected_nopar:Npn \box_clear:N #1
+\cs_new_protected:Npn \box_clear:N #1
   { \box_set_eq:NN  #1 \c_empty_box }
-\cs_new_protected_nopar:Npn \box_gclear:N #1
+\cs_new_protected:Npn \box_gclear:N #1
   { \box_gset_eq:NN #1 \c_empty_box }
 \cs_generate_variant:Nn \box_clear:N  { c }
 \cs_generate_variant:Nn \box_gclear:N { c }
-\cs_new_protected_nopar:Npn \box_clear_new:N #1
+\cs_new_protected:Npn \box_clear_new:N #1
   {
     \cs_if_exist:NTF #1
       { \box_set_eq:NN #1 \c_empty_box }
       { \box_new:N #1 }
   }
-\cs_new_protected_nopar:Npn \box_gclear_new:N #1
+\cs_new_protected:Npn \box_gclear_new:N #1
   {
     \cs_if_exist:NTF #1
       { \box_gset_eq:NN #1 \c_empty_box }
@@ -77,15 +77,15 @@
   }
 \cs_generate_variant:Nn \box_clear_new:N  { c }
 \cs_generate_variant:Nn \box_gclear_new:N { c }
-\cs_new_protected_nopar:Npn \box_set_eq:NN #1#2
+\cs_new_protected:Npn \box_set_eq:NN #1#2
   { \tex_setbox:D #1 \tex_copy:D #2 }
-\cs_new_protected_nopar:Npn \box_gset_eq:NN
+\cs_new_protected:Npn \box_gset_eq:NN
   { \tex_global:D \box_set_eq:NN }
 \cs_generate_variant:Nn \box_set_eq:NN  { cN , Nc , cc }
 \cs_generate_variant:Nn \box_gset_eq:NN { cN , Nc , cc }
-\cs_new_protected_nopar:Npn \box_set_eq_clear:NN #1#2
+\cs_new_protected:Npn \box_set_eq_clear:NN #1#2
   { \tex_setbox:D #1 \tex_box:D #2 }
-\cs_new_protected_nopar:Npn \box_gset_eq_clear:NN
+\cs_new_protected:Npn \box_gset_eq_clear:NN
   { \tex_global:D  \box_set_eq_clear:NN }
 \cs_generate_variant:Nn \box_set_eq_clear:NN  { cN , Nc , cc }
 \cs_generate_variant:Nn \box_gset_eq_clear:NN { cN , Nc , cc }
@@ -95,11 +95,11 @@
 \cs_generate_variant:Nn \box_ht:N { c }
 \cs_generate_variant:Nn \box_dp:N { c }
 \cs_generate_variant:Nn \box_wd:N { c }
-\cs_new_protected_nopar:Npn \box_set_dp:Nn #1#2
+\cs_new_protected:Npn \box_set_dp:Nn #1#2
   { \box_dp:N #1 \dim_eval:w #2 \dim_eval_end: }
-\cs_new_protected_nopar:Npn \box_set_ht:Nn #1#2
+\cs_new_protected:Npn \box_set_ht:Nn #1#2
   { \box_ht:N #1 \dim_eval:w #2 \dim_eval_end: }
-\cs_new_protected_nopar:Npn \box_set_wd:Nn #1#2
+\cs_new_protected:Npn \box_set_wd:Nn #1#2
   { \box_wd:N #1 \dim_eval:w #2 \dim_eval_end: }
 \cs_generate_variant:Nn \box_set_ht:Nn { c }
 \cs_generate_variant:Nn \box_set_dp:Nn { c }
@@ -137,10 +137,9 @@
 \cs_generate_variant:Nn \box_if_empty:NT  { c }
 \cs_generate_variant:Nn \box_if_empty:NF  { c }
 \cs_generate_variant:Nn \box_if_empty:NTF { c }
-\cs_new_eq:NN \l_last_box \tex_lastbox:D
-\cs_new_protected_nopar:Npn \box_set_to_last:N #1
-  { \tex_setbox:D #1 \l_last_box }
-\cs_new_protected_nopar:Npn \box_gset_to_last:N
+\cs_new_protected:Npn \box_set_to_last:N #1
+  { \tex_setbox:D #1 \tex_lastbox:D }
+\cs_new_protected:Npn \box_gset_to_last:N
   { \tex_global:D \box_set_to_last:N }
 \cs_generate_variant:Nn \box_set_to_last:N  { c }
 \cs_generate_variant:Nn \box_gset_to_last:N { c }
@@ -149,20 +148,20 @@
 \box_new:N \l_tmpb_box
 \cs_new_eq:NN \box_show:N \tex_showbox:D
 \cs_generate_variant:Nn \box_show:N { c }
-\cs_new_protected_nopar:Npn \hbox:n { \tex_hbox:D \scan_stop: }
+\cs_new_protected:Npn \hbox:n { \tex_hbox:D \scan_stop: }
 \cs_new_protected:Npn \hbox_set:Nn #1#2 { \tex_setbox:D #1 \tex_hbox:D {#2} }
-\cs_new_protected_nopar:Npn \hbox_gset:Nn { \tex_global:D \hbox_set:Nn }
+\cs_new_protected:Npn \hbox_gset:Nn { \tex_global:D \hbox_set:Nn }
 \cs_generate_variant:Nn \hbox_set:Nn { c }
 \cs_generate_variant:Nn \hbox_gset:Nn { c }
 \cs_new_protected:Npn \hbox_set_to_wd:Nnn #1#2#3
   { \tex_setbox:D #1 \tex_hbox:D to \dim_eval:w #2 \dim_eval_end: {#3} }
-\cs_new_protected_nopar:Npn \hbox_gset_to_wd:Nnn
+\cs_new_protected:Npn \hbox_gset_to_wd:Nnn
   { \tex_global:D \hbox_set_to_wd:Nnn }
 \cs_generate_variant:Nn \hbox_set_to_wd:Nnn { c }
 \cs_generate_variant:Nn \hbox_gset_to_wd:Nnn { c }
-\cs_new_protected_nopar:Npn \hbox_set:Nw  #1
+\cs_new_protected:Npn \hbox_set:Nw  #1
   { \tex_setbox:D #1 \tex_hbox:D \c_group_begin_token }
-\cs_new_protected_nopar:Npn \hbox_gset:Nw
+\cs_new_protected:Npn \hbox_gset:Nw
   { \tex_global:D \hbox_set:Nw }
 \cs_generate_variant:Nn \hbox_set:Nw  { c }
 \cs_generate_variant:Nn \hbox_gset:Nw { c }
@@ -185,30 +184,30 @@
 \cs_new_eq:NN \hbox_unpack_clear:N \tex_unhbox:D
 \cs_generate_variant:Nn \hbox_unpack:N { c }
 \cs_generate_variant:Nn \hbox_unpack_clear:N { c }
-\cs_new_protected_nopar:Npn \vbox:n { \tex_vbox:D \scan_stop: }
-\cs_new_protected_nopar:Npn \vbox_top:n { \tex_vtop:D \scan_stop: }
+\cs_new_protected:Npn \vbox:n { \tex_vbox:D \scan_stop: }
+\cs_new_protected:Npn \vbox_top:n { \tex_vtop:D \scan_stop: }
 \cs_new_protected:Npn \vbox_to_ht:nn #1#2
   { \tex_vbox:D to \dim_eval:w #1 \dim_eval_end: {#2} }
 \cs_new_protected:Npn \vbox_to_zero:n #1 { \tex_vbox:D to \c_zero_dim {#1} }
 \cs_new_protected:Npn \vbox_set:Nn #1#2 { \tex_setbox:D #1 \tex_vbox:D {#2} }
-\cs_new_protected_nopar:Npn \vbox_gset:Nn  { \tex_global:D \vbox_set:Nn }
+\cs_new_protected:Npn \vbox_gset:Nn  { \tex_global:D \vbox_set:Nn }
 \cs_generate_variant:Nn \vbox_set:Nn  { c }
 \cs_generate_variant:Nn \vbox_gset:Nn { c }
 \cs_new_protected:Npn \vbox_set_top:Nn #1#2
   { \tex_setbox:D #1 \tex_vtop:D {#2} }
-\cs_new_protected_nopar:Npn \vbox_gset_top:Nn
+\cs_new_protected:Npn \vbox_gset_top:Nn
   { \tex_global:D \vbox_set_top:Nn }
 \cs_generate_variant:Nn \vbox_set_top:Nn { c }
 \cs_generate_variant:Nn \vbox_gset_top:Nn { c }
 \cs_new_protected:Npn \vbox_set_to_ht:Nnn #1#2#3
   { \tex_setbox:D #1 \tex_vbox:D to \dim_eval:w #2 \dim_eval_end: {#3} }
-\cs_new_protected_nopar:Npn \vbox_gset_to_ht:Nnn
+\cs_new_protected:Npn \vbox_gset_to_ht:Nnn
   { \tex_global:D \vbox_set_to_ht:Nnn }
 \cs_generate_variant:Nn \vbox_set_to_ht:Nnn  { c }
 \cs_generate_variant:Nn \vbox_gset_to_ht:Nnn { c }
-\cs_new_nopar:Npn \vbox_set:Nw #1
+\cs_new:Npn \vbox_set:Nw #1
   { \tex_setbox:D #1 \tex_vbox:D \c_group_begin_token }
-\cs_new_protected_nopar:Npn \vbox_gset:Nw
+\cs_new_protected:Npn \vbox_gset:Nw
   { \tex_global:D \vbox_set:Nw }
 \cs_generate_variant:Nn \vbox_set:Nw  { c }
 \cs_generate_variant:Nn \vbox_gset:Nw { c }
@@ -224,7 +223,7 @@
 \cs_new_eq:NN \vbox_unpack_clear:N \tex_unvbox:D
 \cs_generate_variant:Nn \vbox_unpack:N { c }
 \cs_generate_variant:Nn \vbox_unpack_clear:N { c }
-\cs_new_protected_nopar:Npn \vbox_set_split_to_ht:NNn #1#2#3
+\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: }
 \fp_new:N \l_box_angle_fp
 \fp_new:N \l_box_cos_fp
@@ -243,7 +242,7 @@
 \fp_new:N \l_box_y_fp
 \fp_new:N \l_box_x_new_fp
 \fp_new:N \l_box_y_new_fp
-\cs_new_protected_nopar:Npn \box_rotate:Nn #1#2
+\cs_new_protected:Npn \box_rotate:Nn #1#2
   {
     \hbox_set:Nn #1
       {
@@ -260,7 +259,7 @@
         \group_end:
     }
   }
-\cs_new_protected_nopar:Npn \box_rotate_aux:N #1
+\cs_new_protected:Npn \box_rotate_aux:N #1
   {
     \dim_set:Nn \l_box_top_dim    {  \box_ht:N #1 }
     \dim_set:Nn \l_box_bottom_dim { -\box_dp:N #1 }
@@ -294,7 +293,7 @@
       { \l_box_right_new_dim - \l_box_left_new_dim }
     \box_use:N \l_box_tmp_box
   }
-\cs_new_protected_nopar:Npn \box_rotate_set_sin_cos:
+\cs_new_protected:Npn \box_rotate_set_sin_cos:
   {
     \fp_set_eq:NN \l_box_tmp_fp \l_box_angle_fp
     \fp_div:Nn \l_box_tmp_fp { 180 }
@@ -302,7 +301,7 @@
     \fp_sin:Nn \l_box_sin_fp { \l_box_tmp_fp }
     \fp_cos:Nn \l_box_cos_fp { \l_box_tmp_fp }
   }
-\cs_new_protected_nopar:Npn \box_rotate_x:nnN #1#2#3
+\cs_new_protected:Npn \box_rotate_x:nnN #1#2#3
   {
     \fp_set_from_dim:Nn \l_box_x_fp {#1}
     \fp_set_from_dim:Nn \l_box_y_fp {#2}
@@ -313,7 +312,7 @@
     \fp_sub:Nn \l_box_x_new_fp { \l_box_tmp_fp }
     \dim_set:Nn #3 { \fp_to_dim:N \l_box_x_new_fp }
   }
-\cs_new_protected_nopar:Npn \box_rotate_y:nnN #1#2#3
+\cs_new_protected:Npn \box_rotate_y:nnN #1#2#3
   {
     \fp_set_from_dim:Nn \l_box_x_fp {#1}
     \fp_set_from_dim:Nn \l_box_y_fp {#2}
@@ -324,7 +323,7 @@
     \fp_add:Nn \l_box_y_new_fp { \l_box_tmp_fp }
     \dim_set:Nn #3 { \fp_to_dim:N \l_box_y_new_fp }
 }
-\cs_new_protected_nopar:Npn \box_rotate_quadrant_one:
+\cs_new_protected:Npn \box_rotate_quadrant_one:
   {
     \box_rotate_y:nnN \l_box_right_dim \l_box_top_dim
       \l_box_top_new_dim
@@ -335,7 +334,7 @@
     \box_rotate_x:nnN \l_box_right_dim \l_box_bottom_dim
       \l_box_right_new_dim
   }
-\cs_new_protected_nopar:Npn \box_rotate_quadrant_two:
+\cs_new_protected:Npn \box_rotate_quadrant_two:
   {
     \box_rotate_y:nnN \l_box_right_dim \l_box_bottom_dim
       \l_box_top_new_dim
@@ -346,7 +345,7 @@
     \box_rotate_x:nnN \l_box_left_dim   \l_box_bottom_dim
       \l_box_right_new_dim
   }
-\cs_new_protected_nopar:Npn \box_rotate_quadrant_three:
+\cs_new_protected:Npn \box_rotate_quadrant_three:
   {
     \box_rotate_y:nnN \l_box_left_dim  \l_box_bottom_dim
       \l_box_top_new_dim
@@ -357,7 +356,7 @@
     \box_rotate_x:nnN \l_box_left_dim   \l_box_top_dim
       \l_box_right_new_dim
   }
-\cs_new_protected_nopar:Npn \box_rotate_quadrant_four:
+\cs_new_protected:Npn \box_rotate_quadrant_four:
   {
     \box_rotate_y:nnN \l_box_left_dim  \l_box_top_dim
       \l_box_top_new_dim
@@ -417,7 +416,7 @@
       }
     \box_resize_common:N #1
   }
-\cs_new_protected_nopar:Npn \box_resize_to_ht_plus_dp:Nn #1#2
+\cs_new_protected:Npn \box_resize_to_ht_plus_dp:Nn #1#2
   {
     \hbox_set:Nn #1
       {
@@ -438,7 +437,7 @@
       }
   }
 \cs_generate_variant:Nn \box_resize_to_ht_plus_dp:Nn { c }
-\cs_new_protected_nopar:Npn \box_resize_to_wd:Nn #1#2
+\cs_new_protected:Npn \box_resize_to_wd:Nn #1#2
   {
     \hbox_set:Nn #1
       {
@@ -458,7 +457,7 @@
       }
   }
 \cs_generate_variant:Nn \box_resize_to_wd:Nn { c }
-\cs_new_protected_nopar:Npn \box_scale:Nnn #1#2#3
+\cs_new_protected:Npn \box_scale:Nnn #1#2#3
   {
     \hbox_set:Nn #1
       {
@@ -480,7 +479,7 @@
       }
   }
 \cs_generate_variant:Nn \box_scale:Nnn { c }
-\cs_new_protected_nopar:Npn \box_scale_aux:Nnn #1#2#3
+\cs_new_protected:Npn \box_scale_aux:Nnn #1#2#3
   {
     \fp_compare:NNNTF \l_box_scale_y_fp > \c_zero_fp
       {
@@ -496,7 +495,7 @@
       { \l_box_right_new_dim -#2 \l_box_right_dim }
     \box_resize_common:N #1
   }
-\cs_new_protected_nopar:Npn \box_resize_common:N #1
+\cs_new_protected:Npn \box_resize_common:N #1
   {
     \hbox_set:Nn \l_box_tmp_box
       {
@@ -520,6 +519,63 @@
         \box_use:N \l_box_tmp_box
       }
   }
+\cs_new_protected:Npn \box_clip:N #1
+  { \hbox_set:Nn #1 { \driver_box_use_clip:N #1 } }
+\cs_generate_variant:Nn \box_clip:N { c }
+\cs_new_protected:Npn \box_trim:Nnnnn #1#2#3#4#5
+  {
+    \box_set_wd:Nn #1 { \box_wd:N #1 - \dim_eval:n {#4} - \dim_eval:n {#2} }
+    \hbox_set:Nn #1
+      {
+        \skip_horizontal:n { - \dim_eval:n {#2} }
+        \box_use:N #1
+      }
+    \dim_compare:nNnTF { \box_dp:N #1 } > {#3}
+      { \box_set_dp:Nn #1 { \box_dp:N #1 - \dim_eval:n {#3} } }
+      {
+        \hbox_set:Nn #1
+          {
+            \box_move_down:nn { \dim_eval:n {#3} - \box_dp:N #1 }
+              { \box_use:N #1 }
+          }
+        \box_set_dp:Nn #1 \c_zero_dim
+      }
+    \dim_compare:nNnTF { \box_ht:N #1 } > {#5}
+      { \box_set_ht:Nn #1 { \box_ht:N #1 - \dim_eval:n {#5} } }
+      {
+        \hbox_set:Nn #1
+          {
+            \box_move_up:nn { \dim_eval:n {#5} - \box_ht:N #1 }
+              { \box_use:N #1 }
+          }
+        \box_set_ht:Nn #1 \c_zero_dim
+      }
+  }
+\cs_generate_variant:Nn \box_trim:Nnnnn { c }
+\cs_new_protected:Npn \box_viewport:Nnnnn #1#2#3#4#5
+  {
+    \box_set_wd:Nn #1 { \dim_eval:n {#4} - \dim_eval:n {#2} }
+    \hbox_set:Nn #1
+      {
+        \skip_horizontal:n { - \dim_eval:n {#2} }
+        \box_use:N #1
+      }
+    \dim_compare:nNnTF {#3} > \c_zero_dim
+      {
+        \hbox_set:Nn #1 { \box_move_down:nn {#3} { \box_use:N #1 } }
+        \box_set_dp:Nn #1 \c_zero_dim
+      }
+      { \box_set_dp:Nn #1 { - \dim_eval:n {#3} } }
+    \dim_compare:nNnTF {#5} > \c_zero_dim
+      { \box_set_ht:Nn #1 {#5} }
+      {
+        \hbox_set:Nn #1
+          { \box_move_up:nn { -\dim_eval:n {#5} } { \box_use:N #1 } }
+        \box_set_ht:Nn #1 \c_zero_dim
+      }
+  }
+\cs_generate_variant:Nn \box_viewport:Nnnnn { c }
+\cs_new_eq:NN \l_last_box \tex_lastbox:D
 %% 
 %%
 %% End of file `l3box.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
index b3266a06681..01a360b3861 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
@@ -47,7 +47,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3coffins.dtx 2814 2011-09-12 12:56:08Z joseph $
+\GetIdInfo$Id: l3coffins.dtx 2963 2011-11-15 22:06:41Z joseph $
   {L3 Experimental coffin code layer}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -241,6 +241,12 @@
 \hbox_set:Nn  \c_empty_coffin { }
 \coffin_new:N \l_coffin_aligned_coffin
 \coffin_new:N \l_coffin_aligned_internal_coffin
+\cs_new_eq:NN \coffin_dp:N \box_dp:N
+\cs_new_eq:NN \coffin_dp:c \box_dp:c
+\cs_new_eq:NN \coffin_ht:N \box_ht:N
+\cs_new_eq:NN \coffin_ht:c \box_ht:c
+\cs_new_eq:NN \coffin_wd:N \box_wd:N
+\cs_new_eq:NN \coffin_wd:c \box_wd:c
 \cs_new_protected_nopar:Npn \coffin_get_pole:NnN #1#2#3
   {
     \prop_get:cnNF
@@ -284,7 +290,7 @@
     \cs_set_eq:NN \Width       \l_coffin_Width_dim
     \dim_set:Nn \Height      { \box_ht:N #1 }
     \dim_set:Nn \Depth       { \box_dp:N #1 }
-    \dim_set:Nn \TotalHeight { \box_ht:N #1 - \box_dp:N #1 }
+    \dim_set:Nn \TotalHeight { \box_ht:N #1 + \box_dp:N #1 }
     \dim_set:Nn \Width       { \box_wd:N #1 }
   }
 \cs_new_protected_nopar:Npn \coffin_end_user_dimensions:
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
index 8196f23e1eb..831fb50ae02 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3int.dtx 2896 2011-10-09 20:36:50Z joseph $
+\GetIdInfo$Id: l3int.dtx 2928 2011-10-22 12:32:44Z bruno $
   {L3 Experimental integers}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -126,7 +126,7 @@
     \newcount #1
   }
 \cs_generate_variant:Nn \int_new:N { c }
-\cs_new_protected_nopar:Npn \int_const:Nn #1#2
+\cs_new_protected:Npn \int_const:Nn #1#2
   {
     \int_compare:nNnTF {#2} > \c_minus_one
       {
@@ -157,9 +157,9 @@
 \cs_new_protected_nopar:Npn \int_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
 \cs_generate_variant:Nn \int_gset_eq:NN {       c }
 \cs_generate_variant:Nn \int_gset_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \int_add:Nn #1#2
+\cs_new_protected:Npn \int_add:Nn #1#2
   { \tex_advance:D #1 by \int_eval:w #2 \int_eval_end: }
-\cs_new_nopar:Npn \int_sub:Nn #1#2
+\cs_new_protected:Npn \int_sub:Nn #1#2
   { \tex_advance:D #1 by - \int_eval:w #2 \int_eval_end: }
 \cs_new_protected_nopar:Npn \int_gadd:Nn
   { \tex_global:D \int_add:Nn }
@@ -181,13 +181,13 @@
 \cs_generate_variant:Nn \int_decr:N  { c }
 \cs_generate_variant:Nn \int_gincr:N { c }
 \cs_generate_variant:Nn \int_gdecr:N { c }
-\cs_new_protected_nopar:Npn \int_set:Nn #1#2
+\cs_new_protected:Npn \int_set:Nn #1#2
   { #1 ~ \int_eval:w #2\int_eval_end: }
 \cs_new_protected_nopar:Npn \int_gset:Nn { \tex_global:D \int_set:Nn }
 \cs_generate_variant:Nn \int_set:Nn  { c }
 \cs_generate_variant:Nn \int_gset:Nn { c }
 \cs_new_eq:NN \int_use:N \tex_the:D
-\cs_new_nopar:Npn \int_use:c #1 { \int_use:N \cs:w #1 \cs_end: }
+\cs_new:Npn \int_use:c #1 { \int_use:N \cs:w #1 \cs_end: }
 \prg_new_conditional:Npnn \int_compare:n #1 { p , T , F , TF }
   { \exp_after:wN \int_compare_aux:nw \int_value:w \int_eval:w #1 \q_stop }
 \cs_new:Npn \int_compare_aux:nw #1#2 \q_stop
@@ -338,7 +338,7 @@
     \int_compare:nNnF {#1} #2 {#3}
       { \int_do_until:nNnn {#1} #2 {#3} {#4} }
   }
-\cs_new_nopar:Npn \int_to_arabic:n #1 { \int_eval:n {#1} }
+\cs_new:Npn \int_to_arabic:n #1 { \int_eval:n {#1} }
 \cs_new:Npn \int_to_symbols:nnn #1#2#3
   {
     \int_compare:nNnTF {#1} > {#2}
@@ -490,7 +490,7 @@
   { \int_to_base:nn {#1} { 16 } }
 \cs_new:Npn \int_to_octal:n #1
   { \int_to_base:nn {#1} { 8 } }
-\cs_new_nopar:Npn \int_to_roman:n #1
+\cs_new:Npn \int_to_roman:n #1
   {
     \exp_after:wN \int_to_roman_aux:N
       \int_to_roman:w \int_eval:n {#1} Q
@@ -500,7 +500,7 @@
     \use:c { int_to_roman_ #1 :w }
     \int_to_roman_aux:N
   }
-\cs_new_nopar:Npn \int_to_Roman:n #1
+\cs_new:Npn \int_to_Roman:n #1
   {
     \exp_after:wN \int_to_Roman_aux:N
       \int_to_roman:w \int_eval:n {#1} Q
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
index c93aa0bf179..aa3e05244c3 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3names.dtx 2896 2011-10-09 20:36:50Z joseph $
+\GetIdInfo$Id: l3names.dtx 2944 2011-11-11 07:10:26Z joseph $
   {L3 Experimental namespace for primitives}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -454,16 +454,19 @@
   \name_primitive:NN \pdfdecimaldigits      \pdftex_pdfdecimaldigits:D
   \name_primitive:NN \pdfhorigin            \pdftex_pdfhorigin:D
   \name_primitive:NN \pdfinfo               \pdftex_pdfinfo:D
+  \name_primitive:NN \pdflastxform          \pdftex_pdflastxform:D
   \name_primitive:NN \pdfliteral            \pdftex_pdfliteral:D
   \name_primitive:NN \pdfminorversion       \pdftex_pdfminorversion:D
   \name_primitive:NN \pdfobjcompresslevel   \pdftex_pdfobjcompresslevel:D
   \name_primitive:NN \pdfoutput             \pdftex_pdfoutput:D
+  \name_primitive:NN \pdfrefxform           \pdftex_pdfrefxform:D
   \name_primitive:NN \pdfrestore            \pdftex_pdfrestore:D
   \name_primitive:NN \pdfsave               \pdftex_pdfsave:D
   \name_primitive:NN \pdfsetmatrix          \pdftex_pdfsetmatrix:D
   \name_primitive:NN \pdfpkresolution       \pdftex_pdfpkresolution:D
   \name_primitive:NN \pdftexrevision        \pdftex_pdftextrevision:D
   \name_primitive:NN \pdfvorigin            \pdftex_pdfvorigin:D
+  \name_primitive:NN \pdfxform              \pdftex_pdfxform:D
   \name_primitive:NN \pdfstrcmp             \pdftex_strcmp:D
   \name_primitive:NN \XeTeXversion          \xetex_XeTeXversion:D
   \name_primitive:NN \catcodetable          \luatex_catcodetable:D
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
index 9fdb0cb4006..45e1aa17ddb 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
@@ -46,12 +46,14 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3prg.dtx 2896 2011-10-09 20:36:50Z joseph $
+\GetIdInfo$Id: l3prg.dtx 2915 2011-10-15 21:21:08Z bruno $
   {L3 Experimental control structures}
 %%
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \package_check_loaded_expl:
+\tex_let:D \if_bool:N          \tex_ifodd:D
+\tex_let:D \if_predicate:w     \tex_ifodd:D
 \cs_new_protected_nopar:Npn \bool_new:N #1 { \cs_new_eq:NN #1 \c_false_bool }
 \cs_generate_variant:Nn \bool_new:N { c }
 \cs_new_protected_nopar:Npn \bool_set_true:N #1
@@ -82,7 +84,7 @@
 \cs_generate_variant:Nn \bool_gset:Nn { c }
 \prg_new_conditional:Npnn \bool_if:N #1 { p , T , F , TF }
   {
-    \if_bool:N #1
+    \if_meaning:w \c_true_bool #1
       \prg_return_true:
     \else:
       \prg_return_false:
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
index 4a086cf2270..605733e8580 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3skip.dtx 2896 2011-10-09 20:36:50Z joseph $
+\GetIdInfo$Id: l3skip.dtx 2959 2011-11-14 21:47:18Z joseph $
   {L3 Experimental dimensions and skips}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -54,52 +54,62 @@
 \cs_new_eq:NN \if_dim:w      \tex_ifdim:D
 \cs_new_eq:NN \dim_eval:w    \etex_dimexpr:D
 \cs_new_eq:NN \dim_eval_end: \tex_relax:D
-\cs_new_protected_nopar:Npn \dim_new:N #1
+\cs_new_protected:Npn \dim_new:N #1
   {
     \chk_if_free_cs:N #1
     \newdimen #1
   }
 \cs_generate_variant:Nn \dim_new:N { c }
-\cs_new_protected_nopar:Npn \dim_zero:N #1 { #1 \c_zero_dim }
-\cs_new_protected_nopar:Npn \dim_gzero:N { \tex_global:D \dim_zero:N }
+\cs_new_protected:Npn \dim_zero:N #1 { #1 \c_zero_dim }
+\cs_new_protected:Npn \dim_gzero:N { \tex_global:D \dim_zero:N }
 \cs_generate_variant:Nn \dim_zero:N  { c }
 \cs_generate_variant:Nn \dim_gzero:N { c }
-\cs_new_protected_nopar:Npn \dim_set:Nn #1#2
+\cs_new_protected:Npn \dim_set:Nn #1#2
   { #1 ~ \dim_eval:w #2 \dim_eval_end: }
-\cs_new_protected_nopar:Npn \dim_gset:Nn { \tex_global:D \dim_set:Nn }
+\cs_new_protected:Npn \dim_gset:Nn { \tex_global:D \dim_set:Nn }
 \cs_generate_variant:Nn \dim_set:Nn  { c }
 \cs_generate_variant:Nn \dim_gset:Nn { c }
-\cs_new_protected_nopar:Npn \dim_set_eq:NN #1#2 { #1 = #2 }
+\cs_new_protected:Npn \dim_set_eq:NN #1#2 { #1 = #2 }
 \cs_generate_variant:Nn \dim_set_eq:NN {       c }
 \cs_generate_variant:Nn \dim_set_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \dim_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
+\cs_new_protected:Npn \dim_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
 \cs_generate_variant:Nn \dim_gset_eq:NN {       c }
 \cs_generate_variant:Nn \dim_gset_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \dim_set_max:Nn #1#2
+\cs_new_protected:Npn \dim_set_max:Nn #1#2
   { \dim_compare:nNnT {#1} < {#2} { \dim_set:Nn #1 {#2} } }
-\cs_new_protected_nopar:Npn \dim_gset_max:Nn #1#2
-  { \dim_compare:nNnT {#1} < {#2} { \dim_gset:Nn #1 {#2} } }
-\cs_new_protected_nopar:Npn \dim_set_min:Nn #1#2
+\cs_new_protected:Npn \dim_gset_max:Nn
+  { \tex_global:D \dim_set_max:Nn }
+\cs_new_protected:Npn \dim_set_min:Nn #1#2
   { \dim_compare:nNnT {#1} > {#2} { \dim_set:Nn #1 {#2} } }
-\cs_new_protected_nopar:Npn \dim_gset_min:Nn #1#2
-  { \dim_compare:nNnT {#1} > {#2} { \dim_gset:Nn #1 {#2} } }
+\cs_new_protected:Npn \dim_gset_min:Nn
+  { \tex_global:D \dim_set_min:Nn }
 \cs_generate_variant:Nn \dim_set_max:Nn  { c }
 \cs_generate_variant:Nn \dim_gset_max:Nn { c }
 \cs_generate_variant:Nn \dim_set_min:Nn  { c }
 \cs_generate_variant:Nn \dim_gset_min:Nn { c }
-\cs_new_protected_nopar:Npn \dim_add:Nn #1#2
+\cs_new_protected:Npn \dim_add:Nn #1#2
   { \tex_advance:D #1 by \dim_eval:w #2 \dim_eval_end: }
-\cs_new_protected_nopar:Npn \dim_gadd:Nn { \tex_global:D \dim_add:Nn }
+\cs_new_protected:Npn \dim_gadd:Nn { \tex_global:D \dim_add:Nn }
 \cs_generate_variant:Nn \dim_add:Nn  { c }
 \cs_generate_variant:Nn \dim_gadd:Nn { c }
-\cs_new_protected_nopar:Npn \dim_sub:Nn #1#2
+\cs_new_protected:Npn \dim_sub:Nn #1#2
   { \tex_advance:D #1 by - \dim_eval:w #2 \dim_eval_end: }
-\cs_new_protected_nopar:Npn \dim_gsub:Nn { \tex_global:D \dim_sub:Nn }
+\cs_new_protected:Npn \dim_gsub:Nn { \tex_global:D \dim_sub:Nn }
 \cs_generate_variant:Nn \dim_sub:Nn  { c }
 \cs_generate_variant:Nn \dim_gsub:Nn { c }
-\cs_new_nopar:Npn \dim_ratio:nn #1#2
+\cs_new:Npn \dim_abs:n #1
+  {
+    \dim_use:N
+      \dim_eval:w
+        \if_dim:w \dim_eval:w #1 < \c_zero_dim
+          -
+        \fi:
+      \dim_eval:w #1 \dim_eval_end:
+    \dim_eval_end:
+  }
+\cs_new:Npn \dim_ratio:nn #1#2
   { \dim_ratio_aux:n {#1} / \dim_ratio_aux:n {#2} }
-\cs_new_nopar:Npn \dim_ratio_aux:n #1
+\cs_new:Npn \dim_ratio_aux:n #1
   { \int_value:w \dim_eval:w #1 \dim_eval_end: }
 \prg_new_conditional:Npnn \dim_compare:nNn #1#2#3 { p , T , F , TF }
   {
@@ -191,8 +201,25 @@
     \dim_compare:nNnF {#1} #2 {#3}
       { \dim_do_until:nNnn {#1} #2 {#3} {#4} }
   }
-\cs_new_nopar:Npn \dim_eval:n #1
+\cs_new:Npn \dim_eval:n #1
   { \dim_use:N \dim_eval:w #1 \dim_eval_end: }
+\cs_new:Npn \dim_strip_bp:n #1
+  { \dim_strip_pt:n { 0.996 26 \dim_eval:w #1 \dim_eval_end: } }
+\cs_new:Npn \dim_strip_pt:n #1
+  {
+    \exp_after:wN
+      \dim_strip_pt:w \dim_use:N \dim_eval:w #1 \dim_eval_end: \q_stop
+  }
+\use:x
+  {
+    \cs_new:Npn \exp_not:N \dim_strip_pt:w
+      ##1 . ##2 \tl_to_str:n { pt } ##3 \exp_not:N \q_stop
+      {
+        ##1
+        \exp_not:N \int_compare:nNnT {##2} > \c_zero
+          { . ##2 }
+      }
+  }
 \cs_new_eq:NN \dim_use:N \tex_the:D
 \cs_generate_variant:Nn \dim_use:N { c }
 \cs_new_eq:NN  \dim_show:N \kernel_register_show:N
@@ -204,35 +231,35 @@
 \dim_new:N \l_tmpc_dim
 \dim_new:N \g_tmpa_dim
 \dim_new:N \g_tmpb_dim
-\cs_new_protected_nopar:Npn \skip_new:N #1
+\cs_new_protected:Npn \skip_new:N #1
   {
     \chk_if_free_cs:N #1
     \newskip #1
   }
 \cs_generate_variant:Nn \skip_new:N { c }
-\cs_new_protected_nopar:Npn \skip_zero:N #1 { #1 \c_zero_skip }
-\cs_new_protected_nopar:Npn \skip_gzero:N { \tex_global:D \skip_zero:N }
+\cs_new_protected:Npn \skip_zero:N #1 { #1 \c_zero_skip }
+\cs_new_protected:Npn \skip_gzero:N { \tex_global:D \skip_zero:N }
 \cs_generate_variant:Nn \skip_zero:N  { c }
 \cs_generate_variant:Nn \skip_gzero:N { c }
-\cs_new_protected_nopar:Npn \skip_set:Nn #1#2
+\cs_new_protected:Npn \skip_set:Nn #1#2
   { #1 ~ \etex_glueexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \skip_gset:Nn { \tex_global:D \skip_set:Nn }
+\cs_new_protected:Npn \skip_gset:Nn { \tex_global:D \skip_set:Nn }
 \cs_generate_variant:Nn \skip_set:Nn  { c }
 \cs_generate_variant:Nn \skip_gset:Nn { c }
-\cs_new_protected_nopar:Npn \skip_set_eq:NN #1#2 { #1 = #2 }
+\cs_new_protected:Npn \skip_set_eq:NN #1#2 { #1 = #2 }
 \cs_generate_variant:Nn \skip_set_eq:NN {       c }
 \cs_generate_variant:Nn \skip_set_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \skip_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
+\cs_new_protected:Npn \skip_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
 \cs_generate_variant:Nn \skip_gset_eq:NN {       c }
 \cs_generate_variant:Nn \skip_gset_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \skip_add:Nn #1#2
+\cs_new_protected:Npn \skip_add:Nn #1#2
   { \tex_advance:D #1 by \etex_glueexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \skip_gadd:Nn { \tex_global:D \skip_add:Nn }
+\cs_new_protected:Npn \skip_gadd:Nn { \tex_global:D \skip_add:Nn }
 \cs_generate_variant:Nn \skip_add:Nn  { c }
 \cs_generate_variant:Nn \skip_gadd:Nn { c }
-\cs_new_protected_nopar:Npn \skip_sub:Nn #1#2
+\cs_new_protected:Npn \skip_sub:Nn #1#2
   { \tex_advance:D #1 by - \etex_glueexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \skip_gsub:Nn { \tex_global:D \skip_sub:Nn }
+\cs_new_protected:Npn \skip_gsub:Nn { \tex_global:D \skip_sub:Nn }
 \cs_generate_variant:Nn \skip_sub:Nn  { c }
 \cs_generate_variant:Nn \skip_gsub:Nn { c }
 \prg_new_conditional:Npnn \skip_if_eq:nn #1#2 { p , T , F , TF }
@@ -255,15 +282,15 @@
       { \prg_return_true: }
       { \prg_return_false: }
  }
-\cs_new_nopar:Npn \skip_eval:n #1
+\cs_new:Npn \skip_eval:n #1
   { \skip_use:N \etex_glueexpr:D #1 \scan_stop: }
 \cs_new_eq:NN \skip_use:N \tex_the:D
 \cs_generate_variant:Nn \skip_use:N { c }
 \cs_new_eq:NN  \skip_horizontal:N \tex_hskip:D
-\cs_new_nopar:Npn \skip_horizontal:n #1
+\cs_new:Npn \skip_horizontal:n #1
   { \skip_horizontal:N \etex_glueexpr:D #1 \scan_stop: }
 \cs_new_eq:NN  \skip_vertical:N \tex_vskip:D
-\cs_new_nopar:Npn \skip_vertical:n #1
+\cs_new:Npn \skip_vertical:n #1
   { \skip_vertical:N \etex_glueexpr:D #1 \scan_stop: }
 \cs_generate_variant:Nn \skip_horizontal:N { c }
 \cs_generate_variant:Nn \skip_vertical:N { c }
@@ -276,45 +303,45 @@
 \skip_new:N \l_tmpc_skip
 \skip_new:N \g_tmpa_skip
 \skip_new:N \g_tmpb_skip
-\cs_new_protected_nopar:Npn \muskip_new:N #1
+\cs_new_protected:Npn \muskip_new:N #1
   {
     \chk_if_free_cs:N #1
     \newmuskip #1
   }
 \cs_generate_variant:Nn \muskip_new:N { c }
-\cs_new_protected_nopar:Npn \muskip_zero:N #1
+\cs_new_protected:Npn \muskip_zero:N #1
   { #1 \c_zero_muskip }
-\cs_new_protected_nopar:Npn \muskip_gzero:N { \tex_global:D \muskip_zero:N }
+\cs_new_protected:Npn \muskip_gzero:N { \tex_global:D \muskip_zero:N }
 \cs_generate_variant:Nn \muskip_zero:N  { c }
 \cs_generate_variant:Nn \muskip_gzero:N { c }
-\cs_new_protected_nopar:Npn \muskip_set:Nn #1#2
+\cs_new_protected:Npn \muskip_set:Nn #1#2
   { #1 ~ \etex_muexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \muskip_gset:Nn { \tex_global:D \muskip_set:Nn }
+\cs_new_protected:Npn \muskip_gset:Nn { \tex_global:D \muskip_set:Nn }
 \cs_generate_variant:Nn \muskip_set:Nn  { c }
 \cs_generate_variant:Nn \muskip_gset:Nn { c }
-\cs_new_protected_nopar:Npn \muskip_set_eq:NN #1#2 { #1 = #2 }
+\cs_new_protected:Npn \muskip_set_eq:NN #1#2 { #1 = #2 }
 \cs_generate_variant:Nn \muskip_set_eq:NN {       c }
 \cs_generate_variant:Nn \muskip_set_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \muskip_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
+\cs_new_protected:Npn \muskip_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
 \cs_generate_variant:Nn \muskip_gset_eq:NN {       c }
 \cs_generate_variant:Nn \muskip_gset_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \muskip_add:Nn #1#2
+\cs_new_protected:Npn \muskip_add:Nn #1#2
   { \tex_advance:D #1 by \etex_muexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \muskip_gadd:Nn { \tex_global:D \muskip_add:Nn }
+\cs_new_protected:Npn \muskip_gadd:Nn { \tex_global:D \muskip_add:Nn }
 \cs_generate_variant:Nn \muskip_add:Nn  { c }
 \cs_generate_variant:Nn \muskip_gadd:Nn { c }
-\cs_new_protected_nopar:Npn \muskip_sub:Nn #1#2
+\cs_new_protected:Npn \muskip_sub:Nn #1#2
   { \tex_advance:D #1 by - \etex_muexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \muskip_gsub:Nn { \tex_global:D \muskip_sub:Nn }
+\cs_new_protected:Npn \muskip_gsub:Nn { \tex_global:D \muskip_sub:Nn }
 \cs_generate_variant:Nn \muskip_sub:Nn  { c }
 \cs_generate_variant:Nn \muskip_gsub:Nn { c }
-\cs_new_nopar:Npn \muskip_eval:n #1
+\cs_new:Npn \muskip_eval:n #1
   { \muskip_use:N \etex_muexpr:D #1 \scan_stop: }
 \cs_new_eq:NN \muskip_use:N \tex_the:D
 \cs_generate_variant:Nn \muskip_use:N { c }
 \cs_new_eq:NN  \muskip_show:N \kernel_register_show:N
 \cs_generate_variant:Nn \muskip_show:N { c }
-\cs_new_nopar:Npn \skip_split_finite_else_action:nnNN #1#2#3#4
+\cs_new:Npn \skip_split_finite_else_action:nnNN #1#2#3#4
   {
     \skip_if_infinite_glue:nTF {#1}
     {
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
index a66439d732d..cd04f11ddb4 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3tl.dtx 2831 2011-09-16 03:47:54Z bruno $
+\GetIdInfo$Id: l3tl.dtx 2929 2011-10-22 13:00:20Z bruno $
   {L3 Experimental token lists}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -182,13 +182,12 @@
     \exp_args:NNNo \group_end:
     #1 #2 \l_tl_rescan_tl
   }
-\cs_new_nopar:Npx \tl_rescan_aux:w
+\use:x
   {
-    \cs_set_protected:Npn \exp_not:N \tl_rescan_aux:w ##1
+    \cs_new_protected:Npn \exp_not:N \tl_rescan_aux:w ##1
       \c_tl_rescan_marker_tl
       { \tl_set:Nn \exp_not:N \l_tl_rescan_tl {##1} }
   }
-\tl_rescan_aux:w
 \cs_generate_variant:Nn \tl_set_rescan:Nnn  {     Nno }
 \cs_generate_variant:Nn \tl_set_rescan:Nnn  { c , cno }
 \cs_generate_variant:Nn \tl_gset_rescan:Nnn {     Nno }
@@ -589,15 +588,14 @@
   { \str_if_eq_return:on { \use:n #1 { } } { #1 { } } }
 \prg_new_conditional:Npnn \tl_if_head_group:n #1 { p , T , F , TF }
   {
-    \if_predicate:w
+    \if_catcode:w *
         \exp_after:wN \use_none:n
           \exp_after:wN {
             \exp_after:wN {
               \token_to_str:N #1 ?
             }
-            \c_false_bool
           }
-          \c_true_bool
+          *
       \prg_return_false:
     \else:
       \prg_return_true:
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
index 052ccc0ce83..4546eabd5f0 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3token.dtx 2896 2011-10-09 20:36:50Z joseph $
+\GetIdInfo$Id: l3token.dtx 2931 2011-10-22 13:48:28Z bruno $
   {L3 Experimental token manipulation}
 %% \begin{function}[EXP,pTF]{\token_if_protected_long_macro:N}
 \ProvidesExplPackage
@@ -164,7 +164,7 @@
 \group_end:
 \group_begin:
   \char_set_catcode_active:N \*
-  \cs_new_nopar:Npn \c_catcode_active_tl { \exp_not:N * }
+  \tl_const:Nn \c_catcode_active_tl { \exp_not:N * }
 \group_end:
 \prg_new_conditional:Npnn \token_if_group_begin:N #1 { p , T ,  F , TF }
   {