l3experimental 2729 (5sep11)

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

7 files changed, 34 insertions, 426 deletions

diff --git a/Master/texmf-dist/doc/latex/l3experimental/xcoffins/l3coffins-scaling.pdf b/Master/texmf-dist/doc/latex/l3experimental/xcoffins/l3coffins-scaling.pdf
deleted file mode 100644
index 6380de0b105..00000000000
--- a/Master/texmf-dist/doc/latex/l3experimental/xcoffins/l3coffins-scaling.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf b/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf
index 5513a8ad457..f24b6cb567b 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/source/latex/l3experimental/xcoffins/l3coffins-scaling.dtx b/Master/texmf-dist/source/latex/l3experimental/xcoffins/l3coffins-scaling.dtx
deleted file mode 100644
index d04a921e4f4..00000000000
--- a/Master/texmf-dist/source/latex/l3experimental/xcoffins/l3coffins-scaling.dtx
+++ /dev/null
@@ -1,278 +0,0 @@
-% \iffalse meta-comment
-% 
-%% File: l3coffins.dtx Copyright(C) 2010,2011 The LaTeX3 Project
-%%
-%% It may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License (LPPL), either version 1.3c of this
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3experimental bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-%
-%<*driver|package>
-\RequirePackage{expl3}
-\GetIdInfo$Id: l3coffins-scaling.dtx 2678 2011-08-28 07:02:32Z joseph $
-  {L3 Experimental coffin scaling code}
-%</driver|package>
-%<*driver>
-\documentclass[full]{l3doc}
-\begin{document}
-  \DocInput{\jobname.dtx}
-\end{document}
-%</driver>
-% \fi
-% 
-% \title{^^A
-%   The \textsf{l3coffins-scaling} package\\ Scaling coffins^^A
-%   \thanks{This file describes v\ExplFileVersion,
-%     last revised \ExplFileDate.}^^A
-% }
-%         
-% \author{^^A
-%  The \LaTeX3 Project\thanks
-%    {^^A
-%      E-mail:
-%        \href{mailto:latex-team@latex-project.org}
-%          {latex-team@latex-project.org}^^A
-%    }^^A
-% }
-%
-% \date{Released \ExplFileDate}
-%
-% \maketitle
-%
-% \begin{documentation}
-% 
-% The material in this module provides low-level support for scaling
-% and resizing coffins. The core coffin implementation is found in
-% \pkg{l3coffins} in the \pkg{l3kernel} bundle. In contrast to that stable
-% code, this code is highly experimental.
-%
-% \begin{function}{\coffin_resize:Nnn, \coffin_resize:cnn}
-%   \begin{syntax}
-%     \cs{coffin_resize:Nnn} \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}.
-% \end{function}
-%
-% \begin{function}{\coffin_scale:Nnn, \coffin_scale:cnn}
-%   \begin{syntax}
-%     \cs{coffin_scale:Nnn} \meta{coffin} \Arg{x-scale} \Arg{y-scale}
-%   \end{syntax}
-%   Scales the \meta{coffin} by a factors \meta{x-scale} and 
-%   \meta{y-scale} in the horizontal and vertical directions, 
-%   respectively. The two scale factors should be given as real numbers.
-% \end{function}
-% \end{documentation}
-%
-% \begin{implementation}
-%
-% \section{\pkg{l3coffins-scaling} Implementation}
-% 
-%    \begin{macrocode}
-%<*package>
-%    \end{macrocode}
-%    
-%    \begin{macrocode}
-\ProvidesExplPackage
-  {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-%    \end{macrocode}
-%
-% \subsection{Resizing coffins}
-%
-% \begin{variable}{\l_coffin_scale_x_fp}
-% \begin{variable}{\l_coffin_scale_y_fp}
-%   Storage for the scaling factors in $x$ and $y$, respectively.
-%    \begin{macrocode}
-\fp_new:N \l_coffin_scale_x_fp
-\fp_new:N \l_coffin_scale_y_fp
-%    \end{macrocode}
-% \end{variable}
-% \end{variable}
-%
-% \begin{variable}{\l_coffin_scaled_total_height_dim}
-% \begin{variable}{\l_coffin_scaled_width_dim}
-%   When scaling, the values given have to be turned into absolute values.
-%    \begin{macrocode}
-\dim_new:N \l_coffin_scaled_total_height_dim
-\dim_new:N \l_coffin_scaled_width_dim
-%    \end{macrocode}
-% \end{variable}
-% \end{variable}
-%
-% \begin{macro}{\coffin_resize:Nnn, \coffin_resize:cnn}
-%   Resizing a coffin begins by setting up the user-friendly names for
-%   the dimensions of the coffin box. The new sizes are then turned into
-%   scale factor. This is the same operation as takes place for the 
-%   underlying box, but that operation is grouped and so the same
-%   calculation is done here.
-%    \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_resize:Nnn #1#2#3
-  {
-    \coffin_set_user_dimensions:N #1
-    \fp_set_from_dim:Nn \l_coffin_scale_x_fp {#2}
-    \fp_set_from_dim:Nn \l_coffin_tmp_fp { \Width }
-    \fp_div:Nn \l_coffin_scale_x_fp { \l_coffin_tmp_fp }
-    \fp_set_from_dim:Nn \l_coffin_scale_y_fp {#3}
-    \fp_set_from_dim:Nn \l_coffin_tmp_fp { \TotalHeight }
-    \fp_div:Nn \l_coffin_scale_y_fp { \l_coffin_tmp_fp }
-    \hbox_set:Nn #1 { \resizebox * {#2} {#3} { \box_use:N #1 } }
-    \coffin_resize_common:Nnn #1 {#2} {#3}
-  }
-\cs_generate_variant:Nn \coffin_resize:Nnn { c }
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\coffin_resize_common:Nnn}
-%   The poles and corners of the coffin are scaled to the appropriate
-%   places before actually resizing the underlying box.
-%    \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_resize_common:Nnn #1#2#3
-  {
-    \prop_map_inline:cn { l_coffin_corners_ \int_value:w #1 _prop }
-      { \coffin_scale_corner:Nnnn #1 {##1} ##2 }
-    \prop_map_inline:cn { l_coffin_poles_ \int_value:w #1 _prop }
-      { \coffin_scale_pole:Nnnnnn #1 {##1} ##2 }
-%    \end{macrocode}
-%   Negative $x$-scaling values will place the poles in the wrong
-%   location: this is corrected here.
-%    \begin{macrocode}
-    \fp_compare:NNNT \l_coffin_scale_x_fp < \c_zero_fp
-      {
-        \prop_map_inline:cn { l_coffin_corners_ \int_value:w #1 _prop }
-          { \coffin_x_shift_corner:Nnnn #1 {##1} ##2 }
-        \prop_map_inline:cn { l_coffin_poles_ \int_value:w #1 _prop }
-          { \coffin_x_shift_pole:Nnnnnn #1 {##1} ##2 }
-      }  
-    \coffin_end_user_dimensions:
-  }
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\coffin_scale:Nnn, \coffin_scale:cnn}
-%   For scaling, the opposite calculation is done to find the new
-%   dimensions for the coffin. Only the total height is needed, as this
-%   is the shift required for corners and poles. The scaling is done
-%   the \TeX{} way as this works properly with floating point values
-%   without needing to use the \texttt{fp} module.
-%    \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_scale:Nnn #1#2#3
-  {
-    \coffin_set_user_dimensions:N #1
-    \fp_set:Nn \l_coffin_scale_x_fp {#2}
-    \fp_set:Nn \l_coffin_scale_y_fp {#3}
-    \fp_compare:NNNTF \l_coffin_scale_y_fp > \c_zero_fp
-      { \l_coffin_scaled_total_height_dim #3 \TotalHeight }
-      { \l_coffin_scaled_total_height_dim -#3 \TotalHeight }
-    \fp_compare:NNNTF \l_coffin_scale_x_fp > \c_zero_fp
-      { \l_coffin_scaled_width_dim -#2 \Width }
-      { \l_coffin_scaled_width_dim #2 \Width }
-    \hbox_set:Nn #1 { \scalebox  {#2} [#3] { \box_use:N #1 } }
-    \coffin_resize_common:Nnn #1 
-      { \l_coffin_scaled_width_dim } { \l_coffin_scaled_total_height_dim }
-  }
-\cs_generate_variant:Nn \coffin_scale:Nnn { c }
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\coffin_scale_vector:nnNN}
-%   This functions scales a vector from the origin using the pre-set scale
-%   factors in $x$ and $y$. This is a much less complex operation
-%   than rotation, and as a result the code is a lot clearer.
-%    \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_scale_vector:nnNN #1#2#3#4
-  {
-    \fp_set_from_dim:Nn \l_coffin_tmp_fp {#1}
-    \fp_mul:Nn \l_coffin_tmp_fp { \l_coffin_scale_x_fp }
-    \dim_set:Nn #3 { \fp_to_dim:N \l_coffin_tmp_fp }
-    \fp_set_from_dim:Nn \l_coffin_tmp_fp {#2}
-    \fp_mul:Nn \l_coffin_tmp_fp { \l_coffin_scale_y_fp }
-    \dim_set:Nn #4 { \fp_to_dim:N \l_coffin_tmp_fp }
-  }
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\coffin_scale_corner:Nnnn}
-% \begin{macro}{\coffin_scale_pole:Nnnnnn}
-%   Scaling both corners and poles is a simple calculation using the 
-%   preceding vector scaling.
-%    \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_scale_corner:Nnnn #1#2#3#4
-  {
-    \coffin_scale_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim
-    \prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } {#2}
-      { { \dim_use:N \l_coffin_x_dim } { \dim_use:N \l_coffin_y_dim } }  
-  }
-\cs_new_protected_nopar:Npn \coffin_scale_pole:Nnnnnn #1#2#3#4#5#6
-  {
-    \coffin_scale_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim
-    \coffin_set_pole:Nnx #1 {#2}
-      {
-        { \dim_use:N \l_coffin_x_dim } { \dim_use:N \l_coffin_y_dim }
-        {#5} {#6}
-      }  
-  }
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\coffin_x_shift_corner:Nnnn}
-% \begin{macro}{\coffin_x_shift_pole:Nnnnnn}
-%   These functions correct for the $x$ displacement that takes
-%   place with a negative horizontal scaling.
-%    \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_x_shift_corner:Nnnn #1#2#3#4
-  {
-    \prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } {#2}
-      { 
-        { \dim_eval:n { #3 + \box_wd:N #1 } } {#4}
-    }  
-  }
-\cs_new_protected_nopar:Npn \coffin_x_shift_pole:Nnnnnn #1#2#3#4#5#6
-  {
-    \prop_put:cnx { l_coffin_poles_ \int_value:w #1 _prop } {#2}
-      {
-        { \dim_eval:n #3 + \box_wd:N #1 } {#4} 
-        {#5} {#6} 
-      }
-  }
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-%    \begin{macrocode}
-%</package>
-%    \end{macrocode}
-%
-% \end{implementation}
-%
-% \PrintIndex
\ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx
index 369a7c2a50b..9e5199255aa 100644
--- a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx
@@ -35,7 +35,7 @@
 %%
 %
 %<*driver|package>
-\RequirePackage{xparse,l3coffins-scaling}
+\RequirePackage{xparse}
 \GetIdInfo$Id: xcoffins.dtx 2349 2011-05-11 18:44:37Z joseph $
   {L3 Experimental design-level coffins}
 %</driver|package>
@@ -149,6 +149,16 @@
 %   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}
@@ -706,6 +716,19 @@
   { \coffin_new:N #1 }
 %    \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_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
+  }
+%    \end{macrocode}
+% \end{macro}
 %
 % \begin{macro}{\SetHorizontalCoffin}
 % \begin{macro}{\SetVerticalCoffin}
diff --git a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.ins b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.ins
index 240559cccea..f57dc329b3c 100644
--- a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.ins
+++ b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.ins
@@ -9,7 +9,7 @@ of this license is in the file
 
    http://www.latex-project.org/lppl.txt
 
-This file is part of the "xpackage bundle" (The Work in LPPL)
+This file is part of the "l3experimental bundle" (The Work in LPPL)
 and all files in that bundle must be distributed together.
 
 The released version of this bundle is available from CTAN.
@@ -35,7 +35,6 @@ Do not distribute a modified version of this file.
 
 \keepsilent
 
-\generate{\file{l3coffins-scaling.sty}{\from{l3coffins-scaling.dtx}{package}}}
-\generate{\file{xcoffins.sty}         {\from{xcoffins.dtx}         {package}}}
+\generate{\file{xcoffins.sty}{\from{xcoffins.dtx}{package}}}
 
 \endbatchfile
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/l3coffins-scaling.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/l3coffins-scaling.sty
deleted file mode 100644
index 27ada47014e..00000000000
--- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/l3coffins-scaling.sty
+++ /dev/null
@@ -1,143 +0,0 @@
-%%
-%% This is file `l3coffins-scaling.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% l3coffins-scaling.dtx  (with options: `package')
-%% 
-%% EXPERIMENTAL CODE
-%% 
-%% Do not distribute this file without also distributing the
-%% source files specified above.
-%% 
-%% Do not distribute a modified version of this file.
-%% 
-%% File: l3coffins.dtx Copyright(C) 2010,2011 The LaTeX3 Project
-%%
-%% It may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License (LPPL), either version 1.3c of this
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3experimental bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%%
-\RequirePackage{expl3}
-\GetIdInfo$Id: l3coffins-scaling.dtx 2678 2011-08-28 07:02:32Z joseph $
-  {L3 Experimental coffin scaling code}
-\ProvidesExplPackage
-  {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\fp_new:N \l_coffin_scale_x_fp
-\fp_new:N \l_coffin_scale_y_fp
-\dim_new:N \l_coffin_scaled_total_height_dim
-\dim_new:N \l_coffin_scaled_width_dim
-\cs_new_protected_nopar:Npn \coffin_resize:Nnn #1#2#3
-  {
-    \coffin_set_user_dimensions:N #1
-    \fp_set_from_dim:Nn \l_coffin_scale_x_fp {#2}
-    \fp_set_from_dim:Nn \l_coffin_tmp_fp { \Width }
-    \fp_div:Nn \l_coffin_scale_x_fp { \l_coffin_tmp_fp }
-    \fp_set_from_dim:Nn \l_coffin_scale_y_fp {#3}
-    \fp_set_from_dim:Nn \l_coffin_tmp_fp { \TotalHeight }
-    \fp_div:Nn \l_coffin_scale_y_fp { \l_coffin_tmp_fp }
-    \hbox_set:Nn #1 { \resizebox * {#2} {#3} { \box_use:N #1 } }
-    \coffin_resize_common:Nnn #1 {#2} {#3}
-  }
-\cs_generate_variant:Nn \coffin_resize:Nnn { c }
-\cs_new_protected_nopar:Npn \coffin_resize_common:Nnn #1#2#3
-  {
-    \prop_map_inline:cn { l_coffin_corners_ \int_value:w #1 _prop }
-      { \coffin_scale_corner:Nnnn #1 {##1} ##2 }
-    \prop_map_inline:cn { l_coffin_poles_ \int_value:w #1 _prop }
-      { \coffin_scale_pole:Nnnnnn #1 {##1} ##2 }
-    \fp_compare:NNNT \l_coffin_scale_x_fp < \c_zero_fp
-      {
-        \prop_map_inline:cn { l_coffin_corners_ \int_value:w #1 _prop }
-          { \coffin_x_shift_corner:Nnnn #1 {##1} ##2 }
-        \prop_map_inline:cn { l_coffin_poles_ \int_value:w #1 _prop }
-          { \coffin_x_shift_pole:Nnnnnn #1 {##1} ##2 }
-      }
-    \coffin_end_user_dimensions:
-  }
-\cs_new_protected_nopar:Npn \coffin_scale:Nnn #1#2#3
-  {
-    \coffin_set_user_dimensions:N #1
-    \fp_set:Nn \l_coffin_scale_x_fp {#2}
-    \fp_set:Nn \l_coffin_scale_y_fp {#3}
-    \fp_compare:NNNTF \l_coffin_scale_y_fp > \c_zero_fp
-      { \l_coffin_scaled_total_height_dim #3 \TotalHeight }
-      { \l_coffin_scaled_total_height_dim -#3 \TotalHeight }
-    \fp_compare:NNNTF \l_coffin_scale_x_fp > \c_zero_fp
-      { \l_coffin_scaled_width_dim -#2 \Width }
-      { \l_coffin_scaled_width_dim #2 \Width }
-    \hbox_set:Nn #1 { \scalebox  {#2} [#3] { \box_use:N #1 } }
-    \coffin_resize_common:Nnn #1
-      { \l_coffin_scaled_width_dim } { \l_coffin_scaled_total_height_dim }
-  }
-\cs_generate_variant:Nn \coffin_scale:Nnn { c }
-\cs_new_protected_nopar:Npn \coffin_scale_vector:nnNN #1#2#3#4
-  {
-    \fp_set_from_dim:Nn \l_coffin_tmp_fp {#1}
-    \fp_mul:Nn \l_coffin_tmp_fp { \l_coffin_scale_x_fp }
-    \dim_set:Nn #3 { \fp_to_dim:N \l_coffin_tmp_fp }
-    \fp_set_from_dim:Nn \l_coffin_tmp_fp {#2}
-    \fp_mul:Nn \l_coffin_tmp_fp { \l_coffin_scale_y_fp }
-    \dim_set:Nn #4 { \fp_to_dim:N \l_coffin_tmp_fp }
-  }
-\cs_new_protected_nopar:Npn \coffin_scale_corner:Nnnn #1#2#3#4
-  {
-    \coffin_scale_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim
-    \prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } {#2}
-      { { \dim_use:N \l_coffin_x_dim } { \dim_use:N \l_coffin_y_dim } }
-  }
-\cs_new_protected_nopar:Npn \coffin_scale_pole:Nnnnnn #1#2#3#4#5#6
-  {
-    \coffin_scale_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim
-    \coffin_set_pole:Nnx #1 {#2}
-      {
-        { \dim_use:N \l_coffin_x_dim } { \dim_use:N \l_coffin_y_dim }
-        {#5} {#6}
-      }
-  }
-\cs_new_protected_nopar:Npn \coffin_x_shift_corner:Nnnn #1#2#3#4
-  {
-    \prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } {#2}
-      {
-        { \dim_eval:n { #3 + \box_wd:N #1 } } {#4}
-    }
-  }
-\cs_new_protected_nopar:Npn \coffin_x_shift_pole:Nnnnnn #1#2#3#4#5#6
-  {
-    \prop_put:cnx { l_coffin_poles_ \int_value:w #1 _prop } {#2}
-      {
-        { \dim_eval:n #3 + \box_wd:N #1 } {#4}
-        {#5} {#6}
-      }
-  }
-%% 
-%%
-%% End of file `l3coffins-scaling.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
index 2f8cf2ed99c..cbadf49e9fb 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{xparse,l3coffins-scaling}
+\RequirePackage{xparse}
 \GetIdInfo$Id: xcoffins.dtx 2349 2011-05-11 18:44:37Z joseph $
   {L3 Experimental design-level coffins}
 \ProvidesExplPackage
@@ -80,6 +80,13 @@
   }
 \NewDocumentCommand \NewCoffin { m }
   { \coffin_new:N #1 }
+\NewDocumentCommand \BoxToCoffin { m }
+  {
+    \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
+  }
 \NewDocumentCommand \SetHorizontalCoffin { m +m }
   { \hcoffin_set:Nn #1 {#2} }
 \NewDocumentCommand \SetVerticalCoffin { m m +m }