Fix broken merge

core/language/en-GB/Docs/PaletteColours.multids

@@ -65,10 +65,6 @@ sidebar-tab-foreground-selected: Sidebar tab foreground for selected tabs
 sidebar-tab-foreground: Sidebar tab foreground
 sidebar-tiddler-link-foreground-hover: Sidebar tiddler link foreground hover
 sidebar-tiddler-link-foreground: Sidebar tiddler link foreground
-stability-stable: Badge for stability level "stable"
-stability-experimental: Badge for stability level "experimental"
-stability-deprecated: Badge for stability level "deprecated"
-stability-legacy: Badge for stability level "legacy"
 testcase-accent-level-1: Test case accent colour with no nesting
 testcase-accent-level-2: Test case accent colour with 2nd level nesting
 testcase-accent-level-3: Test case accent colour with 3rd level nesting or higher

core/modules/commands/fetch.js

@@ -120,7 +120,7 @@ Command.prototype.fetchFile = function(url,options,callback,redirectCount) {
 	        }
 	   	});
 	   	response.on("error",function(e) {
-			console.log("Error on GET request: " + e);
+			self.commander.log("Error on GET request: " + e);
 			callback(e);
 	   	});
 	});

core/modules/commands/render.js

@@ -47,7 +47,7 @@ Render individual tiddlers and save the results to the specified files
 		$tw.utils.each(tiddlers,function(title) {
 			var filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
 			if(self.commander.verbose) {
-				console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
+				self.commander.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
 			}
 			var parser = wiki.parseTiddler(template || title),
 				widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
@@ -63,4 +63,4 @@ Render individual tiddlers and save the results to the specified files
 	exports.Command = Command;
 	
 	})();
-	
+	

core/modules/commands/save.js

