[latex3-commits] [git/LaTeX3-latex3-latex3] master: Make driver image functions public (a992108)

Joseph Wright joseph.wright at morningstar2.co.uk
Tue May 7 22:54:19 CEST 2019


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

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

commit a992108ef08a47cc6c3e2a75022c6f1b5329f35f
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue May 7 21:48:47 2019 +0100

    Make driver image functions public


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

a992108ef08a47cc6c3e2a75022c6f1b5329f35f
 l3kernel/CHANGELOG.md                   |    4 +++
 l3kernel/l3drivers-image.dtx            |   57 ++++++++++++++++++-------------
 l3kernel/l3drivers.dtx                  |   52 ++++++++++++++++++++++++++++
 l3kernel/testfiles/m3expl001.luatex.tlg |    6 ++--
 l3kernel/testfiles/m3expl001.ptex.tlg   |    8 ++---
 l3kernel/testfiles/m3expl001.tlg        |    6 ++--
 l3kernel/testfiles/m3expl001.uptex.tlg  |    8 ++---
 l3kernel/testfiles/m3expl001.xetex.tlg  |   14 ++++----
 l3kernel/testfiles/m3expl003.luatex.tlg |    6 ++--
 l3kernel/testfiles/m3expl003.ptex.tlg   |    8 ++---
 l3kernel/testfiles/m3expl003.tlg        |    6 ++--
 l3kernel/testfiles/m3expl003.uptex.tlg  |    8 ++---
 l3kernel/testfiles/m3expl003.xetex.tlg  |   14 ++++----
 13 files changed, 131 insertions(+), 66 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index d09efb4..0e053b1 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Added
+
+- Experimental driver-level interfaces for image inclusion
+
 ## [2019-05-07]
 
 ### Added
diff --git a/l3kernel/l3drivers-image.dtx b/l3kernel/l3drivers-image.dtx
index 5d28800..fb33ec8 100644
--- a/l3kernel/l3drivers-image.dtx
+++ b/l3kernel/l3drivers-image.dtx
@@ -73,11 +73,11 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_image_include_eps:n}
+% \begin{macro}{\driver_image_include_eps:n}
 %  The special syntax is relatively clear here: remember we need PostScript
 %  sizes here.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_image_include_eps:n #1
