[latex3-commits] [git/LaTeX3-latex3-latex3] split-pdfmode: Retain combined pdfmode code where possible (d76a8abee)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : split-pdfmode
Link       : https://github.com/latex3/latex3/commit/d76a8abee2b3ab8e5115eea601cd414a4cb52571

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

commit d76a8abee2b3ab8e5115eea601cd414a4cb52571
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Aug 13 20:24:47 2020 +0100

    Retain combined pdfmode code where possible
    
    The files here have no differences at all, so there is
    no issue (at present) with having one DocStrip result.


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

d76a8abee2b3ab8e5115eea601cd414a4cb52571
 l3backend/l3backend.ins                 | 13 +++---
 l3kernel/testfiles/m3expl001.luatex.tlg | 71 +++++++++++++++++----------------
 l3kernel/testfiles/m3expl001.tlg        | 71 +++++++++++++++++----------------
 l3kernel/testfiles/m3expl003.luatex.tlg | 71 +++++++++++++++++----------------
 l3kernel/testfiles/m3expl003.tlg        | 71 +++++++++++++++++----------------
 5 files changed, 150 insertions(+), 147 deletions(-)

diff --git a/l3backend/l3backend.ins b/l3backend/l3backend.ins
index b52628aed..00e3792cf 100644
--- a/l3backend/l3backend.ins
+++ b/l3backend/l3backend.ins
@@ -97,23 +97,22 @@ and all files in that bundle must be distributed together.
 \generate
   {
     \file{l3backend-pdfmode.def}
-      {\from{l3backend-basics.dtx}  {package,pdfmode,shared}}
+      {
+        \from{l3backend-basics.dtx}  {package,pdfmode,shared}
+        \from{l3backend-box.dtx}     {package,pdfmode}
+        \from{l3backend-draw.dtx}    {package,pdfmode}
+        \from{l3backend-graphics.dtx}{package,pdfmode}
+      }
     \file{l3backend-pdfmode-pdftex.def}
       {
         \from{l3backend-basics.dtx}  {package,pdfmode,pdftex}
         \from{l3backend-color.dtx}   {package,pdfmode,pdftex}
-        \from{l3backend-box.dtx}     {package,pdfmode,pdftex}
-        \from{l3backend-draw.dtx}    {package,pdfmode,pdftex}
-        \from{l3backend-graphics.dtx}{package,pdfmode,pdftex}
         \from{l3backend-pdf.dtx}     {package,pdfmode,pdftex}
       }
     \file{l3backend-pdfmode-luatex.def}
       {
         \from{l3backend-basics.dtx}  {package,pdfmode,luatex}
         \from{l3backend-color.dtx}   {package,pdfmode,luatex}
-        \from{l3backend-box.dtx}     {package,pdfmode,luatex}
-        \from{l3backend-draw.dtx}    {package,pdfmode,luatex}
-        \from{l3backend-graphics.dtx}{package,pdfmode,luatex}
         \from{l3backend-pdf.dtx}     {package,pdfmode,luatex}
       }
   }
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 5d3dfd455..ed148a85e 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -46,6 +46,41 @@ Defining \__color_backend_stroke_gray:n on line ...
 Defining \__color_backend_stroke_rgb:n on line ...
 Defining \__color_backend_fill_separation:nn on line ...
 Defining \__color_backend_stroke_separation:nn on line ...
