From 95c68d691764fd1458e68456f8cc035f6164d041 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 21 Jan 2016 23:19:06 +0100 Subject: [init] always log final fontloader choice --- src/luaotfload-init.lua | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index d471152..0f88e58 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -256,7 +256,7 @@ local context_modules = { { ltx, "font-inj" }, { ltx, "luatex-fonts-ota" }, { ltx, "font-otn" }, - { ctx, "font-otp" }, --> since 2013-04-23 + { ctx, "font-otp" }, { ltx, "luatex-fonts-lua" }, { ctx, "font-def" }, { ltx, "luatex-fonts-def" }, @@ -332,7 +332,7 @@ local init_main = function () fontloader = tostring (fontloader) if fontloader == "reference" then - logreport ("log", 4, "init", "Using reference fontloader.") + logreport ("log", 0, "init", "Using reference fontloader.") load_fontloader_module (luaotfload.fontloader_package) elseif fontloader == "default" then @@ -345,7 +345,7 @@ local init_main = function () load_fontloader_module (luaotfload.fontloader_package) elseif fontloader == "unpackaged" then - logreport ("both", 4, "init", + logreport ("log", 0, "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 @@ -388,41 +388,41 @@ local init_main = function () load_fontloader_module "fonts-cbk" elseif fontloader == "context" then - logreport ("both", 2, "init", - "Attempting to load Context modules in lookup path.") + logreport ("log", 0, "init", + "Loading 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”.", + logreport ("log", 0, "init", + "Loading Context files under prefix “%s”.", fontloader) load_context_modules (fontloader) elseif lfs.isfile (fontloader) then - logreport ("both", 2, "init", - "Attempting to load fontloader from absolute path “%s”.", + logreport ("log", 0, "init", + "Loading fontloader from absolute path “%s”.", fontloader) local _void = require (fontloader) elseif kpselookup (fontloader) then local path = kpselookup (fontloader) - logreport ("both", 2, "init", - "Attempting to load fontloader “%s” from kpse-resolved path “%s”.", + logreport ("log", 0, "init", + "Loading fontloader “%s” from kpse-resolved path “%s”.", fontloader, path) local _void = require (path) elseif fontloader then - logreport ("log", 4, "init", + logreport ("log", 0, "init", "Using predefined fontloader “%s”.", fontloader) load_fontloader_module (fontloader) else - logreport ("log", 4, "init", + logreport ("log", 0, "init", "No match for requested fontloader “%s”.", fontloader) fontloader = luaotfload.fontloader_package - logreport ("log", 4, "init", + logreport ("log", 0, "init", "Defaulting to predefined fontloader “%s”.", fontloader) load_fontloader_module (fontloader) -- cgit v1.2.3 From 55799dad5b8a2716aea1cfee28b4ce093e587f8a Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Fri, 22 Jan 2016 00:48:25 +0100 Subject: [init] fix Context module sequence --- src/luaotfload-init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/luaotfload-init.lua') diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index 0f88e58..7ed9c96 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -247,21 +247,21 @@ local context_modules = { { 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, "font-inj" }, + { ctx, "font-inj" }, { ltx, "luatex-fonts-ota" }, - { ltx, "font-otn" }, + { ctx, "font-otn" }, { ctx, "font-otp" }, { ltx, "luatex-fonts-lua" }, { ctx, "font-def" }, { ltx, "luatex-fonts-def" }, { ltx, "luatex-fonts-ext" }, { ltx, "luatex-fonts-cbk" }, + { ctx, "font-map" }, } --[[context_modules]] -- cgit v1.2.3