[latex3-commits] [git/LaTeX3-latex3-latex3] coffins: Initialise internal coffins with full structures (a55271a)

Joseph Wright joseph.wright at morningstar2.co.uk
Mon Jan 21 00:25:31 CET 2019


Repository : https://github.com/latex3/latex3
On branch  : coffins
Link       : https://github.com/latex3/latex3/commit/a55271a023c63ccc75d45a4528a3e255a6576605

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

commit a55271a023c63ccc75d45a4528a3e255a6576605
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Jan 20 22:44:13 2019 +0000

    Initialise internal coffins with full structures


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

a55271a023c63ccc75d45a4528a3e255a6576605
 l3kernel/l3coffins.dtx                  |   28 ++++++++++++----------------
 l3kernel/testfiles/m3expl001.luatex.tlg |    8 ++++----
 l3kernel/testfiles/m3expl001.ptex.tlg   |    8 ++++----
 l3kernel/testfiles/m3expl001.tlg        |    8 ++++----
 l3kernel/testfiles/m3expl001.uptex.tlg  |    8 ++++----
 l3kernel/testfiles/m3expl001.xetex.tlg  |    8 ++++----
 l3kernel/testfiles/m3expl002.luatex.tlg |    4 ++--
 l3kernel/testfiles/m3expl002.ptex.tlg   |    4 ++--
 l3kernel/testfiles/m3expl002.tlg        |    4 ++--
 l3kernel/testfiles/m3expl002.uptex.tlg  |    4 ++--
 l3kernel/testfiles/m3expl002.xetex.tlg  |    4 ++--
 l3kernel/testfiles/m3expl003.luatex.tlg |    8 ++++----
 l3kernel/testfiles/m3expl003.ptex.tlg   |    8 ++++----
 l3kernel/testfiles/m3expl003.tlg        |    8 ++++----
 l3kernel/testfiles/m3expl003.uptex.tlg  |    8 ++++----
 l3kernel/testfiles/m3expl003.xetex.tlg  |    8 ++++----
 l3kernel/testfiles/m3expl004.luatex.tlg |    4 ++--
 l3kernel/testfiles/m3expl004.ptex.tlg   |    4 ++--
 l3kernel/testfiles/m3expl004.tlg        |    4 ++--
 l3kernel/testfiles/m3expl004.uptex.tlg  |    4 ++--
 l3kernel/testfiles/m3expl004.xetex.tlg  |    4 ++--
 l3kernel/testfiles/m3expl006.luatex.tlg |    4 ++--
 l3kernel/testfiles/m3expl006.ptex.tlg   |    4 ++--
 l3kernel/testfiles/m3expl006.tlg        |    4 ++--
 l3kernel/testfiles/m3expl006.uptex.tlg  |    4 ++--
 l3kernel/testfiles/m3expl006.xetex.tlg  |    4 ++--
 26 files changed, 82 insertions(+), 86 deletions(-)

diff --git a/l3kernel/l3coffins.dtx b/l3kernel/l3coffins.dtx
index ead3257..24d75fd 100644
--- a/l3kernel/l3coffins.dtx
+++ b/l3kernel/l3coffins.dtx
@@ -860,26 +860,11 @@
 % \end{macro}
 %
 % \begin{variable}{\c_empty_coffin}
-% \begin{variable}{\l_@@_aligned_coffin}
-% \begin{variable}{\l_@@_aligned_internal_coffin}
-%   Special coffins: these cannot be set up earlier as they need
-%   \cs{coffin_new:N}. The empty coffin is set as a box as the full
-%   coffin-setting system needs some material which is not yet available.
-%   The empty coffin is created entirely by hand: not everything is in place
-%   yet. The same is true for internal coffins, which need scope data.
+%   A permanently empty coffin.
 %    \begin{macrocode}
 \coffin_new:N \c_empty_coffin
