summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--luaotfload-database.lua2
-rw-r--r--luaotfload-features.lua11
-rw-r--r--tests/systemfonts.tex2
3 files changed, 9 insertions, 6 deletions
diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index beef5b1..b7446c9 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -98,7 +98,7 @@ local writable_path
if caches then
writable_path = caches.getwritablepath("names","")
if not writable_path then
- error("Impossible to find a suitable writeable cache...")
+ luaotfload.error("Impossible to find a suitable writeable cache...")
end
names.path.dir = writable_path
names.path.path = filejoin(writable_path, names.path.basename)
diff --git a/luaotfload-features.lua b/luaotfload-features.lua
index 941373d..cac6598 100644
--- a/luaotfload-features.lua
+++ b/luaotfload-features.lua
@@ -352,13 +352,14 @@ local handle_slashed = function (modifiers)
local mod = modifiers[i]
if type(mod) == "table" and mod[1] == "optsize" then --> optical size
optsize = tonumber(mod[2])
- elseif supported[mod] then
- style = supported[mod]
- elseif stylename == false then
+ elseif mod == false then
+ --- ignore
report("log", 0,
"load", "unsupported font option: %s", v)
- elseif not stringis_empty(v) then
- style = stringgsub(v, "[^%a%d]", "")
+ elseif supported[mod] then
+ style = supported[mod]
+ elseif not stringis_empty(mod) then
+ style = stringgsub(mod, "[^%a%d]", "")
end
end
return style, optsize
diff --git a/tests/systemfonts.tex b/tests/systemfonts.tex
index 0e842db..af08509 100644
--- a/tests/systemfonts.tex
+++ b/tests/systemfonts.tex
@@ -21,6 +21,8 @@
\font\lmbi ={Latin Modern Roman/BI:+liga} at 10pt
\font\lms ={Latin Modern Roman Slanted:+liga} at 10pt
\font\lmltn ={Latin Modern Roman:script=latn} at 10pt
+%% get this font here:
+%% http://sourceforge.net/projects/arabeyes/files/kacst_fonts/kacst_one_5.0.tar.bz2/download
\font\arab ={KacstOne:mode=node;script=arab} at 10pt
\termesr fi fl ffi ffl ff\par