[latex3-commits] [git/LaTeX3-latex3-latex3] master: Delay some set up to \AtBeginDocument (65bb9fd)

[Joseph Wright]

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

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

commit 65bb9fd781cd9a8e05bccc6106a8178645f9971d
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue May 7 23:22:28 2019 +0100

    Delay some set up to \AtBeginDocument


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

65bb9fd781cd9a8e05bccc6106a8178645f9971d
 l3kernel/l3drivers-image.dtx           |   28 ++++++++++++++++++++++++----
 l3kernel/testfiles/m3expl001.ptex.tlg  |    1 -
 l3kernel/testfiles/m3expl001.uptex.tlg |    1 -
 l3kernel/testfiles/m3expl001.xetex.tlg |    1 -
 l3kernel/testfiles/m3expl003.ptex.tlg  |    1 -
 l3kernel/testfiles/m3expl003.uptex.tlg |    1 -
 l3kernel/testfiles/m3expl003.xetex.tlg |    1 -
 7 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/l3kernel/l3drivers-image.dtx b/l3kernel/l3drivers-image.dtx
index 204056f..c78e6d3 100644
--- a/l3kernel/l3drivers-image.dtx
+++ b/l3kernel/l3drivers-image.dtx
@@ -69,7 +69,13 @@
 % \begin{macro}{\driver_image_getbb_eps:n}
 %   Simply use the generic function.
 %    \begin{macrocode}
-\cs_new_eq:NN \driver_image_getbb_eps:n \image_read_bb:n
+%<*initex>
+\use:n
+%</initex>
+%<*package>
+\AtBeginDocument
+%</package>
+  { \cs_new_eq:NN \driver_image_getbb_eps:n \image_read_bb:n }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -236,7 +242,13 @@
 %   Simply use the generic functions: only for \texttt{dvipdfmx} in the
 %   extraction cases.
 %    \begin{macrocode}
-\cs_new_eq:NN \driver_image_getbb_eps:n \image_read_bb:n
+%<*initex>
+\use:n
+%</initex>
+%<*package>
+\AtBeginDocument
+%</package>
+  { \cs_new_eq:NN \driver_image_getbb_eps:n \image_read_bb:n }
 %<*dvipdfmx>
 \cs_new_protected:Npn \driver_image_getbb_jpg:n #1
   {
@@ -493,8 +505,16 @@
 % \begin{macro}{\driver_image_getbb_png:n, \driver_image_getbb_jpg:n}
 %   These can be included by extracting the bounding box data.
 %    \begin{macrocode}
-\cs_new_eq:NN \driver_image_getbb_png:n \image_extract_bb:n
-\cs_new_eq:NN \driver_image_getbb_jpg:n \image_extract_bb:n
+%<*initex>
+\use:n
+%</initex>
+%<*package>
+\AtBeginDocument
+%</package>
+  {
+    \cs_new_eq:NN \driver_image_getbb_png:n \image_extract_bb:n
+    \cs_new_eq:NN \driver_image_getbb_jpg:n \image_extract_bb:n
+  }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 611f5f6..6e287bb 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -6470,7 +6470,6 @@ Defining \__driver_draw_cm_decompose_auxi:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxii:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxiii:nnnnN on line ...
 Defining \driver_draw_box_use:Nnnnn on line ...
-Defining \driver_image_getbb_eps:n on line ...
 Defining \driver_image_getbb_jpg:n on line ...
 Defining \driver_image_getbb_png:n on line ...
 Defining \driver_image_getbb_pdf:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 78fb425..8987378 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -6767,7 +6767,6 @@ Defining \__driver_draw_cm_decompose_auxi:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxii:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxiii:nnnnN on line ...
 Defining \driver_draw_box_use:Nnnnn on line ...
-Defining \driver_image_getbb_eps:n on line ...
 Defining \driver_image_getbb_jpg:n on line ...
 Defining \driver_image_getbb_png:n on line ...
 Defining \driver_image_getbb_pdf:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 3e5e192..6aa122f 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -6471,7 +6471,6 @@ Defining \__driver_draw_cm_decompose_auxi:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxii:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxiii:nnnnN on line ...
 Defining \driver_draw_box_use:Nnnnn on line ...
-Defining \driver_image_getbb_eps:n on line ...
 Defining \g__driver_image_int on line ...
 \g__driver_image_int=\count...
 Defining \driver_image_include_eps:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 611f5f6..6e287bb 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -6470,7 +6470,6 @@ Defining \__driver_draw_cm_decompose_auxi:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxii:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxiii:nnnnN on line ...
 Defining \driver_draw_box_use:Nnnnn on line ...
-Defining \driver_image_getbb_eps:n on line ...
 Defining \driver_image_getbb_jpg:n on line ...
 Defining \driver_image_getbb_png:n on line ...
 Defining \driver_image_getbb_pdf:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 78fb425..8987378 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -6767,7 +6767,6 @@ Defining \__driver_draw_cm_decompose_auxi:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxii:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxiii:nnnnN on line ...
 Defining \driver_draw_box_use:Nnnnn on line ...
-Defining \driver_image_getbb_eps:n on line ...
 Defining \driver_image_getbb_jpg:n on line ...
 Defining \driver_image_getbb_png:n on line ...
 Defining \driver_image_getbb_pdf:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 3e5e192..6aa122f 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -6471,7 +6471,6 @@ Defining \__driver_draw_cm_decompose_auxi:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxii:nnnnN on line ...
 Defining \__driver_draw_cm_decompose_auxiii:nnnnN on line ...
 Defining \driver_draw_box_use:Nnnnn on line ...
-Defining \driver_image_getbb_eps:n on line ...
 Defining \g__driver_image_int on line ...
 \g__driver_image_int=\count...
 Defining \driver_image_include_eps:n on line ...