summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/luaotfload-features.lua56
-rw-r--r--src/luaotfload-loaders.lua1
-rw-r--r--src/luaotfload-parsers.lua9
3 files changed, 41 insertions, 25 deletions
diff --git a/src/luaotfload-features.lua b/src/luaotfload-features.lua
index aeeaea3..4bcfbc3 100644
--- a/src/luaotfload-features.lua
+++ b/src/luaotfload-features.lua
@@ -100,9 +100,15 @@ local handle_combination = function (combo, spec)
local fnt = fontidentifiers [id]
if fnt then
local chars = cur.chars
- report ("both", 0, "load",
- " *> %.2d: include font %d at rank %d (%d items).",
- i, id, idx, (chars and #chars or 0))
+ if chars == true then
+ report ("both", 0, "load",
+ " *> %.2d: fallback font %d at rank %d.",
+ i, id, idx)
+ else
+ report ("both", 0, "load",
+ " *> %.2d: include font %d at rank %d (%d items).",
+ i, id, idx, (chars and #chars or 0))
+ end
chain [#chain + 1] = { fnt, chars, idx = idx }
fontids [#fontids + 1] = { id = id }
else
@@ -143,8 +149,12 @@ local handle_combination = function (combo, spec)
local src = fnt.characters
local cnt = 0
- local pickchr = function (uc)
+ local pickchr = function (uc, unavailable)
local chr = src [uc]
+ if unavailable == true and basechar [uc] then
+ --- fallback mode: already known
+ return
+ end
if chr then
chr.commands = { { "slot", i, uc } }
basechar [uc] = chr
@@ -152,23 +162,27 @@ local handle_combination = function (combo, spec)
end
end
- for j = 1, #def do
- local this = def [j]
- if type (this) == "number" then
- report ("both", 0, "load",
- " *> [%d][%d]: import codepoint U+%.4X",
- i, j, this)
- pickchr (this)
- elseif type (this) == "table" then
- local lo, hi = unpack (this)
- report ("both", 0, "load",
- " *> [%d][%d]: import codepoint range U+%.4X--U+%.4X",
- i, j, lo, hi)
- for uc = lo, hi do pickchr (uc) end
- else
- report ("both", 0, "load",
- " *> item no. %d of combination definition \z
- %d not processable.", j, i)
+ if def == true then --> fallback; grab all currently unavailable
+ for uc, _chr in next, src do pickchr (uc, true) end
+ else --> grab only defined range
+ for j = 1, #def do
+ local this = def [j]
+ if type (this) == "number" then
+ report ("both", 0, "load",
+ " *> [%d][%d]: import codepoint U+%.4X",
+ i, j, this)
+ pickchr (this)
+ elseif type (this) == "table" then
+ local lo, hi = unpack (this)
+ report ("both", 0, "load",
+ " *> [%d][%d]: import codepoint range U+%.4X--U+%.4X",
+ i, j, lo, hi)
+ for uc = lo, hi do pickchr (uc) end
+ else
+ report ("both", 0, "load",
+ " *> item no. %d of combination definition \z
+ %d not processable.", j, i)
+ end
end
end
report ("both", 0, "load",
diff --git a/src/luaotfload-loaders.lua b/src/luaotfload-loaders.lua
index 80ce41a..fb01821 100644
--- a/src/luaotfload-loaders.lua
+++ b/src/luaotfload-loaders.lua
@@ -123,6 +123,7 @@ do
logreport ("both", 0, "loaders", " > name %q", result.name or "<nil>")
logreport ("both", 0, "loaders", " > fontname %q", result.fontname or "<nil>")
logreport ("both", 0, "loaders", " > fullname %q", result.fullname or "<nil>")
+ logreport ("both", 0, "loaders", " > type %s", result.type or "<nil>")
return result
end
end
diff --git a/src/luaotfload-parsers.lua b/src/luaotfload-parsers.lua
index 71e539d..b190c2c 100644
--- a/src/luaotfload-parsers.lua
+++ b/src/luaotfload-parsers.lua
@@ -591,11 +591,12 @@ local parenthesized = function (p) return P"(" * ws * p * ws * P")" end
local comboidxpat = Cg(combouint, "idx")
local comboidpat = Cg(combouint, "id" )
-local combocharspat = comboidpat * combodefsep * Cg(Ct(combochars^1), "chars")
+local combocharspat = Cg(P"fallback" * Cc(true) + Ct(combochars^1), "chars")
+local comboidcharspat = comboidpat * combodefsep * combocharspat
-local comboidx = parenthesized (comboidxpat ) + comboidxpat
-local comboid = parenthesized (comboidpat ) + comboidpat
-local comboidchars = parenthesized (combocharspat) + combocharspat
+local comboidx = parenthesized (comboidxpat ) + comboidxpat
+local comboid = parenthesized (comboidpat ) + comboidpat
+local comboidchars = parenthesized (comboidcharspat) + comboidcharspat
local combodef1 = Ct(comboidx * combomapsep * comboid) --> no chars
local combodef = Ct(comboidx * combomapsep * comboidchars)