From a2ea45941a60348f60a312abf8fb01b086dc41a6 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 7 Apr 2016 23:58:55 +0200 Subject: [*] update dates, version --- src/luaotfload-configuration.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/luaotfload-configuration.lua') diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua index 0d48479..32e1417 100644 --- a/src/luaotfload-configuration.lua +++ b/src/luaotfload-configuration.lua @@ -2,14 +2,14 @@ ------------------------------------------------------------------------------- -- FILE: luaotfload-configuration.lua -- DESCRIPTION: config file reader --- REQUIREMENTS: Luaotfload 2.6 or above +-- REQUIREMENTS: Luaotfload 2.7 or above -- AUTHOR: Philipp Gesang, -- AUTHOR: Dohyun Kim ------------------------------------------------------------------------------- -- if not modules then modules = { } end modules ["luaotfload-configuration"] = { - version = "2.6", + version = "2.7", comment = "part of Luaotfload", author = "Philipp Gesang, Dohyun Kim", copyright = "Luaotfload Development Team", -- cgit v1.2.3 From 2a802efe6456f8cfeda53b6df1201413e199812f Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sat, 9 Apr 2016 22:20:10 +0200 Subject: [conf,db] allow switching back to fontforge There are some non-negligible differences in the reader output, especially concerning font names. Until this is sorted out we need a fast way to switch back to the old code for reference. --- src/luaotfload-configuration.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/luaotfload-configuration.lua') diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua index 32e1417..f82c827 100644 --- a/src/luaotfload-configuration.lua +++ b/src/luaotfload-configuration.lua @@ -203,6 +203,7 @@ local default_config = { log_level = 0, color_callback = "post_linebreak_filter", fontloader = default_fontloader (), + use_fontforge = false, }, misc = { bisect = false, @@ -369,6 +370,18 @@ local set_default_features = function () return true end +local set_fontforge = function () + if not _G.fontloader then + logreport ("both", 0, "db", "The fontloader library is missing.") + return false + end + local names = fonts.names + if names and names.use_fontforge then + logreport ("log", 0, "db", "Loading font data with FontForge.") + names.use_fontforge (true) + end + return true +end reconf_tasks = { { "Set the log level" , set_loglevel }, @@ -377,6 +390,7 @@ reconf_tasks = { { "Set the font filter" , set_font_filter }, { "Install font name resolver", set_name_resolver }, { "Set default features" , set_default_features }, + { "Set fontforge" , set_fontforge }, } ------------------------------------------------------------------------------- @@ -509,6 +523,7 @@ local option_spec = { id) return id end, + use_fontforge = { in_t = boolean_t, }, }, log_level = { in_t = number_t, @@ -672,6 +687,7 @@ local formatters = { fontloader = { false, format_string }, log_level = { false, format_integer }, resolver = { false, format_string }, + use_fontforge = { false, format_boolean }, }, } -- cgit v1.2.3 From a4781c4786b39ea4e54c2944a575e88c3f1e591d Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 10 Apr 2016 11:35:25 +0200 Subject: [conf] rework logic ff/lua fontloader choice --- src/luaotfload-configuration.lua | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'src/luaotfload-configuration.lua') diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua index f82c827..f19b9bc 100644 --- a/src/luaotfload-configuration.lua +++ b/src/luaotfload-configuration.lua @@ -371,14 +371,25 @@ local set_default_features = function () end local set_fontforge = function () - if not _G.fontloader then - logreport ("both", 0, "db", "The fontloader library is missing.") - return false - end local names = fonts.names - if names and names.use_fontforge then + if not names or not names.use_fontforge then + --- happens normally on the first run + logreport ("log", 4, "db", "Database not present.") + return true + end + local use_ff = config.luaotfload.run.use_fontforge + if use_ff == true then + if not _G.fontloader then + logreport ("both", 0, "db", + "Fontforge loader was requested but the fontloader \z + library is missing.") + return false + end logreport ("log", 0, "db", "Loading font data with FontForge.") names.use_fontforge (true) + else + logreport ("log", 4, "db", "Loading font data with the Lua loader.") + names.use_fontforge (false) end return true end @@ -523,8 +534,8 @@ local option_spec = { id) return id end, - use_fontforge = { in_t = boolean_t, }, }, + use_fontforge = { in_t = boolean_t, }, log_level = { in_t = number_t, out_t = number_t, --- TODO int_t from 5.3.x on -- cgit v1.2.3