-\coffin_new:N \l_@@_aligned_coffin
-\coffin_new:N \l_@@_aligned_internal_coffin
-\tl_gset:cn
-  { g_@@_scope_ \@@_to_value:N \l_@@_aligned_coffin _tl } { l }
-\tl_gset:cn
-  { g_@@_scope_ \@@_to_value:N \l_@@_aligned_internal_coffin _tl }
-  { l }
 %    \end{macrocode}
 % \end{variable}
-% \end{variable}
-% \end{variable}
 %
 % \begin{variable}{\l_tmpa_coffin, \l_tmpb_coffin}
 %   The usual scratch space.
@@ -1513,6 +1498,17 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{variable}{\l_@@_aligned_coffin, \l_@@_aligned_internal_coffin}
+%   Special coffins: these cannot be set up earlier as they need
+%   \cs{coffin_new:N}. These need to have structures set up from the get-go.
+%    \begin{macrocode}
+\coffin_new:N \l_@@_aligned_coffin
+\coffin_new:N \l_@@_aligned_internal_coffin
+\@@_reset_structure:N \l_@@_aligned_coffin
+\@@_reset_structure:N \l_@@_aligned_internal_coffin
+%    \end{macrocode}
+% \end{variable}
+%
 % \begin{macro}{\@@_align:NnnNnnnnN}
 %   The internal function aligns the two coffins into a third one, but
 %   performs no corrections on the resulting coffin poles. The process
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index dee3f70..e7eb0c8 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5341,10 +5341,6 @@ Defining \__coffin_set_eq:NNNNNNN on line ...
 Defining \__coffin_set_eq:NNNNN on line ...
 Defining \c_empty_coffin on line ...
 \c_empty_coffin=\box...
-Defining \l__coffin_aligned_coffin on line ...
-\l__coffin_aligned_coffin=\box...
-Defining \l__coffin_aligned_internal_coffin on line ...
-\l__coffin_aligned_internal_coffin=\box...
 Defining \l_tmpa_coffin on line ...
 \l_tmpa_coffin=\box...
 Defining \l_tmpb_coffin on line ...
@@ -5384,6 +5380,10 @@ Defining \__coffin_update_poles:NNN on line ...
 Defining \__coffin_calculate_intersection:Nnn on line ...
 Defining \__coffin_calculate_intersection:nnnnnnnn on line ...
 Defining \__coffin_calculate_intersection_aux:nnnnnN on line ...
+Defining \l__coffin_aligned_coffin on line ...
+\l__coffin_aligned_coffin=\box...
+Defining \l__coffin_aligned_internal_coffin on line ...
+\l__coffin_aligned_internal_coffin=\box...
 Defining \coffin_join:NnnNnnnn on line ...
 Defining \coffin_join:cnnNnnnn on line ...
 Defining \exp_args:NNnnc on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 7b0dc06..43d34da 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5637,10 +5637,6 @@ Defining \__coffin_set_eq:NNNNNNN on line ...
 Defining \__coffin_set_eq:NNNNN on line ...
 Defining \c_empty_coffin on line ...
 \c_empty_coffin=\box...
-Defining \l__coffin_aligned_coffin on line ...
-\l__coffin_aligned_coffin=\box...
-Defining \l__coffin_aligned_internal_coffin on line ...
-\l__coffin_aligned_internal_coffin=\box...
 Defining \l_tmpa_coffin on line ...
 \l_tmpa_coffin=\box...
 Defining \l_tmpb_coffin on line ...
@@ -5680,6 +5676,10 @@ Defining \__coffin_update_poles:NNN on line ...
 Defining \__coffin_calculate_intersection:Nnn on line ...
 Defining \__coffin_calculate_intersection:nnnnnnnn on line ...
 Defining \__coffin_calculate_intersection_aux:nnnnnN on line ...
+Defining \l__coffin_aligned_coffin on line ...
+\l__coffin_aligned_coffin=\box...
+Defining \l__coffin_aligned_internal_coffin on line ...
+\l__coffin_aligned_internal_coffin=\box...
 Defining \coffin_join:NnnNnnnn on line ...
 Defining \coffin_join:cnnNnnnn on line ...
 Defining \exp_args:NNnnc on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 8d0af45..19b0f86 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5637,10 +5637,6 @@ Defining \__coffin_set_eq:NNNNNNN on line ...
 Defining \__coffin_set_eq:NNNNN on line ...
 Defining \c_empty_coffin on line ...
 \c_empty_coffin=\box...
