[latex3-commits] [latex3/tagpdf] develop: add Desc key to texsource and mathml key (9a4be9c)
github at latex-project.org
github at latex-project.org
Mon Dec 18 16:22:57 CET 2023
Repository : https://github.com/latex3/tagpdf
On branch : develop
Link : https://github.com/latex3/tagpdf/commit/9a4be9c0cd9e8aee607ea346ffa16421aefbe08e
>---------------------------------------------------------------
commit 9a4be9c0cd9e8aee607ea346ffa16421aefbe08e
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Dec 18 16:22:57 2023 +0100
add Desc key to texsource and mathml key
>---------------------------------------------------------------
9a4be9c0cd9e8aee607ea346ffa16421aefbe08e
CHANGELOG.md | 4 ++
doc/tagpdf.tex | 6 ++-
tagpdf-struct.dtx | 11 ++++-
testfiles-pdftex/test-AFref.pdftexmain.tpf | 76 +++++++++++++++---------------
testfiles-pdftex/test-AFref.tpf | 76 +++++++++++++++---------------
testfiles/texsource.luatex.tpf | 62 ++++++++++++------------
testfiles/texsource.tpf | 58 +++++++++++------------
7 files changed, 153 insertions(+), 140 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0546fb..b8546ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+### Added
+ - support for tagging-sockets
+ - /Desc key to AF-files added with the texsource and mathml keys.
+
### Changed
- ignore AFref, AFinline-key with empty value.
- Documentation changes
diff --git a/doc/tagpdf.tex b/doc/tagpdf.tex
index e039ed8..be0ad23 100644
--- a/doc/tagpdf.tex
+++ b/doc/tagpdf.tex
@@ -1789,11 +1789,13 @@ The key-val list understands the following keys:
\item[\PrintKeyName{texsource}] This is like \verb+AFinline-o+, but
it creates a tex-file, with mime type \texttt{application/x-tex}
- and the AFRelationship \texttt{Source}.
+ and the AFRelationship \texttt{Source}. It also sets the /Desc key to a
+ (currently) fix text to satisfy some validators.
\item[\PrintKeyName{mathml}] This is like \verb+AFinline-o+, but it
creates a xml-file, with mime type \texttt{application/xml} and
- the AFRelationship \texttt{Supplement}.
+ the AFRelationship \texttt{Supplement}. It also sets the /Desc key to a
+ (currently) fix text to satisfy some validators.
\item[\PrintKeyName{lang}] This key allows to set the language for
a structure element. The value should be a bcp-identifier,
diff --git a/tagpdf-struct.dtx b/tagpdf-struct.dtx
index 5c904d2..c4f6d32 100644
--- a/tagpdf-struct.dtx
+++ b/tagpdf-struct.dtx
@@ -175,7 +175,7 @@
% (I couldn't think of a better name, so I sticked to E).
% \end{function}
% \begin{function}{AF (struct-key),AFref (struct-key),
-% AFinline (struct-key),AFinline-o (struct-key),texsource}
+% AFinline (struct-key),AFinline-o (struct-key),texsource,mathml}
% \begin{syntax}
% AF = \meta{object name}\\
% AFref = \meta{object reference}\\
@@ -194,7 +194,12 @@
% still a research task to find out what is really needed.
%
% |texsource| is a special variant of |AF-inline-o| which embeds the file
-% as |.tex| source with the |/AFrelationship| key set to |/Source|.
+% as |.tex| source with the |/AFrelationship| key set to |/Source|. It also sets the |/Desc| key
+% to a (currently) fix text.
+%
+% |mathml| is a special variant of |AF-inline-o| which embeds the file
+% as |.xml| file with the |/AFrelationship| key set to |/Supplement|.
+% It also sets the |/Desc| key to a (currently) fix text.
%
% The argument of |AF| is an object name referring an embedded file as declared for example with
% \cs{pdf_object_new:n} or with the l3pdffile module. |AF| expands its argument
@@ -1321,6 +1326,7 @@
,texsource .code:n =
{
\group_begin:
+ \pdfdict_put:nnn { l_pdffile/Filespec } {Desc}{(TeX~source)}
\pdfdict_put:nnn { l_pdffile/Filespec }{AFRelationship} { /Source }
\@@_struct_add_inline_AF:on {#1}{tex}
\group_end:
@@ -1328,6 +1334,7 @@
,mathml .code:n =
{
\group_begin:
+ \pdfdict_put:nnn { l_pdffile/Filespec } {Desc}{(mathml~representation)}
\pdfdict_put:nnn { l_pdffile/Filespec }{AFRelationship} { /Supplement }
\@@_struct_add_inline_AF:on {#1}{xml}
\group_end:
diff --git a/testfiles-pdftex/test-AFref.pdftexmain.tpf b/testfiles-pdftex/test-AFref.pdftexmain.tpf
index 816560f..ed4e5eb 100644
--- a/testfiles-pdftex/test-AFref.pdftexmain.tpf
+++ b/testfiles-pdftex/test-AFref.pdftexmain.tpf
@@ -22,7 +22,7 @@ stream
endstream
endobj
28 0 obj
-<< /Type /Filespec /AFRelationship /Supplement /F <FEFF007400610067002D0041004600660069006C00650031002E0078006D006C> /UF <FEFF007400610067002D0041004600660069006C00650031002E0078006D006C> /EF<</F 27 0 R/UF 27 0 R>> >>
+<< /Type /Filespec /AFRelationship /Supplement /Desc (mathml representation) /F <FEFF007400610067002D0041004600660069006C00650031002E0078006D006C> /UF <FEFF007400610067002D0041004600660069006C00650031002E0078006D006C> /EF<</F 27 0 R/UF 27 0 R>> >>
endobj
31 0 obj
<<
@@ -384,58 +384,58 @@ endobj
xref
0 48
0000000002 65535 f
-0000001797 00000 n
+0000001827 00000 n
0000000003 00000 f
0000000004 00000 f
0000000009 00000 f
-0000004100 00000 n
-0000001880 00000 n
-0000003738 00000 n
-0000002055 00000 n
+0000004130 00000 n
+0000001910 00000 n
+0000003768 00000 n
+0000002085 00000 n
0000000011 00000 f
-0000002123 00000 n
+0000002153 00000 n
0000000013 00000 f
-0000002193 00000 n
+0000002223 00000 n
0000000021 00000 f
-0000002956 00000 n
-0000002274 00000 n
-0000003234 00000 n
-0000003063 00000 n
-0000003542 00000 n
-0000003341 00000 n
-0000003651 00000 n
+0000002986 00000 n
+0000002304 00000 n
+0000003264 00000 n
+0000003093 00000 n
+0000003572 00000 n
+0000003371 00000 n
+0000003681 00000 n
0000000000 00000 f
-0000003806 00000 n
+0000003836 00000 n
0000000015 00000 n
0000000301 00000 n
-0000003912 00000 n
-0000004006 00000 n
+0000003942 00000 n
+0000004036 00000 n
0000000480 00000 n
0000000766 00000 n
-0000001721 00000 n
-0000001579 00000 n
-0000001000 00000 n
-0000021847 00000 n
-0000022718 00000 n
-0000022882 00000 n
-0000001844 00000 n
-0000001916 00000 n
-0000002018 00000 n
-0000004205 00000 n
-0000004229 00000 n
-0000004662 00000 n
-0000016928 00000 n
-0000017182 00000 n
-0000019846 00000 n
-0000020064 00000 n
-0000022005 00000 n
-0000022941 00000 n
-0000023043 00000 n
+0000001751 00000 n
+0000001609 00000 n
+0000001030 00000 n
+0000021877 00000 n
+0000022748 00000 n
+0000022912 00000 n
+0000001874 00000 n
+0000001946 00000 n
+0000002048 00000 n
+0000004235 00000 n
+0000004259 00000 n
+0000004692 00000 n
+0000016958 00000 n
+0000017212 00000 n
+0000019876 00000 n
+0000020094 00000 n
+0000022035 00000 n
+0000022971 00000 n
+0000023073 00000 n
trailer
<< /Size 48
/Root 46 0 R
/Info 47 0 R
/ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
startxref
-23177
+23207
%%EOF
diff --git a/testfiles-pdftex/test-AFref.tpf b/testfiles-pdftex/test-AFref.tpf
index 816560f..ed4e5eb 100644
--- a/testfiles-pdftex/test-AFref.tpf
+++ b/testfiles-pdftex/test-AFref.tpf
@@ -22,7 +22,7 @@ stream
endstream
endobj
28 0 obj
-<< /Type /Filespec /AFRelationship /Supplement /F <FEFF007400610067002D0041004600660069006C00650031002E0078006D006C> /UF <FEFF007400610067002D0041004600660069006C00650031002E0078006D006C> /EF<</F 27 0 R/UF 27 0 R>> >>
+<< /Type /Filespec /AFRelationship /Supplement /Desc (mathml representation) /F <FEFF007400610067002D0041004600660069006C00650031002E0078006D006C> /UF <FEFF007400610067002D0041004600660069006C00650031002E0078006D006C> /EF<</F 27 0 R/UF 27 0 R>> >>
endobj
31 0 obj
<<
@@ -384,58 +384,58 @@ endobj
xref
0 48
0000000002 65535 f
-0000001797 00000 n
+0000001827 00000 n
0000000003 00000 f
0000000004 00000 f
0000000009 00000 f
-0000004100 00000 n
-0000001880 00000 n
-0000003738 00000 n
-0000002055 00000 n
+0000004130 00000 n
+0000001910 00000 n
+0000003768 00000 n
+0000002085 00000 n
0000000011 00000 f
-0000002123 00000 n
+0000002153 00000 n
0000000013 00000 f
-0000002193 00000 n
+0000002223 00000 n
0000000021 00000 f
-0000002956 00000 n
-0000002274 00000 n
-0000003234 00000 n
-0000003063 00000 n
-0000003542 00000 n
-0000003341 00000 n
-0000003651 00000 n
+0000002986 00000 n
+0000002304 00000 n
+0000003264 00000 n
+0000003093 00000 n
+0000003572 00000 n
+0000003371 00000 n
+0000003681 00000 n
0000000000 00000 f
-0000003806 00000 n
+0000003836 00000 n
0000000015 00000 n
0000000301 00000 n
-0000003912 00000 n
-0000004006 00000 n
+0000003942 00000 n
+0000004036 00000 n
0000000480 00000 n
0000000766 00000 n
-0000001721 00000 n
-0000001579 00000 n
-0000001000 00000 n
-0000021847 00000 n
-0000022718 00000 n
-0000022882 00000 n
-0000001844 00000 n
-0000001916 00000 n
-0000002018 00000 n
-0000004205 00000 n
-0000004229 00000 n
-0000004662 00000 n
-0000016928 00000 n
-0000017182 00000 n
-0000019846 00000 n
-0000020064 00000 n
-0000022005 00000 n
-0000022941 00000 n
-0000023043 00000 n
+0000001751 00000 n
+0000001609 00000 n
+0000001030 00000 n
+0000021877 00000 n
+0000022748 00000 n
+0000022912 00000 n
+0000001874 00000 n
+0000001946 00000 n
+0000002048 00000 n
+0000004235 00000 n
+0000004259 00000 n
+0000004692 00000 n
+0000016958 00000 n
+0000017212 00000 n
+0000019876 00000 n
+0000020094 00000 n
+0000022035 00000 n
+0000022971 00000 n
+0000023073 00000 n
trailer
<< /Size 48
/Root 46 0 R
/Info 47 0 R
/ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
startxref
-23177
+23207
%%EOF
diff --git a/testfiles/texsource.luatex.tpf b/testfiles/texsource.luatex.tpf
index 1f683d6..e6fbf90 100644
--- a/testfiles/texsource.luatex.tpf
+++ b/testfiles/texsource.luatex.tpf
@@ -7,7 +7,7 @@ ABC
endstream
endobj
12 0 obj
-<< /Type /Filespec /AFRelationship /Source /F <FEFF007400610067002D0041004600660069006C00650031002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650031002E007400650078> /EF<</F 11 0 R/UF 11 0 R>> >>
+<< /Type /Filespec /AFRelationship /Source /Desc (TeX source) /F <FEFF007400610067002D0041004600660069006C00650031002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650031002E007400650078> /EF<</F 11 0 R/UF 11 0 R>> >>
endobj
13 0 obj
<< /Subtype /application#2Fx-tex/Type /EmbeddedFile /Params<</ModDate (D:20160520) >> /Length 3 >>
@@ -16,7 +16,7 @@ CDE
endstream
endobj
14 0 obj
-<< /Type /Filespec /AFRelationship /Source /F <FEFF007400610067002D0041004600660069006C00650032002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650032002E007400650078> /EF<</F 13 0 R/UF 13 0 R>> >>
+<< /Type /Filespec /AFRelationship /Source /Desc (TeX source) /F <FEFF007400610067002D0041004600660069006C00650032002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650032002E007400650078> /EF<</F 13 0 R/UF 13 0 R>> >>
endobj
15 0 obj
<< /Subtype /application#2Fx-tex/Type /EmbeddedFile /Params<</ModDate (D:20160520) >> /Length 9 >>
@@ -25,7 +25,7 @@ abc\blub
endstream
endobj
16 0 obj
-<< /Type /Filespec /AFRelationship /Source /F <FEFF007400610067002D0041004600660069006C00650033002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650033002E007400650078> /EF<</F 15 0 R/UF 15 0 R>> >>
+<< /Type /Filespec /AFRelationship /Source /Desc (TeX source) /F <FEFF007400610067002D0041004600660069006C00650033002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650033002E007400650078> /EF<</F 15 0 R/UF 15 0 R>> >>
endobj
17 0 obj
<< /Type /Metadata /Subtype /XML /Length 11363 >>
@@ -382,41 +382,41 @@ endobj
xref
0 34
0000000002 65535 f
-0000013127 00000 n
+0000013184 00000 n
0000000003 00000 f
0000000004 00000 f
0000000008 00000 f
-0000014170 00000 n
-0000013210 00000 n
-0000013374 00000 n
+0000014227 00000 n
+0000013267 00000 n
+0000013431 00000 n
0000000000 00000 f
-0000013953 00000 n
-0000014037 00000 n
+0000014010 00000 n
+0000014094 00000 n
0000000020 00000 n
0000000166 00000 n
-0000000396 00000 n
-0000000542 00000 n
-0000000772 00000 n
-0000000924 00000 n
-0000001154 00000 n
-0000013040 00000 n
-0000012905 00000 n
-0000012607 00000 n
-0000016247 00000 n
-0000016601 00000 n
-0000013174 00000 n
-0000013251 00000 n
-0000013337 00000 n
-0000014271 00000 n
-0000015245 00000 n
-0000014314 00000 n
-0000014389 00000 n
-0000015481 00000 n
-0000016401 00000 n
-0000016663 00000 n
-0000016781 00000 n
+0000000415 00000 n
+0000000561 00000 n
+0000000810 00000 n
+0000000962 00000 n
+0000001211 00000 n
+0000013097 00000 n
+0000012962 00000 n
+0000012664 00000 n
+0000016304 00000 n
+0000016658 00000 n
+0000013231 00000 n
+0000013308 00000 n
+0000013394 00000 n
+0000014328 00000 n
+0000015302 00000 n
+0000014371 00000 n
+0000014446 00000 n
+0000015538 00000 n
+0000016458 00000 n
+0000016720 00000 n
+0000016838 00000 n
trailer
<< /Size 34 /Root 32 0 R /Info 33 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
-16913
+16970
%%EOF
diff --git a/testfiles/texsource.tpf b/testfiles/texsource.tpf
index 0018d16..88f9c52 100644
--- a/testfiles/texsource.tpf
+++ b/testfiles/texsource.tpf
@@ -10,7 +10,7 @@ ABC
endstream
endobj
12 0 obj
-<< /Type /Filespec /AFRelationship /Source /F <FEFF007400610067002D0041004600660069006C00650031002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650031002E007400650078> /EF<</F 11 0 R/UF 11 0 R>> >>
+<< /Type /Filespec /AFRelationship /Source /Desc (TeX source) /F <FEFF007400610067002D0041004600660069006C00650031002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650031002E007400650078> /EF<</F 11 0 R/UF 11 0 R>> >>
endobj
13 0 obj
<<
@@ -22,7 +22,7 @@ CDE
endstream
endobj
14 0 obj
-<< /Type /Filespec /AFRelationship /Source /F <FEFF007400610067002D0041004600660069006C00650032002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650032002E007400650078> /EF<</F 13 0 R/UF 13 0 R>> >>
+<< /Type /Filespec /AFRelationship /Source /Desc (TeX source) /F <FEFF007400610067002D0041004600660069006C00650032002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650032002E007400650078> /EF<</F 13 0 R/UF 13 0 R>> >>
endobj
15 0 obj
<<
@@ -34,7 +34,7 @@ abc\blub
endstream
endobj
16 0 obj
-<< /Type /Filespec /AFRelationship /Source /F <FEFF007400610067002D0041004600660069006C00650033002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650033002E007400650078> /EF<</F 15 0 R/UF 15 0 R>> >>
+<< /Type /Filespec /AFRelationship /Source /Desc (TeX source) /F <FEFF007400610067002D0041004600660069006C00650033002E007400650078> /UF <FEFF007400610067002D0041004600660069006C00650033002E007400650078> /EF<</F 15 0 R/UF 15 0 R>> >>
endobj
18 0 obj
<<
@@ -517,42 +517,42 @@ endobj
xref
0 32
0000000002 65535 f
-0000013049 00000 n
+0000013106 00000 n
0000000003 00000 f
0000000004 00000 f
0000000008 00000 f
-0000014092 00000 n
-0000013132 00000 n
-0000013298 00000 n
+0000014149 00000 n
+0000013189 00000 n
+0000013355 00000 n
0000000000 00000 f
-0000013877 00000 n
-0000013961 00000 n
+0000013934 00000 n
+0000014018 00000 n
0000000015 00000 n
0000000160 00000 n
-0000000390 00000 n
-0000000535 00000 n
-0000000765 00000 n
-0000000916 00000 n
-0000012826 00000 n
-0000001146 00000 n
-0000012961 00000 n
-0000012596 00000 n
-0000024364 00000 n
-0000024522 00000 n
-0000013096 00000 n
-0000013175 00000 n
-0000013261 00000 n
-0000014193 00000 n
-0000014600 00000 n
-0000022360 00000 n
-0000022581 00000 n
-0000024581 00000 n
-0000024699 00000 n
+0000000409 00000 n
+0000000554 00000 n
+0000000803 00000 n
+0000000954 00000 n
+0000012883 00000 n
+0000001203 00000 n
+0000013018 00000 n
+0000012653 00000 n
+0000024421 00000 n
+0000024579 00000 n
+0000013153 00000 n
+0000013232 00000 n
+0000013318 00000 n
+0000014250 00000 n
+0000014657 00000 n
+0000022417 00000 n
+0000022638 00000 n
+0000024638 00000 n
+0000024756 00000 n
trailer
<< /Size 32
/Root 30 0 R
/Info 31 0 R
/ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
startxref
-24831
+24888
%%EOF
More information about the latex3-commits
mailing list.