2014-12-30 09:50:00

1 files changed, 261 insertions, 84 deletions

diff --git a/tex/context/base/lpdf-tag.lua b/tex/context/base/lpdf-tag.lua
index 904d5b196..dbe4d3f1e 100644
--- a/tex/context/base/lpdf-tag.lua
+++ b/tex/context/base/lpdf-tag.lua
@@ -157,10 +157,10 @@ local pdf_mcr            = pdfconstant("MCR")
 local pdf_struct_element = pdfconstant("StructElem")
 
 local function initializepage()
-    index = 0
+    index   = 0
     pagenum = texgetcount("realpageno")
     pageref = pdfreference(pdfpagereference(pagenum))
-    list = pdfarray()
+    list    = pdfarray()
     tree[pagenum] = list -- we can flush after done, todo
 end
 
@@ -231,16 +231,16 @@ local function makeelement(fulltag,parent)
     return e
 end
 
-local f_BDC = formatters["/%s <</MCID %s>>BDC"]
+local f_BDC = formatters["/%s <</MCID %s>> BDC"]
 
-local function makecontent(parent,start,stop,slist,id)
+local function makecontent(parent,id)
     local tag  = parent.tag
     local kids = parent.kids
     local last = index
     if id == "image" then
         local d = pdfdictionary {
             Type = pdf_mcr,
-         -- Pg   = pageref,
+            Pg   = pageref,
             MCID = last,
             Alt  = "image",
         }