+Defining \l__pdf_internal_box on line ...
+\l__pdf_internal_box=\box...
+Defining \__pdf_backend_annotation:nnnn on line ...
+Defining \__pdf_backend_annotation_last: on line ...
+Defining \__pdf_backend_link_begin_goto:nnw on line ...
+Defining \__pdf_backend_link_begin_user:nnw on line ...
+Defining \__pdf_backend_link_begin:nnnw on line ...
+Defining \__pdf_backend_link_end: on line ...
+Defining \__pdf_backend_link_last: on line ...
+Defining \__pdf_backend_link_margin:n on line ...
+Defining \__pdf_backend_destination:nn on line ...
+Defining \__pdf_backend_destination_box:nn on line ...
+Defining \__pdf_backend_catalog_gput:nn on line ...
+Defining \__pdf_backend_info_gput:nn on line ...
+Defining \g__pdf_backend_object_prop on line ...
+Defining \__pdf_backend_object_new:nn on line ...
+Defining \__pdf_backend_object_ref:n on line ...
+Defining \__pdf_backend_object_write:nn on line ...
+Defining \__pdf_backend_object_write:nx on line ...
+Defining \__pdf_exp_not_i:nn on line ...
+Defining \__pdf_exp_not_ii:nn on line ...
+Defining \__pdf_backend_object_now:nn on line ...
+Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_last: on line ...
+Defining \__pdf_backend_pageobject_ref:n on line ...
+Defining \__pdf_backend_compresslevel:n on line ...
+Defining \__pdf_backend_compress_objects:n on line ...
+Defining \__pdf_backend_objcompresslevel:n on line ...
+Defining \__pdf_backend_version_major_gset:n on line ...
+Defining \__pdf_backend_version_minor_gset:n on line ...
+Defining \__pdf_backend_version_major: on line ...
+Defining \__pdf_backend_version_minor: on line ...
+Defining \__pdf_backend_bdc:nn on line ...
+Defining \__pdf_backend_emc: on line ...
+)
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...
@@ -99,38 +134,4 @@ 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 ...
-Defining \l__pdf_internal_box on line ...
-\l__pdf_internal_box=\box...
-Defining \__pdf_backend_annotation:nnnn on line ...
-Defining \__pdf_backend_annotation_last: on line ...
-Defining \__pdf_backend_link_begin_goto:nnw on line ...
-Defining \__pdf_backend_link_begin_user:nnw on line ...
-Defining \__pdf_backend_link_begin:nnnw on line ...
-Defining \__pdf_backend_link_end: on line ...
-Defining \__pdf_backend_link_last: on line ...
-Defining \__pdf_backend_link_margin:n on line ...
-Defining \__pdf_backend_destination:nn on line ...
-Defining \__pdf_backend_destination_box:nn on line ...
-Defining \__pdf_backend_catalog_gput:nn on line ...
-Defining \__pdf_backend_info_gput:nn on line ...
-Defining \g__pdf_backend_object_prop on line ...
-Defining \__pdf_backend_object_new:nn on line ...
-Defining \__pdf_backend_object_ref:n on line ...
-Defining \__pdf_backend_object_write:nn on line ...
-Defining \__pdf_backend_object_write:nx on line ...
-Defining \__pdf_exp_not_i:nn on line ...
-Defining \__pdf_exp_not_ii:nn on line ...
-Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
-Defining \__pdf_backend_object_last: on line ...
-Defining \__pdf_backend_pageobject_ref:n on line ...
-Defining \__pdf_backend_compresslevel:n on line ...
-Defining \__pdf_backend_compress_objects:n on line ...
-Defining \__pdf_backend_objcompresslevel:n on line ...
-Defining \__pdf_backend_version_major_gset:n on line ...
-Defining \__pdf_backend_version_minor_gset:n on line ...
-Defining \__pdf_backend_version_major: on line ...
-Defining \__pdf_backend_version_minor: on line ...
-Defining \__pdf_backend_bdc:nn on line ...
-Defining \__pdf_backend_emc: on line ...
-)))
+))
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 46ae08a71..ad8dc26a4 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -46,6 +46,41 @@ Defining \__color_backend_stroke_gray:n on line ...
 Defining \__color_backend_stroke_rgb:n on line ...
 Defining \__color_backend_fill_separation:nn on line ...
 Defining \__color_backend_stroke_separation:nn on line ...
