diff options
author | Hans Hagen <pragma@wxs.nl> | 2010-10-14 13:14:00 +0200 |
---|---|---|
committer | Hans Hagen <pragma@wxs.nl> | 2010-10-14 13:14:00 +0200 |
commit | ce89840000bacc1d01ad2b4a2a799901d825eb12 (patch) | |
tree | 2a87a70772589daeb5649391fe2ff79a95d355db /tex/context/base/font-ctx.lua | |
parent | 7d23b83135ba030f2cbded0d4637de9b3e5553e5 (diff) | |
download | context-ce89840000bacc1d01ad2b4a2a799901d825eb12.tar.gz |
beta 2010.10.14 13:14
Diffstat (limited to 'tex/context/base/font-ctx.lua')
-rw-r--r-- | tex/context/base/font-ctx.lua | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/tex/context/base/font-ctx.lua b/tex/context/base/font-ctx.lua index e5da6e868..b6c0dd3f3 100644 --- a/tex/context/base/font-ctx.lua +++ b/tex/context/base/font-ctx.lua @@ -470,20 +470,25 @@ function definers.define(specification) -- -- following calls expect a few properties to be set: -- - specification.lookup = specification.lookup or "file" - specification.specification = "" -- not used - specification.size = specification.size or 655260 - specification.sub = specification.sub or "" - specification.method = specification.method or "*" - specification.detail = specification.detail or "" - specification.resolved = "" - specification.forced = "" - specification.features = { } -- via detail + local lookup, name, sub, method, detail = getspecification(name or "") + -- + specification.name = (name ~= "" and name) or specification.name + -- + specification.lookup = specification.lookup or (lookup ~= "" and lookup) or "file" + specification.size = specification.size or 655260 + specification.sub = specification.sub or (sub ~= "" and sub) or "" + specification.method = specification.method or (method ~= "" and method) or "*" + specification.detail = specification.detail or (detail ~= "" and detail) or "" + -- + specification.specification = "" -- not used + specification.resolved = "" + specification.forced = "" + specification.features = { } -- via detail -- -- we don't care about mathsize textsize goodies fallbacks -- if specification.cs == "" then - specification.cs = nil + specification.cs = nil specification.global = false elseif specification.global == nil then specification.global = false |