[latex3-commits] [git/LaTeX3-latex3-latex3] debug: Only load deprecation code once (22baf3718)

Fri Sep 13 10:15:57 CEST 2019

Repository : https://github.com/latex3/latex3
On branch  : debug
Link       : https://github.com/latex3/latex3/commit/22baf3718aef8dc33ec649cb4fd7518d92a51329

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

commit 22baf3718aef8dc33ec649cb4fd7518d92a51329
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Sep 13 09:15:57 2019 +0100

    Only load deprecation code once


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

22baf3718aef8dc33ec649cb4fd7518d92a51329
 l3kernel/l3sys.dtx                      | 10 +++++++---
 l3kernel/testfiles/m3expl001.luatex.tlg |  3 ---
 l3kernel/testfiles/m3expl001.ptex.tlg   |  3 ---
 l3kernel/testfiles/m3expl001.tlg        |  3 ---
 l3kernel/testfiles/m3expl001.uptex.tlg  |  3 ---
 l3kernel/testfiles/m3expl001.xetex.tlg  |  3 ---
 l3kernel/testfiles/m3expl003.luatex.tlg | 17 -----------------
 l3kernel/testfiles/m3expl003.ptex.tlg   | 17 -----------------
 l3kernel/testfiles/m3expl003.tlg        | 17 -----------------
 l3kernel/testfiles/m3expl003.uptex.tlg  | 17 -----------------
 l3kernel/testfiles/m3expl003.xetex.tlg  | 17 -----------------
 11 files changed, 7 insertions(+), 103 deletions(-)

diff --git a/l3kernel/l3sys.dtx b/l3kernel/l3sys.dtx
index 913008366..5988c7c7b 100644
--- a/l3kernel/l3sys.dtx
+++ b/l3kernel/l3sys.dtx
@@ -429,9 +429,10 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{variable}{\g_@@_debug_bool}
+% \begin{variable}{\g_@@_debug_bool, \g_@@_deprecation_bool}
 %    \begin{macrocode}
 \bool_new:N \g_@@_debug_bool
+\bool_new:N \g_@@_deprecation_bool
 %    \end{macrocode}
 % \end{variable}
 %
@@ -443,10 +444,13 @@
     \bool_if:NF \g_@@_debug_bool
       { \__kernel_sys_configuration_load:n { l3debug } }
     \bool_gset_true:N \g_@@_debug_bool
-    \__kernel_sys_configuration_load:n { l3deprecation }
   }
 \cs_new_protected:Npn \sys_load_deprecation:
-  { \__kernel_sys_configuration_load:n { l3deprecation } }
+  {
+    \bool_if:NF \g_@@_deprecation_bool
+      { \__kernel_sys_configuration_load:n { l3deprecation } }
+    \bool_gset_true:N \g_@@_deprecation_bool
+  }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 92f75bb24..473ef1eb5 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -157,9 +157,6 @@ File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 )) (l3debug.def
 File: l3debug.def ....-..-.. v L3 Debugging support
 )
-(l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-)
 Defining \c_sys_backend_str on line ...
 (l3backend-pdfmode.def
 File: l3backend-pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 359d337ac..4b0e5d6ed 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -160,9 +160,6 @@ File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 )) (l3debug.def
 File: l3debug.def ....-..-.. v L3 Debugging support
 )
-(l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-)
 Defining \c_sys_backend_str on line ...
 (l3backend-dvipdfmx.def
 File: l3backend-dvipdfmx.def ....-..-.. v L3 Experimental backend support: dvipdfmx
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index e18002aee..5d9176c53 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -160,9 +160,6 @@ File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 )) (l3debug.def
 File: l3debug.def ....-..-.. v L3 Debugging support
 )
-(l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-)
 Defining \c_sys_backend_str on line ...
 (l3backend-pdfmode.def
 File: l3backend-pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 61a53221f..d4ab7d9c9 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -156,9 +156,6 @@ File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 )) (l3debug.def
 File: l3debug.def ....-..-.. v L3 Debugging support
 )
-(l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-)
 Defining \c_sys_backend_str on line ...
 (l3backend-dvipdfmx.def
 File: l3backend-dvipdfmx.def ....-..-.. v L3 Experimental backend support: dvipdfmx
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index ef6963dab..b73b99f00 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -156,9 +156,6 @@ File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 )) (l3debug.def
 File: l3debug.def ....-..-.. v L3 Debugging support
 )
-(l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-)
 Defining \c_sys_backend_str on line ...
 (l3backend-xdvipdfmx.def
 File: l3backend-xdvipdfmx.def ....-..-.. v L3 Experimental backend support: xdvipdfmx
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 194615976..473ef1eb5 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -157,23 +157,6 @@ File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 )) (l3debug.def
 File: l3debug.def ....-..-.. v L3 Debugging support
 )
-(l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-) (l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-Variant \box_set_eq_clear:cN already defined; not changing it on line ...
-Variant \box_set_eq_clear:Nc already defined; not changing it on line ...
-Variant \box_set_eq_clear:cc already defined; not changing it on line ...
-Variant \box_gset_eq_clear:cN already defined; not changing it on line ...
-Variant \box_gset_eq_clear:Nc already defined; not changing it on line ...
-Variant \box_gset_eq_clear:cc already defined; not changing it on line ...
-Variant \hbox_unpack_clear:c already defined; not changing it on line ...
-Variant \vbox_unpack_clear:c already defined; not changing it on line ...
-Variant \tl_set_from_file:cnn already defined; not changing it on line ...
-Variant \tl_gset_from_file:cnn already defined; not changing it on line ...
-Variant \tl_set_from_file_x:cnn already defined; not changing it on line ..
-Variant \tl_gset_from_file_x:cnn already defined; not changing it on line ..
-)
 Defining \c_sys_backend_str on line ...
 (l3backend-pdfmode.def
 File: l3backend-pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 60dbf8b91..4b0e5d6ed 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -160,23 +160,6 @@ File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 )) (l3debug.def
 File: l3debug.def ....-..-.. v L3 Debugging support
 )
