Fix #532 by sorting table keys when processing content

core/hyphenator-liang.lua

@@ -47,9 +47,9 @@ local function loadPatterns(hyphenator, language)
     print("No patterns for language "..language)
     return
   end
-  for _, pattern in pairs(languageset.patterns) do addPattern(hyphenator, pattern) end
+  for _, pattern in ipairs(languageset.patterns) do addPattern(hyphenator, pattern) end
   if not languageset.exceptions then languageset.exceptions = {} end
-  for _, exception in pairs(languageset.exceptions) do
+  for _, exception in ipairs(languageset.exceptions) do
     registerException(hyphenator, exception)
   end
 end
@@ -114,7 +114,7 @@ local hyphenateNode = function (node)
     local newnodes = {}
     for j, brk in ipairs(breaks) do
       if not(brk == "") then
-        for _, newNode in pairs(SILE.shaper:createNnodes(brk, node.options)) do
+        for _, newNode in ipairs(SILE.shaper:createNnodes(brk, node.options)) do
           if newNode.is_nnode then
             newNode.parent = node
             table.insert(newnodes, newNode)

core/nodefactory.lua

@@ -304,21 +304,21 @@ nodefactory.discretionary = pl.class({
     prebreakWidth = function (self)
       if self.prebw then return self.prebw end
       self.prebw = SILE.length()
-      for _, node in pairs(self.prebreak) do self.prebw:___add(node.width) end
+      for _, node in ipairs(self.prebreak) do self.prebw:___add(node.width) end
       return self.prebw
     end,
 
     postbreakWidth = function (self)
       if self.postbw then return self.postbw end
       self.postbw = SILE.length()
-      for _, node in pairs(self.postbreak) do self.pastbw:___add(node.width) end
+      for _, node in ipairs(self.postbreak) do self.pastbw:___add(node.width) end
       return self.postbw
     end,
 
     replacementWidth = function (self)
       if self.replacew then return self.replacew end
       self.replacew = SILE.length()
-      for _, node in pairs(self.replacement) do self.replacew:___add(node.width) end
+      for _, node in ipairs(self.replacement) do self.replacew:___add(node.width) end
       return self.replacew
     end,
 
@@ -522,7 +522,7 @@ nodefactory.vbox = pl.class({
     outputYourself = function (self, typesetter, line)
       typesetter.frame:advancePageDirection(self.height)
       local initial = true
-      for _, node in pairs(self.nodes) do
+      for _, node in ipairs(self.nodes) do
         if not (initial and (node.is_glue or node.is_penalty)) then
           initial = false
           node:outputYourself(typesetter, line)

core/utilities.lua

@@ -125,6 +125,23 @@ utilities.map = function (func, array)
   return new_array
 end
 
+-- TODO: Replace with pl.tablex.sort()?
+utilities.sortedpairs = function (input)
+  local keys = {}
+  for k, _ in pairs(input) do
+    keys[#keys+1] = k
+  end
+  table.sort(keys, function(a, b)
+    if type(a) ~= type(b) then return false end
+    return a < b
+  end)
+  return coroutine.wrap(function()
+    for i = 1, #keys do
+      coroutine.yield(keys[i], input[keys[i]])
+    end
+  end)
+end
+
 utilities.splice = function (array, start, stop, replacement)
   local ptr = start
   local room = stop - start + 1
@@ -257,7 +274,7 @@ end
 -- items — assuming that the current command is taking care of itself
 utilities.subContent = function (content)
   local out = { id="stuff" }
-  for key, val in pairs(content) do
+  for key, val in utilities.sortedpairs(content) do
     if type(key) == "number" then
       out[#out+1] = val
     end

packages/inputfilter.lua

@@ -1,6 +1,6 @@
 local function transformContent(content, transformFunction, extraArgs)
   local newContent = {}
-  for k, v in pairs(content) do
+  for k, v in SU.sortedpairs(content) do
     if type(k) == "number" then
       if type(v) == "string" then
         local transformed = transformFunction(v, content, extraArgs)