[latex3-commits] [git/LaTeX3-latex3-latex3] master: Avoid abusing \c_empty_coffin (dc31a5a)

[Joseph Wright]

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

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

commit dc31a5a976587f7dad76eb0555e839219053c2a9
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Jan 20 10:13:06 2019 +0000

    Avoid abusing \c_empty_coffin


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

dc31a5a976587f7dad76eb0555e839219053c2a9
 l3kernel/l3coffins.dtx                     |   11 +++++++++--
 l3kernel/testfiles/m3coffins001.luatex.tlg |    2 +-
 l3kernel/testfiles/m3coffins001.ptex.tlg   |    2 +-
 l3kernel/testfiles/m3coffins001.tlg        |    2 +-
 l3kernel/testfiles/m3coffins001.uptex.tlg  |    2 +-
 l3kernel/testfiles/m3coffins001.xetex.tlg  |    2 +-
 l3kernel/testfiles/m3expl001.luatex.tlg    |    2 ++
 l3kernel/testfiles/m3expl001.ptex.tlg      |    2 ++
 l3kernel/testfiles/m3expl001.tlg           |    2 ++
 l3kernel/testfiles/m3expl001.uptex.tlg     |    2 ++
 l3kernel/testfiles/m3expl001.xetex.tlg     |    2 ++
 l3kernel/testfiles/m3expl003.luatex.tlg    |    2 ++
 l3kernel/testfiles/m3expl003.ptex.tlg      |    2 ++
 l3kernel/testfiles/m3expl003.tlg           |    2 ++
 l3kernel/testfiles/m3expl003.uptex.tlg     |    2 ++
 l3kernel/testfiles/m3expl003.xetex.tlg     |    2 ++
 16 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/l3kernel/l3coffins.dtx b/l3kernel/l3coffins.dtx
index a3f6149..40b07bc 100644
--- a/l3kernel/l3coffins.dtx
+++ b/l3kernel/l3coffins.dtx
@@ -700,7 +700,6 @@
 %   yet.
 %    \begin{macrocode}
 \coffin_new:N \c_empty_coffin
-\tex_setbox:D \c_empty_coffin = \tex_hbox:D { }
 \coffin_new:N \l_@@_aligned_coffin
 \coffin_new:N \l_@@_aligned_internal_coffin
 %    \end{macrocode}
@@ -1369,6 +1368,14 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{variable}{\c_@@_empty_coffin}
+%   An empty-but-horizontal coffin.
+%    \begin{macrocode}
+\coffin_new:N \c_@@_empty_coffin
+\tex_setbox:D \c_@@_empty_coffin = \tex_hbox:D { }
+%    \end{macrocode}
+% \end{variable}
+%
 % \begin{macro}{\coffin_typeset:Nnnnn, \coffin_typeset:cnnnn}
 %   Typesetting a coffin means aligning it with the current position,
 %   which is done using a coffin with no content at all. As well as aligning to
@@ -1377,7 +1384,7 @@
 \cs_new_protected:Npn \coffin_typeset:Nnnnn #1#2#3#4#5
   {
     \mode_leave_vertical:
-    \@@_align:NnnNnnnnN \c_empty_coffin { H } { l }
+    \@@_align:NnnNnnnnN \c_@@_empty_coffin { H } { l }
       #1 {#2} {#3} {#4} {#5} \l_@@_aligned_coffin
     \box_use_drop:N \l_@@_aligned_coffin
   }
diff --git a/l3kernel/testfiles/m3coffins001.luatex.tlg b/l3kernel/testfiles/m3coffins001.luatex.tlg
index ec28414..40aad55 100644
--- a/l3kernel/testfiles/m3coffins001.luatex.tlg
+++ b/l3kernel/testfiles/m3coffins001.luatex.tlg
@@ -30,7 +30,7 @@ This is a coding error.
 LaTeX has been asked to create a new control sequence '\aaa' but this name has
 already been used elsewhere.
 The current meaning is:
-  \char"49
+  \char"4A
 Defining \aaa on line ...
 \aaa=\box...
 ============================================================