-Defining \l__coffin_aligned_coffin on line ...
-\l__coffin_aligned_coffin=\box...
-Defining \l__coffin_aligned_internal_coffin on line ...
-\l__coffin_aligned_internal_coffin=\box...
 Defining \l_tmpa_coffin on line ...
 \l_tmpa_coffin=\box...
 Defining \l_tmpb_coffin on line ...
@@ -5680,6 +5676,10 @@ Defining \__coffin_update_poles:NNN on line ...
 Defining \__coffin_calculate_intersection:Nnn on line ...
 Defining \__coffin_calculate_intersection:nnnnnnnn on line ...
 Defining \__coffin_calculate_intersection_aux:nnnnnN on line ...
+Defining \l__coffin_aligned_coffin on line ...
+\l__coffin_aligned_coffin=\box...
+Defining \l__coffin_aligned_internal_coffin on line ...
+\l__coffin_aligned_internal_coffin=\box...
 Defining \coffin_join:NnnNnnnn on line ...
 Defining \coffin_join:cnnNnnnn on line ...
 Defining \exp_args:NNnnc on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 1a3b94e..05c3133 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5634,10 +5634,6 @@ Defining \__coffin_set_eq:NNNNNNN on line ...
 Defining \__coffin_set_eq:NNNNN on line ...
 Defining \c_empty_coffin on line ...
 \c_empty_coffin=\box...
-Defining \l__coffin_aligned_coffin on line ...
-\l__coffin_aligned_coffin=\box...
-Defining \l__coffin_aligned_internal_coffin on line ...
-\l__coffin_aligned_internal_coffin=\box...
 Defining \l_tmpa_coffin on line ...
 \l_tmpa_coffin=\box...
 Defining \l_tmpb_coffin on line ...
@@ -5677,6 +5673,10 @@ Defining \__coffin_update_poles:NNN on line ...
 Defining \__coffin_calculate_intersection:Nnn on line ...
 Defining \__coffin_calculate_intersection:nnnnnnnn on line ...
 Defining \__coffin_calculate_intersection_aux:nnnnnN on line ...
+Defining \l__coffin_aligned_coffin on line ...
+\l__coffin_aligned_coffin=\box...
+Defining \l__coffin_aligned_internal_coffin on line ...
+\l__coffin_aligned_internal_coffin=\box...
 Defining \coffin_join:NnnNnnnn on line ...
 Defining \coffin_join:cnnNnnnn on line ...
 Defining \exp_args:NNnnc on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 29de866..1d8d000 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5352,10 +5352,6 @@ Defining \__coffin_set_eq:NNNNNNN on line ...
 Defining \__coffin_set_eq:NNNNN on line ...
 Defining \c_empty_coffin on line ...
 \c_empty_coffin=\box...
-Defining \l__coffin_aligned_coffin on line ...
-\l__coffin_aligned_coffin=\box...
-Defining \l__coffin_aligned_internal_coffin on line ...
-\l__coffin_aligned_internal_coffin=\box...
 Defining \l_tmpa_coffin on line ...
 \l_tmpa_coffin=\box...
 Defining \l_tmpb_coffin on line ...
@@ -5395,6 +5391,10 @@ Defining \__coffin_update_poles:NNN on line ...
 Defining \__coffin_calculate_intersection:Nnn on line ...
 Defining \__coffin_calculate_intersection:nnnnnnnn on line ...
 Defining \__coffin_calculate_intersection_aux:nnnnnN on line ...
+Defining \l__coffin_aligned_coffin on line ...
+\l__coffin_aligned_coffin=\box...
+Defining \l__coffin_aligned_internal_coffin on line ...
+\l__coffin_aligned_internal_coffin=\box...
 Defining \coffin_join:NnnNnnnn on line ...
 Defining \coffin_join:cnnNnnnn on line ...
 Defining \exp_args:NNnnc on line ...
