Move l3graphics to l3kernel (stable)

l3backend/l3backend-graphics.dtx

@@ -60,23 +60,6 @@
 %<@@=graphics>
 %    \end{macrocode}
 %
-% \begin{macro}{\@@_backend_loaded:n}
-%   To deal with file load ordering. Plain users are on their own.
-%    \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_loaded:n #1
-  {
-    \cs_if_exist:NTF \hook_gput_code:nnn
-      {
-        \hook_gput_code:nnn
-          { package / l3graphics / after }
-          { backend }
-          {#1}
-      }
-      {#1}
-  }
-%    \end{macrocode}
-% \end{macro}
-%
 % \subsection{\texttt{dvips} backend}
 %
 %    \begin{macrocode}
@@ -85,19 +68,15 @@
 %
 % \begin{variable}{\l_graphics_search_ext_seq}
 %    \begin{macrocode}
-\@@_backend_loaded:n
-  { \seq_set_from_clist:Nn \l_graphics_search_ext_seq { .eps , .ps } }
+\seq_set_from_clist:Nn \l_graphics_search_ext_seq { .eps , .ps }
 %    \end{macrocode}
 % \end{variable}
 %
 % \begin{macro}{\@@_backend_getbb_eps:n, \@@_backend_getbb_ps:n}
 %   Simply use the generic function.
 %    \begin{macrocode}
-\@@_backend_loaded:n
-  {
-    \cs_new_eq:NN \@@_backend_getbb_eps:n \@@_read_bb:n
-    \cs_new_eq:NN \@@_backend_getbb_ps:n \@@_read_bb:n
-  }
+\cs_new_eq:NN \@@_backend_getbb_eps:n \@@_read_bb:n
+\cs_new_eq:NN \@@_backend_getbb_ps:n \@@_read_bb:n
 %    \end{macrocode}
 % \end{macro}
 %
@@ -122,8 +101,7 @@
 %
 % \begin{macro}{\@@_backend_get_pagecount:n}
 %    \begin{macrocode}
-\@@_backend_loaded:n
-  { \cs_new_eq:NN \@@_backend_get_pagecount:n \@@_get_pagecount:n }
+\cs_new_eq:NN \@@_backend_get_pagecount:n \@@_get_pagecount:n
 %    \end{macrocode}
 % \end{macro}
 %
@@ -139,12 +117,8 @@
 %
 % \begin{variable}{\l_graphics_search_ext_seq}
 %    \begin{macrocode}
-\@@_backend_loaded:n
-  {
-    \seq_set_from_clist:Nn
-      \l_graphics_search_ext_seq
-      { .pdf , .eps , .ps , .png , .jpg , .jpeg  }
-  }
+\seq_set_from_clist:Nn \l_graphics_search_ext_seq
+  { .pdf , .eps , .ps , .png , .jpg , .jpeg  }
 %    \end{macrocode}
 % \end{variable}
 %
@@ -378,11 +352,8 @@
 %
 % \begin{variable}{\l_graphics_search_ext_seq}
 %    \begin{macrocode}
-\@@_backend_loaded:n
-  {
-    \seq_set_from_clist:Nn \l_graphics_search_ext_seq
-      { .pdf , .eps , .ps , .png , .jpg , .jpeg , .bmp }
-   }
+\seq_set_from_clist:Nn \l_graphics_search_ext_seq
+  { .pdf , .eps , .ps , .png , .jpg , .jpeg , .bmp }
 %    \end{macrocode}
 % \end{variable}
 %
@@ -396,11 +367,8 @@
 %   Simply use the generic functions: only for \texttt{dvipdfmx} in the
 %   extraction cases.
 %    \begin{macrocode}
-\@@_backend_loaded:n
-  {
-    \cs_new_eq:NN \@@_backend_getbb_eps:n \@@_read_bb:n
-    \cs_new_eq:NN \@@_backend_getbb_ps:n \@@_read_bb:n
-  }
+\cs_new_eq:NN \@@_backend_getbb_eps:n \@@_read_bb:n
+\cs_new_eq:NN \@@_backend_getbb_ps:n \@@_read_bb:n
 %<*dvipdfmx>
 \cs_new_protected:Npn \@@_backend_getbb_jpg:n #1
   {
@@ -543,8 +511,7 @@
 % \begin{macro}{\@@_backend_get_pagecount:n}
 %    \begin{macrocode}
 %<*dvipdfmx>
-\@@_backend_loaded:n
-  { \cs_new_eq:NN \@@_backend_get_pagecount:n \@@_get_pagecount:n }
+\cs_new_eq:NN \@@_backend_get_pagecount:n \@@_get_pagecount:n
 %</dvipdfmx>
 %    \end{macrocode}
 % \end{macro}
@@ -688,12 +655,8 @@
 %
 % \begin{variable}{\l_graphics_search_ext_seq}
 %    \begin{macrocode}
-\@@_backend_loaded:n
-  {
-    \seq_set_from_clist:Nn
-      \l_graphics_search_ext_seq
-      { .svg , .pdf , .eps , .ps , .png , .jpg , .jpeg }
-  }
+\seq_set_from_clist:Nn \l_graphics_search_ext_seq
+  { .svg , .pdf , .eps , .ps , .png , .jpg , .jpeg }
 %    \end{macrocode}
 % \end{variable}
 %
@@ -804,11 +767,8 @@
 % \begin{macro}{\@@_backend_getbb_eps:n, \@@_backend_getbb_ps:n}
 %   Simply use the generic function.
 %    \begin{macrocode}
-\@@_backend_loaded:n
-  {
-    \cs_new_eq:NN \@@_backend_getbb_eps:n \@@_read_bb:n
-    \cs_new_eq:NN \@@_backend_getbb_ps:n \@@_read_bb:n
-  }
+\cs_new_eq:NN \@@_backend_getbb_eps:n \@@_read_bb:n
+\cs_new_eq:NN \@@_backend_getbb_ps:n \@@_read_bb:n
 %    \end{macrocode}
 % \end{macro}
 %
@@ -913,8 +873,7 @@
 %
 % \begin{macro}{\@@_backend_get_pagecount:n}
 %    \begin{macrocode}
-\@@_backend_loaded:n
-  { \cs_new_eq:NN \@@_backend_get_pagecount:n \@@_get_pagecount:n }
+\cs_new_eq:NN \@@_backend_get_pagecount:n \@@_get_pagecount:n
 %    \end{macrocode}
 % \end{macro}
 %

l3experimental/CHANGELOG.md

@@ -10,6 +10,9 @@ this project uses date-based 'snapshot' version identifiers.
 ### Added
 - Key `pdf-attr` to `l3graphics` for additional attribute setting
 
+### Removed
+- `l3graphics` package: integrated into `l3kernel`
+
 ### Fixed
 - Grouping in `\draw_path_arc_axes:nnnn` (see \#1195)
 

l3experimental/build.lua

@@ -29,7 +29,6 @@ top of LaTeX2e with no changes to the existing kernel.
 The present release includes:
 - `l3benchmark` for measuring the time taken by TeX to run certain code;
 - `l3draw`, a code-level interface for constructing drawings;
-- `l3graphics`, an interfaces for the inclusion of graphics files;
 - `l3str`, support for string manipulation;
 - `l3sys-shell`, which provides abstractions for common shell functions like
   file deletion and copying;

l3kernel/CHANGELOG.md

@@ -13,6 +13,7 @@ this project uses date-based 'snapshot' version identifiers.
    `\text_declare_titlecase_mapping:nn(n)`
    and `\text_declare_uppercase_mapping:nn(n)` to allow customization of
    case changing outcomes
+- Module `l3graphics`, moved from `l3experimental` to stable status
 
 ### Changed
 - `\box_set_trim:Nnnnn` and `\box_set_viewport:Nnnnn` moved to

l3kernel/config-backend.lua

@@ -16,4 +16,6 @@ specialformats.latex =
       }
   }
 checkengines =
-  {"pdftex", "luatex", "xetex", "etex-dvips", "etex-dvisvgm", "ptex", "uptex"}
+  {"pdftex", "luatex", "xetex", "etex-dvips", "etex-dvisvgm", "ptex", "uptex"}
+
+dynamicfiles = {"*-eps-converted-to.pdf"}

l3kernel/l3.ins

@@ -100,6 +100,7 @@ and all files in that bundle must be distributed together.
         \from{l3regex.dtx}      {package}
         \from{l3box.dtx}        {package}
         \from{l3color.dtx}      {package}
+        \from{l3graphics.dtx}   {package}
         \from{l3pdf.dtx}        {package}
         \from{l3coffins.dtx}    {package}
         \from{l3luatex.dtx}     {package,tex}

l3experimental/l3graphics/l3graphics.dtx → l3kernel/l3graphics.dtx

@@ -11,7 +11,7 @@
 %
 %    http://www.latex-project.org/lppl.txt
 %
-% This file is part of the "l3experimental bundle" (The Work in LPPL)
+% This file is part of the "l3kernel bundle" (The Work in LPPL)
 % and all files in that bundle must be distributed together.
 %
 % -----------------------------------------------------------------------
@@ -49,9 +49,7 @@
 %
 % \begin{documentation}
 %
-% \section{\pkg{l3graphics} documentation}
-%
-% \subsection{Graphics keys}
+% \section{Graphics keys}
 %
 % Inclusion of graphic files requires a range of low-level data be passed to
 % the backend. This is set up using a small number of key--value settings,
@@ -97,7 +95,7 @@
 %   \emph{type} is determined from the file extension.
 % \end{variable}
 %
-% \subsection{Including graphics}
+% \section{Including graphics}
 %
 % \begin{function}{\graphics_include:nn, \graphics_include:nV}
 %   \begin{syntax}
@@ -127,7 +125,7 @@
 %   variable content. Spaces need not be quoted.
 % \end{variable}
 %
-% \subsection{Utility functions}
+% \section{Utility functions}
 %
 % \begin{function}[noTF]{\graphics_get_full_name:nN}
 %   \begin{syntax}
@@ -183,11 +181,6 @@
 %<@@=graphics>
 %    \end{macrocode}
 %
-%    \begin{macrocode}
-\ProvidesExplPackage{l3graphics}{2023-03-30}{}
-  {L3 Experimental graphics inclusion support}
-%    \end{macrocode}
-%
 % \begin{variable}{\l_@@_internal_dim, \l_@@_internal_ior, \l_@@_internal_tl}
 %   Scratch space.
 %    \begin{macrocode}
@@ -716,7 +709,7 @@
   }
 \cs_new_protected:Npx \@@_get_pagecount:n #1
   {
-    \ior_shell_open:Nn \exp_not:N \l_@@_internal_ior
+    \exp_not:N \ior_shell_open:Nn \exp_not:N \l_@@_internal_ior
       { extractbb~-O~#1 }
     \exp_not:N \ior_if_eof:NTF \exp_not:N \l_@@_internal_ior
       { \msg_error:nnn { graphics } { pipe-failed } }

l3experimental/l3graphics/testfiles/m3graphics001.lvt → l3kernel/testfiles-backend/m3graphics001.lvt

@@ -1,5 +1,5 @@
 %
-% Copyright (C) 2022 The LaTeX Project
+% Copyright (C) 2022,2023 The LaTeX Project
 %
 
 \documentclass{minimal}
@@ -10,8 +10,6 @@
 \debug_on:n { check-declarations , deprecation }
 \ExplSyntaxOff
 
-\RequirePackage{l3graphics}
-
 \begin{document}
 
 \ExplSyntaxOn