diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/tagpdf')
15 files changed, 48 insertions, 47 deletions
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-attr-code.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-attr-code.sty index 1219e519faa..9bb57f2bb38 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-attr-code.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-attr-code.sty @@ -1,4 +1,4 @@ -\ProvidesExplPackage {tagpdf-attr-code} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdf-attr-code} {2019/07/02} {0.61} {part of tagpdf - code related to attributes and attribute classes} % the obj is written in tagpdf-tree-code. 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 dc9bc0fcf2b..6d224c4164a 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} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdf-checks-code} {2019/07/02} {0.61} {part of tagpdf - code related to checks and messages} diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def index db7790e25ba..5cb16c5216c 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def @@ -1,5 +1,5 @@ -\ProvidesExplFile {tagpdf-luatex.def} {2019/03/20} {0.60} - {tagpdf driver for luatex} +\ProvidesExplFile {tagpdf-luatex.def} {2019/07/02} {0.61} + {tagpdf~driver~for~luatex} %\newattribute \g__uftag_mc_type_attr %the value represent the type %\newattribute \g__uftag_mc_cnt_attr %will hold the \c@g__uftag_MCID_abs_int value 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 85c4f453300..3f6ce228834 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} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2019/07/02} {0.61} {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 a59df867b9d..4387d3b8085 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 @@ -\ProvidesExplPackage {tagpdf-mc-code-lua} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2019/07/02} {0.61} {tagpdf - mc code only for the luamode } % the two attibutes are defined in the driver file. @@ -250,6 +250,7 @@ \exp_args:Nx \__uftag_mc_handle_stash:n { \__uftag_get_mc_abs_cnt: } } } + \bool_set_false:N\l__uftag_mc_artifact_bool %\group_end: } 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 b707722cb2f..b9bbe29eb36 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} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdf-mc-code-shared} {2019/07/02} {0.61} {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 52cc4750ff6..55e9e0c3b8a 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-pdftex.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-pdftex.def @@ -1,5 +1,5 @@ -\ProvidesExplFile {tagpdf-pdftex.def} {2019/03/20} {0.60} - {tagpdf driver for pdftex} +\ProvidesExplFile {tagpdf-pdftex.def} {2019/07/02} {0.61} + {tagpdf~driver~for~pdftex} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%% driver (pdflatex) commands 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 fe0f494acd0..212b216c79d 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} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdf-roles-code} {2019/07/02} {0.61} {part of tagpdf - code related to roles and structure names} \__uftag_seq_new:N \g__uftag_role_tags_seq %to get names from numbers diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-space-code.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-space-code.sty index 74b252931c3..c47da0e73d4 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-space-code.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-space-code.sty @@ -1,4 +1,4 @@ -\ProvidesExplPackage {tagpdf-space-code} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdf-space-code} {2019/07/02} {0.61} {part of tagpdf - code related to real space chars} % luatex uses an attribute (declared in the driver file) and some luacode in tagpdf.lua % perhaps I will split the code by engine in the future 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 27106c12c59..2096a937fc9 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} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdf-struct-code} {2019/07/02} {0.61} {part of tagpdf - code related to storing structure} % I will use a latex counter for the structure count 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 acc72b2d668..af8ec11aa9c 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} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdf-tree-code} {2019/07/02} {0.61} {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 0f5a9d9059b..5bce390e4f4 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 @@ -\ProvidesExplPackage {tagpdf-user} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdf-user} {2019/07/02} {0.61} {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 577afedaa11..e3b2373bc05 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua @@ -1,8 +1,18 @@ --- Packageversion: 0.60 --- Packagedate: 2019/03/20 -- tagpdf.lua -- Ulrike Fischer +local ProvidesLuaModule = { + name = "tagpdf", + version = "0.61", --TAGVERSION + date = "2019-07-02", --TAGDATE + description = "tagpdf lua code", + license = "The LATEX Project Public License 1.3c" +} + +if luatexbase and luatexbase.provides_module then + luatexbase.provides_module (ProvidesLuaModule) +end + --[[ The code has quite probably a number of problems - more variables should be local instead of global @@ -512,11 +522,10 @@ function uftag.func.store_mc_kid (mcnum,kid,page) tableinsert(uftag.mc[mcnum]["kids"], kidtable ) end + function uftag.func.mc_num_of_kids (mcnum) local num = 0 if uftag.mc[mcnum] and uftag.mc[mcnum]["kids"] then - texio.write_nl("XXXXXXXXXXXXXXXXX") - texio.write_nl(table.serialize(uftag.mc[mcnum]["kids"])) num = #uftag.mc[mcnum]["kids"] end uftag.trace.log ("MC" .. mcnum .. "has " .. num .. "KIDS",4) @@ -554,6 +563,7 @@ function uftag.func.store_struct_mcabs (structnum,mcnum) uftag.struct[structnum]["mc"]=uftag.struct[structnum]["mc"] or { } -- a structure can contain more than on mc chunk, the content should be ordered tableinsert(uftag.struct[structnum]["mc"],mcnum) + uftag.trace.log("MCNUM "..mcnum.." insert in struct "..structnum,3) -- but every mc can only be in one structure uftag.mc[mcnum]= uftag.mc[mcnum] or { } uftag.mc[mcnum]["parent"] = structnum diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty index f583383c897..4163494d313 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty @@ -1,7 +1,7 @@ -\RequirePackage{expl3}[2018/06/14] +\RequirePackage{expl3}[2019/07/01] %\RequirePackage[enable-debug]{expl3}[2018/06/14] -\ProvidesExplPackage {tagpdf} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdf} {2019/07/02} {0.61} {A package to experiment with pdf tagging} %\debug_on:n{check-declarations,check-expressions,deprecation} @@ -41,10 +41,11 @@ \RequirePackage{atbegshi} \RequirePackage{zref-base,zref-lastpage} \RequirePackage{etoolbox} +\RequirePackage{l3pdf} %\RequirePackage{pdfescape} %check if needed %\RequirePackage{pdftexcmds}%check if needed (expandable commands!) -\RequirePackage{l3str-convert} +%\RequirePackage{l3str-convert} \cs_generate_variant:Nn \str_set_convert:Nnnn {Nonn, Noon, Nnon } @@ -83,18 +84,7 @@ tabsorder / structure .code:n = {\tl_set:Nn \l__uftag_tree_tabs_order_tl {/Tabs/S}}, tabsorder / none .code:n = {\tl_set:Nn \l__uftag_tree_tabs_order_tl {}}, tabsorder .initial:n = structure, - compresslevel .choices:nn = {1,2,3,4,5,6,7,8,9} - { - \driver_pdf_compresslevel:n {#1} - \driver_pdf_objects_enable: - }, - compresslevel / 0 .code:n = - { - \driver_pdf_compresslevel:n { 0 } - \driver_pdf_objects_disable: - }, - compresslevel .value_required:n = true, - uncompress .meta:n = { compresslevel = 0 }, + uncompress .code:n = {\pdf_uncompress: }, inputencoding .code:n = { \sys_if_engine_pdftex:T @@ -102,7 +92,7 @@ }, } -% escape commands are a bit engine specific so have been moved to the driver files. +% escape commands are a bit engine specific so have been moved to the backend files. % commands to escape strings so that they can be safely used in pdf % currently not much used. But will be needed later, when alt and actualtext are added. % we probably need the equivalent \pdfescapestring, \pdfescapename \pdfescapehex @@ -114,7 +104,7 @@ %\cs_set_eq:NN \__uftag_pdf_escape_string:n \EdefEscapeString %\cs_set_eq:NN \__uftag_pdf_escape_name:Nn \EdefEscapeName -%escape command. They are driver specific as \pdf@escapehex would ignore most chars +%escape command. They are backend specific as \pdf@escapehex would ignore most chars %outside the "pdflatex" range @@ -137,7 +127,7 @@ } -%testing the engines and loading the driver files +%testing the engines and loading the backend files \sys_if_engine_xetex:T { \PackageError { tagpdf } { xelatex~is~not~supported~-~aborting } {} diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty index bbebe1a99f3..d810bef9f1b 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty @@ -1,7 +1,7 @@ \RequirePackage{expl3}[2018/06/14] %\RequirePackage[enable-debug]{expl3}[2018/06/14] \RequirePackage{xpatch} -\ProvidesExplPackage {tagpdfdocu-patches} {2019/03/20} {0.60} +\ProvidesExplPackage {tagpdfdocu-patches} {2019/07/02} {0.61} {patches/commands for the tagpdf documentation} % to do : marginnote, perhaps the description macros ... @@ -198,7 +198,7 @@ % keys that overwrite \enit@format must be patched, eg like the follow % the font key should be patched in a similar way -\enitkv@key{enumitem}{format}{% +\enitkv@key{}{format}{% new enumitem don't use first argument \def\enit@format{% \tagstructbegin{tag=LI}% \tagstructbegin{tag=Lbl}% @@ -213,20 +213,20 @@ { \hook_put_left:nnn { pdf } - { startlink_url } + { link_begin_url } { \uftag_struct_begin:n{tag=Link} - \uftag_mc_begin:n{tag=Link}\def\blub{abc} + \uftag_mc_begin:n{tag=Link} } \hook_put:nnnn { pdf } - { startlink_url_attr } + { link_begin_url_attr } { /StructParent } { \int_use:N\c@g__uftag_parenttree_obj_int } \hook_put_right:nnn { pdf } - { endlink_url } + { link_end_url } { \__uftag_struct_finish_link: \uftag_mc_end: @@ -235,19 +235,19 @@ \hook_put_left:nnn { pdf } - { startlink_link } + { link_begin_link } { \uftag_struct_begin:n{tag=Link} \uftag_mc_begin:n{tag=Link} } \hook_put:nnnn { pdf } - { startlink_link_attr } + { link_begin_link_attr } { /StructParent } { \int_use:N\c@g__uftag_parenttree_obj_int } \hook_put_right:nnn { pdf } - { endlink_link } + { link_end_link } { \__uftag_struct_finish_link: \uftag_mc_end: @@ -257,13 +257,13 @@ % "alternative descriptions " for PAX3. How to get better text here?? \hook_put:nnnn { pdf } - { startlink_url_attr } + { link_begin_url_attr } { /Contents } { (url) } \hook_put:nnnn { pdf } - { startlink_link_attr } + { link_begin_link_attr } { /Contents } { (ref) } } |