From 96bea07ac35ee9463fe89985c4b887a55579a4c9 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Wed, 17 Nov 2010 13:27:00 +0100 Subject: beta 2010.11.17 13:27 --- scripts/context/lua/mtxrun.lua | 4 +++- scripts/context/stubs/mswin/mtxrun.lua | 4 +++- scripts/context/stubs/unix/mtxrun | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'scripts') 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) diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index c5976018c..701378c09 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/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) diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index c5976018c..701378c09 100755 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -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) -- cgit v1.2.3