@@ -250,104 +250,108 @@ local function makecontent(parent,start,stop,slist,id)
     else
         local d = pdfdictionary {
             Type = pdf_mcr,
-         -- Pg   = pageref,
+            Pg   = pageref,
             MCID = last,
         }
      -- kids[#kids+1] = pdfreference(pdfflushobject(d))
         kids[#kids+1] = d
     end
     --
-    local bliteral = pdfliteral(f_BDC(tag,last))
-    local eliteral = pdfliteral("EMC") -- could be a copy
-    -- use insert instead:
-    local prev = getprev(start)
-    if prev then
-        setfield(prev,"next",bliteral)
-        setfield(bliteral,"prev",prev)
-    end
-    setfield(start,"prev",bliteral)
-    setfield(bliteral,"next",start)
-    -- use insert instead:
-    local next = getnext(stop)
-    if next then
-        setfield(next,"prev",eliteral)
-        setfield(eliteral,"next",next)
-    end
-    setfield(stop,"next",eliteral)
-    setfield(eliteral,"prev",stop)
-    --
-    if slist and getlist(slist) == start then
-        setfield(slist,"list",bliteral)
-    elseif not getprev(start) then
-        report_tags("this can't happen: injection in front of nothing")
-    end
     index = index + 1
-    list[index] = parent.pref
-    return bliteral, eliteral
+    list[index] = parent.pref -- page related list
+    --
+    return f_BDC(tag,last)
 end
 
--- -- --
-
-local level, last, ranges, range = 0, nil, { }, nil
-
-local function collectranges(head,list)
-    for n in traverse_nodes(head) do
-        local id = getid(n) -- 14: image, 8: literal (mp)
-        if id == glyph_code then
-            local at = getattr(n,a_tagged)
-            if not at then
-                range = nil
-            elseif last ~= at then
-                range = { at, "glyph", n, n, list } -- attr id start stop list
-                ranges[#ranges+1] = range
-                last = at
-            elseif range then
-                range[4] = n -- stop
-            end
-        elseif id == hlist_code or id == vlist_code then
-            local at = getattr(n,a_image)
-            if at then
+-- no need to adapt head, as we always operate on lists
+
+function nodeinjections.addtags(head)
+
+    local last   = nil
+    local ranges = { }
+    local range  = nil
+	local head   = tonut(head)
+
+    local function collectranges(head,list)
+        for n in traverse_nodes(head) do
+            local id = getid(n) -- 14: image, 8: literal (mp)
+            if id == glyph_code then
                 local at = getattr(n,a_tagged)
                 if not at then
                     range = nil
+                elseif last ~= at then
+                    range = { at, "glyph", n, n, list } -- attr id start stop list
+                    ranges[#ranges+1] = range
+                    last = at
+                elseif range then
+                    range[4] = n -- stop
+                end
+            elseif id == hlist_code or id == vlist_code then
+                local at = getattr(n,a_image)
+                if at then
+                    local at = getattr(n,a_tagged)
+                    if not at then
+                        range = nil
+                    else
+                        ranges[#ranges+1] = { at, "image", n, n, list } -- attr id start stop list
+                    end
+                    last = nil
                 else
-                    ranges[#ranges+1] = { at, "image", n, n, list } -- attr id start stop list
+                    local nl = getlist(n)
+                 -- slide_nodelist(nl) -- temporary hack till math gets slided (tracker item)
+                    collectranges(nl,n)
                 end
-                last = nil
-            else
-                local nl = getlist(n)
-             -- slide_nodelist(nl) -- temporary hack till math gets slided (tracker item)
-                collectranges(nl,n)
             end
         end
     end
-end
 
-function nodeinjections.addtags(head)
-    -- no need to adapt head, as we always operate on lists
-    level, last, ranges, range = 0, nil, { }, nil
     initializepage()
-	head = tonut(head)
+
     collectranges(head)
+
     if trace_tags then
         for i=1,#ranges do
             local range = ranges[i]
-            local attr, id, start, stop = range[1], range[2], range[3], range[4]
-            local tags = taglist[attr]
+            local attr  = range[1]
+            local id    = range[2]
+            local start = range[3]
+            local stop  = range[4]
+            local tags  = taglist[attr]
             if tags then -- not ok ... only first lines
-                report_tags("%s => %s : %05i % t",tosequence(start,start),tosequence(stop,stop),attr,tags)
+                report_tags("%s => %s : %05i % t",tosequence(start,start),tosequence(stop,stop),attr,tags.taglist)
             end
         end
     end
+
+    local top    = nil
+    local noftop = 0
+
     for i=1,#ranges do
-        local range = ranges[i]
-        local attr, id, start, stop, list = range[1], range[2], range[3], range[4], range[5]
+        local range         = ranges[i]
+        local attr          = range[1]
+        local id            = range[2]
+        local start         = range[3]
+        local stop          = range[4]
+        local list          = range[5]
         local specification = taglist[attr]
-        local list = specification.taglist
-        local prev = root
-        local noftags, tag = #list, nil
-        for j=1,noftags do
-            local tag = list[j]
+        local taglist       = specification.taglist
+        local noftags       = #taglist
+        local common        = 0
+
+        if top then
+            for i=1,noftags >= noftop and noftop or noftags do
+                if top[i] == taglist[i] then
+                    common = i
+                else
+                    break
+                end
+            end
+        end
+
+        local prev = common > 0 and elements[taglist[common]] or root
+
+        for j=common+1,noftags do
+            local tag = taglist[j]
             local prv = elements[tag] or makeelement(tag,prev)
             if prv == false then
                 -- ignore this one
@@ -359,25 +363,198 @@ function nodeinjections.addtags(head)
                 prev = prv
             end
         end
+
         if prev then
-            local b, e = makecontent(prev,start,stop,list,id)
-            if start == head then
-                report_tags("this can't happen: parent list gets tagged")
-                head = b
+            -- use insert instead:
+            local literal = pdfliteral(makecontent(prev,id))
+            local prev    = getprev(start)
+            if prev then
+                setfield(prev,"next",literal)
+                setfield(literal,"prev",prev)
+            end
+            setfield(start,"prev",literal)
+            setfield(literal,"next",start)
+            if list and getlist(list) == start then
+                setfield(list,"list",literal)
             end
-        else
-            -- ignored content
+            -- use insert instead:
+            local literal = pdfliteral("EMC")
+            local next    = getnext(stop)
+            if next then
+                setfield(next,"prev",literal)
+                setfield(literal,"next",next)
+            end
+            setfield(stop,"next",literal)
+            setfield(literal,"prev",stop)
         end
+        top    = taglist
+        noftop = noftags
     end
+
     finishpage()
-    -- can be separate feature
-    --
-    -- injectspans(tonut(head)) -- does to work yet
-    --
+
     head = tonode(head)
     return head, true
+
 end
 
+-- variant: more structure but funny collapsing in viewer
+
+-- function nodeinjections.addtags(head)
+--
+--     local last, ranges, range = nil, { }, nil
+--
+--     local function collectranges(head,list)
+--         for n in traverse_nodes(head) do
+--             local id = getid(n) -- 14: image, 8: literal (mp)
+--             if id == glyph_code then
+--                 local at = getattr(n,a_tagged)
+--                 if not at then
+--                     range = nil
+--                 elseif last ~= at then
+--                     range = { at, "glyph", n, n, list } -- attr id start stop list
+--                     ranges[#ranges+1] = range
+--                     last = at
+--                 elseif range then
+--                     range[4] = n -- stop
+--                 end
+--             elseif id == hlist_code or id == vlist_code then
+--                 local at = getattr(n,a_image)
+--                 if at then
+--                     local at = getattr(n,a_tagged)
+--                     if not at then
+--                         range = nil
+--                     else
+--                         ranges[#ranges+1] = { at, "image", n, n, list } -- attr id start stop list
+--                     end
+--                     last = nil
+--                 else
+--                     local nl = getlist(n)
+--                  -- slide_nodelist(nl) -- temporary hack till math gets slided (tracker item)
+--                     collectranges(nl,n)
+--                 end
+--             end
+--         end
+--     end
+--
+--     initializepage()
+--
+-- 	head = tonut(head)
+--     collectranges(head)
+--
+--     if trace_tags then
+--         for i=1,#ranges do
+--             local range = ranges[i]
+--             local attr  = range[1]
+--             local id    = range[2]
+--             local start = range[3]
+--             local stop  = range[4]
+--             local tags  = taglist[attr]
+--             if tags then -- not ok ... only first lines
+--                 report_tags("%s => %s : %05i % t",tosequence(start,start),tosequence(stop,stop),attr,tags.taglist)
+--             end
+--         end
+--     end
+--
+--     local top    = nil
+--     local noftop = 0
+--     local last   = nil
+--
+--     for i=1,#ranges do
+--         local range         = ranges[i]
+--         local attr          = range[1]
+--         local id            = range[2]
+--         local start         = range[3]
+--         local stop          = range[4]
+--         local list          = range[5]
+--         local specification = taglist[attr]
+--         local taglist       = specification.taglist
+--         local noftags       = #taglist
+--         local tag           = nil
+--         local common        = 0
+--      -- local prev          = root
+--
+--         if top then
+--             for i=1,noftags >= noftop and noftop or noftags do
+--                 if top[i] == taglist[i] then
+--                     common = i
+--                 else
+--                     break
+--                 end
+--             end
+--         end
+--
+--         local result        = { }
+--         local r             = noftop - common
+--         if r > 0 then
+--             for i=1,r do
+--                 result[i] = "EMC"
+--             end
+--         end
+--
+--         local prev   = common > 0 and elements[taglist[common]] or root
+--
+--         for j=common+1,noftags do
+--             local tag = taglist[j]
+--             local prv = elements[tag] or makeelement(tag,prev)
+--          -- if prv == false then
+--          --     -- ignore this one
+--          --     prev = false
+--          --     break
+--          -- elseif prv == true then
+--          --     -- skip this one
+--          -- else
+--                 prev = prv
+--                 r = r + 1
+--                 result[r] = makecontent(prev,id)
+--          -- end
+--         end
+--
+--         if r > 0 then
+--             local literal = pdfliteral(concat(result,"\n"))
+--             -- use insert instead:
+--             local literal = pdfliteral(result)
+--             local prev = getprev(start)
+--             if prev then
+--                 setfield(prev,"next",literal)
+--                 setfield(literal,"prev",prev)
+--             end
+--             setfield(start,"prev",literal)
+--             setfield(literal,"next",start)
+--             if list and getlist(list) == start then
+--                 setfield(list,"list",literal)
+--             end
+--         end
+--
+--         top    = taglist
+--         noftop = noftags
+--         last   = stop
+--
+--     end
+--
+--     if last and noftop > 0 then
+--         local result = { }
+--         for i=1,noftop do
+--             result[i] = "EMC"
+--         end
+--         local literal = pdfliteral(concat(result,"\n"))
+--         -- use insert instead:
+--         local next = getnext(last)
+--         if next then
+--             setfield(next,"prev",literal)
+--             setfield(literal,"next",next)
+--         end
+--         setfield(last,"next",literal)
+--         setfield(literal,"prev",last)
+--     end
+--
+--     finishpage()
+--
+--     head = tonode(head)
+--     return head, true
+--
+-- end
+
 -- this belongs elsewhere (export is not pdf related)
 
 function codeinjections.enabletags(tg,lb)