diff --git a/core/modules/parsers/parseutils.js b/core/modules/parsers/parseutils.js
index 30bc39509..99ccbb40a 100644
--- a/core/modules/parsers/parseutils.js
+++ b/core/modules/parsers/parseutils.js
@@ -381,3 +381,44 @@ exports.parseAttribute = function(source,pos) {
 	node.end = pos;
 	return node;
 };
+
+/*
+Serialize a parsed attribute node
+*/
+exports.serializeAttribute = function(node,options) {
+	options = options || {};
+	if(!node || typeof node !== "object" || !node.name || !node.type) {
+		return null;
+	}
+	// If name is number, means it is a positional attribute and name is omitted
+	var positional = parseInt(node.name) >= 0,
+		// `=` in a widget and might be `:` in a macro
+		assign = positional ? "" : (options.assignmentSymbol || "="),
+		attributeString = positional ? "" : node.name;
+	if(node.type === "string") {
+		if(node.value === "true") {
+			return attributeString;
+		}
+		attributeString += assign + '"' + node.value + '"';
+	} else if(node.type === "filtered") {
+		attributeString += assign + "{{{" + node.filter + "}}}";
+	} else if(node.type === "indirect") {
+		attributeString += assign + "{{" + node.textReference + "}}";
+	} else if(node.type === "substituted") {
+		attributeString += assign + "`" + node.rawValue + "`";
+	} else if(node.type === "macro") {
+		if(node.value && typeof node.value === "object" && node.value.type === "macrocall") {
+			var params = node.value.params.map(function(param) {
+				return param.value;
+			}).join(" ");
+			attributeString += assign + "<<" + node.value.name + " " + params + ">>";
+		} else {
+			// Unsupported macro structure
+			return null;
+		}
+	} else {
+		 // Unsupported type
+		return null;
+	}
+	return attributeString;
+};
diff --git a/core/modules/parsers/wikiparser/rules/codeblock.js b/core/modules/parsers/wikiparser/rules/codeblock.js
index bdecd65be..ca84e24aa 100644
--- a/core/modules/parsers/wikiparser/rules/codeblock.js
+++ b/core/modules/parsers/wikiparser/rules/codeblock.js
@@ -53,3 +53,7 @@ exports.parse = function() {
 			}
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	return "```" + tree.attributes.language.value + "\n" + tree.attributes.code.value + "\n```\n\n";
+}
diff --git a/core/modules/parsers/wikiparser/rules/codeinline.js b/core/modules/parsers/wikiparser/rules/codeinline.js
index 5606ba478..a9dadad27 100644
--- a/core/modules/parsers/wikiparser/rules/codeinline.js
+++ b/core/modules/parsers/wikiparser/rules/codeinline.js
@@ -51,3 +51,7 @@ exports.parse = function() {
 		}]
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	return "`" + serialize(tree.children) + "`";
+}
diff --git a/core/modules/parsers/wikiparser/rules/commentblock.js b/core/modules/parsers/wikiparser/rules/commentblock.js
index 96d3deb3d..9a953be08 100644
--- a/core/modules/parsers/wikiparser/rules/commentblock.js
+++ b/core/modules/parsers/wikiparser/rules/commentblock.js
@@ -22,7 +22,7 @@ Note that the syntax for comments is simplified to an opening "<!--" sequence an
 "use strict";
 
 exports.name = "commentblock";
-exports.types = {block:true, pragma:true};
+exports.types = {block: true, pragma: true};
 
 exports.init = function(parser) {
 	this.parser = parser;
@@ -43,9 +43,22 @@ exports.findNextMatch = function(startPos) {
 	return undefined;
 };
 
+
 exports.parse = function() {
 	// Move past the match
 	this.parser.pos = this.endMatchRegExp.lastIndex;
-	// Don't return any elements
-	return [];
+	// Return a node representing the comment that is not rendered
+	var commentStart = this.match.index;
+	var commentEnd = this.endMatch.index + this.endMatch[0].length;
+	return [{
+			type: "void",
+			children: [],
+			text: this.parser.source.slice(commentStart, commentEnd),
+			start: commentStart,
+			end: commentEnd
+	}];
+};
+
+exports.serialize = function(tree,serialize) {
+	return tree.text + "\n\n" + serialize(tree.children);
 };
diff --git a/core/modules/parsers/wikiparser/rules/commentinline.js b/core/modules/parsers/wikiparser/rules/commentinline.js
index e826b95e6..6eb49e839 100644
--- a/core/modules/parsers/wikiparser/rules/commentinline.js
+++ b/core/modules/parsers/wikiparser/rules/commentinline.js
@@ -40,6 +40,17 @@ exports.findNextMatch = function(startPos) {
 exports.parse = function() {
 	// Move past the match
 	this.parser.pos = this.endMatchRegExp.lastIndex;
-	// Don't return any elements
-	return [];
+	// Return a node representing the inline comment
+	var commentStart = this.match.index;
+	var commentEnd = this.endMatch.index + this.endMatch[0].length;
+	return [{
+			type: "void",
+			text: this.parser.source.slice(commentStart, commentEnd),
+			start: commentStart,
+			end: commentEnd
+	}];
+};
+
+exports.serialize = function(tree,serialize) {
+	return tree.text;
 };
diff --git a/core/modules/parsers/wikiparser/rules/conditional.js b/core/modules/parsers/wikiparser/rules/conditional.js
index 4dccf75fb..57db3891e 100644
--- a/core/modules/parsers/wikiparser/rules/conditional.js
+++ b/core/modules/parsers/wikiparser/rules/conditional.js
@@ -114,4 +114,37 @@ exports.parseIfClause = function(filterCondition) {
 	return [listWidget];
 };
 
+exports.serialize = function(tree,serialize) {
+	// We always have "if" at the beginning
+	var filterCondition = tree.attributes.filter.value;
+	var ifClauseText = serialize(tree.children[0].children);
+	var result = "<%if " + filterCondition + "%>" + ifClauseText;
+	function serializeElseIf(listNode) {
+		// We receive the only list node inside list-template node
+		if(!listNode || listNode.type !== "list") {
+			return "<%else%>" + serialize(listNode);
+		}
+		var filter = listNode.attributes.filter.value || "";
+		var bodyText = serialize(listNode.children[0].children);
+		var nextConditionResult = "";
+		// May has an only any node inside list-empty node
+		if(listNode.children[1] && listNode.children[1].children[0]) {
+			if(listNode.children[1].children[0].type === "list") {
+				nextConditionResult = serializeElseIf(listNode.children[1].children[0]);
+			} else {
+				nextConditionResult = "<%else%>" + serialize(listNode.children[1]);
+			}
+		}
+		return "<%elseif " + filter + "%>" + bodyText + nextConditionResult;
+	}
+	if(tree.children[1] && tree.children[1].children) {
+		result += serializeElseIf(tree.children[1].children[0]);
+	}
+	result += "<%endif%>";
+	if(tree.isBlock) {
+		result += "\n\n";
+	}
+	return result;
+};
+
 })();
diff --git a/core/modules/parsers/wikiparser/rules/dash.js b/core/modules/parsers/wikiparser/rules/dash.js
index 02d82baec..93a69b946 100644
--- a/core/modules/parsers/wikiparser/rules/dash.js
+++ b/core/modules/parsers/wikiparser/rules/dash.js
@@ -33,3 +33,7 @@ exports.parse = function() {
 		entity: dash
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	return tree.entity === "&ndash;" ? "--" : "---";
+};
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/bold.js b/core/modules/parsers/wikiparser/rules/emphasis/bold.js
index 70f741759..12e9ea7a2 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/bold.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/bold.js
@@ -43,3 +43,7 @@ exports.parse = function() {
 		children: tree
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	return "''" + serialize(tree.children) + "''";
+};
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/italic.js b/core/modules/parsers/wikiparser/rules/emphasis/italic.js
index 995e58123..446fdedb4 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/italic.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/italic.js
@@ -43,3 +43,7 @@ exports.parse = function() {
 		children: tree
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	return "//" + serialize(tree.children) + "//";
+};
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js b/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js
index 24380ed11..038aaceba 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js
@@ -43,3 +43,7 @@ exports.parse = function() {
 		children: tree
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	return "~~" + serialize(tree.children) + "~~";
+};
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/subscript.js b/core/modules/parsers/wikiparser/rules/emphasis/subscript.js
index 104ed0294..0b24ad14b 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/subscript.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/subscript.js
@@ -43,3 +43,7 @@ exports.parse = function() {
 		children: tree
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	return ",," + serialize(tree.children) + ",,";
+};
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/superscript.js b/core/modules/parsers/wikiparser/rules/emphasis/superscript.js
index be7157255..96e3c7769 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/superscript.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/superscript.js
@@ -43,3 +43,7 @@ exports.parse = function() {
 		children: tree
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	return "^^" + serialize(tree.children) + "^^";
+};
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/underscore.js b/core/modules/parsers/wikiparser/rules/emphasis/underscore.js
index 2c2bf71c3..8395a0038 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/underscore.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/underscore.js
@@ -43,3 +43,7 @@ exports.parse = function() {
 		children: tree
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	return "__" + serialize(tree.children) + "__";
+};
diff --git a/core/modules/parsers/wikiparser/rules/entity.js b/core/modules/parsers/wikiparser/rules/entity.js
index df2068b78..ff1030b2c 100644
--- a/core/modules/parsers/wikiparser/rules/entity.js
+++ b/core/modules/parsers/wikiparser/rules/entity.js
@@ -33,3 +33,7 @@ exports.parse = function() {
 	// Return the entity
 	return [{type: "entity", entity: this.match[0]}];
 };
+
+exports.serialize = function(tree,serialize) {
+	return tree.entity;
+};
diff --git a/core/modules/parsers/wikiparser/rules/extlink.js b/core/modules/parsers/wikiparser/rules/extlink.js
index 2678e3873..c284dac4b 100644
--- a/core/modules/parsers/wikiparser/rules/extlink.js
+++ b/core/modules/parsers/wikiparser/rules/extlink.js
@@ -28,11 +28,11 @@ exports.init = function(parser) {
 
 exports.parse = function() {
 	// Move past the match
-    var start = this.parser.pos;
+	var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Create the link unless it is suppressed
 	if(this.match[0].substr(0,1) === "~") {
-		return [{type: "text", text: this.match[0].substr(1)}];
+		return [{type: "text", text: this.match[0].substr(1), start: start, end: this.parser.pos}];
 	} else {
 		return [{
 			type: "element",
@@ -49,3 +49,11 @@ exports.parse = function() {
 		}];
 	}
 };
+
+exports.serialize = function(tree,serialize) {
+	if(tree.type === "text") {
+			return "~" + tree.text;
+	} else if(tree.type === "element" && tree.tag === "a") {
+			return tree.attributes.href.value;
+	}
+};
diff --git a/core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js b/core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js
index 2fd96183e..802371ec0 100644
--- a/core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js
+++ b/core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js
@@ -67,3 +67,18 @@ exports.parse = function() {
 	}
 	return [node];
 };
+
+exports.serialize = function(tree,serialize) {
+	var serialized = "{{{" + tree.attributes.filter.value;
+	// Tooltip text
+	if(tree.attributes.tooltip) serialized += "|" + tree.attributes.tooltip.value;
+	// Template title
+	if(tree.attributes.template) serialized += "||" + tree.attributes.template.value;
+	serialized += "}}";
+	// Inline styles
+	if(tree.attributes.style) serialized += tree.attributes.style.value;
+	serialized += "}"
+	// CSS classes
+	if(tree.attributes.itemClass) serialized += "." + tree.attributes.itemClass.value.split(" ").join(".");
+	return serialized + "\n\n";
+};
diff --git a/core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js b/core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js
index ee82ff517..8db822049 100644
--- a/core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js
+++ b/core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js
@@ -66,3 +66,9 @@ exports.parse = function() {
 	}
 	return [node];
 };
+
+exports.serialize = function(tree,serialize) {
+	var filteredtranscludeblock = require("$:/core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js");
+	var result = filteredtranscludeblock.serialize(tree,serialize);
+	return result.trimEnd();
+};
diff --git a/core/modules/parsers/wikiparser/rules/fnprocdef.js b/core/modules/parsers/wikiparser/rules/fnprocdef.js
index 8e675a3d1..953f1687f 100644
--- a/core/modules/parsers/wikiparser/rules/fnprocdef.js
+++ b/core/modules/parsers/wikiparser/rules/fnprocdef.js
@@ -6,15 +6,15 @@ module-type: wikirule
 Wiki pragma rule for function, procedure and widget definitions
 
 ```
-\function name(param:defaultvalue,param2:defaultvalue)
+\function name(param:"defaultvalue", param2:"defaultvalue")
 definition text
 \end
 
-\procedure name(param:defaultvalue,param2:defaultvalue)
+\procedure name(param:"defaultvalue", param2:"defaultvalue")
 definition text
 \end
 
-\widget $mywidget(param:defaultvalue,param2:defaultvalue)
+\widget $mywidget(param:"defaultvalue", param2:"defaultvalue")
 definition text
 \end
 ```
@@ -89,3 +89,18 @@ exports.parse = function() {
 	}
 	return parseTreeNodes;
 };
+
+exports.serialize = function(tree,serialize) {
+	// Type of definition: "function", "procedure", or "widget"
+	var type = tree.isFunctionDefinition ? "function" : (tree.isProcedureDefinition ? "procedure" : "widget");
+	// Name of the function, procedure, or widget
+	var name = tree.attributes.name.value;
+	// Parameters with default values
+	var params = tree.params.map(function(param) {
+			return param.name + (param.default ? ':"' + param.default + '"' : "");
+	}).join(", ");
+	// Definition text
+	var definition = tree.attributes.value.value;
+	// Construct the serialized string, concat the children because pragma rule wrap everything below it as children
+	return "\\" + type + " " + name + "(" + params + ")\n" + definition + "\n\\end\n\n" + serialize(tree.children) + "\n";
+};
diff --git a/core/modules/parsers/wikiparser/rules/hardlinebreaks.js b/core/modules/parsers/wikiparser/rules/hardlinebreaks.js
index da28f7808..ab53a4a89 100644
--- a/core/modules/parsers/wikiparser/rules/hardlinebreaks.js
+++ b/core/modules/parsers/wikiparser/rules/hardlinebreaks.js
@@ -50,6 +50,19 @@ exports.parse = function() {
 			}
 		}
 	} while(match && !match[1]);
-	// Return the nodes
+	// Mark first and last node, and return the nodes
+	if(tree[0]) tree[0].isRuleStart = true;
+	if(tree[tree.length-1]) tree[tree.length-1].isRuleEnd = true;
 	return tree;
 };
+
+exports.serialize = function(tree,serialize) {
+	var text = tree.tag === "br" ? "\n" : (tree.text || "");
+	if(tree.isRuleStart) {
+		return '"""\n' + text;
+	}
+	if(tree.isRuleEnd) {
+		return text + '"""';
+	}
+	return text + serialize(tree.children);
+};
diff --git a/core/modules/parsers/wikiparser/rules/heading.js b/core/modules/parsers/wikiparser/rules/heading.js
index af2a6ad12..32571ea96 100644
--- a/core/modules/parsers/wikiparser/rules/heading.js
+++ b/core/modules/parsers/wikiparser/rules/heading.js
@@ -42,3 +42,11 @@ exports.parse = function() {
 		children: tree
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	// Get heading level from number after `h`
+	var headingLevel = parseInt(tree.tag.substr(1),10);
+	var classes = tree.attributes.class ? tree.attributes.class.value.split(" ").join(".") : "";
+	var headingText = serialize(tree.children);
+	return Array(headingLevel + 1).join("!") + (classes ? "." + classes : "") + " " + headingText + "\n\n";
+};
diff --git a/core/modules/parsers/wikiparser/rules/horizrule.js b/core/modules/parsers/wikiparser/rules/horizrule.js
index 2294add6b..01657e854 100644
--- a/core/modules/parsers/wikiparser/rules/horizrule.js
+++ b/core/modules/parsers/wikiparser/rules/horizrule.js
@@ -27,3 +27,7 @@ exports.parse = function() {
 	this.parser.pos = this.matchRegExp.lastIndex;
 	return [{type: "element", tag: "hr"}];
 };
