From 43f18a389a1380e950cea104f3ada32c88c47863 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Tue, 10 Nov 2015 08:06:55 +0100
Subject: [init] access the context loader from init
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Works fine now by choosing the “context” fontloader in luaotfloadrc.
---
 src/luaotfload-init.lua | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

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

diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua
index c2899d7..ca5d9ec 100644
--- a/src/luaotfload-init.lua
+++ b/src/luaotfload-init.lua
@@ -203,6 +203,7 @@ end --- [init_adapt]
 local init_main = function ()
 
   local load_fontloader_module = luaotfload.loaders.fontloader
+  local load_context_module    = luaotfload.loaders.context
   local ignore_module          = luaotfload.loaders.ignore
 
   --[[doc--
@@ -265,7 +266,41 @@ local init_main = function ()
     logreport ("both", 4, "init",
                "Loading fontloader components from context.")
     logreport ("both", 0, "init", "NOT IMPLEMENTED YET.")
-    os.exit(-42)
+    --- Since 2.6 those are directly provided by the Lualibs package.
+    ignore_module "l-lua"
+    ignore_module "l-lpeg"
+    ignore_module "l-function"
+    ignore_module "l-string"
+    ignore_module "l-table"
+    ignore_module "l-io"
+    ignore_module "l-file"
+    ignore_module "l-boolean"
+    ignore_module "l-math"
+    ignore_module "util-str"
+
+    --- These constitute the fontloader proper.
+    load_context_module "luatex-basics-gen"
+    load_context_module "data-con"
+    load_context_module "luatex-basics-nod"
+    load_context_module "font-ini"
+    load_context_module "font-con"
+    load_context_module "luatex-fonts-enc"
+    load_context_module "font-cid"
+    load_context_module "font-map"
+    load_context_module "luatex-fonts-syn"
+    load_context_module "luatex-fonts-tfm"
+    load_context_module "font-oti"
+    load_context_module "font-otf"
+    load_context_module "font-otb"
+    load_context_module "luatex-fonts-inj"  --> since 2014-01-07, replaces node-inj.lua
+    load_context_module "luatex-fonts-ota"
+    load_context_module "luatex-fonts-otn"  --> since 2014-01-07, replaces font-otn.lua
+    load_context_module "font-otp"   --> since 2013-04-23
+    load_context_module "luatex-fonts-lua"
+    load_context_module "font-def"
+    load_context_module "luatex-fonts-def"
+    load_context_module "luatex-fonts-ext"
+    load_context_module "luatex-fonts-cbk"
 
   elseif fontloader then
     fontloader = tostring (fontloader)
-- 
cgit v1.2.3