summaryrefslogtreecommitdiff
path: root/scripts/context/lua
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2010-11-17 14:40:15 +0200
committerMarius <mariausol@gmail.com>2010-11-17 14:40:15 +0200
commit49a6126dc0cc532254edaeecec129961b132cac5 (patch)
treeddf1cef4731c0ac4c4954e577a11cafeb47e7389 /scripts/context/lua
parent7fc9b91bca833ba04496e8f819fb60dafd77f6e0 (diff)
downloadcontext-49a6126dc0cc532254edaeecec129961b132cac5.tar.gz
beta 2010.11.17 13:27
Diffstat (limited to 'scripts/context/lua')
-rw-r--r--scripts/context/lua/mtxrun.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index c5976018c..701378c09 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -3693,7 +3693,7 @@ local concat = table.concat
local type, next = type, next
utilities = utilities or {}
-utilities.merger = utilities.merger or { }
+utilities.merger = utilities.merger or { } -- maybe mergers
utilities.report = utilities.report or print
local merger = utilities.merger
@@ -3897,6 +3897,8 @@ local nobrace = 1 - (lbrace+rbrace)
local nested = P { lbrace * (nobrace + V(1))^0 * rbrace }
local spaces = space^0
+lpeg.patterns.nested = nested
+
local value = P(lbrace * C((nobrace + nested)^0) * rbrace) + C((nested + (1-comma))^0)
local key = C((1-equal-comma)^1)