1 files changed, 35 insertions, 12 deletions
diff --git a/tex/context/base/mkiv/font-ini.lua b/tex/context/base/mkiv/font-ini.lua
index 3d5dd27a2..462e30bf9 100644
--- a/tex/context/base/mkiv/font-ini.lua
+++ b/tex/context/base/mkiv/font-ini.lua
@@ -10,22 +10,45 @@ if not modules then modules = { } end modules ['font-ini'] = {
 <p>Not much is happening here.</p>
 --ldx]]--
 
-local allocate   = utilities.storage.allocate
+local allocate    = utilities.storage.allocate
+local sortedhash  = table.sortedhash
 
-fonts            = fonts or { }
-local fonts      = fonts
+fonts             = fonts or { }
+local fonts       = fonts
 
-fonts.hashes     = fonts.hashes     or { identifiers = allocate() }
-fonts.tables     = fonts.tables     or { }
-fonts.helpers    = fonts.helpers    or { }
-fonts.tracers    = fonts.tracers    or { } -- for the moment till we have move to moduledata
-fonts.specifiers = fonts.specifiers or { } -- in format !
+local identifiers = allocate()
 
-fonts.analyzers  = { } -- not needed here
-fonts.readers    = { }
-fonts.definers   = { methods = { } }
-fonts.loggers    = { register = function() end }
+fonts.hashes      = fonts.hashes     or { identifiers = identifiers }
+fonts.tables      = fonts.tables     or { }
+fonts.helpers     = fonts.helpers    or { }
+fonts.tracers     = fonts.tracers    or { } -- for the moment till we have move to moduledata
+fonts.specifiers  = fonts.specifiers or { } -- in format !
+
+fonts.analyzers   = { } -- not needed here
+fonts.readers     = { }
+fonts.definers    = { methods = { } }
+fonts.loggers     = { register = function() end }
 
 if context then
+
+    font.originaleach = font.each
+
+    function font.each()
+        return sortedhash(identifiers)
+    end
+
     fontloader = nil
+
 end
+
+-- Outside context one can bump textbase to some higher value but only the
+-- textbase given here is officially supported (read: bug testing etc will
+-- use the values below).
+
+fonts.privateoffsets = {
+    textbase      = 0xF0000, -- used for hidden (opentype features)
+    textextrabase = 0xFD000, -- used for visible by name
+    mathextrabase = 0xFE000, -- used for visible by code
+    mathbase      = 0xFF000, -- used for hidden (virtual math)
+    keepnames     = false,   -- when set to true names are always kept (not for context)
+}