[latex3-commits] [l3svn] 01/02: Tidy up a few auxiliary names

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit 96b2f06f7cdb2e3e8b42808a9de78eacc73c31aa
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue May 16 09:59:26 2017 +0100

    Tidy up a few auxiliary names
---
 l3kernel/l3drivers.dtx                 |   13 +++++++------
 l3kernel/testfiles/m3expl001.xetex.tlg |    2 +-
 l3kernel/testfiles/m3expl003.xetex.tlg |    2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index b25d3a4..f27af40 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -1026,9 +1026,9 @@
 %   {\@@_image_getbb_jpg:n, \@@_image_getbb_pdf:n, \@@_image_getbb_png:n}
 % \begin{macro}[aux]{\@@_image_getbb_auxi:nN}
 % \begin{macro}[aux]{\@@_image_getbb_auxii:nnN, \@@_image_getbb_auxii:VnN}
-% \begin{macro}[aux]{\@@_image_getbb_auxiii:nNnn, \@@_image_getbb_auxiv:nNnn}
+% \begin{macro}[aux]{\@@_image_getbb_auxiii:nNnn}
 % \begin{macro}[aux]{\@@_image_getbb_auxiv:nnNnn, \@@_image_getbb_auxiv:VnNnn}
-% \begin{macro}[aux]{\@@_image_getbb_auxiv:nNnn}
+% \begin{macro}[aux]{\@@_image_getbb_auxv:nNnn, \@@_image_getbb_auxvi:nNnn}
 %   For \texttt{xdvipdfmx}, there are two primitives that allow us to obtain
 %   the bounding box without needing \texttt{extractbb}. The only complexity
 %   is passing the various minor variations to a common core process.
@@ -1036,11 +1036,11 @@
 \cs_new_protected:Npn \@@_image_getbb_jpg:n #1
   {
     \int_zero:N \l__image_page_int
-    \@@_image_getbb_aux:nN {#1} \xetex_picfile:D
+    \@@_image_getbb_auxi:nN {#1} \xetex_picfile:D
   }
 \cs_new_eq:NN \@@_image_getbb_png:n \@@_image_getbb_jpg:n
 \cs_new_protected:Npn \@@_image_getbb_pdf:n #1
-  { \@@_image_getbb_aux:nN {#1} \xetex_pdffile:D }
+  { \@@_image_getbb_auxi:nN {#1} \xetex_pdffile:D }
 \cs_new_protected:Npn \@@_image_getbb_auxi:nN #1#2
   {
     \int_compare:nNnTF \l__image_page_int > 0
@@ -1067,9 +1067,9 @@
         \dim_set_eq:Nc \l__image_urx_dim { c__image_ #1#3 _urx__dim }
         \dim_set_eq:Nc \l__image_ury_dim { c__image_ #1#3 _ury__dim }
       }
-      { \@@_image_getbb_auxiv:nNnn {#1} #2 {#3} {#4} }
+      { \@@_image_getbb_auxvi:nNnn {#1} #2 {#3} {#4} }
   }
-\cs_new_protected:Npn \@@_image_getbb_auxiv:nNnn #1#2#3#4
+\cs_new_protected:Npn \@@_image_getbb_auxvi:nNnn #1#2#3#4
   {
     \hbox_set:Nn \l__image_tmp_box { #2 #1 ~ #4 }
     \dim_set:Nn \l__image_urx_dim { \box_wd:N \l__image_tmp_box }
@@ -1086,6 +1086,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 %    \begin{macrocode}
 %</xdvipdfmx>
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 4e74b99..60a6b39 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5044,7 +5044,7 @@ Defining \__driver_image_getbb_auxiii:nNnn on line ...
 Defining \__driver_image_getbb_auxiv:nnNnn on line ...
 Defining \__driver_image_getbb_auxiv:VnNnn on line ...
 Defining \__driver_image_getbb_auxv:nNnn on line ...
-Defining \__driver_image_getbb_auxiv:nNnn on line ...
+Defining \__driver_image_getbb_auxvi:nNnn on line ...
 Defining \__driver_draw_literal:n on line ...
 Defining \__driver_draw_literal:x on line ...
 Defining \__driver_draw_begin: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 03ff142..742a1f2 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5045,7 +5045,7 @@ Defining \__driver_image_getbb_auxiii:nNnn on line ...
 Defining \__driver_image_getbb_auxiv:nnNnn on line ...
 Defining \__driver_image_getbb_auxiv:VnNnn on line ...
 Defining \__driver_image_getbb_auxv:nNnn on line ...
-Defining \__driver_image_getbb_auxiv:nNnn on line ...
+Defining \__driver_image_getbb_auxvi:nNnn on line ...
 Defining \__driver_draw_literal:n on line ...
 Defining \__driver_draw_literal:x on line ...
 Defining \__driver_draw_begin: on line ...

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.