diff options
author | Philipp Gesang <phg42.2a@gmail.com> | 2014-03-25 07:56:49 +0100 |
---|---|---|
committer | Philipp Gesang <phg42.2a@gmail.com> | 2014-03-25 07:56:49 +0100 |
commit | 1fc3fd768ca2f66a8cd7cc396ad834b13b0f2715 (patch) | |
tree | 4f45675b76388932518f7f6df42aa63fd4c419c3 | |
parent | 2d9d2b43c13b24a71e54796fa15166c97be64fbc (diff) | |
parent | e2966b1932f0cb00da4acf6dc8678366dd180e62 (diff) | |
download | luaotfload-1fc3fd768ca2f66a8cd7cc396ad834b13b0f2715.tar.gz |
Merge pull request #209 from phi-gamma/texlive2014
[fontloader] sync with Context as of 2014-03-25
-rw-r--r-- | src/luaotfload-fontloader.lua | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/luaotfload-fontloader.lua b/src/luaotfload-fontloader.lua index 655aedf..ca538df 100644 --- a/src/luaotfload-fontloader.lua +++ b/src/luaotfload-fontloader.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 03/22/14 15:31:38 +-- merge date : 03/25/14 02:17:04 do -- begin closure to overcome local limits and interference @@ -11499,17 +11499,20 @@ local autofeatures=fonts.analyzers.features local function initialize(sequence,script,language,enabled) local features=sequence.features if features then - local order=features.order - for i=1,#order do - local kind=order[i] - local valid=enabled[kind] - if valid then - local scripts=features[kind] - local languages=scripts[script] or scripts[wildcard] - if languages and (languages[language] or languages[wildcard]) then - return { valid,autofeatures[kind] or false,sequence.chain or 0,kind,sequence } + local order=sequence.order + if order then + for i=1,#order do + local kind=order[i] + local valid=enabled[kind] + if valid then + local scripts=features[kind] + local languages=scripts[script] or scripts[wildcard] + if languages and (languages[language] or languages[wildcard]) then + return { valid,autofeatures[kind] or false,sequence.chain or 0,kind,sequence } + end end end + else end end return false |