3 files changed, 7 insertions, 3 deletions
diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua
index 50a1e8627..50af40193 100644
--- a/tex/generic/context/luatex/luatex-basics-nod.lua
+++ b/tex/generic/context/luatex/luatex-basics-nod.lua
@@ -54,11 +54,13 @@ nodes.handlers     = { }
 local nodecodes    = { } for k,v in next, node.types   () do nodecodes[string.gsub(v,"_","")] = k end
 local whatcodes    = { } for k,v in next, node.whatsits() do whatcodes[string.gsub(v,"_","")] = k end
 local glyphcodes   = { [0] = "character", "glyph", "ligature", "ghost", "left", "right" }
+local disccodes    = { [0] = "discretionary","explicit", "automatic", "regular", "first", "second" }
 
 nodes.nodecodes    = nodecodes
 nodes.whatcodes    = whatcodes
 nodes.whatsitcodes = whatcodes
 nodes.glyphcodes   = glyphcodes
+nodes.disccodes    = disccodes
 
 local free_node    = node.free
 local remove_node  = node.remove
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8cf0e02be..41ed20fdc 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 : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 10/30/13 14:53:50
+-- merge date  : 11/01/13 12:20:30
 
 do -- begin closure to overcome local limits and interference
 
@@ -3400,10 +3400,12 @@ nodes.handlers={}
 local nodecodes={} for k,v in next,node.types  () do nodecodes[string.gsub(v,"_","")]=k end
 local whatcodes={} for k,v in next,node.whatsits() do whatcodes[string.gsub(v,"_","")]=k end
 local glyphcodes={ [0]="character","glyph","ligature","ghost","left","right" }
+local disccodes={ [0]="discretionary","explicit","automatic","regular","first","second" }
 nodes.nodecodes=nodecodes
 nodes.whatcodes=whatcodes
 nodes.whatsitcodes=whatcodes
 nodes.glyphcodes=glyphcodes
+nodes.disccodes=disccodes
 local free_node=node.free
 local remove_node=node.remove
 local new_node=node.new
@@ -5075,7 +5077,7 @@ function fonts.names.getfilename(askedname,suffix)
   return ""
 end
 function fonts.names.ignoredfile(filename) 
-  return true 
+  return false 
 end
 
 end -- closure
diff --git a/tex/generic/context/luatex/luatex-fonts-syn.lua b/tex/generic/context/luatex/luatex-fonts-syn.lua
index 60dd2c063..f03d558bf 100644
--- a/tex/generic/context/luatex/luatex-fonts-syn.lua
+++ b/tex/generic/context/luatex/luatex-fonts-syn.lua
@@ -102,5 +102,5 @@ function fonts.names.getfilename(askedname,suffix)  -- only supported in mkiv
 end
 
 function fonts.names.ignoredfile(filename) -- only supported in mkiv
-    return true -- will be overloaded
+    return false -- will be overloaded
 end