+
+exports.serialize = function(tree,serialize) {
+	return "---\n\n";
+}
diff --git a/core/modules/parsers/wikiparser/rules/html.js b/core/modules/parsers/wikiparser/rules/html.js
index c5f0e86c5..7529340e5 100644
--- a/core/modules/parsers/wikiparser/rules/html.js
+++ b/core/modules/parsers/wikiparser/rules/html.js
@@ -41,7 +41,7 @@ Parse the most recent match
 exports.parse = function() {
 	// Retrieve the most recent match so that recursive calls don't overwrite it
 	var tag = this.nextTag;
-	if (!tag.isSelfClosing) {
+	if(!tag.isSelfClosing) {
 		tag.openTagStart = tag.start;
 		tag.openTagEnd = tag.end;
 	}
@@ -63,22 +63,22 @@ exports.parse = function() {
 		}
 		tag.end = this.parser.pos;
 		tag.closeTagEnd = tag.end;
-		if (tag.closeTagEnd === tag.openTagEnd || this.parser.source[tag.closeTagEnd - 1] !== '>') {
+		if(tag.closeTagEnd === tag.openTagEnd || this.parser.source[tag.closeTagEnd - 1] !== ">") {
 			tag.closeTagStart = tag.end;
 		} else {
 			tag.closeTagStart = tag.closeTagEnd - 2;
 			var closeTagMinPos = tag.children.length > 0 ? tag.children[tag.children.length-1].end : tag.openTagEnd;
-			if (!Number.isSafeInteger(closeTagMinPos)) closeTagMinPos = tag.openTagEnd;
-			while (tag.closeTagStart >= closeTagMinPos) {
+			if(!Number.isSafeInteger(closeTagMinPos)) closeTagMinPos = tag.openTagEnd;
+			while(tag.closeTagStart >= closeTagMinPos) {
 				var char = this.parser.source[tag.closeTagStart];
-				if (char === '>') {
+				if(char === ">") {
 					tag.closeTagStart = -1;
 					break;
 				}
-				if (char === '<') break;
+				if(char === "<") break;
 				tag.closeTagStart -= 1;
 			}
-			if (tag.closeTagStart < closeTagMinPos) {
+			if(tag.closeTagStart < closeTagMinPos) {
 				tag.closeTagStart = tag.end;
 			}
 		}
@@ -191,3 +191,24 @@ exports.isLegalTag = function(tag) {
 		return true;
 	}
 };
+
+exports.serialize = function(tree,serialize) {
+	var tag = tree.tag;
+	var attributes = tree.orderedAttributes.map(function(attribute) {
+			return $tw.utils.serializeAttribute(attribute);
+	}).join(" ");
+	// Children
+	var children = tree.children ? serialize(tree.children) : "";
+	var result = "";
+	// Self-closing tag
+	if(tree.isSelfClosing) {
+			result += "<" + tag + (attributes ? " " + attributes : "") + "/>";
+	} else {
+		// Opening and closing tags
+		result += "<" + tag + (attributes ? " " + attributes : "") + ">" + children + "</" + tag + ">";
+	}
+	if(tree.isBlock) {
+		result += "\n\n";
+	}
+	return result;
+};
diff --git a/core/modules/parsers/wikiparser/rules/image.js b/core/modules/parsers/wikiparser/rules/image.js
index 2bc90b80d..2c6218fbd 100644
--- a/core/modules/parsers/wikiparser/rules/image.js
+++ b/core/modules/parsers/wikiparser/rules/image.js
@@ -126,3 +126,12 @@ exports.parseImage = function(source,pos) {
 	node.end = pos;
 	return node;
 };
+
+exports.serialize = function(tree,serialize) {
+	var width = tree.attributes.width ? " " + $tw.utils.serializeAttribute(tree.attributes.width) : "";
+	var height = tree.attributes.height ? " " + $tw.utils.serializeAttribute(tree.attributes.height) : "";
+	var padSpace = width || height ? " " : "";
+	var tooltip = tree.attributes.tooltip ? tree.attributes.tooltip.value + "|" : "";
+	var source = tree.attributes.source.value;
+	return "[img" + width + height + padSpace + "[" + tooltip + source + "]]";
+};
diff --git a/core/modules/parsers/wikiparser/rules/import.js b/core/modules/parsers/wikiparser/rules/import.js
index 52332f0e3..c80cb7e77 100644
--- a/core/modules/parsers/wikiparser/rules/import.js
+++ b/core/modules/parsers/wikiparser/rules/import.js
@@ -47,3 +47,9 @@ exports.parse = function() {
 		children: []
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	var filter = tree.attributes.filter.value;
+	// Sibling below the pragma become children, so we append the serialized children to the end..
+	return "\\import " + filter + "\n" + serialize(tree.children);
+};
diff --git a/core/modules/parsers/wikiparser/rules/list.js b/core/modules/parsers/wikiparser/rules/list.js
index 98cc5540f..f84d5c54f 100644
--- a/core/modules/parsers/wikiparser/rules/list.js
+++ b/core/modules/parsers/wikiparser/rules/list.js
@@ -60,6 +60,19 @@ var listTypes = {
 	">": {listTag: "blockquote", itemTag: "div"}
 };
 
+var listTags = Object.values(listTypes).map(function(type) {
+	return type.listTag;
+});
+/*
+Check if the child is a nested list or a simple line of list item
+*/
+function isListNode(node) {
+	return node && node.type === "element" && listTags.includes(node.tag);
+}
+var itemTags = Object.values(listTypes).map(function(type) {
+	return type.itemTag;
+});
+
 /*
 Parse the most recent match
 */
@@ -149,3 +162,56 @@ exports.parse = function() {
 	// Return the root element of the list
 	return [listStack[0]];
 };
+
+exports.serialize = function (tree,serialize) {
+	// Helper function to find the marker for a given list container tag and item tag
+	function findMarker(listTag, itemTag) {
+		for(var key in listTypes) {
+			if(listTypes[key].listTag === listTag && listTypes[key].itemTag === itemTag) {
+				return key; // Return the marker associated with the list tag and item tag
+			}
+		}
+		return ""; // Return empty string if no matching marker is found
+	}
+
+	// Recursive function to serialize list nodes, handling nested lists and formatting output
+	function serializeList(node, markerPrefix) {
+		var result = [];
+		if(node.type === "element" && isListNode(node)) {
+			node.children.forEach(function (child) {
+				if(itemTags.includes(child.tag)) {
+					var currentMarker = findMarker(node.tag, child.tag);
+					// Handle class attributes
+					var classAttr = child.attributes && child.attributes.class ? "." + child.attributes.class.value : "";
+					/** 
+					 * same level text nodes may be split into multiple children, and separated by deeper list sub-tree.
+					 * We collect same level text nodes into this list, and concat then submit them before enter deeper list.
+					 */
+					var content = [];
+					$tw.utils.each(child.children,function (subNode) {
+						if(isListNode(subNode)) {
+							// Recursive call for nested lists
+							if(content.length > 0) {
+								result.push(markerPrefix + currentMarker + classAttr + " " + content.join("").trim());
+								content = []
+							}
+							result.push(serializeList(subNode, markerPrefix + currentMarker).trim())
+						} else {
+							content.push(serialize(subNode)) ;
+						}
+						return ""; // Default return for unhandled node types
+					});
+					// prepend `#` mark to a new line, if it has content (and has or hasn't nested list), or if it has no content and also no nested list
+					if(content.length > 0 || child.children.length === 0) {
+						result.push(markerPrefix + currentMarker + classAttr + " " + content.join("").trim());
+						content = []
+					}
+				}
+			});
+		}
+		return result.join("\n");
+	}
+
+	// Begin serialization from the root node, with an empty string as the initial marker prefix
+	return serializeList(tree, "") + "\n\n";
+};
diff --git a/core/modules/parsers/wikiparser/rules/macrocallblock.js b/core/modules/parsers/wikiparser/rules/macrocallblock.js
index 3793d563d..c23558413 100644
--- a/core/modules/parsers/wikiparser/rules/macrocallblock.js
+++ b/core/modules/parsers/wikiparser/rules/macrocallblock.js
@@ -29,7 +29,7 @@ exports.findNextMatch = function(startPos) {
 			var c = this.parser.source.charAt(nextCall.end);
 			// Ensure EOL after parsed macro
 			// If we didn't need to support IE, we'd just use /(?:\r?\n|$)/ym
-			if ((c === "") || (c === "\n") || ((c === "\r") && this.parser.source.charAt(nextCall.end+1) === "\n")) {
+			if((c === "") || (c === "\n") || ((c === "\r") && this.parser.source.charAt(nextCall.end+1) === "\n")) {
 				this.nextCall = nextCall;
 				return nextStart;
 			}
@@ -49,3 +49,24 @@ exports.parse = function() {
 	this.parser.pos = call.end;
 	return [call];
 };
+
+/*
+Serialize a macro call node to wikitext
+*/
+exports.serialize = function (node) {
+	var result = "<<";
+	// Macro name
+	if(node.attributes && node.attributes["$variable"]) {
+		result += node.attributes["$variable"].value;
+	}
+	// Append ordered arguments if any
+	if(node.orderedAttributes) {
+		node.orderedAttributes.forEach(function (attribute) {
+			if(attribute.name !== "$variable") {
+				result += " " + $tw.utils.serializeAttribute(attribute,{assignmentSymbol:":"});
+			}
+		});
+	}
+	result += ">>\n\n";
+	return result;
+};
diff --git a/core/modules/parsers/wikiparser/rules/macrocallinline.js b/core/modules/parsers/wikiparser/rules/macrocallinline.js
index bd6e777bb..de700ce2b 100644
--- a/core/modules/parsers/wikiparser/rules/macrocallinline.js
+++ b/core/modules/parsers/wikiparser/rules/macrocallinline.js
@@ -42,3 +42,12 @@ exports.parse = function() {
 	this.parser.pos = call.end;
 	return [call];
 };
+
+/*
+Same as macrocallblock but without \n\n
+*/
+exports.serialize = function (tree,serialize) {
+	var macrocallblock = require("$:/core/modules/parsers/wikiparser/rules/macrocallblock.js");
+	var result = macrocallblock.serialize(tree,serialize);
+	return result.trimEnd();
+};
diff --git a/core/modules/parsers/wikiparser/rules/macrodef.js b/core/modules/parsers/wikiparser/rules/macrodef.js
index 342f5aacd..b01872bdd 100644
--- a/core/modules/parsers/wikiparser/rules/macrodef.js
+++ b/core/modules/parsers/wikiparser/rules/macrodef.js
@@ -52,9 +52,10 @@ exports.parse = function() {
 		}
 	}
 	// Is the remainder of the \define line blank after the parameter close paren?
-	var reEnd;
+	var reEnd,isBlock = true;
 	if(this.match[3]) {
 		// If so, it is a multiline definition and the end of the body is marked with \end
+		isBlock = false;
 		reEnd = new RegExp("((?:^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
 	} else {
 		// Otherwise, the end of the definition is marked by the end of the line
@@ -79,9 +80,22 @@ exports.parse = function() {
 		attributes: {},
 		children: [],
 		params: params,
-		isMacroDefinition: true
+		isMacroDefinition: true,
+		isBlock: isBlock && !!endMatch
 	}];
 	$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"name",this.match[1]);
 	$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"value",text);
 	return parseTreeNodes;
 };
+
+exports.serialize = function(tree,serialize) {
+	var name = tree.attributes.name.value;
+	var params = tree.params.map(function(param) {
+			return param.name + (param.default ? ":" + param.default : "");
+	}).join(",");
+	var definition = tree.attributes.value.value;
+	if(tree.isBlock) {
+		return "\\define " + name + "(" + params + ") " + definition + "\n\n" + serialize(tree.children);
+	}
+	return "\\define " + name + "(" + params + ")\n" + definition + "\n\\end\n\n" + serialize(tree.children);
+};
diff --git a/core/modules/parsers/wikiparser/rules/parameters.js b/core/modules/parsers/wikiparser/rules/parameters.js
index ccd50319c..90c0c8537 100644
--- a/core/modules/parsers/wikiparser/rules/parameters.js
+++ b/core/modules/parsers/wikiparser/rules/parameters.js
@@ -53,3 +53,10 @@ exports.parse = function() {
 		orderedAttributes: orderedAttributes
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	var params = tree.orderedAttributes.map(function(param) {
+			return param.name + (param.value ? ":" + param.value : "");
+	}).join(",");
+	return "\\parameters(" + params + ")\n\n" + serialize(tree.children);
+};
diff --git a/core/modules/parsers/wikiparser/rules/parsermode.js b/core/modules/parsers/wikiparser/rules/parsermode.js
index 868db3e15..4692a15e0 100644
--- a/core/modules/parsers/wikiparser/rules/parsermode.js
+++ b/core/modules/parsers/wikiparser/rules/parsermode.js
@@ -31,6 +31,7 @@ Parse the most recent match
 */
 exports.parse = function() {
 	// Move past the pragma invocation
+	var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Parse whitespace delimited tokens terminated by a line break
 	var reMatch = /[^\S\n]*(\S+)|(\r?\n)/mg,
@@ -58,6 +59,16 @@ exports.parse = function() {
 			this.parser.parseAsInline = true;
 		}
 	}
-	// No parse tree nodes to return
-	return [];
+	return [{
+		type: "void",
+		children: [],
+		parseAsInline: this.parser.parseAsInline,
+		start: start,
+		end: this.parser.pos
+	}];
+};
+
+exports.serialize = function(tree,serialize) {
+	var mode = tree.parseAsInline ? "inline" : "block";
+	return "\\parsermode " + mode + "\n\n" + serialize(tree.children);
 };
diff --git a/core/modules/parsers/wikiparser/rules/prettyextlink.js b/core/modules/parsers/wikiparser/rules/prettyextlink.js
index 2c575c227..2491c59a6 100644
--- a/core/modules/parsers/wikiparser/rules/prettyextlink.js
+++ b/core/modules/parsers/wikiparser/rules/prettyextlink.js
@@ -113,3 +113,9 @@ exports.parseLink = function(source,pos) {
 	node.end = closePos + 2;
 	return node;
 };
+
+exports.serialize = function(tree,serialize) {
+	var tooltip = tree.children[0].text;
+	var url = tree.attributes.href.value;
+	return "[ext[" + (tooltip !== url ? tooltip + "|" : "") + url + "]]";
+};
diff --git a/core/modules/parsers/wikiparser/rules/prettylink.js b/core/modules/parsers/wikiparser/rules/prettylink.js
index 91579256d..49f3875e6 100644
--- a/core/modules/parsers/wikiparser/rules/prettylink.js
+++ b/core/modules/parsers/wikiparser/rules/prettylink.js
@@ -32,7 +32,7 @@ exports.parse = function() {
 	var text = this.match[1],
 		link = this.match[2] || text,
 		textEndPos = this.parser.source.indexOf("|", start);
-	if (textEndPos < 0 || textEndPos > this.matchRegExp.lastIndex) {
+	if(textEndPos < 0 || textEndPos > this.matchRegExp.lastIndex) {
 		textEndPos = this.matchRegExp.lastIndex - 2;
 	}
 	var linkStart = this.match[2] ? (start + this.match[1].length + 1) : start;
@@ -63,3 +63,9 @@ exports.parse = function() {
 		}];
 	}
 };
+
+exports.serialize = function(tree,serialize) {
+	var text = tree.children[0].text;
+	var target = tree.attributes.to ? tree.attributes.to.value : tree.attributes.href.value;
+	return "[[" + text + (text !== target ? "|" + target : "") + "]]";
+};
diff --git a/core/modules/parsers/wikiparser/rules/quoteblock.js b/core/modules/parsers/wikiparser/rules/quoteblock.js
index be8746de4..cb510af88 100644
--- a/core/modules/parsers/wikiparser/rules/quoteblock.js
+++ b/core/modules/parsers/wikiparser/rules/quoteblock.js
@@ -69,3 +69,18 @@ exports.parse = function() {
 		children: tree
 	}];
 };
+
+exports.serialize = function (tree,serialize) {
+	var result = [];
+	if(tree.type === "element" && tree.tag === "blockquote") {
+		// tree.attributes.class.value: "tc-quote"
+		result.push("<<<" + tree.attributes.class.value);
+		tree.children.forEach(function (child) {
+			if(child.type === "element" && child.tag === "p") {
+				result.push(serialize(child.children).trim());
+			}
+		});
+		result.push("<<<");
+	}
+	return result.join("\n") + "\n\n";
+};
diff --git a/core/modules/parsers/wikiparser/rules/rules.js b/core/modules/parsers/wikiparser/rules/rules.js
index 7b3749308..ba99bc405 100644
--- a/core/modules/parsers/wikiparser/rules/rules.js
+++ b/core/modules/parsers/wikiparser/rules/rules.js
@@ -54,6 +54,30 @@ exports.parse = function() {
 	if(tokens.length > 0) {
 		this.parser.amendRules(tokens[0],tokens.slice(1));
 	}
-	// No parse tree nodes to return
-	return [];
+	// No widget to render, return void node.
+	return [{
+		type: "void",
+		attributes: {
+			action: {type: "string", value: tokens[0]},
+			rules: {type: "string", value: tokens.slice(1).join(" ")}
+		},
+		children: []
+	}];
+};
+
+exports.serialize = function (tree,serialize) {
+	var result = [];
+	if(tree.attributes.action && tree.attributes.rules) {
+		// tree.attributes.action.value: "except"
+		// tree.attributes.rules.value: "ruleone ruletwo rulethree"
+		result.push("\\rules " + tree.attributes.action.value + " " + tree.attributes.rules.value);
+		tree.children.forEach(function (child) {
+			if(child.type === "void" && child.attributes.action && child.attributes.rules) {
+				// child.attributes.action.value: "only"
+				// child.attributes.rules.value: "ruleone ruletwo rulethree"
+				result.push("\\rules " + child.attributes.action.value + " " + child.attributes.rules.value);
+			}
+		});
+	}
+	return result.join("\n");
 };
diff --git a/core/modules/parsers/wikiparser/rules/styleblock.js b/core/modules/parsers/wikiparser/rules/styleblock.js
index 2abf2fc9e..e8b72a22e 100644
--- a/core/modules/parsers/wikiparser/rules/styleblock.js
+++ b/core/modules/parsers/wikiparser/rules/styleblock.js
@@ -64,5 +64,57 @@ exports.parse = function() {
 			$tw.utils.addAttributeToParseTreeNode(tree[t],"style",styles.join(""));
 		}
 	}
