minor tweaks...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

Makefile

@@ -1,9 +1,14 @@
 
 
+BOOTSTRAP_FILES := \
+	$(wildcard bootstrap/*) \
+	$(wildcard bootstrap/*/*) \
+	README.md
+
+
 
 
-
-bootstrap.js: scripts/bootstrap.js
+bootstrap.js: scripts/bootstrap.js $(BOOTSTRAP_FILES)
 	node $<
 
 
@@ -16,7 +21,6 @@ node_modules:
 	npm install
 
 
-# XXX is this a good idea???
 dev: node_modules
 	cp $</ig-object/object.js lib/
 	cp $</ig-actions/actions.js lib/

README.md

@@ -21,7 +21,7 @@ are likely to change, the implementation / API **will definitely** change! ;)_
   A set of tools and API's to enable data synchronization between pWiki
   instances.
 
-- _Self-hosted_ and flexible user interface
+- _Self-hosted[*]_ and flexible user interface
 
   The pWiki interface is implemented as a set of pWiki pages and 
   templates within pWiki itself (see: [Templates] / [/bootstrap](bootstrap)), 
@@ -29,6 +29,9 @@ are likely to change, the implementation / API **will definitely** change! ;)_
   the function of the interface from within pWiki, without touching the 
   code.
 
+  [*]: "Self-hosted" here is meant in the old-school meaning of the word, 
+  i.e. hosted on the client.
+
 - pWiki _portable app_
 
   This is a simple note / todo / outline app.

pwiki2.js

@@ -508,12 +508,14 @@ function*(str){
 
 
 // XXX need context -- page/store...
-// XXX blocks are not handled correctly...
+// XXX need to make this recursive....
+// 		...might even be a good idea to make the above grouo(..) and friends
+// 		recursive too...
 // XXX closure: macros
 var expand =
 module.expand =
 function*(ast){
-	// XXX
+	// XXX PAGE...
 	var page
 	while(true){
 		var {value, done} = ast.next()
@@ -525,8 +527,9 @@ function*(ast){
 			continue }
 		// macro...
 		var {name, args, body, match} = value
+		// XXX PAGE...
 		var res = 
-			macros[name](page, args, body, match)
+			macros[name].call(page, args, body, match)
 			?? ''
 		// XXX test if iterable...
 		if(res instanceof Array){