-(l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-) (l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-Variant \box_set_eq_clear:cN already defined; not changing it on line ...
-Variant \box_set_eq_clear:Nc already defined; not changing it on line ...
-Variant \box_set_eq_clear:cc already defined; not changing it on line ...
-Variant \box_gset_eq_clear:cN already defined; not changing it on line ...
-Variant \box_gset_eq_clear:Nc already defined; not changing it on line ...
-Variant \box_gset_eq_clear:cc already defined; not changing it on line ...
-Variant \hbox_unpack_clear:c already defined; not changing it on line ...
-Variant \vbox_unpack_clear:c already defined; not changing it on line ...
-Variant \tl_set_from_file:cnn already defined; not changing it on line ...
-Variant \tl_gset_from_file:cnn already defined; not changing it on line ...
-Variant \tl_set_from_file_x:cnn already defined; not changing it on line ..
-Variant \tl_gset_from_file_x:cnn already defined; not changing it on line ..
-)
 Defining \c_sys_backend_str on line ...
 (l3backend-dvipdfmx.def
 File: l3backend-dvipdfmx.def ....-..-.. v L3 Experimental backend support: dvipdfmx
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index dff9a1eb5..5d9176c53 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -160,23 +160,6 @@ File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 )) (l3debug.def
 File: l3debug.def ....-..-.. v L3 Debugging support
 )
-(l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-) (l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-Variant \box_set_eq_clear:cN already defined; not changing it on line ...
-Variant \box_set_eq_clear:Nc already defined; not changing it on line ...
-Variant \box_set_eq_clear:cc already defined; not changing it on line ...
-Variant \box_gset_eq_clear:cN already defined; not changing it on line ...
-Variant \box_gset_eq_clear:Nc already defined; not changing it on line ...
-Variant \box_gset_eq_clear:cc already defined; not changing it on line ...
-Variant \hbox_unpack_clear:c already defined; not changing it on line ...
-Variant \vbox_unpack_clear:c already defined; not changing it on line ...
-Variant \tl_set_from_file:cnn already defined; not changing it on line ...
-Variant \tl_gset_from_file:cnn already defined; not changing it on line ...
-Variant \tl_set_from_file_x:cnn already defined; not changing it on line ..
-Variant \tl_gset_from_file_x:cnn already defined; not changing it on line ..
-)
 Defining \c_sys_backend_str on line ...
 (l3backend-pdfmode.def
 File: l3backend-pdfmode.def ....-..-.. v L3 Experimental backend support: PDF mode
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 94207ddcb..d4ab7d9c9 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -156,23 +156,6 @@ File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 )) (l3debug.def
 File: l3debug.def ....-..-.. v L3 Debugging support
 )
-(l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-) (l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-Variant \box_set_eq_clear:cN already defined; not changing it on line ...
-Variant \box_set_eq_clear:Nc already defined; not changing it on line ...
-Variant \box_set_eq_clear:cc already defined; not changing it on line ...
-Variant \box_gset_eq_clear:cN already defined; not changing it on line ...
-Variant \box_gset_eq_clear:Nc already defined; not changing it on line ...
-Variant \box_gset_eq_clear:cc already defined; not changing it on line ...
-Variant \hbox_unpack_clear:c already defined; not changing it on line ...
-Variant \vbox_unpack_clear:c already defined; not changing it on line ...
-Variant \tl_set_from_file:cnn already defined; not changing it on line ...
-Variant \tl_gset_from_file:cnn already defined; not changing it on line ...
-Variant \tl_set_from_file_x:cnn already defined; not changing it on line ..
-Variant \tl_gset_from_file_x:cnn already defined; not changing it on line ..
-)
 Defining \c_sys_backend_str on line ...
 (l3backend-dvipdfmx.def
 File: l3backend-dvipdfmx.def ....-..-.. v L3 Experimental backend support: dvipdfmx
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 4ebd9a8ac..b73b99f00 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -156,23 +156,6 @@ File: l3deprecation.def ....-..-.. v L3 Deprecated functions
 )) (l3debug.def
 File: l3debug.def ....-..-.. v L3 Debugging support
 )
-(l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-) (l3deprecation.def
-File: l3deprecation.def ....-..-.. v L3 Deprecated functions
-Variant \box_set_eq_clear:cN already defined; not changing it on line ...
-Variant \box_set_eq_clear:Nc already defined; not changing it on line ...
-Variant \box_set_eq_clear:cc already defined; not changing it on line ...
-Variant \box_gset_eq_clear:cN already defined; not changing it on line ...
-Variant \box_gset_eq_clear:Nc already defined; not changing it on line ...
-Variant \box_gset_eq_clear:cc already defined; not changing it on line ...
-Variant \hbox_unpack_clear:c already defined; not changing it on line ...
-Variant \vbox_unpack_clear:c already defined; not changing it on line ...
-Variant \tl_set_from_file:cnn already defined; not changing it on line ...
-Variant \tl_gset_from_file:cnn already defined; not changing it on line ...
-Variant \tl_set_from_file_x:cnn already defined; not changing it on line ..
-Variant \tl_gset_from_file_x:cnn already defined; not changing it on line ..
-)
 Defining \c_sys_backend_str on line ...
 (l3backend-xdvipdfmx.def
 File: l3backend-xdvipdfmx.def ....-..-.. v L3 Experimental backend support: xdvipdfmx