-	return tree;
+	return [{
+		type: "void",
+		children: tree
+	}]
+};
+
+exports.serialize = function(tree,serialize) {
+	var lines = [];
+	var classes = [];
+	var styles = [];
+
+	// Same classes are set to each children. So only collect from first child.
+	var node = tree.children[0];
+	if(node && node.attributes && node.attributes.class) {
+		var nodeClasses = node.attributes.class.value.split(" ");
+		for(var j = 0; j < nodeClasses.length; j++) {
+			if(classes.indexOf(nodeClasses[j]) === -1) {
+				classes.push(nodeClasses[j]);
+			}
+		}
+	}
+	if(node && node.attributes && node.attributes.style) {
+		var nodeStyles = node.attributes.style.value.split(";");
+		for(var k = 0; k < nodeStyles.length; k++) {
+			var style = nodeStyles[k].trim();
+			if(style && styles.indexOf(style) === -1) {
+				styles.push(style);
+			}
+		}
+	}
+
+	// Add the style block header, sort styles first, and classes later. Original order is not preserved intentionally for simplicity.
+	if(classes.length > 0 || styles.length > 0) {
+		if(styles.length > 0) {
+			lines.push("@@");
+			lines.push(styles.join(";"));
+			lines.push(";\n");
+		}
+		if(classes.length > 0) {
+			lines.push("@@.");
+			lines.push(classes.join("."));
+			lines.push("\n");
+		}
+	}
+
+	// Serialize each child node and add to result
+	for(var i = 0; i < tree.children.length; i++) {
+		lines.push(serialize(tree.children[i]));
+	}
+	var result = lines.join("").trimEnd();
+	// Add the closing @@ for the style block
+	result += "\n@@\n\n"
+	return result;
 };
diff --git a/core/modules/parsers/wikiparser/rules/styleinline.js b/core/modules/parsers/wikiparser/rules/styleinline.js
index 3aea0d266..ef32e1140 100644
--- a/core/modules/parsers/wikiparser/rules/styleinline.js
+++ b/core/modules/parsers/wikiparser/rules/styleinline.js
@@ -22,7 +22,7 @@ exports.types = {inline: true};
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /@@((?:[^\.\r\n\s:]+:[^\r\n;]+;)+)?(\.(?:[^\r\n\s]+)\s+)?/mg;
+	this.matchRegExp = /@@((?:[^\.\r\n\s:]+:[^\r\n;]+;)+)?\s*(\.(?:[^\r\n\s]+)\s+)?/mg;
 };
 
 exports.parse = function() {
@@ -51,3 +51,18 @@ exports.parse = function() {
 	}
 	return [node];
 };
+
+exports.serialize = function(tree,serialize) {
+	var result = "@@";
+	// Add styles if present
+	if(tree.attributes && tree.attributes.style) {
+		result += tree.attributes.style.value.trim();
+	}
+	// Add classes if present
+	if(tree.attributes && tree.attributes.class) {
+		result += "." + tree.attributes.class.value.trim().split(" ").join(".");
+	}
+	// Serialize children and append to result
+	result += " " + serialize(tree.children) + "@@";
+	return result;
+};
diff --git a/core/modules/parsers/wikiparser/rules/syslink.js b/core/modules/parsers/wikiparser/rules/syslink.js
index a57850265..ded606ab7 100644
--- a/core/modules/parsers/wikiparser/rules/syslink.js
+++ b/core/modules/parsers/wikiparser/rules/syslink.js
@@ -46,3 +46,12 @@ exports.parse = function() {
 		}];
 	}
 };
+
+exports.serialize = function(tree,serialize) {
+	// Check if the link is suppressed. Tree may only have text, no children and attributes
+	var isSuppressed = tree.children && tree.children[0].text.substr(0,1) === "~";
+	var serialized = isSuppressed ? "~" : "";
+	// Append the link text
+	serialized += tree.attributes ? tree.attributes.to.value : tree.text;
+	return serialized;
+};
diff --git a/core/modules/parsers/wikiparser/rules/table.js b/core/modules/parsers/wikiparser/rules/table.js
index 67def255f..9d3e6c77c 100644
--- a/core/modules/parsers/wikiparser/rules/table.js
+++ b/core/modules/parsers/wikiparser/rules/table.js
@@ -184,3 +184,33 @@ exports.parse = function() {
 	}
 	return [table];
 };
+
+exports.serialize = function(tree,serialize) {
+	var serialized = "";
+	// Iterate over the table rows
+	for(var i = 0; i < tree.children.length; i++) {
+		var rowContainer = tree.children[i];
+		// Iterate over the rows in the row container
+		for(var j = 0; j < rowContainer.children.length; j++) {
+			var row = rowContainer.children[j];
+			// Start the row
+			serialized += "|";
+			// Iterate over the cells in the row
+			for(var k = 0; k < row.children.length; k++) {
+				var cell = row.children[k];
+				// if is th, append additional `!`
+				if(cell.tag === "th") {
+					serialized += "!";
+				}
+				// Cell content
+				serialized += serialize(cell.children);
+				// End the cell
+				serialized += "|";
+			}
+			// End the row
+			serialized += "\n";
+		}
+	}
+	// Return the completed block
+	return serialized + "\n";
+};
diff --git a/core/modules/parsers/wikiparser/rules/transcludeblock.js b/core/modules/parsers/wikiparser/rules/transcludeblock.js
index 525113d5d..03da4113e 100644
--- a/core/modules/parsers/wikiparser/rules/transcludeblock.js
+++ b/core/modules/parsers/wikiparser/rules/transcludeblock.js
@@ -82,3 +82,51 @@ exports.parse = function() {
 		}
 	}
 };
+
+exports.serialize = function(tree,serialize) {
+	var result = "{{";
+	function handleTransclude(transcludeNode) {
+		// Handle field
+		if(transcludeNode.attributes.$field) {
+			result += "!!" + transcludeNode.attributes.$field.value;
+		}
+		// Check for index attribute
+		if(transcludeNode.attributes.$index) {
+			result += "##" + transcludeNode.attributes.$index.value;
+		}
+		// Handle template
+		var tiddlerTitle = tree.attributes.tiddler ? tree.attributes.tiddler.value : undefined;
+		if(transcludeNode.attributes.$tiddler && transcludeNode.attributes.$tiddler.value !== tiddlerTitle) {
+			result += "||" + transcludeNode.attributes.$tiddler.value;
+		}
+		// Check for parameters
+		var params = [];
+		var excludedAttributes = ["tiddler", "$tiddler", "$field", "$index", "$template"];
+		for(var key in transcludeNode.attributes) {
+			if(excludedAttributes.indexOf(key) === -1) {
+				params.push(transcludeNode.attributes[key].value);
+			}
+		}
+		if(params.length > 0) {
+			result += "|" + params.join("|");
+		}
+	}
+	function handleTiddler(tiddlerNode) {
+		// Check for tiddler attribute
+		if(tree.attributes.tiddler.value) { 
+			result += tree.attributes.tiddler.value;
+		}
+		$tw.utils.each(tree.children, function(child) {
+			if(child.type === "transclude") {
+				handleTransclude(child);
+			}
+		});
+	}
+	if(tree.type === "tiddler") {
+		handleTiddler(tree);
+	} else if(tree.type === "transclude") {
+		handleTransclude(tree);
+	}
+	result += "}}\n\n";
+	return result;
+};
diff --git a/core/modules/parsers/wikiparser/rules/transcludeinline.js b/core/modules/parsers/wikiparser/rules/transcludeinline.js
index 4ae58e617..281021643 100644
--- a/core/modules/parsers/wikiparser/rules/transcludeinline.js
+++ b/core/modules/parsers/wikiparser/rules/transcludeinline.js
@@ -80,3 +80,9 @@ exports.parse = function() {
 		}
 	}
 };
+
+exports.serialize = function(tree,serialize) {
+	var transcludeblock = require("$:/core/modules/parsers/wikiparser/rules/transcludeblock.js");
+	var result = transcludeblock.serialize(tree,serialize);
+	return result.trimEnd();
+};
diff --git a/core/modules/parsers/wikiparser/rules/typedblock.js b/core/modules/parsers/wikiparser/rules/typedblock.js
index 03fdc8e10..6f1552934 100644
--- a/core/modules/parsers/wikiparser/rules/typedblock.js
+++ b/core/modules/parsers/wikiparser/rules/typedblock.js
@@ -60,22 +60,44 @@ exports.parse = function() {
 	var parser = this.parser.wiki.parseText(parseType,text,{defaultType: "text/plain"});
 	// If there's no render type, just return the parse tree
 	if(!renderType) {
-		return parser.tree;
+		return  [{
+			type: "void",
+			children: $tw.utils.isArray(parser.tree) ? parser.tree : [parser.tree],
+			parseType: parseType,
+			renderType: renderType,
+			text: text,
+			start: start,
+			end: this.parser.pos
+		}];
 	} else {
 		// Otherwise, render to the rendertype and return in a <PRE> tag
 		var widgetNode = this.parser.wiki.makeWidget(parser),
 			container = $tw.fakeDocument.createElement("div");
 		widgetNode.render(container,null);
-		text = renderType === "text/html" ? container.innerHTML : container.textContent;
+		var renderResult = renderType === "text/html" ? container.innerHTML : container.textContent;
+		// Use void node to carry important info for typedblock
 		return [{
-			type: "element",
-			tag: "pre",
+			type: "void",
 			children: [{
-				type: "text",
-				text: text,
-				start: start,
-				end: this.parser.pos
-			}]
+				type: "element",
+				tag: "pre",
+				children: [{
+					type: "text",
+					text: renderResult,
+				}]
+			}],
+			parseType: parseType,
+			renderType: renderType,
+			text: text,
+			start: start,
+			end: this.parser.pos
 		}];
 	}
 };
+
+exports.serialize = function (tree,serialize) {
+	if(tree.type === "void") {
+		return "$$$" + tree.parseType + (tree.renderType ? " > " + tree.renderType : "") + "\n" + tree.text + "\n$$$\n\n";
+	}
+	return "";
+};
diff --git a/core/modules/parsers/wikiparser/rules/wikilink.js b/core/modules/parsers/wikiparser/rules/wikilink.js
index d706de8a9..2c176763c 100644
--- a/core/modules/parsers/wikiparser/rules/wikilink.js
+++ b/core/modules/parsers/wikiparser/rules/wikilink.js
@@ -61,3 +61,11 @@ exports.parse = function() {
 		}]
 	}];
 };
+
+exports.serialize = function(tree,serialize) {
+	var isSuppressed = tree.children && tree.children[0].text.substr(0,1) === $tw.config.textPrimitives.unWikiLink;
+
+	var serialized = isSuppressed ? $tw.config.textPrimitives.unWikiLink : "";
+	serialized += tree.attributes ? tree.attributes.to.value : tree.text;
+	return serialized;
+};
diff --git a/core/modules/parsers/wikiparser/rules/wikilinkprefix.js b/core/modules/parsers/wikiparser/rules/wikilinkprefix.js
index c1c5db1f6..30a216e01 100644
--- a/core/modules/parsers/wikiparser/rules/wikilinkprefix.js
+++ b/core/modules/parsers/wikiparser/rules/wikilinkprefix.js
@@ -33,3 +33,9 @@ exports.parse = function() {
 	// Return the link without unwikilink character as plain text
 	return [{type: "text", text: linkText.substr(1)}];
 };
