From ad26dd6be39d3879da30a6d79997fff81d25591a Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Tue, 6 Dec 2011 10:40:49 +0000
Subject: [PATCH] Test improvements and associated bug fixes

---
 js/Utils.js          |  4 ++--
 js/WikiTextParser.js |  2 +-
 js/WikiTextRules.js  |  8 ++++----
 wikitest.js          | 21 ++++++++++++---------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/js/Utils.js b/js/Utils.js
index 867ce3cba..259af80d8 100755
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -57,12 +57,12 @@ utils.convertFromYYYYMMDDHHMMSSMMM = function(d)
 // Convert & to "&amp;", < to "&lt;", > to "&gt;" and " to "&quot;"
 utils.htmlEncode = function(s)
 {
-	return s.replace(/&/mg,"&amp;").replace(/</mg,"&lt;").replace(/>/mg,"&gt;").replace(/\"/mg,"&quot;");
+	return s.toString().replace(/&/mg,"&amp;").replace(/</mg,"&lt;").replace(/>/mg,"&gt;").replace(/\"/mg,"&quot;");
 };
 
 // Convert "&amp;" to &, "&lt;" to <, "&gt;" to > and "&quot;" to "
 utils.htmlDecode = function(s)
 {
-	return s.replace(/&lt;/mg,"<").replace(/&gt;/mg,">").replace(/&quot;/mg,"\"").replace(/&amp;/mg,"&");
+	return s.toString().replace(/&lt;/mg,"<").replace(/&gt;/mg,">").replace(/&quot;/mg,"\"").replace(/&amp;/mg,"&");
 };
 
diff --git a/js/WikiTextParser.js b/js/WikiTextParser.js
index 13f244d53..c0c4bc1a5 100644
--- a/js/WikiTextParser.js
+++ b/js/WikiTextParser.js
@@ -75,7 +75,7 @@ WikiTextParser.prototype.renderAsHtml = function(store,title) {
 		for(var t=0; t<tree.length; t++) {
 			switch(tree[t].type) {
 				case "text":
-					output.push(utils.htmlEncode(tree[t].value);
+					output.push(utils.htmlEncode(tree[t].value));
 					break;
 				case "br":
 				case "img":
diff --git a/js/WikiTextRules.js b/js/WikiTextRules.js
index 5cc47f977..c2ad37a57 100755
--- a/js/WikiTextRules.js
+++ b/js/WikiTextRules.js
@@ -67,10 +67,10 @@ WikiTextRules.inlineCssHelper = function(w) {
 	while(lookaheadMatch && lookaheadMatch.index == w.nextMatch) {
 		var s,v;
 		if(lookaheadMatch[1]) {
-			s = lookaheadMatch[1].unDash();
+			s = lookaheadMatch[1];
 			v = lookaheadMatch[2];
 		} else {
-			s = lookaheadMatch[3].unDash();
+			s = lookaheadMatch[3];
 			v = lookaheadMatch[4];
 		}
 		if(s=="bgcolor")
@@ -86,10 +86,10 @@ WikiTextRules.inlineCssHelper = function(w) {
 };
 
 WikiTextRules.applyCssHelper = function(e,styles) {
-	if(!"attributes" in e) {
+	if(!e.attributes) {
 		e.attributes = {};
 	}
-	if(!"styles" in e.attributes) {
+	if(!e.attributes.style) {
 		e.attributes.style = {};
 	}
 	for(var t=0; t< styles.length; t++) {
diff --git a/wikitest.js b/wikitest.js
index 44fb04bb8..894d01589 100644
--- a/wikitest.js
+++ b/wikitest.js
@@ -33,7 +33,7 @@ console.error("%s in HTML:\n%s\nAnd in plain:\n%s",
 
 wikiTest({ tiddlers: 
    [ { title: 'FirstTiddler',
-       text: 'This is the \'\'text\'\' of the first tiddler, with a link to the SecondTiddler, too.' },
+       text: 'This is the \'\'text\'\' of the first tiddler, with a @@font-size:8em;color:red;link@@ to the SecondTiddler, too.' },
      { title: 'SecondTiddler',
        text: '!!Heading\nThis is the second tiddler. It has a list:\n* Item one\n* Item two\n* Item three\nAnd a <<macro invocation>>\n' },
      { title: 'ThirdTiddler',
@@ -44,14 +44,17 @@ wikiTest({ tiddlers:
    [ { tiddler: 'FirstTiddler',
        output: 
         [ { type: 'text', value: 'This is the ' },
-          { type: 'strong',
-            children: [ { type: 'text', value: 'text' } ] },
-          { type: 'text',
-            value: ' of the first tiddler, with a link to the ' },
-          { type: 'a',
-            children: [ { type: 'text', value: 'SecondTiddler' } ],
-          	attributes: {href: 'SecondTiddler', className: 'tiddlyLink' } },
-          { type: 'text', value: ', too.' } ] },
+		  { type: 'strong',
+		    children: [ { type: 'text', value: 'text' } ] },
+		  { type: 'text', value: ' of the first tiddler, with a ' },
+		  { type: 'span',
+		    children: [ { type: 'text', value: 'link' } ],
+		    attributes: { style: { 'font-size': '8em', color: 'red' } } },
+		  { type: 'text', value: ' to the ' },
+		  { type: 'a',
+		    children: [ { type: 'text', value: 'SecondTiddler' } ],
+		    attributes: { href: 'SecondTiddler', className: 'tiddlyLink' } },
+		  { type: 'text', value: ', too.' } ] },
      { tiddler: 'SecondTiddler',
        output: 
         [ { type: 'h2',