From 506519b49a3122f9b47b071e242c04825798f633 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sun, 27 May 2012 09:19:37 +0100
Subject: [PATCH] Switch to using the 'wikitextrule' moduletype for the new
 wiki text parser

---
 .../parsers/newwikitextparser/blockrules/class.js        | 2 +-
 .../parsers/newwikitextparser/blockrules/heading.js      | 2 +-
 .../modules/parsers/newwikitextparser/blockrules/html.js | 2 +-
 .../modules/parsers/newwikitextparser/blockrules/list.js | 2 +-
 .../modules/parsers/newwikitextparser/blockrules/rule.js | 2 +-
 .../parsers/newwikitextparser/newwikitextparser.js       | 2 +-
 core/modules/parsers/newwikitextparser/runrules/macro.js | 2 +-
 .../parsers/newwikitextparser/runrules/prettylink.js     | 2 +-
 .../parsers/newwikitextparser/runrules/wikilink.js       | 2 +-
 .../parsers/wikitextparser/rules/wikitextrules.js        | 2 +-
 core/modules/parsers/wikitextparser/wikitextparser.js    | 5 +++--
 core/modules/wiki.js                                     | 9 ++-------
 12 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/core/modules/parsers/newwikitextparser/blockrules/class.js b/core/modules/parsers/newwikitextparser/blockrules/class.js
index 283253fc3..9bb682729 100644
--- a/core/modules/parsers/newwikitextparser/blockrules/class.js
+++ b/core/modules/parsers/newwikitextparser/blockrules/class.js
@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/parsers/newwikitextparser/blockrules/class.js
 type: application/javascript
-module-type: wikirule
+module-type: wikitextrule
 
 Wiki text block rule for assigning classes to paragraphs and other blocks
 
diff --git a/core/modules/parsers/newwikitextparser/blockrules/heading.js b/core/modules/parsers/newwikitextparser/blockrules/heading.js
index 1c324e7ca..eccc7ecbb 100644
--- a/core/modules/parsers/newwikitextparser/blockrules/heading.js
+++ b/core/modules/parsers/newwikitextparser/blockrules/heading.js
@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/parsers/newwikitextparser/blockrules/heading.js
 type: application/javascript
-module-type: wikirule
+module-type: wikitextrule
 
 Wiki text block rule for headings
 
diff --git a/core/modules/parsers/newwikitextparser/blockrules/html.js b/core/modules/parsers/newwikitextparser/blockrules/html.js
index 649deb1a3..bf89b83a0 100644
--- a/core/modules/parsers/newwikitextparser/blockrules/html.js
+++ b/core/modules/parsers/newwikitextparser/blockrules/html.js
@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/parsers/newwikitextparser/blockrules/html.js
 type: application/javascript
-module-type: wikirule
+module-type: wikitextrule
 
 Wiki text block rule for block level HTML elements
 
diff --git a/core/modules/parsers/newwikitextparser/blockrules/list.js b/core/modules/parsers/newwikitextparser/blockrules/list.js
index 8028a97df..33bddd64f 100644
--- a/core/modules/parsers/newwikitextparser/blockrules/list.js
+++ b/core/modules/parsers/newwikitextparser/blockrules/list.js
@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/parsers/newwikitextparser/blockrules/list.js
 type: application/javascript
-module-type: wikirule
+module-type: wikitextrule
 
 Wiki text block rule for lists.
 
diff --git a/core/modules/parsers/newwikitextparser/blockrules/rule.js b/core/modules/parsers/newwikitextparser/blockrules/rule.js
index b7b5fc081..a41797be8 100644
--- a/core/modules/parsers/newwikitextparser/blockrules/rule.js
+++ b/core/modules/parsers/newwikitextparser/blockrules/rule.js
@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/parsers/newwikitextparser/blockrules/rule.js
 type: application/javascript
-module-type: wikirule
+module-type: wikitextrule
 
 Wiki text block rule for rules
 
