[latex3-commits] [git/LaTeX3-latex3-latex3] backend: Some graphics variables (d5f5585)

Joseph Wright joseph.wright at morningstar2.co.uk
Sun Jun 2 10:44:50 CEST 2019 

Repository : https://github.com/latex3/latex3
On branch  : backend
Link       : https://github.com/latex3/latex3/commit/d5f55850951fea2cea6277498f639f25f2e9ea28

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

commit d5f55850951fea2cea6277498f639f25f2e9ea28
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Jun 2 09:44:50 2019 +0100

    Some graphics variables


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

d5f55850951fea2cea6277498f639f25f2e9ea28
 l3kernel/l3backend-graphics.dtx         |   29 +++++++++++++++--------------
 l3kernel/testfiles/m3expl001.luatex.tlg |    6 +++---
 l3kernel/testfiles/m3expl001.ptex.tlg   |    4 ++--
 l3kernel/testfiles/m3expl001.tlg        |    6 +++---
 l3kernel/testfiles/m3expl001.uptex.tlg  |    4 ++--
 l3kernel/testfiles/m3expl001.xetex.tlg  |    4 ++--
 l3kernel/testfiles/m3expl002.ptex.tlg   |    2 +-
 l3kernel/testfiles/m3expl002.uptex.tlg  |    2 +-
 l3kernel/testfiles/m3expl002.xetex.tlg  |    2 +-
 l3kernel/testfiles/m3expl003.luatex.tlg |    6 +++---
 l3kernel/testfiles/m3expl003.ptex.tlg   |    4 ++--
 l3kernel/testfiles/m3expl003.tlg        |    6 +++---
 l3kernel/testfiles/m3expl003.uptex.tlg  |    4 ++--
 l3kernel/testfiles/m3expl003.xetex.tlg  |    4 ++--
 l3kernel/testfiles/m3expl004.ptex.tlg   |    2 +-
 l3kernel/testfiles/m3expl004.uptex.tlg  |    2 +-
 l3kernel/testfiles/m3expl004.xetex.tlg  |    2 +-
 17 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/l3kernel/l3backend-graphics.dtx b/l3kernel/l3backend-graphics.dtx
index e818c8c..e64ef39 100644
--- a/l3kernel/l3backend-graphics.dtx
+++ b/l3kernel/l3backend-graphics.dtx
@@ -227,7 +227,8 @@
 % \begin{macro}{\@@_backend_getbb_eps:n}
 % \begin{macro}{\@@_backend_getbb_eps:nm}
 % \begin{macro}{\@@_backend_include_eps:n}
-% \begin{variable}{\l_@@_dir_str, \l_@@_name_str, \l_@@_ext_str}
+% \begin{variable}
+%   {\l_@@_backend_dir_str, \l_@@_backend_name_str, \l_@@_backend_ext_str}
 %   EPS graphics may be included in \texttt{pdfmode} by conversion to
 %   PDF: this requires restricted shell escape. Modelled on the \pkg{epstopdf}
 %   \LaTeXe{} package, but simplified, conversion takes place here if we have
