From 4a76c3abcdf750cbf1e825d0fce637e35f63b10a Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 27 Sep 2015 18:28:14 +0200 Subject: [main, parsers] prepare for deferred initialization --- src/luaotfload-init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index a493cc1..a5e5bec 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -38,8 +38,8 @@ local logreport --- filled in after loading the log module --[[doc-- \subsection{Preparing the Font Loader} - We treat the fontloader as a black box so behavior is consistent - between formats. + We treat the fontloader as a semi-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 -- cgit v1.2.3 From 780113609ffbb146c1b5a825cb25025246cdba2a Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 27 Sep 2015 20:17:02 +0200 Subject: [main, *] convert for centralized initialization routine --- src/luaotfload-init.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index a5e5bec..af71cb2 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -431,6 +431,8 @@ return { os.gettimeofday() - starttime) local n = init_post () logreport ("both", 5, "init", "post hook terminated, %d actions performed", n) + return true end } +-- vim:tw=79:sw=2:ts=2:expandtab -- cgit v1.2.3 From 8395eb8efec1ac9e311541d9834f1a939b91e710 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 5 Nov 2015 22:08:47 +0100 Subject: [*] kill off file headers We have the VCS info in the status file; these things are just silly. --- src/luaotfload-init.lua | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index af71cb2..1c2046d 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -4,8 +4,6 @@ -- DESCRIPTION: Luaotfload font loader initialization -- REQUIREMENTS: luatex v.0.80 or later; packages lualibs, luatexbase -- AUTHOR: Philipp Gesang (Phg), --- VERSION: 1.0 --- CREATED: 2015-05-26 07:50:54+0200 ----------------------------------------------------------------------- -- -- cgit v1.2.3 From 389fe13c73832215d8486e43ed3c52f6c96f45ca Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Mon, 9 Nov 2015 08:03:29 +0100 Subject: [main,init] add no-op loader for fontloader files --- src/luaotfload-init.lua | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index 1c2046d..1d6d1a5 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 ignore_module = luaotfload.loaders.ignore --[[doc-- @@ -214,26 +215,33 @@ local init_main = function () --doc]]-- + logreport ("log", 4, "init", + "Loading fontloader as merged package.") load_fontloader_module (luaotfload.fontloader_package) ---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context 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 - --- 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" + logreport ("log", 4, "init", + "Loading fontloader components individually.") + --- 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 upstream package! + + --- 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" + ignore_module "luatex-basics-gen" + + --- These constitute the fontloader proper. load_fontloader_module "data-con" load_fontloader_module "luatex-basics-nod" load_fontloader_module "font-ini" -- cgit v1.2.3 From 60f41dfbc13f06a1b43a4e66798a0d043d210eee Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Mon, 9 Nov 2015 08:16:19 +0100 Subject: [init,conf] enable direct loading of fontloader components MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For now, this pertains only to the modules we ship in Luaotfload. For loading from Context we still need a step to distinguish between the namespaced versions of the files, the pure ones in texmf/…/base, and the Luatex-Fonts ones. But yeah, setting [run] fontloader = unpackaged in the luaotfloadrc now works splendidly. --- src/luaotfload-init.lua | 53 ++++++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 20 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index 1d6d1a5..c2899d7 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -215,14 +215,11 @@ local init_main = function () --doc]]-- - logreport ("log", 4, "init", - "Loading fontloader as merged package.") - load_fontloader_module (luaotfload.fontloader_package) - - ---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context + local fontloader = config.luaotfload and config.luaotfload.run.fontloader + or "reference" - if not fonts then - logreport ("log", 4, "init", + if fontloader == "unpackaged" then + logreport ("both", 4, "init", "Loading fontloader components individually.") --- 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 @@ -243,27 +240,43 @@ local init_main = function () --- These constitute the fontloader proper. load_fontloader_module "data-con" - load_fontloader_module "luatex-basics-nod" + load_fontloader_module "basics-nod" load_fontloader_module "font-ini" load_fontloader_module "font-con" - load_fontloader_module "luatex-fonts-enc" + load_fontloader_module "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 "fonts-syn" + load_fontloader_module "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 "fonts-inj" --> since 2014-01-07, replaces node-inj.lua + load_fontloader_module "fonts-ota" + load_fontloader_module "fonts-otn" --> since 2014-01-07, replaces font-otn.lua + load_fontloader_module "font-otp" --> since 2013-04-23 + load_fontloader_module "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 + load_fontloader_module "fonts-def" + load_fontloader_module "fonts-ext" + load_fontloader_module "fonts-cbk" + + elseif fontloader == "context" then + logreport ("both", 4, "init", + "Loading fontloader components from context.") + logreport ("both", 0, "init", "NOT IMPLEMENTED YET.") + os.exit(-42) + + elseif fontloader then + fontloader = tostring (fontloader) + --- “reference”, “default” + logreport ("both", 4, "init", + "Attempting to load fontloader “%s”.", + fontloader) + load_fontloader_module (luaotfload.fontloader_package) + end + + ---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context end --- [init_main] -- cgit v1.2.3 From 43f18a389a1380e950cea104f3ada32c88c47863 Mon Sep 17 00:00:00 2001 From: Philipp Gesang 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 From ec1984766b941087425acca1b4d4fa8201c86639 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 17 Nov 2015 22:51:30 +0100 Subject: [init] rework fontloader choices --- src/luaotfload-init.lua | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index ca5d9ec..2676ec7 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -8,6 +8,7 @@ -- local setmetatable = setmetatable +local kpselookup = kpse.lookup --[[doc-- @@ -218,6 +219,7 @@ local init_main = function () local fontloader = config.luaotfload and config.luaotfload.run.fontloader or "reference" + fontloader = tostring (fontloader) if fontloader == "unpackaged" then logreport ("both", 4, "init", @@ -302,13 +304,34 @@ local init_main = function () load_context_module "luatex-fonts-ext" load_context_module "luatex-fonts-cbk" - elseif fontloader then - fontloader = tostring (fontloader) - --- “reference”, “default” - logreport ("both", 4, "init", - "Attempting to load fontloader “%s”.", + elseif lfs.isdir (fontloader) then + logreport ("both", 2, "init", + "Attempting to load Context files under prefix “%s”.", + fontloader) + TODO() + + elseif lfs.isfile (fontloader) then + logreport ("both", 2, "init", + "Attempting to load fontloader from absolute path “%s”.", + fontloader) + local _void = require (fontloader) + + elseif kpselookup (fontloader) then + local pth = kpselookup (fontloader) + logreport ("both", 2, "init", + "Attempting to load fontloader “%s” from kpse-resolved path “%s”.", + fontloader, path) + local _void = require (path) + + else --- “reference”, “default” + logreport ("log", 6, "init", + "No match for fontloader spec “%s”.", + fontloader) + fontloader = luaotfload.fontloader_package + logreport ("log", 4, "init", + "Using predefined fontloader “%s”.", fontloader) - load_fontloader_module (luaotfload.fontloader_package) + load_fontloader_module (fontloader) end ---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context -- cgit v1.2.3 From 2bcb46cfec8b8d988e12f44d6297f4fb5f9e879b Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 17 Nov 2015 23:08:58 +0100 Subject: [init] unify both Context load branches --- src/luaotfload-init.lua | 103 +++++++++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 40 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index 2676ec7..a42801f 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -182,6 +182,65 @@ local pop_namespaces = function (normalglobal, end end +local context_modules = { + + --- Since 2.6 those are directly provided by the Lualibs package. + { false, "l-lua" }, + { false, "l-lpeg" }, + { false, "l-function" }, + { false, "l-string" }, + { false, "l-table" }, + { false, "l-io" }, + { false, "l-file" }, + { false, "l-boolean" }, + { false, "l-math" }, + { false, "util-str" }, + + --- These constitute the fontloader proper. + { true, "luatex-basics-gen" }, + { true, "data-con" }, + { true, "luatex-basics-nod" }, + { true, "font-ini" }, + { true, "font-con" }, + { true, "luatex-fonts-enc" }, + { true, "font-cid" }, + { true, "font-map" }, + { true, "luatex-fonts-syn" }, + { true, "luatex-fonts-tfm" }, + { true, "font-oti" }, + { true, "font-otf" }, + { true, "font-otb" }, + { true, "luatex-fonts-inj" }, --> since 2014-01-07, replaces node-inj.lua + { true, "luatex-fonts-ota" }, + { true, "luatex-fonts-otn" }, --> since 2014-01-07, replaces font-otn.lua + { true, "font-otp" }, --> since 2013-04-23 + { true, "luatex-fonts-lua" }, + { true, "font-def" }, + { true, "luatex-fonts-def" }, + { true, "luatex-fonts-ext" }, + { true, "luatex-fonts-cbk" }, + +} --[[context_modules]] + +local load_context_modules = function (pth) + + local load_context_module = luaotfload.loaders.context + local ignore_module = luaotfload.loaders.ignore + + logreport ("both", 2, "init", + "Loading fontloader components from context.") + local n = #context_modules + for i = 1, n do + local state, spec = unpack (context_modules [i]) + if state == false then + ignore_module (spec) + elseif state == true then + load_context_module (spec) + end + end + +end + local init_adapt = function () local context_environment = { } @@ -204,7 +263,6 @@ 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,50 +323,15 @@ local init_main = function () load_fontloader_module "fonts-cbk" elseif fontloader == "context" then - logreport ("both", 4, "init", - "Loading fontloader components from context.") - logreport ("both", 0, "init", "NOT IMPLEMENTED YET.") - --- 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" + logreport ("both", 2, "init", + "Attempting to load Context modules in lookup path.") + load_context_modules () elseif lfs.isdir (fontloader) then logreport ("both", 2, "init", "Attempting to load Context files under prefix “%s”.", fontloader) - TODO() + load_context_modules (fontloader) elseif lfs.isfile (fontloader) then logreport ("both", 2, "init", -- cgit v1.2.3 From 0bfd03b4fcdf1cbf3f1fb8e8afa7a2c4d917715a Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 17 Nov 2015 23:56:44 +0100 Subject: [main,init] implement path dependent loading of context modules --- src/luaotfload-init.lua | 61 ++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 26 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index a42801f..2755f78 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -182,6 +182,10 @@ local pop_namespaces = function (normalglobal, end end +--- below paths are relative to the texmf-context +local ltx = "tex/generic/context/luatex" +local ctx = "tex/context/base" + local context_modules = { --- Since 2.6 those are directly provided by the Lualibs package. @@ -197,28 +201,28 @@ local context_modules = { { false, "util-str" }, --- These constitute the fontloader proper. - { true, "luatex-basics-gen" }, - { true, "data-con" }, - { true, "luatex-basics-nod" }, - { true, "font-ini" }, - { true, "font-con" }, - { true, "luatex-fonts-enc" }, - { true, "font-cid" }, - { true, "font-map" }, - { true, "luatex-fonts-syn" }, - { true, "luatex-fonts-tfm" }, - { true, "font-oti" }, - { true, "font-otf" }, - { true, "font-otb" }, - { true, "luatex-fonts-inj" }, --> since 2014-01-07, replaces node-inj.lua - { true, "luatex-fonts-ota" }, - { true, "luatex-fonts-otn" }, --> since 2014-01-07, replaces font-otn.lua - { true, "font-otp" }, --> since 2013-04-23 - { true, "luatex-fonts-lua" }, - { true, "font-def" }, - { true, "luatex-fonts-def" }, - { true, "luatex-fonts-ext" }, - { true, "luatex-fonts-cbk" }, + { ltx, "luatex-basics-gen" }, + { ctx, "data-con" }, + { ltx, "luatex-basics-nod" }, + { ctx, "font-ini" }, + { ctx, "font-con" }, + { ltx, "luatex-fonts-enc" }, + { ctx, "font-cid" }, + { ctx, "font-map" }, + { ltx, "luatex-fonts-syn" }, + { ltx, "luatex-fonts-tfm" }, + { ctx, "font-oti" }, + { ctx, "font-otf" }, + { ctx, "font-otb" }, + { ltx, "luatex-fonts-inj" }, --> since 2014-01-07, replaces node-inj.lua + { ltx, "luatex-fonts-ota" }, + { ltx, "luatex-fonts-otn" }, --> since 2014-01-07, replaces font-otn.lua + { ctx, "font-otp" }, --> since 2013-04-23 + { ltx, "luatex-fonts-lua" }, + { ctx, "font-def" }, + { ltx, "luatex-fonts-def" }, + { ltx, "luatex-fonts-ext" }, + { ltx, "luatex-fonts-cbk" }, } --[[context_modules]] @@ -231,11 +235,16 @@ local load_context_modules = function (pth) "Loading fontloader components from context.") local n = #context_modules for i = 1, n do - local state, spec = unpack (context_modules [i]) - if state == false then + local sub, spec = unpack (context_modules [i]) + if sub == false then ignore_module (spec) - elseif state == true then - load_context_module (spec) + elseif type (sub) == "string" then + load_context_module (spec, file.join (pth, sub)) + else + logreport ("both", 0, "init", + "Internal error, please report. \z + This is not your fault.") + os.exit (-1) end end -- cgit v1.2.3 From 17b8126f260a4f80a041ab179ceb68abf425c359 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 18 Nov 2015 07:47:47 +0100 Subject: [init] fix pathless Context module loading --- src/luaotfload-init.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index 2755f78..f1d1a8e 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -228,8 +228,8 @@ local context_modules = { local load_context_modules = function (pth) - local load_context_module = luaotfload.loaders.context - local ignore_module = luaotfload.loaders.ignore + local load_module = luaotfload.loaders.context + local ignore_module = luaotfload.loaders.ignore logreport ("both", 2, "init", "Loading fontloader components from context.") @@ -239,7 +239,11 @@ local load_context_modules = function (pth) if sub == false then ignore_module (spec) elseif type (sub) == "string" then - load_context_module (spec, file.join (pth, sub)) + if pth then + load_module (spec, file.join (pth, sub)) + else + load_module (spec) + end else logreport ("both", 0, "init", "Internal error, please report. \z -- cgit v1.2.3 From 85bc85c1f116f759c59ef06f27bb37c0d2bb80f6 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 18 Nov 2015 07:52:24 +0100 Subject: [init] handle case for reference loader first MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since it’s the trivial case, expected in 99 % of runs. --- src/luaotfload-init.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index f1d1a8e..5b21d70 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -292,7 +292,11 @@ local init_main = function () or "reference" fontloader = tostring (fontloader) - if fontloader == "unpackaged" then + if fontloader == "reference" or fontloader == "default" then + logreport ("log", 4, "init", "Using reference fontloader.") + load_fontloader_module (luaotfload.fontloader_package) + + elseif fontloader == "unpackaged" then logreport ("both", 4, "init", "Loading fontloader components individually.") --- The loading sequence is known to change, so this might have to be @@ -359,7 +363,7 @@ local init_main = function () fontloader, path) local _void = require (path) - else --- “reference”, “default” + else logreport ("log", 6, "init", "No match for fontloader spec “%s”.", fontloader) @@ -372,6 +376,9 @@ local init_main = function () ---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context + logreport ("both", 0, "init", + "Context OpenType loader version “%s”", + fonts.handlers.otf.version) end --- [init_main] local init_cleanup = function (store) -- cgit v1.2.3 From 671f654e671cc2b255b21b937bbfd7f63cf43c22 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 18 Nov 2015 08:04:17 +0100 Subject: [init] treat known fontloaders as special case Defaulting too soon will prevent loading other loaders like the TL 2014 one we ship for backwards compatibility. --- src/luaotfload-init.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index 5b21d70..0f7464a 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -363,13 +363,19 @@ local init_main = function () fontloader, path) local _void = require (path) + elseif fontloader then + logreport ("log", 4, "init", + "Using predefined fontloader “%s”.", + fontloader) + load_fontloader_module (fontloader) + else - logreport ("log", 6, "init", - "No match for fontloader spec “%s”.", + logreport ("log", 4, "init", + "No match for requested fontloader “%s”.", fontloader) fontloader = luaotfload.fontloader_package logreport ("log", 4, "init", - "Using predefined fontloader “%s”.", + "Defaulting to predefined fontloader “%s”.", fontloader) load_fontloader_module (fontloader) end -- cgit v1.2.3