From 8018408e5e87da1ba46414d4620ac5c21a0b3bdb Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sat, 20 Jun 2015 23:42:50 +0200
Subject: [main, init] move fontloader-specific stuff completely into init

---
 src/luaotfload-init.lua | 252 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 252 insertions(+)

(limited to 'src/luaotfload-init.lua')

diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua
index 4968877..22ad704 100644
--- a/src/luaotfload-init.lua
+++ b/src/luaotfload-init.lua
@@ -57,3 +57,255 @@ local load_fontloader_module = luaotfload.loaders.fontloader
 
 load_luaotfload_module "log"
 
+local log             = luaotfload.log
+local logreport       = log.report
+
+log.set_loglevel (default_log_level)
+
+--[[doc--
+
+    \subsection{Preparing the Font Loader}
+    We treat the fontloader as a black box so behavior is consistent
+    between formats.
+    We load the fontloader code directly in the same fashion as the
+    Plain format \identifier{luatex-fonts} that is part of Context.
+    How this is executed depends on the presence on the
+    \emphasis{merged font loader code}.
+    In \identifier{luaotfload} this is contained in the file
+    \fileent{luaotfload-merged.lua}.
+    If this file cannot be found, the original libraries from \CONTEXT
+    of which the merged code was composed are loaded instead.
+    Since these files are not shipped with Luaotfload, an installation
+    of Context is required.
+    (Since we pull the fontloader directly from the Context minimals,
+    the necessary Context version is likely to be more recent than that
+    of other TeX distributions like Texlive.)
+    The imported font loader will call \luafunction{callback.register}
+    once while reading \fileent{font-def.lua}.
+    This is unavoidable unless we modify the imported files, but
+    harmless if we make it call a dummy instead.
+    However, this problem might vanish if we decide to do the merging
+    ourselves, like the \identifier{lualibs} package does.
+    With this step we would obtain the freedom to load our own
+    overrides in the process right where they are needed, at the cost
+    of losing encapsulation.
+    The decision on how to progress is currently on indefinite hold.
+
+--doc]]--
+
+local starttime         = os.gettimeofday ()
+local trapped_register  = callback.register
+callback.register = function (id)
+  logreport ("log", 4, "main",
+             "Dummy callback.register() invoked on %s.",
+             id)
+end
+
+
+--[[doc--
+
+    By default, the fontloader requires a number of \emphasis{private
+    attributes} for internal use.
+    These must be kept consistent with the attribute handling methods
+    as provided by \identifier{luatexbase}.
+    Our strategy is to override the function that allocates new
+    attributes before we initialize the font loader, making it a
+    wrapper around \luafunction{luatexbase.new_attribute}.\footnote{%
+        Many thanks, again, to Hans Hagen for making this part
+        configurable!
+    }
+    The attribute identifiers are prefixed “\fileent{luaotfload@}” to
+    avoid name clashes.
+
+--doc]]--
+
+do
+    local new_attribute    = luatexbase.new_attribute
+    local the_attributes   = luatexbase.attributes
+
+    attributes = attributes or { }
+
+    attributes.private = function (name)
+        local attr   = "luaotfload@" .. name --- used to be: “otfl@”
+        local number = the_attributes[attr]
+        if not number then
+            number = new_attribute(attr)
+        end
+        return number
+    end
+end
+
+--[[doc--
+
+    These next lines replicate the behavior of
+    \fileent{luatex-fonts.lua}.
+
+--doc]]--
+
+local context_environment = { }
+
+local push_namespaces = function ()
+    logreport ("log", 4, "main", "push namespace for font loader")
+    local normalglobal = { }
+    for k, v in next, _G do
+        normalglobal[k] = v
+    end
+    return normalglobal
+end
+
+local pop_namespaces = function (normalglobal, isolate)
+    if normalglobal then
+        local _G = _G
+        local mode = "non-destructive"
+        if isolate then mode = "destructive" end
+        logreport ("log", 4, "main", "pop namespace from font loader -- " .. mode)
+        for k, v in next, _G do
+            if not normalglobal[k] then
+                context_environment[k] = v
+                if isolate then
+                    _G[k] = nil
+                end
+            end
+        end
+        for k, v in next, normalglobal do
+            _G[k] = v
+        end
+        -- just to be sure:
+        setmetatable(context_environment,_G)
+    else
+        logreport ("both", 0, "main",
+                   "irrecoverable error during pop_namespace: no globals to restore")
+        os.exit()
+    end
+end
+
+luaotfload.context_environment  = context_environment
+luaotfload.push_namespaces      = push_namespaces
+luaotfload.pop_namespaces       = pop_namespaces
+
+local our_environment = push_namespaces()
+
+--[[doc--
+
+    The font loader requires that the attribute with index zero be
+    zero. We happily oblige.
+    (Cf. \fileent{luatex-fonts-nod.lua}.)
+
+--doc]]--
+
+tex.attribute[0] = 0
+
+--[[doc--
+
+    Now that things are sorted out we can finally load the fontloader.
+
+    For less current distibutions we ship the code from TL 2014 that should be
+    compatible with Luatex 0.76.
+
+--doc]]--
+
+load_fontloader_module (luaotfload.fontloader_package)
+
+---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context
+
+if fonts then
+
+    --- The Initialization is highly idiosyncratic.
+
+    if not fonts._merge_loaded_message_done_ then
+        logreport ("log", 5, "main", [["I am using the merged fontloader here.]])
+        logreport ("log", 5, "main", [[ If you run into problems or experience unexpected]])
+        logreport ("log", 5, "main", [[ behaviour, and if you have ConTeXt installed you can try]])
+        logreport ("log", 5, "main", [[ to delete the file 'fontloader-fontloader.lua' as I might]])
+        logreport ("log", 5, "main", [[ then use the possibly updated libraries. The merged]])
+        logreport ("log", 5, "main", [[ version is not supported as it is a frozen instance.]])
+        logreport ("log", 5, "main", [[ Problems can be reported to the ConTeXt mailing list."]])
+    end
+    fonts._merge_loaded_message_done_ = true
+
+else--- the loading sequence is known to change, so this might have to
+    --- be updated with future updates!
+    --- do not modify it though unless there is a change to the merged
+    --- package!
+    load_fontloader_module "l-lua"
+    load_fontloader_module "l-lpeg"
+    load_fontloader_module "l-function"
+    load_fontloader_module "l-string"
+    load_fontloader_module "l-table"
+    load_fontloader_module "l-io"
+    load_fontloader_module "l-file"
+    load_fontloader_module "l-boolean"
+    load_fontloader_module "l-math"
+    load_fontloader_module "util-str"
+    load_fontloader_module "luatex-basics-gen"
+    load_fontloader_module "data-con"
+    load_fontloader_module "luatex-basics-nod"
+    load_fontloader_module "font-ini"
+    load_fontloader_module "font-con"
+    load_fontloader_module "luatex-fonts-enc"
+    load_fontloader_module "font-cid"
+    load_fontloader_module "font-map"
+    load_fontloader_module "luatex-fonts-syn"
+    load_fontloader_module "luatex-fonts-tfm"
+    load_fontloader_module "font-oti"
+    load_fontloader_module "font-otf"
+    load_fontloader_module "font-otb"
+    load_fontloader_module "luatex-fonts-inj"  --> since 2014-01-07, replaces node-inj.lua
+    load_fontloader_module "luatex-fonts-ota"
+    load_fontloader_module "luatex-fonts-otn"  --> since 2014-01-07, replaces font-otn.lua
+    load_fontloader_module "font-otp"          --> since 2013-04-23
+    load_fontloader_module "luatex-fonts-lua"
+    load_fontloader_module "font-def"
+    load_fontloader_module "luatex-fonts-def"
+    load_fontloader_module "luatex-fonts-ext"
+    load_fontloader_module "luatex-fonts-cbk"
+end --- non-merge fallback scope
+
+--[[doc--
+
+    Here we adjust the globals created during font loader
+    initialization. If the second argument to
+    \luafunction{pop_namespaces()} is \verb|true| this will restore the
+    state of \luafunction{_G}, eliminating every global generated since
+    the last call to \luafunction{push_namespaces()}. At the moment we
+    see no reason to do this, and since the font loader is considered
+    an essential part of \identifier{luatex} as well as a very well
+    organized piece of code, we happily concede it the right to add to
+    \luafunction{_G} if needed.
+
+--doc]]--
+
+pop_namespaces(our_environment, false)-- true)
+
+logreport ("both", 1, "main",
+           "fontloader loaded in %0.3f seconds", os.gettimeofday()-starttime)
+
+--[[doc--
+
+    \subsection{Callbacks}
+    After the fontloader is ready we can restore the callback trap from
+    \identifier{luatexbase}.
+
+--doc]]--
+
+callback.register = trapped_register
+
+--[[doc--
+
+    We do our own callback handling with the means provided by
+    luatexbase.
+    Note: \luafunction{pre_linebreak_filter} and
+    \luafunction{hpack_filter} are coupled in \CONTEXT in the concept
+    of \emphasis{node processor}.
+
+--doc]]--
+
+luatexbase.add_to_callback("pre_linebreak_filter",
+                           nodes.simple_font_handler,
+                           "luaotfload.node_processor",
+                           1)
+luatexbase.add_to_callback("hpack_filter",
+                           nodes.simple_font_handler,
+                           "luaotfload.node_processor",
+                           1)
+
-- 
cgit v1.2.3


From ce886921fec191c6d62e2592fda064790bef8e9f Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sat, 20 Jun 2015 23:46:01 +0200
Subject: [init] add stub for module sanitization

---
 src/luaotfload-init.lua | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/luaotfload-init.lua')

diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua
index 22ad704..8bbb59f 100644
--- a/src/luaotfload-init.lua
+++ b/src/luaotfload-init.lua
@@ -309,3 +309,11 @@ luatexbase.add_to_callback("hpack_filter",
                            "luaotfload.node_processor",
                            1)
 
+return {
+  init = function ()
+    init_prepare ()
+    init_main ()
+    init_cleanup ()
+  end
+}
+
-- 
cgit v1.2.3


From f5d3197a4e5f6dee89fcf03e588f0d8cc357dd94 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sat, 20 Jun 2015 23:46:55 +0200
Subject: [init] adapt log messages

---
 src/luaotfload-init.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/luaotfload-init.lua')

diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua
index 8bbb59f..ce29527 100644
--- a/src/luaotfload-init.lua
+++ b/src/luaotfload-init.lua
@@ -96,7 +96,7 @@ log.set_loglevel (default_log_level)
 local starttime         = os.gettimeofday ()
 local trapped_register  = callback.register
 callback.register = function (id)
-  logreport ("log", 4, "main",
+  logreport ("log", 4, "init",
              "Dummy callback.register() invoked on %s.",
              id)
 end
@@ -145,7 +145,7 @@ end
 local context_environment = { }
 
 local push_namespaces = function ()
-    logreport ("log", 4, "main", "push namespace for font loader")
+    logreport ("log", 4, "init", "push namespace for font loader")
     local normalglobal = { }
     for k, v in next, _G do
         normalglobal[k] = v
@@ -158,7 +158,7 @@ local pop_namespaces = function (normalglobal, isolate)
         local _G = _G
         local mode = "non-destructive"
         if isolate then mode = "destructive" end
-        logreport ("log", 4, "main", "pop namespace from font loader -- " .. mode)
+        logreport ("log", 4, "init", "pop namespace from font loader -- " .. mode)
         for k, v in next, _G do
             if not normalglobal[k] then
                 context_environment[k] = v
@@ -173,7 +173,7 @@ local pop_namespaces = function (normalglobal, isolate)
         -- just to be sure:
         setmetatable(context_environment,_G)
     else
-        logreport ("both", 0, "main",
+        logreport ("both", 0, "init",
                    "irrecoverable error during pop_namespace: no globals to restore")
         os.exit()
     end
@@ -213,13 +213,13 @@ if fonts then
     --- The Initialization is highly idiosyncratic.
 
     if not fonts._merge_loaded_message_done_ then
-        logreport ("log", 5, "main", [["I am using the merged fontloader here.]])
-        logreport ("log", 5, "main", [[ If you run into problems or experience unexpected]])
-        logreport ("log", 5, "main", [[ behaviour, and if you have ConTeXt installed you can try]])
-        logreport ("log", 5, "main", [[ to delete the file 'fontloader-fontloader.lua' as I might]])
-        logreport ("log", 5, "main", [[ then use the possibly updated libraries. The merged]])
-        logreport ("log", 5, "main", [[ version is not supported as it is a frozen instance.]])
-        logreport ("log", 5, "main", [[ Problems can be reported to the ConTeXt mailing list."]])
+        logreport ("log", 5, "init", [["I am using the merged fontloader here.]])
+        logreport ("log", 5, "init", [[ If you run into problems or experience unexpected]])
+        logreport ("log", 5, "init", [[ behaviour, and if you have ConTeXt installed you can try]])
+        logreport ("log", 5, "init", [[ to delete the file 'fontloader-fontloader.lua' as I might]])
+        logreport ("log", 5, "init", [[ then use the possibly updated libraries. The merged]])
+        logreport ("log", 5, "init", [[ version is not supported as it is a frozen instance.]])
+        logreport ("log", 5, "init", [[ Problems can be reported to the ConTeXt mailing list."]])
     end
     fonts._merge_loaded_message_done_ = true
 
@@ -277,7 +277,7 @@ end --- non-merge fallback scope
 
 pop_namespaces(our_environment, false)-- true)
 
-logreport ("both", 1, "main",
+logreport ("both", 1, "init",
            "fontloader loaded in %0.3f seconds", os.gettimeofday()-starttime)
 
 --[[doc--
-- 
cgit v1.2.3


From 6516c934af82a0ade55c27edb4e596abf86f6b45 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sat, 20 Jun 2015 23:52:48 +0200
Subject: [init] move late initialization stage from toplevel into dedicated
 subroutines

---
 src/luaotfload-init.lua | 83 ++++++++++++++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 36 deletions(-)

(limited to 'src/luaotfload-init.lua')

diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua
index ce29527..b47e3d4 100644
--- a/src/luaotfload-init.lua
+++ b/src/luaotfload-init.lua
@@ -261,59 +261,70 @@ else--- the loading sequence is known to change, so this might have to
     load_fontloader_module "luatex-fonts-cbk"
 end --- non-merge fallback scope
 
---[[doc--
+local init_cleanup = function ()
+  --- reinstate all the stuff we had to move out of the way to
+  --- accomodate the loader
 
-    Here we adjust the globals created during font loader
-    initialization. If the second argument to
-    \luafunction{pop_namespaces()} is \verb|true| this will restore the
-    state of \luafunction{_G}, eliminating every global generated since
-    the last call to \luafunction{push_namespaces()}. At the moment we
-    see no reason to do this, and since the font loader is considered
-    an essential part of \identifier{luatex} as well as a very well
-    organized piece of code, we happily concede it the right to add to
-    \luafunction{_G} if needed.
+  --[[doc--
 
---doc]]--
+      Here we adjust the globals created during font loader
+      initialization. If the second argument to
+      \luafunction{pop_namespaces()} is \verb|true| this will restore the
+      state of \luafunction{_G}, eliminating every global generated since
+      the last call to \luafunction{push_namespaces()}. At the moment we
+      see no reason to do this, and since the font loader is considered
+      an essential part of \identifier{luatex} as well as a very well
+      organized piece of code, we happily concede it the right to add to
+      \luafunction{_G} if needed.
 
-pop_namespaces(our_environment, false)-- true)
+  --doc]]--
 
-logreport ("both", 1, "init",
-           "fontloader loaded in %0.3f seconds", os.gettimeofday()-starttime)
+  pop_namespaces(our_environment, false)-- true)
 
---[[doc--
+  --[[doc--
 
-    \subsection{Callbacks}
-    After the fontloader is ready we can restore the callback trap from
-    \identifier{luatexbase}.
+      \subsection{Callbacks}
+        After the fontloader is ready we can restore the callback trap
+        from \identifier{luatexbase}.
 
---doc]]--
+  --doc]]--
 
-callback.register = trapped_register
+  callback.register = trapped_register
+end --- [init_cleanup]
 
---[[doc--
+local init_post = function ()
+  --- hook for actions that need to take place after the fontloader is
+  --- installed
 
-    We do our own callback handling with the means provided by
-    luatexbase.
-    Note: \luafunction{pre_linebreak_filter} and
-    \luafunction{hpack_filter} are coupled in \CONTEXT in the concept
-    of \emphasis{node processor}.
-
---doc]]--
+  --[[doc--
 
-luatexbase.add_to_callback("pre_linebreak_filter",
-                           nodes.simple_font_handler,
-                           "luaotfload.node_processor",
-                           1)
-luatexbase.add_to_callback("hpack_filter",
-                           nodes.simple_font_handler,
-                           "luaotfload.node_processor",
-                           1)
+    we do our own callback handling with the means provided by
+    luatexbase.
+    note: \luafunction{pre_linebreak_filter} and
+    \luafunction{hpack_filter} are coupled in \context in the
+    concept of \emphasis{node processor}.
+
+  --doc]]--
+
+  luatexbase.add_to_callback("pre_linebreak_filter",
+                             nodes.simple_font_handler,
+                             "luaotfload.node_processor",
+                             1)
+  luatexbase.add_to_callback("hpack_filter",
+                             nodes.simple_font_handler,
+                             "luaotfload.node_processor",
+                             1)
+end --- [init_post]
 
 return {
   init = function ()
     init_prepare ()
     init_main ()
     init_cleanup ()
+    logreport ("both", 1, "init",
+               "fontloader loaded in %0.3f seconds",
+               os.gettimeofday()-starttime)
+    init_post ()
   end
 }
 
-- 
cgit v1.2.3


From 890a4727b8a5ee779254ed84da90f498acbe48a9 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sun, 21 Jun 2015 00:17:17 +0200
Subject: [main, init] partition initialization into a series of routines

---
 src/luaotfload-init.lua | 201 ++++++++++++++++++++++++++----------------------
 1 file changed, 110 insertions(+), 91 deletions(-)

(limited to 'src/luaotfload-init.lua')

diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua
index b47e3d4..c3e870d 100644
--- a/src/luaotfload-init.lua
+++ b/src/luaotfload-init.lua
@@ -30,37 +30,8 @@
 
 --doc]]--
 
-config                          = config or { }
-local config                    = config
-config.luaotfload               = config.luaotfload or { }
-
-config.lualibs                  = config.lualibs or { }
-config.lualibs.verbose          = false
-config.lualibs.prefer_merged    = true
-config.lualibs.load_extended    = true
-
-require "lualibs"
-
-if not lualibs    then error("this module requires Luaotfload") end
-if not luaotfload then error("this module requires Luaotfload") end
-
-local load_luaotfload_module = luaotfload.loaders.luaotfload
-local load_fontloader_module = luaotfload.loaders.fontloader
-
---[[doc--
-
-    The logger needs to be in place prior to loading the fontloader due
-    to order of initialization being crucial for the logger functions
-    that are swapped.
-
---doc]]--
-
-load_luaotfload_module "log"
-
-local log             = luaotfload.log
-local logreport       = log.report
-
-log.set_loglevel (default_log_level)
+local log        --- filled in after loading the log module
+local logreport  --- filled in after loading the log module
 
 --[[doc--
 
@@ -93,16 +64,45 @@ log.set_loglevel (default_log_level)
 
 --doc]]--
 
-local starttime         = os.gettimeofday ()
-local trapped_register  = callback.register
-callback.register = function (id)
-  logreport ("log", 4, "init",
-             "Dummy callback.register() invoked on %s.",
-             id)
-end
 
+local init_pre = function ()
 
---[[doc--
+  local store                  = { }
+  config                       = config or { } --- global
+  config.luaotfload            = config.luaotfload or { }
+  config.lualibs               = config.lualibs    or { }
+  config.lualibs.verbose       = false
+  config.lualibs.prefer_merged = true
+  config.lualibs.load_extended = true
+
+  require "lualibs"
+
+  if not lualibs    then error "this module requires Luaotfload" end
+  if not luaotfload then error "this module requires Luaotfload" end
+
+  --[[doc--
+
+    The logger needs to be in place prior to loading the fontloader due
+    to order of initialization being crucial for the logger functions
+    that are swapped.
+
+  --doc]]--
+
+  luaotfload.loaders.luaotfload "log"
+  log       = luaotfload.log
+  logreport = log.report
+  log.set_loglevel (default_log_level)
+
+  logreport ("log", 4, "init", "Concealing callback.register().")
+  store.trapped_register = callback.register
+
+  callback.register = function (id)
+    logreport ("log", 4, "init",
+               "Dummy callback.register() invoked on %s.",
+               id)
+  end
+
+  --[[doc--
 
     By default, the fontloader requires a number of \emphasis{private
     attributes} for internal use.
@@ -117,23 +117,22 @@ end
     The attribute identifiers are prefixed “\fileent{luaotfload@}” to
     avoid name clashes.
 
---doc]]--
+  --doc]]--
 
-do
-    local new_attribute    = luatexbase.new_attribute
-    local the_attributes   = luatexbase.attributes
+  local new_attribute    = luatexbase.new_attribute
+  local the_attributes   = luatexbase.attributes
 
-    attributes = attributes or { }
+  attributes = attributes or { } --- this writes a global, sorry
 
-    attributes.private = function (name)
-        local attr   = "luaotfload@" .. name --- used to be: “otfl@”
-        local number = the_attributes[attr]
-        if not number then
-            number = new_attribute(attr)
-        end
-        return number
-    end
-end
+  attributes.private = function (name)
+    local attr   = "luaotfload@" .. name --- used to be: “otfl@”
+    local number = the_attributes[attr]
+    if not number then number = new_attribute(attr) end
+    return number
+  end
+
+  return store
+end --- [init_pre]
 
 --[[doc--
 
@@ -142,8 +141,6 @@ end
 
 --doc]]--
 
-local context_environment = { }
-
 local push_namespaces = function ()
     logreport ("log", 4, "init", "push namespace for font loader")
     local normalglobal = { }
@@ -153,7 +150,9 @@ local push_namespaces = function ()
     return normalglobal
 end
 
-local pop_namespaces = function (normalglobal, isolate)
+local pop_namespaces = function (normalglobal,
+                                 isolate,
+                                 context_environment)
     if normalglobal then
         local _G = _G
         local mode = "non-destructive"
@@ -171,59 +170,71 @@ local pop_namespaces = function (normalglobal, isolate)
             _G[k] = v
         end
         -- just to be sure:
-        setmetatable(context_environment,_G)
+        setmetatable(context_environment, _G)
     else
         logreport ("both", 0, "init",
                    "irrecoverable error during pop_namespace: no globals to restore")
-        os.exit()
+        os.exit ()
     end
 end
 
-luaotfload.context_environment  = context_environment
-luaotfload.push_namespaces      = push_namespaces
-luaotfload.pop_namespaces       = pop_namespaces
+local init_adapt = function ()
 
-local our_environment = push_namespaces()
+  luaotfload.context_environment  = { }
+  luaotfload.push_namespaces      = push_namespaces
+  luaotfload.pop_namespaces       = pop_namespaces
 
---[[doc--
+  local our_environment = push_namespaces ()
 
-    The font loader requires that the attribute with index zero be
-    zero. We happily oblige.
-    (Cf. \fileent{luatex-fonts-nod.lua}.)
+  --[[doc--
 
---doc]]--
+      The font loader requires that the attribute with index zero be
+      zero. We happily oblige.
+      (Cf. \fileent{luatex-fonts-nod.lua}.)
 
-tex.attribute[0] = 0
+  --doc]]--
 
---[[doc--
+  tex.attribute[0] = 0
 
-    Now that things are sorted out we can finally load the fontloader.
+  return our_environment
 
-    For less current distibutions we ship the code from TL 2014 that should be
-    compatible with Luatex 0.76.
+end --- [init_adapt]
 
---doc]]--
+local init_main = function ()
+
+  local load_fontloader_module = luaotfload.loaders.fontloader
+
+  --[[doc--
+
+      Now that things are sorted out we can finally load the
+      fontloader.
 
-load_fontloader_module (luaotfload.fontloader_package)
+      For less current distibutions we ship the code from TL 2014 that
+      should be compatible with Luatex 0.76.
+
+  --doc]]--
 
----load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context
+  load_fontloader_module (luaotfload.fontloader_package)
 
-if fonts then
+  ---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context
+
+  if fonts then
 
     --- The Initialization is highly idiosyncratic.
 
     if not fonts._merge_loaded_message_done_ then
-        logreport ("log", 5, "init", [["I am using the merged fontloader here.]])
-        logreport ("log", 5, "init", [[ If you run into problems or experience unexpected]])
-        logreport ("log", 5, "init", [[ behaviour, and if you have ConTeXt installed you can try]])
-        logreport ("log", 5, "init", [[ to delete the file 'fontloader-fontloader.lua' as I might]])
-        logreport ("log", 5, "init", [[ then use the possibly updated libraries. The merged]])
-        logreport ("log", 5, "init", [[ version is not supported as it is a frozen instance.]])
-        logreport ("log", 5, "init", [[ Problems can be reported to the ConTeXt mailing list."]])
+      logreport ("log", 5, "init", [["I am using the merged fontloader here.]])
+      logreport ("log", 5, "init", [[ If you run into problems or experience unexpected]])
+      logreport ("log", 5, "init", [[ behaviour, and if you have ConTeXt installed you can try]])
+      logreport ("log", 5, "init", [[ to delete the file 'fontloader-fontloader.lua' as I might]])
+      logreport ("log", 5, "init", [[ then use the possibly updated libraries. The merged]])
+      logreport ("log", 5, "init", [[ version is not supported as it is a frozen instance.]])
+      logreport ("log", 5, "init", [[ Problems can be reported to the ConTeXt mailing list."]])
     end
     fonts._merge_loaded_message_done_ = true
 
-else--- the loading sequence is known to change, so this might have to
+  else
+    --- the loading sequence is known to change, so this might have to
     --- be updated with future updates!
     --- do not modify it though unless there is a change to the merged
     --- package!
@@ -259,9 +270,11 @@ else--- the loading sequence is known to change, so this might have to
     load_fontloader_module "luatex-fonts-def"
     load_fontloader_module "luatex-fonts-ext"
     load_fontloader_module "luatex-fonts-cbk"
-end --- non-merge fallback scope
+  end --- non-merge fallback scope
+
+end --- [init_main]
 
-local init_cleanup = function ()
+local init_cleanup = function (store)
   --- reinstate all the stuff we had to move out of the way to
   --- accomodate the loader
 
@@ -279,7 +292,9 @@ local init_cleanup = function ()
 
   --doc]]--
 
-  pop_namespaces(our_environment, false)-- true)
+  luaotfload.pop_namespaces (store.our_environment,
+                             false,
+                             luaotfload.context_environment)
 
   --[[doc--
 
@@ -289,7 +304,9 @@ local init_cleanup = function ()
 
   --doc]]--
 
-  callback.register = trapped_register
+  logreport ("log", 4, "init",
+             "Restoring original callback.register().")
+  callback.register = store.trapped_register
 end --- [init_cleanup]
 
 local init_post = function ()
@@ -318,12 +335,14 @@ end --- [init_post]
 
 return {
   init = function ()
-    init_prepare ()
+    local starttime = os.gettimeofday ()
+    local store = init_pre ()
+    store.our_environment = init_adapt ()
     init_main ()
-    init_cleanup ()
+    init_cleanup (store)
     logreport ("both", 1, "init",
                "fontloader loaded in %0.3f seconds",
-               os.gettimeofday()-starttime)
+               os.gettimeofday() - starttime)
     init_post ()
   end
 }
-- 
cgit v1.2.3


From e8a56b051a32ed4c468c9325048ded01002a841a Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sun, 21 Jun 2015 00:19:32 +0200
Subject: [init] remove annyoing banner

---
 src/luaotfload-init.lua | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'src/luaotfload-init.lua')

diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua
index c3e870d..feff4cc 100644
--- a/src/luaotfload-init.lua
+++ b/src/luaotfload-init.lua
@@ -218,22 +218,7 @@ local init_main = function ()
 
   ---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context
 
-  if fonts then
-
-    --- The Initialization is highly idiosyncratic.
-
-    if not fonts._merge_loaded_message_done_ then
-      logreport ("log", 5, "init", [["I am using the merged fontloader here.]])
-      logreport ("log", 5, "init", [[ If you run into problems or experience unexpected]])
-      logreport ("log", 5, "init", [[ behaviour, and if you have ConTeXt installed you can try]])
-      logreport ("log", 5, "init", [[ to delete the file 'fontloader-fontloader.lua' as I might]])
-      logreport ("log", 5, "init", [[ then use the possibly updated libraries. The merged]])
-      logreport ("log", 5, "init", [[ version is not supported as it is a frozen instance.]])
-      logreport ("log", 5, "init", [[ Problems can be reported to the ConTeXt mailing list."]])
-    end
-    fonts._merge_loaded_message_done_ = true
-
-  else
+  if not fonts then
     --- the loading sequence is known to change, so this might have to
     --- be updated with future updates!
     --- do not modify it though unless there is a change to the merged
-- 
cgit v1.2.3