From f42fb181f1927d75bfa2b67aabf1cc4125cc9cfb Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sat, 10 Sep 2022 02:28:12 +0300 Subject: [PATCH] some cleanup... Signed-off-by: Alex A. Naanou --- pwiki/page.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pwiki/page.js b/pwiki/page.js index b3b460d..a3231c7 100755 --- a/pwiki/page.js +++ b/pwiki/page.js @@ -837,7 +837,7 @@ object.Constructor('Page', BasePage, { // the context, this potentially can lead to false positives. include: Macro( ['src', 'recursive', 'join', - ['strict', 'nonstrict', 'isolated', 'all']], + ['strict', 'nonstrict', 'isolated']], async function*(args, body, state, key='included', handler){ var macro = 'include' if(typeof(args) == 'string'){ @@ -926,7 +926,7 @@ object.Constructor('Page', BasePage, { source: Macro( // XXX should this have the same args as include??? ['src', 'recursive', 'join', - ['strict', 'nonstrict', 'isolated', 'all']], + ['strict', 'nonstrict', 'isolated']], //['src'], async function*(args, body, state){ yield* this.macros.include.call(this, @@ -956,7 +956,7 @@ object.Constructor('Page', BasePage, { // XXX need a way to escape macros -- i.e. include in a quoted text... quote: Macro( ['src', 'filter', 'text', 'join', - ['expandactions', 'all']], + ['expandactions']], async function*(args, body, state){ var src = args.src //|| args[0] var base = this.get(this.path.split(/\*/).shift()) @@ -1162,7 +1162,7 @@ object.Constructor('Page', BasePage, { // XXX SORT sorting not implemented yet.... macro: Macro( ['name', 'src', 'sort', 'text', 'join', 'else', - ['strict', 'nonstrict', 'all']], + ['strict', 'nonstrict']], async function*(args, body, state){ var that = this var name = args.name //?? args[0] @@ -2095,7 +2095,6 @@ PAGES=100 for(var i=0; i