diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2016-07-05 08:17:49 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2016-07-05 08:17:49 +0200 |
| commit | 8c9101fcc313f47232c8378a1cde37874efd845a (patch) | |
| tree | f313d216cfe8fe8f90fec7deb83b954af8640372 /src/fontloader/misc/fontloader-font-oto.lua | |
| parent | 46415b821010269c820f408162a4441616b28345 (diff) | |
| download | luaotfload-8c9101fcc313f47232c8378a1cde37874efd845a.tar.gz | |
[fontloader] sync with Context as of 2016-07-05
Diffstat (limited to 'src/fontloader/misc/fontloader-font-oto.lua')
| -rw-r--r-- | src/fontloader/misc/fontloader-font-oto.lua | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/fontloader/misc/fontloader-font-oto.lua b/src/fontloader/misc/fontloader-font-oto.lua index 1199778..177382f 100644 --- a/src/fontloader/misc/fontloader-font-oto.lua +++ b/src/fontloader/misc/fontloader-font-oto.lua @@ -120,7 +120,7 @@ local function registerbasehash(tfmdata) basehash[hash] = base end properties.basehash = base - properties.fullname = properties.fullname .. "-" .. base + properties.fullname = (properties.fullname or properties.name) .. "-" .. base -- report_prepare("fullname base hash '%a, featureset %a",tfmdata.properties.fullname,hash) applied = { } end @@ -225,6 +225,11 @@ local function preparesubstitutions(tfmdata,feature,value,validlookups,lookuplis local trace_alternatives = trace_baseinit and trace_alternatives local trace_ligatures = trace_baseinit and trace_ligatures + if not changed then + changed = { } + tfmdata.changed = changed + end + for i=1,#lookuplist do local sequence = lookuplist[i] local steps = sequence.steps @@ -392,7 +397,8 @@ local function featuresinitializer(tfmdata,value) local properties = tfmdata.properties local script = properties.script local language = properties.language - local rawfeatures = rawdata.resources.features + local rawresources = rawdata.resources + local rawfeatures = rawresources and rawresources.features local basesubstitutions = rawfeatures and rawfeatures.gsub local basepositionings = rawfeatures and rawfeatures.gpos -- |