From e3524942cc0c406c0df886dd18fb3ba2fed6fd62 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sat, 5 May 2012 13:15:59 +0100
Subject: [PATCH] Update the include macro to use filtering and serializing

---
 rabbithole/core/modules/macros/include.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/rabbithole/core/modules/macros/include.js b/rabbithole/core/modules/macros/include.js
index dd55f3e61..78e1fc38e 100644
--- a/rabbithole/core/modules/macros/include.js
+++ b/rabbithole/core/modules/macros/include.js
@@ -13,23 +13,24 @@ module-type: macro
 exports.info = {
 	name: "^",
 	params: {
-		target: {byPos: 0, type: "tiddler"},
+		filter: {byPos: 0, type: "filter"},
 		as: {byPos: 1, as: "text"}
 	}
 };
 
 exports.executeMacro = function() {
-	var tiddler = this.hasParameter("target") ? this.wiki.getTiddler(this.params.target) : null,
-		as = this.params.as,
-		children = [];
-	if(tiddler) {
-		as = as || tiddler.fields.as || "text/plain";
-		children = this.wiki.parseText(as,tiddler.fields.text).tree;
-		for(var t=0; t<children.length; t++) {
-			children[t].execute(this.parents,this.tiddlerTitle);
+	var as = this.params.as || "text/plain";
+	if(this.hasParameter("filter")) {
+		var titles = this.wiki.filterTiddlers(this.params.filter),
+			result = [];
+		for(var t=0; t<titles.length; t++) {
+			result.push(this.wiki.serializeTiddler(this.params.filter,as));
 		}
+		return [$tw.Tree.Element("pre",{},[
+				$tw.Tree.Text(result.join("\n"))
+			])];
 	}
-	return children;
+	return [];
 };