Update version number

bin/build-site.sh

@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library
 
 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.3.2
+    TW5_BUILD_VERSION=v5.3.1
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -104,15 +104,13 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--build favicon static index \
 	|| exit 1
 
-# /empty.html					Empty
-# /empty.hta					For Internet Explorer
-# /empty-external-core.html		External core empty
-# /tiddlywikicore-<version>.js	Core plugin javascript
+# /empty.html			Empty
+# /empty.hta			For Internet Explorer
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/empty \
 	--verbose \
 	--output $TW5_BUILD_OUTPUT \
-	--build empty emptyexternalcore \
+	--build empty \
 	|| exit 1
 
 

boot/boot.js

@@ -575,8 +575,9 @@ var globalCheck =[
 	"    configurable: true",
 	"  });",
 	"  if(Object.keys(__temp__).length){",
-	"    console.log(\"Warning: Global assignment detected\",Object.keys(__temp__));",
+	"    console.log(Object.keys(__temp__));",
 	"    delete Object.prototype.__temp__;",
+	"    throw \"Global assignment is not allowed within modules on node.\";",
 	"  }",
 	"  delete Object.prototype.__temp__;",
 ].join('\n');
@@ -925,7 +926,7 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 				}
 			} else {
 				// line number should be included in e.stack for runtime errors
-				$tw.utils.error("Error executing boot module " + name + ": " + String(e) + "\n\n" + e.stack);
+				$tw.utils.error("Error executing boot module " + name + ": " + JSON.stringify(e) + "\n\n" + e.stack);
 			}
 		}
 	}
@@ -2674,18 +2675,6 @@ $tw.hooks.addHook = function(hookName,definition) {
 	}
 };
 
-/*
-Delete hooks from the hashmap
-*/
-$tw.hooks.removeHook = function(hookName,definition) {
-	if($tw.utils.hop($tw.hooks.names,hookName)) {
-		var p = $tw.hooks.names[hookName].indexOf(definition);
-		if(p !== -1) {
-			$tw.hooks.names[hookName].splice(p, 1);
-		}
-	}
-};
-
 /*
 Invoke the hook by key
 */

core/language/en-GB/Exporters.multids

@@ -3,4 +3,4 @@ title: $:/language/Exporters/
 StaticRiver: Static HTML
 JsonFile: JSON file
 CsvFile: CSV file
-TidFile: TID text file
+TidFile: ".tid" file

core/language/en-GB/Help/savewikifolder.tid

@@ -19,7 +19,7 @@ The following options are supported:
 ** ''yes'' will "explode" plugins into separate tiddler files and save them to the plugin directory within the wiki folder
 ** ''no'' will suppress exploding plugins into their constituent tiddler files. It will save the plugin as a single JSON tiddler in the tiddlers folder
 
-Note that both ''explodePlugins'' options will produce wiki folders that build the exact same original wiki. The difference lies in how plugins are represented in the wiki folder.
+Note that both ''explodePlugins'' options will produce wiki folders that build the same exact same original wiki. The difference lies in how plugins are represented in the wiki folder.
 
 A common usage is to convert a TiddlyWiki HTML file into a wiki folder:
 
