summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-05-12 03:00:55 +0000
committerNorbert Preining <norbert@preining.info>2022-05-12 03:00:55 +0000
commit9486eb2bfaca439060b1097a57e2304b34d38bdd (patch)
tree5ce44e68a960e8c33d4fdf01687aef35684ba95f /macros/latex/contrib
parentf13b318e9141d8f73521ec9e249647ebb38c6510 (diff)
CTAN sync 202205120300
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/hvextern/Changes3
-rw-r--r--macros/latex/contrib/hvextern/doc/hvextern.pdfbin1202031 -> 1203772 bytes
-rw-r--r--macros/latex/contrib/hvextern/doc/hvextern.tex2
-rw-r--r--macros/latex/contrib/hvextern/latex/hvextern.sty60
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md14
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/README.md2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty85
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdfbin953205 -> 953118 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty45
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx14
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdfbin682266 -> 682110 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdfbin577668 -> 577528 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdfbin505453 -> 505145 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdfbin546718 -> 546572 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdfbin529759 -> 529620 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdfbin532962 -> 532810 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdfbin525157 -> 524996 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdfbin580589 -> 580444 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdfbin504397 -> 504246 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdfbin738865 -> 738718 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdfbin551991 -> 551839 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx18
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdfbin648894 -> 673287 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx102
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdfbin665456 -> 672124 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdfbin517099 -> 517003 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdfbin417162 -> 416870 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx9
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdfbin572975 -> 573044 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdfbin385375 -> 385112 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx52
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdfbin424423 -> 419517 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx10
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdfbin445975 -> 445946 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty2
-rw-r--r--macros/latex/contrib/tagpdf/README.md4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-backend.dtx14
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-checks.dtx18
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-code.pdfbin1195004 -> 1206588 bytes
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-code.tex6
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx20
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx16
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx33
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-roles.dtx10
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-space.dtx10
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-struct.dtx51
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-tree.dtx12
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-user.dtx10
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.dtx31
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.ins12
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.pdfbin486212 -> 488517 bytes
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.tex27
-rw-r--r--macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty9
-rw-r--r--macros/latex/contrib/univie-ling/README6
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdfbin456033 -> 456124 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex6
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdfbin450553 -> 450599 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex6
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdfbin455886 -> 455994 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex6
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdfbin340866 -> 340885 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex3
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls4
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls4
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls4
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls2
83 files changed, 532 insertions, 258 deletions
diff --git a/macros/latex/contrib/hvextern/Changes b/macros/latex/contrib/hvextern/Changes
index 0204c888fb..964577b7fa 100644
--- a/macros/latex/contrib/hvextern/Changes
+++ b/macros/latex/contrib/hvextern/Changes
@@ -1,5 +1,8 @@
hvextern.sty ----------------
+v 0.24 2022-05-11 - fix introduced bug for \hv@rm
+ - added tcolorbox support for \runExtCmd
+ . added keywords pagesep and mpsep
v 0.23 2022-05-08 - added \runExtCmd
- added doctype shell
v 0.22 2022-05-05 - added mpvalign, tclbox
diff --git a/macros/latex/contrib/hvextern/doc/hvextern.pdf b/macros/latex/contrib/hvextern/doc/hvextern.pdf
index c521b487ea..60f1d77645 100644
--- a/macros/latex/contrib/hvextern/doc/hvextern.pdf
+++ b/macros/latex/contrib/hvextern/doc/hvextern.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvextern/doc/hvextern.tex b/macros/latex/contrib/hvextern/doc/hvextern.tex
index 8c104803e6..ecc62a121f 100644
--- a/macros/latex/contrib/hvextern/doc/hvextern.tex
+++ b/macros/latex/contrib/hvextern/doc/hvextern.tex
@@ -1596,6 +1596,8 @@ already exists, there is no need to create it with the next run again and again.
\item[\Lkeyword{ExamplesDir}] move all examples into a directory
\item[\Lkeyset{tclbox=false}] Can be used if there are some negative interactions between package \Lpack{listings}
and package \Lpack{tcolorbox}.
+\item[\Lkeyword{mpsep}] Distance between code and output (default 1\,em).
+\item[\Lkeyword{pagesep}] Distance between pages for multipage output (default 1\,em).
\item[\Lkeyword{eps}] create an eps from the pdf (historical).
\end{description}
diff --git a/macros/latex/contrib/hvextern/latex/hvextern.sty b/macros/latex/contrib/hvextern/latex/hvextern.sty
index 5179123aa2..2f7fb9d6ff 100644
--- a/macros/latex/contrib/hvextern/latex/hvextern.sty
+++ b/macros/latex/contrib/hvextern/latex/hvextern.sty
@@ -11,8 +11,8 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\def\hvexternFileversion{0.23}
-\ProvidesFile{hvextern}[2022/05/08 v\hvexternFileversion: package for running external documents (HV)]
+\def\hvexternFileversion{0.24}
+\ProvidesFile{hvextern}[2022/05/11 v\hvexternFileversion: package for running external documents (HV)]
\RequirePackage{shellesc,xkeyval,graphicx,marginnote,fancyvrb,tikz,listings,ifplatform}
\RequirePackage{tcolorbox,xparse}
@@ -30,6 +30,8 @@
\newcounter{@@@runs}
\newsavebox\hv@extern@box
\newlength\hv@LineWidth
+\newlength\hv@extern@pagesep
+\newlength\hv@extern@mpsep
\AtBeginDocument{\setlength\hv@LineWidth{\dimexpr\linewidth-2\fboxsep-2\fboxrule}}
\newlength\hv@extern@mpwidth \setlength\hv@extern@mpwidth{\z@}
@@ -46,8 +48,10 @@
\define@key{hv}{caption}[]{\def\hv@extern@caption{#1}}
\define@key{hv}{label}[]{\def\hv@extern@label{#1}}
\define@key{hv}{pages}[1]{\def\hv@extern@pages{#1}}
+\define@key{hv}{pagesep}[1em]{\hv@extern@pagesep=#1}
\define@key{hv}{cropmargin}[2]{\def\hv@extern@cropmargin{#1 }}
\define@key{hv}{mpwidth}[0pt]{\setlength\hv@extern@mpwidth{#1}}
+\define@key{hv}{mpsep}[1em]{\setlength\hv@extern@mpsep{#1}}
\define@key{hv}{mpvalign}[t]{\def\hv@extern@mpvalign{#1}}
\define@key{hv}{ext}[tex]{\def\hv@extern@ext{.#1}}
\define@boolkey{hv}[hv@extern@]{redirect}[true]{}
@@ -91,7 +95,7 @@
}
\def\ResetKeys{%
- \setkeys{hv}{
+ \setkeys{hv}{%
showFilename=false,% Dateinamen im Rand angeben
ext=tex,% file extension
code=false,% show Code
@@ -118,6 +122,7 @@
caption=,% keine Caption
label=,% kein Label
pages=1,% welche Seiten auszugeben sind
+ pagesep=1em,% horizontal sep between pages
docType=latex,% LaTeX example Code
cleanup={},% Hilfsdateien nicht löschen
moveToExampleDir=false,% Verschieben nach ExamplesDir
@@ -147,7 +152,7 @@
{
\clist_map_inline:nn {#1}{\ShellEscape{\hv@rm \hv@extern@ExamplesDir\hvExternDateiname.##1}}
\ifnum\hv@extern@compilerNo=0\relax % we have metapost
- \hv@rm epsf.*
+ \ShellEscape{\hv@rm\space epsf.*}%
\fi
}
\NewDocumentCommand\run@hv@extern@sequenceList{ m }
@@ -163,6 +168,7 @@
\tcbset{breakable,left=2pt,right=2pt,top=2pt,bottom=2pt,boxsep=0pt}
\newcommand\PreambleVerbatim[2][]{%
+ \hv@typeout{Running PreambleVerbatim with #1, #2}%
\ifhv@extern@tcbox
\begin{tcolorbox}\VerbatimInput[#1]{#2}\end{tcolorbox}%
\else
@@ -170,6 +176,7 @@
\fi}
\newcommand\BodyVerbatim[2][]{%
+ \hv@typeout{Running BodyVerbatim with #1, #2}%
\ifhv@extern@tcbox
\begin{tcolorbox}\VerbatimInput[#1]{#2}\end{tcolorbox}%
\else
@@ -177,13 +184,15 @@
\fi}
\newcommand\PreambleListing[2][]{%
+ \hv@typeout{Running PreambleListing with #1, #2}%
\ifhv@extern@tcbox
\begin{tcolorbox}[top=-2pt]\expandafter\lstinputlisting\expandafter[#1]{#2}\end{tcolorbox}%
- \else
+ \else
\expandafter\lstinputlisting\expandafter[#1]{#2}%
\fi}
\newcommand\BodyListing[2][]{%
+ \hv@typeout{Running BodyListing with #1, #2}%
\ifhv@extern@tcbox
\begin{tcolorbox}[top=-2pt]\expandafter\lstinputlisting\expandafter[#1]{#2}\end{tcolorbox}%
\else
@@ -321,9 +330,9 @@
\global\hv@extern@forcetrue}}}% set force, if no pdf or png exists
\begingroup
\hv@typeout{>>> writing file \hvExternDateiname\hv@extern@ext ...}%
- \filecontents[force,noheader]{\hvExternDateiname\hv@extern@ext}
+ \filecontents[force,noheader]{\hvExternDateiname\hv@extern@ext}%
}
- {\endfilecontents% \end
+ {\endfilecontents% \end%
\hv@typeout{>>> ... done}%
\global\stepcounter{hv@example@counter}%
\endgroup
@@ -383,7 +392,7 @@
% we need lstinputlisting, because \VerbatimInput doesn't work in a box
\savebox\hv@extern@box{\expandafter\lstinputlisting\expandafter[\@@@temp]{\hvExternDateiname\hv@extern@ext}}%
% \savebox\hv@extern@box{\VerbatimInput{\hvExternDateiname\hv@extern@ext}}%
- \ifdim\wd\hv@extern@box > \z@
+ \ifdim\wd\hv@extern@box > \z@\relax
\expandafter\fvset\expandafter{\hv@extern@lstOptions}%
\tcbset{colback=\hv@extern@BGpreamble,colframe=\hv@extern@BOpreamble}%
\PreambleVerbatim{\hvExternDateiname\hv@extern@ext}%
@@ -391,7 +400,7 @@
\else
\edef\@@@temp{\@nameuse{\hv@extern@docType @initPreamble}}%
\savebox\hv@extern@box{\expandafter\lstinputlisting\expandafter[\@@@temp]{\hvExternDateiname\hv@extern@ext}}%
- \ifdim\wd\hv@extern@box>\z@
+ \ifdim\wd\hv@extern@box>\z@\relax
\expandafter\lstset\expandafter{\hv@extern@lstOptions}%
\tcbset{colback=\hv@extern@BGpreamble,colframe=\hv@extern@BOpreamble}%
\PreambleListing[\@@@temp]{\hvExternDateiname\hv@extern@ext}%
@@ -447,12 +456,12 @@
\ifhv@extern@frame
\expandafter\@for\expandafter\next\expandafter:\expandafter=\hv@extern@pages\do{%
\fbox{\expandafter\includegraphics\expandafter[\hv@extern@grfOptions,page=\next]{\hv@extern@ExamplesDir\hvExternDateiname}}%
- \hspace{5pt}}\hspace*{-5pt}%
+ \hspace{\hv@extern@pagesep}}\hspace*{-\hv@extern@pagesep}%
\else
\expandafter\@for\expandafter\next\expandafter:\expandafter=\hv@extern@pages\do{%
\expandafter\includegraphics\expandafter[\hv@extern@grfOptions,page=\next]%
{\hv@extern@ExamplesDir\hvExternDateiname}%
- \hspace{5pt}}\hspace*{-5pt}%
+ \hspace{\hv@extern@pagesep}}\hspace*{-\hv@extern@pagesep}%
\fi
\ifx\hv@extern@caption\@empty\else\caption{\hv@extern@caption}\fi
\ifx\hv@extern@label\@empty\else\label{\hv@extern@label}\fi
@@ -464,11 +473,21 @@
\fi
\else% no graphic, only text
\ifdim\hv@extern@mpwidth>\z@
- \hfill\minipage[t]{\dimexpr\linewidth-\hv@extern@mpwidth-1em\relax}\vspace{0pt}
- \noindent\BodyListing{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \hfill\minipage[t]{\dimexpr\linewidth-\hv@extern@mpwidth-\hv@extern@mpsep\relax}\vspace{0pt}
+ \noindent
+ \ifhv@extern@usefancyvrb
+ \expandafter\BodyVerbatim\expandafter[\hv@extern@lstOptions]{\hv@extern@ExamplesDir\hvExternDateiname.txt}%
+ \else
+ \expandafter\BodyListing\expandafter[\hv@extern@lstOptions]{\hv@extern@ExamplesDir\hvExternDateiname.txt}%
+ \fi
\endminipage
\else
- \noindent\BodyListing{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \noindent
+ \ifhv@extern@usefancyvrb
+ \expandafter\BodyVerbatim\expandafter[\hv@extern@lstOptions]{\hv@extern@ExamplesDir\hvExternDateiname.txt}%
+ \else
+ \expandafter\BodyListing\expandafter[\hv@extern@lstOptions]{\hv@extern@ExamplesDir\hvExternDateiname.txt}%
+ \fi
\fi
\fi
\ifhv@extern@force\expandafter\run@hv@extern@cleanup\expandafter{\hv@extern@cleanup}\fi% cleanup
@@ -524,12 +543,21 @@
\ifhv@extern@float
\hv@typeout{>>>> Floating environment}%
\begin{figure}[!htb]
- \noindent\BodyListing{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \ifhv@extern@usefancyvrb
+ \expandafter\BodyVerbatim\expandafter[\hv@extern@lstOptions]{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \else
+ \expandafter\BodyListing\expandafter[\hv@extern@lstOptions]{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \fi
\ifx\hv@extern@caption\@empty\else\caption{\hv@extern@caption}\fi
\ifx\hv@extern@label\@empty\else\label{\hv@extern@label}\fi
\end{figure}
\else
- \noindent\BodyListing{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \noindent
+ \ifhv@extern@usefancyvrb
+ \expandafter\BodyVerbatim\expandafter[\hv@extern@lstOptions]{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \else
+ \expandafter\BodyListing\expandafter[\hv@extern@lstOptions]{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \fi
\fi
\fi
\ifhv@extern@force\expandafter\run@hv@extern@cleanup\expandafter{\hv@extern@cleanup}\fi% cleanup
diff --git a/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
index 2fdc3b7db6..17c90a18ae 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
+++ b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
@@ -5,6 +5,20 @@ first release 0.95a, 2021-02-23 will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
this project uses date-based 'snapshot' version identifiers.
+## [2022-05-11]
+
+### Added
+ - allow standard pdf/A-4
+ - check requirement for max-pdfversion
+ - add requirement for Info dictionary
+ - load tagpdf-base if it exists to provide the
+ tagging commands.
+
+### Fixed
+ - Support/firstaid for colorspace package
+ - Support for metadata with hyperxmp and xetex
+
+
## [2022-04-14]
### Fixed
- l3pdffield-radiobutton: handling of Opt array.
diff --git a/macros/latex/contrib/pdfmanagement-testphase/README.md b/macros/latex/contrib/pdfmanagement-testphase/README.md
index 8736e0d670..cd4af9c120 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/README.md
+++ b/macros/latex/contrib/pdfmanagement-testphase/README.md
@@ -1,6 +1,6 @@
# LaTeX PDF management testphase bundle
-Version: 0.95n, 2022-04-14
+Version: 0.95o, 2022-05-11
This package is used during a test phase to load the new PDF management code
of LaTeX.
diff --git a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
index f4f601f59f..6c06a0022d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
@@ -24,7 +24,7 @@
%% This file has the LPPL maintenance status "maintained".
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{color-ltx}[2022-04-14 v0.95n
+\ProvidesPackage{color-ltx}[2022-05-11 v0.95o
Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2022/01/06 v1.3d) (DPC)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
diff --git a/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
new file mode 100644
index 0000000000..7bef618163
--- /dev/null
+++ b/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
@@ -0,0 +1,85 @@
+%% This is file `hyperxmp-patches-tmp-ltx.sty"
+% 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 "pdfmanagement 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/pdfresources
+%
+% for those people who are interested.
+\NeedsTeXFormat{LaTeX2e}[2020/10/01]
+\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2022-05-11}{0.95o}
+ {temporay patches to for the colorspace package to test pdfresource management ... UF}
+
+\hook_gput_code:nnn {begindocument} {pdf}
+ {
+ \tl_if_exist:NT \spc@op
+ {
+ \def\spc@Pageresources#1{}
+ }
+
+ }
+
+\hook_gput_code:nnn {begindocument/end} {pdf}
+ {
+ \tl_if_exist:NT \spc@op
+ {
+ \__pdf_backend_object_new:nn {__spc_extgstate_op_false}{dict}
+ \__pdf_backend_object_write:nn
+ {__spc_extgstate_op_false}
+ {/Type /ExtGState~/op~false~/OP~false}
+ \pdfmanagement_add:nnn
+ {Page/Resources/ExtGState}
+ {SPCko}
+ {\__pdf_backend_object_ref:n {__spc_extgstate_op_false}}
+ \__pdf_backend_object_new:nn {__spc_extgstate_op_true0}{dict}
+ \__pdf_backend_object_write:nn
+ {__spc_extgstate_op_true0}
+ {/Type /ExtGState~/op~true~/OP~true~/OPM~0}%
+ \pdfmanagement_add:nnn
+ {Page/Resources/ExtGState}
+ {SPCmz}
+ {\__pdf_backend_object_ref:n {__spc_extgstate_op_true0}}
+ \__pdf_backend_object_new:nn {__spc_extgstate_op_true1}{dict}
+ \__pdf_backend_object_write:nn
+ {__spc_extgstate_op_true1}
+ {/Type /ExtGState~/op~true~/OP~true~/OPM~1}%
+ \pdfmanagement_add:nnn
+ {Page/Resources/ExtGState}
+ {SPCop}
+ {\__pdf_backend_object_ref:n {__spc_extgstate_op_true1}}
+ }
+ }
+
+\RemoveFromHook{begindocument}[colorspace]
+
+\hook_gput_code:nnn {enddocument} {pdf}
+ {
+ \def\spc@elt#1#2
+ {
+ \str_set_eq:Nc\l_tmpa_str {spc@ir@#2}
+ \seq_set_split:NnV \l_tmpa_seq {~}\l_tmpa_str
+ \seq_get_left:NN\l_tmpa_seq\l_tmpa_str
+ %remove spaces
+ \exp_args:NNx
+ \str_replace_all:Nnn\l_tmpa_str {\c_hash_str20}{~}
+ %remove slash
+ \str_set:Nx\l_tmpa_str{\str_tail:N\l_tmpa_str}
+ \pdfmanagement_add:nex
+ {Page/Resources/ColorSpace}{\l_tmpa_str}{\seq_item:Nn\l_tmpa_seq{2}~0~R}
+ }
+ \spc@csall
+ }
+
+\endinput
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
index 457ea9f1ac..e53325b827 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
@@ -83,7 +83,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -959,7 +959,7 @@
%<@@=hyp>
% \end{macrocode}
% \begin{macrocode}
-\ProvidesFile{hgeneric-testphase.def}[2022-04-14 v0.95n %
+\ProvidesFile{hgeneric-testphase.def}[2022-05-11 v0.95o %
generic Hyperref driver for the LaTeX PDF management testphase bundle]
\RequirePackage{etoolbox} %why?
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
index ece868a47f..e9b09189ed 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
index 0f0c22f831..70b83b44f8 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
@@ -19,7 +19,7 @@
%
% for those people who are interested.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2022-04-14}{0.95n}
+\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2022-05-11}{0.95o}
{Store hyperref metadata in XMP format / temporay patches to test pdfresource management ... UF}
\cs_if_exist:NT \pdfmanagement_add:nnn
@@ -45,19 +45,27 @@
}
% A standard should be retrieved from the document settings.
-\cs_new:Npn \__hypxmp_get_Astandard:w #1-#2#3#4\q_stop
+\cs_new:Npn \__hypxmp_get_Astandard:
{
- \tl_if_eq:nnT{#1}{A}
+ \exp_args:Ne \tl_if_eq:nnT{\pdfmeta_standard_item:n{type}}{A}
{
\Hy@pdfatrue
- \tl_set:Nn \@pdfapart{#2}
- \tl_set:Nx \@pdfaconformance{#3}
+ \tl_set:Nx \@pdfapart{\pdfmeta_standard_item:n{level}}
+ \tl_set:Nx \@pdfaconformance{\pdfmeta_standard_item:n{conformance}}
}
}
+% A-4 will need also the year, so we have to extend the schema
+\renewcommand*{\hyxmp@pdfa@id@schema}{%
+ \ifHy@pdfa
+ \exp_args:Nnx\hyxmp@add@simple{pdfaid:part}{\pdfmeta_standard_item:n{level}}
+ \exp_args:Nnx\hyxmp@add@simple{pdfaid:conformance}{\pdfmeta_standard_item:n{conformance}}
+ \exp_args:Nnx\hyxmp@add@simple{pdfaid:rev}{\pdfmeta_standard_item:n{year}}
+ \fi
+}
+
\cs_new_protected:Npn \__hyxmp_get_metadata:
{
- \exp_last_unbraced:Ne \__hypxmp_get_Astandard:w
- {\GetDocumentProperties{document/pdfstandard}}Z-ZZZ\q_stop
+ \__hypxmp_get_Astandard:
\clist_map_inline:nn
{
% hyperxmp keys:
@@ -146,9 +154,26 @@
\DeclareHookRule{begindocument/before}{pdfmanagement/firstaid/hyperxmp}{before}{hyperxmp}
-\AddToHook{enddocument}[pdfmanagement-firstaid]{\__hyxmp_get_metadata:}
-
-\DeclareHookRule{enddocument}{pdfmanagement-firstaid}{before}{hyperxmp}
+% hyperxmp puts the code into enddocument, but for xetex this is too late.
+% so we move that to shipout/lastpage and add our command before.
+% the luatex code must stay in enddocument as hyperxmp tries to detect the pdf size
+% there.
+\sys_if_output_dvi:TF
+ {
+ \RemoveFromHook{enddocument}[hyperxmp]
+ \AddToHook{shipout/lastpage}[pdfmanagement-firstaid]
+ {
+ \__hyxmp_get_metadata:
+ \hyxmp@auto@assign@data
+ \hyxmp@check@standards
+ \hyxmp@warn@if@no@metadata
+ \hyxmp@embed@packet
+ }
+ }
+ {
+ \AddToHook{enddocument}[pdfmanagement-firstaid]{\__hyxmp_get_metadata:}
+ \DeclareHookRule{enddocument}{pdfmanagement-firstaid}{before}{hyperxmp}
+ }
\endinput
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
index 037a8bafc9..01b288ac35 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
@@ -45,7 +45,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
%
@@ -56,27 +56,27 @@
% \begin{macrocode}
%<drivers>\ProvidesExplFile
%<*dvipdfmx>
- {l3backend-testphase-dvipdfmx.def}{2022-04-14}{}
+ {l3backend-testphase-dvipdfmx.def}{2022-05-11}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
%</dvipdfmx>
%<*dvips>
- {l3backend-testphase-dvips.def}{2022-04-14}{}
+ {l3backend-testphase-dvips.def}{2022-05-11}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
%</dvips>
%<*dvisvgm>
- {l3backend-testphase-dvisvgm.def}{2022-04-14}{}
+ {l3backend-testphase-dvisvgm.def}{2022-05-11}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm}
%</dvisvgm>
%<*luatex>
- {l3backend-testphase-luatex.def}{2022-04-14}{}
+ {l3backend-testphase-luatex.def}{2022-05-11}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
%</luatex>
%<*pdftex>
- {l3backend-testphase-pdftex.def}{2022-04-14}{}
+ {l3backend-testphase-pdftex.def}{2022-05-11}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
%</pdftex>
%<*xdvipdfmx>
- {l3backend-testphase-xetex.def}{2022-04-14}{}
+ {l3backend-testphase-xetex.def}{2022-05-11}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
%</xdvipdfmx>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
index 1aa7e6c3db..66cb1d1802 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
index 457064953c..400491b8b8 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -433,7 +433,7 @@
% \begin{macrocode}
%<@@=pdfannot>
%<*header>
-\ProvidesExplPackage{l3pdfannot}{2022-04-14}{0.95n}
+\ProvidesExplPackage{l3pdfannot}{2022-05-11}{0.95o}
{PDF-annotations}
\RequirePackage{l3pdfdict}
%</header>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
index bf4b4345d3..32a8dd415c 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
index e2ed2c3538..fe33565a75 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -209,7 +209,7 @@
% \begin{macrocode}
%<@@=pdfdict>
%<*header>
-\ProvidesExplPackage{l3pdfdict}{2022-04-14}{0.95n}
+\ProvidesExplPackage{l3pdfdict}{2022-05-11}{0.95o}
{Tools for PDF dictionaries (LaTeX PDF management testphase bundle)}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
index ee05142d22..35b00b95f9 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
index 55874dd701..118efcafb2 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
index 64c16f44cc..86c2d6f152 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
index 7cd1b617f7..d6e1fb4eea 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
@@ -65,7 +65,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
index 97d02b4e2f..b9d68650c9 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
index 121c60b745..f88609ecf3 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
index 19932cc3ee..c0b2c70235 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
index 0cd494954e..97796862fd 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
@@ -56,7 +56,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
index 9cc07a6694..01babfc72d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
index a395088e4c..274aed4db7 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
@@ -84,7 +84,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
index 2491fbbfb1..e801b9aa75 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
index c0f5e4dbea..289a720df0 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
index 2186636cbd..7fb1850255 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
index 4fe5de4219..309b5da3ba 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
@@ -70,7 +70,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -974,7 +974,7 @@
%<*package>
%<@@=pdffield>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{l3pdffield-testphase}{2022-04-14}{0.95n}%
+\ProvidesExplPackage{l3pdffield-testphase}{2022-05-11}{0.95o}%
{form fields}
% \end{macrocode}
% \subsection{hyperref specific command}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
index 3d4ee635c8..7c7b151522 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
index 2adc7fe617..6a6012cb61 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -397,7 +397,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage{l3pdffile}{2022-04-14}{0.95n}
+\ProvidesExplPackage{l3pdffile}{2022-05-11}{0.95o}
{embedding and referencing files in PDF---LaTeX PDF management testphase bundle}
\RequirePackage{l3pdftools} %temporarly!!
%</header>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
index 4b28a34f38..d4b1823bf6 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
index fb8ca853e0..d5546bf702 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
@@ -58,7 +58,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -360,6 +360,20 @@
% Values added to \texttt{ThisPage} can not be removed. It is not possible to
% show the content of this dictionary with \cs{pdfmanagement_show:n}.
% \end{function}
+%
+% \paragraph{Changing the \texttt{/MediaBox}}: It is possible to change
+% the \texttt{/MediaBox} of one or more pages by setting it for the \texttt{Page}
+% or \texttt{ThisPage} path (using \texttt{Pages} doesn't work, the engines
+% overwrite this)---this works even with dvips and allows to create
+% pages of different sizes. But you must be careful with the values.
+% If you set e.g. with pdflatex \cs{pdfpageheight} to 300bp you get a mediabox of
+% |0 0 595 300|, but pdflatex measure from the top and will also move
+% the reference point up, so effectivly
+% you get the \emph{upper} third of the page. If you set the \texttt{/MediaBox}
+% to |0 0 595 300| with \cs{pdfmanagement_add:nnn} you get the \emph{lower} third.
+% In general it is better to use only the primitive commands to avoid confusing
+% results.
+%
% \subsubsection{\enquote{Page/Resources}: ExtGState, ColorSpace, Shading, Pattern}
% \begin{NOTE}{UF}
% Only for pdf/luatex and xdvipdfmx backend- and pdf-code is needed to add values
@@ -619,7 +633,7 @@
%<@@=pdfmanagement>
%<*header>
%
-\ProvidesExplPackage{l3pdfmanagement}{2022-04-14}{0.95n}
+\ProvidesExplPackage{l3pdfmanagement}{2022-05-11}{0.95o}
{Management of core PDF dictionaries (LaTeX PDF management testphase bundle)}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
index 0f011fc723..ca57671fa3 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
index 77b69fad2d..778141f7ae 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -222,17 +222,45 @@
% tested from TeX, but in a current LaTeX normally ToUnicode are set for all fonts.
% \item[|tagged|] that is set in A-2a and A-3a and means that the pdf must be
% tagged. This is currently neither tested not enforced somewhere.
+% \item[|Trailer_no_Info|] The \texttt{Info} dictionary
+% has been deprecated since quite some time. Metadata should be set with
+% XMP-data instead. In PDF A-4 now the \texttt{Info} dictionary
+% shall not be present in the trailer dictionary at all
+% (unless there exists a PieceInfo entry in the Catalog). And if it is present
+% it should only contain the \texttt{/ModDate} entry. The engines
+% do not offer currently an option to suppress the dictionary completly,
+% one can only give the entries the value null (it only works for all entries
+% with lualatex and pdflatex). The next pdflatex will offer \cs{pdfomitinfodict}.
+% Until then l3pdfmeta does nothing with this requirement.
+%
% \end{description}
%
% \subsubsection{Tests with values and special handlers}
%
% \begin{description}
%
-% \item[|min_pdf_version|] stores the minimal PDF version.
+% \item[|min_pdf_version|] stores the minimal PDF version needed for
+% a standard.
+% It should be checked against the current PDF version (\cs{pdf_version:}).
+% A failure means that the version should be changed.
+% Currently there is only one hard requirement which leads to a failure in
+% a validator like verapdf: The A-4 standard should use PDF 2.0.
+% As PDF A-1 is based on PDF 1.4 and PDF A-2 and A-3 are based
+% on PDF 1.7 \pkg{l3pdfmeta} also sets these versions also as requirements.
+% These requirements are checked by \pkg{l3pdfmeta} when the version is set with
+% \cs{DocumentMetadata} and a warning is issued (but the version is
+% not changed). More checks are only needed if the version is changed later.
+%
+%
+% \item[|max_pdf_version|] stores the maximal PDF version.
% It should be checked against the current PDF version (\cs{pdf_version:}).
% A failure means that the version should be changed.
-% This check is done by \pkg{l3pdfmeta} when the version is set with
-% \cs{DocumentMetadata} so more checks are only needed if the version is changed later.
+% The check is currently relevant only for the A-1 to A-3 standards:
+% PDF 2.0 leads to a failure in a validator like verapdf so the maximal
+% version should be PDF 1.7.
+% This requirement is checked by \pkg{l3pdfmeta} when the version is set with
+% \cs{DocumentMetadata} and a warning is issued (but the version is
+% not changed). More checks are only needed if the version is changed later.
%
% \item[|named_actions|] this requirement restricts the list of
% allowed named actions to |NextPage|, |PrevPage|, |FirstPage|, |LastPage|.
@@ -353,7 +381,7 @@
% \begin{macrocode}
%<@@=pdfmeta>
%<*header>
-\ProvidesExplPackage{l3pdfmeta}{2022-04-14}{0.95n}
+\ProvidesExplPackage{l3pdfmeta}{2022-05-11}{0.95o}
{PDF-Standards---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
@@ -362,6 +390,11 @@
%<*package>
\msg_new:nnn {pdf }{unknown-standard}{The~standard~'#1'~is~unknown~and~has~been~ignored}
% \end{macrocode}
+% Message for not fitting pdf version
+% \begin{macrocode}
+\msg_new:nnn {pdf }{wrong-pdfversion}
+ {PDF~version~#1~is~too~#2~for~standard~'#3'.}
+% \end{macrocode}
% \begin{variable}{\l_@@_tmpa_tl,\l_@@_tmpb_tl,\l_@@_tmpa_str}
% \begin{macrocode}
\tl_new:N\l_@@_tmpa_tl
@@ -456,6 +489,19 @@
}
% \end{macrocode}
% \end{macro}
+% The next is the counter part and checks that the version is not to high
+% \begin{macro}{\@@_standard_verify_handler_max_pdf_version:nn}
+% \begin{macrocode}
+%
+\cs_new_protected:Npn \@@_standard_verify_handler_max_pdf_version:nn #1 #2
+ {
+ \pdf_version_compare:NnTF >
+ { #2 }
+ {\prg_return_false:}
+ {\prg_return_true:}
+ }
+% \end{macrocode}
+% \end{macro}
% The next checks if the user value is in the list and returns a failure if not.
% \begin{macro}{\@@_standard_verify_handler_named_actions:nn}
% \begin{macrocode}
@@ -515,9 +561,30 @@
{
\pdfmeta_standard_verify:nF { annot_flags }
{ \@@_verify_pdfa_annot_flags: }
+ \pdfmeta_standard_verify:nnF { min_pdf_version }
+ { \pdf_version: }
+ { \msg_warning:nnxxx {pdf}{wrong-pdfversion}
+ {\pdf_version:}{low}
+ {
+ \pdfmeta_standard_item:n{type}
+ -
+ \pdfmeta_standard_item:n{level}
+ }
+ }
+ \pdfmeta_standard_verify:nnF { max_pdf_version }
+ { \pdf_version: }
+ { \msg_warning:nnxxx {pdf}{wrong-pdfversion}
+ {\pdf_version:}{high}
+ {
+ \pdfmeta_standard_item:n{type}
+ -
+ \pdfmeta_standard_item:n{level}
+ }
+ }
}
% \end{macrocode}
%
+%
% \subsubsection{pdf/A}
% We use global properties so that follow up standards can be
% copied and then adjusted.
@@ -531,6 +598,7 @@
% \g_@@_standard_pdf/A-3A_prop ,
% \g_@@_standard_pdf/A-3B_prop ,
% \g_@@_standard_pdf/A-3U_prop ,
+% \g_@@_standard_pdf/A-4_prop ,
% }
% \begin{macrocode}
\prop_new:c { g_@@_standard_pdf/A-1B_prop }
@@ -542,6 +610,7 @@
,conformance = B
,year = 2005
,min_pdf_version = 1.4 %minimum
+ ,max_pdf_version = 1.4 %minimum
,no_encryption =
,no_external_content = % no F, FFilter, or FDecodeParms in stream dicts
,no_embed_content = % no EF key in filespec, no /Type/EmbeddedFiles
@@ -605,7 +674,8 @@
\prop_gremove:cn
{ g_@@_standard_pdf/A-2B_prop }
{ embed_content}
-
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-2B_prop }{max_pdf_version}{1.7}
%A-2u ==============
\prop_new:c { g_@@_standard_pdf/A-2U_prop }
\prop_gset_eq:cc
@@ -669,6 +739,26 @@
{ g_@@_standard_pdf/A-3A_prop }{conformance}{A}
\prop_gput:cnn
{ g_@@_standard_pdf/A-3A_prop }{tagged}{}
+
+%A-4 ==============
+\prop_new:c { g_@@_standard_pdf/A-4_prop }
+\prop_gset_eq:cc
+ { g_@@_standard_pdf/A-4_prop }
+ { g_@@_standard_pdf/A-3U_prop }
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-4_prop }{name}{pdf/A-4}
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-4_prop }{level}{4}
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-4_prop }{min_pdf_version}{2.0}
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-4_prop }{year}{2020}
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-4_prop }{Trailer_no_Info}{}
+\prop_gremove:cn
+ { g_@@_standard_pdf/A-4_prop }{conformance}
+\prop_gremove:cn
+ { g_@@_standard_pdf/A-4_prop }{max_pdf_version}
% \end{macrocode}
% \end{variable}
%
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
index 871b6574a7..dc32159920 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
index f56714fbd9..23162ff2f6 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -212,7 +212,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage{l3pdftools}{2022-04-14}{0.95n}
+\ProvidesExplPackage{l3pdftools}{2022-05-11}{0.95o}
{candidate commands for l3pdf---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
index 52a5c22d76..c6ed4aab27 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
index 32b45966fc..2e4419950d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -133,7 +133,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*header>
-\ProvidesExplPackage{l3pdfxform}{2022-04-14}{0.95n}
+\ProvidesExplPackage{l3pdfxform}{2022-05-11}{0.95o}
{command to create xforms (beta)---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
index 0d638715ae..8465858cd8 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
index d7b4224aa5..0fc6be4031 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -117,7 +117,8 @@
% e.g., \texttt{lang=de-DE}. If not given the default value used is |en-US|.
%
% \item[\texttt{pdfstandard}] Choice key to set the pdf standard.
-% Currently |A-1b|, |A-2a|, |A-2b|, |A-2u|, |A-3a|, |A-3b| and |A-3u| are accepted as
+% Currently |A-1b|, |A-2a|, |A-2b|, |A-2u|, |A-3a|, |A-3b|, |A-3u| and |A-4|
+% are accepted as
% values. The casing is irrelevant, |a-1b| works too.
% The underlying code to ensure the requirements (as far as they
% can be ensured) is still incomplete, but a color profile is included and the
@@ -216,7 +217,7 @@
% \begin{macrocode}
%<@@=pdfmanagement>
%<*header>
-\ProvidesExplPackage{ltdocinit}{2022-04-14}{0.95n}
+\ProvidesExplPackage{ltdocinit}{2022-05-11}{0.95o}
{Initialize document metadata}
%</header>
% \end{macrocode}
@@ -278,7 +279,7 @@
\keys_set:nn {document / metadata} {_pdfstandard=\str_uppercase:n{#1}}
}
,_pdfstandard .choices:nn =
- {A-1B,A-2A,A-2B,A-2U,A-3A,A-3B,A-3U}
+ {A-1B,A-2A,A-2B,A-2U,A-3A,A-3B,A-3U,A-4}
{
\prop_if_exist:cT { g__pdfmeta_standard_pdf/#1_prop }
{
diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
index a0e1e9c6c0..f62e767f59 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
index 5e80a4566b..be6f8518c0 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty
index 6cabadb5a0..337cc6c4cc 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty
@@ -22,7 +22,7 @@
%% This work consists of the main source file pdflscape-ltx.sty
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{pdflscape-ltx}{2022-04-14}{0.95n}
+\ProvidesExplPackage{pdflscape-ltx}{2022-05-11}{0.95o}
{Display of landscape pages in PDF - adaption of pdflscape to the PDFmanagement bundle (testphase)}
\DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
index 15fc8cf38b..009f1bf07f 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -64,11 +64,11 @@
% |debug={firstaidoff={name1,name2,...},...}|.
% \begin{macrocode}
%<*package>
-\ProvidesExplPackage{pdfmanagement-firstaid}{2022-04-14}{0.95n}
+\ProvidesExplPackage{pdfmanagement-firstaid}{2022-05-11}{0.95o}
{LaTeX PDF management testphase bundle / firstaid-patches}
%<@@=pdfmanagement>
-\clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor,color,beamer,output}
+\clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor,color,beamer,output,colorspace}
{
\bool_new:c { g_@@_firstaid_#1_bool }
\bool_gset_true:c { g_@@_firstaid_#1_bool }
@@ -291,48 +291,14 @@
% as colorspace uses temporary macros whose contents is lost.
% \begin{macrocode}
%<*package>
-%<@@=pdf>
-% this must be earlier, to avoid problems with luatex which has two pageresources
-% lua/tex
-\hook_gput_code:nnn {begindocument} {pdf}
- {
- \tl_if_exist:NT \spc@op
- {
- \def\spc@Pageresources#1{}
- }
-
- }
-
-\hook_gput_code:nnn {begindocument/end} {pdf}
- {
- \tl_if_exist:NT \spc@op
+\bool_if:NT \g_@@_firstaid_colorspace_bool
+ {
+ \AddToHook
{
- \@@_backend_object_new:nn {__spc_extgstate_op_false}{dict}
- \@@_backend_object_write:nn
- {__spc_extgstate_op_false}
- {/Type /ExtGState~/op~false~/OP~false}
- \pdfmanagement_add:nnn
- {Page/Resources/ExtGState}
- {SPCko}
- {\@@_backend_object_ref:n {__spc_extgstate_op_false}}
- \@@_backend_object_new:nn {__spc_extgstate_op_true0}{dict}
- \@@_backend_object_write:nn
- {__spc_extgstate_op_true0}
- {/Type /ExtGState~/op~true~/OP~true~/OPM~0}%
- \pdfmanagement_add:nnn
- {Page/Resources/ExtGState}
- {SPCmz}
- {\@@_backend_object_ref:n {__spc_extgstate_op_true0}}
- \@@_backend_object_new:nn {__spc_extgstate_op_true1}{dict}
- \@@_backend_object_write:nn
- {__spc_extgstate_op_true1}
- {/Type /ExtGState~/op~true~/OP~true~/OPM~1}%
- \pdfmanagement_add:nnn
- {Page/Resources/ExtGState}
- {SPCop}
- {\@@_backend_object_ref:n {__spc_extgstate_op_true1}}
+ package/colorspace/after
}
- }
+ {\RequirePackage{colorspace-patches-tmp-ltx}}
+ }
%</package>
% \end{macrocode}%
% \end{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
index e5e921f73a..b87fed57e9 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
index 4b764771fd..174a9be11c 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.95n, released 2022-04-14}
+% \date{Version 0.95o, released 2022-05-11}
%
% \maketitle
% \begin{documentation}
@@ -386,7 +386,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*package>
-\ProvidesExplPackage{pdfmanagement-testphase}{2022-04-14}{0.95n}
+\ProvidesExplPackage{pdfmanagement-testphase}{2022-05-11}{0.95o}
{LaTeX PDF management testphase bundle}
\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
\IfFormatAtLeastTF{2020-10-01}{}{
@@ -414,19 +414,21 @@
% to allow to set it in the document.
% \begin{macrocode}
%<*header>
-\ProvidesExplFile{pdfmanagement-testphase.ltx}{2022-04-14}{0.95n}
+\ProvidesExplFile{pdfmanagement-testphase.ltx}{2022-05-11}{0.95o}
{PDF~management~code~(testphase)}
%</header>
%<*package>
%\RequirePackage{l3pdfdict} % needed by l3pdfmanagement
%\RequirePackage{l3pdfmanagement} % loads the core code with the boolean
%\RequirePackage{ltdocinit} % DocumentMetadata,
-%% can perhaps be combined or made optional ...
+%can perhaps be combined or made optional ...
%\RequirePackage{l3pdfannot}
%\RequirePackage{l3pdfxform-beta}
%\RequirePackage{l3pdfmeta} %
%\RequirePackage{l3pdftools}
%\RequirePackage{l3pdffile}
+\IfFileExists{tagpdf-base.sty}
+ {\RequirePackage{tagpdf-base}}{}
\input{pdfmanagement-testphase.ltx}
%</package>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
index 3048335394..407934ef9c 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
index d92ef551d1..9c8e0ee942 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
@@ -3,7 +3,7 @@
%% a replacement for transparent sty from Heiko Oberdiek
%%
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{transparent-ltx}{2022-04-14}{0.95n}
+\ProvidesExplPackage{transparent-ltx}{2022-05-11}{0.95o}
{Transparency with color stacks (replacement for transparent.sty from Heiko Oberdiek)}%
\RequirePackage{l3opacity}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
index 3c298e5b99..17ecbfee31 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
@@ -1,6 +1,6 @@
%% LaTeX2e file `xcolor-patches.sty'
%%
-\ProvidesPackage{xcolor-patches-tmp-ltx}[2022-04-14 v0.95n patch xcolor for l3color]
+\ProvidesPackage{xcolor-patches-tmp-ltx}[2022-05-11 v0.95o patch xcolor for l3color]
\@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
\ExplSyntaxOn
diff --git a/macros/latex/contrib/tagpdf/README.md b/macros/latex/contrib/tagpdf/README.md
index f614f459fa..5f0f5ceccf 100644
--- a/macros/latex/contrib/tagpdf/README.md
+++ b/macros/latex/contrib/tagpdf/README.md
@@ -1,6 +1,6 @@
#tagpdf — A package to create tagged pdf
-Packageversion: 0.93
-Packagedate: 2022/01/13
+Packageversion: 0.94
+Packagedate: 2022/05/11
Author: Ulrike Fischer
## License
diff --git a/macros/latex/contrib/tagpdf/tagpdf-backend.dtx b/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
index dcf7afb823..17fd440792 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
@@ -23,11 +23,7 @@
% for those people who are interested.
%
%<*driver>
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
+\DocumentMetadata{}
\documentclass{l3doc}
\usepackage{array,booktabs,caption}
\hypersetup{pdfauthor=Ulrike Fischer,
@@ -51,13 +47,13 @@
% }^^A
% }
%
-% \date{Version 0.93, released 2022-01-13}
+% \date{Version 0.94, released 2022-05-11}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*luatex>
-\ProvidesExplFile {tagpdf-luatex.def} {2022-01-13} {0.93}
+\ProvidesExplFile {tagpdf-luatex.def} {2022-05-11} {0.94}
{tagpdf~driver~for~luatex}
% \end{macrocode}
% \section{Loading the lua}
@@ -161,8 +157,8 @@
local ProvidesLuaModule = {
name = "tagpdf",
- version = "0.93", --TAGVERSION
- date = "2022-01-13", --TAGDATE
+ version = "0.94", --TAGVERSION
+ date = "2022-05-11", --TAGDATE
description = "tagpdf lua code",
license = "The LATEX Project Public License 1.3c"
}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-checks.dtx b/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
index 53f97383f8..add77ce81f 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
@@ -24,11 +24,7 @@
%
%
%<*driver>
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
+\DocumentMetadata{}
\documentclass{l3doc}
\usepackage{array,booktabs,caption}
\hypersetup{pdfauthor=Ulrike Fischer,
@@ -52,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.93, released 2022-01-13}
+% \date{Version 0.94, released 2022-05-11}
% \maketitle
% \begin{documentation}
% \section{Commands}
@@ -298,7 +294,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-checks-code} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-checks-code} {2022-05-11} {0.94}
{part of tagpdf - code related to checks, conditionals, debugging and messages}
%</header>
% \end{macrocode}
@@ -468,6 +464,7 @@
% the only sensible values for the argument are |mc_tag| and |struct_tag|.
% \begin{macrocode}
\cs_new:Npn \tag_get:n #1 { \use:c {@@_get_data_#1: } }
+%</package>
% \end{macrocode}
% \end{macro}
%
@@ -478,7 +475,12 @@
% The test is true if all booleans, the global and the two local one are true.
%
% \begin{macrocode}
+%<*base>
\prg_new_conditional:Npnn \tag_if_active: { p , T , TF, F }
+ { \prg_return_false: }
+%</base>
+%<*package>
+\prg_set_conditional:Npnn \tag_if_active: { p , T , TF, F }
{
\bool_lazy_all:nTF
{
@@ -528,7 +530,7 @@
}
% \end{macrocode}
% \end{macro}
-% \subsection{Checks related to stuctures}
+% \subsection{Checks related to structures}
% \begin{macro}{\@@_check_structure_has_tag:n}
% Structures must have a tag, so we check if the S entry is in the property.
% It is an error if this is missing. The argument is a number.
diff --git a/macros/latex/contrib/tagpdf/tagpdf-code.pdf b/macros/latex/contrib/tagpdf/tagpdf-code.pdf
index 6f92329af5..6ecb01b35d 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-code.pdf
+++ b/macros/latex/contrib/tagpdf/tagpdf-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/tagpdf-code.tex b/macros/latex/contrib/tagpdf/tagpdf-code.tex
index d51c209929..9e71bc1eff 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-code.tex
+++ b/macros/latex/contrib/tagpdf/tagpdf-code.tex
@@ -23,11 +23,7 @@
for those people who are interested.
\fi
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
+\DocumentMetadata{}
\documentclass{l3doc}
% The next line is needed so that \GetFileInfo will be able to pick up
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
index 994e3b0b85..e0713b61d6 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: tagpdf-mc.dtx
+%% File: tagpdf-mc-generic.dtx
%
% Copyright (C) 2019-2022 Ulrike Fischer
%
@@ -22,11 +22,7 @@
%
% for those people who are interested.
%<*driver>
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
+\DocumentMetadata{}
\documentclass{l3doc}
\usepackage{array,booktabs,caption}
\hypersetup{pdfauthor=Ulrike Fischer,
@@ -50,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.93, released 2022-01-13}
+% \date{Version 0.94, released 2022-05-11}
% \maketitle
% \begin{documentation}
% \end{documentation}
@@ -59,11 +55,11 @@
% \begin{macrocode}
%<@@=tag>
%<*generic>
-\ProvidesExplPackage {tagpdf-mc-code-generic} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2022-05-11} {0.94}
{part of tagpdf - code related to marking chunks - generic mode}
%</generic>
%<*debug>
-\ProvidesExplPackage {tagpdf-debug-generic} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-debug-generic} {2022-05-11} {0.94}
{part of tagpdf - debugging code related to marking chunks - generic mode}
%</debug>
% \end{macrocode}
@@ -668,9 +664,11 @@
% the state is passed to the end command through a global var and
% a global boolean.
% \begin{macrocode}
+%<base>\cs_new_protected:Npn \tag_mc_begin:n #1 {}
+%<base>\cs_new_protected:Nn \tag_mc_end:{}
%<*generic|debug>
%<*generic>
-\cs_new_protected:Npn \tag_mc_begin:n #1 %#1 keyval
+\cs_set_protected:Npn \tag_mc_begin:n #1 %#1 keyval
{
\@@_check_if_active_mc:T
{
@@ -717,7 +715,7 @@
%</debug>
}
%<*generic>
-\cs_new_protected:Nn \tag_mc_end:
+\cs_set_protected:Nn \tag_mc_end:
{
\@@_check_if_active_mc:T
{
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
index d8dba57fd1..af6dbd1b39 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: tagpdf-mc.dtx
+%% File: tagpdf-mc-luacode.dtx
%
% Copyright (C) 2019-2022 Ulrike Fischer
%
@@ -22,11 +22,7 @@
%
% for those people who are interested.
%<*driver>
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
+\DocumentMetadata{}
\documentclass{l3doc}
\usepackage{array,booktabs,caption}
\hypersetup{pdfauthor=Ulrike Fischer,
@@ -50,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.93, released 2022-01-13}
+% \date{Version 0.94, released 2022-05-11}
% \maketitle
% \begin{implementation}
% The code is splitted into three parts: code shared by all engines,
@@ -90,7 +86,7 @@
% \begin{macrocode}
%<@@=tag>
%<*luamode>
-\ProvidesExplPackage {tagpdf-mc-code-lua} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2022-05-11} {0.94}
{tagpdf - mc code only for the luamode }
%</luamode>
% \end{macrocode}
@@ -294,7 +290,7 @@
% We currently don't check if there is nesting as it doesn't matter so
% much in lua.
% \begin{macrocode}
-\cs_new_protected:Nn \tag_mc_begin:n
+\cs_set_protected:Nn \tag_mc_begin:n
{
\@@_check_if_active_mc:T
{
@@ -331,7 +327,7 @@
%
% TODO: check how the use command must be guarded.
% \begin{macrocode}
-\cs_new_protected:Nn \tag_mc_end:
+\cs_set_protected:Nn \tag_mc_end:
{
\@@_check_if_active_mc:T
{
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
index 852f1d0846..bbf8b3f720 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: tagpdf-mc.dtx
+%% File: tagpdf-mc-shared.dtx
%
% Copyright (C) 2019-2022 Ulrike Fischer
%
@@ -22,11 +22,7 @@
%
% for those people who are interested.
%<*driver>
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
+\DocumentMetadata{}
\documentclass{l3doc}
\usepackage{array,booktabs,caption}
\hypersetup{pdfauthor=Ulrike Fischer,
@@ -50,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.93, released 2022-01-13}
+% \date{Version 0.94, released 2022-05-11}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -178,7 +174,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-mc-code-shared} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-mc-code-shared} {2022-05-11} {0.94}
{part of tagpdf - code related to marking chunks -
code shared by generic and luamode }
%</header>
@@ -300,6 +296,7 @@
{
\tl_new:c { g_@@_mc_label_\tl_to_str:n{#1}_used_tl }
}
+%</shared>
% \end{macrocode}
%
% \end{macro}
@@ -311,7 +308,9 @@
%
% TODO: is testing for struct the right test?
% \begin{macrocode}
-\cs_new_protected:Npn \tag_mc_use:n #1 %#1: label name
+%<base>\cs_new_protected:Npn \tag_mc_use:n #1 {}
+%<*shared>
+\cs_set_protected:Npn \tag_mc_use:n #1 %#1: label name
{
\@@_check_if_active_struct:T
{
@@ -332,6 +331,7 @@
}
}
}
+%</shared>
% \end{macrocode}
% \end{macro}
% \begin{macro}
@@ -343,26 +343,33 @@
% and then stops all tagging. It creates a group.
% It pushes and pops mc-chunks at the begin and end.
% \begin{macrocode}
-\cs_new_protected:Npn \tag_mc_artifact_group_begin:n #1
+%<base>\cs_new_protected:Npn \tag_mc_artifact_group_begin:n #1 {}
+%<base>\cs_new_protected:Npn \tag_mc_artifact_group_end:{}
+%<*shared>
+\cs_set_protected:Npn \tag_mc_artifact_group_begin:n #1
{
\tag_mc_end_push:
\tag_mc_begin:n {artifact=#1}
\tag_stop_group_begin:
}
-\cs_new_protected:Npn \tag_mc_artifact_group_end:
+\cs_set_protected:Npn \tag_mc_artifact_group_end:
{
\tag_stop_group_end:
\tag_mc_end:
\tag_mc_begin_pop:n{}
}
+%</shared>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\tag_mc_end_push:, \tag_mc_begin_pop:n}
%
% \begin{macrocode}
-\cs_new_protected:Npn \tag_mc_end_push:
+%<base>\cs_new_protected:Npn \tag_mc_end_push: {}
+%<base>\cs_new_protected:Npn \tag_mc_begin_pop:n #1 {}
+%<*shared>
+\cs_set_protected:Npn \tag_mc_end_push:
{
\@@_check_if_active_mc:T
{
@@ -381,7 +388,7 @@
}
}
-\cs_new_protected:Npn \tag_mc_begin_pop:n #1
+\cs_set_protected:Npn \tag_mc_begin_pop:n #1
{
\@@_check_if_active_mc:T
{
diff --git a/macros/latex/contrib/tagpdf/tagpdf-roles.dtx b/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
index f8b0589bb5..5fa36ce06e 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
@@ -22,11 +22,7 @@
%
% for those people who are interested.
%<*driver>
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
+\DocumentMetadata{}
\documentclass{l3doc}
\usepackage{array,booktabs,caption}
\hypersetup{pdfauthor=Ulrike Fischer,
@@ -50,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.93, released 2022-01-13}
+% \date{Version 0.94, released 2022-05-11}
% \maketitle
% \begin{documentation}
% \begin{function}
@@ -91,7 +87,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-roles-code} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-roles-code} {2022-05-11} {0.94}
{part of tagpdf - code related to roles and structure names}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-space.dtx b/macros/latex/contrib/tagpdf/tagpdf-space.dtx
index 40c4367ba2..21a41f959f 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-space.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-space.dtx
@@ -22,11 +22,7 @@
%
% for those people who are interested.
%<*driver>
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
+\DocumentMetadata{}
\documentclass{l3doc}
\usepackage{array,booktabs,caption}
\hypersetup{pdfauthor=Ulrike Fischer,
@@ -50,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.93, released 2022-01-13}
+% \date{Version 0.94, released 2022-05-11}
% \maketitle
% \begin{documentation}
% \begin{function}{interwordspace (setup-key)}
@@ -68,7 +64,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-space-code} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-space-code} {2022-05-11} {0.94}
{part of tagpdf - code related to real space chars}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-struct.dtx b/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
index 6f03c5ac0f..621ef672b8 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
@@ -22,11 +22,7 @@
%
% for those people who are interested.
%<*driver>
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
+\DocumentMetadata{}
\documentclass{l3doc}
\usepackage{array,booktabs,caption}
\hypersetup{pdfauthor=Ulrike Fischer,
@@ -50,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.93, released 2022-01-13}
+% \date{Version 0.94, released 2022-05-11}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -221,7 +217,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-struct-code} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-struct-code} {2022-05-11} {0.94}
{part of tagpdf - code related to storing structure}
%</header>
% \end{macrocode}
@@ -969,7 +965,6 @@
\group_end:
}
}
-%</package>
% \end{macrocode}
% \end{macro}
% \begin{macro}{root-AF (setup-key)}
@@ -998,14 +993,17 @@
}
},
}
+%</package>
% \end{macrocode}
% \end{macro}
% \section{User commands}
%
% \begin{macro}{\tag_struct_begin:n,\tag_struct_end:}
% \begin{macrocode}
+%<base>\cs_new_protected:Npn \tag_struct_begin:n #1 {}
+%<base>\cs_new_protected:Npn \tag_struct_end:{}
%<*package|debug>
-%<package>\cs_new_protected:Npn \tag_struct_begin:n #1 %#1 key-val
+%<package>\cs_set_protected:Npn \tag_struct_begin:n #1 %#1 key-val
%<debug>\cs_set_protected:Npn \tag_struct_begin:n #1 %#1 key-val
{
%<package>\@@_check_if_active_struct:T
@@ -1067,7 +1065,7 @@
}
%<debug>{ \@@_debug_struct_begin_ignore:n { #1 }}
}
-%<package>\cs_new_protected:Nn \tag_struct_end:
+%<package>\cs_set_protected:Nn \tag_struct_end:
%<debug>\cs_set_protected:Nn \tag_struct_end:
{ %take the current structure num from the stack:
%the objects are written later, lua mode hasn't all needed info yet
@@ -1104,8 +1102,9 @@
% This command allows to use a stashed structure in another place.
% TODO: decide how it should be guarded. Probably by the struct-check.
% \begin{macrocode}
+%<base>\cs_new_protected:Npn \tag_struct_use:n #1 {}
%<*package>
-\cs_new_protected:Nn \tag_struct_use:n %#1 is the label
+\cs_set_protected:Npn \tag_struct_use:n #1 %#1 is the label
{
\@@_check_if_active_struct:T
{
@@ -1171,7 +1170,7 @@
% \section{Attributes and attribute classes}
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage {tagpdf-attr-code} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-attr-code} {2022-05-11} {0.94}
{part of tagpdf - code related to attributes and attribute classes}
%</header>
% \end{macrocode}
@@ -1217,8 +1216,8 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_attr_new_entry:nn #1 #2 %#1:name, #2: content
{
- \prop_gput:Nnn \g_@@_attr_entries_prop
- {#1}{#2}
+ \prop_gput:Nen \g_@@_attr_entries_prop
+ {\pdf_name_from_unicode_e:n{#1}}{#2}
}
\keys_define:nn { @@ / setup }
@@ -1239,7 +1238,14 @@
attribute-class .code:n =
{
\clist_set:No \l_@@_tmpa_clist { #1 }
- \seq_set_from_clist:NN \l_@@_tmpa_seq \l_@@_tmpa_clist
+ \seq_set_from_clist:NN \l_@@_tmpb_seq \l_@@_tmpa_clist
+% \end{macrocode}
+% we convert the names into pdf names with slash
+% \begin{macrocode}
+ \seq_set_map_x:NNn \l_@@_tmpa_seq \l_@@_tmpb_seq
+ {
+ \pdf_name_from_unicode_e:n {##1}
+ }
\seq_map_inline:Nn \l_@@_tmpa_seq
{
\prop_if_in:NnF \g_@@_attr_entries_prop {##1}
@@ -1248,14 +1254,10 @@
}
\seq_gput_left:Nn\g_@@_attr_class_used_seq { ##1}
}
- \seq_set_map:NNn \l_@@_tmpb_seq \l_@@_tmpa_seq
- {
- /##1
- }
\tl_set:Nx \l_@@_tmpa_tl
{
\int_compare:nT { \seq_count:N \l_@@_tmpa_seq > 1 }{[}
- \seq_use:Nn \l_@@_tmpb_seq { \c_space_tl }
+ \seq_use:Nn \l_@@_tmpa_seq { \c_space_tl }
\int_compare:nT { \seq_count:N \l_@@_tmpa_seq > 1 }{]}
}
\int_compare:nT { \seq_count:N \l_@@_tmpa_seq > 0 }
@@ -1277,7 +1279,14 @@
attribute .code:n = % A property (attribute, value currently a dictionary)
{
\clist_set:No \l_@@_tmpa_clist { #1 }
- \seq_set_from_clist:NN \l_@@_tmpa_seq \l_@@_tmpa_clist
+ \seq_set_from_clist:NN \l_@@_tmpb_seq \l_@@_tmpa_clist
+% \end{macrocode}
+% we convert the names into pdf names with slash
+% \begin{macrocode}
+ \seq_set_map_x:NNn \l_@@_tmpa_seq \l_@@_tmpb_seq
+ {
+ \pdf_name_from_unicode_e:n {##1}
+ }
\tl_set:Nx \l_@@_attr_value_tl
{
\int_compare:nT { \seq_count:N \l_@@_tmpa_seq > 1 }{[}%]
diff --git a/macros/latex/contrib/tagpdf/tagpdf-tree.dtx b/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
index e6964666d9..a63dce4687 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
@@ -23,11 +23,7 @@
% for those people who are interested.
%
%<*driver>
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
+\DocumentMetadata{}
\documentclass{l3doc}
\usepackage{array,booktabs,caption}
\hypersetup{pdfauthor=Ulrike Fischer,
@@ -51,13 +47,13 @@
% }^^A
% }
%
-% \date{Version 0.93, released 2022-01-13}
+% \date{Version 0.94, released 2022-05-11}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-tree-code} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-tree-code} {2022-05-11} {0.94}
{part of tagpdf - code related to writing trees and dictionaries to the pdf}
%</header>
% \end{macrocode}
@@ -333,7 +329,7 @@
\seq_gremove_duplicates:N \g_@@_attr_class_used_seq
\seq_set_map:NNn \l_@@_tmpa_seq \g_@@_attr_class_used_seq
{
- /##1\c_space_tl
+ ##1\c_space_tl
<<
\prop_item:Nn
\g_@@_attr_entries_prop
diff --git a/macros/latex/contrib/tagpdf/tagpdf-user.dtx b/macros/latex/contrib/tagpdf/tagpdf-user.dtx
index 2b58d81659..5b7cf4bb40 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-user.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-user.dtx
@@ -22,11 +22,7 @@
%
% for those people who are interested.
%<*driver>
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
+\DocumentMetadata{}
\documentclass{l3doc}
\usepackage{array,booktabs,caption}
\hypersetup{pdfauthor=Ulrike Fischer,
@@ -50,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.93, released 2022-01-13}
+% \date{Version 0.94, released 2022-05-11}
% \maketitle
% \begin{documentation}
% \section{Setup commands}
@@ -250,7 +246,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-user} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-user} {2022-05-11} {0.94}
{tagpdf - user commands}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf.dtx b/macros/latex/contrib/tagpdf/tagpdf.dtx
index 5406505c59..95154859ee 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf.dtx
@@ -33,9 +33,10 @@
% \end{syntax}
% \end{function}
%
-% \begin{function}{ \tag_stop_group_begin:, \tag_stop_group_end: }
+% \begin{function}{ \tag_stop_group_begin:, \tag_stop_group_end:, \tag_stop: }
% We need a command to stop tagging in some places.
-% This simply switches the two local booleans.
+% This simply switches the two local booleans. The grouping commands
+% can be used to group the effect.
% \end{function}
%
% \begin{function}{activate-space (setup-key)}
@@ -80,7 +81,7 @@
% \begin{macrocode}
%<@@=tag>
%<*package>
-\ProvidesExplPackage {tagpdf} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf} {2022-05-11} {0.94}
{ A package to experiment with pdf tagging }
\bool_if:nF
@@ -98,7 +99,7 @@
{
Activate~it~with \MessageBreak
\string\RequirePackage{pdfmanagement-testphase}\MessageBreak
- \string\DeclareDocumentMetadata{<options>}\MessageBreak
+ \string\DocumentMetadata{<options>}\MessageBreak
before~\string\documentclass
}
}
@@ -106,7 +107,7 @@
% \end{macrocode}
%<*debug>
% \begin{macrocode}
-\ProvidesExplPackage {tagpdf-debug} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdf-debug} {2022-05-11} {0.94}
{ debug code for tagpdf }
\@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput}
\end{macrocode}
@@ -140,13 +141,24 @@
% \begin{macrocode}
\RequirePackage{l3ref-tmp}
% \end{macrocode}
-%
+% To be on the safe side for now, load also the base definitions
+% \begin{macrocode}
+\RequirePackage{tagpdf-base}
+%</package>
+% \end{macrocode}
+% \begin{macrocode}
+%<*base>
+\ProvidesExplPackage {tagpdf-base} {2022-05-11} {0.94}
+ {part of tagpdf - provide base, no-op versions of the user commands }
+%</base>
+% \end{macrocode}
% \section{Temporary code}
% This is code which will be removed when proper support exists in LaTeX
% \subsection{a LastPage label}
% See also issue \#2 in Accessible-xref
% \begin{macro}{\@@_lastpagelabel:}
% \begin{macrocode}
+%<*package>
\cs_new_protected:Npn \@@_lastpagelabel:
{
\legacy_if:nT { @filesw }
@@ -302,7 +314,7 @@
\cs_generate_variant:Nn \pdf_object_ref:n {e}
\cs_generate_variant:Nn \pdfannot_dict_put:nnn {nnx}
\cs_generate_variant:Nn \pdffile_embed_stream:nnn {nxx,oxx}
-\cs_generate_variant:Nn \prop_gput:Nnn {Nxx}
+\cs_generate_variant:Nn \prop_gput:Nnn {Nxx,Nen}
\cs_generate_variant:Nn \prop_put:Nnn {Nxx}
\cs_generate_variant:Nn \ref_label:nn { nv }
\cs_generate_variant:Nn \seq_set_split:Nnn{Nne}
@@ -427,6 +439,11 @@
\bool_set_false:N \l_@@_active_mc_bool
}
\cs_set_eq:NN \tag_stop_group_end: \group_end:
+\cs_new_protected:Npn \tag_stop:
+ {
+ \bool_set_false:N \l_@@_active_struct_bool
+ \bool_set_false:N \l_@@_active_mc_bool
+ }
% \end{macrocode}
% \end{macro}
%
diff --git a/macros/latex/contrib/tagpdf/tagpdf.ins b/macros/latex/contrib/tagpdf/tagpdf.ins
index e212ae48b2..54809f67c1 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.ins
+++ b/macros/latex/contrib/tagpdf/tagpdf.ins
@@ -70,6 +70,17 @@ and all files in that bundle must be distributed together.
}
\generate
+ {\file{tagpdf-base.sty}
+ {
+ \from{tagpdf.dtx}{base}
+ \from{tagpdf-mc-generic.dtx}{base}
+ \from{tagpdf-mc-shared.dtx}{base}
+ \from{tagpdf-struct.dtx}{base}
+ \from{tagpdf-checks.dtx}{base}
+ }
+ }
+
+\generate
{\file{tagpdf-luatex.def}{\from{tagpdf-backend.dtx}{luatex}}}
\generate
{\file{tagpdf-mc-code-generic.sty}{\from{tagpdf-mc-generic.dtx}{generic}}}
@@ -97,6 +108,7 @@ and all files in that bundle must be distributed together.
\generate
{\file{tagpdf-debug-lua.sty}{\from{tagpdf-mc-luacode.dtx}{debug}}}
+
\def\MetaPrefix{-- }
\def\defaultpostamble{%
\MetaPrefix^^J%
diff --git a/macros/latex/contrib/tagpdf/tagpdf.pdf b/macros/latex/contrib/tagpdf/tagpdf.pdf
index 72892e853c..d031e46f2d 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.pdf
+++ b/macros/latex/contrib/tagpdf/tagpdf.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/tagpdf.tex b/macros/latex/contrib/tagpdf/tagpdf.tex
index af08d81651..8b1cf9f9b0 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.tex
+++ b/macros/latex/contrib/tagpdf/tagpdf.tex
@@ -4,8 +4,8 @@
\DocumentMetadata{pdfversion=2.0,lang=en-UK,testphase=phase-II}
\makeatletter
-\def\UlrikeFischer@package@version{0.93}
-\def\UlrikeFischer@package@date{2022-01-13}
+\def\UlrikeFischer@package@version{0.94}
+\def\UlrikeFischer@package@date{2022-05-11}
\makeatother
\documentclass[DIV=12,parskip=half-,bibliography=totoc]{scrartcl}
@@ -57,7 +57,7 @@
}
\usepackage{hyperxmp}
-\usepackage[pdfdisplaydoctitle=true,hyperfootnotes=false,
+\usepackage[pdfdisplaydoctitle=true,%hyperfootnotes=false,
]{hyperref}
\hypersetup{
@@ -96,9 +96,6 @@
\begin{document}
-\tagstructbegin{tag=Document}
-
-
\tagstructbegin{tag=Title}
\tagmcbegin{tag=Title}
@@ -150,6 +147,14 @@ Issues, comments, suggestions should be added as issues to the github tracker:
\tableofcontents
+\section{Preface to version 0.94}
+
+In this version a small package, \pkg{tagpdf-base} has been added. It provides
+no-op versions of the main expl3 user commands for packages that want to support
+tagging but can't be sure if the \pkg{tagpdf} package has been loaded.
+
+
+
\section{Preface to version 0.93}
The main change in the package itself in this version is the support for structure destinations.
This is a new type of destinations in \PDF~2.0.
@@ -189,7 +194,7 @@ Since many year the creation of accessible \PDF{}-files with \LaTeX\ which confo
But in my opinion missing are means to \emph{experiment} with tagging and accessibility. Means to try out, how difficult it is to tag some structures, means to try out, how much tagging is really needed (standards and validators don't need to be right \ldots), means to test what else is needed so that a \PDF{} works e.g. with a screen reader. Without such experiments it is imho quite difficult to get a feeling about what has to be done, which kernel changes are needed, how packages should be adapted.
This package tries to close this gap by offering \emph{core} commands to tag a \PDF{}%
-\tagpdfparaOff\footnote{In case you don't know what this means: there will be some explanations later on.}\tagpdfparaOn.
+\footnote{In case you don't know what this means: there will be some explanations later on.}.
My hope is that the knowledge gained by the use of this package will at the end allow to decide if and how code to do tagging should be part of the \LaTeX\ kernel.
@@ -566,7 +571,7 @@ That's a debug option, it helps in lua mode to see where space glyph will be ins
\section{Tagging}
-pdf is a page orientated graphic format. It simply puts ink and glyphs at various coordinates on a page. A simple stream of a page can look like this\tagpdfparaOff\footnote{The appendix contains some remarks about the syntax of a \PDF{} file}\tagpdfparaOn:
+pdf is a page orientated graphic format. It simply puts ink and glyphs at various coordinates on a page. A simple stream of a page can look like this\footnote{The appendix contains some remarks about the syntax of a \PDF{} file}:
\begin{lstlisting}[columns=fixed]
stream
@@ -711,7 +716,7 @@ They are marked with of a pair of keywords, \texttt{BDC} and \texttt{EMC} which
-\item[Content] Content is marked also with of a pair of keywords, \texttt{BDC} and \texttt{EMC}. The first argument of \texttt{BDC} is a tag name which describes the structural type of the text\tagpdfparaOff\footnote{There is quite some redundancy in the specification here. The structural type is also set in the structure tree. One wonders if it isn't enough to use always \texttt{/SPAN} here.}\tagpdfparaOn
+\item[Content] Content is marked also with of a pair of keywords, \texttt{BDC} and \texttt{EMC}. The first argument of \texttt{BDC} is a tag name which describes the structural type of the text\footnote{There is quite some redundancy in the specification here. The structural type is also set in the structure tree. One wonders if it isn't enough to use always \texttt{/SPAN} here.}
Examples are \texttt{/P} (paragraph), \texttt{/H2} (heading), \texttt{/TD} (table cell). The reference mentions a number of standard types but it is possible to add more or to use different names.
In the second argument of \texttt{BDC} -- in the property dictionary -- more data can be stored. \emph{Required} is an \texttt{/MCID}-key which takes an integer as a value:
@@ -1436,7 +1441,8 @@ As an example here an attribute that can be attached to tabular header (type TH)
One or more such attributes can be attached to a structure element. It is also possible to store such an attribute under a symbolic name in a so-called \enquote{ClassedMap} and then to attach references to such classes to a structure.
To use such attributes you must at first declare it in \verb+\tagpdfsetup+ with the key \texttt{newattribute}. This key takes two argument, a name and the content of the attribute.
-The name should be a sensible key name, the content a dictionary.
+The name should be a sensible key name, it is converted to a pdf name with
+\verb+\pdf_name_from_unicode_e:n+, so slashes and spaces are allow. The content should be a dictionary without the braket.
@@ -1987,7 +1993,6 @@ This maps 0 to an array and 2 to the object reference \texttt{21 0 R}. Number tr
\end{description}
-\tagstructend %document
\end{document}
%http://msf.mathmlcloud.org/file_formats/8 %sample \PDF{} for math
diff --git a/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty b/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
index 3c283a8a3e..102560ead0 100644
--- a/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
+++ b/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
@@ -1,5 +1,5 @@
%\RequirePackage[enable-debug]{expl3}[2018/06/14]
-\ProvidesExplPackage {tagpdfdocu-patches} {2022-01-13} {0.93}
+\ProvidesExplPackage {tagpdfdocu-patches} {2022-05-11} {0.94}
{patches/commands for the tagpdf documentation}
\RequirePackage{etoolbox}
@@ -86,7 +86,11 @@
% no internal patches, but KOMA-only solution
%%%%%%%%
+% the structure should be opened rather early to catch the refstepcounter!
\AddtoDoHook{heading/begingroup}{\tagpdfparaOff\use_none:n}
+\cs_new_protected:Npn \__tag_struct_section_begin:n #1 {\tagstructbegin{tag=\prop_item:Nn\g_tag_section_level_prop{#1}}}
+\AddtoDoHook{heading/postinit}{\__tag_struct_section_begin:n}
+\AddtoDoHook{heading/endgroup}{\tagstructend\use_none:n}
\prop_new:N \g_tag_section_level_prop
\prop_gput:Nnn \g_tag_section_level_prop {section}{H1}
@@ -98,7 +102,6 @@
{
\@hangfrom
{\hskip #2
- \tagstructbegin{tag=\prop_item:Nn\g_tag_section_level_prop{#1}}
%\tl_if_empty:nF{#3}
\tl_if_in:nnF{\@empty}{#3}
{
@@ -109,7 +112,7 @@
}
{\tag_mc_begin:n {tag=\prop_item:Nn\g_tag_section_level_prop{#1}}
#4
- \tag_mc_end:\tagstructend}%
+ \tag_mc_end:}%
}
% minisec is simply P, so we let paratagging handle this.
diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README
index eca71ea022..1d9253ce4e 100644
--- a/macros/latex/contrib/univie-ling/README
+++ b/macros/latex/contrib/univie-ling/README
@@ -80,6 +80,12 @@ also have a look at the example files.
== CHANGES ==
+V. 1.18 (2022-05-11):
+ - univie-ling-expose:
+ - univie-ling-paper:
+ - univie-ling-thesis:
+ * Fix error with subtitles
+
V. 1.17 (2022-02-05):
- univie-ling-wlg:
* Allow to set fixed publication date via \date in titling
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
index 6b4989c489..b984f72c10 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
index 1264896923..e6183fee41 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.17, 2022/02/05}
+\date{Version 1.18, 2022/05/11}
\maketitle
@@ -326,6 +326,10 @@ Templates are provided as well:
\section{Release History}
\begin{description}
+ \item 2022/05/11 (v.\,1.18)
+ \begin{itemize}
+ \item Fix error with subtitles.
+ \end{itemize}
\item 2022/02/05 (v.\,1.17)
\begin{itemize}
\item Fix option \joption{apa}.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
index 9d557a76c4..f9a615a48a 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
index 4bf7eca5a6..58e3ff0658 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.17, 2022/02/05}
+\date{Version 1.18, 2022/05/11}
\maketitle
@@ -349,6 +349,10 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2022/05/11 (v.\,1.18)
+ \begin{itemize}
+ \item Fix error with subtitles.
+ \end{itemize}
\item 2022/02/05 (v.\,1.17)
\begin{itemize}
\item Fix option \joption{apa}.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
index ad101a880f..66d1b27bff 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
index 633af56324..8a14c4aa98 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.17, 2022/02/05}
+\date{Version 1.18, 2022/05/11}
\maketitle
@@ -386,6 +386,10 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2022/05/11 (v.\,1.18)
+ \begin{itemize}
+ \item Fix error with subtitles.
+ \end{itemize}
\item 2022/02/05 (v.\,1.17)
\begin{itemize}
\item Fix option \joption{apa}.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
index b30af6669a..5b58211bb2 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
index 32c0c0c6a6..07aafe231d 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.17, 2022/02/05}
+\date{Version 1.18, 2022/05/11}
\maketitle
@@ -233,6 +233,7 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m
\raggedright
\begin{itemize}
+ \item 2022/05/11 (v.\,1.18) No change to this class.
\item 2022/02/05 (v.\,1.17) Allow to set fixed publication date via \jcsmacro{date} in titling.
\item 2021/11/03 (v.\,1.16) No change to this class.
\item 2021/10/19 (v.\,1.15) Allow for slanted/bold IPA.
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
index ec67e415cf..b6030f59d7 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-expose}[2022/02/05 v1.17 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2022/05/11 v1.18 Univie Linguistic Exposes (JSp)]
\RequirePackage{xkeyval}
@@ -461,7 +461,7 @@
{\usekomafont{tpcaption}\GetTranslation{tpcaption}\par}
{\ifx\@title\@empty\else
\usekomafont{title}{\enquote{\@title%
- \ifx\@subtitle\@empty\else\\\@subtitle\fi}\par}%
+ \ifx\@subtitle\@empty\else\linebreak\@subtitle\fi}\par}%
\fi
}
\vskip 2em
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
index aea817c74f..b7f727e0fb 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-paper}[2022/02/05 v1.17 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2022/05/11 v1.18 Univie Linguistic Papers (JSp)]
\RequirePackage{xkeyval}
@@ -510,7 +510,7 @@ This includes all drawings, sketches, graphics and internet sources.}
\fi
{\ifx\@title\@empty\else
\usekomafont{title}{\enquote{\@title%
- \ifx\@subtitle\@empty\else\\\@subtitle\fi}\par}%
+ \ifx\@subtitle\@empty\else\linebreak\@subtitle\fi}\par}%
\fi
}%
{\ifx\@course\@empty\else\vskip 2em%
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
index f0db154435..0129554232 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-thesis}[2022/02/05 v1.17 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2022/05/11 v1.18 Univie Linguistic Theses (JSp)]
\RequirePackage{xkeyval}
@@ -556,7 +556,7 @@ This includes all drawings, sketches, graphics and internet sources.}
{\usekomafont{tpcaption}Titel der \@thesistype\,/\,Title of the \@thesistype@en\par}
{\ifx\@title\@empty\else
\usekomafont{title}{\enquote{\@title%
- \ifx\@subtitle\@empty\else\\\@subtitle\fi}\par}%
+ \ifx\@subtitle\@empty\else\linebreak\@subtitle\fi}\par}%
\fi
}%
{\ifx\@volume\@empty\else%
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
index 09e106800f..6698cb693e 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
@@ -8,7 +8,7 @@
% General Linguistics
\edboardGL{Markus P\"ochtrager}
% Applied Linguistics
-\edboardAL{Mi-Cha Flubacher \& Florian Grosser}%
+\edboardAL{Mi-Cha Flubacher, Florian Grosser \& Carina Lozo}%
% Historical Linguistics
\edboardHL{Stefan Schumacher}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
index 3a2db18109..39e6e2b1fb 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
@@ -32,7 +32,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-wlg}[2022/02/05 v1.17 WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2022/05/11 v1.18 WLG journal layout (JSp)]
%% ============================================================