+Defining \l__pdf_internal_box on line ...
+\l__pdf_internal_box=\box...
+Defining \__pdf_backend_annotation:nnnn on line ...
+Defining \__pdf_backend_annotation_last: on line ...
+Defining \__pdf_backend_link_begin_goto:nnw on line ...
+Defining \__pdf_backend_link_begin_user:nnw on line ...
+Defining \__pdf_backend_link_begin:nnnw on line ...
+Defining \__pdf_backend_link_end: on line ...
+Defining \__pdf_backend_link_last: on line ...
+Defining \__pdf_backend_link_margin:n on line ...
+Defining \__pdf_backend_destination:nn on line ...
+Defining \__pdf_backend_destination_box:nn on line ...
+Defining \__pdf_backend_catalog_gput:nn on line ...
+Defining \__pdf_backend_info_gput:nn on line ...
+Defining \g__pdf_backend_object_prop on line ...
+Defining \__pdf_backend_object_new:nn on line ...
+Defining \__pdf_backend_object_ref:n on line ...
+Defining \__pdf_backend_object_write:nn on line ...
+Defining \__pdf_backend_object_write:nx on line ...
+Defining \__pdf_exp_not_i:nn on line ...
+Defining \__pdf_exp_not_ii:nn on line ...
+Defining \__pdf_backend_object_now:nn on line ...
+Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_last: on line ...
+Defining \__pdf_backend_pageobject_ref:n on line ...
+Defining \__pdf_backend_compresslevel:n on line ...
+Defining \__pdf_backend_compress_objects:n on line ...
+Defining \__pdf_backend_objcompresslevel:n on line ...
+Defining \__pdf_backend_version_major_gset:n on line ...
+Defining \__pdf_backend_version_minor_gset:n on line ...
+Defining \__pdf_backend_version_major: on line ...
+Defining \__pdf_backend_version_minor: on line ...
+Defining \__pdf_backend_bdc:nn on line ...
+Defining \__pdf_backend_emc: on line ...
+)
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...
@@ -99,38 +134,4 @@ 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 ...
-Defining \l__pdf_internal_box on line ...
-\l__pdf_internal_box=\box...
-Defining \__pdf_backend_annotation:nnnn on line ...
-Defining \__pdf_backend_annotation_last: on line ...
-Defining \__pdf_backend_link_begin_goto:nnw on line ...
-Defining \__pdf_backend_link_begin_user:nnw on line ...
-Defining \__pdf_backend_link_begin:nnnw on line ...
-Defining \__pdf_backend_link_end: on line ...
-Defining \__pdf_backend_link_last: on line ...
-Defining \__pdf_backend_link_margin:n on line ...
-Defining \__pdf_backend_destination:nn on line ...
-Defining \__pdf_backend_destination_box:nn on line ...
-Defining \__pdf_backend_catalog_gput:nn on line ...
-Defining \__pdf_backend_info_gput:nn on line ...
-Defining \g__pdf_backend_object_prop on line ...
-Defining \__pdf_backend_object_new:nn on line ...
-Defining \__pdf_backend_object_ref:n on line ...
-Defining \__pdf_backend_object_write:nn on line ...
-Defining \__pdf_backend_object_write:nx on line ...
-Defining \__pdf_exp_not_i:nn on line ...
-Defining \__pdf_exp_not_ii:nn on line ...
-Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
-Defining \__pdf_backend_object_last: on line ...
-Defining \__pdf_backend_pageobject_ref:n on line ...
-Defining \__pdf_backend_compresslevel:n on line ...
-Defining \__pdf_backend_compress_objects:n on line ...
-Defining \__pdf_backend_objcompresslevel:n on line ...
-Defining \__pdf_backend_version_major_gset:n on line ...
-Defining \__pdf_backend_version_minor_gset:n on line ...
-Defining \__pdf_backend_version_major: on line ...
-Defining \__pdf_backend_version_minor: on line ...
-Defining \__pdf_backend_bdc:nn on line ...
-Defining \__pdf_backend_emc: on line ...
-)))
+))
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 5d3dfd455..ed148a85e 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -46,6 +46,41 @@ Defining \__color_backend_stroke_gray:n on line ...
 Defining \__color_backend_stroke_rgb:n on line ...
 Defining \__color_backend_fill_separation:nn on line ...
 Defining \__color_backend_stroke_separation:nn on line ...
