Merge pull request #279 from phi-gamma/master

Restructure initialization

8 files changed, 138 insertions, 134 deletions

diff --git a/src/fontloader/luaotfload-package.lua b/src/fontloader/luaotfload-package.lua
index b60ae17..725c498 100644
--- a/src/fontloader/luaotfload-package.lua
+++ b/src/fontloader/luaotfload-package.lua
@@ -63,12 +63,16 @@ loadmodule "l-boolean.lua"
 loadmodule "l-math.lua"
 loadmodule "util-str.lua"
 
+--- Another file containing auxiliary definitions must be present
+--- prior to initialization of the configuration.
+
+loadmodule "luatex-basics-gen.lua"
+
 --- The files below constitute the “fontloader proper”. Some of the
 --- functionality like file resolvers is overloaded later by
 --- Luaotfload. Consequently, the resulting package is pretty
 --- bare-bones and not usable independently.
 
-loadmodule("luatex-basics-gen.lua")
 loadmodule("data-con.lua")
 loadmodule("luatex-basics-nod.lua")
 loadmodule("font-ini.lua")
diff --git a/src/fontloader/runtime/fontloader-fontloader.lua b/src/fontloader/runtime/fontloader-reference.lua
index d8095a2..d8095a2 100644
--- a/src/fontloader/runtime/fontloader-fontloader.lua
+++ b/src/fontloader/runtime/fontloader-reference.lua
diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua
index e9393c5..e2cfbd8 100644
--- a/src/luaotfload-configuration.lua
+++ b/src/luaotfload-configuration.lua
@@ -140,9 +140,9 @@ local feature_presets = {
 --doc]]--
 
 local registered_loaders = {
-  default    = "fontloader",
-  fontloader = "fontloader",
-  tl2013     = "tl2013",
+  default   = luaotfloadstatus and luaotfloadstatus.notes.loader or "reference",
+  reference = "reference",
+  tl2014    = "tl2014",
 }
 
 --[[doc--
diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua
index feff4cc..0ef968d 100644
--- a/src/luaotfload-init.lua
+++ b/src/luaotfload-init.lua
@@ -65,7 +65,7 @@ local logreport  --- filled in after loading the log module
 --doc]]--
 
 
-local init_pre = function ()
+local init_early = function ()
 
   local store                  = { }
   config                       = config or { } --- global
@@ -74,6 +74,7 @@ local init_pre = function ()
   config.lualibs.verbose       = false
   config.lualibs.prefer_merged = true
   config.lualibs.load_extended = true
+  fonts                        = fonts or { }
 
   require "lualibs"
 
@@ -131,8 +132,10 @@ local init_pre = function ()
     return number
   end
 
+  luaotfload.loaders.fontloader "basics-gen"
+
   return store
