summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-04-16 12:13:46 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2013-04-16 12:13:46 +0200
commitcf7d6eceb827fc8d7c0c0afc2255155552f030af (patch)
treed53173a9adaab2da3aa4a7b466f0180607c36ef7
parented31c97dc564515396dc9a8db7a0e863e8a31a1f (diff)
downloadluaotfload-cf7d6eceb827fc8d7c0c0afc2255155552f030af.tar.gz
add fixes courtesy of Élie Roux to the database code
-rw-r--r--otfl-font-nms.lua13
1 files changed, 10 insertions, 3 deletions
diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua
index 0942eda..8869bef 100644
--- a/otfl-font-nms.lua
+++ b/otfl-font-nms.lua
@@ -88,9 +88,16 @@ end
local synonyms = {
regular = { "normal", "roman", "plain", "book", "medium" },
- bold = { "boldregular", "demi", "demibold" },
+ --- TODO note from Élie Roux
+ --- boldregular was for old versions of Linux Libertine, is it still useful?
+ --- semibold is in new versions of Linux Libertine, but there is also a bold,
+ --- not sure it's useful here...
+ bold = { "demi", "demibold", "semibold", "boldregular" },
italic = { "regularitalic", "normalitalic", "oblique", "slanted" },
- bolditalic = { "boldoblique", "boldslanted", "demiitalic", "demioblique", "demislanted", "demibolditalic" },
+ bolditalic = {
+ "boldoblique", "boldslanted", "demiitalic", "demioblique",
+ "demislanted", "demibolditalic", "semibolditalic"
+ },
}
local loaded = false
@@ -585,7 +592,7 @@ local function read_fonts_conf(path, results)
elseif not lfs.isfile(include) and not lfs.isdir(include) then
include = file.join(file.dirname(path), include)
end
- if lfs.isfile(include) then
+ if lfs.isfile(include) and kpse.readable_file(include) then
-- maybe we should prevent loops here?
-- we exclude path with texmf in them, as they should
-- be found otherwise