diff --git a/l3kernel/testfiles/m3expl002.luatex.tlg b/l3kernel/testfiles/m3expl002.luatex.tlg
index 318ef4e..dcdd826 100644
--- a/l3kernel/testfiles/m3expl002.luatex.tlg
+++ b/l3kernel/testfiles/m3expl002.luatex.tlg
@@ -126,10 +126,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl002.ptex.tlg b/l3kernel/testfiles/m3expl002.ptex.tlg
index 259ebc1..bbfaa19 100644
--- a/l3kernel/testfiles/m3expl002.ptex.tlg
+++ b/l3kernel/testfiles/m3expl002.ptex.tlg
@@ -128,10 +128,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl002.tlg b/l3kernel/testfiles/m3expl002.tlg
index 06f5289..baf15b8 100644
--- a/l3kernel/testfiles/m3expl002.tlg
+++ b/l3kernel/testfiles/m3expl002.tlg
@@ -128,10 +128,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl002.uptex.tlg b/l3kernel/testfiles/m3expl002.uptex.tlg
index 07c199e..5658e81 100644
--- a/l3kernel/testfiles/m3expl002.uptex.tlg
+++ b/l3kernel/testfiles/m3expl002.uptex.tlg
@@ -125,10 +125,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl002.xetex.tlg b/l3kernel/testfiles/m3expl002.xetex.tlg
index 0b8e820..3b646dc 100644
--- a/l3kernel/testfiles/m3expl002.xetex.tlg
+++ b/l3kernel/testfiles/m3expl002.xetex.tlg
@@ -125,10 +125,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index dee3f70..e7eb0c8 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5341,10 +5341,6 @@ Defining \__coffin_set_eq:NNNNNNN on line ...
 Defining \__coffin_set_eq:NNNNN on line ...
 Defining \c_empty_coffin on line ...
 \c_empty_coffin=\box...
-Defining \l__coffin_aligned_coffin on line ...
-\l__coffin_aligned_coffin=\box...
-Defining \l__coffin_aligned_internal_coffin on line ...
-\l__coffin_aligned_internal_coffin=\box...
 Defining \l_tmpa_coffin on line ...
 \l_tmpa_coffin=\box...
 Defining \l_tmpb_coffin on line ...
@@ -5384,6 +5380,10 @@ Defining \__coffin_update_poles:NNN on line ...
 Defining \__coffin_calculate_intersection:Nnn on line ...
 Defining \__coffin_calculate_intersection:nnnnnnnn on line ...
 Defining \__coffin_calculate_intersection_aux:nnnnnN on line ...
+Defining \l__coffin_aligned_coffin on line ...
+\l__coffin_aligned_coffin=\box...
+Defining \l__coffin_aligned_internal_coffin on line ...
+\l__coffin_aligned_internal_coffin=\box...
 Defining \coffin_join:NnnNnnnn on line ...
 Defining \coffin_join:cnnNnnnn on line ...
 Defining \exp_args:NNnnc on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 7b0dc06..43d34da 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5637,10 +5637,6 @@ Defining \__coffin_set_eq:NNNNNNN on line ...
 Defining \__coffin_set_eq:NNNNN on line ...
 Defining \c_empty_coffin on line ...
 \c_empty_coffin=\box...
-Defining \l__coffin_aligned_coffin on line ...
-\l__coffin_aligned_coffin=\box...
-Defining \l__coffin_aligned_internal_coffin on line ...
-\l__coffin_aligned_internal_coffin=\box...
 Defining \l_tmpa_coffin on line ...
 \l_tmpa_coffin=\box...
 Defining \l_tmpb_coffin on line ...
@@ -5680,6 +5676,10 @@ Defining \__coffin_update_poles:NNN on line ...
 Defining \__coffin_calculate_intersection:Nnn on line ...
 Defining \__coffin_calculate_intersection:nnnnnnnn on line ...
 Defining \__coffin_calculate_intersection_aux:nnnnnN on line ...
