From 93dccfc40625a754b372edd228724969b28e4342 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sat, 9 Jun 2018 15:32:09 +0200 Subject: 2018-06-09 14:37:00 --- tex/context/base/mkiv/font-def.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tex/context/base/mkiv/font-def.lua') 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.

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 -- cgit v1.2.3