+\cs_new_protected:Npn \driver_image_include_eps:n #1
   {
     \@@_literal:x
       {
@@ -195,18 +195,22 @@
 % \end{macro}
 %
 % \begin{macro}
-%   {\@@_image_include_jpg:n, \@@_image_include_pdf:n, \@@_image_include_png:n}
+%   {
+%     \driver_image_include_jpg:n,
+%     \driver_image_include_pdf:n,
+%     \driver_image_include_png:n
+%   }
 %   Images are already loaded for the measurement part of the code, so
 %   inclusion is straight-forward, with only any attributes to worry about. The
 %   latter carry through from determination of the bounding box.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_image_include_jpg:n #1
+\cs_new_protected:Npn \driver_image_include_jpg:n #1
   {
     \tex_pdfrefximage:D
       \int_use:c { c_@@_image_ #1 \l_@@_image_attr_tl _int }
   }
-\cs_new_eq:NN \@@_image_include_pdf:n \@@_image_include_jpg:n
-\cs_new_eq:NN \@@_image_include_png:n \@@_image_include_jpg:n
+\cs_new_eq:NN \driver_image_include_pdf:n \driver_image_include_jpg:n
+\cs_new_eq:NN \driver_image_include_png:n \driver_image_include_jpg:n
 %    \end{macrocode}
 % \end{macro}
 %
@@ -256,8 +260,8 @@
 %
 % \begin{macro}
 %   {
-%     \@@_image_include_eps:n, \@@_image_include_jpg:n,
-%     \@@_image_include_pdf:n, \@@_image_include_png:n
+%     \driver_image_include_eps:n, \driver_image_include_jpg:n,
+%     \driver_image_include_pdf:n, \driver_image_include_png:n
 %   }
 %  \begin{macro}{\@@_image_include_auxi:nn}
 %  \begin{macro}{\@@_image_include_auxii:nnn, \@@_image_include_auxii:xnn}
@@ -267,7 +271,7 @@
 %   the latter it is better to use the primitive route. The relevant code for
 %   that is included later in this file.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_image_include_eps:n #1
+\cs_new_protected:Npn \driver_image_include_eps:n #1
   {
     \@@_literal:x
       {
@@ -278,11 +282,11 @@
         ury = \dim_to_decimal_in_bp:n \l_image_ury_dim
       }
   }
-\cs_new_protected:Npn \@@_image_include_jpg:n #1
+\cs_new_protected:Npn \driver_image_include_jpg:n #1
   { \@@_image_include_auxi:nn {#1} { image } }
-\cs_new_eq:NN \@@_image_include_png:n \@@_image_include_jpg:n
+\cs_new_eq:NN \driver_image_include_png:n \driver_image_include_jpg:n
 %<*dvipdfmx>
-\cs_new_protected:Npn \@@_image_include_pdf:n #1
+\cs_new_protected:Npn \driver_image_include_pdf:n #1
   { \@@_image_include_auxi:nn {#1} { epdf } }
 %</dvipdfmx>
 %    \end{macrocode}
@@ -374,7 +378,11 @@
 % \subsubsection{Images}
 %
 % \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:nN}
 % \begin{macro}{\@@_image_getbb_auxii:nnN, \@@_image_getbb_auxii:VnN}
 % \begin{macro}{\@@_image_getbb_auxiii:nNnn}
@@ -387,14 +395,14 @@
 %   \XeTeX{} primitive omits the text |box| from the page box specification,
 %   so there is also some \enquote{trimming} to do here.
 %    \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
     \@@_image_getbb_auxi:nN {#1} \tex_XeTeXpicfile:D
   }
-\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
@@ -447,14 +455,14 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\@@_image_include_pdf:n}
+% \begin{macro}{\driver_image_include_pdf:n}
 % \begin{macro}{\@@_image_include_bitmap_quote:w}
 %   For PDF images, properly supporting the |pagebox| concept in \XeTeX{}
 %   is best done using the |\tex_XeTeXpdffile:D| primitive. The syntax here
 %   is the same as for the image measurement part, although we know at this
 %   stage that there must be some valid setting for \cs{l_image_pagebox_tl}.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_image_include_pdf:n #1
+\cs_new_protected:Npn \driver_image_include_pdf:n #1
   {
     \tex_XeTeXpdffile:D
       \@@_image_include_pdf_quote:w #1 "#1" \q_stop \c_space_tl
@@ -466,6 +474,7 @@
   { " #2 " }
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 %    \begin{macrocode}
 %</xdvipdfmx>
@@ -477,15 +486,15 @@
 %<*dvisvgm>
 %    \end{macrocode}
 %
-% \begin{macro}{\@@_image_getbb_png:n, \@@_image_getbb_jpg:n}
+% \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 \@@_image_getbb_png:n \image_extract_bb:n
-\cs_new_eq:NN \@@_image_getbb_jpg:n \image_extract_bb:n
+\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}
 %
-% \begin{macro}{\@@_image_include_png:n, \@@_image_include_jpg:n}
+% \begin{macro}{\driver_image_include_png:n, \driver_image_include_jpg:n}
 % \begin{macro}{\@@_image_include_bitmap_quote:w}
 %   The driver here has built-in support for basic image inclusion (see
 %   \texttt{dvisvgm.def} for a more complex approach, needed if clipping,
@@ -494,7 +503,7 @@
 %   quotes the file name, but if it is already quoted (contains spaces)
 %   then we have an issue: we simply strip off any quotes as a result.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_image_include_png:n #1
+\cs_new_protected:Npn \driver_image_include_png:n #1
   {
      \@@_literal:x
        {
@@ -504,7 +513,7 @@
          \@@_image_include_bitmap_quote:w #1 " #1 " \q_stop
        }
   }
-\cs_new_eq:NN \@@_image_include_jpg:n \@@_image_include_png:n
+\cs_new_eq:NN \driver_image_include_jpg:n \driver_image_include_png:n
 \cs_new:Npn \@@_image_include_bitmap_quote:w #1 " #2 " #3 \q_stop
   { " #2 " }
 %    \end{macrocode}
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 352eb9a..b700153 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -463,6 +463,58 @@
 %   given.
 % \end{function}
 %
+% \section{Image inclusion}
+%
+% Image inclusion support is closely tied to the higher-level \pkg{l3image}
+% module. This arises as information concerning images (\emph{e.g.}~page
+% numbers in multi-page files) is needed to correct cache image data. As
+% such, the driver code here assumes the following are defined
+% \begin{itemize}
+%   \item \cs{l_image_decodearray_tl}
+%   \item \cs{l_image_interpolate_tl}
+%   \item \cs{l_image_page_tl}
+%   \item \cs{l_image_pagebox_tl}
+% \end{itemize}
+%
+% Note also that the functions defined will depend on the file types supported
+% by the driver. As such, a calling function should typically test for the
+% existence of an appropriate function to determine if the image file is
+% supported.
+%
+% \begin{function}[added = 2019-05-07]
+%   {
+%     \driver_image_getbb_eps:n,
+%     \driver_image_getbb_jpg:n,
+%     \driver_image_getbb_pdf:n,
+%     \driver_image_getbb_png:n
+%   }
+%   \begin{syntax}
+%     \cs{driver_image_getbb_pdf:n} \Arg{file}
+%   \end{syntax}
+%   These functions load the requested image \meta{file} and obtain the
+%   bounding box information on the file. They may also cache the image for
+%   subsequent inclusion: this is driver-dependent. The bounding box data
+%   will be stored in \cs{l_image_llx_dim},  \cs{l_image_lly_dim},
+%   \cs{l_image_urx_dim}, and  \cs{l_image_ury_dim} after use of these
+%   functions.
+% \end{function}
+%
+% \begin{function}[added = 2019-05-07]
+%   {
+%     \driver_image_include_eps:n,
+%     \driver_image_include_jpg:n,
+%     \driver_image_include_pdf:n,
+%     \driver_image_include_png:n
+%   }
+%   \begin{syntax}
+%     \cs{driver_image_include_pdf:n} \Arg{file}
+%   \end{syntax}
+%   These functions include the appropriate image type at the current position.
+%   They should be preceded by use of the matching \texttt{getbb} function to
+%   set the bounding box correctly; in some drivers, the \texttt{getbb}
+%   function is also responsible for caching the image for later inclusion.
+% \end{function}
+%
 % \section{PDF Features}
 %
 % A range of PDF features are exposed by \pdfTeX{} and \LuaTeX{} in direct PDF
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index b373ee5..6a12a0b 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -6482,9 +6482,9 @@ 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 ...
-Defining \__driver_image_include_jpg:n on line ...
-Defining \__driver_image_include_pdf:n on line ...
-Defining \__driver_image_include_png:n on line ...
+Defining \driver_image_include_jpg:n on line ...
+Defining \driver_image_include_pdf:n on line ...
+Defining \driver_image_include_png:n on line ...
 Defining \driver_pdf_annotation:nnnn on line ...
 Defining \driver_pdf_annotation_last: on line ...
 Defining \driver_pdf_link_begin_goto:nnw on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 6946213..e937429 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -6476,10 +6476,10 @@ 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 ...
-Defining \__driver_image_include_jpg:n on line ...
-Defining \__driver_image_include_png:n on line ...
-Defining \__driver_image_include_pdf:n on line ...
+Defining \driver_image_include_eps:n on line ...
+Defining \driver_image_include_jpg:n on line ...
+Defining \driver_image_include_png:n on line ...
+Defining \driver_image_include_pdf:n on line ...
 Defining \__driver_image_include_auxi:nn on line ...
 Defining \__driver_image_include_auxii:nnn on line ...
 Defining \__driver_image_include_auxii:xnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 7bcd62e..cb308a4 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -6780,9 +6780,9 @@ 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 ...
-Defining \__driver_image_include_jpg:n on line ...
-Defining \__driver_image_include_pdf:n on line ...
-Defining \__driver_image_include_png:n on line ...
+Defining \driver_image_include_jpg:n on line ...
+Defining \driver_image_include_pdf:n on line ...
+Defining \driver_image_include_png:n on line ...
 Defining \driver_pdf_annotation:nnnn on line ...
 Defining \driver_pdf_annotation_last: on line ...
 Defining \driver_pdf_link_begin_goto:nnw on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 6688782..33a392f 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -6773,10 +6773,10 @@ 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 ...
-Defining \__driver_image_include_jpg:n on line ...
-Defining \__driver_image_include_png:n on line ...
-Defining \__driver_image_include_pdf:n on line ...
+Defining \driver_image_include_eps:n on line ...
+Defining \driver_image_include_jpg:n on line ...
+Defining \driver_image_include_png:n on line ...
+Defining \driver_image_include_pdf:n on line ...
 Defining \__driver_image_include_auxi:nn on line ...
 Defining \__driver_image_include_auxii:nnn on line ...
 Defining \__driver_image_include_auxii:xnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index d90852d..caf8029 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -6474,16 +6474,16 @@ 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 ...
-Defining \__driver_image_include_jpg:n on line ...
-Defining \__driver_image_include_png:n on line ...
+Defining \driver_image_include_eps:n on line ...
+Defining \driver_image_include_jpg:n on line ...
+Defining \driver_image_include_png:n on line ...
 Defining \__driver_image_include_auxi:nn on line ...
 Defining \__driver_image_include_auxii:nnn on line ...
 Defining \__driver_image_include_auxii:xnn on line ...
 Defining \__driver_image_include_auxiii:nnn 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_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:nN on line ...
 Defining \__driver_image_getbb_auxii:nnN on line ...
 Defining \__driver_image_getbb_auxii:VnN on line ...
@@ -6493,7 +6493,7 @@ Defining \__driver_image_getbb_auxiv:VnNnn on line ...
 Defining \__driver_image_getbb_auxv:nNnn on line ...
 Defining \__driver_image_getbb_auxvi:nNnn on line ...
 Defining \__driver_image_getbb_pagebox:w on line ...
-Defining \__driver_image_include_pdf:n on line ...
+Defining \driver_image_include_pdf:n on line ...
 Defining \__driver_image_include_pdf_quote:w on line ...
 Defining \__driver_pdf:n on line ...
 Defining \__driver_pdf:x on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index b373ee5..6a12a0b 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -6482,9 +6482,9 @@ 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 ...
-Defining \__driver_image_include_jpg:n on line ...
-Defining \__driver_image_include_pdf:n on line ...
-Defining \__driver_image_include_png:n on line ...
+Defining \driver_image_include_jpg:n on line ...
+Defining \driver_image_include_pdf:n on line ...
+Defining \driver_image_include_png:n on line ...
 Defining \driver_pdf_annotation:nnnn on line ...
 Defining \driver_pdf_annotation_last: on line ...
 Defining \driver_pdf_link_begin_goto:nnw on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 6946213..e937429 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -6476,10 +6476,10 @@ 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 ...
-Defining \__driver_image_include_jpg:n on line ...
-Defining \__driver_image_include_png:n on line ...
-Defining \__driver_image_include_pdf:n on line ...
+Defining \driver_image_include_eps:n on line ...
+Defining \driver_image_include_jpg:n on line ...
+Defining \driver_image_include_png:n on line ...
+Defining \driver_image_include_pdf:n on line ...
 Defining \__driver_image_include_auxi:nn on line ...
 Defining \__driver_image_include_auxii:nnn on line ...
 Defining \__driver_image_include_auxii:xnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 7bcd62e..cb308a4 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -6780,9 +6780,9 @@ 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 ...
-Defining \__driver_image_include_jpg:n on line ...
-Defining \__driver_image_include_pdf:n on line ...
-Defining \__driver_image_include_png:n on line ...
+Defining \driver_image_include_jpg:n on line ...
+Defining \driver_image_include_pdf:n on line ...
+Defining \driver_image_include_png:n on line ...
 Defining \driver_pdf_annotation:nnnn on line ...
 Defining \driver_pdf_annotation_last: on line ...
 Defining \driver_pdf_link_begin_goto:nnw on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 6688782..33a392f 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -6773,10 +6773,10 @@ 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 ...
-Defining \__driver_image_include_jpg:n on line ...
-Defining \__driver_image_include_png:n on line ...
-Defining \__driver_image_include_pdf:n on line ...
+Defining \driver_image_include_eps:n on line ...
+Defining \driver_image_include_jpg:n on line ...
+Defining \driver_image_include_png:n on line ...
+Defining \driver_image_include_pdf:n on line ...
 Defining \__driver_image_include_auxi:nn on line ...
 Defining \__driver_image_include_auxii:nnn on line ...
 Defining \__driver_image_include_auxii:xnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index d90852d..caf8029 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -6474,16 +6474,16 @@ 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 ...
-Defining \__driver_image_include_jpg:n on line ...
-Defining \__driver_image_include_png:n on line ...
+Defining \driver_image_include_eps:n on line ...
+Defining \driver_image_include_jpg:n on line ...
+Defining \driver_image_include_png:n on line ...
 Defining \__driver_image_include_auxi:nn on line ...
 Defining \__driver_image_include_auxii:nnn on line ...
 Defining \__driver_image_include_auxii:xnn on line ...
 Defining \__driver_image_include_auxiii:nnn 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_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:nN on line ...
 Defining \__driver_image_getbb_auxii:nnN on line ...
 Defining \__driver_image_getbb_auxii:VnN on line ...
@@ -6493,7 +6493,7 @@ Defining \__driver_image_getbb_auxiv:VnNnn on line ...
 Defining \__driver_image_getbb_auxv:nNnn on line ...
 Defining \__driver_image_getbb_auxvi:nNnn on line ...
 Defining \__driver_image_getbb_pagebox:w on line ...
-Defining \__driver_image_include_pdf:n on line ...
+Defining \driver_image_include_pdf:n on line ...
 Defining \__driver_image_include_pdf_quote:w on line ...
 Defining \__driver_pdf:n on line ...
 Defining \__driver_pdf:x on line ...





More information about the latex3-commits mailing list