diff --git a/CHANGELOG.md b/CHANGELOG.md index f2da9bc6..248069bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,15 +4,18 @@ 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. -## [Unreleased] -## [2023-10-23] +## [2023-10-27] Version: 0.98m ### 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 + ## [2023-08-30] Version: 0.98l diff --git a/Readme.md b/Readme.md index 20a0d19a..e9fa7b2a 100644 --- 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-23](https://img.shields.io/badge/date-2023--10--23-blue.svg?style=flat-square) +![Date: 2023-10-27](https://img.shields.io/badge/date-2023--10--27-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 index 8e07c59d..2b90c66f 100644 --- a/build.lua +++ b/build.lua @@ -1,6 +1,6 @@ -- Build script for tagpdf packageversion="0.98m" -packagedate="2023-10-23" +packagedate="2023-10-27" module = "tagpdf" ctanpkg = "tagpdf" diff --git a/ctan.ann b/ctan.ann index 8c16f07d..fab42d68 100644 --- a/ctan.ann +++ b/ctan.ann @@ -1,6 +1,10 @@ -Version 0.98m [2023-10-23] +Version 0.98m [2023-10-27] ### Changed -- use new LaTeX properties if available - + - 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 diff --git a/doc/CTANREADME.md b/doc/CTANREADME.md index 60af4372..b5a8a983 100644 --- 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/23 +Packagedate: 2023/10/27 Author: Ulrike Fischer ## License diff --git a/doc/tagpdf.tex b/doc/tagpdf.tex index 9fa2d788..8b07c871 100644 --- a/doc/tagpdf.tex +++ b/doc/tagpdf.tex @@ -17,7 +17,7 @@ \DebugBlocksOff \makeatletter \def\UlrikeFischer@package@version{0.98m} -\def\UlrikeFischer@package@date{2023-10-23} +\def\UlrikeFischer@package@date{2023-10-27} \makeatother \documentclass[bibliography=totoc,a4paper]{article} diff --git a/doc/tagpdfdocu-patches.sty b/doc/tagpdfdocu-patches.sty index b2073709..dd08c7e2 100644 --- 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-23} {0.98m} +\ProvidesExplPackage {tagpdfdocu-patches} {2023-10-27} {0.98m} {patches/commands for the tagpdf documentation} \RequirePackage{etoolbox,xpatch} diff --git a/tagpdf-backend.dtx b/tagpdf-backend.dtx index 7ff29c24..d6fcd70f 100644 --- a/tagpdf-backend.dtx +++ b/tagpdf-backend.dtx @@ -47,13 +47,13 @@ % }^^A % } % -% \date{Version 0.98m, released 2023-10-23} +% \date{Version 0.98m, released 2023-10-27} % \maketitle % \begin{implementation} % \begin{macrocode} %<@@=tag> %<*luatex> -\ProvidesExplFile {tagpdf-luatex.def} {2023-10-23} {0.98m} +\ProvidesExplFile {tagpdf-luatex.def} {2023-10-27} {0.98m} {tagpdf~driver~for~luatex} % \end{macrocode} % \section{Loading the lua} @@ -159,7 +159,7 @@ local ProvidesLuaModule = { name = "tagpdf", version = "0.98m", --TAGVERSION - date = "2023-10-23", --TAGDATE + date = "2023-10-27", --TAGDATE description = "tagpdf lua code", license = "The LATEX Project Public License 1.3c" } diff --git a/tagpdf-checks.dtx b/tagpdf-checks.dtx index de0abae5..dc1456ea 100644 --- a/tagpdf-checks.dtx +++ b/tagpdf-checks.dtx @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Version 0.98m, released 2023-10-23} +% \date{Version 0.98m, released 2023-10-27} % \maketitle % \begin{documentation} % \section{Commands} @@ -313,7 +313,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-checks-code} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-checks-code} {2023-10-27} {0.98m} {part of tagpdf - code related to checks, conditionals, debugging and messages} % % \end{macrocode} diff --git a/tagpdf-ctan.zip b/tagpdf-ctan.zip new file mode 100644 index 00000000..601318e5 Binary files /dev/null and b/tagpdf-ctan.zip differ diff --git a/tagpdf-data.dtx b/tagpdf-data.dtx index e35efa16..7ad2a3f3 100644 --- a/tagpdf-data.dtx +++ b/tagpdf-data.dtx @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Version 0.98m, released 2023-10-23} +% \date{Version 0.98m, released 2023-10-27} % \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-23} {0.98m} +%% \ProvidesExplFile {tagpdf-ns-latex.def} {2023-10-27} {0.98m} %% {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-23} {0.98m} +%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2023-10-27} {0.98m} %% {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-23} {0.98m} +%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2023-10-27} {0.98m} %% {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-23} {0.98m} +%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2023-10-27} {0.98m} %% {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-23} {0.98m} +%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2023-10-27} {0.98m} %% {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-23} {0.98m} +%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2023-10-27} {0.98m} % {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-23} {0.98m} +%% \ProvidesExplFile {tagpdf-parent-child.csv} {2023-10-27} {0.98m} ,,,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-23} {0.98m} +%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2023-10-27} {0.98m} ,,,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 index ddbf7c52..d1f6441a 100644 --- a/tagpdf-mc-generic.dtx +++ b/tagpdf-mc-generic.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98m, released 2023-10-23} +% \date{Version 0.98m, released 2023-10-27} % \maketitle % \begin{documentation} % \end{documentation} @@ -55,11 +55,11 @@ % \begin{macrocode} %<@@=tag> %<*generic> -\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-10-27} {0.98m} {part of tagpdf - code related to marking chunks - generic mode} % %<*debug> -\ProvidesExplPackage {tagpdf-debug-generic} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-debug-generic} {2023-10-27} {0.98m} {part of tagpdf - debugging code related to marking chunks - generic mode} % % \end{macrocode} diff --git a/tagpdf-mc-luacode.dtx b/tagpdf-mc-luacode.dtx index 02a15500..7066237b 100644 --- a/tagpdf-mc-luacode.dtx +++ b/tagpdf-mc-luacode.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98m, released 2023-10-23} +% \date{Version 0.98m, released 2023-10-27} % \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-23} {0.98m} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2023-10-27} {0.98m} {tagpdf - mc code only for the luamode } % %<*debug> -\ProvidesExplPackage {tagpdf-debug-lua} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-debug-lua} {2023-10-27} {0.98m} {part of tagpdf - debugging code related to marking chunks - lua mode} % % \end{macrocode} diff --git a/tagpdf-mc-shared.dtx b/tagpdf-mc-shared.dtx index 79eaa67c..e18f7bd1 100644 --- a/tagpdf-mc-shared.dtx +++ b/tagpdf-mc-shared.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98m, released 2023-10-23} +% \date{Version 0.98m, released 2023-10-27} % \maketitle % \begin{documentation} % \section{Public Commands} @@ -181,7 +181,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-mc-code-shared} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-mc-code-shared} {2023-10-27} {0.98m} {part of tagpdf - code related to marking chunks - code shared by generic and luamode } % diff --git a/tagpdf-roles.dtx b/tagpdf-roles.dtx index ae6d64cb..36b46394 100644 --- a/tagpdf-roles.dtx +++ b/tagpdf-roles.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98m, released 2023-10-23} +% \date{Version 0.98m, released 2023-10-27} % \maketitle % \begin{documentation} % \begin{function} @@ -98,7 +98,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-roles-code} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-roles-code} {2023-10-27} {0.98m} {part of tagpdf - code related to roles and structure names} % % \end{macrocode} diff --git a/tagpdf-space.dtx b/tagpdf-space.dtx index fce693a3..191a645b 100644 --- a/tagpdf-space.dtx +++ b/tagpdf-space.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98m, released 2023-10-23} +% \date{Version 0.98m, released 2023-10-27} % \maketitle % \begin{documentation} % \begin{function}{interwordspace (setup-key)} @@ -64,7 +64,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-space-code} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-space-code} {2023-10-27} {0.98m} {part of tagpdf - code related to real space chars} % % \end{macrocode} diff --git a/tagpdf-struct.dtx b/tagpdf-struct.dtx index 9c0a8da4..263ae03c 100644 --- a/tagpdf-struct.dtx +++ b/tagpdf-struct.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98m, released 2023-10-23} +% \date{Version 0.98m, released 2023-10-27} % \maketitle % \begin{documentation} % \section{Public Commands} @@ -247,7 +247,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-struct-code} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-struct-code} {2023-10-27} {0.98m} {part of tagpdf - code related to storing structure} % % \end{macrocode} @@ -1848,7 +1848,7 @@ % \section{Attributes and attribute classes} % \begin{macrocode} %<*header> -\ProvidesExplPackage {tagpdf-attr-code} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-attr-code} {2023-10-27} {0.98m} {part of tagpdf - code related to attributes and attribute classes} % % \end{macrocode} @@ -1907,6 +1907,19 @@ } % \end{macrocode} % \end{macro} +% TEMP!!!! +% we temporarly use an internal function for the mapping. This can go +% at the next update +% \begin{macrocode} +\cs_if_free:NTF \seq_set_map_e:NNn + { + \cs_new_eq:NN \@@_seq_set_map_e:NNn \seq_set_map_x:NNn + } + { + \cs_new_eq:NN \@@_seq_set_map_e:NNn \seq_set_map_e:NNn + } +% \end{macrocode} +% % \begin{macro}{attribute-class (struct-key)} % attribute-class has to store the used attribute names so that % they can be added to the ClassMap later. @@ -1920,7 +1933,7 @@ % \end{macrocode} % we convert the names into pdf names with slash % \begin{macrocode} - \seq_set_map_x:NNn \l_@@_tmpa_seq \l_@@_tmpb_seq + \@@_seq_set_map_e:NNn \l_@@_tmpa_seq \l_@@_tmpb_seq { \pdf_name_from_unicode_e:n {##1} } @@ -1963,7 +1976,7 @@ % \end{macrocode} % we convert the names into pdf names with slash % \begin{macrocode} - \seq_set_map_x:NNn \l_@@_tmpa_seq \l_@@_tmpb_seq + \@@_seq_set_map_e:NNn \l_@@_tmpa_seq \l_@@_tmpb_seq { \pdf_name_from_unicode_e:n {##1} } diff --git a/tagpdf-tree.dtx b/tagpdf-tree.dtx index cdd4ef9e..41298b2d 100644 --- a/tagpdf-tree.dtx +++ b/tagpdf-tree.dtx @@ -47,13 +47,13 @@ % }^^A % } % -% \date{Version 0.98m, released 2023-10-23} +% \date{Version 0.98m, released 2023-10-27} % \maketitle % \begin{implementation} % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-tree-code} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-tree-code} {2023-10-27} {0.98m} {part of tagpdf - code related to writing trees and dictionaries to the pdf} % % \end{macrocode} diff --git a/tagpdf-user.dtx b/tagpdf-user.dtx index ea563e64..339d79e1 100644 --- a/tagpdf-user.dtx +++ b/tagpdf-user.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98m, released 2023-10-23} +% \date{Version 0.98m, released 2023-10-27} % \maketitle % \begin{documentation} % \section{Setup commands} @@ -250,7 +250,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-user} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-user} {2023-10-27} {0.98m} {tagpdf - user commands} % % \end{macrocode} diff --git a/tagpdf.dtx b/tagpdf.dtx index c903cd40..668d0851 100644 --- a/tagpdf.dtx +++ b/tagpdf.dtx @@ -93,7 +93,7 @@ % \begin{macrocode} %<@@=tag> %<*package> -\ProvidesExplPackage {tagpdf} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf} {2023-10-27} {0.98m} { A package to experiment with pdf tagging } \bool_if:nF @@ -119,7 +119,7 @@ % \end{macrocode} %<*debug> % \begin{macrocode} -\ProvidesExplPackage {tagpdf-debug} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-debug} {2023-10-27} {0.98m} { debug code for tagpdf } \@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput} % \end{macrocode} @@ -142,7 +142,7 @@ % we define a base package with dummy functions % \begin{macrocode} %<*base> -\ProvidesExplPackage {tagpdf-base} {2023-10-23} {0.98m} +\ProvidesExplPackage {tagpdf-base} {2023-10-27} {0.98m} {part of tagpdf - provide base, no-op versions of the user commands } % % \end{macrocode}