[latex3-commits] [git/LaTeX3-latex3-latex3] master: Missed a few \@@ => \driver changes (99d7f2a)
Joseph Wright
joseph.wright at morningstar2.co.uk
Wed May 8 00:17:32 CEST 2019
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/99d7f2a36237c15c3d989e4f8b25ab7cc0a03d0d
>---------------------------------------------------------------
commit 99d7f2a36237c15c3d989e4f8b25ab7cc0a03d0d
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue May 7 23:17:32 2019 +0100
Missed a few \@@ => \driver changes
>---------------------------------------------------------------
99d7f2a36237c15c3d989e4f8b25ab7cc0a03d0d
l3kernel/l3drivers-image.dtx | 26 +++++++++++++++-----------
l3kernel/testfiles/m3expl001.luatex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.ptex.tlg | 8 ++++----
l3kernel/testfiles/m3expl001.tlg | 4 ++--
l3kernel/testfiles/m3expl001.uptex.tlg | 8 ++++----
l3kernel/testfiles/m3expl001.xetex.tlg | 2 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.ptex.tlg | 8 ++++----
l3kernel/testfiles/m3expl003.tlg | 4 ++--
l3kernel/testfiles/m3expl003.uptex.tlg | 8 ++++----
l3kernel/testfiles/m3expl003.xetex.tlg | 2 +-
11 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/l3kernel/l3drivers-image.dtx b/l3kernel/l3drivers-image.dtx
index 3af13af..204056f 100644
--- a/l3kernel/l3drivers-image.dtx
+++ b/l3kernel/l3drivers-image.dtx
@@ -66,10 +66,10 @@
%<*dvips>
% \end{macrocode}
%
-% \begin{macro}{\@@_image_getbb_eps:n}
+% \begin{macro}{\driver_image_getbb_eps:n}
% Simply use the generic function.
% \begin{macrocode}
-\cs_new_eq:NN \@@_image_getbb_eps:n \image_read_bb:n
+\cs_new_eq:NN \driver_image_getbb_eps:n \image_read_bb:n
% \end{macrocode}
% \end{macro}
%
@@ -114,7 +114,11 @@
% \end{variable}
%
% \begin{macro}
-% {\@@_image_getbb_jpg:n, \@@_image_getbb_pdf:n, \@@_image_getbb_png:n}
+% {
+% \driver_image_getbb_jpg:n,
+% \driver_image_getbb_pdf:n,
+% \driver_image_getbb_png:n
+% }
% \begin{macro}
% {\@@_image_getbb_auxi:n, \@@_image_getbb_auxii:n}
% Getting the bounding box here requires us to box up the image and
@@ -124,7 +128,7 @@
% two forms of the attributes: a \enquote{short} set to allow us to
% track for caching, and the full form to pass to the primitive.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_image_getbb_jpg:n #1
+\cs_new_protected:Npn \driver_image_getbb_jpg:n #1
{
\int_zero:N \l_image_page_int
\tl_clear:N \l_image_pagebox_tl
@@ -138,7 +142,7 @@
\tl_clear:N \l_@@_image_attr_tl
\@@_image_getbb_auxi:n {#1}
}
-\cs_new_eq:NN \@@_image_getbb_png:n \@@_image_getbb_jpg:n
+\cs_new_eq:NN \driver_image_getbb_png:n \driver_image_getbb_jpg:n
\cs_new_protected:Npn \@@_image_getbb_pdf:n #1
{
\tl_clear:N \l_image_decodearray_tl
@@ -226,22 +230,22 @@
%
% \begin{macro}
% {
-% \@@_image_getbb_eps:n, \@@_image_getbb_jpg:n,
-% \@@_image_getbb_pdf:n, \@@_image_getbb_png:n
+% \driver_image_getbb_eps:n, \driver_image_getbb_jpg:n,
+% \driver_image_getbb_pdf:n, \driver_image_getbb_png:n
% }
% Simply use the generic functions: only for \texttt{dvipdfmx} in the
% extraction cases.
% \begin{macrocode}
-\cs_new_eq:NN \@@_image_getbb_eps:n \image_read_bb:n
+\cs_new_eq:NN \driver_image_getbb_eps:n \image_read_bb:n
%<*dvipdfmx>
-\cs_new_protected:Npn \@@_image_getbb_jpg:n #1
+\cs_new_protected:Npn \driver_image_getbb_jpg:n #1
{
\int_zero:N \l_image_page_int
\tl_clear:N \l_image_pagebox_tl
\image_extract_bb:n {#1}
}
-\cs_new_eq:NN \@@_image_getbb_png:n \@@_image_getbb_jpg:n
-\cs_new_protected:Npn \@@_image_getbb_pdf:n #1
+\cs_new_eq:NN \driver_image_getbb_png:n \driver_image_getbb_jpg:n
+\cs_new_protected:Npn \driver_image_getbb_pdf:n #1
{
\tl_clear:N \l_image_decodearray_tl
\bool_set_false:N \l_image_interpolate_bool
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 6a12a0b..82f3021 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -6477,8 +6477,8 @@ Defining \__driver_color_fill_select:x on line ...
Defining \driver_draw_cm:nnnn on line ...
Defining \driver_draw_box_use:Nnnnn on line ...
Defining \l__driver_image_attr_tl on line ...
-Defining \__driver_image_getbb_jpg:n on line ...
-Defining \__driver_image_getbb_png: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 ...
Defining \__driver_image_getbb_auxi:n on line ...
Defining \__driver_image_getbb_auxii:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index e937429..611f5f6 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -6470,10 +6470,10 @@ 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 ...
+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 ...
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/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index cb308a4..daa6226 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -6775,8 +6775,8 @@ Defining \__driver_color_fill_select:x on line ...
Defining \driver_draw_cm:nnnn on line ...
Defining \driver_draw_box_use:Nnnnn on line ...
Defining \l__driver_image_attr_tl on line ...
-Defining \__driver_image_getbb_jpg:n on line ...
-Defining \__driver_image_getbb_png: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 ...
Defining \__driver_image_getbb_auxi:n on line ...
Defining \__driver_image_getbb_auxii:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 33a392f..78fb425 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -6767,10 +6767,10 @@ 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 ...
+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 ...
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/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index caf8029..3e5e192 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -6471,7 +6471,7 @@ 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_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.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 6a12a0b..82f3021 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -6477,8 +6477,8 @@ Defining \__driver_color_fill_select:x on line ...
Defining \driver_draw_cm:nnnn on line ...
Defining \driver_draw_box_use:Nnnnn on line ...
Defining \l__driver_image_attr_tl on line ...
-Defining \__driver_image_getbb_jpg:n on line ...
-Defining \__driver_image_getbb_png: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 ...
Defining \__driver_image_getbb_auxi:n on line ...
Defining \__driver_image_getbb_auxii:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index e937429..611f5f6 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -6470,10 +6470,10 @@ 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 ...
+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 ...
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.tlg b/l3kernel/testfiles/m3expl003.tlg
index cb308a4..daa6226 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -6775,8 +6775,8 @@ Defining \__driver_color_fill_select:x on line ...
Defining \driver_draw_cm:nnnn on line ...
Defining \driver_draw_box_use:Nnnnn on line ...
Defining \l__driver_image_attr_tl on line ...
-Defining \__driver_image_getbb_jpg:n on line ...
-Defining \__driver_image_getbb_png: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 ...
Defining \__driver_image_getbb_auxi:n on line ...
Defining \__driver_image_getbb_auxii:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 33a392f..78fb425 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -6767,10 +6767,10 @@ 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 ...
+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 ...
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.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index caf8029..3e5e192 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -6471,7 +6471,7 @@ 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_eps:n on line ...
Defining \g__driver_image_int on line ...
\g__driver_image_int=\count...
Defining \driver_image_include_eps:n on line ...
More information about the latex3-commits
mailing list