From 852cd5b8e7c01fd58763cd499f5666a65724bd26 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 1 Oct 2011 18:53:36 +0200 Subject: Fix documentation about default prefix fixes #38 --- otfl-font-nms.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'otfl-font-nms.lua') diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua index 6e8b8be..538c6b0 100644 --- a/otfl-font-nms.lua +++ b/otfl-font-nms.lua @@ -224,6 +224,8 @@ function names.resolve(specification) return names.resolve(specification) else -- else, fallback to filename + -- XXX: specification.name is empty with absolute paths, looks + -- like a bug in the specification parser return specification.name, false end end -- cgit v1.2.3 From d8753a1c461d18b51219d5fec7e39f2567b8c908 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 1 Oct 2011 19:07:24 +0200 Subject: Try /usr/local/etc/fonts/fonts.conf before /etc/fonts/fonts.conf closes #34 --- otfl-font-nms.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'otfl-font-nms.lua') diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua index 538c6b0..6793830 100644 --- a/otfl-font-nms.lua +++ b/otfl-font-nms.lua @@ -669,7 +669,11 @@ local function get_os_dirs() local windir = os.getenv("WINDIR") return { file.join(windir, 'Fonts') } else - return read_fonts_conf("/etc/fonts/fonts.conf", {}) + for _,p in next, {"/usr/local/etc/fonts/fonts.conf", "/etc/fonts/fonts.conf"} do + if lfs.isfile(p) then + return read_fonts_conf("/etc/fonts/fonts.conf", {}) + end + end end end -- cgit v1.2.3 From d085e0bbd9bc778216f47a00f36d1ab5a313c159 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 1 Oct 2011 19:10:58 +0200 Subject: Should not error() here --- otfl-font-nms.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'otfl-font-nms.lua') diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua index 6793830..dcd75d3 100644 --- a/otfl-font-nms.lua +++ b/otfl-font-nms.lua @@ -587,7 +587,10 @@ local function read_fonts_conf(path, results) ]] local f = io.open(path) if not f then - error("Cannot open the file "..path) + if trace_search then + logs.report("cannot open file", "%s", path) + end + return results end local incomments = false for line in f:lines() do @@ -675,6 +678,7 @@ local function get_os_dirs() end end end + return {} end local function scan_os_fonts(fontnames, newfontnames) -- cgit v1.2.3