Rejigged the link macro to accept child elements

js/macros/info.js

@@ -18,12 +18,14 @@ exports.macro = {
 		var encoder = type === "text/html" ? utils.htmlEncode : function(x) {return x;},
 			parseTree = store.parseTiddler(tiddler.fields.title);
 		if(parseTree) {
+			var r = [];
 			var d = parseTree.dependencies;
 			if(d === null) {
-				return encoder("Dependencies: *");
+				r.push(encoder("Dependencies: *"));
 			} else {
-				return encoder("Dependencies: " + d.join(", "));
+				r.push(encoder("Dependencies: " + d.join(", ")));
 			}
+			return r.join("/n");
 		} else {
 			return "";
 		}

js/macros/link.js

@@ -14,20 +14,18 @@ exports.macro = {
 	wrapperTag: "span",
 	types: ["text/html","text/plain"],
 	params: {
-		target: {byName: "default", type: "tiddler", optional: false},
-		text: {byName: true, type: "text", optional: true}
+		target: {byName: "default", type: "tiddler", optional: false}
 	},
-	handler: function(type,tiddler,store,params) {
-		var text = params.text || params.target;
+	handler: function(type,tiddler,store,params,content) {
 		if(type === "text/html") {
 			return utils.stitchElement("a",{
 				href: params.target
 			},{
-				content: utils.htmlEncode(text),
+				content: content,
 				classNames: store.adjustClassesForLink([],params.target)
 			});
 		} else if (type === "text/plain") {
-			return text;	
+			return "";	
 		}
 	}
 };

js/macros/view.js

@@ -23,7 +23,7 @@ exports.macro = {
 		if(v) {
 			switch(params.format) {
 				case "link":
-					return store.renderMacro("link",type,tiddler,{target: v});
+					return store.renderMacro("link",type,tiddler,{target: v},encoder(v));
 				case "wikified":
 					return store.renderTiddler(type,tiddler.fields.title);
 				case "date":