diff --git a/core/modules/parsers/newwikitextparser/newwikitextparser.js b/core/modules/parsers/newwikitextparser/newwikitextparser.js
index ffb1bf8b3..db0dea00f 100644
--- a/core/modules/parsers/newwikitextparser/newwikitextparser.js
+++ b/core/modules/parsers/newwikitextparser/newwikitextparser.js
@@ -155,7 +155,7 @@ var WikiTextParser = function(options) {
 	this.runRules = [];
 	var blockRegExpStrings = [],
 		runRegExpStrings = [],
-		rules = ($tw.plugins.moduleTypes.wikirule || []).slice(0);
+		rules = ($tw.plugins.moduleTypes.wikitextrule || []).slice(0);
 	for(var t=0; t<rules.length; t++) {
 		if(rules[t].blockParser) {
 			this.blockRules.push(rules[t]);
diff --git a/core/modules/parsers/newwikitextparser/runrules/macro.js b/core/modules/parsers/newwikitextparser/runrules/macro.js
index e400e09ef..6c40e269a 100644
--- a/core/modules/parsers/newwikitextparser/runrules/macro.js
+++ b/core/modules/parsers/newwikitextparser/runrules/macro.js
@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/parsers/newwikitextparser/runrules/macro.js
 type: application/javascript
-module-type: wikirule
+module-type: wikitextrule
 
 Wiki text run rule for pretty links
 
diff --git a/core/modules/parsers/newwikitextparser/runrules/prettylink.js b/core/modules/parsers/newwikitextparser/runrules/prettylink.js
index 4d50e3ea1..1d20d0c68 100644
--- a/core/modules/parsers/newwikitextparser/runrules/prettylink.js
+++ b/core/modules/parsers/newwikitextparser/runrules/prettylink.js
@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/parsers/newwikitextparser/runrules/prettylink.js
 type: application/javascript
-module-type: wikirule
+module-type: wikitextrule
 
 Wiki text run rule for pretty links
 
diff --git a/core/modules/parsers/newwikitextparser/runrules/wikilink.js b/core/modules/parsers/newwikitextparser/runrules/wikilink.js
index a21298812..526b7e706 100644
--- a/core/modules/parsers/newwikitextparser/runrules/wikilink.js
+++ b/core/modules/parsers/newwikitextparser/runrules/wikilink.js
@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/parsers/newwikitextparser/runrules/wikilink.js
 type: application/javascript
-module-type: wikirule
+module-type: wikitextrule
 
 Wiki text run rule for wiki links.
 
diff --git a/core/modules/parsers/wikitextparser/rules/wikitextrules.js b/core/modules/parsers/wikitextparser/rules/wikitextrules.js
index 2c76703c6..525637f24 100755
--- a/core/modules/parsers/wikitextparser/rules/wikitextrules.js
+++ b/core/modules/parsers/wikitextparser/rules/wikitextrules.js
@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/parsers/wikitextparser/rules/wikitextrules.js
 type: application/javascript
-module-type: wikitextrule
+module-type: module
 
 Rule modules for the wikitext parser
 
diff --git a/core/modules/parsers/wikitextparser/wikitextparser.js b/core/modules/parsers/wikitextparser/wikitextparser.js
index de9c141aa..255eee106 100644
--- a/core/modules/parsers/wikitextparser/wikitextparser.js
+++ b/core/modules/parsers/wikitextparser/wikitextparser.js
@@ -53,8 +53,9 @@ var WikiTextParser = function(options) {
 	this.autoLinkWikiWords = true;
 };
 
-WikiTextParser.prototype.installRules = function(rules) {
-	var pattern = [];
+WikiTextParser.prototype.installRules = function() {
+	var rules = require("./rules/wikitextrules.js").rules,
+		pattern = [];
 	for(var n=0; n<rules.length; n++) {
 		pattern.push("(" + rules[n].match + ")");
 	}
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index fae2cb718..0a656fb4b 100644
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -247,15 +247,10 @@ exports.initParsers = function(moduleType) {
 			}
 		}
 	}
-	// Install the wikitext rules
-	modules = $tw.plugins.moduleTypes.wikitextrule;
+	// Install the rules for the old wikitext parser rules
 	var wikitextparser = this.parsers["text/x-tiddlywiki"];
 	if(modules && wikitextparser) {
-		for(n=0; n<modules.length; n++) {
-			m = modules[n];
-			// Add the rules defined by the module - currently a hack as we overwrite them
-			wikitextparser.installRules(m.rules);
-		}
+		wikitextparser.installRules();
 	}
 };