Move l3pdf to l3kernel

There are only a small number of additions here. The changes in the peek test occur as we need one use of \AtBeginDocument.
latex3 · Feb 11, 2021 · 5f7f872 · 5f7f872
1 parent 7a9b139
commit 5f7f872
Show file tree

Hide file tree

Showing 26 changed files with 73 additions and 221 deletions.
diff --git a/l3backend/CHANGELOG.md b/l3backend/CHANGELOG.md
@@ -6,6 +6,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Changed
+- Update tracking of PDF management functions
+
 ### Fixed
 - Opacity support for pdfTeX/LuaTeX
 

diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
@@ -804,16 +804,17 @@
         / \str_convert_pdfname:n {#1} ~ #2 ~
         \pdf_object_last:
       }
-    \use:x
+    \cs_if_exist:NT \pdfmanagement_add:nnn
       {
-        \pdfmanagement_add:nnn
-          { Page / Resources / ColorSpace }
-          { color \int_use:N \g_@@_model_int }
-          { \pdf_object_last: }
+        \use:x
+          {
+            \pdfmanagement_add:nnn
+              { Page / Resources / ColorSpace }
+              { color \int_use:N \g_@@_model_int }
+              { \pdf_object_last: }
+          }
       }
   }
-\cs_if_exist:NF \pdf_object_now:nn
-  { \cs_gset_protected:Npn \@@_backend_separation_init:nnnnn #1#2#3#4#5 { } }
 \cs_new_protected:Npn \@@_backend_separation_init:n #1
   {
     \pdf_object_now:nx { array } {#1}
@@ -891,16 +892,17 @@
         #2 ~
         \pdf_object_last:
       }
-    \use:x
+    \cs_if_exist:NT \pdfmanagement_add:nnn
       {
-        \pdfmanagement_add:nnn
-          { Page / Resources / ColorSpace }
-          { color \int_use:N \g_@@_model_int }
-          { \pdf_object_last: }
+        \use:x
+          {
+            \pdfmanagement_add:nnn
+              { Page / Resources / ColorSpace }
+              { color \int_use:N \g_@@_model_int }
+              { \pdf_object_last: }
+          }
       }
   }
-\cs_if_exist:NF \pdf_object_now:nn
-  { \cs_gset_protected:Npn \@@_backend_devicen_init:nnn #1#2#3 { } }
 \cs_new:Npn \@@_backend_devicen_init:w #1 ~ #2 \s_@@_stop
   {
     + 1

diff --git a/l3experimental/CHANGELOG.md b/l3experimental/CHANGELOG.md
@@ -9,6 +9,7 @@ this project uses date-based 'snapshot' version identifiers.
 
 ### Removed
 - `l3color`: moved to `l3kernel`
+- `l3pdf`: moved to `l3kernel`
 
 ## [2021-02-06]
 

diff --git a/l3experimental/l3pdf/build.lua b/l3experimental/l3pdf/build.lua
diff --git a/l3experimental/l3pdf/l3pdf-code.tex b/l3experimental/l3pdf/l3pdf-code.tex
diff --git a/l3experimental/l3pdf/l3pdf.ins b/l3experimental/l3pdf/l3pdf.ins
diff --git a/l3experimental/l3pdf/testfiles/m3pdf000.lvt b/l3experimental/l3pdf/testfiles/m3pdf000.lvt
diff --git a/l3experimental/l3pdf/testfiles/m3pdf000.tlg b/l3experimental/l3pdf/testfiles/m3pdf000.tlg
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
@@ -9,6 +9,7 @@ this project uses date-based 'snapshot' version identifiers.
 
 ### Added
 - `l3color`: Moved from `l3experimental`
+- `l3pdf`: Moved from `l3experimental`
 
 ### Changed
 - Re-ordered `interface3` documentation

diff --git a/l3kernel/doc/source3body.tex b/l3kernel/doc/source3body.tex
@@ -587,6 +587,7 @@ \part{Typesetting}
 \DocInput{l3box.dtx}
 \DocInput{l3coffins.dtx}
 \DocInput{l3color.dtx}
+\DocInput{l3pdf.dtx}
 
 \part{Additions and removals}
 

diff --git a/l3kernel/l3.ins b/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{l3pdf.dtx}        {package}
         \from{l3coffins.dtx}    {package}
         \from{l3luatex.dtx}     {package,tex}
         \from{l3unicode.dtx}    {package}

diff --git a/l3kernel/l3coffins.dtx b/l3kernel/l3coffins.dtx
@@ -413,6 +413,7 @@
 %
 %    \begin{macrocode}
 %<@@=coffin>
+\typeout { \meaning \l_peek_token }
 %    \end{macrocode}
 %
 % \subsection{Coffins: data structures and general variables}

diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
@@ -2644,6 +2644,7 @@
       { is~undefined. }
       { has~the~properties: #2 }
   }
+\typeout { \meaning \l_peek_token }
 %    \end{macrocode}
 %
 %    \begin{macrocode}