From 4bbc008e81df7ec54a401548c1403201a26488b2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 10 Jul 2018 21:05:49 +0000 Subject: tagpdf (10jul18) git-svn-id: svn://tug.org/texlive/trunk@48178 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tagpdf/tagpdf-checks-code.sty | 10 +++++++++- Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def | 2 +- Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty | 2 +- Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty | 2 +- Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-shared.sty | 2 +- Master/texmf-dist/tex/latex/tagpdf/tagpdf-pdftex.def | 2 +- Master/texmf-dist/tex/latex/tagpdf/tagpdf-roles-code.sty | 4 ++-- Master/texmf-dist/tex/latex/tagpdf/tagpdf-struct-code.sty | 6 +++++- Master/texmf-dist/tex/latex/tagpdf/tagpdf-tree-code.sty | 2 +- Master/texmf-dist/tex/latex/tagpdf/tagpdf-user.sty | 2 +- Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua | 10 +++++----- Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty | 2 +- 12 files changed, 29 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tagpdf') diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-checks-code.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-checks-code.sty index b1959acc42e..107dcb3ab80 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-checks-code.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-checks-code.sty @@ -1,4 +1,4 @@ -\ProvidesExplPackage {tagpdf-checks-code} {2018/07/04} {0.1} +\ProvidesExplPackage {tagpdf-checks-code} {2018/07/09} {0.2} {part of tagpdf - code related to checks and messages} @@ -46,6 +46,14 @@ } } +\cs_new:Nn \__uftag_check_structure_tag:N + { + \prop_if_in:NoF \g__uftag_role_tags_prop { #1 } + { + \msg_warning:nnx {tagpdf}{role-unknown-tag} { #1 } + } + } + \cs_new:Nn \__uftag_check_info_closing_struct:n %#1 struct num { \msg_info:nnn {tagpdf}{struct-show-closing}{#1} diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def index 3cff65569c1..4590d0cc21f 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def @@ -1,4 +1,4 @@ -\ProvidesExplFile {tagpdf-luatex.def} {2018/07/04} {0.1} +\ProvidesExplFile {tagpdf-luatex.def} {2018/07/09} {0.2} {tagpdf driver for luatex} \newattribute \g__uftag_mc_type_attr %the value represent the type 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 5bdab895e61..29309cfba33 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 @@ -1,4 +1,4 @@ -\ProvidesExplPackage {tagpdf-mc-code-generic} {2018/07/04} {0.1} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2018/07/09} {0.2} {part of tagpdf - code related to marking chunks - generic mode} % for the label system 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 0d8a66b12a1..3b252c59739 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 @@ -1,4 +1,4 @@ -\ProvidesExplFile {tagpdf-mc-code-lua.sty} {2018/07/04} {0.1} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2018/07/09} {0.2} {tagpdf - mc code only for the luamode } %the two attibutes are defined in the driver file. diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-shared.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-shared.sty index 006014432c2..8c5013ec0a3 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-shared.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-shared.sty @@ -1,4 +1,4 @@ -\ProvidesExplPackage {tagpdf-mc-code-shared} {2018/07/04} {0.1} +\ProvidesExplPackage {tagpdf-mc-code-shared} {2018/07/09} {0.2} {part of tagpdf - code related to marking chunks - code shared by generic and luamode } % I use a latex counter for the absolute count, so that it is added to diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-pdftex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-pdftex.def index af728c69d90..61dc45b2a6b 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-pdftex.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-pdftex.def @@ -1,4 +1,4 @@ -\ProvidesExplFile {tagpdf-pdftex.def} {2018/07/04} {0.1} +\ProvidesExplFile {tagpdf-pdftex.def} {2018/07/09} {0.2} {tagpdf driver for pdftex} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-roles-code.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-roles-code.sty index 06489c6ea8c..93180cc8576 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-roles-code.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-roles-code.sty @@ -1,4 +1,4 @@ -\ProvidesExplPackage {tagpdf-roles-code} {2018/07/04} {0.1} +\ProvidesExplPackage {tagpdf-roles-code} {2018/07/09} {0.2} {part of tagpdf - code related to roles and structure names} \__uftag_seq_new:N \g__uftag_role_tags_seq %to get names from numbers @@ -35,7 +35,7 @@ L, %list LI, %list item (around label and list item body) Lbl, %list label - Lbody, %list item body + LBody, %list item body Table, TR, %table row TH, %table header cell diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-struct-code.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-struct-code.sty index 24345dfd196..3c92767a107 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-struct-code.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-struct-code.sty @@ -1,4 +1,4 @@ -\ProvidesExplPackage {tagpdf-struct-code} {2018/07/04} {0.1} +\ProvidesExplPackage {tagpdf-struct-code} {2018/07/09} {0.2} {part of tagpdf - code related to storing structure} % I will use a latex counter for the structure count @@ -256,6 +256,10 @@ tag .code:n = % S property { \__uftag_pdf_escape_name:Nn \l__uftag_tmpa_tl { #1 } + \bool_if:NT \g__uftag_check_tags_bool + { + \__uftag_check_structure_tag:N \l__uftag_tmpa_tl + } \__uftag_prop_gput:cnx { g__uftag_struct_\int_eval:n {\c@g__uftag_struct_abs_int}_prop } { S } diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-tree-code.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-tree-code.sty index 751c26974d2..2fd82d27f66 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-tree-code.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-tree-code.sty @@ -1,4 +1,4 @@ -\ProvidesExplPackage {tagpdf-tree-code} {2018/07/04} {0.1} +\ProvidesExplPackage {tagpdf-tree-code} {2018/07/09} {0.2} {part of tagpdf - code related to writing trees and dictionaries to the pdf} %this does the actual finishing: diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-user.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-user.sty index 084c0f36030..137d636cc64 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-user.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-user.sty @@ -1,4 +1,4 @@ -\ProvidesExplFile {tagpdf-user.sty} {2018/07/04} {0.1} +\ProvidesExplPackage {tagpdf-user} {2018/07/09} {0.2} {tagpdf - user commands} \NewDocumentCommand \tagpdfsetup { m } diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua index 4c0c6678d7d..ca49eb887be 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua @@ -1,5 +1,5 @@ --- Packageversion: 0.1 --- Packagedate: 2018/07/04 +-- Packageversion: 0.2 +-- Packagedate: 2018/07/09 -- tagpdf.lua -- Ulrike Fischer @@ -435,7 +435,7 @@ end function uftag.func.fill_parent_tree_line (page) -- we need to get page-> i=kid -> mcnum -> structnum -- pay attention: the kid numbers and the page number in the parent tree start with 0! - local numsentry + local numsentry ="" local pdfpage = page-1 if uftag.page[page] and uftag.page[page][0] then mcchunks=#uftag.page[page] @@ -465,9 +465,9 @@ function uftag.func.fill_parent_tree_line (page) uftag.trace.log("PAGETREE PAGE" .. page.. " NUM ENTRY = ".. numsentry,3) end else - uftag.trace.log ("PAGETREE: NO DATA FOR PAGE "..i,3) + uftag.trace.log ("PAGETREE: NO DATA FOR PAGE "..page,3) end - return numsentry + return numsentry end function uftag.func.output_parenttree (abspage) diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty index a9dc7173783..15c87eb3fed 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty @@ -1,6 +1,6 @@ \RequirePackage{expl3}[2018/06/14] -\ProvidesExplPackage {tagpdf} {2018/07/04} {0.1} +\ProvidesExplPackage {tagpdf} {2018/07/09} {0.2} {A package to experiment with pdf tagging} % storing internal names to my name space: -- cgit v1.2.3