2 files changed, 9 insertions, 9 deletions
diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua
index 462b665fb..5827af948 100644
--- a/tex/generic/context/luatex/luatex-basics-nod.lua
+++ b/tex/generic/context/luatex/luatex-basics-nod.lua
@@ -60,11 +60,11 @@ for k, v in next, node.types() do
     nodecodes[k] = v
     nodecodes[v] = k
 end
-for i=0,#glyphcodes do
-    glyphcodes[glyphcodes[i]] = i
+for k, v in next, glyphcodes do
+    glyphcodes[v] = k
 end
-for i=0,#disccodes do
-    disccodes[disccodes[i]] = i
+for k, v in next, glyphcodes do
+    disccodes[v] = k
 end
 
 nodes.nodecodes    = nodecodes
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 6b530e252..bba070be4 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 05/12/18 00:07:56
+-- merge date  : 05/17/18 18:32:09
 
 do -- begin closure to overcome local limits and interference
 
@@ -5351,11 +5351,11 @@ for k,v in next,node.types() do
   nodecodes[k]=v
   nodecodes[v]=k
 end
-for i=0,#glyphcodes do
-  glyphcodes[glyphcodes[i]]=i
+for k,v in next,glyphcodes do
+  glyphcodes[v]=k
 end
-for i=0,#disccodes do
-  disccodes[disccodes[i]]=i
+for k,v in next,glyphcodes do
+  disccodes[v]=k
 end
 nodes.nodecodes=nodecodes
 nodes.glyphcodes=glyphcodes