Sync with context beta 2012.02.21 14:02

1 files changed, 106 insertions, 90 deletions

diff --git a/otfl-font-otn.lua b/otfl-font-otn.lua
index 12ea975..2fd910e 100644
--- a/otfl-font-otn.lua
+++ b/otfl-font-otn.lua
@@ -27,6 +27,7 @@ if not modules then modules = { } end modules ['font-otn'] = {
 -- default features (per language, script)
 -- handle positions (we need example fonts)
 -- handle gpos_single (we might want an extra width field in glyph nodes because adding kerns might interfere)
+-- mark (to mark) code is still not what it should be (too messy but we need some more extreem husayni tests)
 
 --[[ldx--
 <p>This module is a bit more split up that I'd like but since we also want to test
@@ -192,14 +193,21 @@ local ligature_code      = glyphcodes.ligature
 
 local privateattribute   = attributes.private
 
+-- Something is messed up: we have two mark / ligature indices, one at the injection
+-- end and one here ... this is bases in KE's patches but there is something fishy
+-- there as I'm pretty sure that for husayni we need some connection (as it's much
+-- more complex than an average font) but I need proper examples of all cases, not
+-- of only some.
+
 local state              = privateattribute('state')
 local markbase           = privateattribute('markbase')
 local markmark           = privateattribute('markmark')
-local markdone           = privateattribute('markdone')
+local markdone           = privateattribute('markdone') -- assigned at the injection end
 local cursbase           = privateattribute('cursbase')
 local curscurs           = privateattribute('curscurs')
 local cursdone           = privateattribute('cursdone')
 local kernpair           = privateattribute('kernpair')
+local ligacomp           = privateattribute('ligacomp') -- assigned here (ideally it should be combined)
 
 local injections         = nodes.injections
 local setmark            = injections.setmark
@@ -367,47 +375,38 @@ local function toligature(kind,lookupname,start,stop,char,markflag,discfound) --
         current.subtype = ligature_code
         current.components = start
         local head = current
-        if deletemarks then
-            if trace_marks then
-                while start do
-                    if marks[start.char] then
-                        logwarning("%s: remove mark %s",pref(kind,lookupname),gref(start.char))
-                    end
-                    start = start.next
+        -- this is messy ... we should get rid of the components eventually
+        local i = 0 -- is index of base
+        while start do
+            if not marks[start.char] then
+                i = i + 1
+            elseif not deletemarks then -- quite fishy
+                set_attribute(start,ligacomp,i)
+                if trace_marks then
+                    logwarning("%s: keep mark %s, gets index %s",pref(kind,lookupname),gref(start.char),i)
                 end
+                head, current = insert_node_after(head,current,copy_node(start))
             end
-        else
-            local i = 0
-            while start do
-                if marks[start.char] then
-                    set_attribute(start,markdone,i)
-                    if trace_marks then
-                        logwarning("%s: keep mark %s, gets index %s",pref(kind,lookupname),gref(start.char),i)
-                    end
-                    head, current = insert_node_after(head,current,copy_node(start))
-                else
-                    i = i + 1
-                end
-                start = start.next
-            end
-            start = current.next
-            while start and start.id == glyph_code do
-                if marks[start.char] then
-                    set_attribute(start,markdone,i)
-                    if trace_marks then
-                        logwarning("%s: keep mark %s, gets index %s",pref(kind,lookupname),gref(start.char),i)
-                    end
-                else
-                    break
+            start = start.next
+        end
+        start = current.next
+        while start and start.id == glyph_code do
+            if marks[start.char] then
+                set_attribute(start,ligacomp,i)
+                if trace_marks then
+                    logwarning("%s: keep mark %s, gets index %s",pref(kind,lookupname),gref(start.char),i)
                 end
-                start = start.next
+            else
+                break
             end
+            start = start.next
         end
-     -- we do need components in funny kerning mode but maybe I can better reconstruct then
-     -- as we do have the font components info available; removing components makes the
-     -- previous code much simpler
-     --
-     -- flush_node_list(head.components)
+        --
+        -- we do need components in funny kerning mode but maybe I can better reconstruct then
+        -- as we do have the font components info available; removing components makes the
+        -- previous code much simpler
+        --
+        -- flush_node_list(head.components)
         return head
     end
 end
@@ -659,18 +658,14 @@ function handlers.gpos_mark2ligature(start,kind,lookupname,markanchors,sequence)
     local markchar = start.char
     if marks[markchar] then
         local base = start.prev -- [glyph] [optional marks] [start=mark]
-        local index = 1
         if base and base.id == glyph_code and base.subtype<256 and base.font == currentfont then
             local basechar = base.char
             if marks[basechar] then
-                index = index + 1
                 while true do
                     base = base.prev
                     if base and base.id == glyph_code and base.subtype<256 and base.font == currentfont then
                         basechar = base.char
-                        if marks[basechar] then
-                            index = index + 1
-                        else
+                        if not marks[basechar] then
                             break
                         end
                     else
@@ -681,8 +676,7 @@ function handlers.gpos_mark2ligature(start,kind,lookupname,markanchors,sequence)
                     end
                 end
             end
-            local i = has_attribute(start,markdone)
-            if i then index = i end
+            local index = has_attribute(start,ligacomp)
             local baseanchors = descriptions[basechar]
             if baseanchors then
                 baseanchors = baseanchors.anchors
@@ -696,7 +690,7 @@ function handlers.gpos_mark2ligature(start,kind,lookupname,markanchors,sequence)
                                 if ma then
                                     ba = ba[index]
                                     if ba then
-                                        local dx, dy, bound = setmark(start,base,tfmdata.parameters.factor,rlmode,ba,ma,index)
+                                        local dx, dy, bound = setmark(start,base,tfmdata.parameters.factor,rlmode,ba,ma) -- index
                                         if trace_marks then
                                             logprocess("%s, anchor %s, index %s, bound %s: anchoring mark %s to baselig %s at index %s => (%s,%s)",
                                                 pref(kind,lookupname),anchor,index,bound,gref(markchar),gref(basechar),index,dx,dy)
@@ -727,46 +721,55 @@ end
 function handlers.gpos_mark2mark(start,kind,lookupname,markanchors,sequence)
     local markchar = start.char
     if marks[markchar] then
---~         local alreadydone = markonce and has_attribute(start,markmark)
---~         if not alreadydone then
-            local base = start.prev -- [glyph] [basemark] [start=mark]
-            if base and base.id == glyph_code and base.subtype<256 and base.font == currentfont then -- subtype test can go
-                local basechar = base.char
-                local baseanchors = descriptions[basechar]
+        local base = start.prev -- [glyph] [basemark] [start=mark]
+     -- while base and has_attribute(base,ligacomp) and has_attribute(base,ligacomp) ~= has_attribute(start,ligacomp) do
+     --     base = base.prev -- KE: prevents mkmk for marks on different components of a ligature
+     -- end
+        local slc = has_attribute(start,ligacomp)
+        if slc then -- a rather messy loop ... needs checking with husayni
+            while base do
+                local blc = has_attribute(base,ligacomp)
+                if blc and blc ~= slc then
+                    base = base.prev
+                else
+                    break
+                end
+            end
+        end
+        if base and base.id == glyph_code and base.subtype<256 and base.font == currentfont then -- subtype test can go
+            local basechar = base.char
+            local baseanchors = descriptions[basechar]
+            if baseanchors then
+                baseanchors = baseanchors.anchors
                 if baseanchors then
-                    baseanchors = baseanchors.anchors
+                    baseanchors = baseanchors['basemark']
                     if baseanchors then
-                        baseanchors = baseanchors['basemark']
-                        if baseanchors then
-                            local al = anchorlookups[lookupname]
-                            for anchor,ba in next, baseanchors do
-                                if al[anchor] then
-                                    local ma = markanchors[anchor]
-                                    if ma then
-                                        local dx, dy, bound = setmark(start,base,tfmdata.parameters.factor,rlmode,ba,ma)
-                                        if trace_marks then
-                                            logprocess("%s, anchor %s, bound %s: anchoring mark %s to basemark %s => (%s,%s)",
-                                                pref(kind,lookupname),anchor,bound,gref(markchar),gref(basechar),dx,dy)
-                                        end
-                                        return start,true
+                        local al = anchorlookups[lookupname]
+                        for anchor,ba in next, baseanchors do
+                            if al[anchor] then
+                                local ma = markanchors[anchor]
+                                if ma then
+                                    local dx, dy, bound = setmark(start,base,tfmdata.parameters.factor,rlmode,ba,ma)
+                                    if trace_marks then
+                                        logprocess("%s, anchor %s, bound %s: anchoring mark %s to basemark %s => (%s,%s)",
+                                            pref(kind,lookupname),anchor,bound,gref(markchar),gref(basechar),dx,dy)
                                     end
+                                    return start,true
                                 end
                             end
-                            if trace_bugs then
-                                logwarning("%s: no matching anchors for mark %s and basemark %s",pref(kind,lookupname),gref(markchar),gref(basechar))
-                            end
+                        end
+                        if trace_bugs then
+                            logwarning("%s: no matching anchors for mark %s and basemark %s",pref(kind,lookupname),gref(markchar),gref(basechar))
                         end
                     end
-                else -- if trace_bugs then
-                --  logwarning("%s: char %s is missing in font",pref(kind,lookupname),gref(basechar))
-                    onetimemessage(currentfont,basechar,"no base anchors",report_fonts)
                 end
-            elseif trace_bugs then
-                logwarning("%s: prev node is no mark",pref(kind,lookupname))
+            else -- if trace_bugs then
+            --  logwarning("%s: char %s is missing in font",pref(kind,lookupname),gref(basechar))
+                onetimemessage(currentfont,basechar,"no base anchors",report_fonts)
             end
---~         elseif trace_marks and trace_details then
---~             logprocess("%s, mark %s is already bound (n=%s), ignoring mark2mark",pref(kind,lookupname),gref(markchar),alreadydone)
---~         end
+        elseif trace_bugs then
+            logwarning("%s: prev node is no mark",pref(kind,lookupname))
+        end
     elseif trace_bugs then
         logwarning("%s: mark %s is no mark",pref(kind,lookupname),gref(markchar))
     end
@@ -1292,18 +1295,14 @@ function chainprocs.gpos_mark2ligature(start,stop,kind,chainname,currentcontext,
         end
         if markanchors then
             local base = start.prev -- [glyph] [optional marks] [start=mark]
-            local index = 1
             if base and base.id == glyph_code and base.subtype<256 and base.font == currentfont then
                 local basechar = base.char
                 if marks[basechar] then
-                    index = index + 1
                     while true do
                         base = base.prev
                         if base and base.id == glyph_code and base.subtype<256 and base.font == currentfont then
                             basechar = base.char
-                            if marks[basechar] then
-                                index = index + 1
-                            else
+                            if not marks[basechar] then
                                 break
                             end
                         else
@@ -1315,8 +1314,7 @@ function chainprocs.gpos_mark2ligature(start,stop,kind,chainname,currentcontext,
                     end
                 end
                 -- todo: like marks a ligatures hash
-                local i = has_attribute(start,markdone)
-                if i then index = i end
+                local index = has_attribute(start,ligacomp)
                 local baseanchors = descriptions[basechar].anchors
                 if baseanchors then
                    local baseanchors = baseanchors['baselig']
@@ -1328,7 +1326,7 @@ function chainprocs.gpos_mark2ligature(start,stop,kind,chainname,currentcontext,
                                 if ma then
                                     ba = ba[index]
                                     if ba then
-                                        local dx, dy, bound = setmark(start,base,tfmdata.parameters.factor,rlmode,ba,ma,index)
+                                        local dx, dy, bound = setmark(start,base,tfmdata.parameters.factor,rlmode,ba,ma) -- index
                                         if trace_marks then
                                             logprocess("%s, anchor %s, bound %s: anchoring mark %s to baselig %s at index %s => (%s,%s)",
                                                 cref(kind,chainname,chainlookupname,lookupname),anchor,a or bound,gref(markchar),gref(basechar),index,dx,dy)
@@ -1369,6 +1367,20 @@ function chainprocs.gpos_mark2mark(start,stop,kind,chainname,currentcontext,look
             end
             if markanchors then
                 local base = start.prev -- [glyph] [basemark] [start=mark]
+             -- while (base and has_attribute(base,ligacomp) and has_attribute(base,ligacomp) ~= has_attribute(start,ligacomp)) do
+             --     base = base.prev -- KE: prevents mkmk for marks on different components of a ligature
+             -- end
+                local slc = has_attribute(start,ligacomp)
+                if slc then -- a rather messy loop ... needs checking with husayni
+                    while base do
+                        local blc = has_attribute(base,ligacomp)
+                        if blc and blc ~= slc then
+                            base = base.prev
+                        else
+                            break
+                        end
+                    end
+                end
                 if base and base.id == glyph_code and base.subtype<256 and base.font == currentfont then -- subtype test can go
                     local basechar = base.char
                     local baseanchors = descriptions[basechar].anchors
@@ -1584,7 +1596,7 @@ local function show_skip(kind,chainname,char,ck,class)
 end
 
 local function normal_handle_contextchain(start,kind,chainname,contexts,sequence,lookuphash)
-   --  local rule, lookuptype, sequence, f, l, lookups = ck[1], ck[2] ,ck[3], ck[4], ck[5], ck[6]
+    --  local rule, lookuptype, sequence, f, l, lookups = ck[1], ck[2] ,ck[3], ck[4], ck[5], ck[6]
     local flags        = sequence.flags
     local done         = false
     local skipmark     = flags[1]
@@ -1806,11 +1818,15 @@ local function normal_handle_contextchain(start,kind,chainname,contexts,sequence
                 if nofchainlookups == 1 then
                     local chainlookupname = chainlookups[1]
                     local chainlookup = lookuptable[chainlookupname]
-                    local cp = chainprocs[chainlookup.type]
-                    if cp then
-                        start, done = cp(start,last,kind,chainname,ck,lookuphash,chainlookup,chainlookupname,nil,sequence)
-                    else
-                        logprocess("%s: %s is not yet supported",cref(kind,chainname,chainlookupname),chainlookup.type)
+                    if chainlookup then
+                        local cp = chainprocs[chainlookup.type]
+                        if cp then
+                            start, done = cp(start,last,kind,chainname,ck,lookuphash,chainlookup,chainlookupname,nil,sequence)
+                        else
+                            logprocess("%s: %s is not yet supported",cref(kind,chainname,chainlookupname),chainlookup.type)
+                        end
+                    else -- shouldn't happen
+                        logprocess("%s is not yet supported",cref(kind,chainname,chainlookupname))
                     end
                  else
                     local i = 1