summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-05-28 22:26:14 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2013-05-28 22:26:14 +0200
commitacb76cca1c0bdedc811d7eeed1b2392b692cdf50 (patch)
tree249dc6ee764d0acfc56f876ed00a18fea4605363
parente263928dfb028952384103d1edc98cea467d4555 (diff)
downloadluaotfload-acb76cca1c0bdedc811d7eeed1b2392b692cdf50.tar.gz
have file locator return the filename when known fonts are specified without extension
-rw-r--r--luaotfload-database.lua5
-rwxr-xr-xluaotfload-tool.lua2
2 files changed, 3 insertions, 4 deletions
diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index 65f2bf7..aba1921 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -399,10 +399,9 @@ crude_file_lookup = function (filename)
if found then
found = filenames.full[found]
if found == nil then
- return dummy_findfile(filename)
- else
- return found
+ found = dummy_findfile(filename)
end
+ return found or filename
end
for i=1, #type1_formats do
local format = type1_formats[i]
diff --git a/luaotfload-tool.lua b/luaotfload-tool.lua
index 9479180..a379633 100755
--- a/luaotfload-tool.lua
+++ b/luaotfload-tool.lua
@@ -546,7 +546,7 @@ local process_cmdline = function ( ) -- unit -> jobspec
force_reload = nil,
criterion = "",
query = "",
- log_level = 1, --- 2 is approx. the old behavior
+ log_level = 0, --- 2 is approx. the old behavior
}
local long_options = {