+
+exports.serialize = function(tree,serialize) {
+	var serialized = $tw.config.textPrimitives.unWikiLink;
+	serialized += tree.text;
+	return serialized;
+};
diff --git a/core/modules/parsers/wikiparser/wikiparser.js b/core/modules/parsers/wikiparser/wikiparser.js
index 3d1379fd4..ab4bab11e 100644
--- a/core/modules/parsers/wikiparser/wikiparser.js
+++ b/core/modules/parsers/wikiparser/wikiparser.js
@@ -215,8 +215,8 @@ WikiParser.prototype.parsePragmas = function() {
 		var subTree = nextMatch.rule.parse();
 		if(subTree.length > 0) {
 			// Set the start and end positions of the pragma rule if
-			if (subTree[0].start === undefined) subTree[0].start = start;
-			if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+			if(subTree[0].start === undefined) subTree[0].start = start;
+			if(subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
 			$tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
 			// Quick hack; we only cope with a single parse tree node being returned, which is true at the moment
 			currentTreeBranch.push.apply(currentTreeBranch,subTree);
@@ -245,9 +245,9 @@ WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
 		var start = this.pos;
 		var subTree = nextMatch.rule.parse();
 		// Set the start and end positions of the first and last blocks if they're not already set
-		if (subTree.length > 0) {
-			if (subTree[0].start === undefined) subTree[0].start = start;
-			if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+		if(subTree.length > 0) {
+			if(subTree[0].start === undefined) subTree[0].start = start;
+			if(subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
 		}
 		$tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
 		return subTree;
@@ -256,7 +256,7 @@ WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
 	var start = this.pos;
 	var children = this.parseInlineRun(terminatorRegExp);
 	var end = this.pos;
-	return [{type: "element", tag: "p", children: children, start: start, end: end }];
+	return [{type: "element", tag: "p", children: children, start: start, end: end, rule: "parseblock" }];
 };
 
 /*
@@ -350,10 +350,10 @@ WikiParser.prototype.parseInlineRunUnterminated = function(options) {
 		var start = this.pos;
 		var subTree = nextMatch.rule.parse();
 		// Set the start and end positions of the first and last child if they're not already set
-		if (subTree.length > 0) {
+		if(subTree.length > 0) {
 			// Set the start and end positions of the first and last child if they're not already set
-			if (subTree[0].start === undefined) subTree[0].start = start;
-			if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+			if(subTree[0].start === undefined) subTree[0].start = start;
+			if(subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
 		}
 		$tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
 		tree.push.apply(tree,subTree);
@@ -410,9 +410,9 @@ WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegEx
 			var start = this.pos;
 			var subTree = inlineRuleMatch.rule.parse();
 			// Set the start and end positions of the first and last child if they're not already set
-			if (subTree.length > 0) {
-				if (subTree[0].start === undefined) subTree[0].start = start;
-				if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+			if(subTree.length > 0) {
+				if(subTree[0].start === undefined) subTree[0].start = start;
+				if(subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
 			}
 			$tw.utils.each(subTree, function (node) { node.rule = inlineRuleMatch.rule.name; });
 			tree.push.apply(tree,subTree);
diff --git a/core/modules/utils/parsetree.js b/core/modules/utils/parsetree.js
index 410f92181..17bf068af 100644
--- a/core/modules/utils/parsetree.js
+++ b/core/modules/utils/parsetree.js
@@ -119,3 +119,55 @@ exports.getParseTreeText = function getParseTreeText(tree) {
 	}
 	return output.join("");
 };
+
+exports.getParser = function(type,options) {
+	options = options || {};
+	// Select a parser
+	var Parser = $tw.Wiki.parsers[type];
+	if(!Parser && $tw.utils.getFileExtensionInfo(type)) {
+		Parser = $tw.Wiki.parsers[$tw.utils.getFileExtensionInfo(type).type];
+	}
+	if(!Parser) {
+		Parser = $tw.Wiki.parsers[options.defaultType || "text/vnd.tiddlywiki"];
+	}
+	if(!Parser) {
+		return null;
+	}
+	return Parser;
+};
+
+/*
+Utility to get the (similarly but not 1:1 equal) original wikitext of a parse tree node or array of nodes.
+Based on `node.rule` metadata added in `wikiparser.js`.
+*/
+exports.serializeParseTree = function serializeParseTree(tree,tiddlerType,options) {
+	options = options || {};
+	var output = [];
+	if($tw.utils.isArray(tree)) {
+		$tw.utils.each(tree,function(node) {
+			output.push(serializeParseTree(node,tiddlerType));
+		});
+	} else if(tree) {
+		if(tree.type === "text" && !tree.rule) {
+			output.push(tree.text);
+		} else {
+			var Parser = $tw.utils.getParser(tiddlerType);
+			if(!Parser.prototype.blockRuleClasses && !Parser.prototype.inlineRuleClasses && !Parser.prototype.pragmaRuleClasses) {
+				// Wiki parser initialize blockRuleClasses when first new an instance
+				new Parser(tiddlerType,undefined,{wiki: options.wiki || $tw.wiki});
+			}
+			var Rule = Parser.prototype.blockRuleClasses[tree.rule] ||
+				Parser.prototype.inlineRuleClasses[tree.rule] ||
+				Parser.prototype.pragmaRuleClasses[tree.rule];
+			if(Rule && Rule.prototype.serialize) {
+				output.push(Rule.prototype.serialize(tree,serializeParseTree));
+			} else if(tree.rule === "parseblock") {
+				output.push(serializeParseTree(tree.children,tiddlerType),"\n\n");
+			} else {
+				// when no rule is found, just serialize the children
+				output.push(serializeParseTree(tree.children,tiddlerType));
+			}
+		}
+	}
+	return output.join("");
+};
diff --git a/core/modules/widgets/importvariables.js b/core/modules/widgets/importvariables.js
index befee4a90..597b5bc56 100644
--- a/core/modules/widgets/importvariables.js
+++ b/core/modules/widgets/importvariables.js
@@ -49,7 +49,8 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
 		var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true, configTrimWhiteSpace:false});
 		if(parser) {
 			var parseTreeNode = parser.tree[0];
-			while(parseTreeNode && ["setvariable","set","parameters"].indexOf(parseTreeNode.type) !== -1) {
+			// process AST nodes generated by pragma rules.
+			while(parseTreeNode && ["setvariable","set","parameters","void"].indexOf(parseTreeNode.type) !== -1) {
 				var node = {
 					type: "set",
 					attributes: parseTreeNode.attributes,
@@ -82,7 +83,7 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
 						// this widget. If it needs to refresh,
 						// it'll do so along with the the whole
 						// importvariable tree.
-						if (widgetPointer != this) {
+						if(widgetPointer != this) {
 							widgetPointer.makeChildWidgets = function(){};
 						}
 						widgetPointer = widgetPointer.children[0];
@@ -93,7 +94,7 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
 		} 
 	});
 
-	if (widgetPointer != this) {
+	if(widgetPointer != this) {
 		widgetPointer.parseTreeNode.children = this.parseTreeNode.children;
 	} else {
 		widgetPointer.makeChildWidgets();
diff --git a/core/modules/widgets/void.js b/core/modules/widgets/void.js
new file mode 100755
index 000000000..2f73db513
--- /dev/null
+++ b/core/modules/widgets/void.js
@@ -0,0 +1,49 @@
+/*\
+title: $:/core/modules/widgets/Void.js
+type: application/javascript
+module-type: widget
+
+Void widget that is not intended for render. It still renders all its children.
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var VoidNodeWidget = function(parseTreeNode,options) {
+	this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+VoidNodeWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+VoidNodeWidget.prototype.render = function(parent,nextSibling) {
+	// Nothing to do for a void node, but render the children. Nodes generated by pragma rules are holding everything below it in the children.
+	this.parentDomNode = parent;
+	this.computeAttributes()
+	this.execute();
+	this.renderChildren(parent,nextSibling);
+};
+
+/*
+Compute the internal state of the widget
+*/
+VoidNodeWidget.prototype.execute = function() {
+	// Nothing to do for a void node, but construct the child widgets
+	this.makeChildWidgets();
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+VoidNodeWidget.prototype.refresh = function(changedTiddlers) {
+	return this.refreshChildren(changedTiddlers);
+};
+
+exports.void = VoidNodeWidget;
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 878b34eb2..db1788a72 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -1059,17 +1059,7 @@ Options include:
 exports.parseText = function(type,text,options) {
 	text = text || "";
 	options = options || {};
-	// Select a parser
-	var Parser = $tw.Wiki.parsers[type];
-	if(!Parser && $tw.utils.getFileExtensionInfo(type)) {
-		Parser = $tw.Wiki.parsers[$tw.utils.getFileExtensionInfo(type).type];
-	}
-	if(!Parser) {
-		Parser = $tw.Wiki.parsers[options.defaultType || "text/vnd.tiddlywiki"];
-	}
-	if(!Parser) {
-		return null;
-	}
+	var Parser = $tw.utils.getParser(type,options)
 	// Return the parser instance
 	return new Parser(type,text,{
 		parseAsInline: options.parseAsInline,
@@ -1083,7 +1073,7 @@ exports.parseText = function(type,text,options) {
 Parse a tiddler according to its MIME type
 */
 exports.parseTiddler = function(title,options) {
-	options = $tw.utils.extend({},options);
+	options = options || {};
 	var cacheType = options.parseAsInline ? "inlineParseTree" : "blockParseTree",
 		tiddler = this.getTiddler(title),
 		self = this;
diff --git a/editions/test/tiddlers/tests/data/serialize/Attribute.tid b/editions/test/tiddlers/tests/data/serialize/Attribute.tid
new file mode 100644
index 000000000..3f986784a
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Attribute.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Attribute
+type: text/vnd.tiddlywiki
+
+<$macrocall $name="rpn" a=<<rpn 2 2 *>> b="pi" operation="*" decimals="4"/>
diff --git a/editions/test/tiddlers/tests/data/serialize/BlockRule.tid b/editions/test/tiddlers/tests/data/serialize/BlockRule.tid
new file mode 100644
index 000000000..316f745c6
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/BlockRule.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/BlockRule
+type: text/vnd.tiddlywiki
+
+The speed of sound
+
+The light of speed
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/BoldEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/BoldEmphasis.tid
new file mode 100644
index 000000000..2caac9172
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/BoldEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/BoldEmphasis
+type: text/vnd.tiddlywiki
+
+This is ''bold'' text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/CodeBlock.tid b/editions/test/tiddlers/tests/data/serialize/CodeBlock.tid
new file mode 100644
index 000000000..7a03f3aea
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/CodeBlock.tid
@@ -0,0 +1,17 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/CodeBlock
+type: text/vnd.tiddlywiki
+
+Simple `JS` and complex
+
+---
+
+```js
+var match = reEnd.exec(this.parser.source)
+```
+
+```tid
+<$list filter="[tag[ExampleTag]sort[title]]"/>
+```
+
+end
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/CommentBlock.tid b/editions/test/tiddlers/tests/data/serialize/CommentBlock.tid
new file mode 100644
index 000000000..c90b67c25
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/CommentBlock.tid
@@ -0,0 +1,11 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/CommentBlock
+type: text/vnd.tiddlywiki
+
+<!-- This is a comment -->
+
+Some text
+
+<!-- Another comment -->
+
+More text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/CommentInline.tid b/editions/test/tiddlers/tests/data/serialize/CommentInline.tid
new file mode 100644
index 000000000..2d0e98513
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/CommentInline.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/CommentInline
+type: text/vnd.tiddlywiki
+
+This is some text with an inline comment <!-- This is a comment --> and some more text.
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/Conditional.tid b/editions/test/tiddlers/tests/data/serialize/Conditional.tid
new file mode 100644
index 000000000..4540e6eb4
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Conditional.tid
@@ -0,0 +1,21 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Conditional
+type: text/vnd.tiddlywiki
+
+This is a <%if [{something}] %>Elephant<%elseif [{else}] %>Pelican<%else%>Crocodile<%endif%> <%if [{something}] %>Elephant<%else%>Crocodile<%endif%>
+
+<%if [{$:/info/url/protocol}match[file:]]%>
+  Loaded from a file URI
+<%elseif [{$:/info/url/protocol}match[https:]]%>
+  Loaded from an HTTPS URI
+<%elseif [{$:/info/url/protocol}match[http:]]%>
+  Loaded from an HTTP URI
+<%else%>
+  Loaded from an unknown protocol
+<%endif%>
+
+Plain text in next paragraph.
+
+<%if [{$:/info/url/protocol}match[file:]]%>
+  Hidden.
+<%endif%>
diff --git a/editions/test/tiddlers/tests/data/serialize/Dash.tid b/editions/test/tiddlers/tests/data/serialize/Dash.tid
new file mode 100644
index 000000000..b0a7ddc55
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Dash.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Dash
+type: text/vnd.tiddlywiki
+
+This is an en-dash: --
+
+This is an em-dash: ---
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/Entity.tid b/editions/test/tiddlers/tests/data/serialize/Entity.tid
new file mode 100644
index 000000000..d8891e4ed
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Entity.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Entity
+type: text/vnd.tiddlywiki
+
+This is a copyright symbol: &copy;
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/ExtLink.tid b/editions/test/tiddlers/tests/data/serialize/ExtLink.tid
new file mode 100644
index 000000000..de966452f
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/ExtLink.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/ExtLink
+type: text/vnd.tiddlywiki
+
+An external link: https://www.tiddlywiki.com/
+
+A suppressed external link: ~http://www.tiddlyspace.com/
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeBlock.tid b/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeBlock.tid
new file mode 100644
index 000000000..b1c526d9d
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeBlock.tid
@@ -0,0 +1,13 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/FilteredTranscludeBlock
+type: text/vnd.tiddlywiki
+
+{{{ [tag[docs]] }}}
+
+{{{ [tag[docs]] |tooltip}}}
+
+{{{ [tag[docs]] ||TemplateTitle}}}
+
+{{{ [tag[docs]] |tooltip||TemplateTitle}}}
+
+{{{ [tag[docs]] }}width:40;height:50;}.class.class
diff --git a/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeInline.tid b/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeInline.tid
new file mode 100644
index 000000000..8b3155882
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeInline.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/FilteredTranscludeInline
+type: text/vnd.tiddlywiki
+
+{{{ [tag[docs]] }}} {{{ [tag[docs]] |tooltip}}} {{{ [tag[docs]] ||TemplateTitle}}} {{{ [tag[docs]] |tooltip||TemplateTitle}}} {{{ [tag[docs]] }}width:40;height:50;}.class.class
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/FunctionDefinition.tid b/editions/test/tiddlers/tests/data/serialize/FunctionDefinition.tid
new file mode 100644
index 000000000..3585564a9
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/FunctionDefinition.tid
@@ -0,0 +1,15 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/FunctionDefinition
+type: text/vnd.tiddlywiki
+
+\function name(param:"defaultvalue", param2:"defaultvalue")
+definition text
+\end
+
+\procedure name(param:"defaultvalue", param2:"defaultvalue")
+definition text
+\end
+
+\widget $mywidget(param:"defaultvalue", param2:"defaultvalue")
+definition text
+\end
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/HardLineBreaks.tid b/editions/test/tiddlers/tests/data/serialize/HardLineBreaks.tid
new file mode 100644
index 000000000..b6ea0b985
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/HardLineBreaks.tid
@@ -0,0 +1,12 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/HardLineBreaks
+type: text/vnd.tiddlywiki
+
+"""
+This is some text
+That is set like
+It is a Poem
+When it is
+Clearly
+Not
+"""
diff --git a/editions/test/tiddlers/tests/data/serialize/Heading.tid b/editions/test/tiddlers/tests/data/serialize/Heading.tid
new file mode 100644
index 000000000..34152e50a
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Heading.tid
@@ -0,0 +1,29 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Heading
+type: text/vnd.tiddlywiki
+
+! Heading 1
+
+!! Heading 2
+
+!!! Heading 3
+
+!!!! Heading 4
+
+!!!!! Heading 5
+
+!!!!!! Heading 6
+
+! AAA
+
+!! AAA
+
+!!! AAA
+
+!!!! AAA
+
+!!!!! AAA
+
+!!!!!! AAA
+
+AAA
diff --git a/editions/test/tiddlers/tests/data/serialize/Html.tid b/editions/test/tiddlers/tests/data/serialize/Html.tid
new file mode 100644
index 000000000..76b86d570
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Html.tid
@@ -0,0 +1,15 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Html
+type: text/vnd.tiddlywiki
+
+<aside>
+This is an HTML5 aside element
+</aside>
+
+<$slider target="MyTiddler">
+This is a widget invocation
+</$slider>
+
+<$list filter="[tag[ExampleTag]sort[title]]"/>
+
+Plain text in next paragraph.
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/Image.tid b/editions/test/tiddlers/tests/data/serialize/Image.tid
new file mode 100644
index 000000000..8641df4cb
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Image.tid
@@ -0,0 +1,10 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Image
+type: text/vnd.tiddlywiki
+
+[img[https://tiddlywiki.com/fractalveg.jpg]]
+[img width="23" height="24" [https://tiddlywiki.com/fractalveg.jpg]]
+[img width={{!!width}} height={{!!height}} [https://tiddlywiki.com/fractalveg.jpg]]
+[img[Description of image|https://tiddlywiki.com/fractalveg.jpg]]
+[img[TiddlerTitle]]
+[img[Description of image|TiddlerTitle]]
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/Import.tid b/editions/test/tiddlers/tests/data/serialize/Import.tid
new file mode 100644
index 000000000..e467de534
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Import.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Import
+type: text/vnd.tiddlywiki
+
+\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [[$:/core/ui/PageMacros]]
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/ItalicEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/ItalicEmphasis.tid
new file mode 100644
index 000000000..a06ca62ce
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/ItalicEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/ItalicEmphasis
+type: text/vnd.tiddlywiki
+
+This is //italic// text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/List.tid b/editions/test/tiddlers/tests/data/serialize/List.tid
new file mode 100644
index 000000000..d25397799
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/List.tid
@@ -0,0 +1,40 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/List
+type: text/vnd.tiddlywiki
+
+* This is an unordered list
+* It has two items
+
+# This is a numbered list
+## With a subitem
+# And a third item
+
+; This is a term that is being defined
+: This is the definition of that term
+
+#** One
+#* Two
+#** Three
+#**** Four
+#**# Five
+#**## Six
+## Seven
+### Eight
+## Nine
+
+* List item one
+*.active List item two has the class `active`
+* List item three
+
+# AAA
+## [[BBB]]
+### CCC
+# AAA
+## CCC
+## DDD
+## EEE
+# BBB
+## FF `/` FFF
+## FFF
+## GGG
+## 
diff --git a/editions/test/tiddlers/tests/data/serialize/MacroCallBlock.tid b/editions/test/tiddlers/tests/data/serialize/MacroCallBlock.tid
new file mode 100644
index 000000000..4bd30d451
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/MacroCallBlock.tid
@@ -0,0 +1,9 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/MacroCallBlock
+type: text/vnd.tiddlywiki
+
+<<name "value" "value2">>
+
+<<.def "macro calls">>
+
+<<alert "primary" "primary alert" width:"60%">>
diff --git a/editions/test/tiddlers/tests/data/serialize/MacroCallInline.tid b/editions/test/tiddlers/tests/data/serialize/MacroCallInline.tid
new file mode 100644
index 000000000..09127dce0
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/MacroCallInline.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/MacroCallInline
+type: text/vnd.tiddlywiki
+
+These are macro calls in a line: <<name "value" "value2">> and <<.def "macro calls">> <<alert "primary" "primary alert" width:"60%">>
diff --git a/editions/test/tiddlers/tests/data/serialize/MacroDef.tid b/editions/test/tiddlers/tests/data/serialize/MacroDef.tid
new file mode 100644
index 000000000..132ee7053
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/MacroDef.tid
@@ -0,0 +1,9 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/MacroDef
+type: text/vnd.tiddlywiki
+
+\define name(param:defaultvalue,param2:defaultvalue)
+definition text, including $param$ markers
+\end
+
+\define lingo-base() $:/language/ControlPanel/Basics/
diff --git a/editions/test/tiddlers/tests/data/serialize/Parameters.tid b/editions/test/tiddlers/tests/data/serialize/Parameters.tid
new file mode 100644
index 000000000..5b107a73d
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Parameters.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Parameters
+type: text/vnd.tiddlywiki
+
+\parameters(param:defaultvalue,param2:defaultvalue)
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/ParserMode.tid b/editions/test/tiddlers/tests/data/serialize/ParserMode.tid
new file mode 100644
index 000000000..b4c31b66b
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/ParserMode.tid
@@ -0,0 +1,9 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/ParserMode
+type: text/vnd.tiddlywiki
+
+\parsermode block
+
+\parsermode inline
+
+Test.
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/PrettyExtLink.tid b/editions/test/tiddlers/tests/data/serialize/PrettyExtLink.tid
new file mode 100644
index 000000000..1b4002b94
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/PrettyExtLink.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/PrettyExtLink
+type: text/vnd.tiddlywiki
+
+[ext[https://tiddlywiki.com/fractalveg.jpg]]
+[ext[Tooltip|https://tiddlywiki.com/fractalveg.jpg]]
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/PrettyLink.tid b/editions/test/tiddlers/tests/data/serialize/PrettyLink.tid
new file mode 100644
index 000000000..8c7afbc7f
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/PrettyLink.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/PrettyLink
+type: text/vnd.tiddlywiki
+
+[[Introduction]]
+[[Link description|TiddlerTitle]]
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/QuoteBlock.tid b/editions/test/tiddlers/tests/data/serialize/QuoteBlock.tid
new file mode 100644
index 000000000..a2f698846
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/QuoteBlock.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/QuoteBlock
+type: text/vnd.tiddlywiki
+
+<<<tc-quote
+Quote text
+<<<
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/RulesPragma.tid b/editions/test/tiddlers/tests/data/serialize/RulesPragma.tid
new file mode 100644
index 000000000..c3e79f5ea
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/RulesPragma.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/RulesPragma
+type: text/vnd.tiddlywiki
+
+\rules except ruleone ruletwo rulethree
+\rules only ruleone ruletwo rulethree
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/SimpleText.tid b/editions/test/tiddlers/tests/data/serialize/SimpleText.tid
new file mode 100644
index 000000000..c05b5044d
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/SimpleText.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/SimpleText
+type: text/vnd.tiddlywiki
+
+The quick brown fox
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/SoftLineBreak.tid b/editions/test/tiddlers/tests/data/serialize/SoftLineBreak.tid
new file mode 100644
index 000000000..e22202549
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/SoftLineBreak.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/SoftLineBreak
+type: text/vnd.tiddlywiki
+
+The rain in Spain
+falls mainly on the plain
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/StrikethroughEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/StrikethroughEmphasis.tid
new file mode 100644
index 000000000..5ca1b1d2e
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/StrikethroughEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/StrikethroughEmphasis
+type: text/vnd.tiddlywiki
+
+This is ~~strikethrough~~ text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/StyleBlock.tid b/editions/test/tiddlers/tests/data/serialize/StyleBlock.tid
new file mode 100644
index 000000000..4d0ac83b6
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/StyleBlock.tid
@@ -0,0 +1,17 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/StyleBlock
+type: text/vnd.tiddlywiki
+
+@@background-color:red;
+@@.myClass
+This paragraph will have the CSS class `myClass`.
+
+* The `<ul>` around this list will also have the class `myClass`
+* List item 2
+@@
+
+@@font-size:1.5em;
+@@.coloured-text.coloured-bg
+* Block content
+* With custom style and classes
+@@
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/StyleBlock2.tid b/editions/test/tiddlers/tests/data/serialize/StyleBlock2.tid
new file mode 100644
index 000000000..cdd31254e
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/StyleBlock2.tid
@@ -0,0 +1,13 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/StyleBlock2
+type: text/vnd.tiddlywiki
+
+@@width:100px;
+@@.myFirstClass.mySecondClass.myThirdClass
+This is a paragraph
+@@
+
+@@background-color:lightcyan;
+* Item one
+* Item two
+@@
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/StyleInline.tid b/editions/test/tiddlers/tests/data/serialize/StyleInline.tid
new file mode 100644
index 000000000..c491767f5
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/StyleInline.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/StyleInline
+type: text/vnd.tiddlywiki
+
+@@.myClass This is some text with a class@@
+@@background-color:red; This is some text with a background colour@@
+@@width:100px;.myClass This is some text with a class and a width@@
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/SubscriptEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/SubscriptEmphasis.tid
new file mode 100644
index 000000000..b39d7f6d5
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/SubscriptEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/SubscriptEmphasis
+type: text/vnd.tiddlywiki
+
+This is ,,subscript,, text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/SuperscriptEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/SuperscriptEmphasis.tid
new file mode 100644
index 000000000..9683f9e54
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/SuperscriptEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/SuperscriptEmphasis
+type: text/vnd.tiddlywiki
+
+This is ^^superscript^^ text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/SysLink.tid b/editions/test/tiddlers/tests/data/serialize/SysLink.tid
new file mode 100644
index 000000000..fdbc982fe
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/SysLink.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/SysLink
+type: text/vnd.tiddlywiki
+
+$:TiddlerTitle
+~$:TiddlerTitle
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/Table.tid b/editions/test/tiddlers/tests/data/serialize/Table.tid
new file mode 100644
index 000000000..bd92db4bc
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Table.tid
@@ -0,0 +1,11 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Table
+type: text/vnd.tiddlywiki
+
+|!|!Alpha|!Beta|!Gamma|!Delta|
+|!One|||||
+|!Two|||||
+|!Three|||||
+
+|cell one|cell two|
+|cell three|cell four|
diff --git a/editions/test/tiddlers/tests/data/serialize/TranscludeBlock.tid b/editions/test/tiddlers/tests/data/serialize/TranscludeBlock.tid
new file mode 100644
index 000000000..344171af0
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/TranscludeBlock.tid
@@ -0,0 +1,21 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/TranscludeBlock
+type: text/vnd.tiddlywiki
+
+{{MyTiddler}}
+
+{{MyTiddler||TemplateTitle}}
+
+{{||TemplateTitle}}
+
+{{MyTiddler|Parameter}}
+
+{{MyTiddler||TemplateTitle|Parameter|SecondParameter}}
+
+{{MyTiddler!!field}}
+
+{{!!field}}
+
+{{MyTiddler##index}}
+
+{{##index}}
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/TranscludeInline.tid b/editions/test/tiddlers/tests/data/serialize/TranscludeInline.tid
new file mode 100644
index 000000000..df20658cf
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/TranscludeInline.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/TranscludeInline
+type: text/vnd.tiddlywiki
+
+{{MyTiddler}} {{MyTiddler||TemplateTitle}}
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/TypedBlock1.tid b/editions/test/tiddlers/tests/data/serialize/TypedBlock1.tid
new file mode 100644
index 000000000..06362d062
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/TypedBlock1.tid
@@ -0,0 +1,15 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/TypedBlock1
+type: text/vnd.tiddlywiki
+
+$$$text/vnd.tiddlywiki > text/plain
+This is ''some'' wikitext
+$$$
+
+$$$text/unknown
+Some plain text, which will not be //formatted//.
+
+$$$text/vnd.tiddlywiki > text/html
+This is ''some'' wikitext
+$$$
+
diff --git a/editions/test/tiddlers/tests/data/serialize/TypedBlock2.tid b/editions/test/tiddlers/tests/data/serialize/TypedBlock2.tid
new file mode 100644
index 000000000..082ca533a
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/TypedBlock2.tid
@@ -0,0 +1,19 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/TypedBlock2
+type: text/vnd.tiddlywiki
+
+$$$.js
+This will be rendered as JavaScript
+$$$
+
+$$$.svg
+<svg xmlns="http://www.w3.org/2000/svg" width="150" height="100">
+  <circle cx="100" cy="50" r="40" stroke="black" stroke-width="2" fill="red" />
+</svg>
+$$$
+
+$$$image/svg+xml
+<svg xmlns="http://www.w3.org/2000/svg" width="150" height="100">
+  <circle cx="100" cy="50" r="40" stroke="black" stroke-width="2" fill="green" />
+</svg>
+$$$
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/UnderscoreEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/UnderscoreEmphasis.tid
new file mode 100644
index 000000000..73dc6425c
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/UnderscoreEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/UnderscoreEmphasis
+type: text/vnd.tiddlywiki
+
+This is __underscore__ text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/WikiLink.tid b/editions/test/tiddlers/tests/data/serialize/WikiLink.tid
new file mode 100644
index 000000000..18b04caf1
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/WikiLink.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/WikiLink
+type: text/vnd.tiddlywiki
+
+AWikiLink
+AnotherLink
+~SuppressedLink
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/WikiLinkPrefix.tid b/editions/test/tiddlers/tests/data/serialize/WikiLinkPrefix.tid
new file mode 100644
index 000000000..982ed9071
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/WikiLinkPrefix.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/WikiLinkPrefix
+type: text/vnd.tiddlywiki
+
+~SuppressedLink
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid
index 916e2abfb..fc0d785f8 100644
--- a/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid
@@ -26,4 +26,4 @@ title: TiddlerOne
 +
 title: ExpectedResult
 
-<p>[{"type":"element","tag":"p","children":[{"type":"text","text":"This is a block","start":68,"end":83}],"start":68,"end":83}]</p><p>[{"type":"text","text":"This is inline","start":136,"end":152}]</p>
\ No newline at end of file
+<p>[{"type":"element","tag":"p","children":[{"type":"text","text":"This is a block","start":68,"end":83}],"start":68,"end":83,"rule":"parseblock"}]</p><p>[{"type":"text","text":"This is inline","start":136,"end":152}]</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/test-html-parser.js b/editions/test/tiddlers/tests/test-html-parser.js
index 9fc108235..c6c160bb3 100644
--- a/editions/test/tiddlers/tests/test-html-parser.js
+++ b/editions/test/tiddlers/tests/test-html-parser.js
@@ -24,7 +24,7 @@ describe("HTML tag new parser tests", function() {
 			null
 		);
 		expect($tw.utils.parseWhiteSpace("p  ",1)).toEqual(
-			{ type : 'whitespace', start : 1, end : 3 }
+			{ type : "whitespace", start : 1, end : 3 }
 		);
 	});
 
@@ -33,7 +33,7 @@ describe("HTML tag new parser tests", function() {
 			null
 		);
 		expect($tw.utils.parseTokenString("p=  ",1,"=")).toEqual(
-			{ type : 'token', value : '=', start : 1, end : 2 }
+			{ type : "token", value : "=", start : 1, end : 2 }
 		);
 	});
 
@@ -42,10 +42,10 @@ describe("HTML tag new parser tests", function() {
 			null
 		);
 		expect($tw.utils.parseTokenRegExp("p='  ",1,/(=(?:'|"))/g).match[0]).toEqual(
-			'=\''
+			"='"
 		);
 		expect($tw.utils.parseTokenRegExp("p=blah  ",2,/([^\s>]+)/g).match[0]).toEqual(
-			'blah'
+			"blah"
 		);
 	});
 
@@ -54,40 +54,40 @@ describe("HTML tag new parser tests", function() {
 			null
 		);
 		expect($tw.utils.parseStringLiteral("p='blah'  ",2)).toEqual(
-			{ type : 'string', start : 2, value : 'blah', end : 8 }
+			{ type : "string", start : 2, value : "blah", end : 8 }
 		);
 		expect($tw.utils.parseStringLiteral("p=''  ",2)).toEqual(
-			{ type : 'string', start : 2, value : '', end : 4 }
+			{ type : "string", start : 2, value : "", end : 4 }
 		);
 		expect($tw.utils.parseStringLiteral("p=\"blah'  ",2)).toEqual(
 			null
 		);
 		expect($tw.utils.parseStringLiteral("p=\"\"  ",2)).toEqual(
-			{ type : 'string', start : 2, value : '', end : 4 }
+			{ type : "string", start : 2, value : "", end : 4 }
 		);
 	});
 
 	it("should parse macro parameters", function() {
 		expect($tw.utils.parseMacroParameter("me",0)).toEqual(
-			{ type : 'macro-parameter', start : 0, value : 'me', end : 2 }
+			{ type : "macro-parameter", start : 0, value : "me", end : 2 }
 		);
 		expect($tw.utils.parseMacroParameter("me:one",0)).toEqual(
-			{ type : 'macro-parameter', start : 0, value : 'one', name : 'me', end : 6 }
+			{ type : "macro-parameter", start : 0, value : "one", name : "me", end : 6 }
 		);
 		expect($tw.utils.parseMacroParameter("me:'one two three'",0)).toEqual(
-			{ type : 'macro-parameter', start : 0, value : 'one two three', name : 'me', end : 18 }
+			{ type : "macro-parameter", start : 0, value : "one two three", name : "me", end : 18 }
 		);
 		expect($tw.utils.parseMacroParameter("'one two three'",0)).toEqual(
-			{ type : 'macro-parameter', start : 0, value : 'one two three', end : 15 }
+			{ type : "macro-parameter", start : 0, value : "one two three", end : 15 }
 		);
 		expect($tw.utils.parseMacroParameter("me:[[one two three]]",0)).toEqual(
-			{ type : 'macro-parameter', start : 0, value : 'one two three', name : 'me', end : 20 }
+			{ type : "macro-parameter", start : 0, value : "one two three", name : "me", end : 20 }
 		);
 		expect($tw.utils.parseMacroParameter("[[one two three]]",0)).toEqual(
-			{ type : 'macro-parameter', start : 0, value : 'one two three', end : 17 }
+			{ type : "macro-parameter", start : 0, value : "one two three", end : 17 }
 		);
 		expect($tw.utils.parseMacroParameter("myparam>",0)).toEqual(
-			{ type : 'macro-parameter', start : 0, value : 'myparam>', end : 8 }
+			{ type : "macro-parameter", start : 0, value : "myparam>", end : 8 }
 		);
 	});
 
@@ -96,22 +96,22 @@ describe("HTML tag new parser tests", function() {
 			null
 		);
 		expect($tw.utils.parseMacroInvocation("<<mymacro>>",0)).toEqual(
-			{ type : 'macrocall', start : 0, params : [  ], name : 'mymacro', end : 11 }
+			{ type : "macrocall", start : 0, params : [  ], name : "mymacro", end : 11 }
 		);
 		expect($tw.utils.parseMacroInvocation("<<mymacro one two three>>",0)).toEqual(
-			{ type : 'macrocall', start : 0, params : [ { type : 'macro-parameter', start : 9, value : 'one', end : 13 }, { type : 'macro-parameter', start : 13, value : 'two', end : 17 }, { type : 'macro-parameter', start : 17, value : 'three', end : 23 } ], name : 'mymacro', end : 25 }
+			{ type : "macrocall", start : 0, params : [ { type : "macro-parameter", start : 9, value : "one", end : 13 }, { type : "macro-parameter", start : 13, value : "two", end : 17 }, { type : "macro-parameter", start : 17, value : "three", end : 23 } ], name : "mymacro", end : 25 }
 		);
 		expect($tw.utils.parseMacroInvocation("<<mymacro p:one q:two three>>",0)).toEqual(
-			{ type : 'macrocall', start : 0, params : [ { type : 'macro-parameter', start : 9, value : 'one', name : 'p', end : 15 }, { type : 'macro-parameter', start : 15, value : 'two', name : 'q', end : 21 }, { type : 'macro-parameter', start : 21, value : 'three', end : 27 } ], name : 'mymacro', end : 29 }
+			{ type : "macrocall", start : 0, params : [ { type : "macro-parameter", start : 9, value : "one", name : "p", end : 15 }, { type : "macro-parameter", start : 15, value : "two", name : "q", end : 21 }, { type : "macro-parameter", start : 21, value : "three", end : 27 } ], name : "mymacro", end : 29 }
 		);
 		expect($tw.utils.parseMacroInvocation("<<mymacro 'one two three'>>",0)).toEqual(
-			{ type : 'macrocall', start : 0, params : [ { type : 'macro-parameter', start : 9, value : 'one two three', end : 25 } ], name : 'mymacro', end : 27 } 
+			{ type : "macrocall", start : 0, params : [ { type : "macro-parameter", start : 9, value : "one two three", end : 25 } ], name : "mymacro", end : 27 } 
 		);
 		expect($tw.utils.parseMacroInvocation("<<mymacro r:'one two three'>>",0)).toEqual(
-			{ type : 'macrocall', start : 0, params : [ { type : 'macro-parameter', start : 9, value : 'one two three', name : 'r', end : 27 } ], name : 'mymacro', end : 29 } 
+			{ type : "macrocall", start : 0, params : [ { type : "macro-parameter", start : 9, value : "one two three", name : "r", end : 27 } ], name : "mymacro", end : 29 } 
 		);
 		expect($tw.utils.parseMacroInvocation("<<myMacro one:two three:'four and five'>>",0)).toEqual(
-			{ type : 'macrocall', start : 0, params : [ { type : 'macro-parameter', start : 9, value : 'two', name : 'one', end : 17 }, { type : 'macro-parameter', start : 17, value : 'four and five', name : 'three', end : 39 } ], name : 'myMacro', end : 41 } 
+			{ type : "macrocall", start : 0, params : [ { type : "macro-parameter", start : 9, value : "two", name : "one", end : 17 }, { type : "macro-parameter", start : 17, value : "four and five", name : "three", end : 39 } ], name : "myMacro", end : 41 } 
 		);
 	});
 
@@ -120,56 +120,87 @@ describe("HTML tag new parser tests", function() {
 			null
 		);
 		expect($tw.utils.parseAttribute("p='blah'  ",0)).toEqual(
-			{ type : 'string', start : 0, name : 'p', value : 'blah', end : 8 }
+			{ type : "string", start : 0, name : "p", value : "blah", end : 8 }
 		);
 		expect($tw.utils.parseAttribute("p=\"blah\"  ",0)).toEqual(
-			{ type : 'string', start : 0, name : 'p', value : 'blah', end : 8 }
+			{ type : "string", start : 0, name : "p", value : "blah", end : 8 }
 		);
 		expect($tw.utils.parseAttribute("p=\"bl\nah\"  ",0)).toEqual(
-			{ type : 'string', start : 0, name : 'p', value : 'bl\nah', end : 9 }
+			{ type : "string", start : 0, name : "p", value : "bl\nah", end : 9 }
 		);
 		expect($tw.utils.parseAttribute("p={{{blah}}}  ",0)).toEqual(
-			{ type : 'filtered', start : 0, name : 'p', filter : 'blah', end : 12 }
+			{ type : "filtered", start : 0, name : "p", filter : "blah", end : 12 }
 		);
 		expect($tw.utils.parseAttribute("p={{{bl\nah}}}  ",0)).toEqual(
-			{ type : 'filtered', start : 0, name : 'p', filter : 'bl\nah', end : 13 }
+			{ type : "filtered", start : 0, name : "p", filter : "bl\nah", end : 13 }
 		);
 		expect($tw.utils.parseAttribute("p={{{ [{$:/layout}] }}}  ",0)).toEqual(
-			{ type : 'filtered', start : 0, name : 'p', filter : ' [{$:/layout}] ', end : 23 }
+			{ type : "filtered", start : 0, name : "p", filter : " [{$:/layout}] ", end : 23 }
 		);
 		expect($tw.utils.parseAttribute("p={{blah}}  ",0)).toEqual(
-			{ type : 'indirect', start : 0, name : 'p', textReference : 'blah', end : 10 }
+			{ type : "indirect", start : 0, name : "p", textReference : "blah", end : 10 }
 		);
 		expect($tw.utils.parseAttribute("p=blah  ",0)).toEqual(
-			{ type : 'string', start : 0, name : 'p', value : 'blah', end : 6 }
+			{ type : "string", start : 0, name : "p", value : "blah", end : 6 }
 		);
 		expect($tw.utils.parseAttribute("p =blah  ",0)).toEqual(
-			{ type : 'string', start : 0, name : 'p', value : 'blah', end : 7 }
+			{ type : "string", start : 0, name : "p", value : "blah", end : 7 }
 		);
 		expect($tw.utils.parseAttribute("p= blah  ",0)).toEqual(
-			{ type : 'string', start : 0, name : 'p', value : 'blah', end : 7 }
+			{ type : "string", start : 0, name : "p", value : "blah", end : 7 }
 		);
 		expect($tw.utils.parseAttribute("p = blah  ",0)).toEqual(
-			{ type : 'string', start : 0, name : 'p', value : 'blah', end : 8 }
+			{ type : "string", start : 0, name : "p", value : "blah", end : 8 }
 		);
 		expect($tw.utils.parseAttribute("p = >blah  ",0)).toEqual(
-			{ type : 'string', value : 'true', start : 0, name : 'p', end : 4 }
+			{ type : "string", value : "true", start : 0, name : "p", end : 4 }
 		);
 		expect($tw.utils.parseAttribute(" attrib1>",0)).toEqual(
-			{ type : 'string', value : 'true', start : 0, name : 'attrib1', end : 8 }
+			{ type : "string", value : "true", start : 0, name : "attrib1", end : 8 }
 		);
 		expect($tw.utils.parseAttribute("p=`blah` ",1)).toEqual(null);
 		expect($tw.utils.parseAttribute("p=`blah` ",0)).toEqual(
-			{ start: 0, name: 'p', type: 'substituted', rawValue: 'blah', end: 8 }
+			{ start: 0, name: "p", type: "substituted", rawValue: "blah", end: 8 }
 		);
 		expect($tw.utils.parseAttribute("p=```blah``` ",0)).toEqual(
-			{ start: 0, name: 'p', type: 'substituted', rawValue: 'blah', end: 12 }
+			{ start: 0, name: "p", type: "substituted", rawValue: "blah", end: 12 }
 		);
 		expect($tw.utils.parseAttribute("p=`Hello \"There\"`",0)).toEqual(
-			{ start: 0, name: 'p', type: 'substituted', rawValue: 'Hello "There"', end: 17 }
+			{ start: 0, name: "p", type: "substituted", rawValue: 'Hello "There"', end: 17 }
 		);
 	});
 
+	
+	describe("serializeAttribute", function () {
+		it("should serialize string attributes", function () {
+			expect($tw.utils.serializeAttribute({ type: "string", name: "p", value: "blah" })).toBe('p="blah"');
+			expect($tw.utils.serializeAttribute({ type: "string", name: "p", value: "true" })).toBe("p");
+		});
+
+		it("should serialize filtered attributes", function () {
+			expect($tw.utils.serializeAttribute({ type: "filtered", name: "p", filter: "blah" })).toBe("p={{{blah}}}");
+		});
+
+		it("should serialize indirect attributes", function () {
+			expect($tw.utils.serializeAttribute({ type: "indirect", name: "p", textReference: "blah" })).toBe("p={{blah}}");
+		});
+
+		it("should serialize substituted attributes", function () {
+			expect($tw.utils.serializeAttribute({ type: "substituted", name: "p", rawValue: "blah" })).toBe("p=`blah`");
+		});
+
+		it("should return null for unsupported types", function () {
+			expect($tw.utils.serializeAttribute({ type: "unknown", name: "p", value: "blah" })).toBeNull();
+		});
+
+		it("should return null for invalid input", function () {
+			expect($tw.utils.serializeAttribute(null)).toBeNull();
+			expect($tw.utils.serializeAttribute({})).toBeNull();
+			expect($tw.utils.serializeAttribute({ type: "string" })).toBeNull();
+			expect($tw.utils.serializeAttribute({ name: "p" })).toBeNull();
+		});
+	});
+
 	it("should parse HTML tags", function() {
 		expect(parser.parseTag("<mytag>",1)).toEqual(
 			null
@@ -178,52 +209,52 @@ describe("HTML tag new parser tests", function() {
 			null
 		);
 		expect(parser.parseTag("<mytag>",0)).toEqual(
-			{ type : 'element', start : 0, attributes : { }, orderedAttributes: [ ], tag : 'mytag', end : 7 }
+			{ type : "element", start : 0, attributes : { }, orderedAttributes: [ ], tag : "mytag", end : 7 }
 		);
 		expect(parser.parseTag("<mytag attrib1>",0)).toEqual(
-			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', value : 'true', start : 6, name : 'attrib1', end : 14 } }, orderedAttributes: [ { start: 6, name: 'attrib1', type: 'string', value: 'true', end: 14 } ], tag : 'mytag', end : 15 }
+			{ type : "element", start : 0, attributes : { attrib1 : { type : "string", value : "true", start : 6, name : "attrib1", end : 14 } }, orderedAttributes: [ { start: 6, name: "attrib1", type: "string", value: "true", end: 14 } ], tag : "mytag", end : 15 }
 		);
 		expect(parser.parseTag("<mytag attrib1/>",0)).toEqual(
-			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', value : 'true', start : 6, name : 'attrib1', end : 14 } }, orderedAttributes: [ { start: 6, name: 'attrib1', type: 'string', value: 'true', end: 14 } ], tag : 'mytag', isSelfClosing : true, end : 16 }
+			{ type : "element", start : 0, attributes : { attrib1 : { type : "string", value : "true", start : 6, name : "attrib1", end : 14 } }, orderedAttributes: [ { start: 6, name: "attrib1", type: "string", value: "true", end: 14 } ], tag : "mytag", isSelfClosing : true, end : 16 }
 		);
 		expect(parser.parseTag("<$view field=\"title\" format=\"link\"/>",0)).toEqual(
-			{ type : 'view', start : 0, attributes : { field : { start : 6, name : 'field', type : 'string', value : 'title', end : 20 }, format : { start : 20, name : 'format', type : 'string', value : 'link', end : 34 } }, orderedAttributes: [ { start: 6, name: 'field', type: 'string', value: 'title', end: 20 }, { start: 20, name: 'format', type: 'string', value: 'link', end: 34 } ], tag : '$view', isSelfClosing : true, end : 36 }
+			{ type : "view", start : 0, attributes : { field : { start : 6, name : "field", type : "string", value : "title", end : 20 }, format : { start : 20, name : "format", type : "string", value : "link", end : 34 } }, orderedAttributes: [ { start: 6, name: "field", type: "string", value: "title", end: 20 }, { start: 20, name: "format", type: "string", value: "link", end: 34 } ], tag : "$view", isSelfClosing : true, end : 36 }
 		);
 		expect(parser.parseTag("<mytag attrib1='something'>",0)).toEqual(
-			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', start : 6, name : 'attrib1', value : 'something', end : 26 } }, orderedAttributes: [ { start: 6, name: 'attrib1', type: 'string', value: 'something', end: 26 } ], tag : 'mytag', end : 27 }
+			{ type : "element", start : 0, attributes : { attrib1 : { type : "string", start : 6, name : "attrib1", value : "something", end : 26 } }, orderedAttributes: [ { start: 6, name: "attrib1", type: "string", value: "something", end: 26 } ], tag : "mytag", end : 27 }
 		);
 		expect(parser.parseTag("<mytag attrib1 attrib1='something'>",0)).toEqual(
-			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', start : 15, name : 'attrib1', value : 'something', end : 34 } }, orderedAttributes: [ { start: 6, name: 'attrib1', type: 'string', value: 'true', end: 15 }, { start: 15, name: 'attrib1', type: 'string', value: 'something', end: 34 } ], tag : 'mytag', end : 35 }
+			{ type : "element", start : 0, attributes : { attrib1 : { type : "string", start : 15, name : "attrib1", value : "something", end : 34 } }, orderedAttributes: [ { start: 6, name: "attrib1", type: "string", value: "true", end: 15 }, { start: 15, name: "attrib1", type: "string", value: "something", end: 34 } ], tag : "mytag", end : 35 }
 		);
 		expect(parser.parseTag("<mytag attrib1 attrib1='something' attrib1='else'>",0)).toEqual(
-			{ type : 'element', start : 0, attributes : { attrib1 : { type : 'string', start : 34, name : 'attrib1', value : 'else', end : 49 } }, orderedAttributes: [ { start: 6, name: 'attrib1', type: 'string', value: 'true', end: 15 }, { start: 15, name: 'attrib1', type: 'string', value: 'something', end: 34 }, { start: 34, name: 'attrib1', type: 'string', value: 'else', end: 49 } ], tag : 'mytag', end : 50 }
+			{ type : "element", start : 0, attributes : { attrib1 : { type : "string", start : 34, name : "attrib1", value : "else", end : 49 } }, orderedAttributes: [ { start: 6, name: "attrib1", type: "string", value: "true", end: 15 }, { start: 15, name: "attrib1", type: "string", value: "something", end: 34 }, { start: 34, name: "attrib1", type: "string", value: "else", end: 49 } ], tag : "mytag", end : 50 }
 		);
 		expect(parser.parseTag("<$mytag attrib1='something' attrib2=else thing>",0)).toEqual(
-			{ type : 'mytag', start : 0, attributes : { attrib1 : { type : 'string', start : 7, name : 'attrib1', value : 'something', end : 27 }, attrib2 : { type : 'string', start : 27, name : 'attrib2', value : 'else', end : 40 }, thing : { type : 'string', start : 40, name : 'thing', value : 'true', end : 46 } }, orderedAttributes: [ { start: 7, name: 'attrib1', type: 'string', value: 'something', end: 27 }, { start: 27, name: 'attrib2', type: 'string', value: 'else', end: 40 }, { start: 40, name: 'thing', type: 'string', value: 'true', end: 46 } ], tag : '$mytag', end : 47 }
+			{ type : "mytag", start : 0, attributes : { attrib1 : { type : "string", start : 7, name : "attrib1", value : "something", end : 27 }, attrib2 : { type : "string", start : 27, name : "attrib2", value : "else", end : 40 }, thing : { type : "string", start : 40, name : "thing", value : "true", end : 46 } }, orderedAttributes: [ { start: 7, name: "attrib1", type: "string", value: "something", end: 27 }, { start: 27, name: "attrib2", type: "string", value: "else", end: 40 }, { start: 40, name: "thing", type: "string", value: "true", end: 46 } ], tag : "$mytag", end : 47 }
 		);
 		expect(parser.parseTag("< $mytag attrib1='something' attrib2=else thing>",0)).toEqual(
 			null
 		);
 		expect(parser.parseTag("<$mytag attrib3=<<myMacro one:two three:'four and five'>>>",0)).toEqual(
-			{ type : 'mytag', start : 0, attributes : { attrib3 : { type : 'macro', start : 7, name : 'attrib3', value : { type : 'macrocall', start : 16, params : [ { type : 'macro-parameter', start : 25, value : 'two', name : 'one', end : 33 }, { type : 'macro-parameter', start : 33, value : 'four and five', name : 'three', end : 55 } ], name : 'myMacro', end : 57 }, end : 57 } }, orderedAttributes: [ { type : 'macro', start : 7, name : 'attrib3', value : { type : 'macrocall', start : 16, params : [ { type : 'macro-parameter', start : 25, value : 'two', name : 'one', end : 33 }, { type : 'macro-parameter', start : 33, value : 'four and five', name : 'three', end : 55 } ], name : 'myMacro', end : 57 }, end : 57 } ], tag : '$mytag', end : 58 }
+			{ type : "mytag", start : 0, attributes : { attrib3 : { type : "macro", start : 7, name : "attrib3", value : { type : "macrocall", start : 16, params : [ { type : "macro-parameter", start : 25, value : "two", name : "one", end : 33 }, { type : "macro-parameter", start : 33, value : "four and five", name : "three", end : 55 } ], name : "myMacro", end : 57 }, end : 57 } }, orderedAttributes: [ { type : "macro", start : 7, name : "attrib3", value : { type : "macrocall", start : 16, params : [ { type : "macro-parameter", start : 25, value : "two", name : "one", end : 33 }, { type : "macro-parameter", start : 33, value : "four and five", name : "three", end : 55 } ], name : "myMacro", end : 57 }, end : 57 } ], tag : "$mytag", end : 58 }
 		);
 		expect(parser.parseTag("<$mytag attrib1='something' attrib2=else thing attrib3=<<myMacro one:two three:'four and five'>>>",0)).toEqual(
-			{ type : 'mytag', start : 0, attributes : { attrib1 : { type : 'string', start : 7, name : 'attrib1', value : 'something', end : 27 }, attrib2 : { type : 'string', start : 27, name : 'attrib2', value : 'else', end : 40 }, thing : { type : 'string', start : 40, name : 'thing', value : 'true', end : 47 }, attrib3 : { type : 'macro', start : 47, name : 'attrib3', value : { type : 'macrocall', start : 55, params : [ { type : 'macro-parameter', start : 64, value : 'two', name : 'one', end : 72 }, { type : 'macro-parameter', start : 72, value : 'four and five', name : 'three', end : 94 } ], name : 'myMacro', end : 96 }, end : 96 } }, orderedAttributes: [ { type : 'string', start : 7, name : 'attrib1', value : 'something', end : 27 }, { type : 'string', start : 27, name : 'attrib2', value : 'else', end : 40 }, { type : 'string', start : 40, name : 'thing', value : 'true', end : 47 }, { type : 'macro', start : 47, name : 'attrib3', value : { type : 'macrocall', start : 55, params : [ { type : 'macro-parameter', start : 64, value : 'two', name : 'one', end : 72 }, { type : 'macro-parameter', start : 72, value : 'four and five', name : 'three', end : 94 } ], name : 'myMacro', end : 96 }, end : 96 } ], tag : '$mytag', end : 97 }
+			{ type : "mytag", start : 0, attributes : { attrib1 : { type : "string", start : 7, name : "attrib1", value : "something", end : 27 }, attrib2 : { type : "string", start : 27, name : "attrib2", value : "else", end : 40 }, thing : { type : "string", start : 40, name : "thing", value : "true", end : 47 }, attrib3 : { type : "macro", start : 47, name : "attrib3", value : { type : "macrocall", start : 55, params : [ { type : "macro-parameter", start : 64, value : "two", name : "one", end : 72 }, { type : "macro-parameter", start : 72, value : "four and five", name : "three", end : 94 } ], name : "myMacro", end : 96 }, end : 96 } }, orderedAttributes: [ { type : "string", start : 7, name : "attrib1", value : "something", end : 27 }, { type : "string", start : 27, name : "attrib2", value : "else", end : 40 }, { type : "string", start : 40, name : "thing", value : "true", end : 47 }, { type : "macro", start : 47, name : "attrib3", value : { type : "macrocall", start : 55, params : [ { type : "macro-parameter", start : 64, value : "two", name : "one", end : 72 }, { type : "macro-parameter", start : 72, value : "four and five", name : "three", end : 94 } ], name : "myMacro", end : 96 }, end : 96 } ], tag : "$mytag", end : 97 }
 		);
 	});
 
 	it("should find and parse HTML tags", function() {
 		expect(parser.findNextTag("<something <mytag>",1)).toEqual(
-			{ type : 'element', start : 11, attributes : {  }, orderedAttributes: [ ], tag : 'mytag', end : 18 }
+			{ type : "element", start : 11, attributes : {  }, orderedAttributes: [ ], tag : "mytag", end : 18 }
 		);
 		expect(parser.findNextTag("something else </mytag>",0)).toEqual(
 			null
 		);
 		expect(parser.findNextTag("<<some other stuff>> <mytag>",0)).toEqual(
-			{ type : 'element', start : 1, attributes : { other : { type : 'string', value : 'true', start : 6, name : 'other', end : 13 }, stuff : { type : 'string', value : 'true', start : 13, name : 'stuff', end : 18 } }, orderedAttributes: [ { type : 'string', value : 'true', start : 6, name : 'other', end : 13 }, { type : 'string', value : 'true', start : 13, name : 'stuff', end : 18 } ], tag : 'some', end : 19 }
+			{ type : "element", start : 1, attributes : { other : { type : "string", value : "true", start : 6, name : "other", end : 13 }, stuff : { type : "string", value : "true", start : 13, name : "stuff", end : 18 } }, orderedAttributes: [ { type : "string", value : "true", start : 6, name : "other", end : 13 }, { type : "string", value : "true", start : 13, name : "stuff", end : 18 } ], tag : "some", end : 19 }
 		);
 		expect(parser.findNextTag("<<some other stuff>> <mytag>",2)).toEqual(
-			{ type : 'element', start : 21, attributes : {  }, orderedAttributes: [ ], tag : 'mytag', end : 28 }
+			{ type : "element", start : 21, attributes : {  }, orderedAttributes: [ ], tag : "mytag", end : 28 }
 		);
 	});
 
diff --git a/editions/test/tiddlers/tests/test-wikitext-parser.js b/editions/test/tiddlers/tests/test-wikitext-parser.js
index c35ad1dce..cc4574895 100644
--- a/editions/test/tiddlers/tests/test-wikitext-parser.js
+++ b/editions/test/tiddlers/tests/test-wikitext-parser.js
@@ -23,87 +23,87 @@ describe("WikiText parser tests", function() {
 	it("should parse tags", function() {
 		expect(parse("<br>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start : 0, end : 4, children : [ { type : 'element', tag : 'br', start : 0, end : 4, openTagStart: 0, openTagEnd: 4, rule: 'html', isBlock : false, attributes : {  }, orderedAttributes: [ ] } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start : 0, end : 4, children : [ { type : "element", tag : "br", start : 0, end : 4, openTagStart: 0, openTagEnd: 4, rule: "html", isBlock : false, attributes : {  }, orderedAttributes: [ ] } ] } ]
 
 		);
 		expect(parse("</br>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start : 0, end : 5, children : [ { type : 'text', text : '</br>', start : 0, end : 5 } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start : 0, end : 5, children : [ { type : "text", text : "</br>", start : 0, end : 5 } ] } ]
 
 		);
 		expect(parse("<div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start : 0, end : 5, children : [ { type : 'element', tag : 'div', start : 0, end : 5, openTagStart: 0, openTagEnd: 5, closeTagStart: 5, closeTagEnd: 5, rule: 'html', isBlock : false, attributes : {  }, orderedAttributes: [ ], children : [  ] } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start : 0, end : 5, children : [ { type : "element", tag : "div", start : 0, end : 5, openTagStart: 0, openTagEnd: 5, closeTagStart: 5, closeTagEnd: 5, rule: "html", isBlock : false, attributes : {  }, orderedAttributes: [ ], children : [  ] } ] } ]
 
 		);
 		expect(parse("<div/>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start : 0, end : 6, children : [ { type : 'element', tag : 'div', isSelfClosing : true, isBlock : false, attributes : {  }, orderedAttributes: [ ], start : 0, end : 6, rule: 'html' } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start : 0, end : 6, children : [ { type : "element", tag : "div", isSelfClosing : true, isBlock : false, attributes : {  }, orderedAttributes: [ ], start : 0, end : 6, rule: "html" } ] } ]
 
 		);
 		expect(parse("<div></div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start : 0, end : 11, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : {  }, orderedAttributes: [ ], children : [ ], start : 0, end : 11, openTagStart: 0, openTagEnd: 5, closeTagStart: 5, closeTagEnd: 11, rule: 'html' } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start : 0, end : 11, children : [ { type : "element", tag : "div", isBlock : false, attributes : {  }, orderedAttributes: [ ], children : [ ], start : 0, end : 11, openTagStart: 0, openTagEnd: 5, closeTagStart: 5, closeTagEnd: 11, rule: "html" } ] } ]
 
 		);
 		expect(parse("<div>some text</div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start : 0, end : 20, children : [ { type : 'element', tag : 'div', openTagStart: 0, openTagEnd: 5, closeTagStart: 14, closeTagEnd: 20, rule: 'html', isBlock : false, attributes : {  }, orderedAttributes: [ ], children : [ { type : 'text', text : 'some text', start : 5, end : 14 } ], start : 0, end : 20 } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start : 0, end : 20, children : [ { type : "element", tag : "div", openTagStart: 0, openTagEnd: 5, closeTagStart: 14, closeTagEnd: 20, rule: "html", isBlock : false, attributes : {  }, orderedAttributes: [ ], children : [ { type : "text", text : "some text", start : 5, end : 14 } ], start : 0, end : 20 } ] } ]
 
 		);
 		expect(parse("<div attribute>some text</div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start : 0, end : 30, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'string', value : 'true', start : 4, end : 14, name: 'attribute' } }, orderedAttributes: [ { type : 'string', value : 'true', start : 4, end : 14, name: 'attribute' } ], children : [ { type : 'text', text : 'some text', start : 15, end : 24 } ], start : 0, end : 30, openTagStart: 0, openTagEnd: 15, closeTagStart: 24, closeTagEnd: 30, rule: 'html' } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start : 0, end : 30, children : [ { type : "element", tag : "div", isBlock : false, attributes : { attribute : { type : "string", value : "true", start : 4, end : 14, name: "attribute" } }, orderedAttributes: [ { type : "string", value : "true", start : 4, end : 14, name: "attribute" } ], children : [ { type : "text", text : "some text", start : 15, end : 24 } ], start : 0, end : 30, openTagStart: 0, openTagEnd: 15, closeTagStart: 24, closeTagEnd: 30, rule: "html" } ] } ]
 
 		);
 		expect(parse("<div attribute='value'>some text</div>")).toEqual(
-			[ { type : 'element', tag : 'p', start : 0, end : 38, children : [ { type : 'element', tag : 'div', openTagStart: 0, openTagEnd: 23, closeTagStart: 32, closeTagEnd: 38, rule: 'html', isBlock : false, attributes : { attribute : { type : 'string', name: 'attribute', value : 'value', start: 4, end: 22 } }, orderedAttributes: [ { type: 'string', name: 'attribute', value : 'value', start: 4, end: 22 } ], children : [ { type : 'text', text : 'some text', start : 23, end : 32 } ], start : 0, end : 38 } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start : 0, end : 38, children : [ { type : "element", tag : "div", openTagStart: 0, openTagEnd: 23, closeTagStart: 32, closeTagEnd: 38, rule: "html", isBlock : false, attributes : { attribute : { type : "string", name: "attribute", value : "value", start: 4, end: 22 } }, orderedAttributes: [ { type: "string", name: "attribute", value : "value", start: 4, end: 22 } ], children : [ { type : "text", text : "some text", start : 23, end : 32 } ], start : 0, end : 38 } ] } ]
 
 		);
 		expect(parse("<div attribute={{TiddlerTitle}}>some text</div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start: 0, end: 47, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name: 'attribute', textReference : 'TiddlerTitle', start : 4, end : 31 } }, orderedAttributes: [ { type : 'indirect', name: 'attribute', textReference : 'TiddlerTitle', start : 4, end : 31 } ], children : [ { type : 'text', text : 'some text', start : 32, end : 41 } ], start : 0, end : 47, openTagStart: 0, openTagEnd: 32, closeTagStart: 41, closeTagEnd: 47, rule: 'html' } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start: 0, end: 47, children : [ { type : "element", tag : "div", isBlock : false, attributes : { attribute : { type : "indirect", name: "attribute", textReference : "TiddlerTitle", start : 4, end : 31 } }, orderedAttributes: [ { type : "indirect", name: "attribute", textReference : "TiddlerTitle", start : 4, end : 31 } ], children : [ { type : "text", text : "some text", start : 32, end : 41 } ], start : 0, end : 47, openTagStart: 0, openTagEnd: 32, closeTagStart: 41, closeTagEnd: 47, rule: "html" } ] } ]
 
 		);
 		expect(parse("<$reveal state='$:/temp/search' type='nomatch' text=''>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start: 0, end: 55, children : [ { type : 'reveal', tag: '$reveal', rule: 'html', attributes : { state : { start : 8, name : 'state', type : 'string', value : '$:/temp/search', end : 31 }, type : { start : 31, name : 'type', type : 'string', value : 'nomatch', end : 46 }, text : { start : 46, name : 'text', type : 'string', value : '', end : 54 } }, orderedAttributes: [ { start : 8, name : 'state', type : 'string', value : '$:/temp/search', end : 31 }, { start : 31, name : 'type', type : 'string', value : 'nomatch', end : 46 }, { start : 46, name : 'text', type : 'string', value : '', end : 54 } ], start: 0, end : 55, openTagStart: 0, openTagEnd: 55, closeTagStart: 55, closeTagEnd: 55, isBlock : false, children : [  ] } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start: 0, end: 55, children : [ { type : "reveal", tag: "$reveal", rule: "html", attributes : { state : { start : 8, name : "state", type : "string", value : "$:/temp/search", end : 31 }, type : { start : 31, name : "type", type : "string", value : "nomatch", end : 46 }, text : { start : 46, name : "text", type : "string", value : "", end : 54 } }, orderedAttributes: [ { start : 8, name : "state", type : "string", value : "$:/temp/search", end : 31 }, { start : 31, name : "type", type : "string", value : "nomatch", end : 46 }, { start : 46, name : "text", type : "string", value : "", end : 54 } ], start: 0, end : 55, openTagStart: 0, openTagEnd: 55, closeTagStart: 55, closeTagEnd: 55, isBlock : false, children : [  ] } ] } ]
 
 		);
 		expect(parse("<div attribute={{TiddlerTitle!!field}}>some text</div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start: 0, end: 54, children : [ { type : 'element', tag : 'div', rule: 'html', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'TiddlerTitle!!field', start : 4, end : 38 } }, orderedAttributes: [ { type : 'indirect', name : 'attribute', textReference : 'TiddlerTitle!!field', start : 4, end : 38 } ], children : [ { type : 'text', text : 'some text', start : 39, end : 48 } ], start : 0, end : 54, openTagStart: 0, openTagEnd: 39, closeTagStart: 48, closeTagEnd: 54 } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start: 0, end: 54, children : [ { type : "element", tag : "div", rule: "html", isBlock : false, attributes : { attribute : { type : "indirect", name : "attribute", textReference : "TiddlerTitle!!field", start : 4, end : 38 } }, orderedAttributes: [ { type : "indirect", name : "attribute", textReference : "TiddlerTitle!!field", start : 4, end : 38 } ], children : [ { type : "text", text : "some text", start : 39, end : 48 } ], start : 0, end : 54, openTagStart: 0, openTagEnd: 39, closeTagStart: 48, closeTagEnd: 54 } ] } ]
 
 		);
 		expect(parse("<div attribute={{Tiddler Title!!field}}>some text</div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start: 0, end: 55, children : [ { type : 'element', tag : 'div', rule: 'html', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } }, orderedAttributes: [ { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } ], children : [ { type : 'text', text : 'some text', start : 40, end : 49 } ], start : 0, end : 55, openTagStart: 0, openTagEnd: 40, closeTagStart: 49, closeTagEnd: 55 } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start: 0, end: 55, children : [ { type : "element", tag : "div", rule: "html", isBlock : false, attributes : { attribute : { type : "indirect", name : "attribute", textReference : "Tiddler Title!!field", start : 4, end : 39 } }, orderedAttributes: [ { type : "indirect", name : "attribute", textReference : "Tiddler Title!!field", start : 4, end : 39 } ], children : [ { type : "text", text : "some text", start : 40, end : 49 } ], start : 0, end : 55, openTagStart: 0, openTagEnd: 40, closeTagStart: 49, closeTagEnd: 55 } ] } ]
 
 		);
 		expect(parse("<div attribute={{TiddlerTitle!!field}}>\n\nsome text</div>")).toEqual(
 
-			[ { type : 'element', start : 0, attributes : { attribute : { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } }, orderedAttributes: [ { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } ], tag : 'div', rule: 'html', end : 56, openTagStart: 0, openTagEnd: 39, closeTagStart: 50, closeTagEnd: 56, isBlock : true, children : [ { type : 'element', tag : 'p', start : 41, end : 50, children : [ { type : 'text', text : 'some text', start : 41, end : 50 } ] } ] } ]
+			[ { type : "element", start : 0, attributes : { attribute : { start : 4, name : "attribute", type : "indirect", textReference : "TiddlerTitle!!field", end : 38 } }, orderedAttributes: [ { start : 4, name : "attribute", type : "indirect", textReference : "TiddlerTitle!!field", end : 38 } ], tag : "div", rule: "html", end : 56, openTagStart: 0, openTagEnd: 39, closeTagStart: 50, closeTagEnd: 56, isBlock : true, children : [ { type : "element", tag : "p", rule: "parseblock", start : 41, end : 50, children : [ { type : "text", text : "some text", start : 41, end : 50 } ] } ] } ]
 
 		);
 		expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n\nsome text</div></div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start: 0, end: 67, children : [ { type : 'element', start : 0, end: 67, openTagStart: 0, openTagEnd: 5, closeTagStart: 61, closeTagEnd: 67, attributes : {  }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 61, openTagStart: 5, openTagEnd: 44, closeTagStart: 55, closeTagEnd: 61, rule: 'html', isBlock : true, children : [ { type : 'element', tag : 'p', start : 46, end : 55, children : [ { type : 'text', text : 'some text', start : 46, end : 55 } ] } ] } ] } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start: 0, end: 67, children : [ { type : "element", start : 0, end: 67, openTagStart: 0, openTagEnd: 5, closeTagStart: 61, closeTagEnd: 67, attributes : {  }, orderedAttributes: [ ], tag : "div", rule: "html", isBlock : false, children : [ { type : "element", start : 5, attributes : { attribute : { start : 9, name : "attribute", type : "indirect", textReference : "TiddlerTitle!!field", end : 43 } }, orderedAttributes: [ { start : 9, name : "attribute", type : "indirect", textReference : "TiddlerTitle!!field", end : 43 } ], tag : "div", end : 61, openTagStart: 5, openTagEnd: 44, closeTagStart: 55, closeTagEnd: 61, rule: "html", isBlock : true, children : [ { type : "element", tag : "p", rule: "parseblock", start : 46, end : 55, children : [ { type : "text", text : "some text", start : 46, end : 55 } ] } ] } ] } ] } ]
 
 		);
 		expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n\n!some heading</div></div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start: 0, end: 71, children : [ { type : 'element', start : 0, end: 71, openTagStart: 0, openTagEnd: 5, closeTagStart: 71, closeTagEnd: 71, attributes : {  }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 71, openTagStart: 5, openTagEnd: 44, closeTagStart: 71, closeTagEnd: 71, rule: 'html', isBlock : true, children : [ { type : 'element', tag : 'h1', start: 46, end: 71, rule: 'heading', attributes : { class : { type : 'string', value : '', start: 47, end: 47 } }, children : [ { type : 'text', text : 'some heading</div></div>', start : 47, end : 71 } ] } ] } ] } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start: 0, end: 71, children : [ { type : "element", start : 0, end: 71, openTagStart: 0, openTagEnd: 5, closeTagStart: 71, closeTagEnd: 71, attributes : {  }, orderedAttributes: [ ], tag : "div", rule: "html", isBlock : false, children : [ { type : "element", start : 5, attributes : { attribute : { start : 9, name : "attribute", type : "indirect", textReference : "TiddlerTitle!!field", end : 43 } }, orderedAttributes: [ { start : 9, name : "attribute", type : "indirect", textReference : "TiddlerTitle!!field", end : 43 } ], tag : "div", end : 71, openTagStart: 5, openTagEnd: 44, closeTagStart: 71, closeTagEnd: 71, rule: "html", isBlock : true, children : [ { type : "element", tag : "h1", start: 46, end: 71, rule: "heading", attributes : { class : { type : "string", value : "", start: 47, end: 47 } }, children : [ { type : "text", text : "some heading</div></div>", start : 47, end : 71 } ] } ] } ] } ] } ]
 
 		);
 		expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n!some heading</div></div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start: 0, end: 70, children : [ { type : 'element', start : 0, end: 70, openTagStart: 0, openTagEnd: 5, closeTagStart: 64, closeTagEnd: 70, attributes : {  }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 64, openTagStart: 5, openTagEnd: 44, closeTagStart: 58, closeTagEnd: 64, rule: 'html', isBlock : false, children : [ { type : 'text', text : '\n!some heading', start : 44, end : 58 } ] } ] } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start: 0, end: 70, children : [ { type : "element", start : 0, end: 70, openTagStart: 0, openTagEnd: 5, closeTagStart: 64, closeTagEnd: 70, attributes : {  }, orderedAttributes: [ ], tag : "div", rule: "html", isBlock : false, children : [ { type : "element", start : 5, attributes : { attribute : { start : 9, name : "attribute", type : "indirect", textReference : "TiddlerTitle!!field", end : 43 } }, orderedAttributes: [ { start : 9, name : "attribute", type : "indirect", textReference : "TiddlerTitle!!field", end : 43 } ], tag : "div", end : 64, openTagStart: 5, openTagEnd: 44, closeTagStart: 58, closeTagEnd: 64, rule: "html", isBlock : false, children : [ { type : "text", text : "\n!some heading", start : 44, end : 58 } ] } ] } ] } ]
 
 		);
 		// Regression test for issue (#3306)
 		expect(parse("<div><span><span>\n\nSome text</span></span></div>")).toEqual(
 
-			[ { type : 'element', tag : 'p', start: 0, end: 48, children : [ { type : 'element', start : 0, end: 48, openTagStart: 0, openTagEnd: 5, closeTagStart: 42, closeTagEnd: 48, attributes : {  }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : {  }, orderedAttributes: [ ], tag : 'span', end : 42, openTagStart: 5, openTagEnd: 11, closeTagStart: 35, closeTagEnd: 42, rule: 'html', isBlock : false, children : [ { type : 'element', start : 11, attributes : {  }, orderedAttributes: [ ], tag : 'span', end : 35, openTagStart: 11, openTagEnd: 17, closeTagStart: 28, closeTagEnd: 35, rule: 'html', isBlock : true, children : [ { type : 'element', tag : 'p', start : 19, end : 28, children : [ { type : 'text', text : 'Some text', start : 19, end : 28 } ] } ] } ] } ] } ] } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start: 0, end: 48, children : [ { type : "element", start : 0, end: 48, openTagStart: 0, openTagEnd: 5, closeTagStart: 42, closeTagEnd: 48, attributes : {  }, orderedAttributes: [ ], tag : "div", rule: "html", isBlock : false, children : [ { type : "element", start : 5, attributes : {  }, orderedAttributes: [ ], tag : "span", end : 42, openTagStart: 5, openTagEnd: 11, closeTagStart: 35, closeTagEnd: 42, rule: "html", isBlock : false, children : [ { type : "element", start : 11, attributes : {  }, orderedAttributes: [ ], tag : "span", end : 35, openTagStart: 11, openTagEnd: 17, closeTagStart: 28, closeTagEnd: 35, rule: "html", isBlock : true, children : [ { type : "element", tag : "p", rule: "parseblock", start : 19, end : 28, children : [ { type : "text", text : "Some text", start : 19, end : 28 } ] } ] } ] } ] } ] } ]
 
 		);
 	});
@@ -111,7 +111,12 @@ describe("WikiText parser tests", function() {
 	it("should parse macro definitions", function() {
 		expect(parse("\\define myMacro()\nnothing\n\\end\n")).toEqual(
 
-			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"isMacroDefinition":true,"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"start":0,"end":30,"rule":"macrodef"}]
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"isMacroDefinition":true,"isBlock":false,"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"start":0,"end":30,"rule":"macrodef"}]
+
+		);
+		expect(parse("\\define myMacro() nothing\n\n")).toEqual(
+
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"isMacroDefinition":true,"isBlock":true,"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"start":0,"end":25,"rule":"macrodef"}]
 
 		);
 	});
@@ -182,7 +187,7 @@ describe("WikiText parser tests", function() {
 	it("should parse comment in pragma area. Comment will be invisible", function() {
 		expect(parse("<!-- comment in pragma area -->\n\\define aMacro()\nnothing\n\\end\n")).toEqual(
 
-			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"aMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"isMacroDefinition":true,"orderedAttributes":[{"name":"name","type":"string","value":"aMacro"},{"name":"value","type":"string","value":"nothing"}],"start":32,"end":61,"rule":"macrodef"}]
+			[{"type":"void","children":[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"aMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"isMacroDefinition":true,"isBlock":false,"orderedAttributes":[{"name":"name","type":"string","value":"aMacro"},{"name":"value","type":"string","value":"nothing"}],"start":32,"end":61,"rule":"macrodef"}],"text":"<!-- comment in pragma area -->","start":0,"end":31,"rule":"commentblock"}]
 
 		);
 	});
@@ -190,12 +195,12 @@ describe("WikiText parser tests", function() {
 	it("should block mode filtered transclusions", function() {
 		expect(parse("{{{ filter }}}")).toEqual(
 
-			[ { type: 'list', attributes: { filter: { type: 'string', value: ' filter ', start: 3, end: 11 } }, isBlock: true, start: 0, end: 14, rule: "filteredtranscludeblock" } ]
+			[ { type: "list", attributes: { filter: { type: "string", value: " filter ", start: 3, end: 11 } }, isBlock: true, start: 0, end: 14, rule: "filteredtranscludeblock" } ]
 
 		);
 		expect(parse("{{{ fil\nter }}}")).toEqual(
 
-			[ { type: 'list', attributes: { filter: { type: 'string', value: ' fil\nter ', start: 3, end: 12 } }, isBlock: true, start: 0, end: 15, rule: "filteredtranscludeblock" } ]
+			[ { type: "list", attributes: { filter: { type: "string", value: " fil\nter ", start: 3, end: 12 } }, isBlock: true, start: 0, end: 15, rule: "filteredtranscludeblock" } ]
 
 		);
 	});
@@ -203,38 +208,38 @@ describe("WikiText parser tests", function() {
 	it("should parse inline macro calls", function() {
 		expect(parse("<<john>><<paul>><<george>><<ringo>>")).toEqual(
 
-			[{"type":"element","tag":"p","children":[{"type":"transclude","start":0,"end":8,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]},{"type":"transclude","start":8,"end":16,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"paul"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"paul"}]},{"type":"transclude","start":16,"end":26,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"george"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"george"}]},{"type":"transclude","start":26,"end":35,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"ringo"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"ringo"}]}],"start":0,"end":35}]
+			[{"type":"element","tag":"p",rule:"parseblock","children":[{"type":"transclude","start":0,"end":8,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]},{"type":"transclude","start":8,"end":16,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"paul"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"paul"}]},{"type":"transclude","start":16,"end":26,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"george"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"george"}]},{"type":"transclude","start":26,"end":35,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"ringo"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"ringo"}]}],"start":0,"end":35}]
 
 		);
 		expect(parse("text <<john one:val1 two: 'val \"2\"' three: \"val '3'\" four: \"\"\"val 4\"5'\"\"\" five: [[val 5]] >>")).toEqual(
 
-			[{"type":"element","tag":"p","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":92,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"},"one":{"name":"one","type":"string","value":"val1","start":11,"end":20},"two":{"name":"two","type":"string","value":"val \"2\"","start":20,"end":35},"three":{"name":"three","type":"string","value":"val '3'","start":35,"end":52},"four":{"name":"four","type":"string","value":"val 4\"5'","start":52,"end":73},"five":{"name":"five","type":"string","value":"val 5","start":73,"end":89}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"one","type":"string","value":"val1","start":11,"end":20},{"name":"two","type":"string","value":"val \"2\"","start":20,"end":35},{"name":"three","type":"string","value":"val '3'","start":35,"end":52},{"name":"four","type":"string","value":"val 4\"5'","start":52,"end":73},{"name":"five","type":"string","value":"val 5","start":73,"end":89}]}],"start":0,"end":92}]
+			[{"type":"element","tag":"p",rule:"parseblock","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":92,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"},"one":{"name":"one","type":"string","value":"val1","start":11,"end":20},"two":{"name":"two","type":"string","value":"val \"2\"","start":20,"end":35},"three":{"name":"three","type":"string","value":"val '3'","start":35,"end":52},"four":{"name":"four","type":"string","value":"val 4\"5'","start":52,"end":73},"five":{"name":"five","type":"string","value":"val 5","start":73,"end":89}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"one","type":"string","value":"val1","start":11,"end":20},{"name":"two","type":"string","value":"val \"2\"","start":20,"end":35},{"name":"three","type":"string","value":"val '3'","start":35,"end":52},{"name":"four","type":"string","value":"val 4\"5'","start":52,"end":73},{"name":"five","type":"string","value":"val 5","start":73,"end":89}]}],"start":0,"end":92}]
 
 		);
 		expect(parse("ignored << carrots <<john>>")).toEqual(
 
-			[{"type":"element","tag":"p","children":[{"type":"text","text":"ignored << carrots ","start":0,"end":19},{"type":"transclude","start":19,"end":27,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]}],"start":0,"end":27}]
+			[{"type":"element","tag":"p",rule:"parseblock","children":[{"type":"text","text":"ignored << carrots ","start":0,"end":19},{"type":"transclude","start":19,"end":27,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]}],"start":0,"end":27}]
 
 		);
 		expect(parse("text <<<john>>")).toEqual(
 
-			[{"type":"element","tag":"p","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":14,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"<john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"<john"}]}],"start":0,"end":14}]
+			[{"type":"element","tag":"p",rule:"parseblock","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":14,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"<john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"<john"}]}],"start":0,"end":14}]
 
 		);
 		expect(parse("before\n<<john>>")).toEqual(
 
-			[{"type":"element","tag":"p","children":[{"type":"text","text":"before\n","start":0,"end":7},{"type":"transclude","start":7,"end":15,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]}],"start":0,"end":15}]
+			[{"type":"element","tag":"p",rule:"parseblock","children":[{"type":"text","text":"before\n","start":0,"end":7},{"type":"transclude","start":7,"end":15,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]}],"start":0,"end":15}]
 
 		);
 		// A single space will cause it to be inline
 		expect(parse("<<john>> ")).toEqual(
 
-			[{"type":"element","tag":"p","children":[{"type":"transclude","start":0,"end":8,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]},{"type":"text","text":" ","start":8,"end":9}],"start":0,"end":9}]
+			[{"type":"element","tag":"p",rule:"parseblock","children":[{"type":"transclude","start":0,"end":8,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]},{"type":"text","text":" ","start":8,"end":9}],"start":0,"end":9}]
 
 		);
 		expect(parse("text <<outie one:'my <<innie>>' >>")).toEqual(
 
-			[{"type":"element","tag":"p","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":34,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"outie"},"one":{"name":"one","type":"string","value":"my <<innie>>","start":12,"end":31}},"orderedAttributes":[{"name":"$variable","type":"string","value":"outie"},{"name":"one","type":"string","value":"my <<innie>>","start":12,"end":31}]}],"start":0,"end":34}]
+			[{"type":"element","tag":"p",rule:"parseblock","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":34,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"outie"},"one":{"name":"one","type":"string","value":"my <<innie>>","start":12,"end":31}},"orderedAttributes":[{"name":"$variable","type":"string","value":"outie"},{"name":"one","type":"string","value":"my <<innie>>","start":12,"end":31}]}],"start":0,"end":34}]
 
 		);
 
@@ -243,7 +248,7 @@ describe("WikiText parser tests", function() {
 	it("should parse block macro calls", function() {
 		expect(parse("<<john>>\n<<paul>>\r\n<<george>>\n<<ringo>>")).toEqual(
 
-			[ { type: 'transclude', start: 0, rule: 'macrocallblock', attributes: { $variable: { name: "$variable", type: "string", value: "john" }}, orderedAttributes: [ { name: "$variable", type: "string", value: "john" }], end: 8, isBlock: true }, { type: 'transclude', start: 9, rule: 'macrocallblock', attributes: { $variable: { name: "$variable", type: "string", value: "paul" }}, orderedAttributes: [ { name: "$variable", type: "string", value: "paul" }], end: 17, isBlock: true }, { type: 'transclude', start: 19, rule: 'macrocallblock', attributes: { $variable: { name: "$variable", type: "string", value: "george" }}, orderedAttributes: [ { name: "$variable", type: "string", value: "george" }], end: 29, isBlock: true }, { type: 'transclude', start: 30, rule: 'macrocallblock', attributes: { $variable: { name: "$variable", type: "string", value: "ringo" }}, orderedAttributes: [ { name: "$variable", type: "string", value: "ringo" }], end: 39, isBlock: true } ]
+			[ { type: "transclude", start: 0, rule: "macrocallblock", attributes: { $variable: { name: "$variable", type: "string", value: "john" }}, orderedAttributes: [ { name: "$variable", type: "string", value: "john" }], end: 8, isBlock: true }, { type: "transclude", start: 9, rule: "macrocallblock", attributes: { $variable: { name: "$variable", type: "string", value: "paul" }}, orderedAttributes: [ { name: "$variable", type: "string", value: "paul" }], end: 17, isBlock: true }, { type: "transclude", start: 19, rule: "macrocallblock", attributes: { $variable: { name: "$variable", type: "string", value: "george" }}, orderedAttributes: [ { name: "$variable", type: "string", value: "george" }], end: 29, isBlock: true }, { type: "transclude", start: 30, rule: "macrocallblock", attributes: { $variable: { name: "$variable", type: "string", value: "ringo" }}, orderedAttributes: [ { name: "$variable", type: "string", value: "ringo" }], end: 39, isBlock: true } ]
 
 		);
 		expect(parse("<<john one:val1 two: 'val \"2\"' three: \"val '3'\" four: \"\"\"val 4\"5'\"\"\" five: [[val 5]] >>")).toEqual(
@@ -253,17 +258,17 @@ describe("WikiText parser tests", function() {
 		);
 		expect(parse("<< carrots\n\n<<john>>")).toEqual(
 
-			[ { type: 'element', tag: 'p', start : 0, end : 10, children: [ { type: 'text', text: '<< carrots', start : 0, end : 10 } ] }, { type: 'transclude', start: 12, rule: 'macrocallblock', attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 20, isBlock: true } ]
+			[ { type: "element", tag: "p", rule: "parseblock", start : 0, end : 10, children: [ { type: "text", text: "<< carrots", start : 0, end : 10 } ] }, { type: "transclude", start: 12, rule: "macrocallblock", attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 20, isBlock: true } ]
 
 		);
 		expect(parse("before\n\n<<john>>")).toEqual(
 
-			[ { type: 'element', tag: 'p', start : 0, end : 6, children: [ { type: 'text', text: 'before', start : 0, end : 6 } ] }, { type: 'transclude', start: 8, rule: 'macrocallblock', attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 16, isBlock: true } ]
+			[ { type: "element", tag: "p", rule: "parseblock", start : 0, end : 6, children: [ { type: "text", text: "before", start : 0, end : 6 } ] }, { type: "transclude", start: 8, rule: "macrocallblock", attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 16, isBlock: true } ]
 
 		);
 		expect(parse("<<john>>\nafter")).toEqual(
 
-			[ { type: 'transclude', start: 0, rule: 'macrocallblock', attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 8, isBlock: true }, { type: 'element', tag: 'p', start: 9, end: 14, children: [ { type: 'text', text: 'after', start: 9, end: 14 } ] } ]
+			[ { type: "transclude", start: 0, rule: "macrocallblock", attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 8, isBlock: true }, { type: "element", tag: "p", rule: "parseblock", start: 9, end: 14, children: [ { type: "text", text: "after", start: 9, end: 14 } ] } ]
 
 		);
 		expect(parse("<<multiline arg:\"\"\"\n\nwikitext\n\"\"\" >>")).toEqual(
@@ -273,7 +278,7 @@ describe("WikiText parser tests", function() {
 		);
 		expect(parse("<<outie one:'my <<innie>>' >>")).toEqual(
 
-			[ { type: 'transclude', start: 0, rule: 'macrocallblock', attributes: { $variable: {name: "$variable", type:"string", value: "outie"}, one: {name: "one", type:"string", value: "my <<innie>>", start: 7, end: 26} }, orderedAttributes: [ {name: "$variable", type:"string", value: "outie"}, {name: "one", type:"string", value: "my <<innie>>", start: 7, end: 26} ], end: 29, isBlock: true } ]
+			[ { type: "transclude", start: 0, rule: "macrocallblock", attributes: { $variable: {name: "$variable", type:"string", value: "outie"}, one: {name: "one", type:"string", value: "my <<innie>>", start: 7, end: 26} }, orderedAttributes: [ {name: "$variable", type:"string", value: "outie"}, {name: "one", type:"string", value: "my <<innie>>", start: 7, end: 26} ], end: 29, isBlock: true } ]
 
 		);
 	});
@@ -291,7 +296,7 @@ describe("WikiText parser tests", function() {
 		);
 		expect(parse("<<john param>>>")).toEqual(
 
-			[{"type":"element","tag":"p","children":[{"type":"transclude","start":0,"end":14,"rule":"macrocallinline","attributes":{"0":{"name":"0","type":"string","value":"param","start":6,"end":12},"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"0","type":"string","value":"param","start":6,"end":12}]},{"type":"text","text":">","start":14,"end":15}],"start":0,"end":15}]
+			[{"type":"element","tag":"p",rule:"parseblock","children":[{"type":"transclude","start":0,"end":14,"rule":"macrocallinline","attributes":{"0":{"name":"0","type":"string","value":"param","start":6,"end":12},"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"0","type":"string","value":"param","start":6,"end":12}]},{"type":"text","text":">","start":14,"end":15}],"start":0,"end":15}]
 
 		);
 		// equals signs should be allowed
@@ -306,7 +311,7 @@ describe("WikiText parser tests", function() {
 	it("should parse horizontal rules", function() {
 		expect(parse("---Not a rule\n\n----\n\nBetween\n\n---")).toEqual(
 
-			[ { type : 'element', tag : 'p', start : 0, end : 13, children : [ { type : 'entity', entity : '&mdash;', start: 0, end: 3, rule: 'dash' }, { type : 'text', text : 'Not a rule', start : 3, end : 13 } ] }, { type : 'element', tag : 'hr', start: 15, end: 20, rule: 'horizrule' }, { type : 'element', tag : 'p', start : 21, end : 28, children : [ { type : 'text', text : 'Between', start : 21, end : 28 } ] }, { type : 'element', tag : 'hr', start: 30, end: 33, rule: 'horizrule' } ]
+			[ { type : "element", tag : "p", rule: "parseblock", start : 0, end : 13, children : [ { type : "entity", entity : "&mdash;", start: 0, end: 3, rule: "dash" }, { type : "text", text : "Not a rule", start : 3, end : 13 } ] }, { type : "element", tag : "hr", start: 15, end: 20, rule: "horizrule" }, { type : "element", tag : "p", rule: "parseblock", start : 21, end : 28, children : [ { type : "text", text : "Between", start : 21, end : 28 } ] }, { type : "element", tag : "hr", start: 30, end: 33, rule: "horizrule" } ]
 
 		);
 
@@ -315,7 +320,7 @@ describe("WikiText parser tests", function() {
 	it("should parse hard linebreak areas", function() {
 		expect(parse("\"\"\"Something\nin the\nway she moves\n\"\"\"\n\n")).toEqual(
 
-			[ { type : 'element', tag : 'p', children : [ { type : 'text', text : 'Something', start : 3, end : 12, rule: 'hardlinebreaks' }, { type : 'element', tag : 'br', rule: 'hardlinebreaks', start: 12, end: 13 }, { type : 'text', text : 'in the', start : 13, end : 19, rule: 'hardlinebreaks' }, { type : 'element', tag : 'br', rule: 'hardlinebreaks', start: 19, end: 20 }, { type : 'text', text : 'way she moves', start : 20, end : 33, rule: 'hardlinebreaks' }, { type : 'element', tag : 'br', rule: 'hardlinebreaks', start: 33, end: 34 } ], start : 0, end : 37 } ]
+			[ { type : "element", tag : "p", rule: "parseblock", children : [ { type : "text", text : "Something", start : 3, end : 12, rule: "hardlinebreaks", isRuleStart: true }, { type : "element", tag : "br", rule: "hardlinebreaks", start: 12, end: 13 }, { type : "text", text : "in the", start : 13, end : 19, rule: "hardlinebreaks" }, { type : "element", tag : "br", rule: "hardlinebreaks", start: 19, end: 20 }, { type : "text", text : "way she moves", start : 20, end : 33, rule: "hardlinebreaks" }, { type : "element", tag : "br", rule: "hardlinebreaks", start: 33, end: 34, isRuleEnd: true } ], start : 0, end : 37 } ]
 
 		);
 
diff --git a/editions/test/tiddlers/tests/test-wikitext-serialize.js b/editions/test/tiddlers/tests/test-wikitext-serialize.js
new file mode 100644
index 000000000..e9c6f97cf
--- /dev/null
+++ b/editions/test/tiddlers/tests/test-wikitext-serialize.js
@@ -0,0 +1,18 @@
+/*\
+title: test-wikitext-serialize.js
+type: application/javascript
+tags: [[$:/tags/test-spec]]
+
+Tests the wikitext inverse-rendering from Wiki AST.
+
+\*/
+
+describe("WikiAST serialization unit tests", function () {
+  var cases = $tw.wiki.filterTiddlers("[all[shadows+tiddlers]tag[$:/tags/wikitext-serialize-test-spec]]");
+  $tw.utils.each(cases, function (title) {
+    it("should serialize correctly for " + title, function () {
+      var serialized = $tw.utils.serializeParseTree($tw.wiki.parseTiddler(title).tree).trimEnd();
+      expect(serialized).toBe($tw.wiki.getTiddlerText(title).trimEnd());
+    });
+  });
+});