Merge branch 'develop' of https://github.com/u-fischer/tagpdf into de…

…velop
latex3 · Nov 12, 2023 · 13a8e45 · 13a8e45
2 parents bde82c1 + 902e8d8
commit 13a8e45
Show file tree

Hide file tree

Showing 32 changed files with 78 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,15 @@ All notable changes to the `tagpdf` package since the
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 this project uses date-based 'snapshot' version identifiers.
 
+## [2023-11-10]
+Version: 0.98n
+
+### Changed
+ - all commands use now e-types
+
+### Fixed
+ - deprecation error from \seq_set_map_x:
+
 ## [2023-10-27]
 Version: 0.98m
 

diff --git a/Readme.md b/Readme.md
@@ -1,7 +1,7 @@
 # tagpdf
 
-![Version: 0.98m](https://img.shields.io/badge/current_version-0.98m-blue.svg?style=flat-square)
-![Date: 2023-10-27](https://img.shields.io/badge/date-2023--10--27-blue.svg?style=flat-square)
+![Version: 0.98n](https://img.shields.io/badge/current_version-0.98n-blue.svg?style=flat-square)
+![Date: 2023-11-10](https://img.shields.io/badge/date-2023--11--10-blue.svg?style=flat-square)
 [![License: LPPL1.3c ](https://img.shields.io/badge/license-LPPL1.3c-blue.svg?style=flat-square)](https://ctan.org/license/lppl1.3c)
 
 A package to experiment with tagging and other requirements of accessible pdfs with pdflatex and lualatex

diff --git a/build.lua b/build.lua
@@ -1,6 +1,6 @@
 -- Build script for tagpdf
-packageversion="0.98m"
-packagedate="2023-10-27"
+packageversion="0.98n"
+packagedate="2023-11-10"
 
 module   = "tagpdf"
 ctanpkg  = "tagpdf"

diff --git a/ctan.ann b/ctan.ann
@@ -1,10 +1,7 @@
-Version 0.98m [2023-10-27]
+Version 0.98n [2023-11-10]
 
 ### Changed
- - use new LaTeX properties if available
- - change name of label to avoid problems with active underscore.
- - start to move x-type functions to e-type functions
-
-### Fixed
- - debugging code for structures didn't correctly reflect later changes  
+ - all commands use now e-types
 
+### Fixed
+ - deprecation error from \seq_set_map_x:
diff --git a/doc/CTANREADME.md b/doc/CTANREADME.md
@@ -1,6 +1,6 @@
 #tagpdf — A package to create tagged pdf
-Packageversion: 0.98m 
-Packagedate: 2023/10/27
+Packageversion: 0.98n 
+Packagedate: 2023/11/10
 Author: Ulrike Fischer
 
 ## License

diff --git a/doc/ex-AF-file.pdf b/doc/ex-AF-file.pdf
diff --git a/doc/ex-alt-actualtext.pdf b/doc/ex-alt-actualtext.pdf
diff --git a/doc/ex-attribute.pdf b/doc/ex-attribute.pdf
diff --git a/doc/ex-formula-problem.pdf b/doc/ex-formula-problem.pdf
diff --git a/doc/ex-list.pdf b/doc/ex-list.pdf
diff --git a/doc/ex-mc-manual-para-split-obsolete.pdf b/doc/ex-mc-manual-para-split-obsolete.pdf
diff --git a/doc/ex-softhyphen.pdf b/doc/ex-softhyphen.pdf
diff --git a/doc/ex-spaceglyph-listings.pdf b/doc/ex-spaceglyph-listings.pdf
diff --git a/doc/ex-structure-obsolete.pdf b/doc/ex-structure-obsolete.pdf
diff --git a/doc/ex-tagpdf-template.pdf b/doc/ex-tagpdf-template.pdf
diff --git a/doc/tagpdf-code.pdf b/doc/tagpdf-code.pdf
diff --git a/doc/tagpdf.tex b/doc/tagpdf.tex
@@ -16,8 +16,8 @@
  }
 \DebugBlocksOff
 \makeatletter
-\def\UlrikeFischer@package@version{0.98m}
-\def\UlrikeFischer@package@date{2023-10-27}
+\def\UlrikeFischer@package@version{0.98n}
+\def\UlrikeFischer@package@date{2023-11-10}
 \makeatother
 
 \documentclass[bibliography=totoc,a4paper]{article}
@@ -117,27 +117,31 @@
 \tagstructbegin{tag=Div}
 \begin{tcolorbox}[colframe=red,before upper=\tagpdfparaOn]
 
-This package is not meant for normal document production. It is mainly a tool to \emph{research}
-tagging.
+This package is not meant for normal use in a document. It is on one mainly a tool to \emph{research}
+tagging. On the other side it is the base of the code developed in the \texttt{latex-lab} bundle for the
+Tagged PDF project \url{https://www.latex-project.org/publications/indexbytopic/pdf/}.
 
-You need a very current \LaTeX{} format.
-You need a very current L3 programming layer.
-You need the new \LaTeX{} PDF management bundle.
+The package develops together with the code in the \texttt{latex-lab} bundle, in the 
+\LaTeX{} format, in the \texttt{pdfmanagement-testphase} package (the \LaTeX{} PDF management bundle)
+and the L3 programming layer. 
+That means you should ensure that all these components are up-to-date and in sync which each 
+other. 
 
-This package is incomplete, experimental and quite probably contains bugs. It is in parts
-quite slow as the code prefers readability over speed.
+This package quite probably contains bugs. It is in parts
+quite slow as the code currently prefers readability over speed.
 At some time it will disappear when the code has been integrated into the \LaTeX{} format.
 
-This package can change in an incompatible way.
+This package can still change in an incompatible way.
 
 You need some knowledge about \TeX, \PDF{} and perhaps even lua to use it.
 
 \medskip
 
-Issues, comments, suggestions should be added as issues to the github tracker:
+Issues, comments, suggestions can be added as issues to these two github tracker:
 
 \medskip
 \centering
+\url{https://github.com/latex3/tagging-project}\par
 \url{https://github.com/u-fischer/tagpdf}
 
 \end{tcolorbox}

diff --git a/doc/tagpdfdocu-patches.sty b/doc/tagpdfdocu-patches.sty
@@ -1,5 +1,5 @@
 %\RequirePackage[enable-debug]{expl3}[2018/06/14]
-\ProvidesExplPackage {tagpdfdocu-patches} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdfdocu-patches} {2023-11-10} {0.98n}
  {patches/commands for the tagpdf documentation}
 \RequirePackage{etoolbox,xpatch}
 

diff --git a/tagpdf-backend.dtx b/tagpdf-backend.dtx
@@ -47,13 +47,13 @@
 %    }^^A
 % }
 %
-% \date{Version 0.98m, released 2023-10-27}
+% \date{Version 0.98n, released 2023-11-10}
 % \maketitle
 % \begin{implementation}
 %    \begin{macrocode}
 %<@@=tag>
 %<*luatex>
-\ProvidesExplFile {tagpdf-luatex.def} {2023-10-27} {0.98m}
+\ProvidesExplFile {tagpdf-luatex.def} {2023-11-10} {0.98n}
   {tagpdf~driver~for~luatex}
 %    \end{macrocode}
 % \section{Loading the lua}
@@ -158,8 +158,8 @@
 
 local ProvidesLuaModule = {
     name          = "tagpdf",
-    version       = "0.98m",       --TAGVERSION
-    date          = "2023-10-27", --TAGDATE
+    version       = "0.98n",       --TAGVERSION
+    date          = "2023-11-10", --TAGDATE
     description   = "tagpdf lua code",
     license       = "The LATEX Project Public License 1.3c"
 }

diff --git a/tagpdf-checks.dtx b/tagpdf-checks.dtx
@@ -48,7 +48,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.98m, released 2023-10-27}
+% \date{Version 0.98n, released 2023-11-10}
 % \maketitle
 % \begin{documentation}
 % \section{Commands}
@@ -313,7 +313,7 @@
 %    \begin{macrocode}
 %<@@=tag>
 %<*header>
-\ProvidesExplPackage {tagpdf-checks-code} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdf-checks-code} {2023-11-10} {0.98n}
  {part of tagpdf - code related to checks, conditionals, debugging and messages}
 %</header>
 %    \end{macrocode}

diff --git a/tagpdf-ctan.zip b/tagpdf-ctan.zip
diff --git a/tagpdf-data.dtx b/tagpdf-data.dtx
@@ -47,7 +47,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.98m, released 2023-10-27}
+% \date{Version 0.98n, released 2023-11-10}
 % \maketitle
 % \begin{documentation}
 % This files contains a various data files which are read in
@@ -60,7 +60,7 @@
 % It lists the new tag, the rolemap and the namespace of the rolemap.
 %    \begin{macrocode}
 %<*ns-latex>
-%% \ProvidesExplFile {tagpdf-ns-latex.def} {2023-10-27} {0.98m}
+%% \ProvidesExplFile {tagpdf-ns-latex.def} {2023-11-10} {0.98n}
 %% {latex} {https://www.latex-project.org/ns/dflt/2022}{}
 title,        Title,    pdf2,
 part,         Title,    pdf2,
@@ -92,7 +92,7 @@ text,         P,        pdf2,
 % It is bound to change
 %    \begin{macrocode}
 %<*ns-latex-book>
-%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2023-10-27} {0.98m}
+%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2023-11-10} {0.98n}
 %% {latex-book} {https://www.latex-project.org/ns/book/2022}{}
 chapter,       H1,pdf2,
 section,       H2,pdf2,
@@ -108,7 +108,7 @@ subparagraph,  H6,pdf2,
 % loaded. 
 %    \begin{macrocode}
 %<*ns-latex-inline>
-%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2023-10-27} {0.98m}
+%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2023-11-10} {0.98n}
 %% {latex-inline} {https://www.latex-project.org/ns/inline/2022}{}
 chapter,       Span, pdf2,    
 section,       Span, pdf2,
@@ -122,7 +122,7 @@ P,             Span, pdf2,
 % \section{The pdf namespace data}
 %    \begin{macrocode}
 %<*ns-pdf>
-%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2023-10-27} {0.98m}
+%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2023-11-10} {0.98n}
 %%  {pdf}   {http://iso.org/pdf/ssn}{}
 StructTreeRoot,StructTreeRoot,pdf,D,
 Document,Document,pdf,D,   
@@ -190,7 +190,7 @@ Strong,Span,pdf,I,
 % \section{The pdf 2.0 namespace data}
 %    \begin{macrocode}
 %<*ns-pdf2>
-%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2023-10-27} {0.98m} 
+%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2023-11-10} {0.98n} 
 %%  {pdf2}  {http://iso.org/pdf2/ssn}{}
 Document,Document,pdf2,D,   
 Part,Part,pdf2,G,       
@@ -246,7 +246,7 @@ Strong,Strong,pdf2,I,
 % \section{The mathml namespace data}
 %    \begin{macrocode}
 %<*ns-mathml>
-%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2023-10-27} {0.98m}
+%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2023-11-10} {0.98n}
 % {mathml}{http://www.w3.org/1998/Math/MathML}{}
 abs,abs,mathml,
 and,and,mathml,
@@ -481,7 +481,7 @@ xor,xor,mathml,
 % This will perhaps change in future.
 %    \begin{macrocode}
 %<*parent-child>
-%% \ProvidesExplFile {tagpdf-parent-child.csv} {2023-10-27} {0.98m}
+%% \ProvidesExplFile {tagpdf-parent-child.csv} {2023-11-10} {0.98n}
 ,,,StructTreeRoot,Document,Art,Part,Div,Sect,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,MC
 Document,both,document level,1,0..n,∅,‡,‡,∅,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅
 Art,1.7,grouping,∅,0..n,∅,‡,‡,0..n,0..n,‡,∅,∅,∅,0..n,∅,0..n,∅,∅,∅,0..1,0..1,∅,∅,∅,0..n,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅,∅,0..n,0..n,∅,∅,∅,0..n,0..n,∅,∅
@@ -536,7 +536,7 @@ MC,both,---,∅,∅,∅,∅,∅,∅,0..n,‡,∅,∅,∅,0..n,0..n,0..n,0..n,0..
 % This will perhaps change in future.
 %    \begin{macrocode}
 %<*parent-child-2>
-%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2023-10-27} {0.98m}
+%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2023-11-10} {0.98n}
 ,,,StructTreeRoot,Document,DocumentFragment,Art,Part,Div,Sect,Aside,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Title,Sub,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Em,Strong,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,FENote,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,math,mathml,Artifact,MC
 Document,both,document level,1,0..n,0..n,∅,‡,‡,∅,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅
 DocumentFragment,2.0,document level,∅,0..n,0..n,0..n,‡,‡,0..n,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅*,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,0..n,∅

