From b7b69c20fae6b104e134dae90ac34a35221b82ed Mon Sep 17 00:00:00 2001
From: Context Git Mirror Bot <phg42.2a@gmail.com>
Date: Thu, 2 Oct 2014 23:15:04 +0200
Subject: 2014-10-02 23:09:00

---
 tex/context/base/font-otn.lua | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'tex/context/base/font-otn.lua')

diff --git a/tex/context/base/font-otn.lua b/tex/context/base/font-otn.lua
index c35dcf27c..32dc820d3 100644
--- a/tex/context/base/font-otn.lua
+++ b/tex/context/base/font-otn.lua
@@ -269,6 +269,7 @@ local currentfont         = false
 local lookuptable         = false
 local anchorlookups       = false
 local lookuptypes         = false
+local lookuptags          = false
 local handlers            = { }
 local rlmode              = 0
 local featurevalue        = false
@@ -323,20 +324,20 @@ end
 
 local function cref(kind,chainname,chainlookupname,lookupname,index) -- not in the mood to alias f_
     if index then
-        return formatters["feature %a, chain %a, sub %a, lookup %a, index %a"](kind,chainname,chainlookupname,lookupname,index)
+        return formatters["feature %a, chain %a, sub %a, lookup %a, index %a"](kind,chainname,chainlookupname,lookuptags[lookupname],index)
     elseif lookupname then
-        return formatters["feature %a, chain %a, sub %a, lookup %a"](kind,chainname,chainlookupname,lookupname)
+        return formatters["feature %a, chain %a, sub %a, lookup %a"](kind,chainname,chainlookupname,lookuptags[lookupname])
     elseif chainlookupname then
-        return formatters["feature %a, chain %a, sub %a"](kind,chainname,chainlookupname)
+        return formatters["feature %a, chain %a, sub %a"](kind,lookuptags[chainname],lookuptags[chainlookupname])
     elseif chainname then
-        return formatters["feature %a, chain %a"](kind,chainname)
+        return formatters["feature %a, chain %a"](kind,lookuptags[chainname])
     else
         return formatters["feature %a"](kind)
     end
 end
 
 local function pref(kind,lookupname)
-    return formatters["feature %a, lookup %a"](kind,lookupname)
+    return formatters["feature %a, lookup %a"](kind,lookuptags[lookupname])
 end
 
 -- We can assume that languages that use marks are not hyphenated. We can also assume
@@ -1924,7 +1925,7 @@ local function normal_handle_contextchain(head,start,kind,chainname,contexts,seq
                     end
                  else
                     local i = 1
-                    repeat
+                    while true do
                         if skipped then
                             while true do
                                 local char = getchar(start)
@@ -1965,12 +1966,14 @@ local function normal_handle_contextchain(head,start,kind,chainname,contexts,seq
                                 end
                             end
                         end
-                        if start then
+                        if i > nofchainlookups then
+                            break
+                        elseif start then
                             start = getnext(start)
                         else
                             -- weird
                         end
-                    until i > nofchainlookups
+                    end
                 end
             else
                 local replacements = ck[7]
@@ -2169,6 +2172,7 @@ local function featuresprocessor(head,font,attr)
     anchorlookups   = resources.lookup_to_anchor
     lookuptable     = resources.lookups
     lookuptypes     = resources.lookuptypes
+    lookuptags      = resources.lookuptags
 
     currentfont     = font
     rlmode          = 0
@@ -2769,6 +2773,7 @@ local function prepare_contextchains(tfmdata)
     local rawdata    = tfmdata.shared.rawdata
     local resources  = rawdata.resources
     local lookuphash = resources.lookuphash
+    local lookuptags = resources.lookuptags
     local lookups    = rawdata.lookups
     if lookups then
         for lookupname, lookupdata in next, rawdata.lookups do
@@ -2782,7 +2787,7 @@ local function prepare_contextchains(tfmdata)
                         report_prepare("unsupported format %a",format)
                     elseif not validformat[lookuptype] then
                         -- todo: dejavu-serif has one (but i need to see what use it has)
-                        report_prepare("unsupported format %a, lookuptype %a, lookupname %a",format,lookuptype,lookupname)
+                        report_prepare("unsupported format %a, lookuptype %a, lookupname %a",format,lookuptype,lookuptags[lookupname])
                     else
                         local contexts = lookuphash[lookupname]
                         if not contexts then
@@ -2838,7 +2843,7 @@ local function prepare_contextchains(tfmdata)
                     -- no rules
                 end
             else
-                report_prepare("missing lookuptype for lookupname %a",lookupname)
+                report_prepare("missing lookuptype for lookupname %a",lookuptags[lookupname])
             end
         end
     end
-- 
cgit v1.2.3