From b1e9655b7fe9d827c051b977ce31a4a4da5aec6d Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 28 Sep 2016 12:09:13 +0200 Subject: [main,tool] fix version check Fixes #382 Luaotfload will fail with an up to date Luatex on account on a buggy minimum version check. Many thanks to @davidcarlisle for the report. --- src/luaotfload-tool.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/luaotfload-tool.lua') diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua index fee5980..45d5e63 100755 --- a/src/luaotfload-tool.lua +++ b/src/luaotfload-tool.lua @@ -2,7 +2,7 @@ ----------------------------------------------------------------------- -- FILE: luaotfload-tool.lua -- DESCRIPTION: database functionality --- REQUIREMENTS: luaotfload 2.7 +-- REQUIREMENTS: luaotfload 2.8 -- AUTHOR: Khaled Hosny, Élie Roux, Philipp Gesang -- LICENSE: GPL v2.0 ----------------------------------------------------------------------- @@ -10,7 +10,7 @@ luaotfload = luaotfload or { } local version = "2.8" luaotfload.version = version -luaotfload.min_luatex_version = { 0, 95, 0 } --- i. e. 0.95.0 +luaotfload.min_luatex_version = { 0, 95, 0 } luaotfload.self = "luaotfload-tool" --[[doc-- @@ -64,8 +64,9 @@ do actual = { major, minor, revno or 0 } end - if actual [1] < minimum [1] or actual [2] < minimum [2] - or actual [3] < minimum [3] + if actual [1] < minimum [1] + or actual == minimum and actual [2] < minimum [2] + or actual == minimum and actual [2] == minimum [2] and actual [3] < minimum [3] then texio.write_nl ("term and log", string.format ("\tFATAL ERROR\n\z -- cgit v1.2.3 From 127133d3bc3f70d054045f47df924cba88741195 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 29 Sep 2016 21:24:41 +0200 Subject: [tool] remove unnecessary modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These only make the loader emit warnings because of the missing runtime environment. They weren’t needed to begin with. --- src/luaotfload-tool.lua | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/luaotfload-tool.lua') diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua index 45d5e63..aa9b5b2 100755 --- a/src/luaotfload-tool.lua +++ b/src/luaotfload-tool.lua @@ -153,20 +153,8 @@ require "fontloader-font-cff" require "fontloader-font-ttf" require "fontloader-font-dsp" require "fontloader-font-oup" -require "fontloader-font-otl" -require "fontloader-font-oto" -------- "fontloader-font-otj" -------- "fontloader-font-ota" -------- "fontloader-font-ots" -------- "fontloader-font-osd" require "fontloader-font-onr" -require "fontloader-font-one" -require "fontloader-font-afk" -require "fontloader-font-tfm" -require "fontloader-font-lua" require "fontloader-font-def" -require "fontloader-fonts-ext" -------- "fontloader-font-gbn" fonts = fonts or { } local fontsnames = fonts.names or { } -- cgit v1.2.3 From e7df86aa0afab9d353313a2d2d9bc66045fd823c Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 29 Sep 2016 22:46:46 +0200 Subject: [features,tool] fix subfont handling in file loading MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subfont loading seems to have been broken for a while but no reports … --- src/luaotfload-tool.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/luaotfload-tool.lua') diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua index aa9b5b2..6c1f7d1 100755 --- a/src/luaotfload-tool.lua +++ b/src/luaotfload-tool.lua @@ -181,7 +181,7 @@ end require "alt_getopt" -loadmodule "log.lua" --- this populates the luaotfload.log.* namespace +loadmodule "log" --- this populates the luaotfload.log.* namespace loadmodule "parsers" --- fonts.conf, configuration, and request syntax loadmodule "configuration" --- configuration file handling loadmodule "database" @@ -655,7 +655,7 @@ subfont_by_name = function (lst, askedname, n) if fonts.names.sanitize_fontname (font.fullname) == askedname then return font end - return subfont_by_name (lst, askedname, n) + return subfont_by_name (lst, askedname, n + 1) end return false end @@ -668,7 +668,7 @@ The font info knows two levels of detail: returned by readers.loadfont(). --doc]]-- -local show_font_info = function (basename, askedname, detail) +local show_font_info = function (basename, askedname, detail, subfont) local filenames = fonts.names.data().files local index = filenames.base[basename] local fullname = filenames.full[index] @@ -678,7 +678,7 @@ local show_font_info = function (basename, askedname, detail) end if fullname then local shortinfo = fonts.handlers.otf.readers.getinfo (fullname, { - subfont = nil, + subfont = subfont, platformnames = true, rawfamilynames = true, }) @@ -1173,7 +1173,8 @@ actions.query = function (job) needle = tmpspec.resolved or tmpspec.name end elseif tmpspec.lookup == "file" then - needle = tmpspec.name + needle = tmpspec.name + subfont = tmpspec.sub end if needle then @@ -1191,7 +1192,8 @@ actions.query = function (job) "Resolved file name %q", foundname) end if job.show_info then - show_font_info (foundname, query, job.full_info) + logreport (false, 3, "resolve", "Dump extra info.") + show_font_info (foundname, query, job.full_info, subfont) iowrite "\n" end else -- cgit v1.2.3 From 21c660b3904ebbe89fdb0be4608ca23142af0ced Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 29 Sep 2016 22:49:16 +0200 Subject: [tool] fix crash in verbose error message --- src/luaotfload-tool.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/luaotfload-tool.lua') diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua index 6c1f7d1..e7df3ce 100755 --- a/src/luaotfload-tool.lua +++ b/src/luaotfload-tool.lua @@ -701,7 +701,8 @@ local show_font_info = function (basename, askedname, detail, subfont) [[%s is a font collection]], basename) for subfont = 1, nfonts do logreport (true, 1, "resolve", - [[Showing info for font no. %d]], n) + [[Showing info for font no. %d]], + subfont) show_info_items(shortinfo[subfont]) if detail == true then show_full_info(fullname, subfont) -- cgit v1.2.3