summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2011-10-06 00:23:31 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2011-10-06 00:23:45 +0200
commitc1d7136fd34aa4dfb47cf9d3c82c9f9e0e5474b8 (patch)
tree94a0b78935a98788f0708394c876c10b3f952874
parent0b83bfdfb73b53a9c1f7ac1281de6250ca66dfc2 (diff)
downloadluaotfload-c1d7136fd34aa4dfb47cf9d3c82c9f9e0e5474b8.tar.gz
Sync with ContTeXt beta 2011.10.05 23:32
Fixes loading TFM fonts. Now almost all tests pass.
-rw-r--r--otfl-font-def.lua2
-rw-r--r--otfl-font-otf.lua22
2 files changed, 15 insertions, 9 deletions
diff --git a/otfl-font-def.lua b/otfl-font-def.lua
index 2c780ad..aaa6ef4 100644
--- a/otfl-font-def.lua
+++ b/otfl-font-def.lua
@@ -299,7 +299,7 @@ function definers.loadfont(specification)
local embedding
if directive_embedall then
embedding = "full"
- elseif properties.filename and constructors.dontembed[properties.filename] then
+ elseif properties and properties.filename and constructors.dontembed[properties.filename] then
embedding = "no"
else
embedding = "subset"
diff --git a/otfl-font-otf.lua b/otfl-font-otf.lua
index 319cae6..83b961e 100644
--- a/otfl-font-otf.lua
+++ b/otfl-font-otf.lua
@@ -114,15 +114,21 @@ local function showfeatureorder(rawdata,filename)
if features then
for feature, scripts in next, features do
local tt = { }
- for script, languages in next, scripts do
- local ttt = { }
- for language, _ in next, languages do
- ttt[#ttt+1] = language
+ if type(scripts) == "table" then
+ for script, languages in next, scripts do
+ local ttt = { }
+ for language, _ in next, languages do
+ ttt[#ttt+1] = language
+ end
+ tt[#tt+1] = format("[%s: %s]",script,concat(ttt," "))
+ end
+ if trace_loading then
+ report_otf(" %s: %s",feature,concat(tt," "))
+ end
+ else
+ if trace_loading then
+ report_otf(" %s: %s",feature,tostring(scripts))
end
- tt[#tt+1] = format("[%s: %s]",script,concat(ttt," "))
- end
- if trace_loading then
- report_otf(" %s: %s",feature,concat(tt," "))
end
end
end