From 172d4cdcf2ba3206f2c4cdd9aa9a2489ba1f3c5a Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Thu, 8 Dec 2011 17:18:03 +0000
Subject: [PATCH] Added support for macros

And added a dummy version macro to get started
---
 js/WikiTextMacros.js              | 40 +++++++++++++++++++++++++++++++
 js/WikiTextParser.js              | 10 +++++++-
 test/wikitests/SecondTiddler.html |  2 +-
 test/wikitests/SecondTiddler.tid  |  2 +-
 test/wikitests/SecondTiddler.txt  |  2 +-
 5 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 js/WikiTextMacros.js

diff --git a/js/WikiTextMacros.js b/js/WikiTextMacros.js
new file mode 100644
index 000000000..afcf65117
--- /dev/null
+++ b/js/WikiTextMacros.js
@@ -0,0 +1,40 @@
+/*
+Wiki text macro implementation
+*/
+
+
+/*global require: false, exports: false */
+"use strict";
+
+var util = require("util");
+
+var wikiTextMacros = exports;
+
+wikiTextMacros.executeMacros = function(tree,store) {
+	for(var t=0; t<tree.length; t++) {
+		if(tree[t].type === "macro") {
+			wikiTextMacros.executeMacro(tree[t],store);
+		}
+		if(tree[t].children) {
+			wikiTextMacros.executeMacros(tree[t].children,store);
+		}
+	}
+};
+
+wikiTextMacros.executeMacro = function(macroNode,store) {
+	var macroInfo = wikiTextMacros.macros[macroNode.name];
+	macroNode.output = [];
+	if(macroInfo) {
+		macroInfo.handler(macroNode,store);
+	} else {
+		macroNode.output.push({type: "text", value: "Unknown macro " + macroNode.name});
+	}
+};
+
+wikiTextMacros.macros = {
+	version: {
+		handler: function(macroNode,store) {
+			macroNode.output.push({type: "text", value: "0.0.0"});
+		}
+	}
+};
diff --git a/js/WikiTextParser.js b/js/WikiTextParser.js
index 080fac127..5ca191777 100644
--- a/js/WikiTextParser.js
+++ b/js/WikiTextParser.js
@@ -26,7 +26,8 @@ Text nodes are:
 /*global require: false, exports: false */
 "use strict";
 
-var wikiTextRules = require("./WikiTextRules.js").wikiTextRules,
+var wikiTextMacros = require("./WikiTextMacros.js"),
+	wikiTextRules = require("./WikiTextRules.js").wikiTextRules,
 	utils = require("./Utils.js"),
 	util = require("util");
 
@@ -91,12 +92,16 @@ WikiTextParser.prototype.renderAsHtml = function(store,title) {
 				case "img":
 					renderElement(tree[t],true); // Self closing elements
 					break;
+				case "macro":
+					renderSubTree(tree[t].output);
+					break;
 				default:
 					renderElement(tree[t]);
 					break;
 			}
 		}
 	};
+	wikiTextMacros.executeMacros(this.tree,this.store);
 	renderSubTree(this.tree);
 	return output.join("");	
 };
@@ -117,6 +122,9 @@ WikiTextParser.prototype.renderAsText = function(store,title) {
 						output.push(tree[t].value);
 					}
 					break;
+				case "macro":
+					renderSubTree(tree[t].output);
+					break;
 			}
 			if(tree[t].children) {
 				renderSubTree(tree[t].children);
diff --git a/test/wikitests/SecondTiddler.html b/test/wikitests/SecondTiddler.html
index a8e16cbed..7860a796c 100644
--- a/test/wikitests/SecondTiddler.html
+++ b/test/wikitests/SecondTiddler.html
@@ -1 +1 @@
-<h2>Heading</h2>This is the second tiddler. It has a list:<br /><ul><li> Item one</li><li> Item two</li><li> Item three</li></ul>And a <macro></macro> and a <span className="myClass">custom class</span><br />
\ No newline at end of file
+<h2>Heading</h2>This is the second tiddler. It has a list:<br /><ul><li> Item one</li><li> Item two</li><li> Item three</li></ul>And a macro invocation 0.0.0 and a <span className="myClass">custom class</span><br />
\ No newline at end of file
diff --git a/test/wikitests/SecondTiddler.tid b/test/wikitests/SecondTiddler.tid
index ea4c4e246..05fef1b04 100644
--- a/test/wikitests/SecondTiddler.tid
+++ b/test/wikitests/SecondTiddler.tid
@@ -5,4 +5,4 @@ This is the second tiddler. It has a list:
 * Item one
 * Item two
 * Item three
-And a <<macro invocation>> and a {{myClass{custom class}}}
+And a macro invocation <<version>> and a {{myClass{custom class}}}
diff --git a/test/wikitests/SecondTiddler.txt b/test/wikitests/SecondTiddler.txt
index 95c66dcdc..efc2c9c39 100644
--- a/test/wikitests/SecondTiddler.txt
+++ b/test/wikitests/SecondTiddler.txt
@@ -1 +1 @@
-HeadingThis is the second tiddler. It has a list: Item one Item two Item threeAnd a  and a custom class
\ No newline at end of file
+HeadingThis is the second tiddler. It has a list: Item one Item two Item threeAnd a macro invocation 0.0.0 and a custom class
\ No newline at end of file