From 8a5a9bfa8b151bedf8a87db8519f07d08d618e2d Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Wed, 4 Jan 2012 11:57:45 +0000
Subject: [PATCH] Macro fixes

---
 js/WikiStore.js | 48 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/js/WikiStore.js b/js/WikiStore.js
index edb33edf4..ab55976c2 100755
--- a/js/WikiStore.js
+++ b/js/WikiStore.js
@@ -307,7 +307,7 @@ WikiStore.prototype.installMacros = function() {
 				text: {byPos: 0, type: "text", optional: false}
 			},
 			code: {
-				"text/html": this.sandbox.parse("return '<p>' + utils.htmlEncode(params.text) + '</p>';"),
+				"text/html": this.sandbox.parse("return utils.htmlEncode(params.text);"),
 				"text/plain": this.sandbox.parse("return params.text;")
 			}
 		},
@@ -318,7 +318,7 @@ WikiStore.prototype.installMacros = function() {
 				template: {byPos: 2, type: "text", optional: true}
 			},
 			code: {
-				"text/html": this.sandbox.parse("return '<span>' + store.getFormattedTiddlerField(tiddler.fields.title,params.field,params.format,params.template) + '</span>';"),
+				"text/html": this.sandbox.parse("return store.getFormattedTiddlerField(tiddler.fields.title,params.field,params.format,params.template);"),
 				"text/plain": this.sandbox.parse("return store.getFormattedTiddlerField(tiddler.fields.title,params.field,params.format,params.template);")
 			}
 		},
@@ -329,13 +329,55 @@ WikiStore.prototype.installMacros = function() {
 				emptyMessage: {byName: true, type: "text", optional: true}
 			},
 			code: {
-				"text/html": this.sandbox.parse("return '<span>' + store.listTiddlers(params.type,params.template,params.emptyMessage) + '</span>';"),
+				"text/html": this.sandbox.parse("return store.listTiddlers(params.type,params.template,params.emptyMessage);"),
 				"text/plain": this.sandbox.parse("return store.listTiddlers(params.type,params.template,params.emptyMessage);")
 			}
+		},
+		version: {
+			params: {
+			},
+			code: {
+				"text/html": this.sandbox.parse("return '5.0.0';"),
+				"text/plain": this.sandbox.parse("return '5.0.0';")
+			}
+		},
+		tiddler: {
+			params: {
+				target: {byName: "default", type: "tiddler", optional: false},
+				with: {byName: true, type: "text", optional: true, cascade: true}
+			},
+			code: {
+				"text/html": this.sandbox.parse("return store.renderTiddler('text/html',params.target);"),
+				"text/plain": this.sandbox.parse("return store.renderTiddler('text/plain',params.target);")
+			}
 		}
 	};
 };
 
+/*
+
+tiddler: {
+		argOptions: {defaultName:"name",cascadeDefaults:true},
+		handler: function(macroNode,args,title) {
+			var targetTitle = args.getValueByName("name",null),
+				withTokens = args.getValuesByName("with",[]),
+				tiddler = this.store.getTiddler(targetTitle),
+				text = this.store.getTiddlerText(targetTitle,""),
+				t;
+			for(t=0; t<withTokens.length; t++) {
+				var placeholderRegExp = new RegExp("\\$"+(t+1),"mg");
+				text = text.replace(placeholderRegExp,withTokens[t]);
+			}
+			macroNode.output = this.store.parseText(tiddler.fields.type,text).children;
+			// Execute any macros in the copy
+			this.executeMacros(macroNode.output,title);
+		}
+	},
+
+*/
+
+
+
 exports.WikiStore = WikiStore;
 
 })();