[latex3-commits] [git/LaTeX3-latex3-latex3] master: Use \color_... functions for 'color safety' (e1d5ff5)

Joseph Wright joseph.wright at morningstar2.co.uk
Tue Feb 27 21:29:09 CET 2018


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

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

commit e1d5ff5cf3f80657108e19fb3b36e55692073e80
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Feb 27 20:29:09 2018 +0000

    Use \color_... functions for 'color safety'
    
    No change in functionality: purely making the
    code clearer (and using our own tools!).


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

e1d5ff5cf3f80657108e19fb3b36e55692073e80
 l3kernel/l3.ins                         |    2 +-
 l3kernel/l3box.dtx                      |   58 ++++++++++++++++---------------
 l3kernel/l3format.ins                   |    2 +-
 l3kernel/testfiles/m3expl001.luatex.tlg |   22 ++++++------
 l3kernel/testfiles/m3expl001.ptex.tlg   |   22 ++++++------
 l3kernel/testfiles/m3expl001.tlg        |   22 ++++++------
 l3kernel/testfiles/m3expl001.uptex.tlg  |   22 ++++++------
 l3kernel/testfiles/m3expl001.xetex.tlg  |   22 ++++++------
 l3kernel/testfiles/m3expl003.luatex.tlg |   22 ++++++------
 l3kernel/testfiles/m3expl003.ptex.tlg   |   22 ++++++------
 l3kernel/testfiles/m3expl003.tlg        |   22 ++++++------
 l3kernel/testfiles/m3expl003.uptex.tlg  |   22 ++++++------
 l3kernel/testfiles/m3expl003.xetex.tlg  |   22 ++++++------
 l3kernel/testfiles/m3expl006.luatex.tlg |    8 +++++
 l3kernel/testfiles/m3expl006.ptex.tlg   |    8 +++++
 l3kernel/testfiles/m3expl006.tlg        |    8 +++++
 l3kernel/testfiles/m3expl006.uptex.tlg  |    8 +++++
 l3kernel/testfiles/m3expl006.xetex.tlg  |    8 +++++
 18 files changed, 182 insertions(+), 140 deletions(-)

diff --git a/l3kernel/l3.ins b/l3kernel/l3.ins
index e2db89d..e2df5ff 100644
--- a/l3kernel/l3.ins
+++ b/l3kernel/l3.ins
@@ -96,8 +96,8 @@ and all files in that bundle must be distributed together.
         \from{l3tl-analysis.dtx}{package}
         \from{l3regex.dtx}      {package}
         \from{l3box.dtx}        {package}
-        \from{l3coffins.dtx}    {package}
         \from{l3color-base.dtx} {package}
+        \from{l3coffins.dtx}    {package}
         \from{l3sys.dtx}        {package}
         \from{l3deprecation.dtx}{package}
         \from{l3candidates.dtx} {package}
diff --git a/l3kernel/l3box.dtx b/l3kernel/l3box.dtx
index d214f85..df12ffe 100644
--- a/l3kernel/l3box.dtx
+++ b/l3kernel/l3box.dtx
@@ -1190,7 +1190,7 @@
 %   Put a horizontal box directly into the input stream.
 %    \begin{macrocode}
 \cs_new_protected:Npn \hbox:n #1