diff --git a/tagpdf-mc-generic.dtx b/tagpdf-mc-generic.dtx
@@ -46,7 +46,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.98m, released 2023-10-27}
+% \date{Version 0.98n, released 2023-11-10}
 % \maketitle
 % \begin{documentation}
 % \end{documentation}
@@ -55,11 +55,11 @@
 %    \begin{macrocode}
 %<@@=tag>
 %<*generic>
-\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-11-10} {0.98n}
  {part of tagpdf - code related to marking chunks - generic mode}
 %</generic>
 %<*debug>
-\ProvidesExplPackage {tagpdf-debug-generic} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdf-debug-generic} {2023-11-10} {0.98n}
  {part of tagpdf - debugging code related to marking chunks - generic mode}
 %</debug>
 %    \end{macrocode}

diff --git a/tagpdf-mc-luacode.dtx b/tagpdf-mc-luacode.dtx
@@ -46,7 +46,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.98m, released 2023-10-27}
+% \date{Version 0.98n, released 2023-11-10}
 % \maketitle
 % \begin{implementation}
 % The code is splitted into three parts: code shared by all engines,
@@ -86,11 +86,11 @@
 %    \begin{macrocode}
 %<@@=tag>
 %<*luamode>
-\ProvidesExplPackage {tagpdf-mc-code-lua} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2023-11-10} {0.98n}
   {tagpdf - mc code only for the luamode }
 %</luamode>
 %<*debug>
