[latex3-commits] [l3svn] 02/02: XeTeX's primitive omits "box" from pagebox spec

[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 88fe13f9a8470421b9be6697f386242b03f13bdd
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue May 16 10:06:14 2017 +0100

    XeTeX's primitive omits "box" from pagebox spec
---
 l3kernel/l3drivers.dtx                 |   17 ++++++++++++++---
 l3kernel/testfiles/m3expl001.xetex.tlg |    1 +
 l3kernel/testfiles/m3expl003.xetex.tlg |    1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index f27af40..207ed8f 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -1028,10 +1028,13 @@
 % \begin{macro}[aux]{\@@_image_getbb_auxii:nnN, \@@_image_getbb_auxii:VnN}
 % \begin{macro}[aux]{\@@_image_getbb_auxiii:nNnn}
 % \begin{macro}[aux]{\@@_image_getbb_auxiv:nnNnn, \@@_image_getbb_auxiv:VnNnn}
-% \begin{macro}[aux]{\@@_image_getbb_auxv:nNnn, \@@_image_getbb_auxvi:nNnn}
+% \begin{macro}[aux]{\@@_image_getbb_auxv:nNnn, \@@_image_getbb_auxv:nNnn}
+% \begin{macro}[aux, EXP]{\@@_image_getbb_pagebox:w}
 %   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.
+%   is passing the various minor variations to a common core process. The
+%   \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
   {
@@ -1058,7 +1061,13 @@
       {#1} #2 {#3} {#4}
   }
 \cs_new_protected:Npn \@@_image_getbb_auxiv:nnNnn #1#2#3#4#5
-  { \@@_image_getbb_auxv:nNnn {#2} #3 { #4 : #1 } { #5 ~ #1 } }
+  {
+    \use:x
+      {
+        \@@_image_getbb_auxv:nNnn {#2} #3 { #4 : #1 }
+          { #5 ~ \@@_image_getbb_pagebox:w #1 }
+      }
+  }
 \cs_generate_variant:Nn \@@_image_getbb_auxiv:nnNnn { V }
 \cs_new_protected:Npn \@@_image_getbb_auxv:nNnn #1#2#3#4
   {
@@ -1079,6 +1088,7 @@
     \dim_const:cn { c__image_ #1#3 _ury__dim }
       { \l__image_ury_dim }
   }
+\cs_new:Npn \@@_image_getbb_pagebox:w #1 box {#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -1087,6 +1097,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 60a6b39..2c5bfee 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5045,6 +5045,7 @@ 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_auxvi:nNnn on line ...
+Defining \__driver_image_getbb_pagebox:w 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 742a1f2..606670c 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5046,6 +5046,7 @@ 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_auxvi:nNnn on line ...
+Defining \__driver_image_getbb_pagebox:w 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.