diff options
45 files changed, 431 insertions, 279 deletions
diff --git a/Master/texmf-dist/doc/latex/tagpdf/README.md b/Master/texmf-dist/doc/latex/tagpdf/README.md index 21be5e7a7df..1b6bdfc3b54 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/README.md +++ b/Master/texmf-dist/doc/latex/tagpdf/README.md @@ -1,6 +1,6 @@ #tagpdf β A package to create tagged pdf -Packageversion: 0.98r -Packagedate: 2023/12/18 +Packageversion: 0.98s +Packagedate: 2024/01/19 Author: Ulrike Fischer, LaTeX Project Team ## License diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf index 0467680bb70..979b494e165 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf @@ -1,11 +1,11 @@ %PDF-2.0 %ΜΥΑΤΕΨΠΔΖ 23 0 obj -<< /Subtype /application#2Fx-tex/Type /EmbeddedFile /Params<</ModDate (D:20231218165304+01'00') /Size 151 /CheckSum (9C8ECF305917FA946D95ABE1EE87EFE1) >> /Length 151 >> +<< /Subtype /application#2Fx-tex/Type /EmbeddedFile /Params<</ModDate (D:20240119195615+01'00') /Size 151 /CheckSum (21E1A83BCC98E4F7FCCA5E335BF08D4A) >> /Length 151 >> stream %% LaTeX2e file `example-input-file.tex' %% generated by the `filecontents' environment -%% from source `ex-AF-file' on 2023/12/18. +%% from source `ex-AF-file' on 2024/01/19. %% Additional info! @@ -15,7 +15,7 @@ endobj << /Type /Filespec /AFRelationship /Unspecified /F <FEFF006500780061006D0070006C0065002D0069006E007000750074002D00660069006C0065002E007400650078> /UF <FEFF006500780061006D0070006C0065002D0069006E007000750074002D00660069006C0065002E007400650078> /EF<</F 23 0 R/UF 23 0 R>> >> endobj 26 0 obj -<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20231218) >> /Length 19 >> +<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20240119) >> /Length 19 >> stream BΓ€r with teh shirt endstream @@ -24,7 +24,7 @@ endobj << /Type /Filespec /AFRelationship /Supplement /F <FEFF007400610067002D0041004600660069006C00650031002E007400780074> /UF <FEFF007400610067002D0041004600660069006C00650031002E007400780074> /EF<</F 26 0 R/UF 26 0 R>> >> endobj 29 0 obj -<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20231218) >> /Length 4 >> +<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20240119) >> /Length 4 >> stream Duck endstream @@ -242,17 +242,17 @@ stream </dc:language> <dc:date> <rdf:Seq> - <rdf:li>2023-12-18T16:53:27+01:00</rdf:li> + <rdf:li>2024-01-19T19:56:37+01:00</rdf:li> </rdf:Seq> </dc:date> <dc:format>application/pdf</dc:format> <dc:source>ex-AF-file.tex</dc:source> <xmp:CreatorTool>LaTeX</xmp:CreatorTool> - <xmp:CreateDate>2023-12-18T16:53:27+01:00</xmp:CreateDate> - <xmp:ModifyDate>2023-12-18T16:53:27+01:00</xmp:ModifyDate> - <xmp:MetadataDate>2023-12-18T16:53:27+01:00</xmp:MetadataDate> + <xmp:CreateDate>2024-01-19T19:56:37+01:00</xmp:CreateDate> + <xmp:ModifyDate>2024-01-19T19:56:37+01:00</xmp:ModifyDate> + <xmp:MetadataDate>2024-01-19T19:56:37+01:00</xmp:MetadataDate> <xmpMM:DocumentID>uuid:38d5a844-2217-4081-87cc-b2129dc357a6</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:0e8072c7-0780-4492-8b11-fb55665e5017</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:5cb7d4e3-b534-443a-870e-a511237fa2cf</xmpMM:InstanceID> <prism:complianceProfile>three</prism:complianceProfile> <prism:pageCount>1</prism:pageCount> </rdf:Description> @@ -350,7 +350,7 @@ endobj << /Type /Namespace /NS (https://www.latex-project.org/ns/inline/2022) /RoleMapNS 19 0 R >> endobj 20 0 obj -<< /Type /Namespace /NS (data:,2E18371-2178-CD86-EAAA-9D751F70709C) >> +<< /Type /Namespace /NS (data:,BBA0C22B-E40B-3CA4-A17D-CA788152A7FF) >> endobj 7 0 obj [ 8 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 20 0 R ] @@ -452,7 +452,7 @@ endobj << /Type /Catalog /Pages 37 0 R /MarkInfo 38 0 R/Lang (de-DE)/Metadata 32 0 R/StructTreeRoot 5 0 R >> endobj 47 0 obj -<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231218165327+01'00')/ModDate (D:20231218165327+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> +<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20240119195637+01'00')/ModDate (D:20240119195637+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> endobj xref 0 48 @@ -461,9 +461,9 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000009 00000 f -0000016267 00000 n +0000016268 00000 n 0000013795 00000 n -0000015690 00000 n +0000015691 00000 n 0000014006 00000 n 0000000011 00000 f 0000014074 00000 n @@ -478,34 +478,34 @@ xref 0000015292 00000 n 0000015602 00000 n 0000000000 00000 f -0000015758 00000 n +0000015759 00000 n 0000000020 00000 n 0000000382 00000 n -0000015871 00000 n +0000015872 00000 n 0000000673 00000 n 0000000828 00000 n -0000016003 00000 n +0000016004 00000 n 0000001062 00000 n 0000001202 00000 n -0000016135 00000 n +0000016136 00000 n 0000001436 00000 n 0000013649 00000 n 0000013514 00000 n 0000012908 00000 n -0000020005 00000 n -0000020359 00000 n +0000020006 00000 n +0000020360 00000 n 0000013759 00000 n 0000013852 00000 n 0000013969 00000 n -0000016372 00000 n -0000018821 00000 n -0000016558 00000 n -0000019042 00000 n -0000020159 00000 n -0000020421 00000 n -0000020539 00000 n +0000016373 00000 n +0000018822 00000 n +0000016559 00000 n +0000019043 00000 n +0000020160 00000 n +0000020422 00000 n +0000020540 00000 n trailer -<< /Size 48 /Root 46 0 R /Info 47 0 R /ID [ <A4888D7EDBF2265F1E4F3942A5101D8C> <A4888D7EDBF2265F1E4F3942A5101D8C> ] >> +<< /Size 48 /Root 46 0 R /Info 47 0 R /ID [ <C783AA5CC12032BDA358EBEEAE85BFB6> <C783AA5CC12032BDA358EBEEAE85BFB6> ] >> startxref -20762 +20763 %%EOF diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf Binary files differindex 19b62f6c22c..e80d2fbc035 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf index 3fae0d8e3ce..5eaa00749be 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf @@ -216,17 +216,17 @@ stream </dc:language> <dc:date> <rdf:Seq> - <rdf:li>2023-12-18T16:54:32+01:00</rdf:li> + <rdf:li>2024-01-19T19:57:37+01:00</rdf:li> </rdf:Seq> </dc:date> <dc:format>application/pdf</dc:format> <dc:source>ex-attribute.tex</dc:source> <xmp:CreatorTool>LaTeX</xmp:CreatorTool> - <xmp:CreateDate>2023-12-18T16:54:32+01:00</xmp:CreateDate> - <xmp:ModifyDate>2023-12-18T16:54:32+01:00</xmp:ModifyDate> - <xmp:MetadataDate>2023-12-18T16:54:32+01:00</xmp:MetadataDate> + <xmp:CreateDate>2024-01-19T19:57:37+01:00</xmp:CreateDate> + <xmp:ModifyDate>2024-01-19T19:57:37+01:00</xmp:ModifyDate> + <xmp:MetadataDate>2024-01-19T19:57:37+01:00</xmp:MetadataDate> <xmpMM:DocumentID>uuid:7a9cf910-1c19-429a-8f24-339c62d8a57f</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:ac67207c-46f2-43f7-8717-d9fb86bb4927</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:f29497e4-c54a-486e-86fd-a1f59a181a57</xmpMM:InstanceID> <prism:complianceProfile>three</prism:complianceProfile> <prism:pageCount>1</prism:pageCount> </rdf:Description> @@ -449,7 +449,7 @@ endobj << /Type /Catalog /Pages 26 0 R /MarkInfo 27 0 R/Lang (de_DE)/Metadata 21 0 R/StructTreeRoot 5 0 R >> endobj 38 0 obj -<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/Title (Title)/CreationDate (D:20231218165432+01'00')/ModDate (D:20231218165432+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> +<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/Title (Title)/CreationDate (D:20240119195737+01'00')/ModDate (D:20240119195737+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> endobj xref 0 39 @@ -493,7 +493,7 @@ xref 0000017720 00000 n 0000017838 00000 n trailer -<< /Size 39 /Root 37 0 R /Info 38 0 R /ID [ <87A67E5AF52178AFD399D665CB3CE11A> <87A67E5AF52178AFD399D665CB3CE11A> ] >> +<< /Size 39 /Root 37 0 R /Info 38 0 R /ID [ <175B3F8B0165F50DA2EA61FEB2DEECC4> <175B3F8B0165F50DA2EA61FEB2DEECC4> ] >> startxref 18075 %%EOF diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf index a1ee76c7245..b293fc5d3fc 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf @@ -239,17 +239,17 @@ stream </dc:language> <dc:date> <rdf:Seq> - <rdf:li>2023-12-18T16:55:04+01:00</rdf:li> + <rdf:li>2024-01-19T19:58:08+01:00</rdf:li> </rdf:Seq> </dc:date> <dc:format>application/pdf</dc:format> <dc:source>ex-formula-problem.tex</dc:source> <xmp:CreatorTool>LaTeX</xmp:CreatorTool> - <xmp:CreateDate>2023-12-18T16:55:04+01:00</xmp:CreateDate> - <xmp:ModifyDate>2023-12-18T16:55:04+01:00</xmp:ModifyDate> - <xmp:MetadataDate>2023-12-18T16:55:04+01:00</xmp:MetadataDate> + <xmp:CreateDate>2024-01-19T19:58:08+01:00</xmp:CreateDate> + <xmp:ModifyDate>2024-01-19T19:58:08+01:00</xmp:ModifyDate> + <xmp:MetadataDate>2024-01-19T19:58:08+01:00</xmp:MetadataDate> <xmpMM:DocumentID>uuid:8eb2ce1d-b2ec-440a-8bc2-73733eb3eeb0</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:a6776950-c564-4a23-89bd-1070861bab80</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:9aa99a5f-42c4-4b8e-806c-136f2e587e9a</xmpMM:InstanceID> <prism:complianceProfile>three</prism:complianceProfile> <prism:pageCount>2</prism:pageCount> </rdf:Description> @@ -425,7 +425,7 @@ endobj << /Type /Catalog /Pages 16 0 R /MarkInfo 23 0 R/Lang (de-DE)/Metadata 19 0 R/StructTreeRoot 5 0 R >> endobj 33 0 obj -<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231218165504+01'00')/ModDate (D:20231218165504+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> +<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20240119195808+01'00')/ModDate (D:20240119195808+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> endobj xref 0 34 @@ -464,7 +464,7 @@ xref 0000018886 00000 n 0000019004 00000 n trailer -<< /Size 34 /Root 32 0 R /Info 33 0 R /ID [ <7DF556227FCAB9E10CB341987B6AE040> <7DF556227FCAB9E10CB341987B6AE040> ] >> +<< /Size 34 /Root 32 0 R /Info 33 0 R /ID [ <488A89BFEB9F5F572710D34833184E45> <488A89BFEB9F5F572710D34833184E45> ] >> startxref 19227 %%EOF diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf index 43dfe42bf89..c42445a6a22 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf @@ -210,17 +210,17 @@ stream </dc:language> <dc:date> <rdf:Seq> - <rdf:li>2023-12-18T16:55:36+01:00</rdf:li> + <rdf:li>2024-01-19T19:58:39+01:00</rdf:li> </rdf:Seq> </dc:date> <dc:format>application/pdf</dc:format> <dc:source>ex-list.tex</dc:source> <xmp:CreatorTool>LaTeX</xmp:CreatorTool> - <xmp:CreateDate>2023-12-18T16:55:36+01:00</xmp:CreateDate> - <xmp:ModifyDate>2023-12-18T16:55:36+01:00</xmp:ModifyDate> - <xmp:MetadataDate>2023-12-18T16:55:36+01:00</xmp:MetadataDate> + <xmp:CreateDate>2024-01-19T19:58:39+01:00</xmp:CreateDate> + <xmp:ModifyDate>2024-01-19T19:58:39+01:00</xmp:ModifyDate> + <xmp:MetadataDate>2024-01-19T19:58:39+01:00</xmp:MetadataDate> <xmpMM:DocumentID>uuid:4c749825-1de7-414c-879f-29e4d0bef66e</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:48712e9e-58ec-4ad8-87e8-3a42043a5fe0</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:063cbb0f-d41e-44a3-8a47-db62ccf9c581</xmpMM:InstanceID> <prism:complianceProfile>three</prism:complianceProfile> <prism:pageCount>1</prism:pageCount> </rdf:Description> @@ -653,7 +653,7 @@ endobj << /Type /Catalog /Pages 54 0 R /MarkInfo 55 0 R/Lang (en-US)/Metadata 48 0 R/StructTreeRoot 5 0 R >> endobj 72 0 obj -<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231218165536+01'00')/ModDate (D:20231218165536+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> +<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20240119195839+01'00')/ModDate (D:20240119195839+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> endobj xref 0 73 @@ -731,7 +731,7 @@ xref 0000029592 00000 n 0000029710 00000 n trailer -<< /Size 73 /Root 71 0 R /Info 72 0 R /ID [ <5E4774C3791D95301ACD19EAD1CFC0CF> <5E4774C3791D95301ACD19EAD1CFC0CF> ] >> +<< /Size 73 /Root 71 0 R /Info 72 0 R /ID [ <AC1B7C8DF05B36B74D0C37D00A0B08DF> <AC1B7C8DF05B36B74D0C37D00A0B08DF> ] >> startxref 29933 %%EOF diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf index 978f983adfa..123ba509468 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf @@ -243,17 +243,17 @@ stream </dc:language> <dc:date> <rdf:Seq> - <rdf:li>2023-12-18T16:56:05+01:00</rdf:li> + <rdf:li>2024-01-19T19:59:07+01:00</rdf:li> </rdf:Seq> </dc:date> <dc:format>application/pdf</dc:format> <dc:source>ex-mc-manual-para-split-obsolete.tex</dc:source> <xmp:CreatorTool>LaTeX</xmp:CreatorTool> - <xmp:CreateDate>2023-12-18T16:56:05+01:00</xmp:CreateDate> - <xmp:ModifyDate>2023-12-18T16:56:05+01:00</xmp:ModifyDate> - <xmp:MetadataDate>2023-12-18T16:56:05+01:00</xmp:MetadataDate> + <xmp:CreateDate>2024-01-19T19:59:07+01:00</xmp:CreateDate> + <xmp:ModifyDate>2024-01-19T19:59:07+01:00</xmp:ModifyDate> + <xmp:MetadataDate>2024-01-19T19:59:07+01:00</xmp:MetadataDate> <xmpMM:DocumentID>uuid:c33d64b4-96ec-4e48-8f27-0b3edc831547</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:1595e56f-70f8-4474-867a-1ae2b3cd7f64</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:9847df95-eea1-49b3-8a9e-c1ab77ce723c</xmpMM:InstanceID> <prism:complianceProfile>three</prism:complianceProfile> <prism:pageCount>2</prism:pageCount> </rdf:Description> @@ -413,7 +413,7 @@ endobj << /Type /Catalog /Pages 14 0 R /Lang (en-US)/Metadata 15 0 R >> endobj 25 0 obj -<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231218165605+01'00')/ModDate (D:20231218165605+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> +<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20240119195907+01'00')/ModDate (D:20240119195907+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> endobj xref 0 26 @@ -444,7 +444,7 @@ xref 0000023897 00000 n 0000023978 00000 n trailer -<< /Size 26 /Root 24 0 R /Info 25 0 R /ID [ <D3C598AB7A053A3DD44A24FFA696E407> <D3C598AB7A053A3DD44A24FFA696E407> ] >> +<< /Size 26 /Root 24 0 R /Info 25 0 R /ID [ <299946CEB936BD1617FEBF129FCDEB78> <299946CEB936BD1617FEBF129FCDEB78> ] >> startxref 24201 %%EOF diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf index 19a7add1f56..2b430d802ee 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf @@ -210,17 +210,17 @@ stream </dc:language> <dc:date> <rdf:Seq> - <rdf:li>2023-12-18T16:56:31+01:00</rdf:li> + <rdf:li>2024-01-19T19:59:33+01:00</rdf:li> </rdf:Seq> </dc:date> <dc:format>application/pdf</dc:format> <dc:source>ex-softhyphen.tex</dc:source> <xmp:CreatorTool>LaTeX</xmp:CreatorTool> - <xmp:CreateDate>2023-12-18T16:56:31+01:00</xmp:CreateDate> - <xmp:ModifyDate>2023-12-18T16:56:31+01:00</xmp:ModifyDate> - <xmp:MetadataDate>2023-12-18T16:56:31+01:00</xmp:MetadataDate> + <xmp:CreateDate>2024-01-19T19:59:33+01:00</xmp:CreateDate> + <xmp:ModifyDate>2024-01-19T19:59:33+01:00</xmp:ModifyDate> + <xmp:MetadataDate>2024-01-19T19:59:33+01:00</xmp:MetadataDate> <xmpMM:DocumentID>uuid:aa82e685-4098-469d-861c-3c45dfc700c7</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:ca29539e-9ba0-41f7-86f8-6cc5a9e4611e</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:8a7b353e-b6b5-40da-83ad-77aea4170264</xmpMM:InstanceID> <prism:complianceProfile>three</prism:complianceProfile> <prism:pageCount>1</prism:pageCount> </rdf:Description> @@ -393,7 +393,7 @@ endobj << /Type /Catalog /Pages 19 0 R /MarkInfo 20 0 R/Lang (en-US)/Metadata 14 0 R/StructTreeRoot 5 0 R >> endobj 30 0 obj -<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231218165631+01'00')/ModDate (D:20231218165631+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> +<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20240119195933+01'00')/ModDate (D:20240119195933+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> endobj xref 0 31 @@ -429,7 +429,7 @@ xref 0000018116 00000 n 0000018234 00000 n trailer -<< /Size 31 /Root 29 0 R /Info 30 0 R /ID [ <BF19B56A876C85685B4226B9DA446ACA> <BF19B56A876C85685B4226B9DA446ACA> ] >> +<< /Size 31 /Root 29 0 R /Info 30 0 R /ID [ <05B8611EC20F37F713A0D2A6789467CE> <05B8611EC20F37F713A0D2A6789467CE> ] >> startxref 18457 %%EOF diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf index a0eb729bb67..929c9a6aeb5 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf @@ -210,17 +210,17 @@ stream </dc:language> <dc:date> <rdf:Seq> - <rdf:li>2023-12-18T16:56:58+01:00</rdf:li> + <rdf:li>2024-01-19T19:59:58+01:00</rdf:li> </rdf:Seq> </dc:date> <dc:format>application/pdf</dc:format> <dc:source>ex-spaceglyph-listings.tex</dc:source> <xmp:CreatorTool>LaTeX</xmp:CreatorTool> - <xmp:CreateDate>2023-12-18T16:56:58+01:00</xmp:CreateDate> - <xmp:ModifyDate>2023-12-18T16:56:58+01:00</xmp:ModifyDate> - <xmp:MetadataDate>2023-12-18T16:56:58+01:00</xmp:MetadataDate> + <xmp:CreateDate>2024-01-19T19:59:58+01:00</xmp:CreateDate> + <xmp:ModifyDate>2024-01-19T19:59:58+01:00</xmp:ModifyDate> + <xmp:MetadataDate>2024-01-19T19:59:58+01:00</xmp:MetadataDate> <xmpMM:DocumentID>uuid:acdc2435-bf29-4e54-8d09-1c9b6dc32038</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:715fe598-2cf7-4804-8ee9-3614435f190c</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:bc642c93-8887-45fe-8177-ac4f6cf315a8</xmpMM:InstanceID> <prism:complianceProfile>three</prism:complianceProfile> <prism:pageCount>1</prism:pageCount> </rdf:Description> @@ -354,7 +354,7 @@ endobj << /Type /Catalog /Pages 15 0 R /MarkInfo 16 0 R/Lang (en-US)/Metadata 10 0 R/StructTreeRoot 5 0 R >> endobj 26 0 obj -<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231218165658+01'00')/ModDate (D:20231218165658+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> +<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20240119195958+01'00')/ModDate (D:20240119195958+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> endobj xref 0 27 @@ -386,7 +386,7 @@ xref 0000015484 00000 n 0000015602 00000 n trailer -<< /Size 27 /Root 25 0 R /Info 26 0 R /ID [ <4B690D51D73DA114967668E465C7FF2E> <4B690D51D73DA114967668E465C7FF2E> ] >> +<< /Size 27 /Root 25 0 R /Info 26 0 R /ID [ <92ADB4969503303AD517B208CBD05D4D> <92ADB4969503303AD517B208CBD05D4D> ] >> startxref 15825 %%EOF diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf index 9f8c7a0b6f2..713aef9a9da 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf @@ -210,17 +210,17 @@ stream </dc:language> <dc:date> <rdf:Seq> - <rdf:li>2023-12-18T16:57:26+01:00</rdf:li> + <rdf:li>2024-01-19T20:00:24+01:00</rdf:li> </rdf:Seq> </dc:date> <dc:format>application/pdf</dc:format> <dc:source>ex-structure-obsolete.tex</dc:source> <xmp:CreatorTool>LaTeX</xmp:CreatorTool> - <xmp:CreateDate>2023-12-18T16:57:26+01:00</xmp:CreateDate> - <xmp:ModifyDate>2023-12-18T16:57:26+01:00</xmp:ModifyDate> - <xmp:MetadataDate>2023-12-18T16:57:26+01:00</xmp:MetadataDate> + <xmp:CreateDate>2024-01-19T20:00:24+01:00</xmp:CreateDate> + <xmp:ModifyDate>2024-01-19T20:00:24+01:00</xmp:ModifyDate> + <xmp:MetadataDate>2024-01-19T20:00:24+01:00</xmp:MetadataDate> <xmpMM:DocumentID>uuid:bf5e4a2b-cfa9-4fc5-878c-8f9d2ee95445</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:62157a53-a4aa-4084-8ca4-634237e85781</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:391cce5f-6762-4dd5-8345-24759df53df5</xmpMM:InstanceID> <prism:complianceProfile>three</prism:complianceProfile> <prism:pageCount>1</prism:pageCount> </rdf:Description> @@ -526,7 +526,7 @@ endobj << /Type /Catalog /Pages 26 0 R /MarkInfo 27 0 R/Lang (en-US)/Metadata 20 0 R/StructTreeRoot 5 0 R >> endobj 43 0 obj -<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231218165726+01'00')/ModDate (D:20231218165726+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> +<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20240119200024+01'00')/ModDate (D:20240119200024+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> endobj xref 0 44 @@ -575,7 +575,7 @@ xref 0000023426 00000 n 0000023544 00000 n trailer -<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <80C0A77C79EE32C1370ED68B014C304B> <80C0A77C79EE32C1370ED68B014C304B> ] >> +<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <9B1032D5838A13E78C5BD861432B1F63> <9B1032D5838A13E78C5BD861432B1F63> ] >> startxref 23767 %%EOF diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf index eff5cf76379..bc717f0fa66 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf @@ -210,17 +210,17 @@ stream </dc:language> <dc:date> <rdf:Seq> - <rdf:li>2023-12-18T16:57:56+01:00</rdf:li> + <rdf:li>2024-01-19T20:00:52+01:00</rdf:li> </rdf:Seq> </dc:date> <dc:format>application/pdf</dc:format> <dc:source>ex-tagpdf-template.tex</dc:source> <xmp:CreatorTool>LaTeX</xmp:CreatorTool> - <xmp:CreateDate>2023-12-18T16:57:56+01:00</xmp:CreateDate> - <xmp:ModifyDate>2023-12-18T16:57:56+01:00</xmp:ModifyDate> - <xmp:MetadataDate>2023-12-18T16:57:56+01:00</xmp:MetadataDate> + <xmp:CreateDate>2024-01-19T20:00:52+01:00</xmp:CreateDate> + <xmp:ModifyDate>2024-01-19T20:00:52+01:00</xmp:ModifyDate> + <xmp:MetadataDate>2024-01-19T20:00:52+01:00</xmp:MetadataDate> <xmpMM:DocumentID>uuid:f320abfc-f6ab-4d12-8719-d176f4d947cf</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:045226fb-45fe-4620-820d-0c52be3f32d6</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:822d8f21-3463-4bbd-8556-f3a87ef8651a</xmpMM:InstanceID> <prism:complianceProfile>three</prism:complianceProfile> <prism:pageCount>1</prism:pageCount> </rdf:Description> @@ -309,7 +309,7 @@ endobj << /Type /Namespace /NS (https://www.latex-project.org/ns/inline/2022) /RoleMapNS 19 0 R >> endobj 20 0 obj -<< /Type /Namespace /NS (data:,7C21117D-8985-8D15-E095-29CE1B6DCBC2) >> +<< /Type /Namespace /NS (data:,2BB44E58-9D2A-B688-A395-4CB6A38386E) >> endobj 7 0 obj [ 8 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 20 0 R ] @@ -401,7 +401,7 @@ endobj << /Type /Catalog /Pages 32 0 R /MarkInfo 33 0 R/Lang (en-US)/Metadata 27 0 R/StructTreeRoot 5 0 R >> endobj 43 0 obj -<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231218165756+01'00')/ModDate (D:20231218165756+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> +<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20240119200052+01'00')/ModDate (D:20240119200052+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> endobj xref 0 44 @@ -410,9 +410,9 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000009 00000 f -0000014545 00000 n +0000014544 00000 n 0000012015 00000 n -0000013973 00000 n +0000013972 00000 n 0000012288 00000 n 0000000011 00000 f 0000012356 00000 n @@ -427,30 +427,30 @@ xref 0000013574 00000 n 0000013884 00000 n 0000000000 00000 f -0000014041 00000 n -0000014138 00000 n -0000014225 00000 n -0000014312 00000 n -0000014411 00000 n +0000014040 00000 n +0000014137 00000 n +0000014224 00000 n +0000014311 00000 n +0000014410 00000 n 0000000020 00000 n 0000011869 00000 n 0000011734 00000 n 0000011500 00000 n -0000017151 00000 n -0000017505 00000 n +0000017150 00000 n +0000017504 00000 n 0000011979 00000 n 0000012056 00000 n 0000012188 00000 n 0000012225 00000 n -0000014667 00000 n -0000016108 00000 n -0000014754 00000 n -0000016329 00000 n -0000017305 00000 n -0000017567 00000 n -0000017685 00000 n +0000014666 00000 n +0000016107 00000 n +0000014753 00000 n +0000016328 00000 n +0000017304 00000 n +0000017566 00000 n +0000017684 00000 n trailer -<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <B9D89BA811B99E1C236CEFC67C3CB974> <B9D89BA811B99E1C236CEFC67C3CB974> ] >> +<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <35EA0A3564780016E32C886EF0615181> <35EA0A3564780016E32C886EF0615181> ] >> startxref -17908 +17907 %%EOF diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf Binary files differindex f2225710219..0971abe8174 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf Binary files differindex 9d6e7130e9d..e8bd9118bbe 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf +++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex index d39cd227fc6..740d82b2903 100644 --- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex +++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex @@ -16,8 +16,8 @@ } \DebugBlocksOff \makeatletter -\def\UlrikeFischer@package@version{0.98r} -\def\UlrikeFischer@package@date{2023-12-18} +\def\UlrikeFischer@package@version{0.98s} +\def\UlrikeFischer@package@date{2024-01-19} \makeatother \documentclass[bibliography=totoc,a4paper]{article} @@ -1057,7 +1057,7 @@ The key-val list understands the following keys: \begin{docCommands} { {doc name=tagmcend}, - {doc name=tag_mc:end} + {doc name=tag_mc_end:} } \end{docCommands} @@ -2130,21 +2130,32 @@ of the PDF types can be looked up in the \PDF{}-references \parencite{pdfspec-iso32000-1,pdfspec-iso32000-2_2020}): \begin{enumerate} -\item The \emph{standard structure namespace for PDF 1.7}, also called - the \emph{default standard structure namespace}. The public name of - the namespace is |tag/NS/pdf|. This can be used to reference the - namespace e.g. in attributes. These are the structure names from PDF - 1.7: \ExplSyntaxOn \clist_clear:N\l_tmpa_clist \prop_map_inline:cn { - g__tag_role_NS_pdf_prop } { \clist_put_right:Nn \l_tmpa_clist {#1} - } \clist_use:Nn \l_tmpa_clist {,\c_space_tl } \ExplSyntaxOff +\item The \emph{standard structure namespace for PDF 1.7}, also called + the \emph{default standard structure namespace}. The public name of + the namespace is |tag/NS/pdf|. This can be used to reference the + namespace e.g. in attributes. These are the structure names from PDF + 1.7 (\texttt{StructTreeRoot} is a bit special, it is not really a structure + name but nevertheless listed here): + \ExplSyntaxOn %% + \clist_clear:N\l_tmpa_clist + \prop_map_inline:cn + {g__tag_role_NS_pdf_prop} + { + \str_if_eq:eeT + {#1} + {\use_i:nn #2} + { \clist_put_right:Nn \l_tmpa_clist {#1} } + } + \clist_use:Nn \l_tmpa_clist {,\c_space_tl }. %% + \ExplSyntaxOff \item The \emph{standard structure namespace for PDF 2.0}. The public name of the namespace is |tag/NS/pdf2|. This can be used to reference the namespace e.g. in attributes. These are more or less same types as in PDF. The following types have been removed from - this set:\\ + this set\footnote{They still can be used in a PDF 2.0 document!}:\\ % -\ExplSyntaxOn +\ExplSyntaxOn % \clist_clear:N\l_tmpa_clist \prop_map_inline:cn { g__tag_role_NS_pdf_prop } { @@ -2153,20 +2164,19 @@ of the PDF types can be looked up in the \PDF{}-references {#1} { \clist_put_right:Nn \l_tmpa_clist {#1} } } -\clist_use:Nn \l_tmpa_clist {,\c_space_tl }\\ -\ExplSyntaxOff +\clist_use:Nn \l_tmpa_clist {,\c_space_tl },\\ +\ExplSyntaxOff % and the following are new:\\ -\ExplSyntaxOn -\clist_clear:N\l_tmpa_clist -\prop_map_inline:cn { g__tag_role_NS_pdf2_prop } - { - \prop_if_in:cnF - { g__tag_role_NS_pdf_prop } - {#1} - { \clist_put_right:Nn \l_tmpa_clist {#1} } - } -\clist_use:Nn \l_tmpa_clist {,\c_space_tl } -\ExplSyntaxOff +\ExplSyntaxOn % + \clist_clear:N\l_tmpa_clist % + \prop_map_inline:cn { g__tag_role_NS_pdf_prop } + { + \str_if_eq:eeF {#1} + {\use_i:nn #2} + { \clist_put_right:Nn \l_tmpa_clist {#1} } + } + \clist_use:Nn \l_tmpa_clist {,\c_space_tl }. +\ExplSyntaxOff % \item MathML 3.0 as an \emph{other namespaces}. The public name of the namespace is |tag/NS/mathml|. This can be used to reference the diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx index a257c70058b..8a6554e31bc 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf-backend.dtx % -% Copyright (C) 2019-2023 Ulrike Fischer +% Copyright (C) 2019-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -47,13 +47,13 @@ % }^^A % } % -% \date{Version 0.98r, released 2023-12-18} +% \date{Version 0.98s, released 2024-01-19} % \maketitle % \begin{implementation} % \begin{macrocode} %<@@=tag> %<*luatex> -\ProvidesExplFile {tagpdf-luatex.def} {2023-12-18} {0.98r} +\ProvidesExplFile {tagpdf-luatex.def} {2024-01-19} {0.98s} {tagpdf~driver~for~luatex} % \end{macrocode} % \section{Loading the lua} @@ -158,8 +158,8 @@ local ProvidesLuaModule = { name = "tagpdf", - version = "0.98r", --TAGVERSION - date = "2023-12-18", --TAGDATE + version = "0.98s", --TAGVERSION + date = "2024-01-19", --TAGDATE description = "tagpdf lua code", license = "The LATEX Project Public License 1.3c" } @@ -754,6 +754,7 @@ local function @@_mark_spaces (head) local id = n.id if id == GLYPH then local glyph = n + default_currfontid = glyph.font if glyph.next and (glyph.next.id == GLUE) and not inside_math and (glyph.next.width >0) then @@ -790,8 +791,9 @@ local function @@_mark_spaces (head) if glyph.next and (glyph.next.id == GLUE) and not inside_math and (glyph.next.width >0) and n.subtype==0 then - nodesetattribute(glyph.next,iwspaceattributeid,1) - -- nodesetattribute(glyph.next,iwfontattributeid,glyph.font) + nodesetattribute(glyph.next,iwspaceattributeid,1) + -- changed 2024-01-18, issue #72 + nodesetattribute(glyph.next,iwfontattributeid,default_currfontid) -- for debugging if ltx.@@.trace.showspaces then @@_show_spacemark (head,glyph) @@ -838,6 +840,7 @@ ltx.@@.func.markspaceoff=@@_deactivate_mark_space % \begin{macrocode} local default_space_char = nodenew(GLYPH) local default_fontid = fontid("TU/lmr/m/n/10") +local default_currfontid = fontid("TU/lmr/m/n/10") default_space_char.char = 32 default_space_char.font = default_fontid % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx index 80d865405d5..7053050c3f2 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf-checks.dtx % -% Copyright (C) 2019-2023 Ulrike Fischer +% Copyright (C) 2019-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Version 0.98r, released 2023-12-18} +% \date{Version 0.98s, released 2024-01-19} % \maketitle % \begin{documentation} % \section{Commands} @@ -284,16 +284,30 @@ % mc-current} % Various messages related to mc-chunks. TODO document their meaning. % \end{function} -% \begin{function}{struct-no-objnum,struct-faulty-nesting, +% \begin{function}{struct-unknown,struct-no-objnum,struct-orphan,struct-faulty-nesting, % struct-missing-tag,struct-used-twice,struct-label-unknown,struct-show-closing} -% Various messages related to structure. TODO document their meaning. +% Various messages related to structure. Check the definition in the code for their +% meaning and the arguments they take. % \end{function} % +% \begin{function}{tree-struct-still-open} +% Message issued at the end of the compilation +% if there are (beside Root) other open structures on the stack. +% \end{function} +% + +% \begin{function}{show-struct,show-kids} +% These two messages are used in debug mode +% to show the current structures in the log and terminal. +% \end{function} +% + % \begin{function}{attr-unknown} % Message if an attribute i sunknown. % \end{function} % -% \begin{function}{role-missing,role-unknown,role-unknown-tag,role-tag,new-tag} +% \begin{function}{role-missing,role-unknown,role-unknown-tag,role-tag,new-tag, +% role-parent-child,role-remapping} % Messages related to role mapping. % \end{function} % @@ -313,7 +327,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-checks-code} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-checks-code} {2024-01-19} {0.98s} {part of tagpdf - code related to checks, conditionals, debugging and messages} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx index 350b5d645ff..dd084f03eb1 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf-data.dtx % -% Copyright (C) 2022-2023 Ulrike Fischer +% Copyright (C) 2022-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Version 0.98r, released 2023-12-18} +% \date{Version 0.98s, released 2024-01-19} % \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-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-01-19} {0.98s} %% {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-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-01-19} {0.98s} %% {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-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2024-01-19} {0.98s} %% {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-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-01-19} {0.98s} %% {pdf} {http://iso.org/pdf/ssn}{} StructTreeRoot,StructTreeRoot,pdf,D, Document,Document,pdf,D, @@ -190,8 +190,9 @@ Strong,Span,pdf,I, % \section{The pdf 2.0 namespace data} % \begin{macrocode} %<*ns-pdf2> -%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2023-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-01-19} {0.98s} %% {pdf2} {http://iso.org/pdf2/ssn}{} +StructTreeRoot,StructTreeRoot,pdf2,D, Document,Document,pdf2,D, Part,Part,pdf2,G, Sect,Sect,pdf2,G, @@ -246,7 +247,7 @@ Strong,Strong,pdf2,I, % \section{The mathml namespace data} % \begin{macrocode} %<*ns-mathml> -%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2023-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-01-19} {0.98s} % {mathml}{http://www.w3.org/1998/Math/MathML}{} abs,abs,mathml, and,and,mathml, @@ -481,7 +482,7 @@ xor,xor,mathml, % This will perhaps change in future. % \begin{macrocode} %<*parent-child> -%% \ProvidesExplFile {tagpdf-parent-child.csv} {2023-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-01-19} {0.98s} ,,,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 +537,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-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-01-19} {0.98s} ,,,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/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx index 510cd0efe5c..c27e33d6e7f 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf-mc-generic.dtx % -% Copyright (C) 2019-2023 Ulrike Fischer +% Copyright (C) 2019-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98r, released 2023-12-18} +% \date{Version 0.98s, released 2024-01-19} % \maketitle % \begin{documentation} % \end{documentation} @@ -55,11 +55,11 @@ % \begin{macrocode} %<@@=tag> %<*generic> -\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-01-19} {0.98s} {part of tagpdf - code related to marking chunks - generic mode} %</generic> %<*debug> -\ProvidesExplPackage {tagpdf-debug-generic} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-debug-generic} {2024-01-19} {0.98s} {part of tagpdf - debugging code related to marking chunks - generic mode} %</debug> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx index c387249c4c2..c10aca5b935 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf-mc-luacode.dtx % -% Copyright (C) 2019-2023 Ulrike Fischer +% Copyright (C) 2019-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98r, released 2023-12-18} +% \date{Version 0.98s, released 2024-01-19} % \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-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-01-19} {0.98s} {tagpdf - mc code only for the luamode } %</luamode> %<*debug> -\ProvidesExplPackage {tagpdf-debug-lua} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-debug-lua} {2024-01-19} {0.98s} {part of tagpdf - debugging code related to marking chunks - lua mode} %</debug> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx index 7732ee2eea8..f08a0a8f4c6 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf-mc-shared.dtx % -% Copyright (C) 2019-2023 Ulrike Fischer +% Copyright (C) 2019-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98r, released 2023-12-18} +% \date{Version 0.98s, released 2024-01-19} % \maketitle % \begin{documentation} % \section{Public Commands} @@ -181,7 +181,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-mc-code-shared} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-mc-code-shared} {2024-01-19} {0.98s} {part of tagpdf - code related to marking chunks - code shared by generic and luamode } %</header> diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx index 38d6840b8db..c700553f339 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf-roles.dtx % -% Copyright (C) 2019-2023 Ulrike Fischer +% Copyright (C) 2019-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98r, released 2023-12-18} +% \date{Version 0.98s, released 2024-01-19} % \maketitle % \begin{documentation} % \begin{function} @@ -98,7 +98,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-roles-code} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-roles-code} {2024-01-19} {0.98s} {part of tagpdf - code related to roles and structure names} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx index 8421ceba695..4119753bfda 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf-space.dtx % -% Copyright (C) 2019-2023 Ulrike Fischer +% Copyright (C) 2019-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98r, released 2023-12-18} +% \date{Version 0.98s, released 2024-01-19} % \maketitle % \begin{documentation} % \begin{function}{interwordspace (setup-key)} @@ -64,7 +64,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-space-code} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-space-code} {2024-01-19} {0.98s} {part of tagpdf - code related to real space chars} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx index 4808cccece5..73224158a7c 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf-struct.dtx % -% Copyright (C) 2019-2023 Ulrike Fischer +% Copyright (C) 2019-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98r, released 2023-12-18} +% \date{Version 0.98s, released 2024-01-19} % \maketitle % \begin{documentation} % \section{Public Commands} @@ -63,9 +63,10 @@ % it will check if the \Arg{tag} (after expansion) % is identical to the current structure on the stack. The tag is not role mapped! % \end{function} -% \begin{function}{\tag_struct_use:n} +% \begin{function}{\tag_struct_use:n,\tag_struct_use_num:n} % \begin{syntax} -% \cs{tag_struct_use:n}\Arg{label} +% \cs{tag_struct_use:n}\Arg{label}\\ +% \cs{tag_struct_use_num:n}\Arg{structure number} % \end{syntax} % These commands insert a structure previously stashed away as kid % into the currently active structure. @@ -105,6 +106,21 @@ % This gives back the next free /StructParent number (assuming that it is % together with \cs{tag_struct_insert_annot:nn} which will increase the number. % \end{function} +% +% \begin{function}{\tag_struct_gput:nnn} +% \begin{syntax} +% \cs{tag_struct_gput:nnn}\Arg{structure number}\Arg{keyword}\Arg{value} +% \end{syntax} +% This is a command that allows to update the data of a structure. +% This often can't done simply by replacing the value, as we have to +% preserve and extend existing content. We use therefore dedicated functions +% adjusted to the key in question. +% The first argument is the number of the structure, +% the second a keyword referring to a function, +% the third the value. Currently the only keyword is \texttt{ref} which updates +% the Ref key (an array) +% \end{function} +% % \section{Public keys} % \subsection{Keys for the structure commands} % \begin{function}{tag (struct-key)} @@ -269,7 +285,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-struct-code} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-struct-code} {2024-01-19} {0.98s} {part of tagpdf - code related to storing structure} %</header> % \end{macrocode} @@ -296,6 +312,12 @@ \@@_seq_new:N \g_@@_struct_objR_seq % \end{macrocode} % \end{variable} +% \begin{variable}{\c_@@_struct_null_tl} +% In lua mode we have to test if the kids a null +% \begin{macrocode} +\tl_const:Nn\c_@@_struct_null_tl {null} +% \end{macrocode} +% \end{variable} % \begin{variable}{\g_@@_struct_cont_mc_prop} % in generic mode it can happen after @@ -817,20 +839,40 @@ { % in this case we need a special command in % luamode to get the array right. See issue #13 - \bool_if:NT\g_@@_mode_lua_bool + \bool_if:NTF\g_@@_mode_lua_bool { \@@_struct_exchange_kid_command:c {g_@@_struct_kids_#1_seq} +% \end{macrocode} +% check if we get null +% \begin{macrocode} + \tl_set:Ne\l_@@_tmpa_tl + {\use:e{\seq_item:cn {g__tag_struct_kids_#1_seq} {1}}} + \tl_if_eq:NNF\l__tag_tmpa_tl \c_@@_struct_null_tl + { + \@@_struct_prop_gput:nne + {#1} + {K} + { + \seq_item:cn + { + g_@@_struct_kids_#1_seq + } + {1} + } + } } - \@@_struct_prop_gput:nne - {#1} - {K} { - \seq_item:cn + \@@_struct_prop_gput:nne + {#1} + {K} { - g_@@_struct_kids_#1_seq + \seq_item:cn + { + g_@@_struct_kids_#1_seq + } + {1} } - {1} } } % } @@ -1007,7 +1049,7 @@ \pdf_object_ref:e { @@/struct/\l_@@_struct_stack_parent_tmpa_tl } } % increase the int: - \stepcounter{ g_@@_parenttree_obj_int } + \int_gincr:N \c@g_@@_parenttree_obj_int } } % \end{macrocode} @@ -1863,7 +1905,7 @@ % \section{Attributes and attribute classes} % \begin{macrocode} %<*header> -\ProvidesExplPackage {tagpdf-attr-code} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-attr-code} {2024-01-19} {0.98s} {part of tagpdf - code related to attributes and attribute classes} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx index df1f50fdd4d..fd0a8bfc2fd 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf-tree.dtx % -% Copyright (C) 2019-2023 Ulrike Fischer +% Copyright (C) 2019-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -47,13 +47,13 @@ % }^^A % } % -% \date{Version 0.98r, released 2023-12-18} +% \date{Version 0.98s, released 2024-01-19} % \maketitle % \begin{implementation} % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-tree-code} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-tree-code} {2024-01-19} {0.98s} {part of tagpdf - code related to writing trees and dictionaries to the pdf} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx index 5f1a72a3e89..682708d4f9c 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf-user.dtx % -% Copyright (C) 2019-2023 Ulrike Fischer +% Copyright (C) 2019-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98r, released 2023-12-18} +% \date{Version 0.98s, released 2024-01-19} % \maketitle % \begin{documentation} % \section{Setup commands} @@ -120,7 +120,7 @@ % \cs{ShowTagging} \Arg{key-val} % \end{syntax} % This is a generic function to output various debugging helps. It not -% necessarly stops the compilation. The keys and their function are described below. +% necessarily stops the compilation. The keys and their function are described below. % \end{function} % % \begin{function}{mc-data (show-key)} @@ -158,6 +158,15 @@ % If no value is used, then the default is |show|. % \end{function} % +% \begin{function}{debug/structures (show-key)} +% \begin{syntax} +% |debug/structures| = \meta{structure number} +% \end{syntax} +% This key is available only if the tagpdf-debug package is loaded +% and shows all structures starting with the one with the number +% given by the key. +% \end{function} + % \section{Extension commands} % The following commands and code parts are not core commands of tagpdf. % They either provide work-arounds for missing functionality elsewhere, @@ -243,6 +252,50 @@ % { Contents } % { (ref) } % \end{verbatim} +% +% \section{Socket support} +% +% \begin{function}{\tag_socket_use:n,\tag_socket_use:nn,\UseTaggingSocket} +% \begin{syntax} +% \cs{tag_socket_use:n} \Arg{socket name}\\ +% \cs{tag_socket_use:nn} \Arg{socket name} \Arg{socket argument}\\ +% \cs{UseTaggingSocket} \Arg{socket name} \\ +% \cs{UseTaggingSocket} \Arg{socket name} \Arg{socket argument}\\ +% \end{syntax} +% \end{function} + +% The next \LaTeX{} will use special sockets for the tagging. +% +% These sockets will use names starting +% with \texttt{tagsupport/}. Usually, these sockets have exactly two +% plugs defined: \texttt{noop} (when no tagging is requested or +% tagging is not wanted for some reason) and +% a second plug that enables the tagging. There +% may be more, e.g., tagging with special debugging, etc., but right +% now it is usually just on or off. +% +% Given that we sometimes have to suspend tagging, it would be fairly +% inefficient to put different plugs into these sockets whenever that +% happens. We therefore offer \cs{UseTaggingSocket} which is like +% \cs{UseSocket} except that the socket name is specified without +% \texttt{tagsupport/}, i.e., +% \begin{quote} +% \verb=\UseTaggingSocket{foo}= $\to$ +% \verb=\UseSocket{tagsupport/foo}= +% \end{quote} +% Beside being slightly shorter, the big advantage is that this way +% we can change \cs{UseTaggingSocket} to do nothing by switching a boolean +% instead of changing the plugs of the tagging support sockets back and forth. +% +% It is possible to use the tagging support sockets with +% \cs{UseSocket} directly, but in this case the socket remains active +% if e.g. \cs{SuspendTagging} is in force. There may be reasons for doing +% that but in general we expect to always use \cs{UseTaggingSocket}. +% +% The L3 programming layer versions \cs{tag_socket_use:n} and +% \cs{tag_socket_use:nn} are slightly more efficient than +% \cs{UseTaggingSocket} because they do not have to determine how +% many arguments the socket takes when disabling it. % \end{documentation} % % \begin{implementation} @@ -250,7 +303,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-user} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-user} {2024-01-19} {0.98s} {tagpdf - user commands} %</header> % \end{macrocode} @@ -347,39 +400,6 @@ % \end{macro} % % \section{Socket support} -% The next \LaTeX{} will use special sockets for the tagging. -% -% These sockets will use names starting -% with \texttt{tagsupport/}. Usually, these sockets have exactly two -% plugs defined: \texttt{noop} (when no tagging is requested or -% tagging is not wanted for some reason) and -% a second plug that enables the tagging. There -% may be more, e.g., tagging with special debugging, etc., but right -% now it is usually just on or off. -% -% Given that we sometimes have to suspend tagging, it would be fairly -% inefficient to put different plugs into these sockets whenever that -% happens. We therefore offer \cs{UseTaggingSocket} which is like -% \cs{UseSocket} except that the socket name is specified without -% \texttt{tagsupport/}, i.e., -% \begin{quote} -% \verb=\UseTaggingSocket{foo}= $\to$ -% \verb=\UseSocket{tagsupport/foo}= -% \end{quote} -% Beside being slightly shorter, the big advantage is that this way -% we can change \cs{UseTaggingSocket} to do nothing by switching a boolean -% instead of changing the plugs of the tagging support sockets back and forth. -% -% It is possible to use the tagging support sockets with -% \cs{UseSocket} directly, but in this case the socket remains active -% if e.g. \cs{SuspendTagging} is in force. There may be reasons for doing -% that but in general we expect to always use \cs{UseTaggingSocket}. -% -% The L3 programming layer versions \cs{tag_socket_use:n} and -% \cs{tag_socket_use:nn} are slightly more efficient than -% \cs{UseTaggingSocket} because they do not have to determine how -% many arguments the socket takes when disabling it. -% % Until we can be sure that the kernel defines the commands we provide them before % redefining them: % \begin{macrocode} @@ -718,7 +738,10 @@ % \g_@@_para_main_end_int, % \l_@@_para_tag_default_tl, % \l_@@_para_tag_tl, -% \l_@@_para_main_tag_tl} +% \l_@@_para_main_tag_tl, +% \l_@@_para_attr_class_tl, +% \l_@@_para_main_attr_class_tl, +% } % At first some variables. % \begin{macrocode} %</package> @@ -736,6 +759,12 @@ \tl_new:N \l_@@_para_main_tag_tl \tl_set:Nn \l_@@_para_main_tag_tl {text-unit} % \end{macrocode} +% this is perhaps already defined by the block code +% \begin{macrocode} +\tl_if_exist:NF \l_@@_para_attr_class_tl + {\tl_new:N \l_@@_para_attr_class_tl } +\tl_new:N \l_@@_para_main_attr_class_tl +% \end{macrocode} % \end{macro} % \begin{macro} @@ -827,6 +856,10 @@ % \begin{macrocode} \AddToHook{package/latex-lab-testphase-block/after} { + \tl_if_exist:NT \l_tag_para_attr_class_tl + { + \tl_set:Nn \l_@@_para_attr_class_tl { \l_tag_para_attr_class_tl } + } \cs_set_protected:Npn \__block_start_para_structure:n #1 { \__block_debug_typeout:n { @endpe = \legacy_if:nTF { @endpe }{true}{false} @@ -836,7 +869,11 @@ \bool_if:NF \l__tag_para_flattened_bool { \@@_gincr_para_main_begin_int: - \tag_struct_begin:n{tag=\l__tag_para_main_tag_tl} + \tag_struct_begin:n + { + tag=\l_@@_para_main_tag_tl, + attribute-class=\l_@@_para_main_attr_class_tl, + } } } \@@_gincr_para_begin_int: @@ -844,7 +881,7 @@ \tag_struct_begin:n { tag=\l__tag_para_tag_tl - ,attribute-class=\l_tag_para_attr_class_tl + ,attribute-class=\l_@@_para_attr_class_tl } \__tag_check_para_begin_show:nn {green}{#1} \tag_mc_begin:n {} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx index 37de4d99272..4eb87d0faf0 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx @@ -2,7 +2,7 @@ % %% File: tagpdf.dtx % -% Copyright (C) 2019-2023 Ulrike Fischer +% Copyright (C) 2019-2024 Ulrike Fischer % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -84,7 +84,7 @@ % \begin{macrocode} %<@@=tag> %<*package> -\ProvidesExplPackage {tagpdf} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf} {2024-01-19} {0.98s} { A package to experiment with pdf tagging } \bool_if:nF @@ -110,7 +110,7 @@ % \end{macrocode} %<*debug> % \begin{macrocode} -\ProvidesExplPackage {tagpdf-debug} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-debug} {2024-01-19} {0.98s} { debug code for tagpdf } \@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput} % \end{macrocode} @@ -133,7 +133,7 @@ % we define a base package with dummy functions % \begin{macrocode} %<*base> -\ProvidesExplPackage {tagpdf-base} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-base} {2024-01-19} {0.98s} {part of tagpdf - provide base, no-op versions of the user commands } %</base> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf.ins b/Master/texmf-dist/source/latex/tagpdf/tagpdf.ins index f0b7ac2284b..bc48d45842d 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf.ins +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf.ins @@ -2,7 +2,7 @@ File: tagpdf.ins -Copyright (C) 2019-2023 Ulrike Fischer +Copyright (C) 2019-2024 Ulrike Fischer It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -34,7 +34,7 @@ for those people who are interested. \let\MetaPrefix\relax \preamble -Copyright (C) 2019-2023 Ulrike Fischer +Copyright (C) 2019-2024 Ulrike Fischer It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty index 042dbf92012..524546ed76c 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty @@ -12,7 +12,7 @@ %% tagpdf-user.dtx (with options: `base') %% tagpdf-roles.dtx (with options: `base') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -25,7 +25,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf-base} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-base} {2024-01-19} {0.98s} {part of tagpdf - provide base, no-op versions of the user commands } \AddToHook{begindocument} { @@ -85,6 +85,8 @@ \cs_new_protected:Npn \tag_struct_use_num:n #1 {} %% File: tagpdf-checks.dtx + + \cs_new:Npn \tag_get:n #1 { \use:c {__tag_get_data_#1: } } \prg_new_conditional:Npnn \tag_if_active: { p , T , TF, F } { \prg_return_false: } @@ -104,6 +106,8 @@ %% File: tagpdf-user.dtx + + \NewDocumentCommand \tagpdfsetup { m }{} \cs_new_protected:Npn\tag_tool:n #1 {} \cs_set_eq:NN\tagtool\tag_tool:n diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty index 3bc33d4189d..5d9a6627436 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty @@ -6,7 +6,7 @@ %% %% tagpdf-mc-generic.dtx (with options: `debug') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-generic.dtx -\ProvidesExplPackage {tagpdf-debug-generic} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-debug-generic} {2024-01-19} {0.98s} {part of tagpdf - debugging code related to marking chunks - generic mode} \cs_set_protected:Npn \tag_mc_begin:n #1 %#1 keyval { diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty index 96ef7382798..e9988f2ba07 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty @@ -6,7 +6,7 @@ %% %% tagpdf-mc-luacode.dtx (with options: `debug') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-luacode.dtx -\ProvidesExplPackage {tagpdf-debug-lua} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-debug-lua} {2024-01-19} {0.98s} {part of tagpdf - debugging code related to marking chunks - lua mode} \cs_set_protected:Npn \__tag_mc_handle_stash:n #1 %1 mcidnum { diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty index e5f6ff92f6b..56b6cde9951 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty @@ -13,7 +13,7 @@ %% tagpdf-struct.dtx (with options: `debug') %% tagpdf-space.dtx (with options: `debug') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -26,7 +26,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf-debug} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-debug} {2024-01-19} {0.98s} { debug code for tagpdf } \@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput} \prop_gput:Nnn \g_msg_module_type_prop { tag / debug} {} @@ -85,6 +85,8 @@ \RequirePackage {tagpdf-debug-generic} % } %% File: tagpdf-checks.dtx + + \msg_new:nnn { tag/debug } { show-struct } { =========================\\ @@ -215,6 +217,8 @@ + + \keys_define:nn { __tag / show } { ,debug/structures .code:n = diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def index e0e335e86ca..36f4cde8c19 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def @@ -6,7 +6,7 @@ %% %% tagpdf-backend.dtx (with options: `luatex') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-backend.dtx -\ProvidesExplFile {tagpdf-luatex.def} {2023-12-18} {0.98r} +\ProvidesExplFile {tagpdf-luatex.def} {2024-01-19} {0.98s} {tagpdf~driver~for~luatex} { \fontencoding{TU}\fontfamily{lmr}\fontseries{m}\fontshape{n}\fontsize{10pt}{10pt}\selectfont diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty index b71722d3960..741bd69a50a 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty @@ -6,7 +6,7 @@ %% %% tagpdf-mc-generic.dtx (with options: `generic') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-generic.dtx -\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-01-19} {0.98s} {part of tagpdf - code related to marking chunks - generic mode} \tl_new:N \l__tag_mc_ref_abspage_tl diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty index c903cc5a485..6ec3561cee9 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty @@ -6,7 +6,7 @@ %% %% tagpdf-mc-luacode.dtx (with options: `luamode') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-luacode.dtx -\ProvidesExplPackage {tagpdf-mc-code-lua} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-01-19} {0.98s} {tagpdf - mc code only for the luamode } \hook_gput_code:nnn{begindocument}{tagpdf/mc} { diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def index 2f34c74c58b..22dc3f11c9b 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def @@ -6,7 +6,7 @@ %% %% tagpdf-data.dtx (with options: `ns-latex-book') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2023-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-01-19} {0.98s} %% {latex-book} {https://www.latex-project.org/ns/book/2022}{} chapter, H1,pdf2, section, H2,pdf2, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-inline.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-inline.def index 3be6393b2c1..11348d53944 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-inline.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-inline.def @@ -6,7 +6,7 @@ %% %% tagpdf-data.dtx (with options: `ns-latex-inline') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2023-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2024-01-19} {0.98s} %% {latex-inline} {https://www.latex-project.org/ns/inline/2022}{} chapter, Span, pdf2, section, Span, pdf2, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def index 0fd9ab2997b..cbe2cf34895 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def @@ -6,7 +6,7 @@ %% %% tagpdf-data.dtx (with options: `ns-latex') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-latex.def} {2023-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-01-19} {0.98s} %% {latex} {https://www.latex-project.org/ns/dflt/2022}{} title, Title, pdf2, part, Title, pdf2, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def index ad406cf1cc0..0098689522b 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def @@ -6,7 +6,7 @@ %% %% tagpdf-data.dtx (with options: `ns-mathml') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2023-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-01-19} {0.98s} abs,abs,mathml, and,and,mathml, annotation,annotation,mathml, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def index 9d1f42476a5..9cba37eb847 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def @@ -6,7 +6,7 @@ %% %% tagpdf-data.dtx (with options: `ns-pdf') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2023-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-01-19} {0.98s} %% {pdf} {http://iso.org/pdf/ssn}{} StructTreeRoot,StructTreeRoot,pdf,D, Document,Document,pdf,D, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def index 931c0447a97..ea0d3aa58e2 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def @@ -6,7 +6,7 @@ %% %% tagpdf-data.dtx (with options: `ns-pdf2') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,8 +19,9 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2023-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-01-19} {0.98s} %% {pdf2} {http://iso.org/pdf2/ssn}{} +StructTreeRoot,StructTreeRoot,pdf2,D, Document,Document,pdf2,D, Part,Part,pdf2,G, Sect,Sect,pdf2,G, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv index 919421b4a34..8ba3a02c8ec 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv @@ -6,7 +6,7 @@ %% %% tagpdf-data.dtx (with options: `parent-child-2') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2023-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-01-19} {0.98s} ,,,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/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv index ae27403821d..ac98db24927 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv @@ -6,7 +6,7 @@ %% %% tagpdf-data.dtx (with options: `parent-child') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-parent-child.csv} {2023-12-18} {0.98r} +%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-01-19} {0.98s} ,,,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,β
,β
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua index f5394895eac..80ab1f24a81 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua @@ -6,7 +6,7 @@ -- -- tagpdf-backend.dtx (with options: `lua') -- --- Copyright (C) 2019-2023 Ulrike Fischer +-- Copyright (C) 2019-2024 Ulrike Fischer -- -- It may be distributed and/or modified under the conditions of -- the LaTeX Project Public License (LPPL), either version 1.3c of @@ -24,8 +24,8 @@ local ProvidesLuaModule = { name = "tagpdf", - version = "0.98r", --TAGVERSION - date = "2023-12-18", --TAGDATE + version = "0.98s", --TAGVERSION + date = "2024-01-19", --TAGDATE description = "tagpdf lua code", license = "The LATEX Project Public License 1.3c" } @@ -411,6 +411,7 @@ local function __tag_mark_spaces (head) local id = n.id if id == GLYPH then local glyph = n + default_currfontid = glyph.font if glyph.next and (glyph.next.id == GLUE) and not inside_math and (glyph.next.width >0) then @@ -448,7 +449,8 @@ local function __tag_mark_spaces (head) and not inside_math and (glyph.next.width >0) and n.subtype==0 then nodesetattribute(glyph.next,iwspaceattributeid,1) - -- nodesetattribute(glyph.next,iwfontattributeid,glyph.font) + -- changed 2024-01-18, issue #72 + nodesetattribute(glyph.next,iwfontattributeid,default_currfontid) -- for debugging if ltx.__tag.trace.showspaces then __tag_show_spacemark (head,glyph) @@ -479,6 +481,7 @@ end ltx.__tag.func.markspaceoff=__tag_deactivate_mark_space local default_space_char = nodenew(GLYPH) local default_fontid = fontid("TU/lmr/m/n/10") +local default_currfontid = fontid("TU/lmr/m/n/10") default_space_char.char = 32 default_space_char.font = default_fontid local function __tag_font_has_space (fontid) diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty index c2018a1dae0..8bd5ebe5d77 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty @@ -15,7 +15,7 @@ %% tagpdf-space.dtx (with options: `package') %% tagpdf-user.dtx (with options: `package') %% -%% Copyright (C) 2019-2023 Ulrike Fischer +%% Copyright (C) 2019-2024 Ulrike Fischer %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -28,7 +28,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdf} {2024-01-19} {0.98s} { A package to experiment with pdf tagging } \bool_if:nF @@ -260,6 +260,8 @@ \file_input:n {tagpdf-luatex.def} } %% File: tagpdf-checks.dtx + + \msg_new:nnn { tag } {mc-nested} { nested~marked~content~found~-~mcid~#1 } \msg_new:nnn { tag } {mc-tag-missing} { required~tag~missing~-~mcid~#1 } \msg_new:nnn { tag } {mc-label-unknown} @@ -1810,6 +1812,7 @@ } %% File: tagpdf-struct.dtx \__tag_seq_new:N \g__tag_struct_objR_seq +\tl_const:Nn\c__tag_struct_null_tl {null} \__tag_prop_new:N \g__tag_struct_cont_mc_prop \seq_new:N \g__tag_struct_stack_seq @@ -2064,20 +2067,37 @@ { % in this case we need a special command in % luamode to get the array right. See issue #13 - \bool_if:NT\g__tag_mode_lua_bool + \bool_if:NTF\g__tag_mode_lua_bool { \__tag_struct_exchange_kid_command:c {g__tag_struct_kids_#1_seq} + \tl_set:Ne\l__tag_tmpa_tl + {\use:e{\seq_item:cn {g__tag_struct_kids_#1_seq} {1}}} + \tl_if_eq:NNF\l__tag_tmpa_tl \c__tag_struct_null_tl + { + \__tag_struct_prop_gput:nne + {#1} + {K} + { + \seq_item:cn + { + g__tag_struct_kids_#1_seq + } + {1} + } + } } - \__tag_struct_prop_gput:nne - {#1} - {K} { - \seq_item:cn + \__tag_struct_prop_gput:nne + {#1} + {K} { - g__tag_struct_kids_#1_seq + \seq_item:cn + { + g__tag_struct_kids_#1_seq + } + {1} } - {1} } } % } @@ -2198,7 +2218,7 @@ \pdf_object_ref:e { __tag/struct/\l__tag_struct_stack_parent_tmpa_tl } } % increase the int: - \stepcounter{ g__tag_parenttree_obj_int } + \int_gincr:N \c@g__tag_parenttree_obj_int } } \cs_new:Npn \__tag_get_data_struct_tag: @@ -2950,6 +2970,8 @@ %% File: tagpdf-user.dtx + + \RenewDocumentCommand \tagpdfsetup { m } { \keys_set:nn { __tag / setup } { #1 } @@ -3167,6 +3189,9 @@ \tl_set:Nn \l__tag_para_tag_tl { \l__tag_para_tag_default_tl } \tl_new:N \l__tag_para_main_tag_tl \tl_set:Nn \l__tag_para_main_tag_tl {text-unit} +\tl_if_exist:NF \l__tag_para_attr_class_tl + {\tl_new:N \l__tag_para_attr_class_tl } +\tl_new:N \l__tag_para_main_attr_class_tl \cs_new_protected:Npn \__tag_gincr_para_main_begin_int: { @@ -3235,6 +3260,10 @@ } \AddToHook{package/latex-lab-testphase-block/after} { + \tl_if_exist:NT \l_tag_para_attr_class_tl + { + \tl_set:Nn \l__tag_para_attr_class_tl { \l_tag_para_attr_class_tl } + } \cs_set_protected:Npn \__block_start_para_structure:n #1 { \__block_debug_typeout:n { @endpe = \legacy_if:nTF { @endpe }{true}{false} @@ -3244,7 +3273,11 @@ \bool_if:NF \l__tag_para_flattened_bool { \__tag_gincr_para_main_begin_int: - \tag_struct_begin:n{tag=\l__tag_para_main_tag_tl} + \tag_struct_begin:n + { + tag=\l__tag_para_main_tag_tl, + attribute-class=\l__tag_para_main_attr_class_tl, + } } } \__tag_gincr_para_begin_int: @@ -3252,7 +3285,7 @@ \tag_struct_begin:n { tag=\l__tag_para_tag_tl - ,attribute-class=\l_tag_para_attr_class_tl + ,attribute-class=\l__tag_para_attr_class_tl } \__tag_check_para_begin_show:nn {green}{#1} \tag_mc_begin:n {} diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty index 91df3a4761a..d6f5e6eb59d 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty @@ -1,5 +1,5 @@ %\RequirePackage[enable-debug]{expl3}[2018/06/14] -\ProvidesExplPackage {tagpdfdocu-patches} {2023-12-18} {0.98r} +\ProvidesExplPackage {tagpdfdocu-patches} {2024-01-19} {0.98s} {patches/commands for the tagpdf documentation} \RequirePackage{etoolbox,xpatch} |