diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2010-02-22 14:26:34 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2010-02-23 01:44:03 +0200 |
| commit | e064aa2dc70fb819cfdb6b3c0bdf1d081859584f (patch) | |
| tree | b429356162be25b812b6e75e85cccae61f893ad4 /otfl-font-xtx.lua | |
| parent | e0931232fb05665da0e809cb3d7be0d3d6c8e820 (diff) | |
| download | luaotfload-e064aa2dc70fb819cfdb6b3c0bdf1d081859584f.tar.gz | |
Updating to latest ConTeXt beta (2010.02.23)
Now many of our fixes are incorporated upstream or fixed in a different
way.
Diffstat (limited to 'otfl-font-xtx.lua')
| -rw-r--r-- | otfl-font-xtx.lua | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/otfl-font-xtx.lua b/otfl-font-xtx.lua index e7137c5..fd0a474 100644 --- a/otfl-font-xtx.lua +++ b/otfl-font-xtx.lua @@ -162,8 +162,6 @@ local function isfile () list.lookup = 'file' end local function isname () list.lookup = 'name' end local function thename(s) list.name = s end local function issub (v) list.sub = v end -local function istrue (s) list[s] = 'yes' end -local function isfalse(s) list[s] = nil end -- was no, see mpg/luaotfload#4 --KH local function iskey (k,v) if k == "script" then parse_script(v) @@ -171,6 +169,9 @@ local function iskey (k,v) list[k] = v end +local function istrue (s) list[s] = true end +local function isfalse(s) list[s] = false end + local spaces = lpeg.P(" ")^0 -- ER: now accepting names like C:/program files/texlive/2009/... local namespec = (lpeg.R("az", "AZ") * lpeg.P(":"))^-1 * (1-lpeg.S("/:("))^1 -- was: (1-lpeg.S("/: ("))^0 @@ -178,11 +179,10 @@ local crapspec = spaces * lpeg.P("/") * (((1-lpeg.P(":"))^0)/isstyle) * spaces -- ER: can't understand why the 'file:' thing doesn't work with fontnames starting by c:... local filename = (lpeg.P("file:")/isfile * (namespec/thename)) + (lpeg.P("[") * lpeg.P(true)/isname * (((1-lpeg.P("]"))^0)/thename) * lpeg.P("]")) local fontname = (lpeg.P("name:")/isname * (namespec/thename)) + lpeg.P(true)/issome * (namespec/thename) -local sometext = (lpeg.R("az") + lpeg.R("AZ") + lpeg.R("09"))^1 +local sometext = (lpeg.R("az","AZ","09") + lpeg.S("+-."))^1 local truevalue = lpeg.P("+") * spaces * (sometext/istrue) local falsevalue = lpeg.P("-") * spaces * (sometext/isfalse) -local someval = (lpeg.S("+-.") + sometext)^1 -local keyvalue = (lpeg.C(sometext) * spaces * lpeg.P("=") * spaces * lpeg.C(someval))/iskey +local keyvalue = (lpeg.C(sometext) * spaces * lpeg.P("=") * spaces * lpeg.C(sometext))/iskey local somevalue = sometext/istrue local subvalue = lpeg.P("(") * (lpeg.C(lpeg.P(1-lpeg.S("()"))^1)/issub) * lpeg.P(")") -- for Kim local option = spaces * (keyvalue + falsevalue + truevalue + somevalue) * spaces @@ -192,12 +192,6 @@ local pattern = (filename + fontname) * subvalue^0 * crapspec^0 * options^0 function fonts.define.specify.colonized(specification) -- xetex mode list = { } lpegmatch(pattern,specification.specification) - for k, v in next, list do - list[k] = v:is_boolean() - if type(list[a]) == "nil" then - list[k] = v - end - end if list.style then specification.style = list.style list.style = nil |