@@ -31,4 +31,4 @@ Save the plugin to the tiddlers directory of the target wiki folder:
 
 ```
 tiddlywiki --load ./mywiki.html --savewikifolder ./mywikifolder explodePlugins=no
-```
+```

core/language/en-GB/Help/server.tid

@@ -1,5 +1,5 @@
 title: $:/language/Help/server
-description: (deprecated: see 'listen' command) Provides an HTTP server interface to TiddlyWiki
+description: Provides an HTTP server interface to TiddlyWiki (deprecated in favour of the new listen command)
 
 Legacy command to serve a wiki over HTTP.
 

core/language/en-GB/Types/image_svg_xml.tid

@@ -1,5 +1,5 @@
 title: $:/language/Docs/Types/image/svg+xml
-description: SVG image
+description: Structured Vector Graphics image
 name: image/svg+xml
 group: Image
 group-sort: 1

core/language/en-GB/Types/image_x-icon.tid

@@ -1,5 +1,5 @@
 title: $:/language/Docs/Types/image/x-icon
-description: ICO icon
+description: ICO format icon file
 name: image/x-icon
 group: Image
 group-sort: 1

core/modules/editor/engines/framed.js

@@ -60,7 +60,7 @@ function FramedEngine(options) {
 		this.domNode.value = this.value;
 	}
 	// Set the attributes
-	if(this.widget.editType && this.widget.editTag !== "textarea") {
+	if(this.widget.editType) {
 		this.domNode.setAttribute("type",this.widget.editType);
 	}
 	if(this.widget.editPlaceholder) {

core/modules/editor/engines/simple.js

@@ -34,7 +34,7 @@ function SimpleEngine(options) {
 		this.domNode.value = this.value;
 	}
 	// Set the attributes
-	if(this.widget.editType && this.widget.editTag !== "textarea") {
+	if(this.widget.editType) {
 		this.domNode.setAttribute("type",this.widget.editType);
 	}
 	if(this.widget.editPlaceholder) {

core/modules/filters/all.js

@@ -28,8 +28,12 @@ function getAllFilterOperators() {
 Export our filter function
 */
 exports.all = function(source,operator,options) {
+	// Get our suboperators
+	var allFilterOperators = getAllFilterOperators();
+	// Cycle through the suboperators accumulating their results
+	var results = new $tw.utils.LinkedList(),
+		subops = operator.operand.split("+");
 	// Check for common optimisations
-	var subops = operator.operand.split("+");
 	if(subops.length === 1 && subops[0] === "") {
 		return source;
 	} else if(subops.length === 1 && subops[0] === "tiddlers") {
@@ -42,10 +46,6 @@ exports.all = function(source,operator,options) {
 		return options.wiki.eachShadowPlusTiddlers;
 	}
 	// Do it the hard way
-	// Get our suboperators
-	var allFilterOperators = getAllFilterOperators();
-	// Cycle through the suboperators accumulating their results
-	var results = new $tw.utils.LinkedList();
 	for(var t=0; t<subops.length; t++) {
 		var subop = allFilterOperators[subops[t]];
 		if(subop) {

core/modules/filters/json-ops.js

@@ -68,54 +68,6 @@ exports["jsontype"] = function(source,operator,options) {
 	return results;
 };
 
-exports["jsonset"] = function(source,operator,options) {
-	var suffixes = operator.suffixes || [],
-		type = suffixes[0] && suffixes[0][0],
-		indexes = operator.operands.slice(0,-1),
-		value = operator.operands[operator.operands.length - 1],
-		results = [];
-	if(operator.operands.length === 1 && operator.operands[0] === "") {
-		value = undefined; // Prevents the value from being assigned
-	}
-	switch(type) {
-		case "string":
-			// Use value unchanged
-			break;
-		case "boolean":
-			value = (value === "true" ? true : (value === "false" ? false : undefined));
-			break;
-		case "number":
-			value = $tw.utils.parseNumber(value);
-			break;
-		case "array":
-			indexes = operator.operands;
-			value = [];
-			break;
-		case "object":
-			indexes = operator.operands;
-			value = {};
-			break;
-		case "null":
-			indexes = operator.operands;
-			value = null;
-			break;
-		case "json":
-			value = $tw.utils.parseJSONSafe(value,function() {return undefined;});
-			break;
-		default:
-			// Use value unchanged
-			break;
-	}
-	source(function(tiddler,title) {
-		var data = $tw.utils.parseJSONSafe(title,title);
-		if(data) {
-			data = setDataItem(data,indexes,value);
-			results.push(JSON.stringify(data));
-		}
-	});
-	return results;
-};
-
 /*
 Given a JSON data structure and an array of index strings, return an array of the string representation of the values at the end of the index chain, or "undefined" if any of the index strings are invalid
 */
@@ -234,34 +186,5 @@ function getDataItem(data,indexes) {
 	return item;
 }
 
-/*
-Given a JSON data structure, an array of index strings and a value, return the data structure with the value added at the end of the index chain. If any of the index strings are invalid then the JSON data structure is returned unmodified. If the root item is targetted then a different data object will be returned
-*/
-function setDataItem(data,indexes,value) {
-	// Ignore attempts to assign undefined
-	if(value === undefined) {
-		return data;
-	}
-	// Check for the root item
-	if(indexes.length === 0 || (indexes.length === 1 && indexes[0] === "")) {
-		return value;
-	}
-	// Traverse the JSON data structure using the index chain
-	var current = data;
-	for(var i = 0; i < indexes.length - 1; i++) {
-		var index = indexes[i];
-		if($tw.utils.hop(current,index)) {
-			current = current[index];
-		} else {
-			// Return the original JSON data structure if any of the index strings are invalid
-			return data;
-		}
-	}
-	// Add the value to the end of the index chain
-	var lastIndex = indexes[indexes.length - 1];
-	current[lastIndex] = value;
-	return data;
-}
-
 })();
 	

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

@@ -1,120 +0,0 @@
-/*\
-title: $:/core/modules/parsers/wikiparser/rules/conditional.js
-type: application/javascript
-module-type: wikirule
-
-Conditional shortcut syntax
-
-```
-This is a <% if [{something}] %>Elephant<% elseif [{else}] %>Pelican<% else %>Crocodile<% endif %>
-```
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.name = "conditional";
-exports.types = {inline: true, block: true};
-
-exports.init = function(parser) {
-	this.parser = parser;
-	// Regexp to match
-	this.matchRegExp = /\<\%\s*if\s+/mg;
-	this.terminateIfRegExp = /\%\>/mg;
-};
-
-exports.findNextMatch = function(startPos) {
-	// Look for the next <% if shortcut
-	this.matchRegExp.lastIndex = startPos;
-	this.match = this.matchRegExp.exec(this.parser.source);
-	// If not found then return no match
-	if(!this.match) {
-		return undefined;
-	}
-	// Check for the next %>
-	this.terminateIfRegExp.lastIndex = this.match.index;
-	this.terminateIfMatch = this.terminateIfRegExp.exec(this.parser.source);
-	// If not found then return no match
-	if(!this.terminateIfMatch) {
-		return undefined;
-	}
-	// Return the position at which the construction was found
-	return this.match.index;
-};
-
-/*
-Parse the most recent match
-*/
-exports.parse = function() {
-	// Get the filter condition
-	var filterCondition = this.parser.source.substring(this.match.index + this.match[0].length,this.terminateIfMatch.index);
-	// Advance the parser position to past the %>
-	this.parser.pos = this.terminateIfMatch.index + this.terminateIfMatch[0].length;
-	// Parse the if clause
-	return this.parseIfClause(filterCondition);
-};
-
-exports.parseIfClause = function(filterCondition) {
-	// Create the list widget
-	var listWidget = {
-		type: "list",
-		tag: "$list",
-		isBlock: this.is.block,
-		children: [
-			{
-				type: "list-template",
-				tag: "$list-template"
-			},
-			{
-				type: "list-empty",
-				tag: "$list-empty"
-			}
-		]
-	};
-	$tw.utils.addAttributeToParseTreeNode(listWidget,"filter",filterCondition);
-	$tw.utils.addAttributeToParseTreeNode(listWidget,"variable","condition");
-	$tw.utils.addAttributeToParseTreeNode(listWidget,"limit","1");
-	// Check for an immediately following double linebreak
-	var hasLineBreak = !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g);
-	// Parse the body looking for else or endif
-	var reEndString = "\\<\\%\\s*(endif)\\s*\\%\\>|\\<\\%\\s*(else)\\s*\\%\\>|\\<\\%\\s*(elseif)\\s+([\\s\\S]+?)\\%\\>",
-		ex;
-	if(hasLineBreak) {
-		ex = this.parser.parseBlocksTerminatedExtended(reEndString);
-	} else {
-		var reEnd = new RegExp(reEndString,"mg");
-		ex = this.parser.parseInlineRunTerminatedExtended(reEnd,{eatTerminator: true});
-	}
-	// Put the body into the list template
-	listWidget.children[0].children = ex.tree;
-	// Check for an else or elseif
-	if(ex.match) {
-		if(ex.match[1] === "endif") {
-			// Nothing to do if we just found an endif
-		} else if(ex.match[2] === "else") {
-			// Check for an immediately following double linebreak
-			hasLineBreak = !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g);
-			// If we found an else then we need to parse the body looking for the endif
-			var reEndString = "\\<\\%\\s*(endif)\\s*\\%\\>",
-			ex;
-			if(hasLineBreak) {
-				ex = this.parser.parseBlocksTerminatedExtended(reEndString);
-			} else {
-				var reEnd = new RegExp(reEndString,"mg");
-				ex = this.parser.parseInlineRunTerminatedExtended(reEnd,{eatTerminator: true});
-			}
-			// Put the parsed content inside the list empty template
-			listWidget.children[1].children = ex.tree;
-		} else if(ex.match[3] === "elseif") {
-			// Parse the elseif clause by reusing this parser, passing the new filter condition
-			listWidget.children[1].children = this.parseIfClause(ex.match[4]);
-		}
-	}
-	// Return the parse tree node
-	return [listWidget];
-};
-
-})();

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

@@ -81,9 +81,6 @@ exports.parse = function() {
 			}
 			return [tiddlerNode];
 		} else {
-			// No template or text reference is provided, so we'll use a blank target. Otherwise we'll generate
-			// a transclude widget that transcludes the current tiddler, often leading to recursion errors
-			transcludeNode.attributes["$tiddler"] = {name: "$tiddler", type: "string", value: ""};
 			return [transcludeNode];
 		}
 	}

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

@@ -79,9 +79,6 @@ exports.parse = function() {
 			}
 			return [tiddlerNode];
 		} else {
-			// No template or text reference is provided, so we'll use a blank target. Otherwise we'll generate
-			// a transclude widget that transcludes the current tiddler, often leading to recursion errors
-			transcludeNode.attributes["$tiddler"] = {name: "$tiddler", type: "string", value: ""};
 			return [transcludeNode];
 		}
 	}

core/modules/parsers/wikiparser/wikiparser.js

@@ -223,7 +223,7 @@ Parse a block from the current position
 	terminatorRegExpString: optional regular expression string that identifies the end of plain paragraphs. Must not include capturing parenthesis
 */
 WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
-	var terminatorRegExp = terminatorRegExpString ? new RegExp(terminatorRegExpString + "|\\r?\\n\\r?\\n","mg") : /(\r?\n\r?\n)/mg;
+	var terminatorRegExp = terminatorRegExpString ? new RegExp("(" + terminatorRegExpString + "|\\r?\\n\\r?\\n)","mg") : /(\r?\n\r?\n)/mg;
 	this.skipWhitespace();
 	if(this.pos >= this.sourceLength) {
 		return [];
@@ -263,22 +263,12 @@ WikiParser.prototype.parseBlocksUnterminated = function() {
 	return tree;
 };
 
-/*
-Parse blocks of text until a terminating regexp is encountered. Wrapper for parseBlocksTerminatedExtended that just returns the parse tree
-*/
-WikiParser.prototype.parseBlocksTerminated = function(terminatorRegExpString) {
-	var ex = this.parseBlocksTerminatedExtended(terminatorRegExpString);
-	return ex.tree;
-};
-
 /*
 Parse blocks of text until a terminating regexp is encountered
 */
-WikiParser.prototype.parseBlocksTerminatedExtended = function(terminatorRegExpString) {
-	var terminatorRegExp = new RegExp(terminatorRegExpString,"mg"),
-		result = {
-			tree: []
-		};
+WikiParser.prototype.parseBlocksTerminated = function(terminatorRegExpString) {
+	var terminatorRegExp = new RegExp("(" + terminatorRegExpString + ")","mg"),
+		tree = [];
 	// Skip any whitespace
 	this.skipWhitespace();
 	//  Check if we've got the end marker
@@ -287,7 +277,7 @@ WikiParser.prototype.parseBlocksTerminatedExtended = function(terminatorRegExpSt
 	// Parse the text into blocks
 	while(this.pos < this.sourceLength && !(match && match.index === this.pos)) {
 		var blocks = this.parseBlock(terminatorRegExpString);
-		result.tree.push.apply(result.tree,blocks);
+		tree.push.apply(tree,blocks);
 		// Skip any whitespace
 		this.skipWhitespace();
 		//  Check if we've got the end marker
@@ -296,9 +286,8 @@ WikiParser.prototype.parseBlocksTerminatedExtended = function(terminatorRegExpSt
 	}
 	if(match && match.index === this.pos) {
 		this.pos = match.index + match[0].length;
-		result.match = match;
 	}
-	return result;
+	return tree;
 };
 
 /*
@@ -341,11 +330,6 @@ WikiParser.prototype.parseInlineRunUnterminated = function(options) {
 };
 
 WikiParser.prototype.parseInlineRunTerminated = function(terminatorRegExp,options) {
-	var ex = this.parseInlineRunTerminatedExtended(terminatorRegExp,options);
-	return ex.tree;
-};
-
-WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegExp,options) {
 	options = options || {};
 	var tree = [];
 	// Find the next occurrence of the terminator
@@ -365,10 +349,7 @@ WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegEx
 				if(options.eatTerminator) {
 					this.pos += terminatorMatch[0].length;
 				}
-				return {
-					match: terminatorMatch,
-					tree: tree
-				};
+				return tree;
 			}
 		}
 		// Process any inline rule, along with the text preceding it
@@ -392,9 +373,7 @@ WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegEx
 		this.pushTextWidget(tree,this.source.substr(this.pos),this.pos,this.sourceLength);
 	}
 	this.pos = this.sourceLength;
-	return {
-		tree: tree
-	};
+	return tree;
 };
 
 /*

core/modules/widgets/checkbox.js

@@ -116,7 +116,7 @@ CheckboxWidget.prototype.getValue = function() {
 				} else {
 					list = $tw.utils.parseStringArray(this.checkboxDefault || "") || [];
 				}
-			} else if(this.checkboxListIndex) {
+			} else if (this.checkboxListIndex) {
 				list = $tw.utils.parseStringArray(this.wiki.extractTiddlerDataItem(tiddler,this.checkboxListIndex,this.checkboxDefault || "")) || [];
 			} else {
 				list = this.wiki.filterTiddlers(this.checkboxFilter,this) || [];
@@ -215,8 +215,6 @@ CheckboxWidget.prototype.handleChangeEvent = function(event) {
 		if($tw.utils.isArray(fieldContents)) {
 			// Make a copy so we can modify it without changing original that's refrenced elsewhere
 			listContents = fieldContents.slice(0);
-		} else if(fieldContents === undefined) {
-			listContents = [];
 		} else if(typeof fieldContents === "string") {
 			listContents = $tw.utils.parseStringArray(fieldContents);
 			// No need to copy since parseStringArray returns a fresh array, not refrenced elsewhere

core/modules/widgets/list.js

@@ -60,7 +60,6 @@ ListWidget.prototype.render = function(parent,nextSibling) {
 Compute the internal state of the widget
 */
 ListWidget.prototype.execute = function() {
-	var self = this;
 	// Get our attributes
 	this.template = this.getAttribute("template");
 	this.editTemplate = this.getAttribute("editTemplate");
@@ -68,8 +67,6 @@ ListWidget.prototype.execute = function() {
 	this.counterName = this.getAttribute("counter");
 	this.storyViewName = this.getAttribute("storyview");
 	this.historyTitle = this.getAttribute("history");
-	// Look for <$list-template> and <$list-empty> widgets as immediate child widgets
-	this.findExplicitTemplates();
 	// Compose the list elements
 	this.list = this.getTiddlerList();
 	var members = [],
@@ -88,48 +85,18 @@ ListWidget.prototype.execute = function() {
 	this.history = [];
 };
 
-ListWidget.prototype.findExplicitTemplates = function() {
-	var self = this;
-	this.explicitListTemplate = null;
-	this.explicitEmptyTemplate = null;
-	var searchChildren = function(childNodes) {
-		$tw.utils.each(childNodes,function(node) {
-			if(node.type === "list-template") {
-				self.explicitListTemplate = node.children;
-			} else if(node.type === "list-empty") {
-				self.explicitEmptyTemplate = node.children;
-			} else if(node.type === "element" && node.tag === "p") {
-				searchChildren(node.children);
-			}
-		});
-	};
-	searchChildren(this.parseTreeNode.children);
-}
-
 ListWidget.prototype.getTiddlerList = function() {
-	var limit = $tw.utils.getInt(this.getAttribute("limit",""),undefined);
 	var defaultFilter = "[!is[system]sort[title]]";
-	var results = this.wiki.filterTiddlers(this.getAttribute("filter",defaultFilter),this);
-	if(limit !== undefined) {
-		if(limit >= 0) {
-			results = results.slice(0,limit);
-		} else {
-			results = results.slice(limit);
-		}
-	}
-	return results;
+	return this.wiki.filterTiddlers(this.getAttribute("filter",defaultFilter),this);
 };
 
 ListWidget.prototype.getEmptyMessage = function() {
 	var parser,
-		emptyMessage = this.getAttribute("emptyMessage");
-	// If emptyMessage attribute is not present or empty then look for an explicit empty template
-	if(!emptyMessage) {
-		if(this.explicitEmptyTemplate) {
-			return this.explicitEmptyTemplate;
-		} else {
-			return [];
-		}
+		emptyMessage = this.getAttribute("emptyMessage","");
+	// this.wiki.parseText() calls 
+	// new Parser(..), which should only be done, if needed, because it's heavy!
+	if (emptyMessage === "") {
+		return [];
 	}
 	parser = this.wiki.parseText("text/vnd.tiddlywiki",emptyMessage,{parseAsInline: true});
 	if(parser) {
@@ -155,19 +122,12 @@ ListWidget.prototype.makeItemTemplate = function(title,index) {
 	if(template) {
 		templateTree = [{type: "transclude", attributes: {tiddler: {type: "string", value: template}}}];
 	} else {
-		// Check for child nodes of the list widget
 		if(this.parseTreeNode.children && this.parseTreeNode.children.length > 0) {
-			// Check for a <$list-item> widget
-			if(this.explicitListTemplate) {
-				templateTree = this.explicitListTemplate;
-			} else if (!this.explicitEmptyTemplate) {
-				templateTree = this.parseTreeNode.children;
-			}
-		}
-		if(!templateTree) {
+			templateTree = this.parseTreeNode.children;
+		} else {
 			// Default template is a link to the title
 			templateTree = [{type: "element", tag: this.parseTreeNode.isBlock ? "div" : "span", children: [{type: "link", attributes: {to: {type: "string", value: title}}, children: [
-				{type: "text", text: title}
+					{type: "text", text: title}
 			]}]}];
 		}
 	}
@@ -265,8 +225,6 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 		// If we are providing an counter variable then we must refresh the items, otherwise we can rearrange them
 		var hasRefreshed = false,t;
 		if(this.counterName) {
-			var mustRefreshOldLast = false;
-			var oldLength = this.children.length;
 			// Cycle through the list and remove and re-insert the first item that has changed, and all the remaining items
 			for(t=0; t<this.list.length; t++) {
 				if(hasRefreshed || !this.children[t] || this.children[t].parseTreeNode.itemTitle !== this.list[t]) {
@@ -274,9 +232,6 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 						this.removeListItem(t);
 					}
 					this.insertListItem(t,this.list[t]);
-					if(!hasRefreshed && t === oldLength) {
-						mustRefreshOldLast = true;
-					}
 					hasRefreshed = true;
 				} else {
 					// Refresh the item we're reusing
@@ -284,12 +239,6 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 					hasRefreshed = hasRefreshed || refreshed;
 				}
 			}
-			// If items were inserted then we must recreate the item that used to be at the last position as it is no longer last
-			if(mustRefreshOldLast && oldLength > 0) {
-				var oldLastIdx = oldLength-1;
-				this.removeListItem(oldLastIdx);
-				this.insertListItem(oldLastIdx,this.list[oldLastIdx]);
-			}
 			// If there are items to remove and we have not refreshed then recreate the item that will now be at the last position
 			if(!hasRefreshed && this.children.length > this.list.length) {
 				this.removeListItem(this.list.length-1);

core/modules/widgets/scrollable.js

@@ -171,6 +171,42 @@ ScrollableWidget.prototype.render = function(parent,nextSibling) {
 	parent.insertBefore(this.outerDomNode,nextSibling);
 	this.renderChildren(this.innerDomNode,null);
 	this.domNodes.push(this.outerDomNode);
+	// If the scroll position is bound to a tiddler
+	if(this.scrollableBind) {
+		// After a delay for rendering, scroll to the bound position
+		setTimeout(this.updateScrollPositionFromBoundTiddler.bind(this),50);
+		// Save scroll position on DOM scroll event
+		this.outerDomNode.addEventListener("scroll",function(event) {
+			var existingTiddler = self.wiki.getTiddler(self.scrollableBind),
+				newTiddlerFields = {
+					title: self.scrollableBind,
+					"scroll-left": self.outerDomNode.scrollLeft.toString(),
+					"scroll-top": self.outerDomNode.scrollTop.toString()
+				};
+			if(!existingTiddler || (existingTiddler.fields["scroll-left"] !== newTiddlerFields["scroll-left"] || existingTiddler.fields["scroll-top"] !== newTiddlerFields["scroll-top"])) {
+				self.wiki.addTiddler(new $tw.Tiddler(existingTiddler,newTiddlerFields));
+			}
+		});
+	}
+};
+
+ScrollableWidget.prototype.updateScrollPositionFromBoundTiddler = function() {
+	var tiddler = this.wiki.getTiddler(this.scrollableBind);
+	if(tiddler) {
+		var scrollLeftTo = this.outerDomNode.scrollLeft;
+		if(parseFloat(tiddler.fields["scroll-left"]).toString() === tiddler.fields["scroll-left"]) {
+			scrollLeftTo = parseFloat(tiddler.fields["scroll-left"]);
+		}
+		var scrollTopTo = this.outerDomNode.scrollTop;
+		if(parseFloat(tiddler.fields["scroll-top"]).toString() === tiddler.fields["scroll-top"]) {
+			scrollTopTo = parseFloat(tiddler.fields["scroll-top"]);
+		}
+		this.outerDomNode.scrollTo({
+			top: scrollTopTo,
+			left: scrollLeftTo,
+			behavior: "instant"
+		})
+	}
 };
 
 /*
@@ -178,6 +214,7 @@ Compute the internal state of the widget
 */
 ScrollableWidget.prototype.execute = function() {
 	// Get attributes
+	this.scrollableBind = this.getAttribute("bind");
 	this.fallthrough = this.getAttribute("fallthrough","yes");
 	this["class"] = this.getAttribute("class");
 	// Make child widgets
@@ -193,6 +230,9 @@ ScrollableWidget.prototype.refresh = function(changedTiddlers) {
 		this.refreshSelf();
 		return true;
 	}
+	if(changedAttributes.bind || changedTiddlers[this.getAttribute("bind")]) {
+		this.updateScrollPositionFromBoundTiddler();
+	}
 	return this.refreshChildren(changedTiddlers);
 };
 

core/modules/widgets/transclude.js

@@ -109,7 +109,6 @@ TranscludeWidget.prototype.collectAttributes = function() {
 		this.recursionMarker = this.getAttribute("recursionMarker","yes");
 	} else {
 		this.transcludeVariable = this.getAttribute("$variable");
-		this.transcludeVariableIsFunction = false;
 		this.transcludeType = this.getAttribute("$type");
 		this.transcludeOutput = this.getAttribute("$output","text/html");
 		this.transcludeTitle = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
@@ -185,9 +184,7 @@ TranscludeWidget.prototype.getTransclusionTarget = function() {
 		if(this.transcludeVariable) {
 			// Transcluding a variable
 			var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()});
-			this.transcludeVariableIsFunction = variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition;
 			text = variableInfo.text;
-			this.transcludeFunctionResult = text;
 			return {
 				text: variableInfo.text,
 				type: this.transcludeType
@@ -222,24 +219,21 @@ TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
 			// Transcluding a variable
 			var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()}),
 				srcVariable = variableInfo && variableInfo.srcVariable;
-			if(srcVariable && srcVariable.isFunctionDefinition) {
-				this.transcludeVariableIsFunction = true;
-				this.transcludeFunctionResult = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
-			}
 			if(variableInfo.text) {
 				if(srcVariable && srcVariable.isFunctionDefinition) {
+					var result = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
 					parser = {
 						tree: [{
 							type: "text",
-							text: this.transcludeFunctionResult
+							text: result
 						}],
-						source: this.transcludeFunctionResult,
+						source: result,
 						type: "text/vnd.tiddlywiki"
 					};
 					if(parseAsInline) {
 						parser.tree[0] = {
 							type: "text",
-							text: this.transcludeFunctionResult
+							text: result
 						};
 					} else {
 						parser.tree[0] = {
@@ -247,7 +241,7 @@ TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
 							tag: "p",
 							children: [{
 								type: "text",
-								text: this.transcludeFunctionResult
+								text: result
 							}]
 						}
 					}
@@ -436,19 +430,12 @@ TranscludeWidget.prototype.parserNeedsRefresh = function() {
 	return (this.sourceText === undefined || parserInfo.sourceText !== this.sourceText || parserInfo.parserType !== this.parserType)
 };
 
-TranscludeWidget.prototype.functionNeedsRefresh = function() {
-	var oldResult = this.transcludeFunctionResult;
-	var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()});
-	var newResult = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
-	return oldResult !== newResult;
-}
-
 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 TranscludeWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(($tw.utils.count(changedAttributes) > 0) || (this.transcludeVariableIsFunction && this.functionNeedsRefresh()) || (!this.transcludeVariable && changedTiddlers[this.transcludeTitle] && this.parserNeedsRefresh())) {
+	if(($tw.utils.count(changedAttributes) > 0) || (!this.transcludeVariable && changedTiddlers[this.transcludeTitle] && this.parserNeedsRefresh())) {
 		this.refreshSelf();
 		return true;
 	} else {

core/ui/ControlPanel/Basics.tid

@@ -26,10 +26,10 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
 |<$link to="$:/status/UserName"><<lingo Username/Prompt>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
 |<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit class="tc-edit-texteditor" tiddler="$:/DefaultTiddlers" autoHeight="yes"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit class="tc-edit-texteditor" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 |<$link to="$:/language/DefaultNewTiddlerTitle"><<lingo NewTiddler/Title/Prompt>></$link> |<$edit-text tiddler="$:/language/DefaultNewTiddlerTitle" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> |
-|<$link to="$:/config/NewJournal/Text"><<lingo NewJournal/Text/Prompt>></$link> |<$edit tiddler="$:/config/NewJournal/Text" class="tc-edit-texteditor" default="" autoHeight="yes"/> |
+|<$link to="$:/config/NewJournal/Text"><<lingo NewJournal/Text/Prompt>></$link> |<$edit tiddler="$:/config/NewJournal/Text" class="tc-edit-texteditor" default=""/> |
 |<$link to="$:/config/NewTiddler/Tags"><<lingo NewTiddler/Tags/Prompt>></$link> |<$vars currentTiddler="$:/config/NewTiddler/Tags" tagField="text">{{||$:/core/ui/EditTemplate/tags}}<$list filter="[<currentTiddler>tags[]] +[limit[1]]" variable="ignore"><$button tooltip={{$:/language/ControlPanel/Basics/RemoveTags/Hint}}><<lingo RemoveTags>><$action-listops $tiddler=<<currentTiddler>> $field="text" $subfilter={{{ [<currentTiddler>get[tags]] }}}/><$action-setfield $tiddler=<<currentTiddler>> tags=""/></$button></$list></$vars> |
 |<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$vars currentTiddler="$:/config/NewJournal/Tags" tagField="text">{{||$:/core/ui/EditTemplate/tags}}<$list filter="[<currentTiddler>tags[]] +[limit[1]]" variable="ignore"><$button tooltip={{$:/language/ControlPanel/Basics/RemoveTags/Hint}}><<lingo RemoveTags>><$action-listops $tiddler=<<currentTiddler>> $field="text" $subfilter={{{ [<currentTiddler>get[tags]] }}}/><$action-setfield $tiddler=<<currentTiddler>> tags=""/></$button></$list></$vars> |
 |<$link to="$:/config/AutoFocus"><<lingo AutoFocus/Prompt>></$link> |{{$:/snippets/minifocusswitcher}} |

core/ui/EditTemplate/body/default.tid

@@ -1,9 +1,5 @@
 title: $:/core/ui/EditTemplate/body/default
 
-\function edit-preview-state()
-[{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] +[get[text]] :else[[no]]
-\end
-
 \define config-visibility-title()
 $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 \end
@@ -14,16 +10,15 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 
 \whitespace trim
 <$let
+	edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
 	importTitle=<<qualify $:/ImportImage>>
 	importState=<<qualify $:/state/ImportImage>> >
 <$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> >
-<div>
-<div class={{{ [function[edit-preview-state]match[yes]then[tc-tiddler-preview]] +[join[ ]] }}}>
+<$reveal stateTitle=<<edit-preview-state>> type="match" text="yes" tag="div">
+<div class="tc-tiddler-preview">
 
 <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
 
-<$list filter="[function[edit-preview-state]match[yes]]" variable="ignore">
-
 <div class="tc-tiddler-preview-preview" data-tiddler-title={{!!draft.title}} data-tags={{!!tags}}>
 
 <$transclude tiddler={{$:/state/editpreviewtype}} mode="inline">
@@ -34,12 +29,13 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 
 </div>
 
-</$list>
-
 </div>
+</$reveal>
 
-</div>
+<$reveal stateTitle=<<edit-preview-state>> type="nomatch" text="yes" tag="div">
 
+<$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
+
+</$reveal>
 </$dropzone>
-
 </$let>

core/ui/EditTemplate/type.tid

@@ -10,7 +10,7 @@ first-search-filter: [all[shadows+tiddlers]prefix[$:/language/Docs/Types/]sort[d
 <em class="tc-edit tc-small-gap-right"><<lingo Type/Prompt>></em>
 <div class="tc-type-selector-dropdown-wrapper">
 <div class="tc-type-selector"><$fieldmangler>
-<$macrocall $name="keyboard-driven-input" tiddler=<<currentTiddler>> storeTitle=<<typeInputTiddler>> refreshTitle=<<refreshTitle>> selectionStateTitle=<<typeSelectionTiddler>> field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] ~[[false]] }}} cancelPopups="yes" configTiddlerFilter="[[$:/core/ui/EditTemplate/type]]" inputCancelActions=<<input-cancel-actions>>/><$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button><$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}<$action-deletetiddler $filter="[<typeInputTiddler>] [<storeTitle>] [<refreshTitle>] [<selectionStateTitle>]"/></$button>
+<$macrocall $name="keyboard-driven-input" tiddler=<<currentTiddler>> storeTitle=<<typeInputTiddler>> refreshTitle=<<refreshTitle>> selectionStateTitle=<<typeSelectionTiddler>> field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] ~[[false]] }}} cancelPopups="yes" configTiddlerFilter="[[$:/core/ui/EditTemplate/type]]" inputCancelActions=<<input-cancel-actions>>/><$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button><$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}<$action-deletetiddler $filter="[<storeTitle>] [<refreshTitle>] [<selectionStateTitle>]"/></$button>
 </$fieldmangler></div>
 
 <div class="tc-block-dropdown-wrapper">

core/ui/EditorToolbar/preview.tid

@@ -9,17 +9,11 @@ button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((preview))
 
 \whitespace trim
-<$let
-	edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
->
 <$reveal state=<<edit-preview-state>> type="match" text="yes" tag="span">
 {{$:/core/images/preview-open}}
 <$action-setfield $tiddler=<<edit-preview-state>> $value="no"/>
-<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
 </$reveal>
 <$reveal state=<<edit-preview-state>> type="nomatch" text="yes" tag="span">
 {{$:/core/images/preview-closed}}
 <$action-setfield $tiddler=<<edit-preview-state>> $value="yes"/>
-<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
 </$reveal>
-</$let>

core/ui/PageTemplate.tid

@@ -20,7 +20,7 @@ code-body: yes
 
 <$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}>
 
-<$dropzone enable=<<tv-enable-drag-and-drop>> class="tc-dropzone tc-page-container-inner">
+<$dropzone enable=<<tv-enable-drag-and-drop>>>
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageTemplate]!has[draft.of]]" variable="listItem">
 

core/wiki/config/OfficialPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/library/v5.3.2/index.html
+url: https://tiddlywiki.com/library/v5.3.1/index.html
 caption: {{$:/language/OfficialPluginLibrary}}
 
 {{$:/language/OfficialPluginLibrary/Hint}}

core/wiki/macros/tag.tid

@@ -10,7 +10,7 @@ color:$(foregroundColor)$;
 <!-- This has no whitespace trim to avoid modifying $actions$. Closing tags omitted for brevity. -->
 \define tag-pill-inner(tag,icon,colour,fallbackTarget,colourA,colourB,element-tag,element-attributes,actions)
 \whitespace trim
-<$let
+<$vars
 	foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">>
 	backgroundColor=<<__colour__>>
 >
@@ -23,7 +23,6 @@ color:$(foregroundColor)$;
 	<$transclude tiddler=<<__icon__>>/>
 	<$view tiddler=<<__tag__>> field="title" format="text" />
 </$element-tag$>
-</$let>
 \end
 
 \define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions)

editions/de-AT-server/tiddlers/system/favicon.ico.meta

@@ -1,2 +1,2 @@
 title: $:/favicon.ico
-type: image/png
+type: image/x-icon

editions/dev/tiddlers/images/favicon.ico.meta

@@ -1,2 +1,2 @@
 title: $:/favicon.ico
-type: image/png
+type: image/x-icon

editions/dev/tiddlers/new/HookMechanism.tid

@@ -1,14 +1,9 @@
 created: 20141122200310516
-modified: 20230923031318421
-tags: Mechanisms
+modified: 20201213161842776
 title: HookMechanism
 type: text/vnd.tiddlywiki
 
-The hook mechanism provides a way for plugins to intercept and modify default functionality. 
-
-!! Add a hook
-
-Hooks are added as follows:
+The hook mechanism provides a way for plugins to intercept and modify default functionality. Hooks are added as follows:
 
 ```js
 /*
@@ -18,8 +13,6 @@ handler: function to be called when hook is invoked
 $tw.hooks.addHook(name,handler);
 ```
 
-!!! Params and return
-
 The handler function will be called with parameters that depend on the specific hook in question, but they always follow the pattern `handler(value,params...)`
 
 * ''value'': an optional value that is to be transformed by the hook function
@@ -27,29 +20,11 @@ The handler function will be called with parameters that depend on the specific
 
 If required by the hook in question, the handler function must return the modified ''value''.
 
-!!! Multiple handlers
-
 Multiple handlers can be assigned to the same name using repeated calls. When a hook is invoked by name all registered functions will be called sequentially in their order of addition.
 
 Note that the ''value'' passed to the subsequent hook function will be the return value of the previous hook function.
 
-Be careful not to `addHook` in widget's `render` method, which will be call several times. You could `addHook` in methods that only called once, e.g. the constructor of widget class. Otherwise you should `removeHook` then add it again.
-
-!!! Timing of registration
-
-Though not essential care should be taken to ensure that hooks are added before they are invoked.
-
-For example: [[Hook: th-opening-default-tiddlers-list]] should ideally be added before the story startup module is invoked. Otherwise any hook specified additions to the default tiddlers will not be seen on the initial loading of the page, though will be visible if the user clicks the home button.
-
-!! Remove a hook
-
-You should clean up the callback when your widget is going to unmount.
-
-```js
-$tw.hooks.removeHook(handler)
-```
-
-The `handler` should be the same function instance you used in `addHook` (check by `===`). You can save it to `this.xxxHookHandler` on your widget, and call `removeHook` in [[destroy method|Widget `destroy` method examples]].
+Though not essential care should be taken to ensure that hooks are added before they are invoked. For example: [[Hook: th-opening-default-tiddlers-list]] should ideally be added before the story startup module is invoked otherwise any hook specified additions to the default tiddlers will not be seen on the initial loading of the page, though will be visible if the user clicks the home button.
 
 !! Example
 

editions/empty/tiddlywiki.info

@@ -12,9 +12,6 @@
 		"empty": [
 			"--render","$:/core/save/all","empty.html","text/plain",
 			"--render","$:/core/save/all","empty.hta","text/plain"],
-		"emptyexternalcore": [
-			"--render","$:/core/save/offline-external-js","empty-external-core.html","text/plain",
-			"--render","$:/core/templates/tiddlywiki5.js","[[tiddlywikicore-]addsuffix<version>addsuffix[.js]]","text/plain"],
 		"externalimages": [
 			"--savetiddlers","[is[image]]","images",
 			"--setfield","[is[image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
@@ -23,7 +20,7 @@
 		"static": [
 			"--render","$:/core/templates/static.template.html","static.html","text/plain",
 			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",			
 			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
-}
+}

editions/es-ES-server/tiddlers/system/favicon.ico.meta

@@ -1,2 +1,2 @@
 title: $:/favicon.ico
-type: image/png
+type: image/x-icon

editions/es-ES/tiddlers/images/favicon.ico.meta

@@ -1,2 +1,2 @@
 title: $:/favicon.ico
-type: image/png
+type: image/x-icon

editions/es-ES/tiddlers/images/green_favicon.ico.meta

@@ -1,2 +1,2 @@
 title: $:/green_favicon.ico
-type: image/png
+type: image/x-icon

editions/fr-FR-server/tiddlers/system/favicon.ico.meta

@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon

editions/fr-FR-server/tiddlers/system/favicon.png.meta

@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/png

editions/fr-FR/tiddlers/images/favicon.ico.meta

@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon

editions/fr-FR/tiddlers/images/favicon.png.meta

@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/png

editions/fr-FR/tiddlers/images/green_favicon.ico.meta

@@ -1,2 +1,2 @@
 title: $:/green_favicon.ico
-type: image/png
+type: image/x-icon

editions/highlightdemo/tiddlywiki.info

@@ -15,7 +15,7 @@
 		"static": [
 			"--render","$:/core/templates/static.template.html","static.html","text/plain",
 			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",
 			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
 }

editions/ja-JP/tiddlers/images/favicon.ico.meta

@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon

editions/ja-JP/tiddlers/images/favicon.png.meta

@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/png

editions/ja-JP/tiddlers/images/green_favicon.ico.meta

@@ -1,2 +1,2 @@
 title: $:/green_favicon.ico
-type: image/png
+type: image/x-icon

editions/katexdemo/tiddlywiki.info

@@ -15,7 +15,7 @@
 		"static": [
 			"--render","$:/core/templates/static.template.html","static.html","text/plain",
 			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",
 			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
 }

editions/ko-KR-server/tiddlers/system/favicon.ico.meta

@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon

editions/ko-KR-server/tiddlers/system/favicon.png.meta

@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/png

editions/ko-KR/tiddlers/images/favicon.ico.meta

@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon

editions/ko-KR/tiddlers/images/favicon.png.meta

@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/png

editions/ko-KR/tiddlers/images/green_favicon.ico.meta

@@ -1,2 +1,2 @@
 title: $:/green_favicon.ico
-type: image/png
+type: image/x-icon

editions/pluginlibrary/tiddlywiki.info

@@ -17,8 +17,8 @@
 		],
 		"library": [
 			"--makelibrary","$:/UpgradeLibrary",
-			"--savelibrarytiddlers","$:/UpgradeLibrary","[prefix[$:/]] -[[$:/plugins/tiddlywiki/upgrade]] -[[$:/plugins/tiddlywiki/translators]] -[[$:/plugins/tiddlywiki/pluginlibrary]] -[[$:/plugins/tiddlywiki/jasmine]]","recipes/library/tiddlers/","$:/UpgradeLibrary/List",
-			"--savetiddler","$:/UpgradeLibrary/List","recipes/library/tiddlers.json",
+   			"--savelibrarytiddlers","$:/UpgradeLibrary","[prefix[$:/]] -[[$:/plugins/tiddlywiki/upgrade]] -[[$:/plugins/tiddlywiki/translators]] -[[$:/plugins/tiddlywiki/pluginlibrary]] -[[$:/plugins/tiddlywiki/jasmine]]","recipes/library/tiddlers/","$:/UpgradeLibrary/List",
+   			"--savetiddler","$:/UpgradeLibrary/List","recipes/library/tiddlers.json",
 			"--rendertiddler","$:/plugins/tiddlywiki/pluginlibrary/library.template.html","index.html","text/plain"]
 	}
 }

editions/prerelease/tiddlers/Release 5.3.1.tid

@@ -1,29 +1,22 @@
 caption: 5.3.1
-created: 20230820112855583
-modified: 20230820112855583
-released: 20230820112855583
+created: 20230720215100983
+modified: 20230720215100983
 tags: ReleaseNotes
 title: Release 5.3.1
 type: text/vnd.tiddlywiki
-description: Bug fix release for v5.3.0
 
-//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.0...v5.3.1]]//
-
-<<.banner-credits
-	credit:"""Congratulations to [[vilc|https://talk.tiddlywiki.org/u/vilc]] for their winning design for the banner for this release (here is the [[competition thread|https://talk.tiddlywiki.org/t/banner-image-competition-for-v5-3-0/7406/10]]).
-"""
-	url:"https://github.com/Jermolene/TiddlyWiki5/blob/4124bbdfb3e2445d45488006dfff1925d067ab0f/editions/tw5.com/tiddlers/images/New%20Release%20Banner.png?raw=true"
->>
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.0...master]]//
 
 ! Overview of v5.3.1
 
-This release comes only a few weeks after [[v5.3.0|Release 5.3.0]]. The motivation for the release is to swiftly fix some issues that have emerged with v5.3.0. There are also some other improvements included in this release, notably the ability to access binary resources over HTTP -- the [[demo|WidgetMessage: tm-http-request Example - Random Dog]] downloads a random image or video of a dog.
-
 ! Bug Fixes and Reversions of v5.3.0 Changes
 
 * Reverted adding the `widget.destroy()` method because of performance concerns (see https://github.com/Jermolene/TiddlyWiki5/pull/7468)
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7647">> inefficiency when transcluding with the ''$output'' attribute set to `text/plain` that manifested itself as extremely slow export times
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7648">> unwanted error message "Global assignment is not allowed within modules on node"
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7647">> inefficiency when transcluding with the ''$output'' attribute set to `text/plain`
+
+! Plugin Improvements
+
+*
 
 ! Translation improvement
 
@@ -32,14 +25,22 @@ Improvements to the following translations:
 * Chinese
 * Polish
 
+! Usability Improvements
+
+* 
+
 ! Widget Improvements
 
 * <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7594">> ''tabindex'' attribute to SelectWidget
 
+! Filter improvements
+
+*
+
 ! Hackability Improvements
 
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7611">> ImportVariablesWidget and [[Pragma: \import]] to trim whitespace when parsing tiddlers
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/commit/9b2af1359614f4ad5afd05be7cf9853909334592">> [[WidgetMessage: tm-http-request]] to handle binary responses ([[demo|WidgetMessage: tm-http-request Example - Random Dog]])
+* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/commit/9b2af1359614f4ad5afd05be7cf9853909334592"> [[WidgetMessage: tm-http-request]] to handle binary responses ([[demo|WidgetMessage: tm-http-request Example - Random Dog]])
 
 ! Bug Fixes
 
@@ -49,17 +50,18 @@ Improvements to the following translations:
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7624">> the pragmas introduced in v5.3.0 so that they can be indented with whitespace
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7619">> size of tiddler icons
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7622">> drag and drop from Chrome-like browsers to Firefox
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7679">> listIndex mode of checkbox widgets
 
 ! Node.js Improvements
 
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7645">> console reporting of ~JavaScript errors
+*
 
 ! Developer Improvements
 
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/6c7c21a87bdb0d8a00df1c14eea18912164e0b57">> overeager onload handler in Jasmine plugin
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/08bad90e51c45233a196333e101bbbf6ecf702ce">> ordering of shadow tiddler listings to not reflect order of insertion
 
+Currently shadow tiddler ordering depends upon the order in which the shadows appear in the plugin JSON
+
 ! Acknowledgements
 
 [[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
@@ -67,21 +69,11 @@ Improvements to the following translations:
 <<.contributors """
 AnthonyMuscio
 btheado
-catter-fly
-cmo-pomerium
 CrossEye
 flibbles
 hffqyd
-lilscribby
-linonetwo
-Marxsal
-mateuszwilczek
-pille1842
 pmario
-rmunn
 saqimtiaz
 stevesunypoly
-TiddlyTweeter
 twMat
-yaisog
 """>>

editions/prerelease/tiddlers/Release 5.3.2.tid

@@ -1,122 +0,0 @@
-caption: 5.3.2
-created: 20231016122502955
-modified: 20231016122502955
-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...master]]//
-
-! Major Improvements
-
-!! Conditional Shortcut Syntax
-
-<<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7710">> a new [[shortcut syntax|Conditional Shortcut Syntax]] for concisely expressing if-then-else logic. For example:
-
-```
-<% if [<animal>match[Elephant]] %>
-  It is an elephant
-<% else %>
-  <% if [<animal>match[Giraffe]] %>
-    It is a giraffe
-  <% else %>
-    It is completely unknown
-  <% endif %>
-<% endif %>
-```
-
-!! Explicit Templates for the ListWidget
-
-<<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7784">> support for `<$list-template>` and `<$list-empty>` as immediate children of the <<.wid "ListWidget">> widget to specify the list item template and/or the empty template. Note that the <<.attr "emptyMessage">> and <<.attr "template">> attributes take precedence if they are present. For example:
-
-```
-<$list filter=<<filter>>>
-	<$list-template>
-		<$text text=<<currentTiddler>>/>
-	</$list-template>
-	<$list-empty>
-		None!
-	</$list-empty>
-</$list>
-```
-
-!! jsonset operator
-
-<<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7742">> [[jsonset Operator]] for setting values within JSON objects
-
-!! QR Code Reader
-
-<<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7746">> QR Code plugin to be able to read QR codes and a number of other bar code formats
-
-! Translation improvement
-
-Improvements to the following translations:
-
-* Chinese
-* Polish
-* Spanish
-
-! Plugin Improvements
-
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/1be8f0a9336952d4745d2bd4f2327e353580a272">> Comments Plugin to use predefined palette colours
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7785">> Evernote Importer Plugin to support images and other attachments
-
-! Widget Improvements
-
-* 
-
-! Usability Improvements
-
-* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/7747">> editor preview button to automatically focus the editor
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7764">> file type names in the export menu
-
-! Hackability Improvements
-
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7737">> an automatic build of the external core TiddlyWiki at https://tiddlywiki.com/empty-external-core.html
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7690">> the default page layout to better support CSS grid and flexbox layouts
-
-! Bug Fixes
-
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7665">> `{{}}` generating a recursion error
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7758">> ordering of Vanilla stylesheets
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/fa9bfa07a095548eb2f8339b0b1b816d2e6794ef">> missing closing tag in tag-pill-inner macro
-* <<.link-badge-removed "https://github.com/Jermolene/TiddlyWiki5/issues/7732">> invalid "type" attribute from textarea elements generated by the EditTextWidget
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7749">> editor "type" dropdown state tiddlers
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7712">> handling of "counter-last" variable when appending items with the ListWidget
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/6088">> upgrade download link in Firefox
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7698">> refreshing of transcluded functions
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7789">> resizing of height of textareas in control panel
-
-! Node.js Improvements
-
-* 
-
-! Performance Improvements
-
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7702">> performance of predefined patterns with [[all Operator]]
-* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/issues/7671">> favicon format to PNG
-
-! Developer Improvements
-
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7751">> global hook handling to support removing hooks
-
-! Acknowledgements
-
-[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
-
-<<.contributors """
-AnthonyMuscio
-BramChen
-BuckarooBanzay
-BurningTreeC
-EvidentlyCube
-joebordes
-kookma
-linonetwo
-mateuszwilczek
-pmario
-rmunn
-simonbaird
-T1mL3arn
-""">>

editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/LocalPluginLibrary
 tags: $:/tags/PluginLibrary
-url: http://127.0.0.1:8080/prerelease/library/v5.3.2/index.html
+url: http://127.0.0.1:8080/prerelease/library/v5.3.1/index.html
 caption: {{$:/language/OfficialPluginLibrary}} (Prerelease Local)
 
 A locally installed version of the official ~TiddlyWiki plugin library at tiddlywiki.com for testing and debugging. //Requires a local web server to share the library//

editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/prerelease/library/v5.3.2/index.html
+url: https://tiddlywiki.com/prerelease/library/v5.3.1/index.html
 caption: {{$:/language/OfficialPluginLibrary}} (Prerelease)
 
 The prerelease version of the official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.

editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid

@@ -1,5 +1,5 @@
 title: TiddlyWiki Pre-release
-modified: 20230731122156493
+modified: 20150428204930183
 
 This is a pre-release build of TiddlyWiki provided for testing and review purposes. ''Please don't try to depend on the pre-release for anything important'' -- you should use the latest official release from https://tiddlywiki.com.
 

editions/prerelease/tiddlers/system/favicon.ico.meta

@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon

editions/prerelease/tiddlers/system/favicon.png.meta

@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/png

editions/prerelease/tiddlers/system/temp-my-scroll-position.tid

@@ -0,0 +1,3 @@
+title: $:/my-scroll-position
+scroll-left: 0
+scroll-top: 100

editions/resumebuilder/tiddlywiki.info

@@ -20,4 +20,4 @@
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico"]
 	}
-}
+}

editions/server-external-js/tiddlywiki.info

@@ -17,7 +17,7 @@
 		"static": [
 			"--render","$:/core/templates/static.template.html","static.html","text/plain",
 			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",			
 			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"],
 		"tiddlywikicore": [
 			"--render","$:/core/templates/tiddlywiki5.js","[[tiddlywikicore-]addsuffix<version>addsuffix[.js]]","text/plain"]

editions/server/tiddlywiki.info

@@ -15,7 +15,7 @@
 		"static": [
 			"--render","$:/core/templates/static.template.html","static.html","text/plain",
 			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",
 			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
 }

editions/test/tiddlers/tests/data/conditionals/Basic.tid

@@ -1,26 +0,0 @@
-title: Conditionals/Basic
-description: Basic conditional shortcut syntax
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Text
-
-This is a <% if [<something>match[one]] %>Elephant<% endif %>, I think.
-+
-title: Output
-
-<$let something="one">
-{{Text}}
-</$let>
-
-<$let something="two">
-{{Text}}
-</$let>
-+
-title: ExpectedResult
-
-<p>
-This is a Elephant, I think.
-</p><p>
-This is a , I think.
-</p>

editions/test/tiddlers/tests/data/conditionals/BlockMode.tid

@@ -1,37 +0,0 @@
-title: Conditionals/BlockMode
-description: Basic conditional shortcut syntax in block mode
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\procedure test(animal)
-<% if [<animal>match[Elephant]] %>
-
-! It is an elephant
-
-<% else %>
-
-<% if [<animal>match[Giraffe]] %>
-
-! It is a giraffe
-
-<% else %>
-
-! It is completely unknown
-
-<% endif %>
-
-<% endif %>
-
-\end
-
-<<test "Giraffe">>
-
-<<test "Elephant">>
-
-<<test "Antelope">>
-+
-title: ExpectedResult
-
-<h1 class="">It is a giraffe</h1><h1 class="">It is an elephant</h1><h1 class="">It is completely unknown</h1>

editions/test/tiddlers/tests/data/conditionals/Else.tid

@@ -1,26 +0,0 @@
-title: Conditionals/Else
-description: Else conditional shortcut syntax
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Text
-
-This is a <% if [<something>match[one]] %>Elephant<% else %>Crocodile<% endif %>, I think.
-+
-title: Output
-
-<$let something="one">
-{{Text}}
-</$let>
-
-<$let something="two">
-{{Text}}
-</$let>
-+
-title: ExpectedResult
-
-<p>
-This is a Elephant, I think.
-</p><p>
-This is a Crocodile, I think.
-</p>

editions/test/tiddlers/tests/data/conditionals/Elseif.tid

@@ -1,32 +0,0 @@
-title: Conditionals/Elseif
-description: Elseif conditional shortcut syntax
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Text
-
-This is a <% if [<something>match[one]] %>Elephant<% elseif [<something>match[two]] %>Antelope<% else %>Crocodile<% endif %>, I think.
-+
-title: Output
-
-<$let something="one">
-{{Text}}
-</$let>
-
-<$let something="two">
-{{Text}}
-</$let>
-
-<$let something="three">
-{{Text}}
-</$let>
-+
-title: ExpectedResult
-
-<p>
-This is a Elephant, I think.
-</p><p>
-This is a Antelope, I think.
-</p><p>
-This is a Crocodile, I think.
-</p>

editions/test/tiddlers/tests/data/conditionals/MissingEndIf.tid

@@ -1,26 +0,0 @@
-title: Conditionals/MissingEndif
-description: Conditional shortcut syntax with missing endif
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Text
-
-This is a <% if [<something>match[one]] %>Elephant
-+
-title: Output
-
-<$let something="one">
-{{Text}}
-</$let>
-
-<$let something="two">
-{{Text}}
-</$let>
-+
-title: ExpectedResult
-
-<p>
-This is a Elephant
-</p><p>
-This is a 
-</p>

editions/test/tiddlers/tests/data/conditionals/MultipleResults.tid

@@ -1,12 +0,0 @@
-title: Conditionals/MultipleResults
-description: Check that multiple results from the filter are ignored
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-This is a <% if 1 2 3 4 5 6 %>Elephant<% endif %>, I think.
-+
-title: ExpectedResult
-
-<p>This is a Elephant, I think.</p>

editions/test/tiddlers/tests/data/conditionals/Nested.tid

@@ -1,38 +0,0 @@
-title: Conditionals/Nested
-description: Nested conditional shortcut syntax
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\procedure test(animal)
-<% if [<animal>match[Elephant]] %>
-It is an elephant
-<% else %>
-<% if [<animal>match[Giraffe]] %>
-It is a giraffe
-<% else %>
-It is completely unknown
-<% endif %>
-<% endif %>
-\end
-
-<<test "Giraffe">>
-
-<<test "Elephant">>
-
-<<test "Antelope">>
-
-+
-title: ExpectedResult
-
-
-
-It is a giraffe
-
-
-It is an elephant
-
-
-It is completely unknown
-

editions/test/tiddlers/tests/data/conditionals/NestedElseif.tid

@@ -1,60 +0,0 @@
-title: Conditionals/NestedElseif
-description: Nested elseif conditional shortcut syntax
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Text
-
-\whitespace trim
-This is a 
-	<% if [<something>match[one]] %>
-		<% if [<another>match[one]] %>
-			Indian
-		<% elseif [<another>match[two]] %>
-			African
-		<% else %>
-			Unknown
-		<% endif %>
-		&#32;Elephant
-	<% elseif [<something>match[two]] %>
-		Antelope
-	<% else %>
-		Crocodile
-	<% endif %>
-, I think.
-+
-title: Output
-
-<$let something="one" another="one">
-{{Text}}
-</$let>
-
-<$let something="one" another="two">
-{{Text}}
-</$let>
-
-<$let something="one" another="three">
-{{Text}}
-</$let>
-
-<$let something="two">
-{{Text}}
-</$let>
-
-<$let something="three">
-{{Text}}
-</$let>
-+
-title: ExpectedResult
-
-<p>
-This is a Indian Elephant, I think.
-</p><p>
-This is a African Elephant, I think.
-</p><p>
-This is a Unknown Elephant, I think.
-</p><p>
-This is a Antelope, I think.
-</p><p>
-This is a Crocodile, I think.
-</p>

editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplates.tid

@@ -1,29 +0,0 @@
-title: ListWidget/WithExplicitTemplates
-description: List widget with explicit templates
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-+
-title: Output
-
-\whitespace trim
-
-\procedure test(filter)
-<$list filter=<<filter>>>
-	<$list-template>
-		<$text text=<<currentTiddler>>/>
-	</$list-template>
-	<$list-empty>
-		None!
-	</$list-empty>
-</$list>
-\end
-
-<<test "1 2 3">>
-
-<<test "">>
-
-+
-title: ExpectedResult
-
-<p>123</p><p>None!</p>

editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplatesInBlockMode.tid

@@ -1,32 +0,0 @@
-title: ListWidget/WithExplicitTemplatesInBlockMode
-description: List widget with explicit templates in block mode
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-+
-title: Output
-
-\whitespace trim
-
-\procedure test(filter)
-<$list filter=<<filter>>>
-
-	<$list-template>
-		<$text text=<<currentTiddler>>/>
-	</$list-template>
-
-	<$list-empty>
-		None!
-	</$list-empty>
-
-</$list>
-\end
-
-<<test "1 2 3">>
-
-<<test "">>
-
-+
-title: ExpectedResult
-
-123None!

editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplatesOverriddenByAttributes.tid

@@ -1,33 +0,0 @@
-title: ListWidget/WithExplicitTemplatesOverriddenByAttributes
-description: List widget with explicit templates
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-+
-title: Output
-
-\whitespace trim
-
-\procedure test(filter)
-<$list filter=<<filter>> emptyMessage="Zero" template="Template">
-	<$list-template>
-		<$text text=<<currentTiddler>>/>
-	</$list-template>
-	<$list-empty>
-		None!
-	</$list-empty>
-</$list>
-\end
-
-<<test "1 2 3">>
-
-<<test "">>
-
-+
-title: Template
-
-<$text text=<<currentTiddler>>/><$text text=<<currentTiddler>>/>
-+
-title: ExpectedResult
-
-<p>112233</p><p>Zero</p>

editions/test/tiddlers/tests/data/list-widget/WithLimit.tid

@@ -1,25 +0,0 @@
-title: ListWidget/WithLimit
-description: List widget with limit
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-+
-title: Output
-
-Zero: <$list filter="1 2 3 4" limit="0" template="Template"/>
-
-One: <$list filter="1 2 3 4" limit="1" template="Template"/>
-
-Two: <$list filter="1 2 3 4" limit="2" template="Template"/>
-
-Minus Two: <$list filter="1 2 3 4" limit="-2" template="Template"/>
-
-+
-title: Template
-
-<$text text=<<currentTiddler>>/>
-+
-title: ExpectedResult
-
-<p>Zero: </p><p>One: 1</p><p>Two: 12</p><p>Minus Two: 34
-</p>