diff --git a/l3kernel/testfiles/m3coffins001.ptex.tlg b/l3kernel/testfiles/m3coffins001.ptex.tlg
index 1660191..2cf2df1 100644
--- a/l3kernel/testfiles/m3coffins001.ptex.tlg
+++ b/l3kernel/testfiles/m3coffins001.ptex.tlg
@@ -30,7 +30,7 @@ This is a coding error.
 LaTeX has been asked to create a new control sequence '\aaa' but this name has
 already been used elsewhere.
 The current meaning is:
-  \char"49
+  \char"4A
 Defining \aaa on line ...
 \aaa=\box...
 ============================================================
diff --git a/l3kernel/testfiles/m3coffins001.tlg b/l3kernel/testfiles/m3coffins001.tlg
index 8e6d7a4..1e4ce90 100644
--- a/l3kernel/testfiles/m3coffins001.tlg
+++ b/l3kernel/testfiles/m3coffins001.tlg
@@ -30,7 +30,7 @@ This is a coding error.
 LaTeX has been asked to create a new control sequence '\aaa' but this name has
 already been used elsewhere.
 The current meaning is:
-  \char"49
+  \char"4A
 Defining \aaa on line ...
 \aaa=\box...
 ============================================================
diff --git a/l3kernel/testfiles/m3coffins001.uptex.tlg b/l3kernel/testfiles/m3coffins001.uptex.tlg
index b74c384..b5ea9ea 100644
--- a/l3kernel/testfiles/m3coffins001.uptex.tlg
+++ b/l3kernel/testfiles/m3coffins001.uptex.tlg
@@ -30,7 +30,7 @@ This is a coding error.
 LaTeX has been asked to create a new control sequence '\aaa' but this name has
 already been used elsewhere.
 The current meaning is:
-  \char"49
+  \char"4A
 Defining \aaa on line ...
 \aaa=\box...
 ============================================================
diff --git a/l3kernel/testfiles/m3coffins001.xetex.tlg b/l3kernel/testfiles/m3coffins001.xetex.tlg
index 1660191..2cf2df1 100644
--- a/l3kernel/testfiles/m3coffins001.xetex.tlg
+++ b/l3kernel/testfiles/m3coffins001.xetex.tlg
@@ -30,7 +30,7 @@ This is a coding error.
 LaTeX has been asked to create a new control sequence '\aaa' but this name has
 already been used elsewhere.
 The current meaning is:
-  \char"49
+  \char"4A
 Defining \aaa on line ...
 \aaa=\box...
 ============================================================
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 9d34754..5af7dde 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5367,6 +5367,8 @@ Defining \__coffin_offset_corner:Nnnnn on line ...
 Defining \__coffin_update_vertical_poles:NNN on line ...
 Defining \__coffin_update_T:nnnnnnnnN on line ...
 Defining \__coffin_update_B:nnnnnnnnN on line ...
+Defining \c__coffin_empty_coffin on line ...
+\c__coffin_empty_coffin=\box...
 Defining \coffin_typeset:Nnnnn on line ...
 Defining \coffin_typeset:cnnnn on line ...
 Defining \l__coffin_display_coffin on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index c0260e5..06640cb 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5663,6 +5663,8 @@ Defining \__coffin_offset_corner:Nnnnn on line ...
 Defining \__coffin_update_vertical_poles:NNN on line ...
 Defining \__coffin_update_T:nnnnnnnnN on line ...
 Defining \__coffin_update_B:nnnnnnnnN on line ...
+Defining \c__coffin_empty_coffin on line ...
+\c__coffin_empty_coffin=\box...
 Defining \coffin_typeset:Nnnnn on line ...
 Defining \coffin_typeset:cnnnn on line ...
 Defining \l__coffin_display_coffin on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index d0375f4..4b0a63c 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5663,6 +5663,8 @@ Defining \__coffin_offset_corner:Nnnnn on line ...
 Defining \__coffin_update_vertical_poles:NNN on line ...
 Defining \__coffin_update_T:nnnnnnnnN on line ...
 Defining \__coffin_update_B:nnnnnnnnN on line ...
+Defining \c__coffin_empty_coffin on line ...
+\c__coffin_empty_coffin=\box...
 Defining \coffin_typeset:Nnnnn on line ...
 Defining \coffin_typeset:cnnnn on line ...
 Defining \l__coffin_display_coffin on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 4a5ba6f..2610acb 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5660,6 +5660,8 @@ Defining \__coffin_offset_corner:Nnnnn on line ...
 Defining \__coffin_update_vertical_poles:NNN on line ...
 Defining \__coffin_update_T:nnnnnnnnN on line ...
 Defining \__coffin_update_B:nnnnnnnnN on line ...