-\ProvidesExplPackage {tagpdf-debug-lua} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdf-debug-lua} {2023-11-10} {0.98n}
  {part of tagpdf - debugging code related to marking chunks - lua mode}
 %</debug>
 %    \end{macrocode}

diff --git a/tagpdf-mc-shared.dtx b/tagpdf-mc-shared.dtx
@@ -46,7 +46,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.98m, released 2023-10-27}
+% \date{Version 0.98n, released 2023-11-10}
 % \maketitle
 % \begin{documentation}
 % \section{Public Commands}
@@ -181,7 +181,7 @@
 %    \begin{macrocode}
 %<@@=tag>
 %<*header>
-\ProvidesExplPackage {tagpdf-mc-code-shared} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdf-mc-code-shared} {2023-11-10} {0.98n}
   {part of tagpdf - code related to marking chunks -
    code shared by generic and luamode }
 %</header>

diff --git a/tagpdf-roles.dtx b/tagpdf-roles.dtx
@@ -46,7 +46,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.98m, released 2023-10-27}
+% \date{Version 0.98n, released 2023-11-10}
 % \maketitle
 % \begin{documentation}
 % \begin{function}
@@ -98,7 +98,7 @@
 %    \begin{macrocode}
 %<@@=tag>
 %<*header>
-\ProvidesExplPackage {tagpdf-roles-code} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdf-roles-code} {2023-11-10} {0.98n}
  {part of tagpdf - code related to roles and structure names}
 %</header>
 %    \end{macrocode}

