summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-07-02 12:42:10 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2013-07-02 12:42:10 +0200
commit71eb6250e1971b7ead98f6d91a7d325597730ebe (patch)
tree65ff68b3aa289350864387565803231fb5d93896
parent62493d4c3d4d3089f7a2ff30d811e8f035d98b8a (diff)
downloadluaotfload-71eb6250e1971b7ead98f6d91a7d325597730ebe.tar.gz
treat psname matches as second-tier (fixes cambria)
-rw-r--r--luaotfload-database.lua4
-rw-r--r--luaotfload-merged.lua2
2 files changed, 2 insertions, 4 deletions
diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index 1f8f34a..7baa92a 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -769,9 +769,7 @@ resolve = function (_, _, specification) -- the 1st two parameters are used by C
or name == fontname
or name == psname
then
- local continue
- exact, continue = add_to_match(exact, askedsize, face)
- if continue == false then break end
+ synonymous, continue = add_to_match(synonymous, askedsize, face)
elseif synonym_set[style] and
(synonym_set[style][prefmodifiers] or
synonym_set[style][subfamily])
diff --git a/luaotfload-merged.lua b/luaotfload-merged.lua
index 81e3fec..9d708bf 100644
--- a/luaotfload-merged.lua
+++ b/luaotfload-merged.lua
@@ -3143,7 +3143,7 @@ function caches.savedata(path,name,data)
local luaname,lucname=makefullname(path,name)
if luaname then
texio.write(string.format("(save: %s)",luaname))
- table.tofile(luaname,data,true,{ reduce=true })
+ table.tofile(luaname,data,true,{ reduce=false })
if lucname and type(caches.compile)=="function" then
os.remove(lucname)
texio.write(string.format("(save: %s)",lucname))