+Defining \c__coffin_empty_coffin on line ...
+\c__coffin_empty_coffin=\box...
 Defining \coffin_typeset:Nnnnn on line ...
 Defining \coffin_typeset:cnnnn on line ...
 Defining \l__coffin_display_coffin on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index eceb662..bc1e810 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5378,6 +5378,8 @@ Defining \__coffin_offset_corner:Nnnnn on line ...
 Defining \__coffin_update_vertical_poles:NNN on line ...
 Defining \__coffin_update_T:nnnnnnnnN on line ...
 Defining \__coffin_update_B:nnnnnnnnN on line ...
+Defining \c__coffin_empty_coffin on line ...
+\c__coffin_empty_coffin=\box...
 Defining \coffin_typeset:Nnnnn on line ...
 Defining \coffin_typeset:cnnnn on line ...
 Defining \l__coffin_display_coffin on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 9d34754..5af7dde 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5367,6 +5367,8 @@ Defining \__coffin_offset_corner:Nnnnn on line ...
 Defining \__coffin_update_vertical_poles:NNN on line ...
 Defining \__coffin_update_T:nnnnnnnnN on line ...
 Defining \__coffin_update_B:nnnnnnnnN on line ...
+Defining \c__coffin_empty_coffin on line ...
+\c__coffin_empty_coffin=\box...
 Defining \coffin_typeset:Nnnnn on line ...
 Defining \coffin_typeset:cnnnn on line ...
 Defining \l__coffin_display_coffin on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index c0260e5..06640cb 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5663,6 +5663,8 @@ Defining \__coffin_offset_corner:Nnnnn on line ...
 Defining \__coffin_update_vertical_poles:NNN on line ...
 Defining \__coffin_update_T:nnnnnnnnN on line ...
 Defining \__coffin_update_B:nnnnnnnnN on line ...
+Defining \c__coffin_empty_coffin on line ...
+\c__coffin_empty_coffin=\box...
 Defining \coffin_typeset:Nnnnn on line ...
 Defining \coffin_typeset:cnnnn on line ...
 Defining \l__coffin_display_coffin on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index d0375f4..4b0a63c 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5663,6 +5663,8 @@ Defining \__coffin_offset_corner:Nnnnn on line ...
 Defining \__coffin_update_vertical_poles:NNN on line ...
 Defining \__coffin_update_T:nnnnnnnnN on line ...
 Defining \__coffin_update_B:nnnnnnnnN on line ...
+Defining \c__coffin_empty_coffin on line ...
+\c__coffin_empty_coffin=\box...
 Defining \coffin_typeset:Nnnnn on line ...
 Defining \coffin_typeset:cnnnn on line ...
 Defining \l__coffin_display_coffin on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 4a5ba6f..2610acb 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5660,6 +5660,8 @@ Defining \__coffin_offset_corner:Nnnnn on line ...
 Defining \__coffin_update_vertical_poles:NNN on line ...
 Defining \__coffin_update_T:nnnnnnnnN on line ...
 Defining \__coffin_update_B:nnnnnnnnN on line ...
+Defining \c__coffin_empty_coffin on line ...
+\c__coffin_empty_coffin=\box...
 Defining \coffin_typeset:Nnnnn on line ...
 Defining \coffin_typeset:cnnnn on line ...
 Defining \l__coffin_display_coffin on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index eceb662..bc1e810 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5378,6 +5378,8 @@ Defining \__coffin_offset_corner:Nnnnn on line ...
 Defining \__coffin_update_vertical_poles:NNN on line ...
 Defining \__coffin_update_T:nnnnnnnnN on line ...
 Defining \__coffin_update_B:nnnnnnnnN on line ...
+Defining \c__coffin_empty_coffin on line ...
+\c__coffin_empty_coffin=\box...
 Defining \coffin_typeset:Nnnnn on line ...
 Defining \coffin_typeset:cnnnn on line ...
 Defining \l__coffin_display_coffin on line ...