[latex3-commits] [git/LaTeX3-latex3-latex3] master: Move l3pdf to l3kernel (58c66f8d7)
Joseph Wright
joseph.wright at morningstar2.co.uk
Thu Feb 18 13:20:41 CET 2021
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/58c66f8d7f8f6441f5c8772a5150fd9d386540af
>---------------------------------------------------------------
commit 58c66f8d7f8f6441f5c8772a5150fd9d386540af
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Feb 11 14:22:31 2021 +0000
Move l3pdf to l3kernel
>---------------------------------------------------------------
58c66f8d7f8f6441f5c8772a5150fd9d386540af
l3backend/CHANGELOG.md | 3 ++
l3backend/l3backend-color.dtx | 30 ++++++-----
l3experimental/CHANGELOG.md | 1 +
l3experimental/l3pdf/build.lua | 19 -------
l3experimental/l3pdf/l3pdf-code.tex | 56 --------------------
l3experimental/l3pdf/l3pdf.ins | 60 ----------------------
l3experimental/l3pdf/testfiles/m3pdf000.lvt | 19 -------
l3experimental/l3pdf/testfiles/m3pdf000.tlg | 6 ---
l3kernel/CHANGELOG.md | 1 +
l3kernel/doc/source3body.tex | 1 +
l3kernel/l3.ins | 1 +
{l3experimental/l3pdf => l3kernel}/l3pdf.dtx | 52 +++++++++----------
.../{m3color003.tlg => m3color003.luatex.tlg} | 11 ++--
l3kernel/testfiles/m3color003.tlg | 1 +
l3kernel/testfiles/m3color003.xetex.tlg | 1 +
.../l3pdf => l3kernel}/testfiles/m3pdf001.lvt | 4 +-
.../l3pdf => l3kernel}/testfiles/m3pdf001.ptex.tlg | 0
.../l3pdf => l3kernel}/testfiles/m3pdf001.tlg | 0
.../testfiles/m3pdf001.uptex.tlg | 0
.../l3pdf => l3kernel}/testfiles/m3pdf002.lvt | 2 +-
.../l3pdf => l3kernel}/testfiles/m3pdf002.tlg | 2 -
l3kernel/testfiles/m3peek001.lvt | 1 +
l3kernel/testfiles/m3peek001.tlg | 2 +-
l3kernel/testfiles/m3peek002.tlg | 2 +-
l3kernel/testfiles/m3quark001.tlg | 1 +
25 files changed, 63 insertions(+), 213 deletions(-)
diff --git a/l3backend/CHANGELOG.md b/l3backend/CHANGELOG.md
index 060ec270e..579c98ecf 100644
--- 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
index 7e90737ad..7fa7408d2 100644
--- 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
index a5c479316..b5bec4c92 100644
--- 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
deleted file mode 100644
index 7e8070e8b..000000000
--- a/l3experimental/l3pdf/build.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env texlua
-
--- Build script for LaTeX3 "l3pdf" files
-
--- Identify the bundle and module: the module may be empty in the case where
--- there is no subdivision
-bundle = "l3experimental"
-module = "l3pdf"
-
--- Location of main directory: use Unix-style path separators
-maindir = "../.."
-
-typesetfiles = {"l3pdf.dtx", "l3pdf-code.tex"}
-
--- Non-standard settings
-checksearch = true
-
--- Load the common build code
-dofile(maindir .. "/build-config.lua")
diff --git a/l3experimental/l3pdf/l3pdf-code.tex b/l3experimental/l3pdf/l3pdf-code.tex
deleted file mode 100644
index db2a7d5bf..000000000
--- a/l3experimental/l3pdf/l3pdf-code.tex
+++ /dev/null
@@ -1,56 +0,0 @@
-\iffalse meta-comment
-
-File: l3pdf-code.tex
-
-Copyright (C) 2019,2021 The LaTeX Project
-
-It may be distributed and/or modified under the conditions of the
-LaTeX Project Public License (LPPL), either version 1.3c of this
-license or (at your option) any later version. The latest version
-of this license is in the file
-
- https://www.latex-project.org/lppl.txt
-
-This file is part of the "l3experimental bundle" (The Work in LPPL)
-and all files in that bundle must be distributed together.
-
-The released version of this bundle is available from CTAN.
-
------------------------------------------------------------------------
-
-The development version of the bundle can be found at
-
- https://github.com/latex3/latex3
-
-for those people who are interested.
-
-\fi
-
-\documentclass{l3doc}
-
-\begin{document}
-
-\makeatletter
-\let\DelayPrintIndex\PrintIndex
-\let\PrintIndex\@empty
-\makeatother
-
-\ExplSyntaxOn
-\clist_gput_right:Nn \g_docinput_clist
- {
- l3pdf.dtx ,
- }
-\ExplSyntaxOff
-
-\part{Implementation}
-
-\def\maketitle{}
-\EnableImplementation
-\DisableDocumentation
-\DocInputAgain
-
-\clearpage
-
-\DelayPrintIndex
-
-\end{document}
diff --git a/l3experimental/l3pdf/l3pdf.ins b/l3experimental/l3pdf/l3pdf.ins
deleted file mode 100644
index e422ceb99..000000000
--- a/l3experimental/l3pdf/l3pdf.ins
+++ /dev/null
@@ -1,60 +0,0 @@
-\iffalse meta-comment
-
-File: l3pdf.ins
-
-Copyright (C) 2019-2021 The LaTeX Project
-
-It may be distributed and/or modified under the conditions of the
-LaTeX Project Public License (LPPL), either version 1.3c of this
-license or (at your option) any later version. The latest version
-of this license is in the file
-
- http://www.latex-project.org/lppl.txt
-
-This file is part of the "l3experimental bundle" (The Work in LPPL)
-and all files in that bundle must be distributed together.
-
------------------------------------------------------------------------
-
-The development version of the bundle can be found at
-
- https://github.com/latex3/latex3
-
-for those people who are interested.
-
------------------------------------------------------------------------
-
-Any modification of this file should ensure that the copyright and
-license information is placed in the derived files.
-
-\fi
-
-\input l3docstrip.tex
-\askforoverwritefalse
-
-\preamble
-
-Copyright (C) 2019-2021 The LaTeX Project
-
-It may be distributed and/or modified under the conditions of
-the LaTeX Project Public License (LPPL), either version 1.3c of
-this license or (at your option) any later version. The latest
-version of this license is in the file:
-
- http://www.latex-project.org/lppl.txt
-
-This file is part of the "l3pdf bundle" (The Work in LPPL)
-and all files in that bundle must be distributed together.
-
-\endpreamble
-% stop docstrip adding \endinput
-\postamble
-\endpostamble
-
-\keepsilent
-
-\generate{\file{l3pdf.sty}
- {\from{l3pdf.dtx}{package}}
-}
-
-\endbatchfile
diff --git a/l3experimental/l3pdf/testfiles/m3pdf000.lvt b/l3experimental/l3pdf/testfiles/m3pdf000.lvt
deleted file mode 100644
index c60cd148e..000000000
--- a/l3experimental/l3pdf/testfiles/m3pdf000.lvt
+++ /dev/null
@@ -1,19 +0,0 @@
-%
-% Copyright (C) 2017-2021 The LaTeX Project
-%
-
-\documentclass{minimal}
-\input{regression-test}
-
-% Test the package loads properly. To avoid having to regenerate the
-% file whenever expl3 is changed, preload it.
-
-\RequirePackage[enable-debug]{expl3}
-\ExplSyntaxOn
-\debug_on:n { check-declarations , deprecation }
-\ExplSyntaxOff
-
-\START
-\AUTHOR{Joseph Wright}
-\RequirePackage{l3pdf}
-\END
diff --git a/l3experimental/l3pdf/testfiles/m3pdf000.tlg b/l3experimental/l3pdf/testfiles/m3pdf000.tlg
deleted file mode 100644
index c7222765b..000000000
--- a/l3experimental/l3pdf/testfiles/m3pdf000.tlg
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a generated file for the LaTeX (2e + expl3) validation system.
-Don't change this file in any respect.
-Author: Joseph Wright
-(l3pdf.sty
-Package: l3pdf ....-..-.. L3 Experimental core PDF support
-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 1507edab5..f69d5a092 100644
--- 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
index ed1c78009..588dba100 100644
--- a/l3kernel/doc/source3body.tex
+++ b/l3kernel/doc/source3body.tex
@@ -587,6 +587,7 @@ used on top of \LaTeXe{} if \cs{outer} tokens are used in the arguments.
\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
index 9977b1c8e..91c471e75 100644
--- 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/l3experimental/l3pdf/l3pdf.dtx b/l3kernel/l3pdf.dtx
similarity index 92%
rename from l3experimental/l3pdf/l3pdf.dtx
rename to l3kernel/l3pdf.dtx
index f5a5c72cf..63e2ab9d9 100644
--- a/l3experimental/l3pdf/l3pdf.dtx
+++ b/l3kernel/l3pdf.dtx
@@ -22,9 +22,6 @@
%
% for those people who are interested.
%
-%<*driver|package>
-\RequirePackage{expl3}
-%</driver|package>
%<*driver>
\documentclass[full]{l3doc}
\begin{document}
@@ -56,7 +53,7 @@
%
% \subsection{Objects}
%
-% \begin{function}[added = 2019-06-02]{\pdf_object_new:nn}
+% \begin{function}[added = 2021-02-10]{\pdf_object_new:nn}
% \begin{syntax}
% \cs{pdf_object_new:nn} \Arg{object} \Arg{type}
% \end{syntax}
@@ -78,7 +75,7 @@
% \end{syntax}
% Tests whether an object with name \Arg{object} has been defined.
% \end{function}
-% \begin{function}[added = 2019-06-02]
+% \begin{function}[added = 2021-02-10]
% {\pdf_object_write:nn, \pdf_object_write:nx}
% \begin{syntax}
% \cs{pdf_object_write:nn} \Arg{object} \Arg{content}
@@ -97,7 +94,7 @@
% \end{itemize}
% \end{function}
%
-% \begin{function}[EXP, added = 2019-06-02]{\pdf_object_ref:n}
+% \begin{function}[EXP, added = 2021-02-10]{\pdf_object_ref:n}
% \begin{syntax}
% \cs{pdf_object_ref:n} \Arg{object}
% \end{syntax}
@@ -105,7 +102,7 @@
% in for example page resource allocation
% \end{function}
%
-% \begin{function}[added = 2019-06-02]
+% \begin{function}[added = 2021-02-10]
% {\pdf_object_now:nn, \pdf_object_now:nx}
% \begin{syntax}
% \cs{pdf_object_now:nn} \Arg{type} \Arg{content}
@@ -123,7 +120,7 @@
% \end{itemize}
% \end{function}
%
-% \begin{function}[EXP, added = 2019-06-02]{\pdf_object_last:}
+% \begin{function}[EXP, added = 2021-02-10]{\pdf_object_last:}
% \begin{syntax}
% \cs{pdf_object_last:}
% \end{syntax}
@@ -133,7 +130,7 @@
%
% \subsection{Version}
%
-% \begin{function}[pTF, EXP, added = 2019-06-02]{\pdf_version_compare:Nn}
+% \begin{function}[pTF, EXP, added = 2021-02-10]{\pdf_version_compare:Nn}
% \begin{syntax}
% \cs{pdf_version_compare:NnTF} \meta{comparator} \Arg{version} \Arg{true code} \Arg{false code}
% \end{syntax}
@@ -142,7 +139,7 @@
% or \meta{false code} will be left in the output stream.
% \end{function}
%
-% \begin{function}[added = 2019-06-02]
+% \begin{function}[added = 2021-02-10]
% {\pdf_version_gset:n, \pdf_version_min_gset:n}
% \begin{syntax}
% \cs{pdf_version_gset:n} \Arg{version}
@@ -155,7 +152,7 @@
% initialised.
% \end{function}
%
-% \begin{function}[EXP, added = 2019-06-02]
+% \begin{function}[EXP, added = 2021-02-10]
% {\pdf_version:, \pdf_version_major:, \pdf_version_minor:}
% \begin{syntax}
% \cs{pdf_version:}
@@ -165,7 +162,7 @@
%
% \subsection{Compression}
%
-% \begin{function}[added = 2019-06-02]{\pdf_uncompress:}
+% \begin{function}[added = 2021-02-10]{\pdf_uncompress:}
% \begin{syntax}
% \cs{pdf_uncompress:}
% \end{syntax}
@@ -257,11 +254,6 @@
%<@@=pdf>
% \end{macrocode}
%
-% \begin{macrocode}
-\ProvidesExplPackage{l3pdf}{2021-02-06}{}
- {L3 Experimental core PDF support}
-% \end{macrocode}
-%
% \begin{variable}{\s_@@_stop}
% Internal scan marks.
% \begin{macrocode}
@@ -271,16 +263,20 @@
%
% \begin{variable}{\g_@@_init_bool}
% A flag so we have some chance of avoiding setting things we are not
-% allowed to.
+% allowed to. As we are potentially early in the format, we have to work
+% a bit harder than ideal.
% \begin{macrocode}
\bool_new:N \g_@@_init_bool
-%<*package>
-\cs_if_exist:NT \documentclass
+\bool_lazy_and:nnT
+ { \str_if_eq_p:Vn \fmtname { LaTeX2e } }
+ { \tl_if_exist_p:N \@expl at finalise@setup@@@@ }
{
- \AtBeginDocument
- { \bool_gset_true:N \g_@@_init_bool }
+ \tl_put_right:Nn \@expl at finalise@setup@@@@
+ {
+ \AtBeginDocument
+ { \bool_gset_true:N \g_@@_init_bool }
+ }
}
-%</package>
% \end{macrocode}
% \end{variable}
%
@@ -313,7 +309,7 @@
{ \@@_backend_object_new:nn {#1} {#2} }
\prg_new_conditional:Npnn \pdf_object_if_exist:n #1 { p , T , F , TF }
{
- \int_if_exist:cTF { c__pdf_backend_object_ \tl_to_str:n {#1} _int }
+ \int_if_exist:cTF { c_@@_backend_object_ \tl_to_str:n {#1} _int }
{ \prg_return_true: }
{ \prg_return_false:}
}
@@ -341,9 +337,9 @@
% @@_version_compare_<:w ,
% @@_version_compare_>:w
% }
-% \begin{macrocode}
% To compare version, we need to split the given value then deal with both
% major and minor version
+% \begin{macrocode}
\prg_new_conditional:Npnn \pdf_version_compare:Nn #1#2 { p , T , F , TF }
{ \use:c { @@_version_compare_ #1 :w } #2 . . \s_@@_stop }
\cs_new:cpn { @@_version_compare_=:w } #1 . #2 . #3 \s_@@_stop
@@ -419,14 +415,14 @@
%
% \begin{macro}{\pdf_destination:nn}
% \begin{macrocode}
-\cs_new_protected:Npn \pdf_destination:nn #1 #2
- { \@@_backend_destination:nn {#1}{#2} }
+\cs_new_protected:Npn \pdf_destination:nn #1#2
+ { \@@_backend_destination:nn {#1} {#2} }
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\pdf_destination:nnnn}
% \begin{macrocode}
-\cs_new_protected:Npn \pdf_destination:nnnn #1 #2 #3 #4
+\cs_new_protected:Npn \pdf_destination:nnnn #1#2#3#4
{
\hbox_to_zero:n
{ \@@_backend_destination:nnnn {#1} {#2} {#3} {#4} }
diff --git a/l3kernel/testfiles/m3color003.tlg b/l3kernel/testfiles/m3color003.luatex.tlg
similarity index 98%
copy from l3kernel/testfiles/m3color003.tlg
copy to l3kernel/testfiles/m3color003.luatex.tlg
index 75ebddf83..fca22955d 100644
--- a/l3kernel/testfiles/m3color003.tlg
+++ b/l3kernel/testfiles/m3color003.luatex.tlg
@@ -5,7 +5,7 @@ Author: Joseph Wright
TEST 1: Multiple models: selecting
============================================================
> \box...=
-\hbox(6.94444+0.0)x22.50005
+\hbox(6.94444+0.0)x22.50005, direction TLT
.\pdfcolorstack 0 push {0.1 g 0.1 G}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
@@ -17,7 +17,7 @@ TEST 1: Multiple models: selecting
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(6.94444+0.0)x22.50005
+\hbox(6.94444+0.0)x22.50005, direction TLT
.\pdfcolorstack 0 push {0.1 0.1 0.2 rg 0.1 0.1 0.2 RG}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
@@ -29,7 +29,7 @@ l. ... }
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(6.94444+0.0)x22.50005
+\hbox(6.94444+0.0)x22.50005, direction TLT
.\pdfcolorstack 0 push {0.1 0.2 0.3 rg 0.1 0.2 0.3 RG}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
@@ -41,7 +41,7 @@ l. ... }
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(6.94444+0.0)x22.50005
+\hbox(6.94444+0.0)x22.50005, direction TLT
.\pdfcolorstack 0 push {0.1 0.2 0.3 0.4 k 0.1 0.2 0.3 0.4 K}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
@@ -53,7 +53,7 @@ l. ... }
<argument> \l_tmpa_box
l. ... }
> \box...=
-\hbox(6.94444+0.0)x22.50005
+\hbox(6.94444+0.0)x22.50005, direction TLT
.\pdfcolorstack 0 push {0.181 g 0.181 G}
.\OT1/cmr/m/n/10 H
.\OT1/cmr/m/n/10 e
@@ -252,6 +252,7 @@ Defining \__color_parse_model_BarToneCIELAB:w on line ..
Defining \__color_backend_fill_BarToneCIELAB:n on line ...
Defining \__color_backend_stroke_BarToneCIELAB:n on line ...
Defining \__color_backend_select_BarToneCIELAB:n on line ...
+Defining \c__pdf_backend_object___color_illuminant_CIELAB_d65_int on line ..
Defining \__color_convert_BarToneCIELAB_cmyk:w on line ...
Defining \__color_convert_BarToneCIELAB_rgb:w on line ...
Defining \__color_convert_BarToneCIELAB_gray:w on line ...
diff --git a/l3kernel/testfiles/m3color003.tlg b/l3kernel/testfiles/m3color003.tlg
index 75ebddf83..b4f315a37 100644
--- a/l3kernel/testfiles/m3color003.tlg
+++ b/l3kernel/testfiles/m3color003.tlg
@@ -252,6 +252,7 @@ Defining \__color_parse_model_BarToneCIELAB:w on line ..
Defining \__color_backend_fill_BarToneCIELAB:n on line ...
Defining \__color_backend_stroke_BarToneCIELAB:n on line ...
Defining \__color_backend_select_BarToneCIELAB:n on line ...
+Defining \c__pdf_backend_object___color_illuminant_CIELAB_d65_int on line ..
Defining \__color_convert_BarToneCIELAB_cmyk:w on line ...
Defining \__color_convert_BarToneCIELAB_rgb:w on line ...
Defining \__color_convert_BarToneCIELAB_gray:w on line ...
diff --git a/l3kernel/testfiles/m3color003.xetex.tlg b/l3kernel/testfiles/m3color003.xetex.tlg
index 87b146906..49013bcae 100644
--- a/l3kernel/testfiles/m3color003.xetex.tlg
+++ b/l3kernel/testfiles/m3color003.xetex.tlg
@@ -252,6 +252,7 @@ Defining \__color_parse_model_BarToneCIELAB:w on line ..
Defining \__color_backend_fill_BarToneCIELAB:n on line ...
Defining \__color_backend_stroke_BarToneCIELAB:n on line ...
Defining \__color_backend_select_BarToneCIELAB:n on line ...
+Defining \c__pdf_backend_object___color_illuminant_CIELAB_d65_int on line ..
Defining \__color_convert_BarToneCIELAB_cmyk:w on line ...
Defining \__color_convert_BarToneCIELAB_rgb:w on line ...
Defining \__color_convert_BarToneCIELAB_gray:w on line ...
diff --git a/l3experimental/l3pdf/testfiles/m3pdf001.lvt b/l3kernel/testfiles/m3pdf001.lvt
similarity index 92%
rename from l3experimental/l3pdf/testfiles/m3pdf001.lvt
rename to l3kernel/testfiles/m3pdf001.lvt
index 06a9a72a3..4eed17ecd 100644
--- a/l3experimental/l3pdf/testfiles/m3pdf001.lvt
+++ b/l3kernel/testfiles/m3pdf001.lvt
@@ -1,5 +1,7 @@
+\documentclass{article}
\input{regression-test}
-\RequirePackage{l3pdf}
+
+\begin{document}
\START
\AUTHOR{Ulrike Fischer, Joseph Wright}
diff --git a/l3experimental/l3pdf/testfiles/m3pdf001.ptex.tlg b/l3kernel/testfiles/m3pdf001.ptex.tlg
similarity index 100%
rename from l3experimental/l3pdf/testfiles/m3pdf001.ptex.tlg
rename to l3kernel/testfiles/m3pdf001.ptex.tlg
diff --git a/l3experimental/l3pdf/testfiles/m3pdf001.tlg b/l3kernel/testfiles/m3pdf001.tlg
similarity index 100%
rename from l3experimental/l3pdf/testfiles/m3pdf001.tlg
rename to l3kernel/testfiles/m3pdf001.tlg
diff --git a/l3experimental/l3pdf/testfiles/m3pdf001.uptex.tlg b/l3kernel/testfiles/m3pdf001.uptex.tlg
similarity index 100%
rename from l3experimental/l3pdf/testfiles/m3pdf001.uptex.tlg
rename to l3kernel/testfiles/m3pdf001.uptex.tlg
diff --git a/l3experimental/l3pdf/testfiles/m3pdf002.lvt b/l3kernel/testfiles/m3pdf002.lvt
similarity index 89%
rename from l3experimental/l3pdf/testfiles/m3pdf002.lvt
rename to l3kernel/testfiles/m3pdf002.lvt
index a813704df..6954b55d4 100644
--- a/l3experimental/l3pdf/testfiles/m3pdf002.lvt
+++ b/l3kernel/testfiles/m3pdf002.lvt
@@ -1,6 +1,5 @@
\input{regression-test}
\documentclass{article}
-\usepackage{l3pdf}
\begin{document}
\START
\ExplSyntaxOn
@@ -9,4 +8,5 @@
\pdf_object_if_exist:nTF{dontexist}{\iow_term:n{true}}{\iow_term:n{false}}
\ExplSyntaxOff
abc
+\OMIT
\end{document}
\ No newline at end of file
diff --git a/l3experimental/l3pdf/testfiles/m3pdf002.tlg b/l3kernel/testfiles/m3pdf002.tlg
similarity index 85%
rename from l3experimental/l3pdf/testfiles/m3pdf002.tlg
rename to l3kernel/testfiles/m3pdf002.tlg
index 114885c2b..7bd73853f 100644
--- a/l3experimental/l3pdf/testfiles/m3pdf002.tlg
+++ b/l3kernel/testfiles/m3pdf002.tlg
@@ -2,5 +2,3 @@ This is a generated file for the LaTeX (2e + expl3) validation system.
Don't change this file in any respect.
true
false
-[1
-] (m3pdf002.aux)
diff --git a/l3kernel/testfiles/m3peek001.lvt b/l3kernel/testfiles/m3peek001.lvt
index 98c0c680f..ccb4b3c49 100644
--- a/l3kernel/testfiles/m3peek001.lvt
+++ b/l3kernel/testfiles/m3peek001.lvt
@@ -7,6 +7,7 @@
\RequirePackage[enable-debug]{expl3}
\ExplSyntaxOn
+\TYPE { \meaning \l_peek_token }
\debug_on:n { check-declarations , deprecation , log-functions }
\ExplSyntaxOff
diff --git a/l3kernel/testfiles/m3peek001.tlg b/l3kernel/testfiles/m3peek001.tlg
index b3b44f405..f7bf7f172 100644
--- a/l3kernel/testfiles/m3peek001.tlg
+++ b/l3kernel/testfiles/m3peek001.tlg
@@ -6,7 +6,7 @@ TEST 1: peek after
============================================================
the letter l
the letter g
-the character [
+begin-group character {
the letter g
============================================================
============================================================
diff --git a/l3kernel/testfiles/m3peek002.tlg b/l3kernel/testfiles/m3peek002.tlg
index a553260a8..48aaab89f 100644
--- a/l3kernel/testfiles/m3peek002.tlg
+++ b/l3kernel/testfiles/m3peek002.tlg
@@ -14,7 +14,7 @@ l. ... }
l. ... }
\outer macro:->
\long\outer macro:->
-the character [
+begin-group character {
\long\outer macro:->
============================================================
============================================================
diff --git a/l3kernel/testfiles/m3quark001.tlg b/l3kernel/testfiles/m3quark001.tlg
index 2e6a7aab7..2f0cc9406 100644
--- a/l3kernel/testfiles/m3quark001.tlg
+++ b/l3kernel/testfiles/m3quark001.tlg
@@ -135,6 +135,7 @@ already been used for a scan mark.
\s__tl
\s__color_stop
\s__color_mark
+\s__pdf_stop
\s__text_stop
\s__bool_mark
\s__bool_stop
More information about the latex3-commits
mailing list.