+Defining \l__pdf_internal_box on line ...
+\l__pdf_internal_box=\box...
+Defining \__pdf_backend_annotation:nnnn on line ...
+Defining \__pdf_backend_annotation_last: on line ...
+Defining \__pdf_backend_link_begin_goto:nnw on line ...
+Defining \__pdf_backend_link_begin_user:nnw on line ...
+Defining \__pdf_backend_link_begin:nnnw on line ...
+Defining \__pdf_backend_link_end: on line ...
+Defining \__pdf_backend_link_last: on line ...
+Defining \__pdf_backend_link_margin:n on line ...
+Defining \__pdf_backend_destination:nn on line ...
+Defining \__pdf_backend_destination_box:nn on line ...
+Defining \__pdf_backend_catalog_gput:nn on line ...
+Defining \__pdf_backend_info_gput:nn on line ...
+Defining \g__pdf_backend_object_prop on line ...
+Defining \__pdf_backend_object_new:nn on line ...
+Defining \__pdf_backend_object_ref:n on line ...
+Defining \__pdf_backend_object_write:nn on line ...
+Defining \__pdf_backend_object_write:nx on line ...
+Defining \__pdf_exp_not_i:nn on line ...
+Defining \__pdf_exp_not_ii:nn on line ...
+Defining \__pdf_backend_object_now:nn on line ...
+Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_last: on line ...
+Defining \__pdf_backend_pageobject_ref:n on line ...
+Defining \__pdf_backend_compresslevel:n on line ...
+Defining \__pdf_backend_compress_objects:n on line ...
+Defining \__pdf_backend_objcompresslevel:n on line ...
+Defining \__pdf_backend_version_major_gset:n on line ...
+Defining \__pdf_backend_version_minor_gset:n on line ...
+Defining \__pdf_backend_version_major: on line ...
+Defining \__pdf_backend_version_minor: on line ...
+Defining \__pdf_backend_bdc:nn on line ...
+Defining \__pdf_backend_emc: on line ...
+)
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...
@@ -99,38 +134,4 @@ 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 ...
-Defining \l__pdf_internal_box on line ...
-\l__pdf_internal_box=\box...
-Defining \__pdf_backend_annotation:nnnn on line ...
-Defining \__pdf_backend_annotation_last: on line ...
-Defining \__pdf_backend_link_begin_goto:nnw on line ...
-Defining \__pdf_backend_link_begin_user:nnw on line ...
-Defining \__pdf_backend_link_begin:nnnw on line ...
-Defining \__pdf_backend_link_end: on line ...
-Defining \__pdf_backend_link_last: on line ...
-Defining \__pdf_backend_link_margin:n on line ...
-Defining \__pdf_backend_destination:nn on line ...
-Defining \__pdf_backend_destination_box:nn on line ...
-Defining \__pdf_backend_catalog_gput:nn on line ...
-Defining \__pdf_backend_info_gput:nn on line ...
-Defining \g__pdf_backend_object_prop on line ...
-Defining \__pdf_backend_object_new:nn on line ...
-Defining \__pdf_backend_object_ref:n on line ...
-Defining \__pdf_backend_object_write:nn on line ...
-Defining \__pdf_backend_object_write:nx on line ...
-Defining \__pdf_exp_not_i:nn on line ...
-Defining \__pdf_exp_not_ii:nn on line ...
-Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
-Defining \__pdf_backend_object_last: on line ...
-Defining \__pdf_backend_pageobject_ref:n on line ...
-Defining \__pdf_backend_compresslevel:n on line ...
-Defining \__pdf_backend_compress_objects:n on line ...
-Defining \__pdf_backend_objcompresslevel:n on line ...
-Defining \__pdf_backend_version_major_gset:n on line ...
-Defining \__pdf_backend_version_minor_gset:n on line ...
-Defining \__pdf_backend_version_major: on line ...
-Defining \__pdf_backend_version_minor: on line ...
-Defining \__pdf_backend_bdc:nn on line ...
-Defining \__pdf_backend_emc: on line ...
-)))
+))
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 46ae08a71..ad8dc26a4 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -46,6 +46,41 @@ Defining \__color_backend_stroke_gray:n on line ...
 Defining \__color_backend_stroke_rgb:n on line ...
 Defining \__color_backend_fill_separation:nn on line ...
 Defining \__color_backend_stroke_separation:nn on line ...
