[latex3-commits] [git/LaTeX3-latex3-latex3] pdf: Move l3pdf to stable (14953ff3b)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Mar 16 11:03:57 CET 2020
Repository : https://github.com/latex3/latex3
On branch : pdf
Link : https://github.com/latex3/latex3/commit/14953ff3bd5ac11365d4500d2e645b24bd086461
>---------------------------------------------------------------
commit 14953ff3bd5ac11365d4500d2e645b24bd086461
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Mar 16 09:59:50 2020 +0000
Move l3pdf to stable
This leaves a stub package for experimental additions:
currently empty but likely to grow soon.
>---------------------------------------------------------------
14953ff3bd5ac11365d4500d2e645b24bd086461
l3experimental/CHANGELOG.md | 3 +
l3experimental/l3pdf/l3pdf-addn.dtx | 87 ++++++++++++++++++++++
l3experimental/l3pdf/l3pdf-code.tex | 4 +-
l3experimental/l3pdf/l3pdf.ins | 2 +-
l3kernel/CHANGELOG.md | 3 +
l3kernel/doc/source3body.tex | 1 +
l3kernel/l3.ins | 1 +
l3kernel/l3format.ins | 1 +
{l3experimental/l3pdf => l3kernel}/l3pdf.dtx | 9 ---
.../l3pdf => l3kernel}/testfiles/m3pdf001.lvt | 2 +-
.../l3pdf => l3kernel}/testfiles/m3pdf001.ptex.tlg | 0
.../l3pdf => l3kernel}/testfiles/m3pdf001.tlg | 0
.../testfiles/m3pdf001.uptex.tlg | 0
13 files changed, 100 insertions(+), 13 deletions(-)
diff --git a/l3experimental/CHANGELOG.md b/l3experimental/CHANGELOG.md
index ccdcd90df..e54e4ebbd 100644
--- a/l3experimental/CHANGELOG.md
+++ b/l3experimental/CHANGELOG.md
@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+### Changed
+- Moved core `l3pdf` code to the kernel
+
## [2020-01-12]
### Changed
diff --git a/l3experimental/l3pdf/l3pdf-addn.dtx b/l3experimental/l3pdf/l3pdf-addn.dtx
new file mode 100644
index 000000000..d4db2aa01
--- /dev/null
+++ b/l3experimental/l3pdf/l3pdf-addn.dtx
@@ -0,0 +1,87 @@
+% \iffalse meta-comment
+%
+%% File: l3pdf-addn.dtx
+%
+% Copyright(C) 2020 The LaTeX3 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.
+%
+%<*driver|package>
+\RequirePackage{expl3}
+%</driver|package>
+%<*driver>
+\documentclass[full]{l3doc}
+\begin{document}
+ \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \title{^^A
+% The \pkg{l3pdf} package\\ Additional PDF support^^A
+% }
+%
+% \author{^^A
+% The \LaTeX3 Project\thanks
+% {^^A
+% E-mail:
+% \href{mailto:latex-team at latex-project.org}
+% {latex-team at latex-project.org}^^A
+% }^^A
+% }
+%
+% \date{Released 2020-01-12}
+%
+% \maketitle
+%
+% \begin{documentation}
+%
+% \section{\pkg{l3pdf} documentation}
+%
+% This package provides support for PDF operations. Core concepts in this
+% area are part of \pkg{l3kernel} from the \texttt{l3pdf.dtx} source.
+%
+% \end{documentation}
+%
+% \begin{implementation}
+%
+% \section{\pkg{l3pdf-addn} implementation}
+%
+% \begin{macrocode}
+%<*initex|package>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<@@=pdf>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*package>
+\ProvidesExplPackage{l3pdf}{2020-01-12}{}
+ {L3 Experimental additional PDF support}
+%</package>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</initex|package>
+% \end{macrocode}
+%
+% \end{implementation}
+%
+% \PrintIndex
diff --git a/l3experimental/l3pdf/l3pdf-code.tex b/l3experimental/l3pdf/l3pdf-code.tex
index a93342f1f..4d0fa04b4 100644
--- a/l3experimental/l3pdf/l3pdf-code.tex
+++ b/l3experimental/l3pdf/l3pdf-code.tex
@@ -2,7 +2,7 @@
File: l3pdf-code.tex
-Copyright (C) 2019 The LaTeX3 Project
+Copyright (C) 2019,2020 The LaTeX3 Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -38,7 +38,7 @@ for those people who are interested.
\ExplSyntaxOn
\clist_gput_right:Nn \g_docinput_clist
{
- l3pdf.dtx ,
+ l3pdf-addn.dtx ,
}
\ExplSyntaxOff
diff --git a/l3experimental/l3pdf/l3pdf.ins b/l3experimental/l3pdf/l3pdf.ins
index e325be452..1fc283820 100644
--- a/l3experimental/l3pdf/l3pdf.ins
+++ b/l3experimental/l3pdf/l3pdf.ins
@@ -54,7 +54,7 @@ and all files in that bundle must be distributed together.
\keepsilent
\generate{\file{l3pdf.sty}
- {\from{l3pdf.dtx}{package}}
+ {\from{l3pdf-addn.dtx}{package}}
}
\endbatchfile
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 39bd31ed0..6e09c5d88 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -10,6 +10,9 @@ this project uses date-based 'snapshot' version identifiers.
### Added
- Control for start-of-titecasing: see `\l_text_titlecase_check_letter_bool`
+### Changed
+- Moved `l3pdf` core code to the kernel
+
### Fixed
- Nesting of `\seq_shuffle:N` in another sequence mapping (issue #687)
diff --git a/l3kernel/doc/source3body.tex b/l3kernel/doc/source3body.tex
index 4edd3d5b6..4cfde00cf 100644
--- a/l3kernel/doc/source3body.tex
+++ b/l3kernel/doc/source3body.tex
@@ -492,6 +492,7 @@ used on top of \LaTeXe{} if \cs{outer} tokens are used in the arguments.
l3text-purify.dtx
}
\ExplSyntaxOff
+\DocInput{l3pdf.dtx}
\DocInput{l3legacy.dtx}
\DocInput{l3candidates.dtx}
diff --git a/l3kernel/l3.ins b/l3kernel/l3.ins
index 86d4ac528..669d5a603 100644
--- a/l3kernel/l3.ins
+++ b/l3kernel/l3.ins
@@ -107,6 +107,7 @@ and all files in that bundle must be distributed together.
\from{l3text.dtx} {package}
\from{l3text-case.dtx} {package}
\from{l3text-purify.dtx}{package}
+ \from{l3pdf.dtx} {package}
\from{l3candidates.dtx} {package}
\from{l3legacy.dtx} {package}
\from{l3deprecation.dtx}{package,kernel}
diff --git a/l3kernel/l3format.ins b/l3kernel/l3format.ins
index a4f728a0d..2529b4be2 100644
--- a/l3kernel/l3format.ins
+++ b/l3kernel/l3format.ins
@@ -107,6 +107,7 @@ and all files in that bundle must be distributed together.
\from{l3text.dtx} {initex}
\from{l3text-case.dtx} {initex}
\from{l3text-purify.dtx}{initex}
+ \from{l3pdf.dtx} {initex}
\from{l3candidates.dtx} {initex}
% ======== FORMAT ONLY =========
\from{l3final.dtx} {initex}
diff --git a/l3experimental/l3pdf/l3pdf.dtx b/l3kernel/l3pdf.dtx
similarity index 98%
rename from l3experimental/l3pdf/l3pdf.dtx
rename to l3kernel/l3pdf.dtx
index dc36f172f..72284895d 100644
--- a/l3experimental/l3pdf/l3pdf.dtx
+++ b/l3kernel/l3pdf.dtx
@@ -183,25 +183,16 @@
%<@@=pdf>
% \end{macrocode}
%
-% \begin{macrocode}
-%<*package>
-\ProvidesExplPackage{l3pdf}{2020-01-12}{}
- {L3 Experimental core PDF support}
-%</package>
-% \end{macrocode}
-%
% \begin{variable}{\g_@@_init_bool}
% A flag so we have some chance of avoiding setting things we are not
% allowed to.
% \begin{macrocode}
\bool_new:N \g_@@_init_bool
-%<*package>
\cs_if_exist:NT \documentclass
{
\AtBeginDocument
{ \bool_gset_true:N \g_@@_init_bool }
}
-%</package>
% \end{macrocode}
% \end{variable}
%
diff --git a/l3experimental/l3pdf/testfiles/m3pdf001.lvt b/l3kernel/testfiles/m3pdf001.lvt
similarity index 95%
rename from l3experimental/l3pdf/testfiles/m3pdf001.lvt
rename to l3kernel/testfiles/m3pdf001.lvt
index 06a9a72a3..fca5577e9 100644
--- a/l3experimental/l3pdf/testfiles/m3pdf001.lvt
+++ b/l3kernel/testfiles/m3pdf001.lvt
@@ -1,5 +1,5 @@
\input{regression-test}
-\RequirePackage{l3pdf}
+
\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
More information about the latex3-commits
mailing list.