From dedff41f610f540022408863273772526fd78a59 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Wed, 28 Sep 2016 18:48:09 +0300
Subject: [PATCH] macros almost done...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 macro.js | 8 ++++----
 pwiki.js | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/macro.js b/macro.js
index b1d374e..97ead6c 100755
--- a/macro.js
+++ b/macro.js
@@ -595,19 +595,19 @@ module = {
 				var isolated = elem.attr('isolated') == 'true'
 
 				var seen = state.seen.slice()
-				if(seen.indexOf(page.path) >= 0){
+				if(seen.indexOf(page.path()) >= 0){
 					return elem.html()
 				}
-				seen.push(page.path)
+				seen.push(page.path())
 
 				return page.map(function(page){
 					return $('<div>')
 						.append(elem
 							.clone()
-							.attr('src', page.path)
+							.attr('src', page.path())
 							.append(that
 								.parse(page,
-									page.raw, 
+									page.raw(), 
 									{ 
 										//slots: !isolated ? state.slots : {},
 										templates: state.templates,
diff --git a/pwiki.js b/pwiki.js
index 4d63f54..e3647aa 100755
--- a/pwiki.js
+++ b/pwiki.js
@@ -1122,9 +1122,14 @@ module._test = function(){
 	var wiki = Object.create(pWikiData)
 	wiki.__data = Object.create(module._test_data)
 
-	return new pWikiPage({
+	var page = new pWikiPage({
 		wiki: wiki,
 	})
+
+	// XXX do some testing...
+	// XXX
+
+	return page
 }