diff --git a/tagpdf-space.dtx b/tagpdf-space.dtx
@@ -46,7 +46,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.98m, released 2023-10-27}
+% \date{Version 0.98n, released 2023-11-10}
 % \maketitle
 % \begin{documentation}
 % \begin{function}{interwordspace (setup-key)}
@@ -64,7 +64,7 @@
 %    \begin{macrocode}
 %<@@=tag>
 %<*header>
-\ProvidesExplPackage {tagpdf-space-code} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdf-space-code} {2023-11-10} {0.98n}
  {part of tagpdf - code related to real space chars}
 %</header>
 %    \end{macrocode}

diff --git a/tagpdf-struct.dtx b/tagpdf-struct.dtx
@@ -46,7 +46,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.98m, released 2023-10-27}
+% \date{Version 0.98n, released 2023-11-10}
 % \maketitle
 % \begin{documentation}
 % \section{Public Commands}
@@ -247,7 +247,7 @@
 %    \begin{macrocode}
 %<@@=tag>
 %<*header>
-\ProvidesExplPackage {tagpdf-struct-code} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdf-struct-code} {2023-11-10} {0.98n}
  {part of tagpdf - code related to storing structure}
 %</header>
 %    \end{macrocode}
@@ -1848,7 +1848,7 @@
 % \section{Attributes and attribute classes}
 %    \begin{macrocode}
 %<*header>
-\ProvidesExplPackage {tagpdf-attr-code} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdf-attr-code} {2023-11-10} {0.98n}
   {part of tagpdf - code related to attributes and attribute classes}
 %</header>
 %    \end{macrocode}
@@ -1882,6 +1882,9 @@
 % two brace group, the name and the content. The content typically
 % needs an |/O| key for the owner. An example look like
 % this.
+% 
+% TODO: consider to put them directly in the ClassMap, that is perhaps
+% more effective. 
 % \begin{verbatim}
 %  \tagpdfsetup
 %   {

diff --git a/tagpdf-tree.dtx b/tagpdf-tree.dtx
@@ -47,13 +47,13 @@
 %    }^^A
 % }
 %
-% \date{Version 0.98m, released 2023-10-27}
+% \date{Version 0.98n, released 2023-11-10}
 % \maketitle
 % \begin{implementation}
 %    \begin{macrocode}
 %<@@=tag>
 %<*header>
-\ProvidesExplPackage {tagpdf-tree-code} {2023-10-27} {0.98m}
+\ProvidesExplPackage {tagpdf-tree-code} {2023-11-10} {0.98n}
  {part of tagpdf - code related to writing trees and dictionaries to the pdf}
 %</header>
 %    \end{macrocode}