[latex3-commits] [git/LaTeX3-latex3-latex3] master: Box shifts apply 'outside' the matrix changes (03affca)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/03affca90d8aabc03bdf4d20a5f1c05367c60019

>---------------------------------------------------------------

commit 03affca90d8aabc03bdf4d20a5f1c05367c60019
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Mar 3 22:15:04 2018 +0000

    Box shifts apply 'outside' the matrix changes


>---------------------------------------------------------------

03affca90d8aabc03bdf4d20a5f1c05367c60019
 l3experimental/l3draw/l3draw-scopes.dtx |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/l3experimental/l3draw/l3draw-scopes.dtx b/l3experimental/l3draw/l3draw-scopes.dtx
index e31bea4..b7913e3 100644
--- a/l3experimental/l3draw/l3draw-scopes.dtx
+++ b/l3experimental/l3draw/l3draw-scopes.dtx
@@ -285,20 +285,25 @@
     \group_begin:
       \hbox_set:Nn \l_@@_tmp_box
         {
-          \tex_kern:D \l_@@_xshift_dim
-          \box_move_up:nn { \l_@@_yshift_dim } { \box_use:N #1 }
+          \use:x
+            {
+              \driver_draw_box_use:Nnnnn #1
+                { \fp_use:N \l_@@_matrix_a_fp }
+                { \fp_use:N \l_@@_matrix_b_fp }
+                { \fp_use:N \l_@@_matrix_c_fp }
+                { \fp_use:N \l_@@_matrix_d_fp }
+            }
         }
       \box_set_ht:Nn \l_@@_tmp_box { 0pt }
       \box_set_dp:Nn \l_@@_tmp_box { 0pt }
       \box_set_wd:Nn \l_@@_tmp_box { 0pt }
-      \use:x
+      \hbox_set:Nn \l_@@_tmp_box
         {
-          \driver_draw_box_use:Nnnnn \l_@@_tmp_box
-            { \fp_use:N \l_@@_matrix_a_fp }
-            { \fp_use:N \l_@@_matrix_b_fp }
-            { \fp_use:N \l_@@_matrix_c_fp }
-            { \fp_use:N \l_@@_matrix_d_fp }
-         }
+          \tex_kern:D \l_@@_xshift_dim
+          \box_move_up:nn { \l_@@_yshift_dim }
+            { \box_use_clear:N \l_@@_tmp_box }
+        }
+      \box_use_clear:N \l_@@_tmp_box
     \group_end:
   }
 %    \end{macrocode}