+Defining \l__pdf_internal_box on line ...
+\l__pdf_internal_box=\box...
+Defining \__pdf_backend_annotation:nnnn on line ...
+Defining \__pdf_backend_annotation_last: on line ...
+Defining \__pdf_backend_link_begin_goto:nnw on line ...
+Defining \__pdf_backend_link_begin_user:nnw on line ...
+Defining \__pdf_backend_link_begin:nnnw on line ...
+Defining \__pdf_backend_link_end: on line ...
+Defining \__pdf_backend_link_last: on line ...
+Defining \__pdf_backend_link_margin:n on line ...
+Defining \__pdf_backend_destination:nn on line ...
+Defining \__pdf_backend_destination_box:nn on line ...
+Defining \__pdf_backend_catalog_gput:nn on line ...
+Defining \__pdf_backend_info_gput:nn on line ...
+Defining \g__pdf_backend_object_prop on line ...
+Defining \__pdf_backend_object_new:nn on line ...
+Defining \__pdf_backend_object_ref:n on line ...
+Defining \__pdf_backend_object_write:nn on line ...
+Defining \__pdf_backend_object_write:nx on line ...
+Defining \__pdf_exp_not_i:nn on line ...
+Defining \__pdf_exp_not_ii:nn on line ...
+Defining \__pdf_backend_object_now:nn on line ...
+Defining \__pdf_backend_object_now:nx on line ...
+Defining \__pdf_backend_object_last: on line ...
+Defining \__pdf_backend_pageobject_ref:n on line ...
+Defining \__pdf_backend_compresslevel:n on line ...
+Defining \__pdf_backend_compress_objects:n on line ...
+Defining \__pdf_backend_objcompresslevel:n on line ...
+Defining \__pdf_backend_version_major_gset:n on line ...
+Defining \__pdf_backend_version_minor_gset:n on line ...
+Defining \__pdf_backend_version_major: on line ...
+Defining \__pdf_backend_version_minor: on line ...
+Defining \__pdf_backend_bdc:nn on line ...
+Defining \__pdf_backend_emc: on line ...
+)
 Defining \__box_backend_clip:N on line ...
 Defining \__box_backend_rotate:Nn on line ...
 Defining \__box_backend_rotate_aux:Nn on line ...
@@ -99,38 +134,4 @@ 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 ...
-Defining \l__pdf_internal_box on line ...
-\l__pdf_internal_box=\box...
-Defining \__pdf_backend_annotation:nnnn on line ...
-Defining \__pdf_backend_annotation_last: on line ...
-Defining \__pdf_backend_link_begin_goto:nnw on line ...
-Defining \__pdf_backend_link_begin_user:nnw on line ...
-Defining \__pdf_backend_link_begin:nnnw on line ...
-Defining \__pdf_backend_link_end: on line ...
-Defining \__pdf_backend_link_last: on line ...
-Defining \__pdf_backend_link_margin:n on line ...
-Defining \__pdf_backend_destination:nn on line ...
-Defining \__pdf_backend_destination_box:nn on line ...
-Defining \__pdf_backend_catalog_gput:nn on line ...
-Defining \__pdf_backend_info_gput:nn on line ...
-Defining \g__pdf_backend_object_prop on line ...
-Defining \__pdf_backend_object_new:nn on line ...
-Defining \__pdf_backend_object_ref:n on line ...
-Defining \__pdf_backend_object_write:nn on line ...
-Defining \__pdf_backend_object_write:nx on line ...
-Defining \__pdf_exp_not_i:nn on line ...
-Defining \__pdf_exp_not_ii:nn on line ...
-Defining \__pdf_backend_object_now:nn on line ...
-Defining \__pdf_backend_object_now:nx on line ...
-Defining \__pdf_backend_object_last: on line ...
-Defining \__pdf_backend_pageobject_ref:n on line ...
-Defining \__pdf_backend_compresslevel:n on line ...
-Defining \__pdf_backend_compress_objects:n on line ...
-Defining \__pdf_backend_objcompresslevel:n on line ...
-Defining \__pdf_backend_version_major_gset:n on line ...
-Defining \__pdf_backend_version_minor_gset:n on line ...
-Defining \__pdf_backend_version_major: on line ...
-Defining \__pdf_backend_version_minor: on line ...
-Defining \__pdf_backend_bdc:nn on line ...
-Defining \__pdf_backend_emc: on line ...
-)))
+))