From 5bb2a1e1b7b05522bc484531a2ecfafbdb32ffa3 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sat, 7 Jan 2012 20:09:01 +0000
Subject: [PATCH] Added support for the "with" parameter to the tiddler macro

---
 js/macros/tiddler.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/js/macros/tiddler.js b/js/macros/tiddler.js
index 19792829b..fa9088d8f 100644
--- a/js/macros/tiddler.js
+++ b/js/macros/tiddler.js
@@ -15,10 +15,23 @@ exports.macro = {
 	cascadeParams: true, // Cascade names of named parameters to following anonymous parameters
 	params: {
 		target: {byName: "default", type: "tiddler", optional: false},
-		"with": {byName: true, type: "text", optional: true}
+		"with": {byName: true, type: "text", optional: true, dependentAll: true}
 	},
 	code: function(type,tiddler,store,params) {
-		return store.renderTiddler(type,params.target);
+		if(params["with"]) {
+			// Parameterised transclusion
+			var targetTiddler = store.getTiddler(params.target),
+				text = targetTiddler.fields.text;
+			var withTokens = [params["with"]];
+			for(var t=0; t<withTokens.length; t++) {
+				var placeholderRegExp = new RegExp("\\$"+(t+1),"mg");
+				text = text.replace(placeholderRegExp,withTokens[t]);
+			}
+			return store.renderText(targetTiddler.fields.type,text,type,tiddler.fields.title);
+		} else {
+			// There's no parameterisation, so we can just render the target tiddler directly
+			return store.renderTiddler(type,params.target,tiddler.fields.title);
+		}
 	}
 };