l3* (14aug12)

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

1 files changed, 37 insertions, 10 deletions

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