Merge pull request #209 from phi-gamma/texlive2014

[fontloader] sync with Context as of 2014-03-25

1 files changed, 13 insertions, 10 deletions

diff --git a/src/luaotfload-fontloader.lua b/src/luaotfload-fontloader.lua
index 655aedf..ca538df 100644
--- a/src/luaotfload-fontloader.lua
+++ b/src/luaotfload-fontloader.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 03/22/14 15:31:38
+-- merge date  : 03/25/14 02:17:04
 
 do -- begin closure to overcome local limits and interference
 
@@ -11499,17 +11499,20 @@ local autofeatures=fonts.analyzers.features
 local function initialize(sequence,script,language,enabled)
   local features=sequence.features
   if features then
-    local order=features.order
-    for i=1,#order do
-      local kind=order[i] 
-      local valid=enabled[kind]
-      if valid then
-        local scripts=features[kind] 
-        local languages=scripts[script] or scripts[wildcard]
-        if languages and (languages[language] or languages[wildcard]) then
-          return { valid,autofeatures[kind] or false,sequence.chain or 0,kind,sequence }
+    local order=sequence.order
+    if order then
+      for i=1,#order do
+        local kind=order[i] 
+        local valid=enabled[kind]
+        if valid then
+          local scripts=features[kind] 
+          local languages=scripts[script] or scripts[wildcard]
+          if languages and (languages[language] or languages[wildcard]) then
+            return { valid,autofeatures[kind] or false,sequence.chain or 0,kind,sequence }
+          end
         end
       end
+    else
     end
   end
   return false