-end --- [init_pre]
+end --- [init_early]
 
 --[[doc--
 
@@ -180,11 +183,8 @@ end
 
 local init_adapt = function ()
 
-  luaotfload.context_environment  = { }
-  luaotfload.push_namespaces      = push_namespaces
-  luaotfload.pop_namespaces       = pop_namespaces
-
-  local our_environment = push_namespaces ()
+  local context_environment  = { }
+  local our_environment      = push_namespaces ()
 
   --[[doc--
 
@@ -196,7 +196,7 @@ local init_adapt = function ()
 
   tex.attribute[0] = 0
 
-  return our_environment
+  return our_environment, context_environment
 
 end --- [init_adapt]
 
@@ -277,9 +277,9 @@ local init_cleanup = function (store)
 
   --doc]]--
 
-  luaotfload.pop_namespaces (store.our_environment,
-                             false,
-                             luaotfload.context_environment)
+  pop_namespaces (store.our_environment,
+                  false,
+                  store.context_environment)
 
   --[[doc--
 
@@ -294,10 +294,7 @@ local init_cleanup = function (store)
   callback.register = store.trapped_register
 end --- [init_cleanup]
 
-local init_post = function ()
-  --- hook for actions that need to take place after the fontloader is
-  --- installed
-
+local init_post_install_callbacks = function ()
   --[[doc--
 
     we do our own callback handling with the means provided by
@@ -316,19 +313,122 @@ local init_post = function ()
                              nodes.simple_font_handler,
                              "luaotfload.node_processor",
                              1)
+end
+
+local init_post_load_agl = function ()
+
+  --[[doc--
+
+      Adobe Glyph List.
+      -----------------------------------------------------------------
+
+      Context provides a somewhat different font-age.lua from an
+      unclear origin. Unfortunately, the file name it reads from is
+      hard-coded in font-enc.lua, so we have to replace the entire
+      table.
+
+      This shouldn’t cause any complications. Due to its implementation
+      the glyph list will be loaded upon loading a OTF or TTF for the
+      first time during a TeX run. (If one sticks to TFM/OFM then it is
+      never read at all.) For this reason we can install a metatable
+      that looks up the file of our choosing and only falls back to the
+      Context one in case it cannot be found.
+
+  --doc]]--
+
+  local findfile  = resolvers.findfile
+  local encodings = fonts.encodings
+
+  if not findfile or not encodings then
+    --- Might happen during refactoring; we continue graciously but in
+    --- a somewhat defect state.
+    logreport ("log", 0, "init",
+               "preconditions unmet, skipping the Adobe Glyph List; "
+               .. "this is a Luaotfload bug.")
+    return
+  end
+
+  if next (fonts.encodings.agl) then
+      --- unnecessary because the file shouldn’t be loaded at this time
+      --- but we’re just making sure
+      fonts.encodings.agl = nil
+      collectgarbage"collect"
+  end
+
+  local agl_init = { }      --- start out empty, fill on demand
+  encodings.agl  = agl_init --- ugh, replaced again later
+
+  setmetatable (agl_init, { __index = function (t, k)
+
+    if k ~= "unicodes" then
+      return nil
+    end
+
+    local glyphlist = findfile "luaotfload-glyphlist.lua"
+    if glyphlist then
+      logreport ("log", 1, "init", "loading the Adobe glyph list")
+    else
+      glyphlist = findfile "font-age.lua"
+      logreport ("both", 0, "init",
+                 "loading the extended glyph list from ConTeXt")
+    end
+
+    if not glyphlist then
+      logreport ("both", 4, "init",
+                 "Adobe glyph list not found, please check your installation.")
+      return nil
+    end
+    logreport ("both", 4, "init",
+               "found Adobe glyph list file at ``%s``, using that.",
+               glyphlist)
+
+    local unicodes = dofile(glyphlist)
+    encodings.agl  = { unicodes = unicodes }
+    return unicodes
+  end })
+
+end
+
+--- (unit -> unit) list
+local init_post_actions = {
+  init_post_install_callbacks,
+  init_post_load_agl,
+}
+
+--- unit -> size_t
+local init_post = function ()
+  --- hook for actions that need to take place after the fontloader is
+  --- installed
+
+  local n = #init_post_actions
+  for i = 1, n do
+    local action = init_post_actions[i]
+    local taction = type (action)
+    if not action or taction ~= "function" then
+      logreport ("both", 1, "init",
+                 "post hook WARNING: action %d not a function but %s/%s; ignoring.",
+                 i, action, taction)
+    else
+      --- call closure
+      action ()
+    end
+  end
+
+  return n
 end --- [init_post]
 
 return {
-  init = function ()
+  early = init_early,
+  main = function (store)
     local starttime = os.gettimeofday ()
-    local store = init_pre ()
-    store.our_environment = init_adapt ()
+    store.our_environment, store.context_environment = init_adapt ()
     init_main ()
     init_cleanup (store)
     logreport ("both", 1, "init",
                "fontloader loaded in %0.3f seconds",
                os.gettimeofday() - starttime)
-    init_post ()
+    local n = init_post ()
+    logreport ("both", 5, "init", "post hook terminated, %d actions performed", n)
   end
 }
 
diff --git a/src/luaotfload-letterspace.lua b/src/luaotfload-letterspace.lua
index 8956f82..9a0646b 100644
--- a/src/luaotfload-letterspace.lua
+++ b/src/luaotfload-letterspace.lua
@@ -471,12 +471,15 @@ local enablefontkerning = function ( )
 
   local handler = function (hd)
     local direct_hd = todirect (hd)
-    local hd, _done = kerncharacters (hd)
-    if not hd then --- bad
+    logreport ("term", 5, "letterspace",
+               "kerncharacters() invoked with node.direct interface \z
+               (``%s`` -> ``%s``)", tostring (hd), tostring (direct_hd))
+    local direct_hd, _done = kerncharacters (direct_hd)
+    if not direct_hd then --- bad
       logreport ("both", 0, "letterspace",
                  "kerncharacters() failed to return a valid new head")
     end
-    return tonode (hd)
+    return tonode (direct_hd)
   end
 
   return add_processor( handler
diff --git a/src/luaotfload-log.lua b/src/luaotfload-log.lua
index a0e78bd..7c012f4 100644
--- a/src/luaotfload-log.lua
+++ b/src/luaotfload-log.lua
@@ -355,52 +355,3 @@ end
 
 texio.reporter = texioreporter
 
---[[doc--
-
-    Adobe Glyph List.
-    -------------------------------------------------------------------
-
-    Context provides a somewhat different font-age.lua from an unclear
-    origin. Unfortunately, the file name it reads from is hard-coded
-    in font-enc.lua, so we have to replace the entire table.
-
-    This shouldn’t cause any complications. Due to its implementation
-    the glyph list will be loaded upon loading a OTF or TTF for the
-    first time during a TeX run. (If one sticks to TFM/OFM then it is
-    never read at all.) For this reason we can install a metatable that
-    looks up the file of our choosing and only falls back to the
-    Context one in case it cannot be found.
-
---doc]]--
-
-if fonts then --- need to be running TeX
-    if next(fonts.encodings.agl) then
-        --- unnecessary because the file shouldn’t be loaded at this time
-        --- but we’re just making sure
-        fonts.encodings.agl = nil
-        collectgarbage"collect"
-    end
-
-
-    fonts.encodings.agl = { }
-
-    setmetatable(fonts.encodings.agl, { __index = function (t, k)
-        if k == "unicodes" then
-            local glyphlist = resolvers.findfile"luaotfload-glyphlist.lua"
-            if glyphlist then
-                report ("log", 1, "load", "loading the Adobe glyph list")
-            else
-                glyphlist = resolvers.findfile"font-age.lua"
-                report ("both", 0, "load",
-                    "loading the extended glyph list from ConTeXt")
-            end
-            local unicodes      = dofile(glyphlist)
-            fonts.encodings.agl = { unicodes = unicodes }
-            return unicodes
-        else
-            return nil
-        end
-    end })
-end
-
--- vim:tw=71:sw=4:ts=4:expandtab
diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua
index e8f05d6..5ac1421 100644
--- a/src/luaotfload-main.lua
+++ b/src/luaotfload-main.lua
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------
 --         FILE:  luaotfload-main.lua
---  DESCRIPTION:  Luaotfload initialization
+--  DESCRIPTION:  Luaotfload entry point
 -- REQUIREMENTS:  luatex v.0.80 or later; packages lualibs, luatexbase
 --       AUTHOR:  Élie Roux, Khaled Hosny, Philipp Gesang
 --      VERSION:  same as Luaotfload
@@ -20,9 +20,7 @@ luaotfload.log                    = luaotfload.log or { }
 luaotfload.version                = "2.6"
 luaotfload.loaders                = { }
 luaotfload.min_luatex_version     = 79             --- i. e. 0.79
-luaotfload.fontloader_package     = "fontloader"   --- default: from current Context
-----------.fontloader_package     = "slim"
-
+luaotfload.fontloader_package     = "reference"    --- default: from current Context
 
 local authors = "\z
     Hans Hagen,\z
@@ -155,13 +153,11 @@ luaotfload.loaders.luaotfload = load_luaotfload_module
 luaotfload.loaders.fontloader = load_fontloader_module
 
 luaotfload.init = load_luaotfload_module "init" --- fontloader initialization
-luaotfload.init.init ()
 
+local store           = luaotfload.init.early ()
 local log             = luaotfload.log
 local logreport       = log.report
 
-load_luaotfload_module "override"   --- load glyphlist on demand
-
 --[[doc--
 
     Now we load the modules written for \identifier{luaotfload}.
@@ -175,6 +171,8 @@ if not config.actions.apply_defaults () then
     logreport ("log", 0, "load", "Configuration unsuccessful.")
 end
 
+luaotfload.init.main (store)
+
 load_luaotfload_module "loaders"         --- Type1 font wrappers
 load_luaotfload_module "database"        --- Font management.
 load_luaotfload_module "colors"          --- Per-font colors.
diff --git a/src/luaotfload-override.lua b/src/luaotfload-override.lua
deleted file mode 100644
index b75530b..0000000
--- a/src/luaotfload-override.lua
+++ /dev/null
@@ -1,52 +0,0 @@
-if not modules then modules = { } end modules ["luaotfload-override"] = {
-    version   = "2.5",
-    comment   = "companion to Luaotfload",
-    author    = "Khaled Hosny, Elie Roux, Philipp Gesang",
-    copyright = "Luaotfload Development Team",
-    license   = "GNU GPL v2.0"
-}
-
-local findfile      = resolvers.findfile
-local encodings     = fonts.encodings
-
-local log           = luaotfload.log
-local report        = log.report
-
---[[doc--
-
-    Adobe Glyph List.
-    -------------------------------------------------------------------
-
-    Context provides a somewhat different font-age.lua from an unclear
-    origin. Unfortunately, the file name it reads from is hard-coded
-    in font-enc.lua, so we have to replace the entire table.
-
-    This shouldn’t cause any complications. Due to its implementation
-    the glyph list will be loaded upon loading a OTF or TTF for the
-    first time during a TeX run. (If one sticks to TFM/OFM then it is
-    never read at all.) For this reason we can install a metatable that
-    looks up the file of our choosing and only falls back to the
-    Context one in case it cannot be found.
-
---doc]]--
-
-encodings.agl = { }
-
-setmetatable(fonts.encodings.agl, { __index = function (t, k)
-    if k ~= "unicodes" then
-        return nil
-    end
-    local glyphlist = findfile "luaotfload-glyphlist.lua"
-    if glyphlist then
-        report ("log", 1, "load", "loading the Adobe glyph list")
-    else
-        glyphlist = findfile "font-age.lua"
-        report ("both", 0, "load",
-                "loading the extended glyph list from ConTeXt")
-    end
-    local unicodes = dofile(glyphlist)
-    encodings.agl  = { unicodes = unicodes }
-    return unicodes
-end })
-
--- vim:tw=71:sw=4:ts=4:expandtab