summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/mkiv/font-ott.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/font-ott.lua')
-rw-r--r--Master/texmf-dist/tex/context/base/mkiv/font-ott.lua50
1 files changed, 10 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/font-ott.lua b/Master/texmf-dist/tex/context/base/mkiv/font-ott.lua
index 10420f6eeb1..59d92f40d84 100644
--- a/Master/texmf-dist/tex/context/base/mkiv/font-ott.lua
+++ b/Master/texmf-dist/tex/context/base/mkiv/font-ott.lua
@@ -8,8 +8,7 @@ if not modules then modules = { } end modules ["font-ott"] = {
}
local type, next, tonumber, tostring, rawget, rawset = type, next, tonumber, tostring, rawget, rawset
-local gsub, lower, format, match, gmatch, find = string.gsub, string.lower, string.format, string.match, string.gmatch, string.find
-local sequenced = table.sequenced
+local gsub, lower, format, match = string.gsub, string.lower, string.format, string.match
local is_boolean = string.is_boolean
local setmetatableindex = table.setmetatableindex
@@ -390,7 +389,6 @@ local languages = allocate {
["kiu" ] = "kirmanjki",
["kjd" ] = "southern kiwai",
["kjp" ] = "eastern pwo karen",
- ["kjz" ] = "bumthangkha",
["kkn" ] = "kokni",
["klm" ] = "kalmyk",
["kmb" ] = "kamba",
@@ -479,7 +477,6 @@ local languages = allocate {
["mdr" ] = "mandar",
["men" ] = "me'en",
["mer" ] = "meru",
- ["mfa" ] = "pattani malay",
["mfe" ] = "morisyen",
["min" ] = "minangkabau",
["miz" ] = "mizo",
@@ -677,7 +674,6 @@ local languages = allocate {
["tpi" ] = "tok pisin",
["trk" ] = "turkish",
["tsg" ] = "tsonga",
- ["tsj" ] = "tshangla",
["tua" ] = "turoyo aramaic",
["tul" ] = "tulu",
["tuv" ] = "tuvin",
@@ -708,7 +704,6 @@ local languages = allocate {
["xbd" ] = "lü",
["xhs" ] = "xhosa",
["xjb" ] = "minjangbal",
- ["xkf" ] = "khengkha",
["xog" ] = "soga",
["xpe" ] = "kpelle (liberia)",
["yak" ] = "sakha",
@@ -992,13 +987,9 @@ setmetatableindex(languages, function(t,k)
return "dflt"
end)
-if setmetatablenewindex then
-
- setmetatablenewindex(languages, "ignore")
- setmetatablenewindex(scripts, "ignore")
- setmetatablenewindex(baselines, "ignore")
-
-end
+setmetatablenewindex(languages, "ignore")
+setmetatablenewindex(baselines, "ignore")
+setmetatablenewindex(baselines, "ignore")
local function resolve(t,k)
if k then
@@ -1038,11 +1029,7 @@ local function assign(t,k,v)
end
end
-if setmetatablenewindex then
-
- setmetatablenewindex(features, assign)
-
-end
+setmetatablenewindex(features, assign)
local checkers = {
rand = function(v)
@@ -1098,7 +1085,7 @@ storage.register("fonts/otf/usedfeatures", usedfeatures, "fonts.handlers.otf.sta
local normalizedaxis = otf.readers.helpers.normalizedaxis or function(s) return s end
-function otffeatures.normalize(features,wrap) -- wrap is for context
+function otffeatures.normalize(features)
if features then
local h = { }
for key, value in next, features do
@@ -1111,9 +1098,9 @@ function otffeatures.normalize(features,wrap) -- wrap is for context
h.script = rawget(verbosescripts,v) or (scripts[v] and v) or "dflt" -- auto adds
elseif k == "axis" then
h[k] = normalizedaxis(value)
- if not callbacks.supported.glyph_stream_provider then
- h.variableshapes = true -- for the moment
- end
+if not callbacks.supported.glyph_stream_provider then
+ h.variableshapes = true -- for the moment
+end
else
local uk = usedfeatures[key]
local uv = uk[value]
@@ -1126,27 +1113,10 @@ function otffeatures.normalize(features,wrap) -- wrap is for context
elseif type(value) == "string" then
local b = is_boolean(value)
if type(b) == "nil" then
- -- we do this elsewhere
- --
- -- if find(value,"=") then
- -- local t = { }
- -- for k, v in gmatch(value,"([^%s,=]+)%s*=%s*([^%s,=]+)") do
- -- t[k] = tonumber(v) or v
- -- end
- -- if next(t) then
- -- value = sequenced(t,",")
- -- end
- -- end
- if wrap and find(value,",") then
- uv = "{"..lower(value).."}"
- else
- uv = lower(value)
- end
+ uv = lower(value)
else
uv = b
end
- elseif type(value) == "table" then
- uv = sequenced(t,",")
else
uv = value
end