l3* (14aug12)

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

20 files changed, 105 insertions, 62 deletions

diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3dt/l3dt.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3dt/l3dt.pdf
index ef1f6338685..55c65524048 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3dt/l3dt.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3dt/l3dt.pdf
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf
index 643c77c2797..2461b6454cd 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf
index 6d452a1a251..dde65fe1daf 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf
index bf1c08b47e9..f0638355366 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str.pdf
index dedf6013d1f..e2ff96fcece 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str.pdf
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf
index 0f6639fb947..c83ca55aa38 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf
index b5fe014e87e..aa6e24af214 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf
diff --git a/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf b/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf
index 4c99ccfd767..ecd13045c18 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf
diff --git a/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf b/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf
index 821b441064c..b19885f938f 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf
diff --git a/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf b/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf
index 2489c2d4220..39f3a94dbc8 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3dt/l3dt.dtx b/Master/texmf-dist/source/latex/l3experimental/l3dt/l3dt.dtx
index be3fc8eb1c1..250fbd7bdf5 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3dt/l3dt.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3dt/l3dt.dtx
@@ -36,7 +36,7 @@
 %
 %<*driver|package>
 \RequirePackage{expl3}
-\GetIdInfo$Id: l3dt.dtx 3877 2012-06-30 22:24:42Z joseph $
+\GetIdInfo$Id: l3dt.dtx 3991 2012-07-16 19:00:35Z joseph $
   {L3 Experimental data tables}
 %</driver|package>
 %<*driver>
@@ -1264,4 +1264,4 @@
 %
 % \end{implementation}
 %
-% \PrintIndex
\ No newline at end of file
+% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx
index 4d795c7c9f5..22c4e73d42e 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx
@@ -36,7 +36,7 @@
 %
 %<*driver|package>
 \RequirePackage{expl3}
-\GetIdInfo$Id: l3sort.dtx 3953 2012-07-11 16:15:09Z bruno $
+\GetIdInfo$Id: l3sort.dtx 3991 2012-07-16 19:00:35Z joseph $
   {L3 Experimental sorting functions}
 %</driver|package>
 %<*driver>
@@ -675,4 +675,4 @@
 %
 % \end{implementation}
 %
-% \PrintIndex
\ No newline at end of file
+% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx
index 0cee83f61ab..1d2a22efea3 100644
--- a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx
@@ -36,7 +36,7 @@
 %
 %<*driver|package>
 \RequirePackage{xparse}
-\GetIdInfo$Id: xcoffins.dtx 3876 2012-06-30 15:35:39Z joseph $
+\GetIdInfo$Id: xcoffins.dtx 4029 2012-07-29 18:16:03Z bruno $
   {L3 Experimental design-level coffins}
 %</driver|package>
 %<*driver>
@@ -150,16 +150,6 @@
 %   name of the \meta{coffin} is not globally-unique.
 % \end{function}
 %
-% \begin{function}{\BoxToCoffin}
-%   \begin{syntax}
-%     \cs{BoxToCoffin} \meta{box}
-%   \end{syntax}
-%   Adds coffin structure to the \meta{box}, which should be a \LaTeXe{}
-%   \enquote{user} box (e.g.~one created using \cs{newsavebox}). This function
-%   allows standard \LaTeXe{} box material to be used in coffin-based
-%   alignments.
-% \end{function}
-%
 % \begin{function}{\SetHorizontalCoffin}
 %   \begin{syntax}
 %     \cs{SetHorizontalCoffin} \meta{coffin} \Arg{material}
@@ -338,10 +328,7 @@
 %     \cs{ResizeCoffin} \meta{coffin} \Arg{width} \Arg{total-height}
 %   \end{syntax}
 %   Resized the \meta{coffin} to \meta{width} and \meta{total-height},
-%   both of which should be given as dimension expressions. These may
-%   include the terms \cs{TotalHeight}, \cs{Height}, \cs{Depth} and
-%   \cs{Width}, which will evaluate to the appropriate dimensions of
-%   the \meta{coffin}.
+%   both of which should be given as dimension expressions.
 % \end{function}
 %
 % \begin{function}{\ScaleCoffin}
@@ -712,7 +699,6 @@
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 %    \end{macrocode}
 %