-  { \tex_hbox:D \scan_stop: { \group_begin: #1 \group_end: } }
+  { \tex_hbox:D \scan_stop: { \color_group_begin: #1 \color_group_end: } }
 %    \end{macrocode}
 %  \end{macro}
 %
@@ -1200,10 +1200,13 @@
 %    \begin{macrocode}
 \__kernel_patch:nnNNpn { \__kernel_chk_var_local:N #1 } { }
 \cs_new_protected:Npn \hbox_set:Nn #1#2
-  { \tex_setbox:D #1 \tex_hbox:D { \group_begin: #2 \group_end: } }
+  { \tex_setbox:D #1 \tex_hbox:D { \color_group_begin: #2 \color_group_end: } }
 \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { }
 \cs_new_protected:Npn \hbox_gset:Nn #1#2
-  { \tex_global:D \tex_setbox:D #1 \tex_hbox:D { \group_begin: #2 \group_end: } }
+  {
+    \tex_global:D \tex_setbox:D #1 \tex_hbox:D
+      { \color_group_begin: #2 \color_group_end: }
+  }
 \cs_generate_variant:Nn \hbox_set:Nn { c }
 \cs_generate_variant:Nn \hbox_gset:Nn { c }
 %    \end{macrocode}
@@ -1220,13 +1223,13 @@
 \cs_new_protected:Npn \hbox_set_to_wd:Nnn #1#2#3
   {
     \tex_setbox:D #1 \tex_hbox:D to \__dim_eval:n {#2}
-      { \group_begin: #3 \group_end: }
+      { \color_group_begin: #3 \color_group_end: }
   }
 \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { }
 \cs_new_protected:Npn \hbox_gset_to_wd:Nnn #1#2#3
   {
     \tex_global:D \tex_setbox:D #1 \tex_hbox:D to \__dim_eval:n {#2}
-      { \group_begin: #3 \group_end: }
+      { \color_group_begin: #3 \color_group_end: }
   }
 \cs_generate_variant:Nn \hbox_set_to_wd:Nnn { c }
 \cs_generate_variant:Nn \hbox_gset_to_wd:Nnn { c }
@@ -1246,20 +1249,20 @@
   {
     \tex_setbox:D #1 \tex_hbox:D
       \c_group_begin_token
-        \group_begin:
+        \color_group_begin:
   }
 \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { }
 \cs_new_protected:Npn \hbox_gset:Nw  #1
   {
     \tex_global:D \tex_setbox:D #1 \tex_hbox:D
       \c_group_begin_token
-        \group_begin:
+        \color_group_begin:
   }
 \cs_generate_variant:Nn \hbox_set:Nw  { c }
 \cs_generate_variant:Nn \hbox_gset:Nw { c }
 \cs_new_protected:Npn \hbox_set_end:
   {
-      \group_end:
+      \color_group_end:
     \c_group_end_token
   }
 \cs_new_eq:NN \hbox_gset_end: \hbox_set_end:
@@ -1277,14 +1280,14 @@
   {
     \tex_setbox:D #1 \tex_hbox:D to \__dim_eval:n {#2}
       \c_group_begin_token
-        \group_begin:
+        \color_group_begin:
   }
 \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { }
 \cs_new_protected:Npn \hbox_gset_to_wd:Nnw #1#2
   {
     \tex_global:D \tex_setbox:D #1 \tex_hbox:D to \__dim_eval:n {#2}
       \c_group_begin_token
-        \group_begin:
+        \color_group_begin:
   }
 \cs_generate_variant:Nn \hbox_set_to_wd:Nnw  { c }
 \cs_generate_variant:Nn \hbox_gset_to_wd:Nnw { c }
@@ -1300,10 +1303,10 @@
 \cs_new_protected:Npn \hbox_to_wd:nn #1#2
    {
      \tex_hbox:D to \__dim_eval:n {#1}
-       { \group_begin: #2 \group_end: }
+       { \color_group_begin: #2 \color_group_end: }
    }
 \cs_new_protected:Npn \hbox_to_zero:n #1
-  { \tex_hbox:D to \c_zero_dim { \group_begin: #1 \group_end: } }
+  { \tex_hbox:D to \c_zero_dim { \color_group_begin: #1 \color_group_end: } }
 %    \end{macrocode}
 %  \end{macro}
 %  \end{macro}
@@ -1345,9 +1348,9 @@
 %   Put a vertical box directly into the input stream.
 %    \begin{macrocode}
 \cs_new_protected:Npn \vbox:n #1
-  { \tex_vbox:D { \group_begin: #1 \par \group_end: } }
+  { \tex_vbox:D { \color_group_begin: #1 \color_group_end: } }
 \cs_new_protected:Npn \vbox_top:n #1
-  { \tex_vtop:D { \group_begin: #1 \par \group_end: } }
+  { \tex_vtop:D { \color_group_begin: #1 \color_group_end: } }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -1360,12 +1363,12 @@
 \cs_new_protected:Npn \vbox_to_ht:nn #1#2
   {
     \tex_vbox:D to \__dim_eval:n {#1}
-      { \group_begin: #2 \par \group_end: }
+      { \color_group_begin: #2 \color_group_end: }
   }
 \cs_new_protected:Npn \vbox_to_zero:n #1
   {
     \tex_vbox:D to \c_zero_dim
-      { \group_begin: #1 \par \group_end: }
+      { \color_group_begin: #1 \color_group_end: }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -1380,13 +1383,13 @@
 \cs_new_protected:Npn \vbox_set:Nn #1#2
   {
     \tex_setbox:D #1 \tex_vbox:D
-      { \group_begin: #2 \par \group_end: }
+      { \color_group_begin: #2 \color_group_end: }
   }
 \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { }
 \cs_new_protected:Npn \vbox_gset:Nn #1#2
   {
     \tex_global:D \tex_setbox:D #1 \tex_vbox:D
-      { \group_begin: #2 \par \group_end: }
+      { \color_group_begin: #2 \color_group_end: }
   }
 \cs_generate_variant:Nn \vbox_set:Nn  { c }
 \cs_generate_variant:Nn \vbox_gset:Nn { c }
@@ -1404,13 +1407,13 @@
 \cs_new_protected:Npn \vbox_set_top:Nn #1#2
   {
     \tex_setbox:D #1 \tex_vtop:D
-      { \group_begin: #2 \par \group_end: }
+      { \color_group_begin: #2 \color_group_end: }
   }
 \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { }
 \cs_new_protected:Npn \vbox_gset_top:Nn #1#2
   {
     \tex_global:D \tex_setbox:D #1 \tex_vtop:D
-      { \group_begin: #2 \par \group_end: }
+      { \color_group_begin: #2 \color_group_end: }
   }
 \cs_generate_variant:Nn \vbox_set_top:Nn { c }
 \cs_generate_variant:Nn \vbox_gset_top:Nn { c }
@@ -1427,13 +1430,13 @@
 \cs_new_protected:Npn \vbox_set_to_ht:Nnn #1#2#3
   {
     \tex_setbox:D #1 \tex_vbox:D to \__dim_eval:n {#2}
-      { \group_begin: #3 \par \group_end: }
+      { \color_group_begin: #3 \color_group_end: }
   }
 \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { }
 \cs_new_protected:Npn \vbox_gset_to_ht:Nnn #1#2#3
   {
     \tex_global:D \tex_setbox:D #1 \tex_vbox:D to \__dim_eval:n {#2}
-      { \group_begin: #3 \par \group_end: }
+      { \color_group_begin: #3 \color_group_end: }
   }
 \cs_generate_variant:Nn \vbox_set_to_ht:Nnn  { c }
 \cs_generate_variant:Nn \vbox_gset_to_ht:Nnn { c }
@@ -1453,21 +1456,20 @@
   {
     \tex_setbox:D #1 \tex_vbox:D
       \c_group_begin_token
-        \group_begin:
+        \color_group_begin:
   }
 \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { }
 \cs_new_protected:Npn \vbox_gset:Nw #1
   {
     \tex_global:D \tex_setbox:D #1 \tex_vbox:D
       \c_group_begin_token
-        \group_begin:
+        \color_group_begin:
   }
 \cs_generate_variant:Nn \vbox_set:Nw  { c }
 \cs_generate_variant:Nn \vbox_gset:Nw { c }
 \cs_new_protected:Npn \vbox_set_end:
   {
-        \par
-      \group_end:
+      \color_group_end:
     \c_group_end_token
   }
 \cs_new_eq:NN \vbox_gset_end: \vbox_set_end:
@@ -1485,14 +1487,14 @@
   {
     \tex_setbox:D #1 \tex_vbox:D to \__dim_eval:n {#2}
       \c_group_begin_token
-        \group_begin:
+        \color_group_begin:
   }
 \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { }
 \cs_new_protected:Npn \vbox_gset_to_ht:Nnw #1#2
   {
     \tex_global:D \tex_setbox:D #1 \tex_vbox:D to \__dim_eval:n {#2}
       \c_group_begin_token
-        \group_begin:
+        \color_group_begin:
   }
 \cs_generate_variant:Nn \vbox_set_to_ht:Nnw  { c }
 \cs_generate_variant:Nn \vbox_gset_to_ht:Nnw { c }
diff --git a/l3kernel/l3format.ins b/l3kernel/l3format.ins
index 6aa7727..472df57 100644
--- a/l3kernel/l3format.ins
+++ b/l3kernel/l3format.ins
@@ -96,8 +96,8 @@ and all files in that bundle must be distributed together.
         \from{l3tl-analysis.dtx}{initex}
         \from{l3regex.dtx}      {initex}
         \from{l3box.dtx}        {initex}
-        \from{l3coffins.dtx}    {initex}
         \from{l3color-base.dtx} {initex}
+        \from{l3coffins.dtx}    {initex}
         \from{l3sys.dtx}        {initex}
         \from{l3deprecation.dtx}{initex}
         \from{l3candidates.dtx} {initex}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 225117b..2221e6b 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5376,6 +5376,17 @@ Defining \box_resize:Nnn on line ...
 Defining \box_resize:cnn on line ...
 Defining \box_use_clear:N on line ...
 Defining \box_use_clear:c on line ...
+Defining \color_group_begin: on line ...
+Defining \color_group_end: on line ...
+Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
+Defining \l__color_current_tl on line ...
 Defining \l__coffin_internal_box on line ...
 \l__coffin_internal_box=\box...
 Defining \l__coffin_internal_dim on line ...
@@ -5511,17 +5522,6 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
 Defining message LaTeX/kernel/unknown-coffin on line ...
 Defining message LaTeX/kernel/unknown-coffin-pole on line ...
 Defining message LaTeX/kernel/show-coffin on line ...
-Defining \color_group_begin: on line ...
-Defining \color_group_end: on line ...
-Defining \color_ensure_current: on line ...
-Defining \__color_select:n on line ...
-Defining \__color_select:V on line ...
-Defining \__color_select:w on line ...
-Defining \__color_select_cmyk:w on line ...
-Defining \__color_select_gray:w on line ...
-Defining \__color_select_rgb:w on line ...
-Defining \__color_select_spot:w on line ...
-Defining \l__color_current_tl on line ...
 Defining \c_sys_jobname_str on line ...
 Defining \c_sys_minute_int on line ...
 Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 2c313fe..93837ba 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5366,6 +5366,17 @@ Defining \box_resize:Nnn on line ...
 Defining \box_resize:cnn on line ...
 Defining \box_use_clear:N on line ...
 Defining \box_use_clear:c on line ...
+Defining \color_group_begin: on line ...
+Defining \color_group_end: on line ...
+Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
+Defining \l__color_current_tl on line ...
 Defining \l__coffin_internal_box on line ...
 \l__coffin_internal_box=\box...
 Defining \l__coffin_internal_dim on line ...
@@ -5501,17 +5512,6 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
 Defining message LaTeX/kernel/unknown-coffin on line ...
 Defining message LaTeX/kernel/unknown-coffin-pole on line ...
 Defining message LaTeX/kernel/show-coffin on line ...
-Defining \color_group_begin: on line ...
-Defining \color_group_end: on line ...
-Defining \color_ensure_current: on line ...
-Defining \__color_select:n on line ...
-Defining \__color_select:V on line ...
-Defining \__color_select:w on line ...
-Defining \__color_select_cmyk:w on line ...
-Defining \__color_select_gray:w on line ...
-Defining \__color_select_rgb:w on line ...
-Defining \__color_select_spot:w on line ...
-Defining \l__color_current_tl on line ...
 Defining \c_sys_jobname_str on line ...
 Defining \c_sys_minute_int on line ...
 Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index bce94d6..de8efbd 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5366,6 +5366,17 @@ Defining \box_resize:Nnn on line ...
 Defining \box_resize:cnn on line ...
 Defining \box_use_clear:N on line ...
 Defining \box_use_clear:c on line ...
+Defining \color_group_begin: on line ...
+Defining \color_group_end: on line ...
+Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
+Defining \l__color_current_tl on line ...
 Defining \l__coffin_internal_box on line ...
 \l__coffin_internal_box=\box...
 Defining \l__coffin_internal_dim on line ...
@@ -5501,17 +5512,6 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
 Defining message LaTeX/kernel/unknown-coffin on line ...
 Defining message LaTeX/kernel/unknown-coffin-pole on line ...
 Defining message LaTeX/kernel/show-coffin on line ...
-Defining \color_group_begin: on line ...
-Defining \color_group_end: on line ...
-Defining \color_ensure_current: on line ...
-Defining \__color_select:n on line ...
-Defining \__color_select:V on line ...
-Defining \__color_select:w on line ...
-Defining \__color_select_cmyk:w on line ...
-Defining \__color_select_gray:w on line ...
-Defining \__color_select_rgb:w on line ...
-Defining \__color_select_spot:w on line ...
-Defining \l__color_current_tl on line ...
 Defining \c_sys_jobname_str on line ...
 Defining \c_sys_minute_int on line ...
 Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 19b856b..f879fb0 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5364,6 +5364,17 @@ Defining \box_resize:Nnn on line ...
 Defining \box_resize:cnn on line ...
 Defining \box_use_clear:N on line ...
 Defining \box_use_clear:c on line ...
+Defining \color_group_begin: on line ...
+Defining \color_group_end: on line ...
+Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
+Defining \l__color_current_tl on line ...
 Defining \l__coffin_internal_box on line ...
 \l__coffin_internal_box=\box...
 Defining \l__coffin_internal_dim on line ...
@@ -5499,17 +5510,6 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
 Defining message LaTeX/kernel/unknown-coffin on line ...
 Defining message LaTeX/kernel/unknown-coffin-pole on line ...
 Defining message LaTeX/kernel/show-coffin on line ...
-Defining \color_group_begin: on line ...
-Defining \color_group_end: on line ...
-Defining \color_ensure_current: on line ...
-Defining \__color_select:n on line ...
-Defining \__color_select:V on line ...
-Defining \__color_select:w on line ...
-Defining \__color_select_cmyk:w on line ...
-Defining \__color_select_gray:w on line ...
-Defining \__color_select_rgb:w on line ...
-Defining \__color_select_spot:w on line ...
-Defining \l__color_current_tl on line ...
 Defining \c_sys_jobname_str on line ...
 Defining \c_sys_minute_int on line ...
 Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 880a875..8883318 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5353,6 +5353,17 @@ Defining \box_resize:Nnn on line ...
 Defining \box_resize:cnn on line ...
 Defining \box_use_clear:N on line ...
 Defining \box_use_clear:c on line ...
+Defining \color_group_begin: on line ...
+Defining \color_group_end: on line ...
+Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
+Defining \l__color_current_tl on line ...
 Defining \l__coffin_internal_box on line ...
 \l__coffin_internal_box=\box...
 Defining \l__coffin_internal_dim on line ...
@@ -5488,17 +5499,6 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
 Defining message LaTeX/kernel/unknown-coffin on line ...
 Defining message LaTeX/kernel/unknown-coffin-pole on line ...
 Defining message LaTeX/kernel/show-coffin on line ...
-Defining \color_group_begin: on line ...
-Defining \color_group_end: on line ...
-Defining \color_ensure_current: on line ...
-Defining \__color_select:n on line ...
-Defining \__color_select:V on line ...
-Defining \__color_select:w on line ...
-Defining \__color_select_cmyk:w on line ...
-Defining \__color_select_gray:w on line ...
-Defining \__color_select_rgb:w on line ...
-Defining \__color_select_spot:w on line ...
-Defining \l__color_current_tl on line ...
 Defining \c_sys_jobname_str on line ...
 Defining \c_sys_minute_int on line ...
 Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 225117b..2221e6b 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5376,6 +5376,17 @@ Defining \box_resize:Nnn on line ...
 Defining \box_resize:cnn on line ...
 Defining \box_use_clear:N on line ...
 Defining \box_use_clear:c on line ...
+Defining \color_group_begin: on line ...
+Defining \color_group_end: on line ...
+Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
+Defining \l__color_current_tl on line ...
 Defining \l__coffin_internal_box on line ...
 \l__coffin_internal_box=\box...
 Defining \l__coffin_internal_dim on line ...
@@ -5511,17 +5522,6 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
 Defining message LaTeX/kernel/unknown-coffin on line ...
 Defining message LaTeX/kernel/unknown-coffin-pole on line ...
 Defining message LaTeX/kernel/show-coffin on line ...
-Defining \color_group_begin: on line ...
-Defining \color_group_end: on line ...
-Defining \color_ensure_current: on line ...
-Defining \__color_select:n on line ...
-Defining \__color_select:V on line ...
-Defining \__color_select:w on line ...
-Defining \__color_select_cmyk:w on line ...
-Defining \__color_select_gray:w on line ...
-Defining \__color_select_rgb:w on line ...
-Defining \__color_select_spot:w on line ...
-Defining \l__color_current_tl on line ...
 Defining \c_sys_jobname_str on line ...
 Defining \c_sys_minute_int on line ...
 Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 2c313fe..93837ba 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5366,6 +5366,17 @@ Defining \box_resize:Nnn on line ...
 Defining \box_resize:cnn on line ...
 Defining \box_use_clear:N on line ...
 Defining \box_use_clear:c on line ...
+Defining \color_group_begin: on line ...
+Defining \color_group_end: on line ...
+Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
+Defining \l__color_current_tl on line ...
 Defining \l__coffin_internal_box on line ...
 \l__coffin_internal_box=\box...
 Defining \l__coffin_internal_dim on line ...
@@ -5501,17 +5512,6 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
 Defining message LaTeX/kernel/unknown-coffin on line ...
 Defining message LaTeX/kernel/unknown-coffin-pole on line ...
 Defining message LaTeX/kernel/show-coffin on line ...
-Defining \color_group_begin: on line ...
-Defining \color_group_end: on line ...
-Defining \color_ensure_current: on line ...
-Defining \__color_select:n on line ...
-Defining \__color_select:V on line ...
-Defining \__color_select:w on line ...
-Defining \__color_select_cmyk:w on line ...
-Defining \__color_select_gray:w on line ...
-Defining \__color_select_rgb:w on line ...
-Defining \__color_select_spot:w on line ...
-Defining \l__color_current_tl on line ...
 Defining \c_sys_jobname_str on line ...
 Defining \c_sys_minute_int on line ...
 Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index bce94d6..de8efbd 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5366,6 +5366,17 @@ Defining \box_resize:Nnn on line ...
 Defining \box_resize:cnn on line ...
 Defining \box_use_clear:N on line ...
 Defining \box_use_clear:c on line ...
+Defining \color_group_begin: on line ...
+Defining \color_group_end: on line ...
+Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
+Defining \l__color_current_tl on line ...
 Defining \l__coffin_internal_box on line ...
 \l__coffin_internal_box=\box...
 Defining \l__coffin_internal_dim on line ...
@@ -5501,17 +5512,6 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
 Defining message LaTeX/kernel/unknown-coffin on line ...
 Defining message LaTeX/kernel/unknown-coffin-pole on line ...
 Defining message LaTeX/kernel/show-coffin on line ...
-Defining \color_group_begin: on line ...
-Defining \color_group_end: on line ...
-Defining \color_ensure_current: on line ...
-Defining \__color_select:n on line ...
-Defining \__color_select:V on line ...
-Defining \__color_select:w on line ...
-Defining \__color_select_cmyk:w on line ...
-Defining \__color_select_gray:w on line ...
-Defining \__color_select_rgb:w on line ...
-Defining \__color_select_spot:w on line ...
-Defining \l__color_current_tl on line ...
 Defining \c_sys_jobname_str on line ...
 Defining \c_sys_minute_int on line ...
 Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 19b856b..f879fb0 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5364,6 +5364,17 @@ Defining \box_resize:Nnn on line ...
 Defining \box_resize:cnn on line ...
 Defining \box_use_clear:N on line ...
 Defining \box_use_clear:c on line ...
+Defining \color_group_begin: on line ...
+Defining \color_group_end: on line ...
+Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
+Defining \l__color_current_tl on line ...
 Defining \l__coffin_internal_box on line ...
 \l__coffin_internal_box=\box...
 Defining \l__coffin_internal_dim on line ...
@@ -5499,17 +5510,6 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
 Defining message LaTeX/kernel/unknown-coffin on line ...
 Defining message LaTeX/kernel/unknown-coffin-pole on line ...
 Defining message LaTeX/kernel/show-coffin on line ...
-Defining \color_group_begin: on line ...
-Defining \color_group_end: on line ...
-Defining \color_ensure_current: on line ...
-Defining \__color_select:n on line ...
-Defining \__color_select:V on line ...
-Defining \__color_select:w on line ...
-Defining \__color_select_cmyk:w on line ...
-Defining \__color_select_gray:w on line ...
-Defining \__color_select_rgb:w on line ...
-Defining \__color_select_spot:w on line ...
-Defining \l__color_current_tl on line ...
 Defining \c_sys_jobname_str on line ...
 Defining \c_sys_minute_int on line ...
 Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 880a875..8883318 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5353,6 +5353,17 @@ Defining \box_resize:Nnn on line ...
 Defining \box_resize:cnn on line ...
 Defining \box_use_clear:N on line ...
 Defining \box_use_clear:c on line ...
+Defining \color_group_begin: on line ...
+Defining \color_group_end: on line ...
+Defining \color_ensure_current: on line ...
+Defining \__color_select:n on line ...
+Defining \__color_select:V on line ...
+Defining \__color_select:w on line ...
+Defining \__color_select_cmyk:w on line ...
+Defining \__color_select_gray:w on line ...
+Defining \__color_select_rgb:w on line ...
+Defining \__color_select_spot:w on line ...
+Defining \l__color_current_tl on line ...
 Defining \l__coffin_internal_box on line ...
 \l__coffin_internal_box=\box...
 Defining \l__coffin_internal_dim on line ...
@@ -5488,17 +5499,6 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
 Defining message LaTeX/kernel/unknown-coffin on line ...
 Defining message LaTeX/kernel/unknown-coffin-pole on line ...
 Defining message LaTeX/kernel/show-coffin on line ...
-Defining \color_group_begin: on line ...
-Defining \color_group_end: on line ...
-Defining \color_ensure_current: on line ...
-Defining \__color_select:n on line ...
-Defining \__color_select:V on line ...
-Defining \__color_select:w on line ...
-Defining \__color_select_cmyk:w on line ...
-Defining \__color_select_gray:w on line ...
-Defining \__color_select_rgb:w on line ...
-Defining \__color_select_spot:w on line ...
-Defining \l__color_current_tl on line ...
 Defining \c_sys_jobname_str on line ...
 Defining \c_sys_minute_int on line ...
 Defining \c_sys_hour_int on line ...
diff --git a/l3kernel/testfiles/m3expl006.luatex.tlg b/l3kernel/testfiles/m3expl006.luatex.tlg
index 3b64a3b..7d963b7 100644
--- a/l3kernel/testfiles/m3expl006.luatex.tlg
+++ b/l3kernel/testfiles/m3expl006.luatex.tlg
@@ -126,6 +126,14 @@ Author: Bruno Le Floch and Joseph Wright
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
+! Undefined control sequence.
+\par ->\ERROR 
+l. ...\hbox_set:Nn  \c_empty_coffin { }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
 \l__coffin_aligned_coffin=\box...
 \l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl006.ptex.tlg b/l3kernel/testfiles/m3expl006.ptex.tlg
index 61415a6..651667e 100644
--- a/l3kernel/testfiles/m3expl006.ptex.tlg
+++ b/l3kernel/testfiles/m3expl006.ptex.tlg
@@ -127,6 +127,14 @@ Author: Bruno Le Floch and Joseph Wright
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
+! Undefined control sequence.
+\par ->\ERROR 
+l. ...\hbox_set:Nn  \c_empty_coffin { }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
 \l__coffin_aligned_coffin=\box...
 \l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl006.tlg b/l3kernel/testfiles/m3expl006.tlg
index e6e64f3..c874036 100644
--- a/l3kernel/testfiles/m3expl006.tlg
+++ b/l3kernel/testfiles/m3expl006.tlg
@@ -127,6 +127,14 @@ Author: Bruno Le Floch and Joseph Wright
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
+! Undefined control sequence.
+\par ->\ERROR 
+l. ...\hbox_set:Nn  \c_empty_coffin { }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
 \l__coffin_aligned_coffin=\box...
 \l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl006.uptex.tlg b/l3kernel/testfiles/m3expl006.uptex.tlg
index 5374a68..83a978d 100644
--- a/l3kernel/testfiles/m3expl006.uptex.tlg
+++ b/l3kernel/testfiles/m3expl006.uptex.tlg
@@ -125,6 +125,14 @@ Author: Bruno Le Floch and Joseph Wright
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
+! Undefined control sequence.
+\par ->\ERROR 
+l. ...\hbox_set:Nn  \c_empty_coffin { }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
 \l__coffin_aligned_coffin=\box...
 \l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...
diff --git a/l3kernel/testfiles/m3expl006.xetex.tlg b/l3kernel/testfiles/m3expl006.xetex.tlg
index a71f7a4..75f0a65 100644
--- a/l3kernel/testfiles/m3expl006.xetex.tlg
+++ b/l3kernel/testfiles/m3expl006.xetex.tlg
@@ -122,6 +122,14 @@ Author: Bruno Le Floch and Joseph Wright
 \l__coffin_x_prime_dim=\dimen...
 \l__coffin_y_prime_dim=\dimen...
 \c_empty_coffin=\box...
+! Undefined control sequence.
+\par ->\ERROR 
+l. ...\hbox_set:Nn  \c_empty_coffin { }
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
 \l__coffin_aligned_coffin=\box...
 \l__coffin_aligned_internal_coffin=\box...
 \l_tmpa_coffin=\box...





More information about the latex3-commits mailing list