diff options
| author | Hans Hagen <pragma@wxs.nl> | 2018-06-09 15:32:09 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2018-06-09 15:32:09 +0200 |
| commit | 93dccfc40625a754b372edd228724969b28e4342 (patch) | |
| tree | 94cec6d553ccc2b797802f39085f9a4725bec8ce /tex/context/base/mkiv/font-def.lua | |
| parent | 86bfea5faac983d15c47eec27f43ec56e75c69ef (diff) | |
| download | context-93dccfc40625a754b372edd228724969b28e4342.tar.gz | |
2018-06-09 14:37:00
Diffstat (limited to 'tex/context/base/mkiv/font-def.lua')
| -rw-r--r-- | tex/context/base/mkiv/font-def.lua | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tex/context/base/mkiv/font-def.lua b/tex/context/base/mkiv/font-def.lua index 732ce401f..7b3beda73 100644 --- a/tex/context/base/mkiv/font-def.lua +++ b/tex/context/base/mkiv/font-def.lua @@ -82,12 +82,14 @@ and prepares a table that will move along as we proceed.</p> local splitter, splitspecifiers = nil, "" -- not so nice -local P, C, S, Cc = lpeg.P, lpeg.C, lpeg.S, lpeg.Cc +local P, C, S, Cc, Cs = lpeg.P, lpeg.C, lpeg.S, lpeg.Cc, lpeg.Cs -local left = P("(") -local right = P(")") -local colon = P(":") -local space = P(" ") +local left = P("(") +local right = P(")") +local colon = P(":") +local space = P(" ") +local lbrace = P("{") +local rbrace = P("}") definers.defaultlookup = "file" @@ -99,7 +101,7 @@ local function addspecifier(symbol) local lookup = C(prefixpattern) * colon local sub = left * C(P(1-left-right-method)^1) * right local specification = C(method) * C(P(1)^1) - local name = C((1-sub-specification)^1) + local name = Cs((lbrace/"") * (1-rbrace)^1 * (rbrace/"") + (1-sub-specification)^1) splitter = P((lookup + Cc("")) * name * (sub + Cc("")) * (specification + Cc(""))) end |