-%
 % \begin{variable}
 %   {
 %     \l_@@_A_hpole_tl          ,
@@ -757,6 +743,35 @@
 %    \end{macrocode}
 % \end{variable}
 %
+% \begin{macro}{\@@_design_names:N}
+% \begin{variable}{\Height, \Depth, \Width, \TotalHeight}
+% \begin{variable}[int]
+%   {\l_@@_height_dim, \l_@@_depth_dim, \l_@@_width_dim, \l_@@_totalheight_dim}
+%   Sets up design-level names for the various coffin dimensions. These are
+%   not defined outside of this scope, and are dimensions so that they work
+%   correctly inside for example \cs{fp_eval:n}.
+%    \begin{macrocode}
+\cs_new_protected:Npn \@@_design_names:N #1
+  {
+    \dim_set:Nn \l_@@_height_dim { \coffin_ht:N #1 }
+    \dim_set:Nn \l_@@_depth_dim  { \coffin_dp:N #1 }
+    \dim_set:Nn \l_@@_width_dim  { \coffin_wd:N #1 }
+    \dim_set:Nn \l_@@_totalheight_dim
+      { \l_@@_height_dim + \l_@@_depth_dim }
+    \cs_set_eq:NN \Height \l_@@_height_dim
+    \cs_set_eq:NN \Depth \l_@@_depth_dim
+    \cs_set_eq:NN \Width \l_@@_width_dim
+    \cs_set_eq:NN \TotalHeight \l_@@_totalheight_dim
+  }
+\dim_new:N \l_@@_height_dim
+\dim_new:N \l_@@_depth_dim
+\dim_new:N \l_@@_width_dim
+\dim_new:N \l_@@_totalheight_dim
+%    \end{macrocode}
+% \end{variable}
+% \end{variable}
+% \end{macro}
+%
 % A lot of this is more-or-less just passing data straight through.
 %
 % \begin{macro}{\NewCoffin}
@@ -767,19 +782,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\BoxToCoffin}
-%   For allowing a user-level \LaTeXe{} box to be used as a coffin.
-%    \begin{macrocode}
-\NewDocumentCommand \BoxToCoffin { m }
-  {
-    \prop_clear_new:c { l_@@_corners_ \__int_value:w #1 _prop }
-    \prop_clear_new:c { l_@@_poles_   \__int_value:w #1 _prop }
-    \@@_update_corners:N #1
-    \@@_update_poles:N #1
-  }
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}{\SetHorizontalCoffin}
 % \begin{macro}{\SetVerticalCoffin}
 %   These are again straight-forward translations.
@@ -794,12 +796,32 @@
 %
 % \begin{macro}{\SetHorizontalPole}
 % \begin{macro}{\SetVerticalPole}
-%   Again straight-forward
+%   Here, there is a need to set up the design-level names for coffin
+%   dimensions. This requires grouping, but the coffin work has to occur
+%   outside of the group. Hence there is a bit of expansion trickery.
 %    \begin{macrocode}
 \NewDocumentCommand \SetHorizontalPole { m m m }
-  { \coffin_set_horizontal_pole:Nnn #1 {#2} {#3} }
+  {
+    \group_begin:
+      \@@_design_names:N #1
+    \use:x
+      {
+        \group_end:
+        \coffin_set_horizontal_pole:Nnn #1
+          { \exp_not:n {#2} } { \dim_eval:n {#3} }
+      }
+  }
 \NewDocumentCommand \SetVerticalPole { m m m }
-  { \coffin_set_vertical_pole:Nnn #1 {#2} {#3} }
+  {
+    \group_begin:
+      \@@_design_names:N #1
+    \use:x
+      {
+        \group_end:
+        \coffin_set_vertical_pole:Nnn #1
+          { \exp_not:n {#2} } { \dim_eval:n {#3} }
+      }
+  }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -933,4 +955,4 @@
 %
 % \end{implementation}
 %
-% \PrintIndex
\ No newline at end of file
+% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
index 77b6456d15e..783ebbf0113 100644
--- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
@@ -37,7 +37,7 @@
 %
 %<*driver|package>
 \RequirePackage{xparse}
-\GetIdInfo$Id: l3galley.dtx 3918 2012-07-05 00:32:37Z bruno $
+\GetIdInfo$Id: l3galley.dtx 4009 2012-07-20 18:18:29Z joseph $
   {L3 Experimental galley code}
 %</driver|package>
 %<*driver>
@@ -1224,17 +1224,12 @@
 %   group level as the text, hence this function cannot be placed using
 %   \cs{group_insert_after:N}. Resetting the meaning of the \cs{par} token
 %   needs to be carried out after the group used for the environment.
-%   As \LaTeXe{} already adds one group, there are two \enquote{escapes}
-%   here: the format version needs only one escape.
 %    \begin{macrocode}
 \cs_new_protected_nopar:Npn \galley_display_end:
   {
       \par
       \@@_restore_parameters:
     \group_end:
-%<*package>
-    \group_insert_after:N \group_insert_after:N
-%</package>
     \group_insert_after:N \@@_display_par_setup:
   }
 %    \end{macrocode}
@@ -2325,4 +2320,4 @@
 %
 % \end{implementation}
 %
-% \PrintIndex
\ No newline at end of file
+% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx
index 87b30d0ce25..9ad68d87e0b 100644
--- a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx
@@ -36,8 +36,8 @@
 %%
 %
 %<*driver|package>
-\RequirePackage{l3names}
-\GetIdInfo$Id: xgalley.dtx 3879 2012-07-01 09:17:47Z joseph $
+\RequirePackage{l3bootstrap}
+\GetIdInfo$Id: xgalley.dtx 3991 2012-07-16 19:00:35Z joseph $
   {L3 Experimental galley}
 %</driver|package>
 %<*driver>
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3dt/l3dt.sty b/Master/texmf-dist/tex/latex/l3experimental/l3dt/l3dt.sty
index a672181b903..804c0c2b294 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3dt/l3dt.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3dt/l3dt.sty
@@ -47,7 +47,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{expl3}
-\GetIdInfo$Id: l3dt.dtx 3877 2012-06-30 22:24:42Z joseph $
+\GetIdInfo$Id: l3dt.dtx 3991 2012-07-16 19:00:35Z joseph $
   {L3 Experimental data tables}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
index b9adcd3eeeb..a719b42e7a4 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
@@ -47,7 +47,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{expl3}
-\GetIdInfo$Id: l3sort.dtx 3953 2012-07-11 16:15:09Z bruno $
+\GetIdInfo$Id: l3sort.dtx 3991 2012-07-16 19:00:35Z joseph $
   {L3 Experimental sorting functions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
index 2eeee54d1ab..371fbc3f650 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
@@ -47,7 +47,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{xparse}
-\GetIdInfo$Id: xcoffins.dtx 3876 2012-06-30 15:35:39Z joseph $
+\GetIdInfo$Id: xcoffins.dtx 4029 2012-07-29 18:16:03Z bruno $
   {L3 Experimental design-level coffins}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -78,23 +78,50 @@
     hoffset           = 0 pt ,
     voffset           = 0 pt
   }
-\NewDocumentCommand \NewCoffin { m }
-  { \coffin_new:N #1 }
-\NewDocumentCommand \BoxToCoffin { m }
+\cs_new_protected:Npn \__coffin_design_names:N #1
   {
-    \prop_clear_new:c { l__coffin_corners_ \__int_value:w #1 _prop }
-    \prop_clear_new:c { l__coffin_poles_   \__int_value:w #1 _prop }
-    \__coffin_update_corners:N #1
-    \__coffin_update_poles:N #1
+    \dim_set:Nn \l__coffin_height_dim { \coffin_ht:N #1 }
+    \dim_set:Nn \l__coffin_depth_dim  { \coffin_dp:N #1 }
+    \dim_set:Nn \l__coffin_width_dim  { \coffin_wd:N #1 }
+    \dim_set:Nn \l__coffin_totalheight_dim
+      { \l__coffin_height_dim + \l__coffin_depth_dim }
+    \cs_set_eq:NN \Height \l__coffin_height_dim
+    \cs_set_eq:NN \Depth \l__coffin_depth_dim
+    \cs_set_eq:NN \Width \l__coffin_width_dim
+    \cs_set_eq:NN \TotalHeight \l__coffin_totalheight_dim
   }
+\dim_new:N \l__coffin_height_dim
+\dim_new:N \l__coffin_depth_dim
+\dim_new:N \l__coffin_width_dim
+\dim_new:N \l__coffin_totalheight_dim
+\NewDocumentCommand \NewCoffin { m }
+  { \coffin_new:N #1 }
 \NewDocumentCommand \SetHorizontalCoffin { m +m }
   { \hcoffin_set:Nn #1 {#2} }
 \NewDocumentCommand \SetVerticalCoffin { m m +m }
   { \vcoffin_set:Nnn #1 {#2} {#3} }
 \NewDocumentCommand \SetHorizontalPole { m m m }
-  { \coffin_set_horizontal_pole:Nnn #1 {#2} {#3} }
+  {
+    \group_begin:
+      \__coffin_design_names:N #1
+    \use:x
+      {
+        \group_end:
+        \coffin_set_horizontal_pole:Nnn #1
+          { \exp_not:n {#2} } { \dim_eval:n {#3} }
+      }
+  }
 \NewDocumentCommand \SetVerticalPole { m m m }
-  { \coffin_set_vertical_pole:Nnn #1 {#2} {#3} }
+  {
+    \group_begin:
+      \__coffin_design_names:N #1
+    \use:x
+      {
+        \group_end:
+        \coffin_set_vertical_pole:Nnn #1
+          { \exp_not:n {#2} } { \dim_eval:n {#3} }
+      }
+  }
 \NewDocumentCommand \JoinCoffins
   {
     o
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index dcf3c5871fc..ded7ca681b1 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -48,7 +48,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{xparse}
-\GetIdInfo$Id: l3galley.dtx 3918 2012-07-05 00:32:37Z bruno $
+\GetIdInfo$Id: l3galley.dtx 4009 2012-07-20 18:18:29Z joseph $
   {L3 Experimental galley code}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -276,7 +276,6 @@
       \par
       \__galley_restore_parameters:
     \group_end:
-    \group_insert_after:N \group_insert_after:N
     \group_insert_after:N \__galley_display_par_setup:
   }
 \cs_new_protected_nopar:Npn \__galley_display_par_setup:
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
index 31fe465cef3..fa9a8ef1730 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
@@ -47,8 +47,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{l3names}
-\GetIdInfo$Id: xgalley.dtx 3879 2012-07-01 09:17:47Z joseph $
+\RequirePackage{l3bootstrap}
+\GetIdInfo$Id: xgalley.dtx 3991 2012-07-16 19:00:35Z joseph $
   {L3 Experimental galley}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}