@@ -235,18 +236,18 @@
 %    \begin{macrocode}
 \sys_if_shell:T
   {
-    \str_new:N \l_@@_dir_str
-    \str_new:N \l_@@_name_str
-    \str_new:N \l_@@_ext_str
+    \str_new:N \l_@@_backend_dir_str
+    \str_new:N \l_@@_backend_name_str
+    \str_new:N \l_@@_backend_ext_str
     \cs_new_protected:Npn \@@_backend_getbb_eps:n #1
       {
         \file_parse_full_name:nNNN {#1}
-          \l_@@_dir_str
-          \l_@@_name_str
-          \l_@@_ext_str
+          \l_@@_backend_dir_str
+          \l_@@_backend_name_str
+          \l_@@_backend_ext_str
         \exp_args:Nx \@@_backend_getbb_eps:nn
           {
-            \l_@@_name_str - \str_tail:N \l_@@_ext_str
+            \l_@@_backend_name_str - \str_tail:N \l_@@_backend_ext_str
             -converted-to.pdf
           }
           {#1}
@@ -264,10 +265,10 @@
     \cs_new_protected:Npn \@@_backend_include_eps:n #1
       {
         \file_parse_full_name:nNNN {#1}
-          \l_@@_dir_str \l_@@_name_str \l_@@_ext_str
+          \l_@@_backend_dir_str \l_@@_backend_name_str \l_@@_backend_ext_str
         \exp_args:Nx \@@_backend_include_pdf:n
           {
-            \l_@@_name_str - \str_tail:N \l_@@_ext_str
+            \l_@@_backend_name_str - \str_tail:N \l_@@_backend_ext_str
             -converted-to.pdf
           }
       }
@@ -321,10 +322,10 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{variable}{\g_@@_graphics_int}
+% \begin{variable}{\g_@@_track_int}
 %   Used to track the object number associated with each graphic.
 %    \begin{macrocode}
-\int_new:N \g_@@_graphics_int
+\int_new:N \g_@@_track_int
 %    \end{macrocode}
 % \end{variable}
 %
@@ -398,8 +399,8 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_include_auxiii:nnn #1#2#3
   {
-    \int_gincr:N \g_@@_graphics_int
-    \int_const:cn { c_@@_graphics_ #1#2 _int } { \g_@@_graphics_int }
+    \int_gincr:N \g_@@_track_int
+    \int_const:cn { c_@@_graphics_ #1#2 _int } { \g_@@_track_int }
     \__kernel_backend_literal:x
       {
         pdf:#3~
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 451e9c1..1588940 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -6498,9 +6498,9 @@ Defining \__graphics_backend_getbb_auxii:n on line ...
 Defining \__graphics_backend_include_jpg:n on line ...
 Defining \__graphics_backend_include_pdf:n on line ...
 Defining \__graphics_backend_include_png:n on line ...
-Defining \l__graphics_dir_str on line ...
-Defining \l__graphics_name_str on line ...
-Defining \l__graphics_ext_str on line ...
+Defining \l__graphics_backend_dir_str on line ...
+Defining \l__graphics_backend_name_str on line ...
+Defining \l__graphics_backend_ext_str on line ...
 Defining \__graphics_backend_getbb_eps:n on line ...
 Defining \__graphics_backend_getbb_eps:nn on line ...
 Defining \__graphics_backend_include_eps:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 189a179..34bbc6d 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -6484,8 +6484,8 @@ Defining \__draw_backend_box_use:Nnnnn on line ...
 Defining \__graphics_backend_getbb_jpg:n on line ...
 Defining \__graphics_backend_getbb_png:n on line ...
 Defining \__graphics_backend_getbb_pdf:n on line ...
-Defining \g__graphics_graphics_int on line ...
-\g__graphics_graphics_int=\count...
+Defining \g__graphics_track_int on line ...
+\g__graphics_track_int=\count...
 Defining \__graphics_backend_include_eps:n on line ...
 Defining \__graphics_backend_include_jpg:n on line ...
 Defining \__graphics_backend_include_png:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 5b2f702..73935fa 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -6795,9 +6795,9 @@ Defining \__graphics_backend_getbb_auxii:n on line ...
 Defining \__graphics_backend_include_jpg:n on line ...
 Defining \__graphics_backend_include_pdf:n on line ...
 Defining \__graphics_backend_include_png:n on line ...
-Defining \l__graphics_dir_str on line ...
-Defining \l__graphics_name_str on line ...
-Defining \l__graphics_ext_str on line ...
+Defining \l__graphics_backend_dir_str on line ...
+Defining \l__graphics_backend_name_str on line ...
+Defining \l__graphics_backend_ext_str on line ...
 Defining \__graphics_backend_getbb_eps:n on line ...
 Defining \__graphics_backend_getbb_eps:nn on line ...
 Defining \__graphics_backend_include_eps:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 3c62e59..e59b5d0 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -6781,8 +6781,8 @@ Defining \__draw_backend_box_use:Nnnnn on line ...
 Defining \__graphics_backend_getbb_jpg:n on line ...
 Defining \__graphics_backend_getbb_png:n on line ...
 Defining \__graphics_backend_getbb_pdf:n on line ...
-Defining \g__graphics_graphics_int on line ...
-\g__graphics_graphics_int=\count...
+Defining \g__graphics_track_int on line ...
+\g__graphics_track_int=\count...
 Defining \__graphics_backend_include_eps:n on line ...
 Defining \__graphics_backend_include_jpg:n on line ...
 Defining \__graphics_backend_include_png:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 660f27c..9a7d079 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -6482,8 +6482,8 @@ Defining \__draw_backend_cm_decompose_auxi:nnnnN on line ...
 Defining \__draw_backend_cm_decompose_auxii:nnnnN on line ...
 Defining \__draw_backend_cm_decompose_auxiii:nnnnN on line ...
 Defining \__draw_backend_box_use:Nnnnn on line ...
-Defining \g__graphics_graphics_int on line ...
-\g__graphics_graphics_int=\count...
+Defining \g__graphics_track_int on line ...
+\g__graphics_track_int=\count...
 Defining \__graphics_backend_include_eps:n on line ...
 Defining \__graphics_backend_include_jpg:n on line ...
 Defining \__graphics_backend_include_png:n on line ...
diff --git a/l3kernel/testfiles/m3expl002.ptex.tlg b/l3kernel/testfiles/m3expl002.ptex.tlg
index 534cb8e..6e29e9d 100644
--- a/l3kernel/testfiles/m3expl002.ptex.tlg
+++ b/l3kernel/testfiles/m3expl002.ptex.tlg
@@ -155,7 +155,7 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \c__deprecation_minus_one=\count...
 ) (l3dvipdfmx.def
 File: l3dvipdfmx.def ....-..-.. v L3 Experimental backend support: dvipdfmx
-\g__graphics_graphics_int=\count...
+\g__graphics_track_int=\count...
 \l__pdf_internal_box=\box...
 \g__pdf_backend_object_int=\count...
 \g__pdf_backend_annotation_int=\count...
diff --git a/l3kernel/testfiles/m3expl002.uptex.tlg b/l3kernel/testfiles/m3expl002.uptex.tlg
index 539f3ba..c0b0c39 100644
--- a/l3kernel/testfiles/m3expl002.uptex.tlg
+++ b/l3kernel/testfiles/m3expl002.uptex.tlg
@@ -152,7 +152,7 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \c__deprecation_minus_one=\count...
 ) (l3dvipdfmx.def
 File: l3dvipdfmx.def ....-..-.. v L3 Experimental backend support: dvipdfmx
-\g__graphics_graphics_int=\count...
+\g__graphics_track_int=\count...
 \l__pdf_internal_box=\box...
 \g__pdf_backend_object_int=\count...
 \g__pdf_backend_annotation_int=\count...
diff --git a/l3kernel/testfiles/m3expl002.xetex.tlg b/l3kernel/testfiles/m3expl002.xetex.tlg
index b6d6b3c..5b6cc57 100644
--- a/l3kernel/testfiles/m3expl002.xetex.tlg
+++ b/l3kernel/testfiles/m3expl002.xetex.tlg
@@ -152,7 +152,7 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \c__deprecation_minus_one=\count...
 ) (l3xdvipdfmx.def
 File: l3xdvipdfmx.def ....-..-.. v L3 Experimental backend support: xdvipdfmx
-\g__graphics_graphics_int=\count...
+\g__graphics_track_int=\count...
 \l__pdf_internal_box=\box...
 \g__pdf_backend_object_int=\count...
 \g__pdf_backend_annotation_int=\count...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 451e9c1..1588940 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -6498,9 +6498,9 @@ Defining \__graphics_backend_getbb_auxii:n on line ...
 Defining \__graphics_backend_include_jpg:n on line ...
 Defining \__graphics_backend_include_pdf:n on line ...
 Defining \__graphics_backend_include_png:n on line ...
-Defining \l__graphics_dir_str on line ...
-Defining \l__graphics_name_str on line ...
-Defining \l__graphics_ext_str on line ...
+Defining \l__graphics_backend_dir_str on line ...
+Defining \l__graphics_backend_name_str on line ...
+Defining \l__graphics_backend_ext_str on line ...
 Defining \__graphics_backend_getbb_eps:n on line ...
 Defining \__graphics_backend_getbb_eps:nn on line ...
 Defining \__graphics_backend_include_eps:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 189a179..34bbc6d 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -6484,8 +6484,8 @@ Defining \__draw_backend_box_use:Nnnnn on line ...
 Defining \__graphics_backend_getbb_jpg:n on line ...
 Defining \__graphics_backend_getbb_png:n on line ...
 Defining \__graphics_backend_getbb_pdf:n on line ...
-Defining \g__graphics_graphics_int on line ...
-\g__graphics_graphics_int=\count...
+Defining \g__graphics_track_int on line ...
+\g__graphics_track_int=\count...
 Defining \__graphics_backend_include_eps:n on line ...
 Defining \__graphics_backend_include_jpg:n on line ...
 Defining \__graphics_backend_include_png:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 5b2f702..73935fa 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -6795,9 +6795,9 @@ Defining \__graphics_backend_getbb_auxii:n on line ...
 Defining \__graphics_backend_include_jpg:n on line ...
 Defining \__graphics_backend_include_pdf:n on line ...
 Defining \__graphics_backend_include_png:n on line ...
-Defining \l__graphics_dir_str on line ...
-Defining \l__graphics_name_str on line ...
-Defining \l__graphics_ext_str on line ...
+Defining \l__graphics_backend_dir_str on line ...
+Defining \l__graphics_backend_name_str on line ...
+Defining \l__graphics_backend_ext_str on line ...
 Defining \__graphics_backend_getbb_eps:n on line ...
 Defining \__graphics_backend_getbb_eps:nn on line ...
 Defining \__graphics_backend_include_eps:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 3c62e59..e59b5d0 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -6781,8 +6781,8 @@ Defining \__draw_backend_box_use:Nnnnn on line ...
 Defining \__graphics_backend_getbb_jpg:n on line ...
 Defining \__graphics_backend_getbb_png:n on line ...
 Defining \__graphics_backend_getbb_pdf:n on line ...
-Defining \g__graphics_graphics_int on line ...
-\g__graphics_graphics_int=\count...
+Defining \g__graphics_track_int on line ...
+\g__graphics_track_int=\count...
 Defining \__graphics_backend_include_eps:n on line ...
 Defining \__graphics_backend_include_jpg:n on line ...
 Defining \__graphics_backend_include_png:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 660f27c..9a7d079 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -6482,8 +6482,8 @@ Defining \__draw_backend_cm_decompose_auxi:nnnnN on line ...
 Defining \__draw_backend_cm_decompose_auxii:nnnnN on line ...
 Defining \__draw_backend_cm_decompose_auxiii:nnnnN on line ...
 Defining \__draw_backend_box_use:Nnnnn on line ...
-Defining \g__graphics_graphics_int on line ...
-\g__graphics_graphics_int=\count...
+Defining \g__graphics_track_int on line ...
+\g__graphics_track_int=\count...
 Defining \__graphics_backend_include_eps:n on line ...
 Defining \__graphics_backend_include_jpg:n on line ...
 Defining \__graphics_backend_include_png:n on line ...
diff --git a/l3kernel/testfiles/m3expl004.ptex.tlg b/l3kernel/testfiles/m3expl004.ptex.tlg
index 534cb8e..6e29e9d 100644
--- a/l3kernel/testfiles/m3expl004.ptex.tlg
+++ b/l3kernel/testfiles/m3expl004.ptex.tlg
@@ -155,7 +155,7 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \c__deprecation_minus_one=\count...
 ) (l3dvipdfmx.def
 File: l3dvipdfmx.def ....-..-.. v L3 Experimental backend support: dvipdfmx
-\g__graphics_graphics_int=\count...
+\g__graphics_track_int=\count...
 \l__pdf_internal_box=\box...
 \g__pdf_backend_object_int=\count...
 \g__pdf_backend_annotation_int=\count...
diff --git a/l3kernel/testfiles/m3expl004.uptex.tlg b/l3kernel/testfiles/m3expl004.uptex.tlg
index 539f3ba..c0b0c39 100644
--- a/l3kernel/testfiles/m3expl004.uptex.tlg
+++ b/l3kernel/testfiles/m3expl004.uptex.tlg
@@ -152,7 +152,7 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \c__deprecation_minus_one=\count...
 ) (l3dvipdfmx.def
 File: l3dvipdfmx.def ....-..-.. v L3 Experimental backend support: dvipdfmx
-\g__graphics_graphics_int=\count...
+\g__graphics_track_int=\count...
 \l__pdf_internal_box=\box...
 \g__pdf_backend_object_int=\count...
 \g__pdf_backend_annotation_int=\count...
diff --git a/l3kernel/testfiles/m3expl004.xetex.tlg b/l3kernel/testfiles/m3expl004.xetex.tlg
index b6d6b3c..5b6cc57 100644
--- a/l3kernel/testfiles/m3expl004.xetex.tlg
+++ b/l3kernel/testfiles/m3expl004.xetex.tlg
@@ -152,7 +152,7 @@ Package: expl3 ....-..-.. L3 programming layer (code)
 \c__deprecation_minus_one=\count...
 ) (l3xdvipdfmx.def
 File: l3xdvipdfmx.def ....-..-.. v L3 Experimental backend support: xdvipdfmx
-\g__graphics_graphics_int=\count...
+\g__graphics_track_int=\count...
 \l__pdf_internal_box=\box...
 \g__pdf_backend_object_int=\count...
 \g__pdf_backend_annotation_int=\count...

More information about the latex3-commits mailing list