+Defining \l__coffin_aligned_coffin on line ...
+\l__coffin_aligned_coffin=\box...
+Defining \l__coffin_aligned_internal_coffin on line ...
+\l__coffin_aligned_internal_coffin=\box...
 Defining \coffin_join:NnnNnnnn on line ...
 Defining \coffin_join:cnnNnnnn on line ...
 Defining \exp_args:NNnnc on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 8d0af45..19b0f86 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5637,10 +5637,6 @@ Defining \__coffin_set_eq:NNNNNNN on line ...
 Defining \__coffin_set_eq:NNNNN on line ...
 Defining \c_empty_coffin on line ...
 \c_empty_coffin=\box...
-Defining \l__coffin_aligned_coffin on line ...
-\l__coffin_aligned_coffin=\box...
-Defining \l__coffin_aligned_internal_coffin on line ...
-\l__coffin_aligned_internal_coffin=\box...
 Defining \l_tmpa_coffin on line ...
 \l_tmpa_coffin=\box...
 Defining \l_tmpb_coffin on line ...
@@ -5680,6 +5676,10 @@ Defining \__coffin_update_poles:NNN on line ...
 Defining \__coffin_calculate_intersection:Nnn on line ...
 Defining \__coffin_calculate_intersection:nnnnnnnn on line ...
 Defining \__coffin_calculate_intersection_aux:nnnnnN on line ...
+Defining \l__coffin_aligned_coffin on line ...
+\l__coffin_aligned_coffin=\box...
+Defining \l__coffin_aligned_internal_coffin on line ...
+\l__coffin_aligned_internal_coffin=\box...
 Defining \coffin_join:NnnNnnnn on line ...
 Defining \coffin_join:cnnNnnnn on line ...
 Defining \exp_args:NNnnc on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 1a3b94e..05c3133 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5634,10 +5634,6 @@ Defining \__coffin_set_eq:NNNNNNN on line ...
 Defining \__coffin_set_eq:NNNNN on line ...
 Defining \c_empty_coffin on line ...
 \c_empty_coffin=\box...
-Defining \l__coffin_aligned_coffin on line ...
-\l__coffin_aligned_coffin=\box...
-Defining \l__coffin_aligned_internal_coffin on line ...
-\l__coffin_aligned_internal_coffin=\box...
 Defining \l_tmpa_coffin on line ...
 \l_tmpa_coffin=\box...
 Defining \l_tmpb_coffin on line ...
@@ -5677,6 +5673,10 @@ Defining \__coffin_update_poles:NNN on line ...
 Defining \__coffin_calculate_intersection:Nnn on line ...
 Defining \__coffin_calculate_intersection:nnnnnnnn on line ...
 Defining \__coffin_calculate_intersection_aux:nnnnnN on line ...
+Defining \l__coffin_aligned_coffin on line ...
+\l__coffin_aligned_coffin=\box...
+Defining \l__coffin_aligned_internal_coffin on line ...
+\l__coffin_aligned_internal_coffin=\box...
 Defining \coffin_join:NnnNnnnn on line ...
 Defining \coffin_join:cnnNnnnn on line ...
 Defining \exp_args:NNnnc on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 29de866..1d8d000 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5352,10 +5352,6 @@ Defining \__coffin_set_eq:NNNNNNN on line ...
 Defining \__coffin_set_eq:NNNNN on line ...
 Defining \c_empty_coffin on line ...
 \c_empty_coffin=\box...
-Defining \l__coffin_aligned_coffin on line ...
-\l__coffin_aligned_coffin=\box...
-Defining \l__coffin_aligned_internal_coffin on line ...
-\l__coffin_aligned_internal_coffin=\box...
 Defining \l_tmpa_coffin on line ...
 \l_tmpa_coffin=\box...
 Defining \l_tmpb_coffin on line ...
@@ -5395,6 +5391,10 @@ Defining \__coffin_update_poles:NNN on line ...
 Defining \__coffin_calculate_intersection:Nnn on line ...
 Defining \__coffin_calculate_intersection:nnnnnnnn on line ...
 Defining \__coffin_calculate_intersection_aux:nnnnnN on line ...