@@ -48,7 +48,7 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 						}
 					});
 					if(self.commander.verbose) {
-						console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
+						self.commander.log("Saving \"" + title + "\" to \"" + filepath + "\"");
 					}
 					try {
 						$tw.utils.saveTiddlerToFileSync(tiddler,fileInfo);

core/modules/filters.js

@@ -200,20 +200,12 @@ exports.parseFilter = function(filterString) {
 
 exports.getFilterOperators = function() {
 	if(!this.filterOperators) {
-		$tw.Wiki.prototype.oldFilterOperators = {};
-		$tw.modules.applyMethods("filteroperator",this.oldFilterOperators);
-		$tw.Wiki.prototype.newFilterOperators = {};
-		$tw.modules.applyMethods("newfilteroperator",this.newFilterOperators);
-		$tw.Wiki.prototype.filterOperators = $tw.utils.extend({},$tw.Wiki.prototype.oldFilterOperators,$tw.Wiki.prototype.newFilterOperators);
+		$tw.Wiki.prototype.filterOperators = {};
+		$tw.modules.applyMethods("filteroperator",this.filterOperators);
 	}
 	return this.filterOperators;
 };
 
-exports.isFilterOperatorNew = function(name) {
-	this.getFilterOperators();
-	return name in $tw.Wiki.prototype.newFilterOperators;
-};
-
 exports.getFilterRunPrefixes = function() {
 	if(!this.filterRunPrefixes) {
 		$tw.Wiki.prototype.filterRunPrefixes = {};
@@ -222,21 +214,11 @@ exports.getFilterRunPrefixes = function() {
 	return this.filterRunPrefixes;
 }
 
-exports.filterTiddlersPolymorphic = function(filterString,widget,source) {
+exports.filterTiddlers = function(filterString,widget,source) {
 	var fn = this.compileFilter(filterString);
 	return fn.call(this,source,widget);
 };
 
-exports.filterTiddlers = function(filterString,widget,source) {
-	var results = this.filterTiddlersPolymorphic(filterString,widget,source);
-	for(var t=0; t<results.length; t++) {
-		if(typeof results[t] !== "string") {
-			results[t] = $tw.utils.filterItemToString(results[t]);
-		}
-	}
-	return results;
-};
-
 /*
 Compile a filter into a function with the signature fn(source,widget) where:
 source: an iterator function for the source tiddlers, called source(iterator), where iterator is called as iterator(tiddler,title)
@@ -273,19 +255,16 @@ exports.compileFilter = function(filterString) {
 				currTiddlerTitle = widget && widget.getVariable("currentTiddler");
 			$tw.utils.each(operation.operators,function(operator) {
 				var operands = [],
-					operatorFunction,
-					operatorName;
+					operatorFunction;
 				if(!operator.operator) {
 					// Use the "title" operator if no operator is specified
 					operatorFunction = filterOperators.title;
-					operatorName = "title";
 				} else if(!filterOperators[operator.operator]) {
 					// Unknown operators treated as "[unknown]" - at run time we can distinguish between a custom operator and falling back to the default "field" operator
 					operatorFunction = filterOperators["[unknown]"];
 				} else {
 					// Use the operator function
 					operatorFunction = filterOperators[operator.operator];
-					operatorName = operator.operator;
 				}
 				$tw.utils.each(operator.operands,function(operand) {
 					if(operand.indirect) {
@@ -298,17 +277,7 @@ exports.compileFilter = function(filterString) {
 					}
 					operands.push(operand.value);
 				});
-				// If this is a legacy monomorphic operator then wrap the accumulator source in a wrapper that converts each item to a string
-				if(!self.isFilterOperatorNew(operatorName)) {
-					var innerAccumulator = accumulator;
-					accumulator = function(iterator) {
-						innerAccumulator(function(ignored,item) {
-							var title = $tw.utils.filterItemToString(item),
-								tiddler = self.getTiddler(title);
-							iterator(tiddler,title);
-						});
-					};
-				}
+
 				// Invoke the appropriate filteroperator module
 				results = operatorFunction(accumulator,{
 							operator: operator.operator,

core/modules/filters/backtranscludes.js

@@ -16,11 +16,11 @@ Filter operator for returning all the backtranscludes from a tiddler
 Export our filter function
 */
 exports.backtranscludes = function(source,operator,options) {
-	var results = new $tw.utils.LinkedList();
+	var results = [];
 	source(function(tiddler,title) {
-		results.pushTop(options.wiki.getTiddlerBacktranscludes(title));
+		$tw.utils.pushTop(results,options.wiki.getTiddlerBacktranscludes(title));
 	});
-	return results.makeTiddlerIterator(options.wiki);
+	return results;
 };
 
 })();

core/modules/filters/count.js

@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/filters/count.js
 type: application/javascript
-module-type: newfilteroperator
+module-type: filteroperator
 
 Filter operator returning the number of entries in the current list.
 
@@ -20,7 +20,7 @@ exports.count = function(source,operator,options) {
 	source(function(tiddler,title) {
 		count++;
 	});
-	return [count];
+	return [count + ""];
 };
 
 })();

core/modules/filters/json-ops.js

@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/filters/json-ops.js
 type: application/javascript
-module-type: newfilteroperator
+module-type: filteroperator
 
 Filter operators for JSON operations
 
@@ -57,9 +57,9 @@ exports["jsonindexes"] = function(source,operator,options) {
 exports["jsontype"] = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		var data = $tw.utils.filterItemToObject(title,{defaultValue: title,parseStringsAsJson: true});
-		if(data !== undefined) {
-			var item = getFilterItemType(data,operator.operands);
+		var data = $tw.utils.parseJSONSafe(title,title);
+		if(data) {
+			var item = getDataItemType(data,operator.operands);
 			if(item !== undefined) {
 				results.push(item);
 			}
@@ -196,7 +196,7 @@ function convertDataItemKeysToStrings(item) {
 	return [];
 }
 
-function getFilterItemType(data,indexes) {
+function getDataItemType(data,indexes) {
 	// Get the item
 	var item = getDataItem(data,indexes);
 	// Return the item type
@@ -281,3 +281,4 @@ function setDataItem(data,indexes,value) {
 }
 
 })();
+	

core/modules/filters/math.js

@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/filters/math.js
 type: application/javascript
-module-type: newfilteroperator
+module-type: filteroperator
 
 Filter operators for math. Unary/binary operators work on each item in turn, and return a new item list.
 
@@ -207,7 +207,7 @@ function makeNumericBinaryOperator(fnCalc) {
 		var result = [],
 			numOperand = $tw.utils.parseNumber(operator.operand);
 		source(function(tiddler,title) {
-			result.push(fnCalc($tw.utils.parseNumber(title),numOperand));
+			result.push($tw.utils.stringifyNumber(fnCalc($tw.utils.parseNumber(title),numOperand)));
 		});
 		return result;
 	};
@@ -226,7 +226,7 @@ function makeNumericReducingOperator(fnCalc,initialValue,fnFinal) {
 		if(fnFinal) {
 			value = fnFinal(value,result.length,result);
 		}
-		return [value];
+		return [$tw.utils.stringifyNumber(value)];
 	};
 };
 
@@ -238,7 +238,7 @@ function makeNumericArrayOperator(fnCalc) {
 		});
 		results = fnCalc(results);
 		$tw.utils.each(results,function(value,index) {
-			results[index] = value;
+			results[index] = $tw.utils.stringifyNumber(value);
 		});
 		return results;
 	};

core/modules/filters/strings.js

@@ -127,7 +127,7 @@ function diffPartsToChars(text1,text2,mode) {
             if(lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : (lineHash[line] !== undefined)) {
 				chars += String.fromCharCode(lineHash[line]);
             } else {
-                if(lineArrayLength == maxLines) {
+                if (lineArrayLength == maxLines) {
                   line = text.substring(lineStart);
                   lineEnd = text.length;
                 }
@@ -217,10 +217,7 @@ exports.splitregexp = function(source,operator,options) {
 		return ["RegExp error: " + ex];
 	}
 	source(function(tiddler,title) {
-		var parts = title.split(regExp).map(function(part){
-			return part || "";	// make sure it's a string
-		});
-		Array.prototype.push.apply(result,parts);
+		Array.prototype.push.apply(result,title.split(regExp));
 	});
 	return result;
 };
@@ -267,7 +264,7 @@ exports.pad = function(source,operator,options) {
 			} else {
 				var padString = "",
 					padStringLength = targetLength - title.length;
-				while(padStringLength > padString.length) {
+				while (padStringLength > padString.length) {
 					padString += fill;
 				}
 				//make sure we do not exceed the specified length

core/modules/filters/transcludes.js

@@ -20,7 +20,7 @@ exports.transcludes = function(source,operator,options) {
 	source(function(tiddler,title) {
 		results.pushTop(options.wiki.getTiddlerTranscludes(title));
 	});
-	return results.makeTiddlerIterator(options.wiki);
+	return results.toArray();
 };
 
 })();

core/modules/indexers/back-indexer.js

@@ -75,7 +75,7 @@ BackSubIndexer.prototype._getTarget = function(tiddler) {
 	}
 	var parser = this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
 	if(parser) {
-		return this.wiki[this.extractor](parser.tree, tiddler.fields.title);
+		return this.wiki[this.extractor](parser.tree);
 	}
 	return [];
 }

core/modules/parsers/parseutils.js

@@ -114,7 +114,7 @@ exports.parseStringLiteral = function(source,pos) {
 	var match = reString.exec(source);
 	if(match && match.index === pos) {
 		node.value = match[1] !== undefined ? match[1] :(
-			match[2] !== undefined ? match[2] : match[3]
+			match[2] !== undefined ? match[2] : match[3] 
 					);
 		node.end = pos + match[0].length;
 		return node;

core/modules/parsers/wikiparser/rules/codeblock.js

@@ -29,16 +29,13 @@ exports.init = function(parser) {
 
 exports.parse = function() {
 	var reEnd = /(\r?\n```$)/mg;
-	var languageStart = this.parser.pos + 3,
-		languageEnd = languageStart + this.match[1].length;
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
 
 	// Look for the end of the block
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
-		text,
-		codeStart = this.parser.pos;
+		text;
 	// Process the block
 	if(match) {
 		text = this.parser.source.substring(this.parser.pos,match.index);
@@ -51,8 +48,8 @@ exports.parse = function() {
 	return [{
 			type: "codeblock",
 			attributes: {
-					code: {type: "string", value: text, start: codeStart, end: this.parser.pos},
-					language: {type: "string", value: this.match[1], start: languageStart, end: languageEnd}
+					code: {type: "string", value: text},
+					language: {type: "string", value: this.match[1]}
 			}
 	}];
 };

core/modules/parsers/wikiparser/rules/codeinline.js

@@ -33,8 +33,7 @@ exports.parse = function() {
 	// Look for the end marker
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
-		text,
-		start = this.parser.pos;
+		text;
 	// Process the text
 	if(match) {
 		text = this.parser.source.substring(this.parser.pos,match.index);
@@ -48,9 +47,7 @@ exports.parse = function() {
 		tag: "code",
 		children: [{
 			type: "text",
-			text: text,
-			start: start,
-			end: this.parser.pos
+			text: text
 		}]
 	}];
 };

core/modules/parsers/wikiparser/rules/extlink.js

@@ -31,7 +31,6 @@ exports.init = function(parser) {
 
 exports.parse = function() {
 	// Move past the match
-    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) === "~") {
@@ -47,7 +46,7 @@ exports.parse = function() {
 				rel: {type: "string", value: "noopener noreferrer"}
 			},
 			children: [{
-				type: "text", text: this.match[0], start: start, end: this.parser.pos
+				type: "text", text: this.match[0]
 			}]
 		}];
 	}

core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js

@@ -31,16 +31,6 @@ exports.init = function(parser) {
 
 exports.parse = function() {
 	// Move past the match
-	var filterStart = this.parser.pos + 3;
-	var filterEnd = filterStart + this.match[1].length;
-	var toolTipStart = filterEnd + 1;
-	var toolTipEnd = toolTipStart + (this.match[2] ? this.match[2].length : 0);
-	var templateStart = toolTipEnd + 2;
-	var templateEnd = templateStart + (this.match[3] ? this.match[3].length : 0);
-	var styleStart = templateEnd + 2;
-	var styleEnd = styleStart + (this.match[4] ? this.match[4].length : 0);
-	var classesStart = styleEnd + 1;
-	var classesEnd = classesStart + (this.match[5] ? this.match[5].length : 0);
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Get the match details
 	var filter = this.match[1],
@@ -52,21 +42,21 @@ exports.parse = function() {
 	var node = {
 		type: "list",
 		attributes: {
-			filter: {type: "string", value: filter, start: filterStart, end: filterEnd},
+			filter: {type: "string", value: filter}
 		},
 		isBlock: true
 	};
 	if(tooltip) {
-		node.attributes.tooltip = {type: "string", value: tooltip, start: toolTipStart, end: toolTipEnd};
+		node.attributes.tooltip = {type: "string", value: tooltip};
 	}
 	if(template) {
-		node.attributes.template = {type: "string", value: template, start: templateStart, end: templateEnd};
+		node.attributes.template = {type: "string", value: template};
 	}
 	if(style) {
-		node.attributes.style = {type: "string", value: style, start: styleStart, end: styleEnd};
+		node.attributes.style = {type: "string", value: style};
 	}
 	if(classes) {
-		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" "), start: classesStart, end: classesEnd};
+		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" ")};
 	}
 	return [node];
 };

core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js

@@ -30,16 +30,6 @@ exports.init = function(parser) {
 };
 
 exports.parse = function() {
-	var filterStart = this.parser.pos + 3;
-	var filterEnd = filterStart + this.match[1].length;
-	var toolTipStart = filterEnd + 1;
-	var toolTipEnd = toolTipStart + (this.match[2] ? this.match[2].length : 0);
-	var templateStart = toolTipEnd + 2;
-	var templateEnd = templateStart + (this.match[3] ? this.match[3].length : 0);
-	var styleStart = templateEnd + 2;
-	var styleEnd = styleStart + (this.match[4] ? this.match[4].length : 0);
-	var classesStart = styleEnd + 1;
-	var classesEnd = classesStart + (this.match[5] ? this.match[5].length : 0);
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Get the match details
@@ -52,20 +42,20 @@ exports.parse = function() {
 	var node = {
 		type: "list",
 		attributes: {
-			filter: {type: "string", value: filter, start: filterStart, end: filterEnd},
+			filter: {type: "string", value: filter}
 		}
 	};
 	if(tooltip) {
-		node.attributes.tooltip = {type: "string", value: tooltip, start: toolTipStart, end: toolTipEnd};
+		node.attributes.tooltip = {type: "string", value: tooltip};
 	}
 	if(template) {
-		node.attributes.template = {type: "string", value: template, start: templateStart, end: templateEnd};
+		node.attributes.template = {type: "string", value: template};
 	}
 	if(style) {
-		node.attributes.style = {type: "string", value: style, start: styleStart, end: styleEnd};
+		node.attributes.style = {type: "string", value: style};
 	}
 	if(classes) {
-		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" "), start: classesStart, end: classesEnd};
+		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" ")};
 	}
 	return [node];
 };

core/modules/parsers/wikiparser/rules/hardlinebreaks.js

@@ -45,11 +45,10 @@ exports.parse = function() {
 		reEnd.lastIndex = this.parser.pos;
 		match = reEnd.exec(this.parser.source);
 		if(match) {
-			var start = this.parser.pos;
 			this.parser.pos = reEnd.lastIndex;
 			// Add a line break if the terminator was a line break
 			if(match[2]) {
-				tree.push({type: "element", tag: "br", start: start, end: this.parser.pos});
+				tree.push({type: "element", tag: "br"});
 			}
 		}
 	} while(match && !match[1]);

core/modules/parsers/wikiparser/rules/heading.js

@@ -30,17 +30,15 @@ exports.parse = function() {
 	// Move past the !s
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Parse any classes, whitespace and then the heading itself
-	var classStart = this.parser.pos;
 	var classes = this.parser.parseClasses();
-	var classEnd = this.parser.pos;
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
 	var tree = this.parser.parseInlineRun(/(\r?\n)/mg);
 	// Return the heading
 	return [{
 		type: "element",
-		tag: "h" + headingLevel,
+		tag: "h" + headingLevel, 
 		attributes: {
-			"class": {type: "string", value: classes.join(" "), start: classStart, end: classEnd}
+			"class": {type: "string", value: classes.join(" ")}
 		},
 		children: tree
 	}];

core/modules/parsers/wikiparser/rules/html.js

@@ -44,10 +44,6 @@ 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) {
-		tag.openTagStart = tag.start;
-		tag.openTagEnd = tag.end;
-	}
 	this.nextTag = null;
 	// Advance the parser position to past the tag
 	this.parser.pos = tag.end;
@@ -64,27 +60,6 @@ exports.parse = function() {
 			var reEnd = new RegExp("(" + reEndString + ")","mg");
 			tag.children = this.parser.parseInlineRun(reEnd,{eatTerminator: true});
 		}
-		tag.end = this.parser.pos;
-		tag.closeTagEnd = tag.end;
-		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) {
-				var char = this.parser.source[tag.closeTagStart];
-				if (char === '>') {
-					tag.closeTagStart = -1;
-					break;
-				}
-				if (char === '<') break;
-				tag.closeTagStart -= 1;
-			}
-			if (tag.closeTagStart < closeTagMinPos) {
-				tag.closeTagStart = tag.end;
-			}
-		}
 	}
 	// Return the tag
 	return [tag];

core/modules/parsers/wikiparser/rules/image.js

@@ -122,9 +122,9 @@ exports.parseImage = function(source,pos) {
 	}
 	pos = token.end;
 	if(token.match[1]) {
-		node.attributes.tooltip = {type: "string", value: token.match[1].trim(),start: token.start,end:token.start + token.match[1].length - 1};
+		node.attributes.tooltip = {type: "string", value: token.match[1].trim()};
 	}
-	node.attributes.source = {type: "string", value: (token.match[2] || "").trim(), start: token.start + (token.match[1] ? token.match[1].length : 0), end: token.end - 2};
+	node.attributes.source = {type: "string", value: (token.match[2] || "").trim()};
 	// Update the end position
 	node.end = pos;
 	return node;

core/modules/parsers/wikiparser/rules/import.js

@@ -38,14 +38,13 @@ exports.parse = function() {
 	// Parse the filter terminated by a line break
 	var reMatch = /(.*)(?:$|\r?\n)/mg;
 	reMatch.lastIndex = this.parser.pos;
-	var filterStart = this.parser.source;
 	var match = reMatch.exec(this.parser.source);
 	this.parser.pos = reMatch.lastIndex;
 	// Parse tree nodes to return
 	return [{
 		type: "importvariables",
 		attributes: {
-			filter: {type: "string", value: match[1], start: filterStart, end: this.parser.pos}
+			filter: {type: "string", value: match[1]}
 		},
 		children: []
 	}];

core/modules/parsers/wikiparser/rules/list.js

@@ -74,7 +74,6 @@ exports.parse = function() {
 		// Match the list marker
 		var reMatch = /([\*#;:>]+)/mg;
 		reMatch.lastIndex = this.parser.pos;
-		var start = this.parser.pos;
 		var match = reMatch.exec(this.parser.source);
 		if(!match || match.index !== this.parser.pos) {
 			break;
@@ -95,21 +94,9 @@ exports.parse = function() {
 			}
 			// Construct the list element or reuse the previous one at this level
 			if(listStack.length <= t) {
-				var listElement = {
-					type: "element",
-					tag: listInfo.listTag,
-					children: [
-						{
-							type: "element",
-							tag: listInfo.itemTag,
-							children: [],
-							start: start,
-							end: this.parser.pos,
-						}
-					],
-					start: start,
-					end: this.parser.pos,
-				};
+				var listElement = {type: "element", tag: listInfo.listTag, children: [
+					{type: "element", tag: listInfo.itemTag, children: []}
+				]};
 				// Link this list element into the last child item of the parent list item
 				if(t) {
 					var prevListItem = listStack[t-1].children[listStack[t-1].children.length-1];
@@ -118,33 +105,21 @@ exports.parse = function() {
 				// Save this element in the stack
 				listStack[t] = listElement;
 			} else if(t === (match[0].length - 1)) {
-				listStack[t].children.push({
-					type: "element",
-					tag: listInfo.itemTag,
-					children: [],
-					start: start,
-					end: this.parser.pos,
-				});
+				listStack[t].children.push({type: "element", tag: listInfo.itemTag, children: []});
 			}
 		}
 		if(listStack.length > match[0].length) {
 			listStack.splice(match[0].length,listStack.length - match[0].length);
 		}
 		// Process the body of the list item into the last list item
-		var classStart = this.parser.pos;
 		var lastListChildren = listStack[listStack.length-1].children,
 			lastListItem = lastListChildren[lastListChildren.length-1],
 			classes = this.parser.parseClasses();
-		var classEnd = this.parser.pos;
 		this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
 		var tree = this.parser.parseInlineRun(/(\r?\n)/mg);
 		lastListItem.children.push.apply(lastListItem.children,tree);
-		lastListItem.end = this.parser.pos;
-		listStack[listStack.length-1].end = this.parser.pos;
 		if(classes.length > 0) {
 			$tw.utils.addClassToParseTreeNode(lastListItem,classes.join(" "));
-			lastListItem.attributes.class.start = classStart;
-			lastListItem.attributes.class.end = classEnd;
 		}
 		// Consume any whitespace following the list item
 		this.parser.skipWhitespace();

core/modules/parsers/wikiparser/rules/prettyextlink.js

@@ -96,20 +96,15 @@ exports.parseLink = function(source,pos) {
 		splitPos = null;
 	}
 	// Pull out the tooltip and URL
-	var tooltip, URL, urlStart;
-	textNode.start = pos;
+	var tooltip, URL;
 	if(splitPos) {
-		urlStart = splitPos + 1;
 		URL = source.substring(splitPos + 1,closePos).trim();
 		textNode.text = source.substring(pos,splitPos).trim();
-		textNode.end = splitPos;
 	} else {
-		urlStart = pos;
 		URL = source.substring(pos,closePos).trim();
 		textNode.text = URL;
-		textNode.end = closePos;
 	}
-	node.attributes.href = {type: "string", value: URL, start: urlStart, end: closePos};
+	node.attributes.href = {type: "string", value: URL};
 	node.attributes.target = {type: "string", value: "_blank"};
 	node.attributes.rel = {type: "string", value: "noopener noreferrer"};
 	// Update the end position

core/modules/parsers/wikiparser/rules/prettylink.js

@@ -29,39 +29,32 @@ exports.init = function(parser) {
 
 exports.parse = function() {
 	// Move past the match
-	var start = this.parser.pos + 2;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Process the link
 	var text = this.match[1],
-		link = this.match[2] || text,
-		textEndPos = this.parser.source.indexOf("|", start);
-	if (textEndPos < 0 || textEndPos > this.matchRegExp.lastIndex) {
-		textEndPos = this.matchRegExp.lastIndex - 2;
-	}
-	var linkStart = this.match[2] ? (start + this.match[1].length + 1) : start;
-	var linkEnd = linkStart + link.length;
+		link = this.match[2] || text;
 	if($tw.utils.isLinkExternal(link)) {
 		return [{
 			type: "element",
 			tag: "a",
 			attributes: {
-				href: {type: "string", value: link, start: linkStart, end: linkEnd},
+				href: {type: "string", value: link},
 				"class": {type: "string", value: "tc-tiddlylink-external"},
 				target: {type: "string", value: "_blank"},
 				rel: {type: "string", value: "noopener noreferrer"}
 			},
 			children: [{
-				type: "text", text: text, start: start, end: textEndPos
+				type: "text", text: text
 			}]
 		}];
 	} else {
 		return [{
 			type: "link",
 			attributes: {
-				to: {type: "string", value: link, start: linkStart, end: linkEnd}
+				to: {type: "string", value: link}
 			},
 			children: [{
-				type: "text", text: text, start: start, end: textEndPos
+				type: "text", text: text
 			}]
 		}];
 	}

core/modules/parsers/wikiparser/rules/quoteblock.js

@@ -28,13 +28,9 @@ exports.parse = function() {
 	// Move past the <s
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Parse any classes, whitespace and then the optional cite itself
-	var classStart = this.parser.pos;
 	classes.push.apply(classes, this.parser.parseClasses());
-	var classEnd = this.parser.pos;
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
-	var citeStart = this.parser.pos;
 	var cite = this.parser.parseInlineRun(/(\r?\n)/mg);
-	var citeEnd = this.parser.pos;
 	// before handling the cite, parse the body of the quote
 	var tree = this.parser.parseBlocks(reEndString);
 	// If we got a cite, put it before the text
@@ -42,24 +38,18 @@ exports.parse = function() {
 		tree.unshift({
 			type: "element",
 			tag: "cite",
-			children: cite,
-			start: citeStart,
-			end: citeEnd
+			children: cite
 		});
 	}
 	// Parse any optional cite
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
-	citeStart = this.parser.pos;
 	cite = this.parser.parseInlineRun(/(\r?\n)/mg);
-	citeEnd = this.parser.pos;
 	// If we got a cite, push it
 	if(cite.length > 0) {
 		tree.push({
 			type: "element",
 			tag: "cite",
-			children: cite,
-			start: citeStart,
-			end: citeEnd
+			children: cite
 		});
 	}
 	// Return the blockquote element
@@ -67,7 +57,7 @@ exports.parse = function() {
 		type: "element",
 		tag: "blockquote",
 		attributes: {
-			class: { type: "string", value: classes.join(" "), start: classStart, end: classEnd },
+			class: { type: "string", value: classes.join(" ") },
 		},
 		children: tree
 	}];

core/modules/parsers/wikiparser/rules/syslink.js

@@ -29,11 +29,10 @@ exports.init = function(parser) {
 exports.parse = function() {
 	var match = this.match[0];
 	// Move past the match
-	var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Create the link unless it is suppressed
 	if(match.substr(0,1) === "~") {
-		return [{type: "text", text: match.substr(1), start: start+1, end: this.parser.pos}];
+		return [{type: "text", text: match.substr(1)}];
 	} else {
 		return [{
 			type: "link",
@@ -42,12 +41,10 @@ exports.parse = function() {
 			},
 			children: [{
 				type: "text",
-				text: match,
-				start: start,
-				end: this.parser.pos
+				text: match
 			}]
 		}];
 	}
 };
 
-})();
+})();

core/modules/parsers/wikiparser/rules/table.js

@@ -150,7 +150,7 @@ exports.parse = function() {
 		} else {
 			// Otherwise, create a new row if this one is of a different type
 			if(rowType !== currRowType) {
-				rowContainer = {type: "element", tag: rowContainerTypes[rowType], children: [], start: this.parser.pos, end: this.parser.pos};
+				rowContainer = {type: "element", tag: rowContainerTypes[rowType], children: []};
 				table.children.push(rowContainer);
 				currRowType = rowType;
 			}
@@ -178,7 +178,6 @@ exports.parse = function() {
 				// Increment the row count
 				rowCount++;
 			}
-			rowContainer.end = this.parser.pos;
 		}
 		rowMatch = rowRegExp.exec(this.parser.source);
 	}

core/modules/parsers/wikiparser/rules/typedblock.js

@@ -46,7 +46,6 @@ exports.parse = function() {
 		renderType = this.match[2];
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
-	var start = this.parser.pos;
 	// Look for the end of the block
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
@@ -75,9 +74,7 @@ exports.parse = function() {
 			tag: "pre",
 			children: [{
 				type: "text",
-				text: text,
-				start: start,
-				end: this.parser.pos
+				text: text
 			}]
 		}];
 	}

core/modules/parsers/wikiparser/rules/wikilink.js

@@ -36,7 +36,6 @@ exports.parse = function() {
 	// Get the details of the match
 	var linkText = this.match[0];
 	// Move past the macro call
-	var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// If the link starts with the unwikilink character then just output it as plain text
 	if(linkText.substr(0,1) === $tw.config.textPrimitives.unWikiLink) {
@@ -58,9 +57,7 @@ exports.parse = function() {
 		},
 		children: [{
 			type: "text",
-			text: linkText,
-			start: start,
-			end: this.parser.pos
+			text: linkText
 		}]
 	}];
 };

core/modules/parsers/wikiparser/wikiparser.js

@@ -91,11 +91,6 @@ var WikiParser = function(type,text,options) {
 	} else {
 		topBranch.push.apply(topBranch,this.parseBlocks());
 	}
-	// Build rules' name map
-	this.usingRuleMap = {};
-	$tw.utils.each(this.pragmaRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
-	$tw.utils.each(this.blockRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
-	$tw.utils.each(this.inlineRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
 	// Return the parse tree
 };
 
@@ -214,13 +209,8 @@ WikiParser.prototype.parsePragmas = function() {
 			break;
 		}
 		// Process the pragma rule
-		var start = this.pos;
 		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;
-			$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);
 			subTree[0].children = [];
@@ -245,15 +235,7 @@ WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
 	// Look for a block rule that applies at the current position
 	var nextMatch = this.findNextMatch(this.blockRules,this.pos);
 	if(nextMatch && nextMatch.matchIndex === this.pos) {
-		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;
-		}
-		$tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
-		return subTree;
+		return nextMatch.rule.parse();
 	}
 	// Treat it as a paragraph if we didn't find a block rule
 	var start = this.pos;
@@ -350,16 +332,7 @@ WikiParser.prototype.parseInlineRunUnterminated = function(options) {
 			this.pos = nextMatch.matchIndex;
 		}
 		// Process the run rule
-		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) {
-			// 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;
-		}
-		$tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
-		tree.push.apply(tree,subTree);
+		tree.push.apply(tree,nextMatch.rule.parse());
 		// Look for the next run rule
 		nextMatch = this.findNextMatch(this.inlineRules,this.pos);
 	}
@@ -410,15 +383,7 @@ WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegEx
 				this.pos = inlineRuleMatch.matchIndex;
 			}
 			// Process the inline rule
-			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;
-			}
-			$tw.utils.each(subTree, function (node) { node.rule = inlineRuleMatch.rule.name; });
-			tree.push.apply(tree,subTree);
+			tree.push.apply(tree,inlineRuleMatch.rule.parse());
 			// Look for the next inline rule
 			inlineRuleMatch = this.findNextMatch(this.inlineRules,this.pos);
 			// Look for the next terminator match
@@ -444,7 +409,7 @@ WikiParser.prototype.pushTextWidget = function(array,text,start,end) {
 		text = $tw.utils.trim(text);
 	}
 	if(text) {
-		array.push({type: "text", text: text, start: start, end: end});
+		array.push({type: "text", text: text, start: start, end: end});		
 	}
 };
 
@@ -497,3 +462,4 @@ WikiParser.prototype.amendRules = function(type,names) {
 exports["text/vnd.tiddlywiki"] = WikiParser;
 
 })();
+

core/modules/server/authenticators/header.js

@@ -37,9 +37,7 @@ HeaderAuthenticator.prototype.authenticateRequest = function(request,response,st
 		return false;
 	} else {
 		// authenticatedUsername will be undefined for anonymous users
-		if(username) {
-			state.authenticatedUsername = $tw.utils.decodeURIComponentSafe(username);
-		}
+		state.authenticatedUsername = $tw.utils.decodeURIComponentSafe(username);
 		return true;
 	}
 };

core/modules/server/server.js

@@ -33,7 +33,13 @@ function Server(options) {
 	this.routes = options.routes || [];
 	this.authenticators = options.authenticators || [];
 	this.wiki = options.wiki;
+	this.logger = new $tw.utils.Logger("server",{colour: "cyan"});
+	this.logger.setPrefix(":" + process.pid + "-" + (Number(new Date()) - 1095776640000));
 	this.boot = options.boot || $tw.boot;
+	// Name the server and init the boot state
+	this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
+	this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
+	this.boot.pathPrefix = this.get("path-prefix") || "";
 	// Initialise the variables
 	this.variables = $tw.utils.extend({},this.defaultVariables);
 	if(options.variables) {
@@ -92,10 +98,6 @@ function Server(options) {
 		this.protocol = "https";
 	}
 	this.transport = require(this.protocol);
-	// Name the server and init the boot state
-	this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
-	this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
-	this.boot.pathPrefix = this.get("path-prefix") || "";
 }
 
 /*
@@ -287,9 +289,9 @@ Server.prototype.requestHandler = function(request,response,options) {
 	var route = self.findMatchingRoute(request,state);
 	// Optionally output debug info
 	if(self.get("debug-level") !== "none") {
-		console.log("Request path:",JSON.stringify(state.urlInfo));
-		console.log("Request headers:",JSON.stringify(request.headers));
-		console.log("authenticatedUsername:",state.authenticatedUsername);
+		self.logger.log("Request path:",JSON.stringify(state.urlInfo.href));
+		self.logger.log("Request headers:",JSON.stringify(request.headers));
+		self.logger.log("authenticatedUsername:",state.authenticatedUsername);
 	}
 	// Return a 404 if we didn't find a route
 	if(!route) {

core/modules/utils/logger.js

@@ -21,6 +21,7 @@ function Logger(componentName,options) {
 	options = options || {};
 	this.componentName = componentName || "";
 	this.colour = options.colour || "white";
+	this.prefix = options.prefix || "";
 	this.enable = "enable" in options ? options.enable : true;
 	this.save = "save" in options ? options.save : true;
 	this.saveLimit = options.saveLimit || 100 * 1024;
@@ -33,6 +34,20 @@ Logger.prototype.setSaveBuffer = function(logger) {
 	this.saveBufferLogger = logger;
 };
 
+/*
+Change the output colour
+*/
+Logger.prototype.setColour = function(colour) {
+	this.colour = colour || "white";
+};
+
+/*
+Change the prefix
+*/
+Logger.prototype.setPrefix = function(prefix) {
+	this.prefix = prefix || "";
+};
+
 /*
 Log a message
 */

core/modules/utils/simple-list.js

@@ -1,86 +0,0 @@
-/*\
-module-type: utils
-title: $:/core/modules/utils/simple-list.js
-type: application/javascript
-
-Switched from a linked list to simplify things
-
-\*/
-(function(){
-
-function SimpleList() {
-	this.clear();
-};
-
-Object.defineProperty(SimpleList.prototype,"length", {
-	get: function() {
-		return this.list.length;
-	}
-});
-
-SimpleList.prototype.clear = function() {
-	this.list = [];
-};
-
-SimpleList.prototype.remove = function(value) {
-	if($tw.utils.isArray(value)) {
-		for(var t=0; t<value.length; t++) {
-			this._remove(value[t]);
-		}
-	} else {
-		this._remove(value);
-	}
-};
-
-/*
-Push behaves like array.push and accepts multiple string arguments. But it also
-accepts a single array argument too, to be consistent with its other methods.
-*/
-SimpleList.prototype.push = function(/* values */) {
-	var values = arguments;
-	if(arguments.length === 1 && $tw.utils.isArray(values[0])) {
-		values = values[0];
-	}
-	for(var i = 0; i < values.length; i++) {
-		this._push(values[i]);
-	}
-	return this.list.length;
-};
-
-SimpleList.prototype.pushTop = function(value) {
-	// this.push(value);
-	// -or-
-	$tw.utils.pushTop(this.list,value);
-};
-
-SimpleList.prototype.each = function(callback) {
-	$tw.utils.each(this.list,callback);
-};
-
-SimpleList.prototype.toArray = function() {
-	return this.list.slice(0);
-};
-
-SimpleList.prototype.makeTiddlerIterator = function(wiki) {
-	var self = this;
-	return function(callback) {
-		self.each(function(title) {
-			callback(wiki.getTiddler(title),title);
-		});
-	};
-};
-
-SimpleList.prototype._remove = function(value) {
-	var p = this.list.indexOf(value);
-	if(p !== -1) {
-		this.list.splice(p,1);
-	}
-};
-
-SimpleList.prototype._push = function(value) {
-	this.list.push(value);
-};
-
-exports.SimpleList = SimpleList;
-
-})();

core/modules/utils/utils.js

@@ -1037,52 +1037,4 @@ exports.makeCompareFunction = function(type,options) {
 	return (types[type] || types[options.defaultType] || types.number);
 };
 
-exports.filterItemToString = function(value) {
-	switch(typeof value) {
-		case "undefined":
-			return "undefined"
-		case "object":
-			return JSON.stringify(value);
-		case "boolean":
-			return value ? "true" : "false";
-		case "number":
-			return value.toString();
-		case "bigint":
-			return value.toString();
-		case "string":
-			return value;
-		case "symbol":
-			throw "Filter operators cannot return Symbols";
-		case "function":
-			throw "Filter operators cannot return Functions";
-	}
-};
-
-exports.filterItemToObject = function(value,options) {
-	options = options || {};
-	var defaultValue = options.defaultValue || {};
-	switch(typeof value) {
-		case "undefined":
-			return defaultValue;
-		case "object":
-			return value;
-		case "boolean":
-			return value;
-		case "number":
-			return value;
-		case "bigint":
-			return value;
-		case "string":
-			if(options.parseStringsAsJson) {
-				return $tw.utils.parseJSONSafe(value,defaultValue);
-			} else {
-				return value;
-			}
-		case "symbol":
-			throw "Filter operators cannot return Symbols";
-		case "function":
-			throw "Filter operators cannot return Functions";
-	}
-};
-
 })();

core/modules/widgets/action-log.js

@@ -66,12 +66,7 @@ LogWidget.prototype.log = function() {
 	});
 
 	for(var v in this.variables) {
-		var variable = this.parentWidget && this.parentWidget.variables[v];
-		if(variable && variable.isFunctionDefinition) {
-			allVars[v] = variable.value;
-		} else {
-			allVars[v]  = this.getVariable(v,{defaultValue:""});
-		}
+		allVars[v] = this.getVariable(v,{defaultValue:""});
 	}
 	if(this.filter) {
 		filteredVars = this.wiki.compileFilter(this.filter).call(this.wiki,this.wiki.makeTiddlerIterator(allVars));

core/modules/widgets/button.js

@@ -262,7 +262,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 ButtonWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.tooltip || changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
+	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
 		this.refreshSelf();
 		return true;
 	} else {

core/modules/wiki.js

@@ -551,41 +551,28 @@ exports.getTiddlerBacklinks = function(targetTitle) {
 
 
 /*
-Return an array of tiddler titles that are directly transcluded within the given parse tree. `title` is the tiddler being parsed, we will ignore its self-referential transclusions, only return
+Return an array of tiddler titles that are directly transcluded within the given parse tree
  */
-exports.extractTranscludes = function(parseTreeRoot, title) {
+exports.extractTranscludes = function(parseTreeRoot) {
 	// Count up the transcludes
 	var transcludes = [],
 		checkParseTree = function(parseTree, parentNode) {
 			for(var t=0; t<parseTree.length; t++) {
 				var parseTreeNode = parseTree[t];
-				if(parseTreeNode.type === "transclude") {
-					if(parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
-						var value;
-						// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
-						if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
-							// Empty value (like `{{!!field}}`) means self-referential transclusion. 
-							value = parentNode.attributes.tiddler.value || title;
-						} else {
-							value = parseTreeNode.attributes.$tiddler.value;
-						}
-					} else if(parseTreeNode.attributes.tiddler && parseTreeNode.attributes.tiddler.type === "string") {
-						// Old transclude widget usage
-						value = parseTreeNode.attributes.tiddler.value;
-					} else if(parseTreeNode.attributes.$field && parseTreeNode.attributes.$field.type === "string") {
-						// Empty value (like `<$transclude $field='created'/>`) means self-referential transclusion. 
-						value = title;
-					} else if(parseTreeNode.attributes.field && parseTreeNode.attributes.field.type === "string") {
-						// Old usage with Empty value (like `<$transclude field='created'/>`)
-						value = title;
+				if(parseTreeNode.type === "transclude" && parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
+					var value;
+					// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
+					if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
+						value = parentNode.attributes.tiddler.value;
+					} else {
+						value = parseTreeNode.attributes.$tiddler.value;
 					}
-					// Deduplicate the result.
-					if(value && transcludes.indexOf(value) === -1) {
-						$tw.utils.pushTop(transcludes,value);
+					if(transcludes.indexOf(value) === -1) {
+						transcludes.push(value);
 					}
 				}
 				if(parseTreeNode.children) {
-					checkParseTree(parseTreeNode.children,parseTreeNode);
+					checkParseTree(parseTreeNode.children, parseTreeNode);
 				}
 			}
 		};
@@ -604,8 +591,7 @@ exports.getTiddlerTranscludes = function(title) {
 		// Parse the tiddler
 		var parser = self.parseTiddler(title);
 		if(parser) {
-			// this will ignore self-referential transclusions from `title`
-			return self.extractTranscludes(parser.tree,title);
+			return self.extractTranscludes(parser.tree);
 		}
 		return [];
 	});

core/palettes/Vanilla.tid

@@ -82,10 +82,6 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #444444
 sidebar-tiddler-link-foreground: #999999
 site-title-foreground: <<colour tiddler-title-foreground>>
-stability-stable: #008000
-stability-experimental: #c07c00
-stability-deprecated: #ff0000
-stability-legacy: #0000ff
 static-alert-foreground: #aaaaaa
 tab-background-selected: #ffffff
 tab-background: #d8d8d8

core/ui/ControlPanel/TiddlyWiki.tid

@@ -9,7 +9,7 @@ list-before:
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]">
 
-<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> >
+<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> style="border-top:1px solid #eee;">
 
 !!.tc-control-panel-accent <$link><$transclude field="caption"/></$link>
 

editions/prerelease/tiddlers/Release 5.3.4.tid

@@ -52,11 +52,10 @@ The easiest way to use the <<.wlink TestCaseWidget>> is by creating TestCaseTidd
 
 ! Translation improvements
 
-This release also includes improvements to the following translations:
+Improvements to the following translations:
 
 * Chinese
 * French
-* German
 * Macedonian
 * Polish
 
@@ -70,7 +69,7 @@ This release also includes improvements to the following translations:
 
 ! Filter Improvements
 
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6081">> new [[transcludes|transcludes Operator]] and [[backtranscludes|backtranscludes Operator]] operators
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7966">> new [[backtranscludes Operator]]
 
 ! Usability Improvements
 
@@ -79,18 +78,14 @@ This release also includes improvements to the following translations:
 
 ! Hackability Improvements
 
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7866">> the wikitext parser to generate start/end properties for all nodes
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/8109">> [[WidgetMessage: tm-http-request]] to be able to use Basic Authentication
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/8225">> [[WidgetMessage: tm-http-request]] to allow the default headers to be suppressed
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7882">> infinite recursion handling using a custom exception
 * <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7966">> button to the JavaScript error popup allowing tiddlers to be saved to a local JSON file
 * <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/issues/8120">> to latest version of modern-normalize 2.0.0
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/8211">> [[tm-permalink|WidgetMessage: tm-permalink]], [[tm-permaview|WidgetMessage: tm-permaview]] and [[tm-copy-to-clipboard|WidgetMessage: tm-copy-to-clipboard]] messages to allow the notification text to be customised
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/8097">> window title rendering to automatically include global definitions
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/8225">> [[WidgetMessage: tm-http-request]] to allow the default headers to be suppressed
 
 ! Bug Fixes
 
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8233">> nested functions not resolving variables created in filter runs
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8186">> nested [[Block Quotes in WikiText]]
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7933">> TiddlyWikiClassic build process
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7935">> LinkWidget not refreshing when the `to` attribute changes
@@ -109,16 +104,11 @@ This release also includes improvements to the following translations:
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/8095">> proper DOCTYPE for the open window template
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7945">> theme font size settings to open in new window CSS
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8098">> backlink parser to prevent it parsing binary tiddlers
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8203">> issue where default parameters were not applied when a ParametersWidget did not find a parent TranscludeWidget
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8222">> crash when using [[splitregexp Operator]] with a regular expression that includes capture groups
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8239">> ActionLogWidget evaluating all variables in scope
 
 ! Node.js Improvements
 
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/8141">> usage of "Cache-Control" header
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7878">> SaveCommand not overwriting files when required
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/8237">> server header authentication when header is missing
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/8253">> ButtonWidget should refresh when "tooltip" attribute changes
 
 ! Performance Improvements
 
@@ -128,7 +118,7 @@ This release also includes improvements to the following translations:
 
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8195">> issue with fakedom TW_Node inheritence
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8099">> SJCL library creating variables in global scope
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8179">> `widget.getVariableInfo()` to always return a `params` property
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8179">> fix `widget.getVariableInfo()` to always return a `params` property
 
 ! Infrastructure Improvements
 
@@ -151,7 +141,6 @@ eschlon
 etardiff
 flibbles
 FSpark
-Gk0Wk
 hoelzro
 jinix6
 joshuafontany

editions/test/tiddlers/tests/data/pragmas/WhitespaceAfterPragma.tid

@@ -58,10 +58,7 @@ title: ExpectedResult
                 "value": "Something"
             }
         ],
-        "isProcedureDefinition": true,
-        "start": 0,
-        "end": 43,
-        "rule": "fnprocdef"
+        "isProcedureDefinition": true
     }
 ]
 </p>

editions/test/tiddlers/tests/test-backtranscludes.js

@@ -11,7 +11,7 @@ Tests the backtranscludes mechanism.
 /*global $tw: false */
 "use strict";
 
-describe('Backtranscludes and transclude filter tests', function() {
+describe('Backtranscludes tests', function() {
 	describe('a tiddler with no transcludes to it', function() {
 		var wiki = new $tw.Wiki();
 
@@ -22,9 +22,6 @@ describe('Backtranscludes and transclude filter tests', function() {
 		it('should have no backtranscludes', function() {
 			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('');
 		});
-		it('should have no transcludes', function() {
-			expect(wiki.filterTiddlers('TestIncoming +[transcludes[]]').join(',')).toBe('');
-		});
 	});
 
 	describe('A tiddler added to the wiki with a transclude to it', function() {
@@ -41,9 +38,6 @@ describe('Backtranscludes and transclude filter tests', function() {
 		it('should have a backtransclude', function() {
 			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
 		});
-		it('should have a transclude', function() {
-			expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('TestIncoming');
-		});
 	});
 
 	describe('A tiddler transclude with template will still use the tiddler as result.', function() {
@@ -62,26 +56,6 @@ describe('Backtranscludes and transclude filter tests', function() {
 		});
 	});
 
-	describe('A data tiddler transclude will still use the tiddler as result.', function() {
-		var wiki = new $tw.Wiki();
-
-		wiki.addTiddler({
-			title: 'TestIncoming',
-			type: 'application/x-tiddler-dictionary',
-			text: 'name: value'});
-
-		wiki.addTiddler({
-			title: 'TestOutgoing',
-			text: 'A transclude to {{TestIncoming##name}}'});
-
-		it('should have a backtransclude', function() {
-			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
-		});
-		it('should have a transclude', function() {
-			expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('TestIncoming');
-		});
-	});
-
 	describe('A tiddler that has a transclude added to it later', function() {
 		it('should have an additional backtransclude', function() {
 			var wiki = new $tw.Wiki();
@@ -169,73 +143,6 @@ describe('Backtranscludes and transclude filter tests', function() {
 			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('');
 		});
 	});
-
-	describe('a tiddler with some transcludes on it in order', function() {
-		var wiki = new $tw.Wiki();
-
-		wiki.addTiddler({
-			title: 'TestOutgoing',
-			text: "{{New Tiddler!!created}}\n\nA transclude to {{TestIncoming}}"
-		});
-
-		it('should have a transclude', function() {
-			expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('New Tiddler,TestIncoming');
-		});
-
-		it('should have a back transclude', function() {
-			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
-			expect(wiki.filterTiddlers('[[New Tiddler]] +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
-		});
-	});
-
-	describe('include implicit self transclusion', function() {
-		var wiki = new $tw.Wiki();
-
-		wiki.addTiddler({
-			title: 'TestOutgoing',
-			text: "{{!!created}}\n\nAn implicit self-referential transclude to <$transclude $field='created'/> and <$transclude field='created'/>"});
-
-		it('should have no transclude', function() {
-			expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('TestOutgoing');
-		});
-
-		it('should have no back transcludes', function() {
-			expect(wiki.filterTiddlers('TestOutgoing +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
-		});
-	});
-
-	describe('include explicit self transclusion', function() {
-		var wiki = new $tw.Wiki();
-
-		wiki.addTiddler({
-			title: 'TestOutgoing',
-			text: "{{TestOutgoing!!created}}\n\n<$transclude $tiddler='TestOutgoing' $field='created'/> and <$transclude tiddler='TestOutgoing' field='created'/>"});
-
-			it('should have no transclude', function() {
-			expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('TestOutgoing');
-		});
-
-		it('should have no back transcludes', function() {
-			expect(wiki.filterTiddlers('TestOutgoing +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
-		});
-	});
-
-	describe('recognize transclusion defined by widget', function() {
-		var wiki = new $tw.Wiki();
-
-		wiki.addTiddler({
-			title: 'TestOutgoing',
-			text: "<$tiddler tiddler='TestIncoming'><$transclude $tiddler /></$tiddler>\n\n<$transclude tiddler='TiddlyWiki Pre-release'/>"});
-
-		it('should have a transclude', function() {
-			expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('TestIncoming,TiddlyWiki Pre-release');
-		});
-
-		it('should have a back transclude', function() {
-			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
-			expect(wiki.filterTiddlers('[[TiddlyWiki Pre-release]] +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
-		});
-	});
 });
 
 })();

editions/test/tiddlers/tests/test-filters.js

@@ -708,10 +708,6 @@ Tests the filtering mechanism.
 			expect(wiki.filterTiddlers("1 2 3 4 +[min[2]]").join(",")).toBe("1,2,2,2");
 		});
 	
-		it("should handle type conversions", function() {
-			expect(wiki.filterTiddlers("[[2]add[2]addprefix[donkey]]").join(",")).toBe("donkey4");
-		});
-	
 	/* listops filters */
 		
 		it("should handle the allafter operator", function() {

editions/test/tiddlers/tests/test-wikitext-parser.js

@@ -26,7 +26,7 @@ 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', start : 0, end : 4, children : [ { type : 'element', tag : 'br', start : 0, end : 4, isBlock : false, attributes : {  }, orderedAttributes: [ ] } ] } ]
 
 		);
 		expect(parse("</br>")).toEqual(
@@ -36,77 +36,78 @@ describe("WikiText parser tests", function() {
 		);
 		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', start : 0, end : 5, children : [ { type : 'element', tag : 'div', start : 0, end : 5, 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', start : 0, end : 6, children : [ { type : 'element', tag : 'div', isSelfClosing : true, isBlock : false, attributes : {  }, orderedAttributes: [ ], start : 0, end : 6 } ] } ]
 
 		);
 		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', start : 0, end : 11, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : {  }, orderedAttributes: [ ], children : [ ], start : 0, end : 5 } ] } ]
 
 		);
 		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', start : 0, end : 20, children : [ { type : 'element', tag : 'div', start : 0, end : 20, isBlock : false, attributes : {  }, orderedAttributes: [ ], children : [ { type : 'text', text : 'some text', start : 5, end : 14 } ], start : 0, end : 5 } ] } ]
 
 		);
 		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', 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 : 15 } ] } ]
 
 		);
 		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', start : 0, end : 38, children : [ { type : 'element', tag : 'div', start: 0, end: 38, 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 : 23 } ] } ]
 
 		);
 		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', 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 : 32 } ] } ]
 
 		);
 		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', start: 0, end: 55, children : [ { type : 'reveal', tag: '$reveal', start : 0, 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 } ], end : 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', start: 0, end: 54, children : [ { type : 'element', tag : 'div', 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 : 39 } ] } ]
 
 		);
 		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', start: 0, end: 55, children : [ { type : 'element', tag : 'div', 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 : 40 } ] } ]
 
 		);
 		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', end : 39, isBlock : true, children : [ { type : 'element', tag : 'p', 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', start: 0, end: 67, children : [ { type : 'element', start : 0, attributes : {  }, orderedAttributes: [ ], tag : 'div', end : 5, 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 : 44, isBlock : true, children : [ { type : 'element', tag : 'p', 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', start: 0, end: 71, children : [ { type : 'element', start : 0, attributes : {  }, orderedAttributes: [ ], tag : 'div', end : 5, 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 : 44, isBlock : true, children : [ { type : 'element', tag : 'h1', attributes : { class : { type : 'string', value : '' } }, 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', start: 0, end: 70, children : [ { type : 'element', start : 0, attributes : {  }, orderedAttributes: [ ], tag : 'div', end : 5, 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 : 44, 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', start: 0, end: 48, children : [ { type : 'element', start : 0, attributes : {  }, orderedAttributes: [ ], tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : {  }, orderedAttributes: [ ], tag : 'span', end : 11, isBlock : false, children : [ { type : 'element', start : 11, attributes : {  }, orderedAttributes: [ ], tag : 'span', end : 17, isBlock : true, children : [ { type : 'element', tag : 'p', start : 19, end : 28, children : [ { type : 'text', text : 'Some text', start : 19, end : 28 } ] } ] } ] } ] } ] } ]
 
 		);
 	});
@@ -114,7 +115,7 @@ 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,"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}]}]
 
 		);
 	});
@@ -122,7 +123,7 @@ describe("WikiText parser tests", function() {
 	it("should parse procedure definitions with no parameters", function() {
 		expect(parse("\\procedure 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":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isProcedureDefinition":true,"start":0,"end":33,"rule":"fnprocdef"}]
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isProcedureDefinition":true}]
 
 		);
 	});
@@ -130,7 +131,7 @@ describe("WikiText parser tests", function() {
 	it("should parse single line procedure definitions with no parameters", function() {
 		expect(parse("\\procedure myMacro() nothing\n")).toEqual(
 
-			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isProcedureDefinition":true,"start":0,"end":28,"rule":"fnprocdef"}]
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isProcedureDefinition":true}]
 
 		);
 	});
@@ -138,7 +139,7 @@ describe("WikiText parser tests", function() {
 	it("should parse procedure definitions with parameters", function() {
 		expect(parse("\\procedure myMacro(one,two,three,four:elephant)\nnothing\n\\end\n")).toEqual(
 
-			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[{"name":"one"},{"name":"two"},{"name":"three"},{"name":"four","default":"elephant"}],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isProcedureDefinition":true,"start":0,"end":60,"rule":"fnprocdef"}]
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[{"name":"one"},{"name":"two"},{"name":"three"},{"name":"four","default":"elephant"}],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isProcedureDefinition":true}]
 
 		);
 	});
@@ -146,14 +147,14 @@ describe("WikiText parser tests", function() {
 	it("should parse procedure definitions", function() {
 		expect(parse("\\procedure myMacro(one:'Jaguar')\n<$text text=<<one>>/>\n\\end\n\n")).toEqual(
 
-			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"<$text text=<<one>>/>"}},"children":[],"params":[{"name":"one","default":"Jaguar"}],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"<$text text=<<one>>/>"}],"isProcedureDefinition":true,"start":0,"end":59,"rule":"fnprocdef"}]
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"<$text text=<<one>>/>"}},"children":[],"params":[{"name":"one","default":"Jaguar"}],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"<$text text=<<one>>/>"}],"isProcedureDefinition":true}]
 
 		);
 
 	});	it("should parse function definitions with no parameters", function() {
 		expect(parse("\\function 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":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isFunctionDefinition":true,"start":0,"end":32,"rule":"fnprocdef"}]
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isFunctionDefinition":true}]
 
 		);
 	});
@@ -161,7 +162,7 @@ describe("WikiText parser tests", function() {
 	it("should parse single line function definitions with no parameters", function() {
 		expect(parse("\\function myMacro() nothing\n")).toEqual(
 
-			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isFunctionDefinition":true,"start":0,"end":27,"rule":"fnprocdef"}]
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isFunctionDefinition":true}]
 
 		);
 	});
@@ -169,7 +170,7 @@ describe("WikiText parser tests", function() {
 	it("should parse function definitions with parameters", function() {
 		expect(parse("\\function myMacro(one,two,three,four:elephant)\nnothing\n\\end\n")).toEqual(
 
-			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[{"name":"one"},{"name":"two"},{"name":"three"},{"name":"four","default":"elephant"}],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isFunctionDefinition":true,"start":0,"end":59,"rule":"fnprocdef"}]
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"nothing"}},"children":[],"params":[{"name":"one"},{"name":"two"},{"name":"three"},{"name":"four","default":"elephant"}],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"nothing"}],"isFunctionDefinition":true}]
 
 		);
 	});
@@ -177,7 +178,7 @@ describe("WikiText parser tests", function() {
 	it("should parse function definitions", function() {
 		expect(parse("\\function myMacro(one:'Jaguar')\n<$text text=<<one>>/>\n\\end\n\n")).toEqual(
 
-			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"<$text text=<<one>>/>"}},"children":[],"params":[{"name":"one","default":"Jaguar"}],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"<$text text=<<one>>/>"}],"isFunctionDefinition":true,"start":0,"end":58,"rule":"fnprocdef"}]
+			[{"type":"set","attributes":{"name":{"name":"name","type":"string","value":"myMacro"},"value":{"name":"value","type":"string","value":"<$text text=<<one>>/>"}},"children":[],"params":[{"name":"one","default":"Jaguar"}],"orderedAttributes":[{"name":"name","type":"string","value":"myMacro"},{"name":"value","type":"string","value":"<$text text=<<one>>/>"}],"isFunctionDefinition":true}]
 
 		);
 	});
@@ -185,7 +186,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":"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"}]}]
 
 		);
 	});
@@ -193,12 +194,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 ' } }, isBlock: true } ]
 
 		);
 		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 ' } }, isBlock: true } ]
 
 		);
 	});
@@ -206,38 +207,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","children":[{"type":"transclude","start":0,"end":8,"attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]},{"type":"transclude","start":8,"end":16,"attributes":{"$variable":{"name":"$variable","type":"string","value":"paul"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"paul"}]},{"type":"transclude","start":16,"end":26,"attributes":{"$variable":{"name":"$variable","type":"string","value":"george"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"george"}]},{"type":"transclude","start":26,"end":35,"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","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":92,"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","children":[{"type":"text","text":"ignored << carrots ","start":0,"end":19},{"type":"transclude","start":19,"end":27,"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","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":14,"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","children":[{"type":"text","text":"before\n","start":0,"end":7},{"type":"transclude","start":7,"end":15,"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","children":[{"type":"transclude","start":0,"end":8,"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","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":34,"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}]
 
 		);
 
@@ -246,37 +247,37 @@ 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, attributes: { $variable: { name: "$variable", type: "string", value: "john" }}, orderedAttributes: [ { name: "$variable", type: "string", value: "john" }], end: 8, isBlock: true }, { type: 'transclude', start: 9, attributes: { $variable: { name: "$variable", type: "string", value: "paul" }}, orderedAttributes: [ { name: "$variable", type: "string", value: "paul" }], end: 17, isBlock: true }, { type: 'transclude', start: 19, attributes: { $variable: { name: "$variable", type: "string", value: "george" }}, orderedAttributes: [ { name: "$variable", type: "string", value: "george" }], end: 29, isBlock: true }, { type: 'transclude', start: 30, 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(
 
-			[{"type":"transclude","start":0,"end":87,"rule":"macrocallblock","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"},"one":{"name":"one","type":"string","value":"val1","start":6,"end":15},"two":{"name":"two","type":"string","value":"val \"2\"","start":15,"end":30},"three":{"name":"three","type":"string","value":"val '3'","start":30,"end":47},"four":{"name":"four","type":"string","value":"val 4\"5'","start":47,"end":68},"five":{"name":"five","type":"string","value":"val 5","start":68,"end":84}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"one","type":"string","value":"val1","start":6,"end":15},{"name":"two","type":"string","value":"val \"2\"","start":15,"end":30},{"name":"three","type":"string","value":"val '3'","start":30,"end":47},{"name":"four","type":"string","value":"val 4\"5'","start":47,"end":68},{"name":"five","type":"string","value":"val 5","start":68,"end":84}],"isBlock":true}]
+			[{"type":"transclude","start":0,"end":87,"attributes":{"$variable":{"name":"$variable","type":"string","value":"john"},"one":{"name":"one","type":"string","value":"val1","start":6,"end":15},"two":{"name":"two","type":"string","value":"val \"2\"","start":15,"end":30},"three":{"name":"three","type":"string","value":"val '3'","start":30,"end":47},"four":{"name":"four","type":"string","value":"val 4\"5'","start":47,"end":68},"five":{"name":"five","type":"string","value":"val 5","start":68,"end":84}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"one","type":"string","value":"val1","start":6,"end":15},{"name":"two","type":"string","value":"val \"2\"","start":15,"end":30},{"name":"three","type":"string","value":"val '3'","start":30,"end":47},{"name":"four","type":"string","value":"val 4\"5'","start":47,"end":68},{"name":"five","type":"string","value":"val 5","start":68,"end":84}],"isBlock":true}]
 
 		);
 		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', start : 0, end : 10, children: [ { type: 'text', text: '<< carrots', start : 0, end : 10 } ] }, { type: 'transclude', start: 12, 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', start : 0, end : 6, children: [ { type: 'text', text: 'before', start : 0, end : 6 } ] }, { type: 'transclude', start: 8, 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, 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 } ] } ]
 
 		);
 		expect(parse("<<multiline arg:\"\"\"\n\nwikitext\n\"\"\" >>")).toEqual(
 
-			[{"type":"transclude","start":0,"end":36,"rule":"macrocallblock","attributes":{"$variable":{"name":"$variable","type":"string","value":"multiline"},"arg":{"name":"arg","type":"string","value":"\n\nwikitext\n","start":11,"end":33}},"orderedAttributes":[{"name":"$variable","type":"string","value":"multiline"},{"name":"arg","type":"string","value":"\n\nwikitext\n","start":11,"end":33}],"isBlock":true}]
+			[{"type":"transclude","start":0,"end":36,"attributes":{"$variable":{"name":"$variable","type":"string","value":"multiline"},"arg":{"name":"arg","type":"string","value":"\n\nwikitext\n","start":11,"end":33}},"orderedAttributes":[{"name":"$variable","type":"string","value":"multiline"},{"name":"arg","type":"string","value":"\n\nwikitext\n","start":11,"end":33}],"isBlock":true}]
 
 		);
 		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, 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 } ]
 
 		);
 	});
@@ -284,23 +285,23 @@ describe("WikiText parser tests", function() {
 	it("should parse tricky macrocall parameters", function() {
 		expect(parse("<<john pa>am>>")).toEqual(
 
-			[{"type":"transclude","start":0,"end":14,"attributes":{"0":{"name":"0","type":"string","value":"pa>am","start":6,"end":12},"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"0","type":"string","value":"pa>am","start":6,"end":12}],"isBlock":true,"rule":"macrocallblock"}]
+			[{"type":"transclude","start":0,"end":14,"attributes":{"0":{"name":"0","type":"string","value":"pa>am","start":6,"end":12},"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"0","type":"string","value":"pa>am","start":6,"end":12}],"isBlock":true}]
 
 		);
 		expect(parse("<<john param> >>")).toEqual(
 
-			[{"type":"transclude","start":0,"end":16,"attributes":{"0":{"name":"0","type":"string","value":"param>","start":6,"end":13},"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"0","type":"string","value":"param>","start":6,"end":13}],"isBlock":true,"rule":"macrocallblock"}]
+			[{"type":"transclude","start":0,"end":16,"attributes":{"0":{"name":"0","type":"string","value":"param>","start":6,"end":13},"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"0","type":"string","value":"param>","start":6,"end":13}],"isBlock":true}]
 
 		);
 		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","children":[{"type":"transclude","start":0,"end":14,"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
 		expect(parse("<<john var>=4 >>")).toEqual(
 
-			[{"type":"transclude","start":0,"end":16,"attributes":{"0":{"name":"0","type":"string","value":"var>=4","start":6,"end":13},"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"0","type":"string","value":"var>=4","start":6,"end":13}],"isBlock":true,"rule":"macrocallblock"}]
+			[{"type":"transclude","start":0,"end":16,"attributes":{"0":{"name":"0","type":"string","value":"var>=4","start":6,"end":13},"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"0","type":"string","value":"var>=4","start":6,"end":13}],"isBlock":true}]
 
 		);
 
@@ -309,7 +310,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', start : 0, end : 13, children : [ { type : 'entity', entity : '&mdash;' }, { type : 'text', text : 'Not a rule', start : 3, end : 13 } ] }, { type : 'element', tag : 'hr' }, { type : 'element', tag : 'p', start : 21, end : 28, children : [ { type : 'text', text : 'Between', start : 21, end : 28 } ] }, { type : 'element', tag : 'hr' } ]
 
 		);
 
@@ -318,7 +319,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', children : [ { type : 'text', text : 'Something', start : 3, end : 12 }, { type : 'element', tag : 'br' }, { type : 'text', text : 'in the', start : 13, end : 19 }, { type : 'element', tag : 'br' }, { type : 'text', text : 'way she moves', start : 20, end : 33 }, { type : 'element', tag : 'br' } ], start : 0, end : 37 } ]
 
 		);
 

editions/tw5.com/tiddlers/String Operators.tid

@@ -1,8 +0,0 @@
-created: 20230803054456864
-modified: 20230803054957952
-tags: Filters [[Filter Operators]]
-title: String Operators
-
-String operators are [[filter operators|Filter Operators]] that interact with strings.
-
-<<list-links "[tag[String Operators]]" class:"multi-columns">>

editions/tw5.com/tiddlers/Tag Operators.tid

@@ -1,8 +0,0 @@
-created: 20230803055001751
-modified: 20230803055210839
-tags: Filters [[Filter Operators]]
-title: Tag Operators
-
-Tag operators are [[filter operators|Filter Operators]] that interact with strings.
-
-<<list-links "[tag[Tag Operators]]">>

editions/tw5.com/tiddlers/about/Archive.tid

@@ -8,7 +8,7 @@ tags: About
 5.1.10 5.1.11 5.1.12 5.1.13 5.1.14 5.1.15 5.1.16 5.1.17 5.1.18 5.1.19
 5.1.20 5.1.21 5.1.22 5.1.23
 5.2.0 5.2.1 5.2.2 5.2.3 5.2.4 5.2.5 5.2.6 5.2.7
-5.3.0 5.3.1 5.3.2 5.3.3
+5.3.0 5.3.1
 \end
 
 Older versions of TiddlyWiki are available in the [[archive|https://github.com/Jermolene/jermolene.github.io/tree/master/archive]]:

editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid

@@ -1,5 +1,5 @@
 created: 20140908114400000
-modified: 20230803053808167
+modified: 20140923141919329
 tags: About
 title: History of TiddlyWiki
 type: text/vnd.tiddlywiki
@@ -32,17 +32,17 @@ Much of the early feedback was that TiddlyWiki was neat, but that it would be mo
 
 Within a few months I saw an experimental Firefox extension that enabled TiddlyWiki to save changes in the browser. Examining the code, I realised that the APIs that it used to write to the file system were actually available in ordinary HTML files - as long as they were loaded via a `file://` URI.
 
-I adapted the Firefox code into the core of TiddlyWiki, and soon added a similar ability for Internet Explorer (making use of an old [[ActiveX|https://en.wikipedia.org/wiki/ActiveX]] control that Microsoft distributed with Internet Explorer).
+I adapted the Firefox code into the core of TiddlyWiki, and soon added a similar ability for Internet Explorer (making use of an old ActiveX control that Microsoft distributed with Internet Explorer).
 
 ! Growth of TiddlyWiki
 
-A major milestone in the growth of TiddlyWiki was the creation of "GTDTiddlyWiki" by Nathan Bowers. He took the vanilla TiddlyWiki product and adapted it for the specific application of keeping track of tasks using the popular Getting Things Done methodology. GTDTiddlyWiki was an immediate hit, being enthusiastically greeted on websites like [[LifeHacker|https://lifehacker.com/]].
+A major milestone in the growth of TiddlyWiki was the creation of "GTDTiddlyWiki" by Nathan Bowers. He took the vanilla TiddlyWiki product and adapted it for the specific application of keeping track of tasks using the popular Getting Things Done methodology. GTDTiddlyWiki was an immediate hit, being enthusiastically greeted on websites like LifeHacker.
 
-Over the next couple of years TiddlyWiki continued to grow in popularity, and gained new features and capabilities. Within a year I was able to support myself by performing bespoke development work on TiddlyWiki, notably working with wiki pioneer [[SocialText|https://en.wikipedia.org/wiki/Socialtext]] on the ability to synchronise changes with an online server
+Over the next couple of years TiddlyWiki continued to grow in popularity, and gained new features and capabilities. Within a year I was able to support myself by performing bespoke development work on TiddlyWiki, notably working with wiki pioneer SocialText on the ability to synchronise changes with an online server
 
 ! BT Acquisition
 
-In May 2007, [[BT]] acquired [[Osmosoft]], my consultancy company. It was an unusual decision to acquire a company with a single employee and a tiny trickle of revenue - [[Osmosoft]] didn't even own the intellectual property in TiddlyWiki since I had handed it over to [[UnaMesa]] to assure its future for the community.
+In May 2007, [[BT]] acquired [[Osmosoft]], my consultancy company. It was an unusual decision to acquire a company with a single employee and a tiny trickle of revenue - [[Osmosoft]] didn't even own the intellectual property in TiddlyWiki since I had handed it over to UnaMesa to assure its future for the community.
 
 [[BT]]'s motivation was to help them understand community-based ecosystems. I joined the organisation as "Head of Open Source Innovation", taking responsibility for open source governance, and providing advice and expertise on how to participate in open soure communities.
 

editions/tw5.com/tiddlers/community/Community Editions.tid

@@ -1,9 +1,9 @@
 created: 20210101150806938
-modified: 20230803053451496
+modified: 20210101151808491
 tags: Community
 title: Community Editions
 
-These are prepackaged editions created by the ~TiddlyWiki [[Community]]. These are ~TiddlyWikis with added plugins and configurations to facilitate a certain use-case. These are great starting points if you want to quickly jump into TiddlyWiki and start using it without spending too much time configuring yourself.
+These are prepackaged editions created by the ~TiddlyWiki [[Community]]. These are TiddlyWikis with added plugins and configurations to facilitate a certain use-case. These are great starting points if you want to quickly jump into TiddlyWiki and start using it without spending too much time configuring yourself.
 
 <div class="tc-link-info">
 

editions/tw5.com/tiddlers/community/Contributor License Agreement.tid

@@ -1,10 +1,10 @@
 created: 20150630205511173
-modified: 20230803053548871
+modified: 20220226175543038
 tags: 
 title: Contributor License Agreement
 type: text/vnd.tiddlywiki
 
-Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the [[UnaMesa]] Association (the legal entity that owns TiddlyWiki on behalf of the community).
+Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).
 
 * For individuals use: [[licenses/CLA-individual|https://github.com/Jermolene/TiddlyWiki5/tree/tiddlywiki-com/licenses/cla-individual.md]]
 * For entities use: [[licenses/CLA-entity|https://github.com/Jermolene/TiddlyWiki5/tree/tiddlywiki-com/licenses/cla-entity.md]]

editions/tw5.com/tiddlers/concepts/ColourPalettes.tid

@@ -1,10 +1,10 @@
 created: 20140216102454178
-modified: 20230803045407958
+modified: 20160617101212889
 tags: Concepts
 title: ColourPalettes
 type: text/vnd.tiddlywiki
 
-A colour palette is a [[data tiddler|DataTiddlers]] that supplies a [[CSS|Cascading Style Sheets]] colour value, such as ''yellow'' or ''#fe0'', for each of several colour names, like this:
+A colour palette is a [[data tiddler|DataTiddlers]] that supplies a [[CSS]] colour value, such as ''yellow'' or ''#fe0'', for each of several colour names, like this:
 
 ```
 page-background: #fe0

editions/tw5.com/tiddlers/concepts/Hard and Soft Links.tid

@@ -1,10 +1,10 @@
 created: 20150123220237000
-modified: 20240610085736941
+modified: 20150226163104000
 tags: Concepts
 title: Hard and Soft Links
 type: text/vnd.tiddlywiki
 
-A <<.def "hard link">> is a [[link|Linking in WikiText]] that can be detected by a superficial examination of WikiText.
+A <<.def "hard link">> is one that can be detected by a superficial examination of WikiText.
 
 A link is <<.def "soft">> if it is:
 
@@ -13,5 +13,3 @@ A link is <<.def "soft">> if it is:
 * generated by a link widget whose <<.attr to>> attribute is a transclusion, macro or variable
 
 <$macrocall $name=".warning" _="""Soft links are not detected by link-related filter operators such as <<.olink backlinks>>, <<.olink links>>, <<.olink all>> and <<.olink is>>."""/>
-
-This concept is analogous to [[Hard and Soft Transclusions]].

editions/tw5.com/tiddlers/concepts/Hard and Soft Transclusions.tid

@@ -1,16 +0,0 @@
-created: 20240610085133221
-modified: 20240610085613037
-tags: Concepts
-title: Hard and Soft Transclusions
-
-A <<.def "hard transclusion">> is a [[transclusion|Transclusion]] that can be detected by a superficial examination of WikiText.
-
-A transclusion is <<.def "soft">> if it is:
-
-* contained in text [[trancluded|Transclusion]] from elsewhere
-* supplied via a [[macro|Macros]], [[procedure|Procedures]] or [[variable|Variables]]
-* generated by a [[transclude widget|TranscludeWidget]] whose <<.attr $tiddler>> attribute is a transclusion, macro or variable
-
-<$macrocall $name=".warning" _="""Soft transclusions are not detected by transclusion-related filter operators <<.olink transcludes>> and <<.olink backtranscludes>>."""/>
-
-This concept is analogous to [[Hard and Soft Links]].

editions/tw5.com/tiddlers/concepts/ShadowTiddlers.tid

@@ -1,7 +1,5 @@
-created: 20230803052544962
-modified: 20230803052604957
-tags: Concepts
 title: ShadowTiddlers
+tags: Concepts
 
 \define actions()
 <$action-setfield $tiddler="$:/state/tab/moresidebar-1850697562" $field="text" $value="$:/core/ui/MoreSideBar/Shadows"/>
@@ -15,7 +13,7 @@ ShadowTiddlers are tiddlers that are loaded from [[Plugins]] at the wiki startup
 
 !! Overriding Shadow Tiddlers to modify plugins
 
-A [[ShadowTiddler|ShadowTiddlers]] can be overridden with an ordinary tiddler of the same name. This leaves the shadow tiddler intact but the plugin will use the overriding tiddler in its place, effectively allowing users to modify the behaviour of plugins.
+A ShadowTiddler can be overridden with an ordinary tiddler of the same name. This leaves the shadow tiddler intact but the plugin will use the overriding tiddler in its place, effectively allowing users to modify the behaviour of plugins.
 
 Users are cautioned against overriding shadow tiddlers because if the shadow tiddler is changed in a plugin update, the overriding tiddler may no longer perform as intended. To remedy this, the overriding tiddler may be modified or deleted. If the overriding tiddler is deleted, then the plugin falls back to using the original shadow tiddler.
 

editions/tw5.com/tiddlers/concepts/Transclusion.tid

@@ -20,4 +20,3 @@ To learn more:
 * TextReference
 * TemplateTiddlers
 * TranscludeWidget
-* [[Hard and Soft Transclusions]]

editions/tw5.com/tiddlers/customising/Alternative page layouts.tid

@@ -1,5 +1,5 @@
 created: 20201123172925848
-modified: 20230803052005116
+modified: 20211126120310891
 tags: [[Customise TiddlyWiki]]
 title: Alternative page layouts
 type: text/vnd.tiddlywiki
@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki
 
 ! Creating an alternative page layout
 
-Creating an alternative layout goes beyond [[adding or removing features|Customising TiddlyWiki's user interface]] from the default interface and allows you to create an entirely new layout from scratch.
+Creating an alternative layout goes beyond [[adding or removing features|Page and tiddler layout customisation]] from the default interface and allows you to create an entirely new layout from scratch.
 
 To create an alternative page layout and have the ability to switch to it, you need to create an alternative page template tiddler with the [[SystemTag: $:/tags/Layout]].
 

editions/tw5.com/tiddlers/customising/Creating new toolbar buttons.tid

@@ -1,5 +1,5 @@
 created: 20211124205415217
-modified: 20230803050345698
+modified: 20211126162937536
 tags: [[Customise TiddlyWiki]]
 title: Creating new toolbar buttons
 type: text/vnd.tiddlywiki
@@ -8,7 +8,7 @@ Let's say you have a skeleton tiddler called 'Recipe template', and you want to
 
 # You will want an image for your button. If none of the core images (shadow tiddlers with the prefix $:/core/images/) work for you, then you will need to create or acquire an SVG image (for example, one of the images at http://flaticon.com), drag it into your file so that it becomes a tiddler, edit the tiddler and adjust the height and width to 22px
 # You will want to create the tiddler that contains your tiddler. Create it, title it, and add the button code (see the code at the bottom of this tiddler for an example, with hints where you will need to adapt it). Tag it [[$:/tags/ViewToolbar]]
-# You will need to create a tiddler that tells TiddlyWiki whether your button should be visible in the toolbar or hidden. Let's title it [[$:/config/ViewToolbarButtons/Visibility/Recipe]]. Type `show` into the text area, and save. If you want to hide it, type `hide` into the text area and save. The button will also be accessable from the ''Control Panel : Appearance : Toolbars : View Toolbar'' tab
+# You will need to create a tiddler that tells TiddlyWiki whether your button should be visible in the toolbar or hidden. Let's title it [[$:/config/ViewToolbarButtons/Visibility/Recipe]]. Type `show` into the text area, and save. If you want to hide it, type `hide` into the text area and save. The button will also be accessable from the ''ControlPanel : Appearance : Toolbars : ViewToolbar'' tab
 # You will want to position the button properly. Open the tiddler $:/tags/ViewToolbar and insert your button tiddler's title in the appropriate place in the list field.
 
 ```

editions/tw5.com/tiddlers/definitions/TiddlyFox.tid

@@ -1,12 +1,10 @@
 created: 20130825161100000
-modified: 20230803051056946
+modified: 20200104111952539
 tags: Definitions
 title: TiddlyFox
 type: text/vnd.tiddlywiki
 
-<<.deprecated-since "FireFox 57" "Saving">>
-
-TiddlyFox is an extension for older versions of Firefox that allows standalone TiddlyWiki files to save their changes directly to the file system. TiddlyFox works on both desktop and smartphone versions of <a href="https://www.mozilla.org/en-US/firefox/">Firefox</a>. See [[Saving with TiddlyFox]] or [[Saving with TiddlyFox on Android]] for detailed instructions.
+TiddlyFox is an extension for older versions of Firefox that allows standalone TiddlyWiki files to save their changes directly to the file system. TiddlyFox works on both desktop and smartphone versions of [[Firefox]]. See [[Saving with TiddlyFox]] or [[Saving with TiddlyFox on Android]] for detailed instructions.
 
 TiddlyFox is now obsolete due to its incompatibility with the latest versions of Firefox - see [[TiddlyFox Apocalypse]]. There are many alternatives to TiddlyFox, but none that work in precisely the same way -- see GettingStarted for details.
 

editions/tw5.com/tiddlers/definitions/UnaMesa.tid

@@ -1,10 +0,0 @@
-created: 20230803213647552
-modified: 20230803214110365
-tags: Definitions
-title: UnaMesa
-
-<<<
-The UnaMesa Association, a 501(c)(3) non-profit, helps entrepreneurs strengthen communities, improve health, and increase well-being. Located in Palo Alto, CA, we incubate projects such as the Magical Bridge Foundation and ~InPlay that translate technology into better social services and new ways of connecting within and across communities. Our overarching goal is to work with networks of social enterprises to develop shared technologies and frameworks for appropriately valuing interactions and relationships in healthcare, education, social services and related domains that recieve short shrift in today's transaction based marketplace. In our view, the purpose of "impact accounting" should be to drive innovations in health, education, social services by making visible which opportunities and experiences are most meaningful in the lives of individuals and families.
-<<<
-
-[[UnaMesa|https://unamesa.org/]] holds the intellectual property rights in TiddlyWiki for the benefit of the community, ensuring that it always remains available under the present permissive license. It has supported the TiddlyWiki open source project since 2006.

editions/tw5.com/tiddlers/fields/ListField.tid

@@ -1,8 +1,8 @@
-caption: list
 created: 20130830092500000
-modified: 20230803052727464
+modified: 20150124202924000
 tags: Fields
 title: ListField
+caption: list
 type: text/vnd.tiddlywiki
 
 The `list` [[field of a tiddler|TiddlerFields]] is an optional feature that can be used to help structure your content. Its value is a [[title list|Title List]], and it can be used in several ways:
@@ -10,4 +10,4 @@ The `list` [[field of a tiddler|TiddlerFields]] is an optional feature that can
 * The `list` field of a tiddler that is being used as a tag determines the ordering of the tiddlers that carry that tag - see [[Tagging]] for details
 * The `list` [[filter|Filters]] selects the entries from a list
 * The `listed` [[filter|Filters]] selects the tiddlers that list the selected tiddler(s)
-* The NavigatorWidget manipulates a [[StoryList|$:/StoryList]] tiddler containing a `list` field of the tiddlers that are displayed in the main story column
+* The NavigatorWidget manipulates a StoryList tiddler containing a `list` field of the tiddlers that are displayed in the main story column

editions/tw5.com/tiddlers/filters/backtranscludes.tid

@@ -1,14 +1,13 @@
-caption: backtranscludes
 created: 20211002204500000
-modified: 20240610085949413
-op-input: a [[selection of titles|Title Selection]]
-op-output: any non-[[system|SystemTiddlers]] titles that [[hard-transclude|Hard and Soft Transclusions]] the input titles
-op-parameter: none
-op-purpose: find the titles that transclude each input title
 tags: [[Filter Operators]]
 title: backtranscludes Operator
 type: text/vnd.tiddlywiki
+caption: backtranscludes
+op-purpose: find the titles that transcludes to each input title
+op-input: a [[selection of titles|Title Selection]]
+op-parameter: none
+op-output: any non-[[system|SystemTiddlers]] titles that contain [[transclusion|Transclusion]] to the input titles
 
-<<.from-version 5.3.4>> Each input title is processed in turn. The corresponding tiddler's list of backtransclusions is generated, sorted alphabetically by title, and then [[dominantly appended|Dominant Append]] to the operator's overall output. Analogous to [[backlinks|backlinks Operator]].
+<<.from-version 5.3.4>> Similar to [[backlinks|backlinks Operator]]. Each input title is processed in turn. The corresponding tiddler's list of backtranscludes is generated, sorted alphabetically by title, and then [[dominantly appended|Dominant Append]] to the operator's overall output.
 
 <<.operator-examples "backtranscludes">>

editions/tw5.com/tiddlers/filters/splitregexp Operator.tid

@@ -1,6 +1,6 @@
 caption: splitregexp
 created: 20190613154722705
-modified: 20240606113433618
+modified: 20190613154924724
 op-input: a [[selection of titles|Title Selection]]
 op-output: the input titles split into separate items according to the specified regular expression <<.place R>>
 op-parameter: The regular expression at which to split each title
@@ -13,7 +13,7 @@ type: text/vnd.tiddlywiki
 
 <<.from-version "5.1.20">>
 
-<<.note """... that in some circumstances the <<.op splitregexp>> operator will include blank items in the list of results. For example, """>>
+Note that in some circumstances the <<.op splitregexp>> operator will include blank items in the list of results. For example, 
 
 ```
 [[the band thethe are the best the]splitregexp[the]]
@@ -42,21 +42,3 @@ Syntax errors in the regular expression will cause the filter to return an error
 <<.operator-example 2 "[[the cat sat on the mat]splitregexp[\]]">>
 
 <<.operator-examples "splitregexp">>
-
-----
-
-The <<.op splitregexp>> operator is intended to be used as described above. If the `regexp` contains //capture groups// those groups will be included into the output.
-
-<<.bad-example """```
-\procedure re() (color)|(colour)ed
-\procedure str() Some coloured text
-{{{ [<str>splitregexp<re>join[, ]] }}}
-```""">>
-
-Somewhat more useful may be this code. 
-
-```
-\procedure re() (colou?red)
-\procedure str() Some coloured text
-{{{ [<str>splitregexp<re>join[, ]] }}}
-```

editions/tw5.com/tiddlers/filters/transcludes.tid

@@ -1,14 +1,13 @@
-caption: transcludes
 created: 20211002204500000
-modified: 20240610085927867
-op-input: a [[selection of titles|Title Selection]]
-op-output: the titles which the input tiddlers [[hard-transclude|Hard and Soft Transclusions]]
-op-parameter: none
-op-purpose: find the titles transcluded by each input title
 tags: [[Filter Operators]] [[Common Operators]]
 title: transcludes Operator
 type: text/vnd.tiddlywiki
+caption: transcludes
+op-purpose: find the titles linked to by each input title
+op-input: a [[selection of titles|Title Selection]]
+op-parameter: none
+op-output: the titles to which the input tiddlers [[transcludes|Transclusion]]
 
-<<.from-version 5.3.4>> Each input title is processed in turn. The corresponding tiddler's list of transclusions is generated, in the order in which they appear in the tiddler's text, and [[dominantly appended|Dominant Append]] to the operator's overall output.
+Each input title is processed in turn. The corresponding tiddler's list of transcludes is generated, in the order in which they appear in the tiddler's text, and [[dominantly appended|Dominant Append]] to the operator's overall output.
 
 <<.operator-examples "transcludes">>

editions/tw5.com/tiddlers/howtos/Custom_data-styles.tid

@@ -1,11 +1,9 @@
-created: 20180411173900000
-modified: 20230803050721827
+created: 201804111739
+modified: 201804111739
 tags: data-tags-styles [[How to apply custom styles]] $:/tags/Stylesheet
 title: Custom data-styles
 type: text/vnd.tiddlywiki
 
-\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html
-
 [data-tiddler-title="Custom styles by data-tiddler-title"] {
   border: 1px solid blue;
 }

editions/tw5.com/tiddlers/howtos/How to embed PDF and other documents.tid

@@ -1,5 +1,5 @@
 created: 20141117000000000
-modified: 20230803051806817
+modified: 20161229175752081
 tags: Learning
 title: How to embed PDF and other documents
 type: text/vnd.tiddlywiki
@@ -24,7 +24,7 @@ This method be OK as long as your PDF is not too big. There can be concerns if y
 
 !!! 2. Embedding with '_canonical_uri'
 
-The other way is to create a tiddler link to the external file. In this method the file is not actually incorporated into your TW5 file, but can be accessed with the `{{My Image File.jpg}}` transclusion syntax just like an embedded file. The location address of the file can also be changed under [[Node.js]]. See [[ExternalImages]] for details of using external images with node.js.
+The other way is to create a tiddler link to the external file. In this method the file is not actually incorporated into your TW5 file, but can be accessed with the `{{My Image File.jpg}}` transclusion syntax just like an embedded file. The location address of the file can also be changed under [[node.js]]. See [[ExternalImages]] for details of using external images with node.js.
 
 Create a tiddler with a field `_canonical_uri`. Put in the local address to the external file. Set the `type` field to `application/pdf`.
 

editions/tw5.com/tiddlers/howtos/Setting a page background image.tid

@@ -1,5 +1,5 @@
 created: 20150417155912612
-modified: 20230803044412567
+modified: 20160610082700598
 tags: [[Customise TiddlyWiki]]
 title: Setting a page background image
 type: text/vnd.tiddlywiki
@@ -14,5 +14,5 @@ type: text/vnd.tiddlywiki
 #* ''Cover'' causes the background image to be sized so that it completely covers the page. Some of the image may be clipped
 #* ''Contain'' causes the background image to be sized so that it fits within the page
 
-Note that the palette [[DarkPhotos|ColourPalettes]] is provided to make the sidebar more readable on dark background images.
+Note that the palette ''DarkPhotos'' is provided to make the sidebar more readable on dark background images.
 

editions/tw5.com/tiddlers/howtos/Tagging.tid

@@ -1,5 +1,5 @@
 created: 20140904075400000
-modified: 20230803050201458
+modified: 20160612132049797
 tags: [[Working with TiddlyWiki]] Concepts
 title: Tagging
 type: text/vnd.tiddlywiki
@@ -20,7 +20,7 @@ By tagging your tiddlers, you can view, navigate and organise your information i
 
 * You can use [[filters|Filters]] to create lists of tiddlers based on their tags. You can then display any combination of the [[fields|TiddlerFields]] of those tiddlers. For example, you could build a glossary by listing the title and text of all tiddlers tagged ''Glossary''. Such lists can be formatted in any way you wish: e.g. bulleted, numbered or comma-separated.
 
-* There are a number of special ''system tags'' that control the layout of tiddlers and the entire ~TiddlyWiki page. See [[Page and tiddler layout customisation|Customising TiddlyWiki's user interface]] for instructions.
+* There are a number of special ''system tags'' that control the layout of tiddlers and the entire ~TiddlyWiki page. See [[Page and tiddler layout customisation]] for instructions.
 
 There are two more things you can do with tags:
 
@@ -28,7 +28,7 @@ There are two more things you can do with tags:
 
 You can use the <<.icon $:/core/images/tag-button>> [[tag manager|$:/TagManager]], found on the ''Tags'' tab under ''More'' in the sidebar, to change the colour of a tag's pill or add an icon to the pill.
 
-* To change the colour, click the button in the ''Colour'' column to select from a colour picker. Alternatively, click the icon in the ''Info'' column, then type a [[CSS|Cascading Style Sheets]] colour value in the ''Colour'' field
+* To change the colour, click the button in the ''Colour'' column to select from a colour picker. Alternatively, click the icon in the ''Info'' column, then type a [[CSS]] colour value in the ''Colour'' field
 * To change the icon, click the <<.icon $:/core/images/down-arrow>> button in the ''Icon'' column and choose from the list of available icons
 
 ! Change the order in which tags are listed

editions/tw5.com/tiddlers/howtos/Using Excise.tid

@@ -1,11 +1,11 @@
 created: 20160810122928198
-modified: 20230803044526608
+modified: 20230505104214168
 tags: [[Editor toolbar]]
 title: Using Excise
 type: text/vnd.tiddlywiki
 
 ! Excise text
-From the [[Editor toolbar]] you can export selected text to a new tiddler and insert a [[link|Linking in WikiText]], [[Transclusion]] or [[macro|Macros]] in its place. Click ''Excise text'' (<<.icon $:/core/images/excise>>), input name of the new tiddler, and choose excise method.
+From the EditorToolbar you can export selected text to a new tiddler and insert a [[link|Linking in WikiText]], [[Transclusion]] or [[macro|Macros]] in its place. Click ''Excise text'' (<<.icon $:/core/images/excise>>), input name of the new tiddler, and choose excise method.
 
 !! How to excise text
 # Highlight the relevant piece of text 

editions/tw5.com/tiddlers/macros/StylesheetMacros.tid

@@ -1,5 +1,5 @@
 created: 20150221181835000
-modified: 20230803034031256
+modified: 20150221223956000
 tags: Macros [[Core Macros]]
 title: Stylesheet Macros
 type: text/vnd.tiddlywiki
@@ -16,8 +16,6 @@ The following core [[macros|Macros]] make it easy to specify alternative browser
 : for the `x-transition-origin` properties
 ;`<<background-linear-gradient gradient>>`
 : for the `x-linear-gradient` values of the `background-image` property
-;`<<column-count columns>>`
-: for the `x-column-count` property
 
 The following macros are documented separately:
 

editions/tw5.com/tiddlers/macros/list-thumbnails Macro.tid

@@ -1,19 +1,19 @@
 caption: list-thumbnails
 created: 20200612170158838
-modified: 20230803033631967
+modified: 20200612171804473
 tags: Macros [[Core Macros]]
 title: list-thumbnails Macro
 type: text/vnd.tiddlywiki
 
-The <<.def list-thumbnails>> [[macros|Macros]] are used to create lists of linkable thumbnail panels. It assumes that the input has <<.field icon>>, <<.field color>>, <<.field background-color>>, <<.field image>>, and <<.field caption>> fields, filled as desired.
+The <<.def list-thumbnails>> [[macros|Macros]] are used to create lists of linkable thumbnail panels.
 
 !! Parameters
 
 ;filter
-: A [[filter|Filters]] for selecting thumbnails
+: filter for selecting thumbnails
 ;width
-: A width in px for the thumbnail, defaulting to `280`
+:Width of thumbnail (default 280 pixels)
 ;height
-: A height in px for the thumbnail, defaulting to `157`
+:Height of thumbnail (default 157 pixels)
 
 <<.macro-examples "list-thumbnails">>

editions/tw5.com/tiddlers/macros/thumbnail Macro.tid

@@ -1,29 +1,14 @@
 caption: thumbnail
 created: 20150325172203603
-modified: 20230803033450805
+modified: 20150325172336079
 tags: Macros [[Core Macros]]
 title: thumbnail Macro
 type: text/vnd.tiddlywiki
 
-The <<.def thumbnail>> [[macro|Macros]] is used to create linkable thumbnail panels. An alternative <<.def thumbnail-right>> macro uses the same parameters, but floats to the right of its container.
+The <<.def thumbnail>> [[macros|Macros]] are used to create linkable thumbnail panels.
 
 !! Parameters
 
-;link
-: The tiddler to link to
-;icon
-: An icon to place in the center of the thumbnail. Must be enclosed in curly brackets
-;color
-: A color for the icon
-;background-color
-: A background color if there is no image. Does not show if the image has transparency
-;image
-: A background image for the thumbnail
-;caption
-: A caption for the element
-;width
-: A width in px for the thumbnail, defaulting to `280`
-;height
-: A height in px for the thumbnail, defaulting to `157`
+(none)
 
-<<.macro-examples "thumbnail">>
+<<.macro-examples "thumbnail">>

editions/tw5.com/tiddlers/mechanisms/WikificationMechanism.tid

@@ -1,5 +1,5 @@
 created: 20191012080221911
-modified: 20230803052515281
+modified: 20191013094002890
 tags: Mechanisms
 title: WikificationMechanism
 type: text/vnd.tiddlywiki
@@ -8,8 +8,8 @@ type: text/vnd.tiddlywiki
 
 It is composed of several distinct steps:
 
-* [[ParserMechanism|WikiText parser mode transitions]]: reading the text of tiddlers and scanning for wikitext constructions, outputting a tree representation of the resulting structure. It is an expensive process so parse trees are cached, and only need to be updated if the corresponding tiddler is changed
-* [[WidgetMechanism|Widgets]]: starting with a specified root tiddler, recursively instantiate a widget for each parse tree node making a rendering tree. Widgets can optionally also create DOM nodes
+* ParserMechanism: reading the text of tiddlers and scanning for wikitext constructions, outputting a tree representation of the resulting structure. It is an expensive process so parse trees are cached, and only need to be updated if the corresponding tiddler is changed
+* WidgetMechanism: starting with a specified root tiddler, recursively instantiate a widget for each parse tree node making a rendering tree. Widgets can optionally also create DOM nodes
 * RefreshMechanism: handling changes to the tiddler store by selectively and efficiently updating a rendering tree
 
 This mechanism is used in the browser to build TiddlyWiki's main interactive page. At startup, the tiddler $:/core/ui/PageTemplate is parsed and rendered to the DOM, recursively pulling in other tiddlers to build the entire user interface. Any user interactions -- following a link, clicking a button, or typing in a text box -- trigger a change in the tiddler store which then automatically propagates through the widget tree.  For example, if the user clicks a link to navigate to a new tiddler, the following steps take place:

editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-bitmap-operation.tid

@@ -1,6 +1,6 @@
 caption: tm-edit-bitmap-operation
 created: 20160424204236050
-modified: 20230803045807664
+modified: 20230723214716576
 tags: Messages
 title: WidgetMessage: tm-edit-bitmap-operation
 type: text/vnd.tiddlywiki
@@ -37,7 +37,7 @@ A `tm-edit-bitmap-operation` invokes one of the available operations on a __surr
 |//{any other params}// |Any other parameters are made available as variables within the context of the widget message. |
 
 
-The `tm-edit-bitmap-operation` message is usually generated by a ButtonWidget or an [[ActionWidget|ActionWidgets]] and is handled by the surrounding bitmap editor.
+The `tm-edit-bitmap-operation` message is usually generated by a ButtonWidget or an ActionWidget and is handled by the surrounding bitmap editor.
 
 ! Bitmap Operations
 

editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid

@@ -1,6 +1,6 @@
 caption: tm-edit-text-operation
 created: 20160424211339792
-modified: 20230803045746596
+modified: 20230723214636245
 tags: Messages
 title: WidgetMessage: tm-edit-text-operation
 type: text/vnd.tiddlywiki
@@ -123,7 +123,7 @@ A `tm-edit-text-operation` invokes one of the available operations on a __surrou
 |param |Name of the operation to be executed, see ''below'' for a list of possible operations |
 |//{any other params}// |Any other parameters are made available as variables within the context of the widget message. |
 
-The `tm-edit-text-operation` message is usually generated by a ButtonWidget or an [[ActionWidget|ActionWidgets]] and is handled by the surrounding text editor.
+The `tm-edit-text-operation` message is usually generated by a ButtonWidget or an ActionWidget and is handled by the surrounding text editor.
 
 ! Text Operations
 

editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Examples.tid

@@ -1,117 +0,0 @@
-created: 20240609152203076
-modified: 20240614210714914
-tags: 
-title: WidgetMessage: tm-http-request Examples
-type: text/vnd.tiddlywiki
-
-<$let store-fetched-output="""\procedure store-fetched-output()
-<$action-setfield $tiddler=Output status=<<status>> error=<<error>> data=<<data>> headers=<<headers>>/>
-\end
-""">
-<$testcase>
-<$data title=Description text="Simple tm-http-request GET"/>
-<$data title=Narrative text="""Use the oncompletion attribute to store the results of a method="GET" request"""/>
-<$data title=Output text=`$(store-fetched-output)$
-\procedure http-get()
-	<$action-sendmessage
-		$message="tm-http-request"
-		url="https://httpbin.org/get"
-		method="GET"
-		oncompletion=<<store-fetched-output>>
-	/>
-\end
-
-<$button actions=<<http-get>>>send HTTP GET</$button>`/>
-</$testcase>
-
-<$testcase>
-<$data title=Description text="Simple tm-http-request POST"/>
-<$data title=Narrative text="""Use the oncompletion attribute to store the results of a method="POST" request. Use the body attribute to send data"""/>
-<$data title=Output text=`$(store-fetched-output)$
-\procedure http-post()
-	<$action-sendmessage
-		$message="tm-http-request"
-		url="https://httpbin.org/post"
-		method="POST"
-		body='{"foo": "bar"}'
-		oncompletion=<<store-fetched-output>>
-	/>
-\end
-
-<$button actions=<<http-post>>>send HTTP POST</$button>`/>
-</$testcase>
-
-<$testcase>
-<$data title=Description text="tm-http-request with delayed response"/>
-<$data title=Narrative text="""Use the bind-status and bind-progress attributes to watch the intermediate state of a slow response"""/>
-<$data title=Output text=`$(store-fetched-output)$
-\procedure http-get()
-	<$action-sendmessage
-		$message="tm-http-request"
-		url="https://httpbin.org/delay/2"
-		bind-status=status
-		bind-progress=progress
-		method="GET"
-		oncompletion=<<store-fetched-output>>
-	/>
-\end
-
-<$button actions=<<http-get>>>send HTTP GET</$button>
-
-|!status |{{status}}|
-|!progress %|{{progress}}|`/>
-</$testcase>
-
-<$testcase>
-<$data title=Description text="tm-http-request with dripped response"/>
-<$data title=Narrative text="""Use the bind-status and bind-progress attributes to watch progress of data which arrives a little at a time"""/>
-<$data title=Output text=`$(store-fetched-output)$
-\procedure http-get()
-	<$action-sendmessage
-		$message="tm-http-request"
-		url="https://httpbin.org/drip?duration=2&numbytes=10&code=200&delay=2"
-		bind-status=status
-		bind-progress=progress
-		method="GET"
-		oncompletion=<<store-fetched-output>>
-	/>
-\end
-
-<$button actions=<<http-get>>>send HTTP GET</$button>
-
-|!status |{{status}}|
-|!progress %|{{progress}}|`/>
-</$testcase>
-
-<$testcase>
-<$data title=Description text="tm-http-request 504 Bad Gateway error response"/>
-<$data title=Narrative text="""Send a request to a url which simulates a 504 HTTP response in order to illustrate what an error response looks like"""/>
-<$data title=Output text=`$(store-fetched-output)$
-\procedure http-get()
-	<$action-sendmessage
-		$message="tm-http-request"
-		url="https://httpbin.org/status/504"
-		method="GET"
-		oncompletion=<<store-fetched-output>>
-	/>
-\end
-
-<$button actions=<<http-get>>>send HTTP GET</$button>`/>
-</$testcase>
-
-<$testcase>
-<$data title=Description text="tm-http-request 405 Method Not Allowed error response"/>
-<$data title=Narrative text="""Another error response example. This one sends a GET to a URL which only allows POST"""/>
-<$data title=Output text=`$(store-fetched-output)$
-\procedure http-get()
-	<$action-sendmessage
-		$message="tm-http-request"
-		url="https://httpbin.org/post"
-		method="GET"
-		oncompletion=<<store-fetched-output>>
-	/>
-\end
-
-<$button actions=<<http-get>>>send HTTP GET</$button>`/>
-</$testcase>
-</$let>

editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request.tid

@@ -1,6 +1,6 @@
 caption: tm-http-request
 created: 20230429161453032
-modified: 20240614204704401
+modified: 20230723215344887
 tags: Messages
 title: WidgetMessage: tm-http-request
 type: text/vnd.tiddlywiki
@@ -54,7 +54,6 @@ Note that the state tiddler $:/state/http-requests contains a number representin
 
 !! Examples
 
-* Several simple examples using https://httpbin.org: [[WidgetMessage: tm-http-request Examples]]
 * [[Zotero's|https://www.zotero.org/]] API for retrieving reference items: [[WidgetMessage: tm-http-request Example - Zotero]]
 * [[Random Dog's|https://random.dog/]] API for retrieving random pictures of dogs showing how to retrieve binary data: [[WidgetMessage: tm-http-request Example - Random Dog]]
 * Example of using HTTP Basic Authentication: [[WidgetMessage: tm-http-request Example - Basic Authentication]]

editions/tw5.com/tiddlers/procedures/Procedures.tid

@@ -18,13 +18,12 @@ The name wrapped in double angled [[brackets|Brackets]] is a shorthand way of [[
 
 ```
 <<my-procedure>>
-<<my-procedure "The parameter">>
 <<my-procedure parameter:"The parameter">>
 ```
 
 The parameters that are specified in the procedure call are made available as variables.
 
-<<.tip """If a procedure has more than one parameter, it is highly encouraged to use "named parameters", as shown in the third example above and in contrast to the second example. Even if it is more to type, it will pay off in the long run.""">>
+<<.tip """If a procedure has more than 1 parameter, it is highly encouraged to use "named parameters", as shown in the second example above. Even if it is more to type, it will pay off in the long run.""">>
 
 !! How Procedures Work
 

editions/tw5.com/tiddlers/releasenotes/Release 5.3.2.tid

@@ -1,11 +1,11 @@
 caption: 5.3.2
 created: 20231213080637781
-description: Conditional Shortcut Syntax, ListWidget Improvements
 modified: 20231213080637781
 released: 20231213080637781
 tags: ReleaseNotes
 title: Release 5.3.2
 type: text/vnd.tiddlywiki
+description: Under development
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.1...v5.3.2]]//
 

editions/tw5.com/tiddlers/releasenotes/Release 5.3.3.tid

@@ -1,11 +1,11 @@
 caption: 5.3.3
 created: 20231223102201587
-description: Bugfix release for v5.3.2
 modified: 20231223102201587
 released: 20231223102201587
 tags: ReleaseNotes
 title: Release 5.3.3
 type: text/vnd.tiddlywiki
+description: Under development
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.2...v5.3.3]]//
 

editions/tw5.com/tiddlers/saving/Saving with Polly.tid

@@ -9,6 +9,7 @@ modified: 20220223160414274
 tags: Chrome Firefox [[Internet Explorer]] Linux Mac Opera Safari Saving Windows Edge
 title: Saving with Polly
 type: text/vnd.tiddlywiki
+ribbon-text: NEW
 
 [[Polly|https://github.com/Marxsal/polly]] is a batch file system using Windows //~PowerShell// to restore ~TiddlyWiki files from a specified download directory to their original home directory.
 

editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid

@@ -1,14 +1,12 @@
 created: 20140103134551508
-modified: 20230803051340676
+modified: 20171113131640857
 tags: [[Saving with TiddlyFox]]
 title: Saving with TiddlyFox on Android
 type: text/vnd.tiddlywiki
 
-<<.deprecated-since "FireFox 57" "Saving">>
-
 (Alternatively, see the [[video tutorial|TiddlyWiki on Firefox for Android Video]])
 
-# Ensure you have the latest version of [[Firefox for Android|http://getfirefox.com]]
+# Ensure you have the latest version of [[Firefox for Android]]
 #* http://getfirefox.com
 # Install the latest release of the TiddlyFox extension from:
 #* https://addons.mozilla.org/en-GB/firefox/addon/tiddlyfox/

editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid

@@ -10,4 +10,4 @@ tags: Saving Firefox
 title: Saving with TiddlyFox
 type: text/vnd.tiddlywiki
 
-<<.deprecated-since "FireFox 57" "Saving with FireFox">>
+<<.deprecated-since "FireFox 57" "Saving with FireFox">>

editions/tw5.com/tiddlers/saving/TiddlyBucket - Save to AWS or Google Storage.tid

@@ -8,6 +8,7 @@ modified: 20221126192853897
 tags: Chrome Firefox [[Internet Explorer]] Linux Mac Opera Safari Saving Windows iOS Edge
 title: TiddlyBucket - Save to AWS or Google Storage
 type: text/vnd.tiddlywiki
+ribbon-text: NEW
 
 ~TiddlyBucket - Save to AWS or Google Storage using Go
 

editions/tw5.com/tiddlers/tag-pill Macro (Examples).tid

@@ -1,14 +0,0 @@
-created: 20230803034230294
-modified: 20230803043848449
-tags: [[Macro Examples]] [[tag-pill Macro]]
-title: tag-pill Macro (Examples)
-
-This example displays the [[Community]] tag as a clickable element with no dropdown:
-
-<$transclude $variable=".example" n="1" eg="""<<tag-pill Community>>"""/>
-
-This example displays the [[Definitions]] tag as an unclickable, but still-styled, `big` element with no dropdown:
-
-<$transclude $variable=".example" n="2" eg="""<<tag-pill Definitions element-tag:"big" element-attributes:"inert">>"""/>
-
-

editions/tw5.com/tiddlers/widgets/ActionDeleteFieldWidget.tid

@@ -1,6 +1,6 @@
 caption: action-deletefield
 created: 20141025120850184
-modified: 20240608151322035
+modified: 20150220162042000
 tags: Widgets ActionWidgets
 title: ActionDeleteFieldWidget
 type: text/vnd.tiddlywiki
@@ -21,56 +21,26 @@ The ''action-deletefield'' widget is invisible. Any content within it is ignored
 
 ! Examples
 
-<$testcase>
-<$data title=Description text="Delete currentTiddler fields using plain attributes"/>
-<$data title=Narrative text="""Use the $action-deletefield widget to delete the "caption" and "tags" fields of the current tiddler"""/>
-<$data title=Output caption="A caption" tags="tag1 tag2 tag3" text="""Click
-<$button actions="<$action-deletefield caption tags/>">
-Delete
-</$button>
-and watch the "caption" and "tags" field disappear."""/>
-</$testcase>
+Here is an example of a button that deletes the caption and tags fields of the current tiddler:
 
-<$testcase>
-<$data title=Description text="Delete fields from a specific tiddler"/>
-<$data title=Narrative text="""Use the $action-deletefield widget to delete the "list" and "tags" fields of the tiddler ~HelloThere"""/>
-<$data $tiddler="HelloThere"/>
-<$data title=Output text="""Click HelloThere, then click
-<$button actions='<$action-deletefield $tiddler="HelloThere" list tags/>'>
-Delete
-</$button>
-and watch the "list" and "tags" fields disappear"""/>
-</$testcase>
+<$macrocall $name='wikitext-example-without-html'
+src='<$button>
+<$action-deletefield caption tags/>
+Delete "caption" and "tags"
+</$button>'/>
 
-<$testcase>
-<$data title=Description text="Delete field from a specific tiddler"/>
-<$data title=Narrative text="""Use the $field attribute of the $action-deletefield widget to delete the "text" field of the tiddler ~HelloThere"""/>
-<$data $tiddler="HelloThere"/>
-<$data title=Output text="""Click HelloThere, then click
-<$button actions='<$action-deletefield $tiddler="HelloThere" $field="text"/>'>
-Delete
-</$button>
-and watch the contents of the "text" field disappear"""/>
-</$testcase>
+Here is an example of a button that deletes the modified date and tags fields of the tiddler HelloThere:
 
-<$testcase>
-<$data title=Description text="Delete a variable field name"/>
-<$data title=Narrative text="""Use the $field attribute of the $action-deletefield widget to delete a variable field name"""/>
-<$data title=Output description="This field will be deleted" text="""<$let fieldName=description>
-Click
-<$button actions="<$action-deletefield $field=<<fieldName>>/>">
-Delete
-</$button>
-and watch the "<<fieldName>>" field disappear."""/>
-</$let>
-</$testcase>
+<$macrocall $name='wikitext-example-without-html'
+src='<$button>
+<$action-deletefield $tiddler="HelloThere" modified tags/>
+Delete "modified" and "tags" from ~HelloThere
+</$button>'/>
 
-<$testcase>
-<$data title=Description text="Delete field without updating timestamps"/>
-<$data title=Narrative text="""Use the $timestamp attribute of the $action-deletefield widget to prevent creation/change of "modified" and "created" fields"""/>
-<$data title=Output description="This field will be deleted" text="""Click
-<$button actions='<$action-deletefield $field="description" $timestamp="no"/>'>
-Delete
-</$button>
-and watch the "description" field disappear without the "modified" and "created" fields getting added"""/>
-</$testcase>
+Here is an example of a button that uses the optional $field attribute to delete the text field of the tiddler HelloThere:
+
+<$macrocall $name='wikitext-example-without-html'
+src='<$button>
+<$action-deletefield $tiddler="HelloThere" $field="text"/>
+Delete text from ~HelloThere
+</$button>'/>

editions/tw5.com/tiddlers/widgets/ActionDeleteTiddlerWidget.tid

@@ -1,6 +1,6 @@
 caption: action-deletetiddler
 created: 20141025120850184
-modified: 20240608152211834
+modified: 20141106173455527
 tags: Widgets ActionWidgets
 title: ActionDeleteTiddlerWidget
 type: text/vnd.tiddlywiki
@@ -25,20 +25,18 @@ The ''action-deletetiddler'' widget is invisible. Any content within it is ignor
 
 ! Examples
 
-<$testcase>
-<$data title=Description text="Delete a specific tiddler"/>
-<$data title=Narrative text="""Use the $tiddler attribute of the $action-deletefield widget to delete the "~HelloThere" tiddler"""/>
-<$data $tiddler="HelloThere"/>
-<$data title=Output text="""<$button actions="<$action-deletetiddler $tiddler=HelloThere/>">
-Delete "~HelloThere"
-</$button>"""/>
-</$testcase>
+Here is an example of a button that deletes the tiddler HelloThere:
 
-<$testcase>
-<$data title=Description text="Delete tiddlers matching a filter"/>
-<$data title=Narrative text="""Use the $filter attribute of the $action-deletefield widget to delete all tiddlers tagged "~TableOfContents" """/>
-<$data $filter="[tag[TableOfContents]]"/>
-<$data title=Output text="""<$button actions='<$action-deletetiddler $filter="[tag[TableOfContents]]"/>'>
+<$macrocall $name='wikitext-example-without-html'
+src='<$button>
+<$action-deletetiddler $tiddler="HelloThere"/>
+Delete "~HelloThere"
+</$button>'/>
+
+Here is an example of a button that deletes all tiddlers tagged [[TableOfContents]]:
+
+<$macrocall $name='wikitext-example-without-html'
+src='<$button>
+<$action-deletetiddler $filter="[tag[TableOfContents]]"/>
 Delete tiddlers tagged "~TableOfContents"
-</$button>"""/>
-</$testcase>
+</$button>'/>

editions/tw5.com/tiddlers/widgets/EncryptWidget.tid

@@ -1,12 +1,12 @@
-caption: encrypt
-created: 20131024141900000
-modified: 20230803050114889
-tags: Widgets
 title: EncryptWidget
+created: 201310241419
+modified: 201310300837
+tags: Widgets
+caption: encrypt
 
 ! Introduction
 
-The encrypt widget renders a filtered list of tiddlers to an encrypted block with the password currently held in the PasswordVault. The encrypted block can subsequently be decrypted by the TiddlyWiki5 BootMechanism. See the [[EncryptionMechanism|Encryption]] for more details.
+The encrypt widget renders a filtered list of tiddlers to an encrypted block with the password currently held in the PasswordVault. The encrypted block can subsequently be decrypted by the TiddlyWiki5 BootMechanism. See the EncryptionMechanism for more details.
 
 ! Content and Attributes
 

editions/tw5.com/tiddlers/widgets/RevealWidget.tid

@@ -1,14 +1,14 @@
 caption: reveal
 created: 20131024141900000
 jeremy: tiddlywiki
-modified: 20230803052644851
+modified: 20201121100908827
 tags: Widgets
 title: RevealWidget
 type: text/vnd.tiddlywiki
 
 ! Introduction
 
-The reveal widget hides or shows its content depending upon the value of a [[state tiddler|StateTiddler]]. The type of the widget determines the condition for the content being displayed:
+The reveal widget hides or shows its content depending upon the value of a [[state tiddler|StateTiddlers]]. The type of the widget determines the condition for the content being displayed:
 
 * type=''match'': the content is displayed if the state tiddler matches the text attribute value
 * type=''nomatch'': the content is displayed if the state tiddler doesn't match the text attribute value

editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid

@@ -1,5 +1,5 @@
 created: 20140908163900000
-modified: 20230803052125981
+modified: 20201228143412000
 tags: Learning
 title: Sharing your tiddlers with others
 type: text/vnd.tiddlywiki
@@ -10,7 +10,7 @@ There are a number of ways that you can share [[tiddlers|Tiddlers]] or your whol
 *You can publish your ~TiddlyWiki online and grab a link to send or message to others:
 **A link to the web address of the whole ~TiddlyWiki file
 **A [[permalink|PermaLinks]] (<<.icon $:/core/images/permalink-button>>) to a specific tiddler
-**A [[permaview|PermaLinks]] (<<.icon $:/core/images/permaview-button>>) link of all the currently open tiddlers
+**A [[permaview|PermaViews]] (<<.icon $:/core/images/permaview-button>>) link of all the currently open tiddlers
 * You can [[share a Dropbox link to your TiddlyWiki|Sharing a TiddlyWiki on Dropbox]]
 * You can [[export tiddlers|How to export tiddlers]] (<<.icon $:/core/images/export-button>>) in a variety of formats including text, static HTML and comma separated values (ie spreadsheet compatible)
 *You can also share tiddlers merely by making your ~TiddlyWiki accessible to others, for example by publishing it online, so that they can [[import tiddlers|Importing Tiddlers]] from it

languages/de-DE/Buttons.multids

@@ -28,7 +28,6 @@ Encryption/ClearPassword/Caption: Verschlüsselung deaktivieren
 Encryption/ClearPassword/Hint: Lösche das Passwort und speichere ohne Verschlüsselung
 Encryption/SetPassword/Caption: Verschlüsselung
 Encryption/SetPassword/Hint: Definiert ein Passwort, um dieses Wiki zu verschlüsseln
-EmergencyDownload/Caption: Speichern aller Tiddler als JSON File
 ExportPage/Caption: Alle exportieren
 ExportPage/Hint: Alle Tiddler exportieren
 ExportTiddler/Caption: Exportieren
@@ -193,4 +192,4 @@ ToggleSidebar/Hint: Invertiere die "sidebar" Sichtbarkeit
 Transcludify/Caption: Transklusion
 Transcludify/Hint: Transklusion - Den selektierten Text in geschwungene Klammern setzen
 Underline/Caption: Unterstreichen
-Underline/Hint: Ausgewählten Text unterstrichen darstellen
+Underline/Hint: Ausgewählten Text unterstrichen darstellen

languages/de-DE/ControlPanel.multids

@@ -206,12 +206,6 @@ Stylesheets/Caption: Stylesheets
 Stylesheets/Expand/Caption: Alle erweitern
 Stylesheets/Hint: Hier wird der "erweiterte" CSS Code dargestellt. Die Reihenfolge, kann in der "Tag-Liste" <<tag "$:/tags/Stylesheet">> mit "Drag & Drop" angepasst werden!
 Stylesheets/Restore/Caption: Alle zurücksetzen
-TestCases/Caption: Test Beispiele
-TestCases/Hint: Test Beispiele sind eigenständige Beispiele zum testen und lernen einzelner Funktionen
-TestCases/All/Caption: Alle Beispiele
-TestCases/All/Hint: Alle Test Beispiele
-TestCases/Failed/Caption: Test Nicht Bestehenden
-TestCases/Failed/Hint: Nicht bestandene Tests - Übersicht
 Theme/Caption: Theme
 Theme/Prompt: Ausgewähltes Theme:
 TiddlerFields/Caption: Tiddler Felder
@@ -234,4 +228,4 @@ Tools/Download/Full/Caption: Herunterladen des ''gesamten Wikis''
 ViewTemplateBody/Caption: View Template Text
 ViewTemplateBody/Hint: Diese Filter-Kaskade wird vom "View Template" dazu verwendet, um die Vorlage für den Tiddler Textbereich auszuwählen.
 ViewTemplateTitle/Caption: View Template Titel
-ViewTemplateTitle/Hint: Diese Filter-Kaskade wird vom "View Template" dazu verwendet, um die Vorlage für den Tiddler Titel auszuwählen.
+ViewTemplateTitle/Hint: Diese Filter-Kaskade wird vom "View Template" dazu verwendet, um die Vorlage für den Tiddler Titel auszuwählen.

languages/de-DE/Dates.multids

@@ -84,4 +84,4 @@ RelativeDate/Past/Minutes: vor <<period>> Minuten
 RelativeDate/Past/Months: vor <<period>> Monaten
 RelativeDate/Past/Second: vor einer Sekunde
 RelativeDate/Past/Seconds: vor <<period>> Sekunden
-RelativeDate/Past/Years: vor <<period>> Jahren
+RelativeDate/Past/Years: vor <<period>> Jahren

languages/de-DE/Docs/ModuleTypes.multids

@@ -9,7 +9,7 @@ config: Daten, die in `$tw.config` eingefügt werden.
 filteroperator: Individuelle Funktionen für den Filter-Operator.
 global: Globale Daten, die in `$tw` eingefügt werden.
 info: Veröffentlicht System-Informationen mit dem Pseudo-plugin: [[$:/temp/info-plugin]]
-isfilteroperator: Parameter für den Filter-Operator: ''is''
+isfilteroperator: Operanden für den Filter-Operator: ''is''
 library: Allgemeiner Modultyp, für JavaScript Module.
 macro: Globale Makro-Definitionen in JavaScript.
 parser: Parser für verschiedene Tiddler Typen.
@@ -27,4 +27,4 @@ utils-browser: Browser-spezifische Methoden werden zu `$tw.utils` hinzugefügt.
 utils-node: Erweitert `$tw.utils` mit Methoden aus node.js.
 widget: Widgets verarbeiten das Rendern und Aktualisieren der Anzeige in der DOM.
 wikimethod: Methoden werden zu `$tw.Wiki` hinzugefügt.
-wikirule: Enthält die individuellen Parser Regeln für den WikiText-Parser.
+wikirule: Enthält die individuellen Parser Regeln für den WikiText-Parser.

languages/de-DE/Docs/PaletteColours.multids

@@ -67,9 +67,6 @@ sidebar-tiddler-link-foreground-hover: Seitenleiste Tiddler Link Vordergrund (ho
 sidebar-tiddler-link-foreground: Seitenleiste Tiddler Link Vordergrund
 site-title-foreground: Wiki Titel Vordergrund
 static-alert-foreground: Statische Warnung Vordergrund
-testcase-accent-level-1: Test Beispiel Akzent Farbe nicht "verschachtelt" - Ebene 1
-testcase-accent-level-2: Test Beispiel Akzent Farbe with Ebene 2
-testcase-accent-level-3: Test Beispiel Akzent Farbe with Ebene 3
 tab-background-selected: Reiter Hintergrund für selektierte Reiter
 tab-background: Reiter Hintergrund
 tab-border-selected: Reiter Rahmen für selektierte Reiter
@@ -109,4 +106,4 @@ toolbar-delete-button: Werkzeugleiste 'Löschen' Button Vordergrund
 toolbar-cancel-button: Werkzeugleiste 'Abbruch' Button Vordergrund
 toolbar-done-button: Werkzeugleiste 'Fertig' Button Vordergrund
 untagged-background: (untagged) Pille Hintergrund
-very-muted-foreground: Stark abgedunkelter Vordergrund
+very-muted-foreground: Stark abgedunkelter Vordergrund

languages/de-DE/EditTemplate.multids

@@ -35,4 +35,4 @@ Title/References/Prompt: Die folgenden Referenz-Links zu diesem Tiddler werden N
 Type/Delete/Caption: Lösche Inhalts Typ
 Type/Delete/Hint: Lösche Inhalts Typ
 Type/Placeholder: Tiddler Format
-Type/Prompt: Typ:
+Type/Prompt: Typ:

languages/de-DE/Exporters.multids

@@ -3,4 +3,4 @@ title: $:/language/Exporters/
 StaticRiver: HTML - Statisch
 JsonFile: JSON - Format
 CsvFile: CSV - Format
-TidFile: TID - Text Format
+TidFile: TID - Text Format

languages/de-DE/Fields.multids

@@ -4,7 +4,6 @@ _canonical_uri: Die komplette URI eines externen Foto Tiddlers. URI = Uniform Re
 author: Name des Plugin-Authors
 bag: Der Name eines ~TiddlyWeb "bags" von dem der Tiddler kam.
 caption: Der Text, der auf "Tab-Buttons" angezeigt wird.
-class: Die CSS Klasse, die angewendet wird, wenn ein Tiddler ausgegeben wird. Siehe: [[Custom styles by user-class]]. Wird auch verwended für: [[Modals]]
 code-body: Das "View Template" wird den Tiddler Text als "Code" anzeigen, wenn dieses Feld auf: ''"yes"'' gesetzt wird.
 color: Der CSS Farbwert, der mit einem Tiddler assoziiert wird.
 component: Der Name einer Komponente, die für eine [[Alarm Anzeige|AlertMechanism]] verantwortlich ist.
@@ -32,7 +31,6 @@ plugin-priority: Ein numerischer Wert, der die Priorität eines "plugins" festle
 plugin-type: Der Typ eines "plugins".
 revision: Die Revisionsnummer eines Tiddlers. Wird von einem Server vergeben.
 released: Datum der ~TiddlyWiki Ausgabe.
-stability: Entwicklungs Status: "deprecated"=abgekündigt, "experimental"=experimentell, "stable"=stabil, "legacy"=Altlast.
 source: Eine Quelltext URL, verbunden mit diesem Tiddler.
 subtitle: Der Untertitel für einen "~Wizard-Dialog".
 tags: Eine Liste von "Tags" für diesen Tiddler.
@@ -42,4 +40,4 @@ title: Ein individueller einmaliger Name eines Tiddlers.
 toc-link: Unterdrückt die Anzeige als Link, wenn der Wert auf ''"no"'' gesetzt wird
 type: Legt den Typ eines Tiddlers fest (aka MIME-type).
 version: Versions-Information eines "plugins".
-_is_skinny: Wenn es existiert, zeigt diese Feld an, dass das "Text-Feld" dynamisch vom Server geladen wird.
+_is_skinny: Wenn es existiert, zeigt diese Feld an, dass das "Text-Feld" dynamisch vom Server geladen wird.