diff options
| author | Hans Hagen <pragma@wxs.nl> | 2011-10-05 23:32:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2011-10-05 23:32:00 +0200 |
| commit | cffe952d288200d1a5d5e019ac690742549cf637 (patch) | |
| tree | a28e685eb64df9e0765ef01894b13162010eabdc /tex/generic | |
| parent | 79d53c0a828babfb0935f98aee0fd82a39dbd220 (diff) | |
| download | context-cffe952d288200d1a5d5e019ac690742549cf637.tar.gz | |
beta 2011.10.05 23:32
Diffstat (limited to 'tex/generic')
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 7371dcfc9..981b8510d 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 10/03/11 12:59:24 +-- merge date : 10/05/11 23:32:57 do -- begin closure to overcome local limits and interference @@ -5136,15 +5136,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 @@ -12136,7 +12142,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" |