+Defining \l__coffin_aligned_coffin on line ...
+\l__coffin_aligned_coffin=\box...
+Defining \l__coffin_aligned_internal_coffin on line ...
+\l__coffin_aligned_internal_coffin=\box...
 Defining \coffin_join:NnnNnnnn on line ...
 Defining \coffin_join:cnnNnnnn on line ...
 Defining \exp_args:NNnnc on line ...
diff --git a/l3kernel/testfiles/m3expl004.luatex.tlg b/l3kernel/testfiles/m3expl004.luatex.tlg
index 318ef4e..dcdd826 100644
--- a/l3kernel/testfiles/m3expl004.luatex.tlg
+++ b/l3kernel/testfiles/m3expl004.luatex.tlg
@@ -126,10 +126,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl004.ptex.tlg b/l3kernel/testfiles/m3expl004.ptex.tlg
index 259ebc1..bbfaa19 100644
--- a/l3kernel/testfiles/m3expl004.ptex.tlg
+++ b/l3kernel/testfiles/m3expl004.ptex.tlg
@@ -128,10 +128,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl004.tlg b/l3kernel/testfiles/m3expl004.tlg
index 06f5289..baf15b8 100644
--- a/l3kernel/testfiles/m3expl004.tlg
+++ b/l3kernel/testfiles/m3expl004.tlg
@@ -128,10 +128,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl004.uptex.tlg b/l3kernel/testfiles/m3expl004.uptex.tlg
index 07c199e..5658e81 100644
--- a/l3kernel/testfiles/m3expl004.uptex.tlg
+++ b/l3kernel/testfiles/m3expl004.uptex.tlg
@@ -125,10 +125,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl004.xetex.tlg b/l3kernel/testfiles/m3expl004.xetex.tlg
index 0b8e820..3b646dc 100644
--- a/l3kernel/testfiles/m3expl004.xetex.tlg
+++ b/l3kernel/testfiles/m3expl004.xetex.tlg
@@ -125,10 +125,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl006.luatex.tlg b/l3kernel/testfiles/m3expl006.luatex.tlg
index dbe24ce..54bf4bf 100644
--- a/l3kernel/testfiles/m3expl006.luatex.tlg
+++ b/l3kernel/testfiles/m3expl006.luatex.tlg
@@ -127,10 +127,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl006.ptex.tlg b/l3kernel/testfiles/m3expl006.ptex.tlg
index 8bd89f1..5e883d8 100644
--- a/l3kernel/testfiles/m3expl006.ptex.tlg
+++ b/l3kernel/testfiles/m3expl006.ptex.tlg
@@ -129,10 +129,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl006.tlg b/l3kernel/testfiles/m3expl006.tlg
index f43ee4b..a2b70ef 100644
--- a/l3kernel/testfiles/m3expl006.tlg
+++ b/l3kernel/testfiles/m3expl006.tlg
@@ -129,10 +129,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl006.uptex.tlg b/l3kernel/testfiles/m3expl006.uptex.tlg
index e60ba6c..0c748ee 100644
--- a/l3kernel/testfiles/m3expl006.uptex.tlg
+++ b/l3kernel/testfiles/m3expl006.uptex.tlg
@@ -126,10 +126,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl006.xetex.tlg b/l3kernel/testfiles/m3expl006.xetex.tlg
index 05aea50..1944833 100644
--- a/l3kernel/testfiles/m3expl006.xetex.tlg
+++ b/l3kernel/testfiles/m3expl006.xetex.tlg
@@ -126,10 +126,10 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
-\l__coffin_aligned_coffin=\box...
-\l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
 \l_tmpb_coffin=\box...
+\l__coffin_aligned_coffin=\box...
+\l__coffin_aligned_internal_coffin=\box...
 \c__coffin_empty_coffin=\box...
 \l__coffin_display_coffin=\box...
 \l__coffin_display_coord_coffin=\box...





More information about the latex3-commits mailing list