Fix docs date

Fixes #6955

boot/boot.js

@@ -1230,13 +1230,16 @@ $tw.Wiki = function(options) {
 	this.getTiddler = function(title) {
 		if(title) {
 			var t = tiddlers[title];
-			if(t instanceof $tw.Tiddler) {
+			if(t !== undefined) {
 				return t;
-			} else if(title !== undefined && shadowTiddlers[title]) {
-				return shadowTiddlers[title].tiddler;
+			} else {
+				var s = shadowTiddlers[title];
+				if(s !== undefined) {
+					return s.tiddler;
+				}
 			}
-			return undefined;
 		}
+		return undefined;
 	};
 
 	// Get an array of all tiddler titles
@@ -2416,7 +2419,7 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("application/epub+zip","base64",".epub");
 	$tw.utils.registerFileType("application/octet-stream","base64",".octet-stream");
 	// Create the wiki store for the app
-	$tw.wiki = new $tw.Wiki();
+	$tw.wiki = new $tw.Wiki($tw.safeMode && {enableIndexers: []});
 	// Install built in tiddler fields modules
 	$tw.Tiddler.fieldModules = $tw.modules.getModulesByTypeAsHashmap("tiddlerfield");
 	// Install the tiddler deserializer modules

core/language/en-GB/Buttons.multids

@@ -18,6 +18,8 @@ CopyToClipboard/Caption: copy to clipboard
 CopyToClipboard/Hint: Copy this text to the clipboard
 Delete/Caption: delete
 Delete/Hint: Delete this tiddler
+DeleteTiddlers/Caption: delete tiddlers
+DeleteTiddlers/Hint: Delete tiddlers
 Edit/Caption: edit
 Edit/Hint: Edit this tiddler
 Encryption/Caption: encryption

core/language/en-GB/EditTemplate.multids

@@ -1,5 +1,6 @@
 title: $:/language/EditTemplate/
 
+Caption: Editor
 Body/External/Hint: This tiddler shows content stored outside of the main TiddlyWiki file. You can edit the tags and fields but cannot directly edit the content itself
 Body/Placeholder: Type the text for this tiddler
 Body/Preview/Type/Output: output

core/language/en-GB/GettingStarted.tid

@@ -9,9 +9,10 @@ Before you start storing important information in ~TiddlyWiki it is vital to mak
 
 <div class="tc-control-panel">
 
-|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
-|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|tc-table-no-border tc-first-col-min-width tc-first-link-nowrap|k
+| <$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link>|<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+| <$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link>|<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|^ <$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link><br><<lingo DefaultTiddlers/TopHint>>|<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 </div>
 
 See the [[control panel|$:/ControlPanel]] for more options.

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

@@ -31,5 +31,5 @@ Notes:
 
 Examples:
 
-* `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` -- renders all non-system tiddlers as files in the subdirectory "tiddlers" with URL-encoded titles and the extension HTML
-
+* `--render '[!is[system]]' '[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]'` -- renders all non-system tiddlers as files in the subdirectory "tiddlers" with URL-encoded titles and the extension HTML
+* `--render '.' 'tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[HelloThere]]'` -- renders the tiddlers tagged "HelloThere" to a JSON file named "tiddlers.json"

core/language/en-GB/Misc.multids

@@ -8,6 +8,7 @@ CloseAll/Button: close all
 ColourPicker/Recent: Recent:
 ConfirmCancelTiddler: Do you wish to discard changes to the tiddler "<$text text=<<title>>/>"?
 ConfirmDeleteTiddler: Do you wish to delete the tiddler "<$text text=<<title>>/>"?
+ConfirmDeleteTiddlers: Are you sure you wish to delete <<resultCount>> tiddler(s)?
 ConfirmOverwriteTiddler: Do you wish to overwrite the tiddler "<$text text=<<title>>/>"?
 ConfirmEditShadowTiddler: You are about to edit a ShadowTiddler. Any changes will override the default system making future upgrades non-trivial. Are you sure you want to edit "<$text text=<<title>>/>"?
 ConfirmAction: Do you wish to proceed?

core/language/en-GB/SideBar.multids

@@ -1,5 +1,6 @@
 title: $:/language/SideBar/
 
+Caption: Sidebar
 All/Caption: All
 Contents/Caption: Contents
 Drafts/Caption: Drafts

core/modules/commands/render.js

@@ -50,7 +50,7 @@ Render individual tiddlers and save the results to the specified files
 				console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
 			}
 			var parser = wiki.parseTiddler(template || title),
-				widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title})}),
+				widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
 				container = $tw.fakeDocument.createElement("div");
 			widgetNode.render(container,null);
 			var text = type === "text/html" ? container.innerHTML : container.textContent;

core/modules/commands/rendertiddler.js

@@ -40,6 +40,7 @@ Command.prototype.execute = function() {
 	$tw.utils.createFileDirectories(filename);
 	if(template) {
 		variables.currentTiddler = title;
+		variables.storyTiddler = title;
 		title = template;
 	}
 	if(name && value) {

core/modules/commands/rendertiddlers.js

@@ -46,7 +46,7 @@ Command.prototype.execute = function() {
 	}
 	$tw.utils.each(tiddlers,function(title) {
 		var parser = wiki.parseTiddler(template),
-			widgetNode = wiki.makeWidget(parser,{variables: {currentTiddler: title}}),
+			widgetNode = wiki.makeWidget(parser,{variables: {currentTiddler: title, storyTiddler: title}}),
 			container = $tw.fakeDocument.createElement("div");
 		widgetNode.render(container,null);
 		var text = type === "text/html" ? container.innerHTML : container.textContent,

core/modules/editor/engines/framed.js

@@ -35,7 +35,7 @@ function FramedEngine(options) {
 	this.iframeDoc = this.iframeNode.contentWindow.document;
 	// (Firefox requires us to put some empty content in the iframe)
 	var paletteTitle = this.widget.wiki.getTiddlerText("$:/palette");
-	var colorScheme = this.widget.wiki.getTiddler(paletteTitle).fields["color-scheme"] || "light";
+	var colorScheme = (this.widget.wiki.getTiddler(paletteTitle) || {fields: {}}).fields["color-scheme"] || "light";
 	this.iframeDoc.open();
 	this.iframeDoc.write("<meta name='color-scheme' content='" + colorScheme + "'>");
 	this.iframeDoc.close();

core/modules/editor/factory.js

@@ -115,7 +115,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 				// Otherwise, we need to construct a default value for the editor
 				switch(this.editField) {
 					case "text":
-						value = "Type the text for the tiddler '" + this.editTitle + "'";
+						value = "";
 						type = "text/vnd.tiddlywiki";
 						break;
 					case "title":

core/modules/filterrunprefixes/map.js

@@ -16,7 +16,9 @@ exports.map = function(operationSubFunction,options) {
 	return function(results,source,widget) {
 		if(results.length > 0) {
 			var inputTitles = results.toArray(),
-				index = 0;
+				index = 0,
+				suffixes = options.suffixes,
+				flatten = (suffixes[0] && suffixes[0][0] === "flat") ? true : false;
 			results.clear();
 			$tw.utils.each(inputTitles,function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),{
@@ -36,7 +38,13 @@ exports.map = function(operationSubFunction,options) {
 						}
 					}
 				});
-				results.push(filtered[0] || "");
+				if(filtered.length && flatten) {
+					$tw.utils.each(filtered,function(value) {
+						results.push(value);
+					})
+				} else {
+					results.push(filtered[0]||"");
+				}
 				++index;
 			});
 		}

core/modules/filters.js

@@ -220,10 +220,18 @@ source: an iterator function for the source tiddlers, called source(iterator), w
 widget: an optional widget node for retrieving the current tiddler etc.
 */
 exports.compileFilter = function(filterString) {
+	if(!this.filterCache) {
+		this.filterCache = Object.create(null);
+		this.filterCacheCount = 0;
+	}
+	if(this.filterCache[filterString] !== undefined) {
+		return this.filterCache[filterString];
+	}
 	var filterParseTree;
 	try {
 		filterParseTree = this.parseFilter(filterString);
 	} catch(e) {
+		// We do not cache this result, so it adjusts along with localization changes
 		return function(source,widget) {
 			return [$tw.language.getString("Error/Filter") + ": " + e];
 		};
@@ -320,7 +328,7 @@ exports.compileFilter = function(filterString) {
 		})());
 	});
 	// Return a function that applies the operations to a source iterator of tiddler titles
-	return $tw.perf.measure("filter: " + filterString,function filterFunction(source,widget) {
+	var compiled = $tw.perf.measure("filter: " + filterString,function filterFunction(source,widget) {
 		if(!source) {
 			source = self.each;
 		} else if(typeof source === "object") { // Array or hashmap
@@ -335,6 +343,16 @@ exports.compileFilter = function(filterString) {
 		});
 		return results.toArray();
 	});
+	if(this.filterCacheCount >= 2000) {
+		// To prevent memory leak, we maintain an upper limit for cache size.
+		// Reset if exceeded. This should give us 95% of the benefit
+		// that no cache limit would give us.
+		this.filterCache = Object.create(null);
+		this.filterCacheCount = 0;
+	}
+	this.filterCache[filterString] = compiled;
+	this.filterCacheCount++;
+	return compiled;
 };
 
 })();

core/modules/filters/format/json.js

@@ -0,0 +1,35 @@
+/*\
+title: $:/core/modules/filters/format/json.js
+type: application/javascript
+module-type: formatfilteroperator
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.json = function(source,operand,options) {
+	var results = [],
+		spaces = null;
+	if(operand) {
+		spaces = /^\d+$/.test(operand) ? parseInt(operand,10) : operand;
+	}
+	source(function(tiddler,title) {
+		var data = $tw.utils.parseJSONSafe(title);
+		try {
+			data = JSON.parse(title);
+		} catch(e) {
+			data = undefined;
+		}
+		if(data !== undefined) {
+			results.push(JSON.stringify(data,null,spaces));
+		}
+	});
+	return results;
+};
+
+})();

core/modules/filters/insertafter.js

@@ -0,0 +1,46 @@
+/*\
+title: $:/core/modules/filters/insertafter.js
+type: application/javascript
+module-type: filteroperator
+
+Insert an item after another item in a list
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Order a list
+*/
+exports.insertafter = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push(title);
+	});
+	var target = operator.operands[1] || (options.widget && options.widget.getVariable(operator.suffix || "currentTiddler"));
+	if(target !== operator.operand) {
+		// Remove the entry from the list if it is present
+		var pos = results.indexOf(operator.operand);
+		if(pos !== -1) {
+			results.splice(pos,1);
+		}
+		// Insert the entry after the target marker
+		pos = results.indexOf(target);
+		if(pos !== -1) {
+			results.splice(pos+1,0,operator.operand);
+		} else {
+			var suffix = operator.operands.length > 1 ? operator.suffix : "";
+			if(suffix === "start") {
+				results.splice(0,0,operator.operand);
+			} else {
+				results.push(operator.operand);
+			}
+		}
+	}
+	return results;
+};
+
+})();

core/modules/filters/insertbefore.js

@@ -32,7 +32,12 @@ exports.insertbefore = function(source,operator,options) {
 		if(pos !== -1) {
 			results.splice(pos,0,operator.operand);
 		} else {
-			results.push(operator.operand);
+			var suffix = operator.operands.length > 1 ? operator.suffix : "";
+			if(suffix == "start") {
+				results.splice(0,0,operator.operand);
+			} else {
+				results.push(operator.operand);
+			}
 		}
 	}
 	return results;

core/modules/filters/json-ops.js

@@ -0,0 +1,153 @@
+/*\
+title: $:/core/modules/filters/json-ops.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operators for JSON operations
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["jsonget"] = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		var data = $tw.utils.parseJSONSafe(title,title);
+		if(data) {
+			var item = getDataItemValueAsString(data,operator.operands);
+			if(item !== undefined) {
+				results.push(item);
+			}
+		}
+	});
+	return results;
+};
+
+exports["jsonindexes"] = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		var data = $tw.utils.parseJSONSafe(title,title);
+		if(data) {
+			var item = getDataItemKeysAsStrings(data,operator.operands);
+			if(item !== undefined) {
+				results.push.apply(results,item);
+			}
+		}
+	});
+	return results;
+};
+
+exports["jsontype"] = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		var data = $tw.utils.parseJSONSafe(title,title);
+		if(data) {
+			var item = getDataItemType(data,operator.operands);
+			if(item !== undefined) {
+				results.push(item);
+			}
+		}
+	});
+	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
+*/
+function getDataItemValueAsString(data,indexes) {
+	// Get the item
+	var item = getDataItem(data,indexes);
+	// Return the item as a string
+	return convertDataItemValueToString(item);
+}
+
+/*
+Given a JSON data structure and an array of index strings, return an array of the string representation of the keys of the item at the end of the index chain, or "undefined" if any of the index strings are invalid
+*/
+function getDataItemKeysAsStrings(data,indexes) {
+	// Get the item
+	var item = getDataItem(data,indexes);
+	// Return the item keys as a string
+	return convertDataItemKeysToStrings(item);
+}
+
+/*
+Return an array of the string representation of the values of a data item, or "undefined" if the item is undefined
+*/
+function convertDataItemValueToString(item) {
+	// Return the item as a string
+	if(item === undefined) {
+		return item;
+	}
+	if(typeof item === "object") {
+		return JSON.stringify(item);
+	}
+	return item.toString();
+}
+
+/*
+Return an array of the string representation of the keys of a data item, or "undefined" if the item is undefined
+*/
+function convertDataItemKeysToStrings(item) {
+	// Return the item as a string
+	if(item === undefined) {
+		return item;
+	} else if(typeof item === "object") {
+		if(item === null) {
+			return [];
+		}
+		var results = [];
+		if($tw.utils.isArray(item)) {
+			for(var i=0; i<item.length; i++) {
+				results.push(i.toString());
+			}
+			return results;
+		} else {
+			$tw.utils.each(Object.keys(item).sort(),function(key) {
+				results.push(key);
+			});
+			return results;
+		}
+	}
+	return [];
+}
+
+function getDataItemType(data,indexes) {
+	// Get the item
+	var item = getDataItem(data,indexes);
+	// Return the item type
+	if(item === undefined) {
+		return item;
+	} else if(item === null) {
+		return "null";
+	} else if($tw.utils.isArray(item)) {
+		return "array";
+	} else if(typeof item === "object") {
+		return "object";
+	} else {
+		return typeof item;
+	}
+}
+
+/*
+Given a JSON data structure and an array of index strings, return the value at the end of the index chain, or "undefined" if any of the index strings are invalid
+*/
+function getDataItem(data,indexes) {
+	if(indexes.length === 0 || (indexes.length === 1 && indexes[0] === "")) {
+		return data;
+	}
+	// Get the item
+	var item = data;
+	for(var i=0; i<indexes.length; i++) {
+		if(item !== undefined) {
+			item = item[indexes[i]];
+		}
+	}
+	return item;
+}
+
+})();
+	

core/modules/parsers/wikiparser/wikiparser.js

@@ -116,7 +116,7 @@ WikiParser.prototype.loadRemoteTiddler = function(url) {
 */
 WikiParser.prototype.setupRules = function(proto,configPrefix) {
 	var self = this;
-	if(!$tw.safemode) {
+	if(!$tw.safeMode) {
 		$tw.utils.each(proto,function(object,name) {
 			if(self.wiki.getTiddlerText(configPrefix + name,"enable") !== "enable") {
 				delete proto[name];

core/modules/server/server.js

@@ -359,8 +359,9 @@ Server.prototype.listen = function(port,host,prefix) {
 	}
 	// Display the port number after we've started listening (the port number might have been specified as zero, in which case we will get an assigned port)
 	server.on("listening",function() {
-		var address = server.address();
-		$tw.utils.log("Serving on " + self.protocol + "://" + address.address + ":" + address.port + prefix,"brown/orange");
+		var address = server.address(),
+			url = self.protocol + "://" + (address.family === "IPv6" ? "[" + address.address + "]" : address.address) + ":" + address.port + prefix;
+		$tw.utils.log("Serving on " + url,"brown/orange");
 		$tw.utils.log("(press ctrl-C to exit)","red");
 	});
 	// Listen

core/modules/startup/browser-messaging.js

@@ -62,12 +62,14 @@ function loadIFrame(url,callback) {
 Unload library iframe for given url
 */
 function unloadIFrame(url){
-	$tw.utils.each(document.getElementsByTagName('iframe'), function(iframe) {
+	var iframes = document.getElementsByTagName('iframe');
+	for(var t=iframes.length-1; t--; t>=0) {
+		var iframe = iframes[t];
 		if(iframe.getAttribute("library") === "true" &&
 		  iframe.getAttribute("src") === url) {
 			iframe.parentNode.removeChild(iframe);
 		}
-	});
+	}
 }
 
 function saveIFrameInfoTiddler(iframeInfo) {

core/modules/startup/story.js

@@ -54,7 +54,9 @@ exports.startup = function() {
 			var hash = $tw.utils.getLocationHash();
 			if(hash !== $tw.locationHash) {
 				$tw.locationHash = hash;
-				openStartupTiddlers({defaultToCurrentStory: true});
+				if(hash !== "#") {
+					openStartupTiddlers({defaultToCurrentStory: true});
+				}
 			}
 		},false);
 		// Listen for the tm-browser-refresh message

core/modules/utils/dom/dragndrop.js

@@ -25,14 +25,13 @@ widget: widget to use as the context for the filter
 exports.makeDraggable = function(options) {
 	var dragImageType = options.dragImageType || "dom",
 		dragImage,
-		domNode = options.domNode,
-		dragHandle = options.selector && domNode.querySelector(options.selector) || domNode;
+		domNode = options.domNode;
 	// Make the dom node draggable (not necessary for anchor tags)
-	if((domNode.tagName || "").toLowerCase() !== "a") {
-		dragHandle.setAttribute("draggable","true");
+	if(!options.selector && ((domNode.tagName || "").toLowerCase() !== "a")) {
+		domNode.setAttribute("draggable","true");
 	}
 	// Add event handlers
-	$tw.utils.addEventListeners(dragHandle,[
+	$tw.utils.addEventListeners(domNode,[
 		{name: "dragstart", handlerFunction: function(event) {
 			if(event.dataTransfer === undefined) {
 				return false;
@@ -41,19 +40,19 @@ exports.makeDraggable = function(options) {
 			var dragTiddler = options.dragTiddlerFn && options.dragTiddlerFn(),
 				dragFilter = options.dragFilterFn && options.dragFilterFn(),
 				titles = dragTiddler ? [dragTiddler] : [],
-			    	startActions = options.startActions,
-			    	variables,
-			    	domNodeRect;
+				startActions = options.startActions,
+				variables,
+				domNodeRect;
 			if(dragFilter) {
 				titles.push.apply(titles,options.widget.wiki.filterTiddlers(dragFilter,options.widget));
 			}
 			var titleString = $tw.utils.stringifyList(titles);
 			// Check that we've something to drag
-			if(titles.length > 0 && event.target === dragHandle) {
+			if(titles.length > 0 && (options.selector && $tw.utils.domMatchesSelector(event.target,options.selector) || event.target === domNode)) {
 				// Mark the drag in progress
 				$tw.dragInProgress = domNode;
 				// Set the dragging class on the element being dragged
-				$tw.utils.addClass(event.target,"tc-dragging");
+				$tw.utils.addClass(domNode,"tc-dragging");
 				// Invoke drag-start actions if given
 				if(startActions !== undefined) {
 					// Collect our variables
@@ -107,21 +106,22 @@ exports.makeDraggable = function(options) {
 					dataTransfer.setData("text/vnd.tiddler",jsonData);
 					dataTransfer.setData("text/plain",titleString);
 					dataTransfer.setData("text/x-moz-url","data:text/vnd.tiddler," + encodeURIComponent(jsonData));
+				} else {
+					dataTransfer.setData("URL","data:text/vnd.tiddler," + encodeURIComponent(jsonData));
 				}
-				dataTransfer.setData("URL","data:text/vnd.tiddler," + encodeURIComponent(jsonData));
 				dataTransfer.setData("Text",titleString);
 				event.stopPropagation();
 			}
 			return false;
 		}},
 		{name: "dragend", handlerFunction: function(event) {
-			if(event.target === domNode) {
+			if((options.selector && $tw.utils.domMatchesSelector(event.target,options.selector)) || event.target === domNode) {
 				// Collect the tiddlers being dragged
 				var dragTiddler = options.dragTiddlerFn && options.dragTiddlerFn(),
 					dragFilter = options.dragFilterFn && options.dragFilterFn(),
 					titles = dragTiddler ? [dragTiddler] : [],
-			    		endActions = options.endActions,
-				    	variables;
+					endActions = options.endActions,
+					variables;
 				if(dragFilter) {
 					titles.push.apply(titles,options.widget.wiki.filterTiddlers(dragFilter,options.widget));
 				}
@@ -135,7 +135,7 @@ exports.makeDraggable = function(options) {
 					options.widget.invokeActionString(endActions,options.widget,event,variables);
 				}
 				// Remove the dragging class on the element being dragged
-				$tw.utils.removeClass(event.target,"tc-dragging");
+				$tw.utils.removeClass(domNode,"tc-dragging");
 				// Delete the drag image element
 				if(dragImage) {
 					dragImage.parentNode.removeChild(dragImage);

core/modules/utils/dom/notifier.js

@@ -36,8 +36,9 @@ Notifier.prototype.display = function(title,options) {
 	if(!tiddler) {
 		return;
 	}
-	// Add classes
+	// Add classes and roles
 	$tw.utils.addClass(notification,"tc-notification");
+	notification.setAttribute("role","alert");
 	// Create the variables
 	var variables = $tw.utils.extend({currentTiddler: title},options.variables);
 	// Render the body of the notification

core/modules/utils/fakedom.js

@@ -42,7 +42,7 @@ var TW_TextNode = function(text) {
 	this.textContent = text + "";
 };
 
-TW_TextNode.prototype = Object.create(TW_Node.prototype);
+Object.setPrototypeOf(TW_TextNode,TW_Node.prototype);
 
 Object.defineProperty(TW_TextNode.prototype, "nodeType", {
 	get: function() {
@@ -67,7 +67,7 @@ var TW_Element = function(tag,namespace) {
 	this.namespaceURI = namespace || "http://www.w3.org/1999/xhtml";
 };
 
-TW_Element.prototype = Object.create(TW_Node.prototype);
+Object.setPrototypeOf(TW_Element,TW_Node.prototype);
 
 Object.defineProperty(TW_Element.prototype, "style", {
 	get: function() {

core/modules/utils/logger.js

@@ -48,7 +48,9 @@ Logger.prototype.log = function(/* args */) {
 			this.saveBufferLogger.buffer = this.saveBufferLogger.buffer.slice(-this.saveBufferLogger.saveLimit);
 		}
 		if(console !== undefined && console.log !== undefined) {
-			return Function.apply.call(console.log, console, [$tw.utils.terminalColour(this.colour),this.componentName + ":"].concat(Array.prototype.slice.call(arguments,0)).concat($tw.utils.terminalColour()));
+			var logMessage = [$tw.utils.terminalColour(this.colour) + this.componentName + ":"].concat(Array.prototype.slice.call(arguments,0));
+			logMessage[logMessage.length-1] += $tw.utils.terminalColour();
+			return Function.apply.call(console.log, console, logMessage);
 		}
 	} 
 };

core/modules/utils/parsetree.js

@@ -12,12 +12,26 @@ Parse tree utility functions.
 /*global $tw: false */
 "use strict";
 
+/*
+Add attribute to parse tree node
+Can be invoked as (node,name,value) or (node,attr)
+*/
 exports.addAttributeToParseTreeNode = function(node,name,value) {
-	var attribute = {name: name, type: "string", value: value};
+	var attribute = typeof name === "object" ? name : {name: name, type: "string", value: value};
+	name = attribute.name;
 	node.attributes = node.attributes || {};
+	node.orderedAttributes = node.orderedAttributes || [];
 	node.attributes[name] = attribute;
-	if(node.orderedAttributes) {
+	var foundIndex = -1;
+	$tw.utils.each(node.orderedAttributes,function(attr,index) {
+		if(attr.name === name) {
+			foundIndex = index;
+		}
+	});
+	if(foundIndex === -1) {
 		node.orderedAttributes.push(attribute);
+	} else {
+		node.orderedAttributes[foundIndex] = attribute;
 	}
 };
 

core/modules/widgets/action-deletefield.js

@@ -36,7 +36,7 @@ Compute the internal state of the widget
 */
 DeleteFieldWidget.prototype.execute = function() {
 	this.actionTiddler = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
-	this.actionField = this.getAttribute("$field");
+	this.actionField = this.getAttribute("$field",null);
 };
 
 /*
@@ -59,7 +59,7 @@ DeleteFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
 		tiddler = this.wiki.getTiddler(self.actionTiddler),
 		removeFields = {},
 		hasChanged = false;
-	if(this.actionField && tiddler) {
+	if((this.actionField !== null) && tiddler) {
 		removeFields[this.actionField] = undefined;
 		if(this.actionField in tiddler.fields) {
 			hasChanged = true;

core/modules/widgets/button.js

@@ -46,7 +46,8 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
 		isPoppedUp = (this.popup || this.popupTitle) && this.isPoppedUp();
 	if(this.selectedClass) {
 		if((this.set || this.setTitle) && this.setTo && this.isSelected()) {
-			$tw.utils.pushTop(classes,this.selectedClass.split(" "));
+			$tw.utils.pushTop(classes, this.selectedClass.split(" "));
+			domNode.setAttribute("aria-checked", "true");
 		}
 		if(isPoppedUp) {
 			$tw.utils.pushTop(classes,this.selectedClass.split(" "));
@@ -66,6 +67,9 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
 	if(this["aria-label"]) {
 		domNode.setAttribute("aria-label",this["aria-label"]);
 	}
+	if (this.role) {
+		domNode.setAttribute("role", this.role);
+	}
 	if(this.popup || this.popupTitle) {
 		domNode.setAttribute("aria-expanded",isPoppedUp ? "true" : "false");
 	}
@@ -206,6 +210,7 @@ ButtonWidget.prototype.execute = function() {
 	this.popup = this.getAttribute("popup");
 	this.hover = this.getAttribute("hover");
 	this["aria-label"] = this.getAttribute("aria-label");
+	this.role = this.getAttribute("role");
 	this.tooltip = this.getAttribute("tooltip");
 	this.style = this.getAttribute("style");
 	this["class"] = this.getAttribute("class","");

core/modules/widgets/checkbox.js

@@ -66,14 +66,14 @@ CheckboxWidget.prototype.render = function(parent,nextSibling) {
 CheckboxWidget.prototype.getValue = function() {
 	var tiddler = this.wiki.getTiddler(this.checkboxTitle);
 	if(tiddler || this.checkboxFilter) {
-		if(this.checkboxTag) {
+		if(tiddler && this.checkboxTag) {
 			if(this.checkboxInvertTag === "yes") {
 				return !tiddler.hasTag(this.checkboxTag);
 			} else {
 				return tiddler.hasTag(this.checkboxTag);
 			}
 		}
-		if(this.checkboxField || this.checkboxIndex) {
+		if(tiddler && (this.checkboxField || this.checkboxIndex)) {
 			// Same logic applies to fields and indexes
 			var value;
 			if(this.checkboxField) {
@@ -206,11 +206,18 @@ CheckboxWidget.prototype.handleChangeEvent = function(event) {
 	}
 	// Set the list field (or index) if specified
 	if(this.checkboxListField || this.checkboxListIndex) {
-		var listContents, oldPos, newPos;
+		var fieldContents, listContents, oldPos, newPos;
 		if(this.checkboxListField) {
-			listContents = tiddler.getFieldList(this.checkboxListField);
+			fieldContents = tiddler ? tiddler.fields[this.checkboxListField] : undefined;
 		} else {
-			listContents = $tw.utils.parseStringArray(this.wiki.extractTiddlerDataItem(this.checkboxTitle,this.checkboxListIndex) || "") || [];
+			fieldContents = this.wiki.extractTiddlerDataItem(this.checkboxTitle,this.checkboxListIndex);
+		}
+		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 {
+			listContents = $tw.utils.parseStringArray(fieldContents) || [];
+			// No need to copy since parseStringArray returns a fresh array, not refrenced elsewhere
 		}
 		oldPos = notValue ? listContents.indexOf(notValue) : -1;
 		newPos = value ? listContents.indexOf(value) : -1;

core/modules/widgets/draggable.js

@@ -87,12 +87,32 @@ DraggableWidget.prototype.execute = function() {
 	this.makeChildWidgets();
 };
 
+
+DraggableWidget.prototype.updateDomNodeClasses = function() {
+	var domNodeClasses = this.domNodes[0].className.split(" "),
+		oldClasses = this.draggableClasses.split(" ");
+	this.draggableClasses = this.getAttribute("class");
+	//Remove classes assigned from the old value of class attribute
+	$tw.utils.each(oldClasses,function(oldClass){
+		var i = domNodeClasses.indexOf(oldClass);
+		if(i !== -1) {
+			domNodeClasses.splice(i,1);
+		}
+	});
+	//Add new classes from updated class attribute.
+	$tw.utils.pushTop(domNodeClasses,this.draggableClasses);
+	this.domNodes[0].setAttribute("class",domNodeClasses.join(" "))
+}
+
 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 DraggableWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	if($tw.utils.count(changedAttributes) > 0) {
+	var changedAttributes = this.computeAttributes(),
+		changedAttributesCount = $tw.utils.count(changedAttributes);
+	if(changedAttributesCount === 1 && changedAttributes["class"]) {
+		this.updateDomNodeClasses();
+	} else if(changedAttributesCount > 0) {
 		this.refreshSelf();
 		return true;
 	}
@@ -101,4 +121,4 @@ DraggableWidget.prototype.refresh = function(changedTiddlers) {
 
 exports.draggable = DraggableWidget;
 
-})();
+})();

core/modules/widgets/element.js

@@ -42,16 +42,22 @@ ElementWidget.prototype.render = function(parent,nextSibling) {
 		this.tag = "h" + headingLevel;
 	}
 	// Select the namespace for the tag
-	var tagNamespaces = {
+	var XHTML_NAMESPACE = "http://www.w3.org/1999/xhtml",
+		tagNamespaces = {
 			svg: "http://www.w3.org/2000/svg",
 			math: "http://www.w3.org/1998/Math/MathML",
-			body: "http://www.w3.org/1999/xhtml"
+			body: XHTML_NAMESPACE
 		};
 	this.namespace = tagNamespaces[this.tag];
 	if(this.namespace) {
 		this.setVariable("namespace",this.namespace);
 	} else {
-		this.namespace = this.getVariable("namespace",{defaultValue: "http://www.w3.org/1999/xhtml"});
+		if(this.hasAttribute("xmlns")) {
+			this.namespace = this.getAttribute("xmlns");
+			this.setVariable("namespace",this.namespace);
+		} else {
+			this.namespace = this.getVariable("namespace",{defaultValue: XHTML_NAMESPACE});
+		}
 	}
 	// Invoke the th-rendering-element hook
 	var parseTreeNodes = $tw.hooks.invokeHook("th-rendering-element",null,this);

core/modules/widgets/genesis.js

@@ -0,0 +1,108 @@
+/*\
+title: $:/core/modules/widgets/genesis.js
+type: application/javascript
+module-type: widget
+
+Genesis widget for dynamically creating widgets
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var GenesisWidget = function(parseTreeNode,options) {
+	this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+GenesisWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+GenesisWidget.prototype.render = function(parent,nextSibling) {
+	this.parentDomNode = parent;
+	this.computeAttributes({filterFn: function(name) {
+		// Only compute our own attributes which start with a single dollar
+		return name.charAt(0) === "$" && name.charAt(1) !== "$";
+	}});
+	this.execute();
+	this.renderChildren(parent,nextSibling);
+};
+
+/*
+Compute the internal state of the widget
+*/
+GenesisWidget.prototype.execute = function() {
+	var self = this;
+	// Collect attributes
+	this.genesisType = this.getAttribute("$type","element");
+	this.genesisRemappable = this.getAttribute("$remappable","yes") === "yes";
+	this.genesisNames = this.getAttribute("$names","");
+	this.genesisValues = this.getAttribute("$values","");
+	// Construct parse tree
+	var isElementWidget = this.genesisType.charAt(0) !== "$",
+		nodeType = isElementWidget ? "element" : this.genesisType.substr(1),
+		nodeTag = isElementWidget ? this.genesisType : undefined;
+	var parseTreeNodes = [{
+		type: nodeType,
+		tag: nodeTag,
+		attributes: {},
+		orderedAttributes: [],
+		children: this.parseTreeNode.children || [],
+		isNotRemappable: !this.genesisRemappable
+	}];
+	// Apply explicit attributes
+	$tw.utils.each($tw.utils.getOrderedAttributesFromParseTreeNode(this.parseTreeNode),function(attribute) {
+		var name = attribute.name;
+		if(name.charAt(0) === "$") {
+			if(name.charAt(1) === "$") {
+				// Double $$ is changed to a single $
+				name = name.substr(1);
+			} else {
+				// Single dollar is ignored
+				return;
+			}
+		}
+		$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],$tw.utils.extend({},attribute,{name: name}));
+	});
+	// Apply attributes in $names/$values
+	this.attributeNames = [];
+	this.attributeValues = [];
+	if(this.genesisNames && this.genesisValues) {
+		this.attributeNames = this.wiki.filterTiddlers(self.genesisNames,this);
+		this.attributeValues = this.wiki.filterTiddlers(self.genesisValues,this);
+		$tw.utils.each(this.attributeNames,function(varname,index) {
+			$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],varname,self.attributeValues[index] || "");
+		});
+	}
+	// Construct the child widgets
+	this.makeChildWidgets(parseTreeNodes);
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+GenesisWidget.prototype.refresh = function(changedTiddlers) {
+	var changedAttributes = this.computeAttributes(),
+		filterNames = this.getAttribute("$names",""),
+		filterValues = this.getAttribute("$values",""),
+		attributeNames = this.wiki.filterTiddlers(filterNames,this),
+		attributeValues = this.wiki.filterTiddlers(filterValues,this);
+	if($tw.utils.count(changedAttributes) > 0 || !$tw.utils.isArrayEqual(this.attributeNames,attributeNames) || !$tw.utils.isArrayEqual(this.attributeValues,attributeValues)) {
+		this.refreshSelf();
+		return true;
+	} else {
+		return this.refreshChildren(changedTiddlers);
+	}
+};
+
+exports.genesis = GenesisWidget;
+
+})();

core/modules/widgets/image.js

@@ -111,6 +111,9 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 	if(this.imageAlt) {
 		domNode.setAttribute("alt",this.imageAlt);
 	}
+	if(this.lazyLoading && tag === "img") {
+		domNode.setAttribute("loading",this.lazyLoading);
+	}
 	// Add classes when the image loads or fails
 	$tw.utils.addClass(domNode,"tc-image-loading");
 	domNode.addEventListener("load",function() {
@@ -137,6 +140,7 @@ ImageWidget.prototype.execute = function() {
 	this.imageClass = this.getAttribute("class");
 	this.imageTooltip = this.getAttribute("tooltip");
 	this.imageAlt = this.getAttribute("alt");
+	this.lazyLoading = this.getAttribute("loading");
 };
 
 /*

core/modules/widgets/importvariables.js

@@ -39,7 +39,10 @@ Compute the internal state of the widget
 ImportVariablesWidget.prototype.execute = function(tiddlerList) {
 	var widgetPointer = this;
 	// Got to flush all the accumulated variables
-	this.variables = new this.variablesConstructor();
+	this.variables = Object.create(null);
+	if(this.parentWidget) {
+		Object.setPrototypeOf(this.variables,this.parentWidget.variables);
+	}
 	// Get our parameters
 	this.filter = this.getAttribute("filter");
 	// Compute the filter

core/modules/widgets/widget.js

@@ -38,9 +38,10 @@ Widget.prototype.initialise = function(parseTreeNode,options) {
 	this.parseTreeNode = parseTreeNode;
 	this.wiki = options.wiki;
 	this.parentWidget = options.parentWidget;
-	this.variablesConstructor = function() {};
-	this.variablesConstructor.prototype = this.parentWidget ? this.parentWidget.variables : {};
-	this.variables = new this.variablesConstructor();
+	this.variables = Object.create(null);
+	if(this.parentWidget) {
+		Object.setPrototypeOf(this.variables,this.parentWidget.variables);
+	}
 	this.document = options.document;
 	this.attributes = {};
 	this.children = [];

core/modules/wiki.js

@@ -50,7 +50,7 @@ exports.getTextReference = function(textRef,defaultText,currTiddlerTitle) {
 	if(tr.field) {
 		var tiddler = this.getTiddler(title);
 		if(tr.field === "title") { // Special case so we can return the title of a non-existent tiddler
-			return title;
+			return title || defaultText;
 		} else if(tiddler && $tw.utils.hop(tiddler.fields,tr.field)) {
 			return tiddler.getFieldString(tr.field);
 		} else {

core/templates/server/static.sidebar.wikitext.tid

@@ -1,7 +1,7 @@
 title: $:/core/templates/server/static.sidebar.wikitext
 
 \whitespace trim
-<div class="tc-sidebar-scrollable" style="overflow: auto;">
+<div class="tc-sidebar-scrollable" style="overflow: auto;" role="region" aria-label={{$:/language/SideBar/Caption}}>
 <div class="tc-sidebar-header">
 <h1 class="tc-site-title">
 <$transclude tiddler="$:/SiteTitle"/>

core/templates/server/static.tiddler.html.tid

@@ -19,8 +19,8 @@ title: $:/core/templates/server/static.tiddler.html
 </head>
 <body class="tc-body">
 <$transclude tiddler="$:/core/templates/server/static.sidebar.wikitext" mode="inline"/>
-<section class="tc-story-river">
-<div class="tc-tiddler-frame">
+<section class="tc-story-river" role="main">
+<div class="tc-tiddler-frame" role="article">
 <$transclude tiddler="$:/core/templates/server/static.tiddler.wikitext" mode="inline"/>
 </div>
 </section>

core/ui/AdvancedSearch/FilterButtons/delete.tid

@@ -3,7 +3,7 @@ tags: $:/tags/AdvancedSearch/FilterButton
 
 \whitespace trim
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
-<$button popup=<<qualify "$:/state/filterDeleteDropdown">> class="tc-btn-invisible">
+<$button tooltip={{$:/language/Buttons/DeleteTiddlers/Hint}} popup=<<qualify "$:/state/filterDeleteDropdown">> class="tc-btn-invisible">
 {{$:/core/images/delete-button}}
 </$button>
 </$reveal>
@@ -13,13 +13,13 @@ tags: $:/tags/AdvancedSearch/FilterButton
 <div class="tc-block-dropdown tc-edit-type-dropdown">
 <div class="tc-dropdown-item-plain">
 <$set name="resultCount" value="""<$count filter={{$:/temp/advancedsearch}}/>""">
-Are you sure you wish to delete <<resultCount>> tiddler(s)?
+{{$:/language/ConfirmDeleteTiddlers}}
 </$set>
 </div>
 <div class="tc-dropdown-item-plain">
 <$button class="tc-btn">
 <$action-deletetiddler $filter={{$:/temp/advancedsearch}}/>
-Delete these tiddlers
+{{$:/language/Buttons/DeleteTiddlers/Hint}}
 </$button>
 </div>
 </div>

core/ui/EditTemplate.tid

@@ -23,7 +23,9 @@ title: $:/core/ui/EditTemplate
 <div
 	data-tiddler-title=<<currentTiddler>>
 	data-tags={{!!tags}}
-	class={{{ tc-tiddler-frame tc-tiddler-edit-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}>
+	class={{{ tc-tiddler-frame tc-tiddler-edit-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}
+	role="region"
+	aria-label={{$:/language/EditTemplate/Caption}}>
 <$fieldmangler>
 <$vars
 	storyTiddler=<<currentTiddler>>

core/ui/EditTemplate/Preview/output.tid

@@ -5,6 +5,6 @@ caption: {{$:/language/EditTemplate/Body/Preview/Type/Output}}
 \import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]] [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!has[draft.of]]
 <$set name="tv-tiddler-preview" value="yes">
 
-<$transclude />
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateBodyFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/body/default]] }}} />
 
 </$set>

core/ui/PageTemplate/story.tid

@@ -2,7 +2,7 @@ title: $:/core/ui/PageTemplate/story
 tags: $:/tags/PageTemplate
 
 \whitespace trim
-<section class="tc-story-river">
+<section class="tc-story-river" role="main">
 
 <section class="story-backdrop">
 

core/ui/SideBarSegments/search.tid

@@ -51,12 +51,14 @@ tags: $:/tags/SideBarSegment
 <$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
 <$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
 <$keyboard key="((advanced-search-sidebar))" actions=<<advanced-search-actions>>>
+<form class="tc-form-inline">
 <$macrocall $name="keyboard-driven-input" tiddler=<<editTiddler>> storeTitle=<<searchTiddler>> 
 		selectionStateTitle=<<searchListState>> refreshTitle="$:/temp/search/refresh" type="search" 
 		tag="input" focus={{$:/config/Search/AutoFocus}} focusPopup=<<qualify "$:/state/popup/search-dropdown">> 
 		class="tc-popup-handle" filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<<cancel-search-actions>> 
 		inputAcceptActions=<<input-accept-actions>> inputAcceptVariantActions=<<input-accept-variant-actions>> cancelPopups="yes" 
 		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"/>
+</form>
 </$keyboard>
 </$keyboard>
 </$keyboard>

core/ui/SideBarSegments/tabs.tid

@@ -1,7 +1,7 @@
 title: $:/core/ui/SideBarSegments/tabs
 tags: $:/tags/SideBarSegment
 
-<div class="tc-sidebar-lists tc-sidebar-tabs">
+<div class="tc-sidebar-lists tc-sidebar-tabs" role="region" aria-label={{$:/language/SideBar/Caption}}>
 
 <$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]" default={{$:/config/DefaultSidebarTab}} state="$:/state/tab/sidebar" class="tc-sidebar-tabs-main" explicitState="$:/state/tab/sidebar--595412856"/>
 

core/ui/ViewTemplate.tid

@@ -7,7 +7,7 @@ $:/state/folded/$(currentTiddler)$
 \define cancel-delete-tiddler-actions(message) <$action-sendmessage $message="tm-$message$-tiddler"/>
 \import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]]
 <$vars storyTiddler=<<currentTiddler>> tiddlerInfoState=<<qualify "$:/state/popup/tiddler-info">>>
-<div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-view-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}>
+<div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-view-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}} role="article">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem">
 <$transclude tiddler=<<listItem>>/>
 </$list>

core/ui/ViewTemplate/body/rendered-plain-text.tid

@@ -0,0 +1,7 @@
+title: $:/core/ui/ViewTemplate/body/rendered-plain-text
+code-body: yes
+
+\whitespace trim
+<$wikify name="text" text={{!!text}} type={{!!type}}>
+<$codeblock code=<<text>> language="css"/>
+</$wikify>

core/ui/ViewTemplate/subtitle.tid

@@ -4,7 +4,11 @@ tags: $:/tags/ViewTemplate
 \whitespace trim
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
 <div class="tc-subtitle">
-<$link to={{!!modifier}} />
-<$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler" counter="indexSubtitleTiddler">
+<$list filter="[<indexSubtitleTiddler-first>match[no]]" variable="ignore">
+&nbsp;
+</$list>
+<$transclude tiddler=<<subtitleTiddler>> mode="inline"/>
+</$list>
 </div>
 </$reveal>

core/ui/ViewTemplate/subtitle/modified.tid

@@ -0,0 +1,4 @@
+title: $:/core/ui/ViewTemplate/subtitle/modified
+tags: $:/tags/ViewTemplate/Subtitle
+
+<$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/>

core/ui/ViewTemplate/subtitle/modifier.tid

@@ -0,0 +1,4 @@
+title: $:/core/ui/ViewTemplate/subtitle/modifier
+tags: $:/tags/ViewTemplate/Subtitle
+
+<$link to={{!!modifier}}/>

core/wiki/config/OfficialPluginLibrary.tid

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

core/wiki/config/ViewTemplateBodyFilters.multids

@@ -1,6 +1,7 @@
 title: $:/config/ViewTemplateBodyFilters/
 tags: $:/tags/ViewTemplateBodyFilter
 
+stylesheet: [tag[$:/tags/Stylesheet]then[$:/core/ui/ViewTemplate/body/rendered-plain-text]]
 system: [prefix[$:/boot/]] [prefix[$:/config/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]] [prefix[$:/core/ui/]split[/]count[]compare:number:eq[4]] [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/info/]] [prefix[$:/temp/]] +[!is[image]limit[1]then[$:/core/ui/ViewTemplate/body/code]]
 code-body: [field:code-body[yes]then[$:/core/ui/ViewTemplate/body/code]]
 import: [field:plugin-type[import]then[$:/core/ui/ViewTemplate/body/import]]

core/wiki/macros/list.tid

@@ -22,12 +22,12 @@ tags: $:/tags/Macro
 <$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
 \end
 
-\define list-links-draggable(tiddler,field:"list",type:"ul",subtype:"li",class:"",itemTemplate)
+\define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
 \whitespace trim
 <span class="tc-links-draggable-list">
 <$vars targetTiddler="""$tiddler$""" targetField="""$field$""">
 <$type$ class="$class$">
-<$list filter="[list[$tiddler$!!$field$]]">
+<$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>>
 <$droppable actions=<<list-links-draggable-drop-actions>> tag="""$subtype$""" enable=<<tv-enable-drag-and-drop>>>
 <div class="tc-droppable-placeholder"/>
 <div>

core/wiki/macros/tabs.tid

@@ -1,10 +1,10 @@
 title: $:/core/macros/tabs
 tags: $:/tags/Macro
-code_body: yes
+code-body: yes
 
 \define tabs-button()
 \whitespace trim
-<$button set=<<tabsState>> setTo=<<currentTab>> default=<<__default__>> selectedClass="tc-tab-selected" tooltip={{!!tooltip}}>
+<$button set=<<tabsState>> setTo=<<currentTab>> default=<<__default__>> selectedClass="tc-tab-selected" tooltip={{!!tooltip}} role="switch">
 	<$tiddler tiddler=<<save-currentTiddler>>>
 		<$set name="tv-wikilinks" value="no">
 			<$transclude tiddler=<<__buttonTemplate__>> mode="inline">
@@ -48,7 +48,7 @@ code_body: yes
 \define tabs(tabsList,default,state:"$:/state/tab",class,template,buttonTemplate,retain,actions,explicitState)
 \whitespace trim
 <$qualify title=<<__state__>> name="qualifiedState">
-	<$set name="tabsState" filter={{{ [<__explicitState__>minlength[1]] ~[<qualifiedState>] }}}>
+	<$let tabsState={{{ [<__explicitState__>minlength[1]] ~[<qualifiedState>] }}}>
 		<div class={{{ [[tc-tab-set]addsuffix[ ]addsuffix<__class__>] }}}>
 			<div class={{{ [[tc-tab-buttons]addsuffix[ ]addsuffix<__class__>] }}}>
 				<<tabs-tab-list>>
@@ -58,6 +58,6 @@ code_body: yes
 				<<tabs-tab-body>>
 			</div>
 		</div>
-	</$set>
+	</$let>
 </$qualify>
 \end

core/wiki/macros/tag-picker.tid

@@ -11,7 +11,7 @@ second-search-filter: [tags[]is[system]search:title<userInput>sort[]]
 \whitespace trim
 <$set name="tag" value={{{ [<__tiddler__>get[text]] }}}>
 <$list filter="[<saveTiddler>!contains:$tagField$<tag>!match[]]" variable="ignore" emptyMessage="<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter='-[<tag>]'/>">
-<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>]"/>
+<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
 $actions$
 </$list>
 </$set>
@@ -52,7 +52,7 @@ $actions$
 </span><$button popup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button><$reveal state=<<storeTitle>> type="nomatch" text=""><$button class="tc-btn-invisible tc-small-gap tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Tags/ClearInput/Hint}} aria-label={{$:/language/EditTemplate/Tags/ClearInput/Caption}}>{{$:/core/images/close-button}}<<delete-tag-state-tiddlers>></$button></$reveal><span class="tc-add-tag-button tc-small-gap-left">
 <$set name="tag" value={{{ [<newTagNameTiddler>get[text]] }}}>
 <$button set=<<newTagNameTiddler>> setTo="" class="">
-<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>]"/>
+<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
 $actions$
 <$set name="currentTiddlerCSSEscaped" value={{{ [<saveTiddler>escapecss[]] }}}>
 <<delete-tag-state-tiddlers>><$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>

core/wiki/macros/tag.tid

@@ -16,7 +16,7 @@ color:$(foregroundColor)$;
 	$element-attributes$
 	class="tc-tag-label tc-btn-invisible"
 	style=<<tag-pill-styles>>
->$actions$<$transclude tiddler="""$icon$"""/><$view tiddler=<<__tag__>> field="title" format="text" />
+>$actions$<$transclude tiddler="""$icon$"""/><$view tiddler=<<__tag__>> field="title" format="text" /></$element-tag$>
 \end
 
 \define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions)

core/wiki/macros/toc.tid

@@ -3,11 +3,13 @@ tags: $:/tags/Macro
 
 \define toc-caption()
 \whitespace trim
+<span class="tc-toc-caption tc-tiny-gap-left">
 <$set name="tv-wikilinks" value="no">
   <$transclude field="caption">
     <$view field="title"/>
   </$transclude>
 </$set>
+</span>
 \end
 
 \define toc-body(tag,sort:"",itemClassFilter,exclude,path)
@@ -51,7 +53,6 @@ tags: $:/tags/Macro
           {{$:/core/images/down-arrow}}
         </$button>
       </$reveal>
-      &#32;
       <<toc-caption>>
     </$link>
     <$reveal type="match" stateTitle=<<toc-state>> text="open">
@@ -71,14 +72,12 @@ tags: $:/tags/Macro
       <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
         <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
           {{$:/core/images/right-arrow}}
-          &#32;
           <<toc-caption>>
         </$button>
       </$reveal>
       <$reveal type="match" stateTitle=<<toc-state>> text="open">
         <$button setTitle=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep">
           {{$:/core/images/down-arrow}}
-          &#32;
           <<toc-caption>>
         </$button>
       </$reveal>
@@ -127,7 +126,6 @@ tags: $:/tags/Macro
             </$button>
           </$reveal>
         </$list>
-        &#32;
         <<toc-caption>>
       </$link>
       <$reveal type="match" stateTitle=<<toc-state>> text="open">
@@ -147,14 +145,12 @@ tags: $:/tags/Macro
         <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
           <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
             {{$:/core/images/right-arrow}}
-            &#32;
             <<toc-caption>>
           </$button>
         </$reveal>
         <$reveal type="match" stateTitle=<<toc-state>> text="open">
           <$button setTitle=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep">
             {{$:/core/images/down-arrow}}
-            &#32;
             <<toc-caption>>
           </$button>
         </$reveal>

core/wiki/peek-stylesheets.tid

@@ -23,11 +23,7 @@ title: $:/snippets/peek-stylesheets
 <$reveal type="match" state=<<state>> text="yes" tag="div">
 <$set name="source" tiddler=<<currentTiddler>>>
 <$wikify name="styles" text=<<source>>>
-<pre>
-<code>
-<$text text=<<styles>>/>
-</code>
-</pre>
+<$codeblock code=<<styles>> language="css"/>
 </$wikify>
 </$set>
 </$reveal>

core/wiki/tags/ViewTemplateBodyFilter.tid

@@ -1,3 +1,3 @@
 title: $:/tags/ViewTemplateBodyFilter
-list: $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/default
+list: $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/default
 

core/wiki/tags/ViewTemplateSubtitle.tid

@@ -0,0 +1,2 @@
+title: $:/tags/ViewTemplate/Subtitle
+list: $:/core/ui/ViewTemplate/subtitle/modifier $:/core/ui/ViewTemplate/subtitle/modified

editions/fr-FR/tiddlers/$__core_ui_TagTemplate.tid

@@ -1,33 +0,0 @@
-created: 20160504080001125
-modified: 20160504080318928
-title: $:/core/ui/TagTemplate
-type: text/vnd.tiddlywiki
-
-\define tag-styles()
-background-color:$(backgroundColor)$;
-fill:$(foregroundColor)$;
-color:$(foregroundColor)$;
-\end
-
-\define tag-body-inner(colour,fallbackTarget,colourA,colourB)
-<$set name="foregroundColor" value=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">>>
-<$set name="backgroundColor" value="""$colour$""">
-<$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-tag-label" style=<<tag-styles>>>
-<$transclude tiddler={{!!icon}}/> <$view field="fr-title"><$view field="title" format="text" /></$view>
-</$button>
-<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes"><div class="tc-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/>
-<hr>
-<$list filter="[all[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/>
-</div>
-</$reveal>
-</$set>
-</$set>
-\end
-
-\define tag-body(colour,palette)
-<span class="tc-tag-list-item">
-<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}}/>
-</span>
-\end
-
-<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/>

editions/fr-FR/tiddlers/system/$__core_macros_list.tid

@@ -0,0 +1,113 @@
+created: 20220830224607117
+modified: 20220830224638865
+tags: $:/tags/Macro
+title: $:/core/macros/list
+
+\define list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage)
+\whitespace trim
+<$type$ class="$class$">
+<$list filter="$filter$" emptyMessage=<<__emptyMessage__>>>
+<$subtype$>
+<$link to={{!!title}}>
+<$let tv-wikilinks="no">
+<$transclude field="caption">
+<$view field="title"/>
+</$transclude>
+</$let>
+</$link>
+</$subtype$>
+</$list>
+</$type$>
+\end
+
+\define list-links-draggable-drop-actions()
+<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
+\end
+
+\define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
+\whitespace trim
+<span class="tc-links-draggable-list">
+<$vars targetTiddler="""$tiddler$""" targetField="""$field$""">
+<$type$ class="$class$">
+<$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>>
+<$droppable actions=<<list-links-draggable-drop-actions>> tag="""$subtype$""" enable=<<tv-enable-drag-and-drop>>>
+<div class="tc-droppable-placeholder"/>
+<div>
+<$transclude tiddler="""$itemTemplate$""">
+<$link to={{!!title}}>
+<$let tv-wikilinks="no">
+<$transclude field="caption">
+<$view field="title"/>
+</$transclude>
+</$let>
+</$link>
+</$transclude>
+</div>
+</$droppable>
+</$list>
+<$tiddler tiddler="">
+<$droppable actions=<<list-links-draggable-drop-actions>> tag="div" enable=<<tv-enable-drag-and-drop>>>
+<div class="tc-droppable-placeholder">
+{{$:/core/images/blank}}
+</div>
+<div style="height:0.5em;"/>
+</$droppable>
+</$tiddler>
+</$type$>
+</$vars>
+</span>
+\end
+
+\define list-tagged-draggable-drop-actions(tag)
+\whitespace trim
+<!-- Save the current ordering of the tiddlers with this tag -->
+<$set name="order" filter="[<__tag__>tagging[]]">
+<!-- Remove any list-after or list-before fields from the tiddlers with this tag -->
+<$list filter="[<__tag__>tagging[]]">
+<$action-deletefield $field="list-before"/>
+<$action-deletefield $field="list-after"/>
+</$list>
+<!-- Save the new order to the Tag Tiddler -->
+<$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist<order>] +[insertbefore<actionTiddler>,<currentTiddler>]"/>
+<!-- Make sure the newly added item has the right tag -->
+<!-- Removing this line makes dragging tags within the dropdown work as intended -->
+<!--<$action-listops $tiddler=<<actionTiddler>> $tags=<<__tag__>>/>-->
+<!-- Using the following 5 lines as replacement makes dragging titles from outside into the dropdown apply the tag -->
+<$list filter="[<actionTiddler>!contains:tags<__tag__>]">
+<$fieldmangler tiddler=<<actionTiddler>>>
+<$action-sendmessage $message="tm-add-tag" $param=<<__tag__>>/>
+</$fieldmangler>
+</$list>
+</$set>
+\end
+
+\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"")
+\whitespace trim
+<span class="tc-tagged-draggable-list">
+<$set name="tag" value=<<__tag__>>>
+<$list filter="[<__tag__>tagging[]$subFilter$]" emptyMessage=<<__emptyMessage__>> storyview=<<__storyview__>>>
+<$elementTag$ class="tc-menu-list-item">
+<$droppable actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>""" enable=<<tv-enable-drag-and-drop>>>
+<$elementTag$ class="tc-droppable-placeholder"/>
+<$elementTag$>
+<$transclude tiddler="""$itemTemplate$""">
+<$link to={{!!title}}>
+<$view field="fr-title">
+<$view field="title"/>
+</$view>
+</$link>
+</$transclude>
+</$elementTag$>
+</$droppable>
+</$elementTag$>
+</$list>
+<$tiddler tiddler="">
+<$droppable actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>""" enable=<<tv-enable-drag-and-drop>>>
+<$elementTag$ class="tc-droppable-placeholder"/>
+<$elementTag$ style="height:0.5em;">
+</$elementTag$>
+</$droppable>
+</$tiddler>
+</$set>
+</span>
+\end

editions/fr-FR/tiddlers/system/$__core_macros_tag.tid

@@ -0,0 +1,39 @@
+created: 20220830190922373
+modified: 20220830191056761
+tags: $:/tags/Macro
+title: $:/core/macros/tag
+
+\define tag-pill-styles()
+background-color:$(backgroundColor)$;
+fill:$(foregroundColor)$;
+color:$(foregroundColor)$;
+\end
+
+<!-- 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)
+<$vars
+	foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">>
+	backgroundColor="""$colour$"""
+><$element-tag$
+	$element-attributes$
+	class="tc-tag-label tc-btn-invisible"
+	style=<<tag-pill-styles>>
+>$actions$<$transclude tiddler="""$icon$"""/><$view tiddler=<<__tag__>> field="fr-title" format="text"><$view tiddler=<<__tag__>> field="title" format="text" /></$view></$element-tag$>
+\end
+
+\define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions)
+<$macrocall $name="tag-pill-inner" tag=<<__tag__>> icon="""$icon$""" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>
+\end
+
+\define tag-pill(tag,element-tag:"span",element-attributes:"",actions:"")
+\whitespace trim
+<span class="tc-tag-list-item" data-tag-title=<<__tag__>>>
+<$let currentTiddler=<<__tag__>>>
+<$macrocall $name="tag-pill-body" tag=<<__tag__>> icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>
+</$let>
+</span>
+\end
+
+\define tag(tag)
+{{$tag$||$:/core/ui/TagTemplate}}
+\end

editions/fr-FR/tiddlers/system/$__core_ui_TagPickerTagTemplate.tid

@@ -0,0 +1,25 @@
+created: 20220830194301860
+modified: 20220830194658750
+title: $:/core/ui/TagPickerTagTemplate
+
+\whitespace trim
+<$button class=<<button-classes>> tag="a" tooltip={{$:/language/EditTemplate/Tags/Add/Button/Hint}}>
+<$list filter="[<saveTiddler>minlength[1]]">
+<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter="[<tag>]"/>
+</$list>
+<$set name="currentTiddlerCSSEscaped" value={{{ [<saveTiddler>escapecss[]] }}}>
+<$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>> preventScroll="true"/>
+</$set>
+<<delete-tag-state-tiddlers>>
+<$list filter="[<refreshTitle>minlength[1]]">
+<$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
+</$list>
+<<actions>>
+<$set name="backgroundColor" value={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
+<$wikify name="foregroundColor" text="""<$macrocall $name="contrastcolour" target=<<backgroundColor>> fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>>/>""">
+<span class="tc-tag-label tc-btn-invisible" style=<<tag-pill-styles>>>
+{{||$:/core/ui/TiddlerIcon}}<$view field="fr-title" format="text"><$view field="title" format="text"/></$view>
+</span>
+</$wikify>
+</$set>
+</$button>

editions/katexdemo/tiddlers/$__DefaultTiddlers.tid

@@ -0,0 +1,8 @@
+created: 20220504131459155
+modified: 20220504131522349
+title: $:/DefaultTiddlers
+type: text/vnd.tiddlywiki
+
+HelloThere
+KaTeX
+$:/plugins/tiddlywiki/katex/developer

editions/katexdemo/tiddlers/DefaultTiddlers.tid

@@ -1,5 +0,0 @@
-title: $:/DefaultTiddlers
-
-HelloThere
-KaTeX
-ImplementationNotes

editions/katexdemo/tiddlers/HelloThere.tid

@@ -1,4 +1,7 @@
+created: 20220504124110967
+modified: 20220504124250020
 title: HelloThere
+type: text/vnd.tiddlywiki
 
 This is a TiddlyWiki plugin for mathematical and chemical typesetting based on KaTeX from Khan Academy.
 
@@ -6,7 +9,7 @@ It is completely self-contained, and doesn't need an Internet connection in orde
 
 ! Installation
 
-To add the plugin to your own TiddlyWiki5, just drag this link to the browser window:
+To add the plugin to your own wiki, just //drag the following link to your ~TiddlyWiki browser window//.
 
 [[$:/plugins/tiddlywiki/katex]]
 

editions/katexdemo/tiddlers/LaTeX.tid

@@ -0,0 +1,8 @@
+created: 20220504123802219
+modified: 20220504123918414
+title: LaTeX
+type: text/vnd.tiddlywiki
+
+<<<https://en.wikipedia.org/wiki/LaTeX
+LaTeX is widely used in academia for the communication and publication of scientific documents in many fields, including mathematics, computer science, engineering, physics, chemistry, economics, linguistics, quantitative psychology, philosophy, and political science.
+<<<

editions/katexdemo/tiddlers/TiddlyWiki.tid

@@ -0,0 +1,8 @@
+created: 20220504123347104
+modified: 20220504123400803
+title: TiddlyWiki
+type: text/vnd.tiddlywiki
+
+TiddlyWiki is a rich, interactive tool for manipulating complex data with structure that doesn't easily fit into conventional tools like spreadsheets or wordprocessors.
+
+Learn more at: https://tiddlywiki.com

editions/katexdemo/tiddlers/TiddlyWiki5.tid

@@ -0,0 +1,6 @@
+created: 20220504123412027
+modified: 20220504123416593
+title: TiddlyWiki5
+type: text/vnd.tiddlywiki
+
+{{TiddlyWiki}}

editions/prerelease/tiddlers/Release 5.2.3.tid

@@ -1,83 +0,0 @@
-caption: 5.2.3
-created: 20220325131459084
-modified: 20220325131459084
-tags: ReleaseNotes
-title: Release 5.2.3
-type: text/vnd.tiddlywiki
-
-\define contributor(username)
-<a href="https://github.com/$username$" style="text-decoration:none;font-size:24px;" class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><img src="https://github.com/$username$.png?size=32" width="32" height="32"/> @<$text text=<<__username__>>/></a>
-\end
-
-//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.2...master]]//
-
-! Plugin Improvements
-
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/6625">> [[BrowserStorage Plugin]] to be able to delete existing tiddlers as well as modify or add tiddlers
-
-
-! Translation improvements
-
-* Polish
-
-! Usability Improvements
-
-* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/issues/5916">> ActionSetFieldWidget to avoid inadvertent changes to the current tiddler
-* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/6589">> "put" and "upload" savers (as used by TiddlyHost) to display error responses from the server
-
-! Widget Improvements
-
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/6561">> CheckboxWidget to support for the ''listField'' and ''filter'' attributes
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/6581">> DraggableWidget to support an ''enabled'' attribute
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/6582">> DraggableWidget to pass additional context variables to the ''dragstartactions'' action string
-
-! Filter improvements
-
-* 
-
-! Hackability Improvements
-
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/6624">> [[colour Macro]] to allow for palette-specific fallback colours to be specified
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6578">> whitespace and indentation of [[tabs Macro]] to improve readability
-
-! Developer Improvements
-
-* A number of core tiddlers have been refactored to use `\whitespace trim` for improved readability. The work was split into a number of PRs: [[#6257|https://github.com/Jermolene/TiddlyWiki5/pull/6257]], [[#6265|https://github.com/Jermolene/TiddlyWiki5/pull/6265]], [[#6269|https://github.com/Jermolene/TiddlyWiki5/pull/6269]], [[#6270|https://github.com/Jermolene/TiddlyWiki5/pull/6270]], [[#6272|https://github.com/Jermolene/TiddlyWiki5/pull/6272]], [[#6275|https://github.com/Jermolene/TiddlyWiki5/pull/6275]], [[#6276|https://github.com/Jermolene/TiddlyWiki5/pull/6276]], [[#6587|https://github.com/Jermolene/TiddlyWiki5/pull/6587]], [[#6600|https://github.com/Jermolene/TiddlyWiki5/pull/6600]], [[#6604|https://github.com/Jermolene/TiddlyWiki5/pull/6604]], [[#6611|https://github.com/Jermolene/TiddlyWiki5/pull/6611]]
-
-
-! Node.js Improvements
-
-* 
-
-! Performance Improvements
-
-* 
-
-! Bug Fixes
-
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/6614">> bug with formatting UTC date strings
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/6603">> SaveCommand crash when attempting to save missing tiddlers
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/6599">> fix broken [[style block behaviour|Styles and Classes in WikiText]]
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/6594">> incorrect display of image system tiddlers as text
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/1c16f12d6f5b81d86f79c3e687eec05b3a8d45bf">> erroneous link rendering within captions in [[list-links Macro]]
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/758d590837c30ddde9cc7b8171273756680f1545">> erroneous link rendering within captions in [[list-links-draggable Macro]]
-
-! 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:
-
-* <<contributor Arlen22>>
-* <<contributor btheado>>
-* <<contributor BurningTreeC>>
-* <<contributor damscal>>
-* <<contributor es-kha>>
-* <<contributor EvidentlyCube>>
-* <<contributor FlashSystems>>
-* <<contributor flibbles>>
-* <<contributor linonetwo>>
-* <<contributor Marxsal>>
-* <<contributor pmario>>
-* <<contributor rmunn>>
-* <<contributor saqimtiaz>>
-* <<contributor simonbaird>>
-* <<contributor tobibeer>>

editions/prerelease/tiddlers/Release 5.2.4.tid

@@ -0,0 +1,74 @@
+caption: 5.2.4
+created: 20220802100223020
+modified: 20220902201505817
+tags: ReleaseNotes
+title: Release 5.2.4
+type: text/vnd.tiddlywiki
+
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.3...master]]//
+
+! Plugin Improvements
+
+* 
+
+! Translation improvement
+
+Improvements to the following translations:
+
+* Chinese
+* Japanese
+
+Improvements to the translation features of TiddlyWiki:
+
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6882">> the [[Translators Edition|Translate TiddlyWiki into your language]] to add an option to display the original English text underneath the text area
+* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/6933">> "delete" button text in $:/AdvancedSearch so that it is translatable
+
+! Accessibility Improvements
+
+* 
+
+! Usability Improvements
+
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/d62a16ee464fb9984b766b48504829a1a3eb143b">> problem with long presses on tiddler links triggering a preview on iOS/iPadOS
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6910">> consistency of button and input elements across browsers
+
+! Widget Improvements
+
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/127f660c91020dcbb43897d954066b31af729e74">> EditTextWidget to remove the default text "Type the text for the tiddler 'foo'"
+
+! Filter improvements
+
+* 
+
+! Hackability Improvements
+
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6936">> new operators for reading and formatting JSON data: [[jsonget Operator]], [[jsonindexes Operator]], [[jsontype Operator]] and [[format Operator]]
+
+! Bug Fixes
+
+* 
+
+! Developer Improvements
+
+* 
+
+! Node.js Improvements
+
+* 
+
+! Performance Improvements
+
+* 
+
+! 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 """
+BramChen
+fu-sen
+oflg
+pmario
+twMat
+xcazin
+""">>

editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/prerelease/library/v5.2.3/index.html
+url: https://tiddlywiki.com/prerelease/library/v5.2.4/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

@@ -4,6 +4,9 @@ modified: 20150428204930183
 This is a pre-release build of TiddlyWiki, [[also available in empty form|https://tiddlywiki.com/prerelease/empty.html]]. It is provided for testing purposes. ''Please don't try to use it for anything important'' -- you should use the latest official release from https://tiddlywiki.com.
 
 <$list filter="[tag[ReleaseNotes]!has[released]!sort[created]]">
-<h1><$text text=<<currentTiddler>>/></h1>
+<div class="tc-titlebar">
+<h2 class="tc-title"><$text text=<<currentTiddler>>/></h2>
+</div>
+<div class="tc-subtitle">Updated: <$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/></div>
 <$transclude mode="block"/>
 </$list>

editions/test/tiddlers/tests/data/genesis-widget/DollarSigns.tid

@@ -0,0 +1,14 @@
+title: Genesis/DollarSigns
+description: Usage of genesis widget with attributes starting with dollar signs
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+<$genesis $type="$let" myvar="Kitten">(<$text text=<<myvar>>/>)</$genesis>
+<$genesis $type="$let" $$myvar="Kitten">(<$text text=<<$myvar>>/>)</$genesis>
++
+title: ExpectedResult
+
+<p>(Kitten)(Kitten)</p>

editions/test/tiddlers/tests/data/genesis-widget/MultipleAttributes.tid

@@ -0,0 +1,14 @@
+title: Genesis/MultipleAttributes
+description: Usage of genesis widget with multiple attributes
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+<$genesis $type="$let" $names="myvar other" $values="Kitten Donkey" myvar={{{ Shark }}}>(<$text text=<<myvar>>/>|<$text text=<<other>>/>)</$genesis>
+<$genesis $type="$let" $names="$myvar $other" $values="Kitten Donkey" $$myvar="Shark">(<$text text=<<$myvar>>/>|<$text text=<<$other>>/>)</$genesis>
++
+title: ExpectedResult
+
+<p>(Kitten|Donkey)(Kitten|Donkey)</p>

editions/test/tiddlers/tests/data/genesis-widget/Simple.tid

@@ -0,0 +1,14 @@
+title: Genesis/Simple
+description: Simple usage of genesis widget
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+<$genesis $type="div">Mouse</$genesis>
+<$genesis $type="div" class="tc-thing" label="Squeak">Mouse</$genesis>
++
+title: ExpectedResult
+
+<p><div>Mouse</div><div class="tc-thing" label="Squeak">Mouse</div></p>

editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal-all.tid

@@ -2,4 +2,4 @@ title: expected-html-tabs-horizontal-all
 type: text/html
 description: Horizontal tabs with all parameters active. This is the expected HTML output from a test in test-wikitext-tabs-macro.js
 
-<p><div class="tc-tab-set "><div class="tc-tab-buttons "><button class="">t 1</button><button class=" tc-tab-selected">t 2</button><button class="">desc</button><button class="">TabFour</button></div><div class="tc-tab-divider "></div><div class="tc-tab-content "><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><h2 class=""><a class="tc-tiddlylink tc-tiddlylink-resolves" href="#TabTwo">TabTwo</a></h2><p><p>Text tab 2</p></p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>
+<p><div class="tc-tab-set "><div class="tc-tab-buttons "><button class="" role="switch">t 1</button><button aria-checked="true" class=" tc-tab-selected" role="switch">t 2</button><button class="" role="switch">desc</button><button class="" role="switch">TabFour</button></div><div class="tc-tab-divider "></div><div class="tc-tab-content "><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><h2 class=""><a class="tc-tiddlylink tc-tiddlylink-resolves" href="#TabTwo">TabTwo</a></h2><p><p>Text tab 2</p></p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>

editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal.tid

@@ -2,4 +2,4 @@ title: expected-html-tabs-horizontal
 type: text/html
 description: Horizontal tabs test - This is the expected HTML output from a test in test-wikitext-tabs-macro.js
 
-<p><div class="tc-tab-set "><div class="tc-tab-buttons "><button class="">t 1</button><button class=" tc-tab-selected">t 2</button><button class="">t 3</button><button class="">TabFour</button></div><div class="tc-tab-divider "></div><div class="tc-tab-content "><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><p>Text tab 2</p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>
+<p><div class="tc-tab-set "><div class="tc-tab-buttons "><button class="" role="switch">t 1</button><button aria-checked="true" class=" tc-tab-selected" role="switch">t 2</button><button class="" role="switch">t 3</button><button class="" role="switch">TabFour</button></div><div class="tc-tab-divider "></div><div class="tc-tab-content "><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><p>Text tab 2</p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>

editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-vertical.tid

@@ -2,4 +2,4 @@ title: expected-html-tabs-vertical
 type: text/html
 description: Vertical tabs test -- This is the expected HTML output from the test in test-wikitext-tabs-macro.js
 
-<p><div class="tc-tab-set tc-vertical"><div class="tc-tab-buttons tc-vertical"><button class="">t 1</button><button class=" tc-tab-selected">t 2</button><button class="">t 3</button><button class="">TabFour</button></div><div class="tc-tab-divider tc-vertical"></div><div class="tc-tab-content tc-vertical"><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><p>Text tab 2</p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>
+<p><div class="tc-tab-set tc-vertical"><div class="tc-tab-buttons tc-vertical"><button class="" role="switch">t 1</button><button aria-checked="true" class=" tc-tab-selected" role="switch">t 2</button><button class="" role="switch">t 3</button><button class="" role="switch">TabFour</button></div><div class="tc-tab-divider tc-vertical"></div><div class="tc-tab-content tc-vertical"><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><p>Text tab 2</p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>

editions/test/tiddlers/tests/test-checkbox-widget.js

@@ -234,6 +234,38 @@ Tests the checkbox widget thoroughly.
             },
         ];
 
+        // https://github.com/Jermolene/TiddlyWiki5/issues/6871
+        const listModeTestsWithListField = (
+            listModeTests
+            .filter(data => data.widgetText.includes("listField='colors'"))
+            .map(data => {
+                const newData = {
+                    ...data,
+                    tiddlers: data.tiddlers.map(tiddler => ({...tiddler, list: tiddler.colors, colors: undefined})),
+                    widgetText: data.widgetText.replace("listField='colors'", "listField='list'"),
+                    expectedChange: {
+                        "Colors": { list: data.expectedChange.Colors.colors.split(' ') }
+                    },
+                }
+                return newData;
+            })
+        );
+        const listModeTestsWithTagsField = (
+            listModeTests
+            .filter(data => data.widgetText.includes("listField='colors'"))
+            .map(data => {
+                const newData = {
+                    ...data,
+                    tiddlers: data.tiddlers.map(tiddler => ({...tiddler, tags: tiddler.colors, colors: undefined})),
+                    widgetText: data.widgetText.replace("listField='colors'", "listField='tags'"),
+                    expectedChange: {
+                        "Colors": { tags: data.expectedChange.Colors.colors.split(' ') }
+                    },
+                }
+                return newData;
+            })
+        );
+
         const indexListModeTests = listModeTests.map(data => {
             const newData = {...data};
             const newName = data.testName.replace('list mode', 'index list mode');
@@ -453,6 +485,8 @@ Tests the checkbox widget thoroughly.
         const checkboxTestData = fieldModeTests.concat(
             indexModeTests,
             listModeTests,
+            listModeTestsWithListField,
+            listModeTestsWithTagsField,
             indexListModeTests,
             filterModeTests,
         );
@@ -495,7 +529,7 @@ Tests the checkbox widget thoroughly.
                     for (const fieldName of Object.keys(change)) {
                         const expectedValue = change[fieldName];
                         const fieldValue = tiddler.fields[fieldName];
-                        expect(fieldValue).toBe(expectedValue);
+                        expect(fieldValue).toEqual(expectedValue);
                     }
                 }
             })

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

@@ -621,6 +621,8 @@ Tests the filtering mechanism.
 		});
 	
 		it("should handle indirect operands", function() {
+			expect(wiki.filterTiddlers("[{!!missing}]").join(",")).toBe("");
+			expect(wiki.filterTiddlers("[{!!title}]").join(",")).toBe("");
 			expect(wiki.filterTiddlers("[prefix{Tiddler8}] +[sort[title]]").join(",")).toBe("Tiddler Three,TiddlerOne");
 			expect(wiki.filterTiddlers("[modifier{Tiddler8!!test-field}] +[sort[title]]").join(",")).toBe("TiddlerOne");
 			var fakeWidget = {wiki: wiki, getVariable: function() {return "Tiddler Three";}};
@@ -745,7 +747,46 @@ Tests the filtering mechanism.
 			
 			expect(wiki.filterTiddlers("a [[b c]] +[append{TiddlerSix!!filter}]").join(",")).toBe("a,b c,one,a a,[subfilter{hasList!!list}]");
 		});
-	
+
+		it("should handle the insertafter operator", function() {
+			var widget = require("$:/core/modules/widgets/widget.js");
+			var rootWidget = new widget.widget({ type:"widget", children:[ {type:"widget", children:[]} ] },
+											   { wiki:wiki, document:$tw.document});
+			rootWidget.makeChildWidgets();
+			var anchorWidget = rootWidget.children[0];
+			rootWidget.setVariable("myVar","c");
+			rootWidget.setVariable("tidTitle","e");
+			rootWidget.setVariable("tidList","one tid with spaces");
+
+			// Position title specified as suffix.
+			expect(wiki.filterTiddlers("a b c d e f +[insertafter:myVar[f]]",anchorWidget).join(",")).toBe("a,b,c,f,d,e");
+			expect(wiki.filterTiddlers("a b c d e f +[insertafter:myVar<tidTitle>]",anchorWidget).join(",")).toBe("a,b,c,e,d,f");
+			expect(wiki.filterTiddlers("a b c d e f +[insertafter:myVar[gg gg]]",anchorWidget).join(",")).toBe("a,b,c,gg gg,d,e,f");
+			expect(wiki.filterTiddlers("a b c d e +[insertafter:myVar<tidList>]",anchorWidget).join(",")).toBe("a,b,c,one tid with spaces,d,e");
+			expect(wiki.filterTiddlers("a b c d e f +[insertafter:tidTitle{TiddlerOne!!tags}]",anchorWidget).join(",")).toBe("a,b,c,d,e,one,f");
+
+			// Position title specified as parameter.
+			expect(wiki.filterTiddlers("a b c d e +[insertafter[f],[a]]",anchorWidget).join(",")).toBe("a,f,b,c,d,e");
+			expect(wiki.filterTiddlers("a b c d e +[insertafter[f],<myVar>]",anchorWidget).join(",")).toBe("a,b,c,f,d,e");
+
+			// Parameter takes precedence over suffix.
+			expect(wiki.filterTiddlers("a b c d e +[insertafter:myVar[f],[a]]",anchorWidget).join(",")).toBe("a,f,b,c,d,e");
+
+			// No position title.
+			expect(wiki.filterTiddlers("a b c [[with space]] +[insertafter[b]]").join(",")).toBe("a,c,with space,b");
+
+			// Position title does not exist, and no suffix given.
+			expect(wiki.filterTiddlers("a b c d e +[insertafter:foo[b]]").join(",")).toBe("a,c,d,e,b");
+			expect(wiki.filterTiddlers("a b c d e +[insertafter[b],[foo]]").join(",")).toBe("a,c,d,e,b");
+			expect(wiki.filterTiddlers("a b c d e +[insertafter[b],<foo>]").join(",")).toBe("a,c,d,e,b");
+
+			// Position title does not exist, but "start" or "end" given as suffix
+			expect(wiki.filterTiddlers("a b c d e +[insertafter:start[b],[foo]]").join(",")).toBe("b,a,c,d,e");
+			expect(wiki.filterTiddlers("a b c d e +[insertafter:start[b],<foo>]").join(",")).toBe("b,a,c,d,e");
+			expect(wiki.filterTiddlers("a b c d e +[insertafter:end[b],[foo]]").join(",")).toBe("a,c,d,e,b");
+			expect(wiki.filterTiddlers("a b c d e +[insertafter:end[b],<foo>]").join(",")).toBe("a,c,d,e,b");
+		});
+
 		it("should handle the insertbefore operator", function() {
 			var widget = require("$:/core/modules/widgets/widget.js");
 			var rootWidget = new widget.widget({ type:"widget", children:[ {type:"widget", children:[]} ] },
@@ -773,10 +814,16 @@ Tests the filtering mechanism.
 			// No position title.
 			expect(wiki.filterTiddlers("a b c [[with space]] +[insertbefore[b]]").join(",")).toBe("a,c,with space,b");
 
-			// Position title does not exist.
+			// Position title does not exist, and no suffix given.
 			expect(wiki.filterTiddlers("a b c d e +[insertbefore:foo[b]]").join(",")).toBe("a,c,d,e,b");
 			expect(wiki.filterTiddlers("a b c d e +[insertbefore[b],[foo]]").join(",")).toBe("a,c,d,e,b");
 			expect(wiki.filterTiddlers("a b c d e +[insertbefore[b],<foo>]").join(",")).toBe("a,c,d,e,b");
+
+			// Position title does not exist, but "start" or "end" given as suffix
+			expect(wiki.filterTiddlers("a b c d e +[insertbefore:start[b],[foo]]").join(",")).toBe("b,a,c,d,e");
+			expect(wiki.filterTiddlers("a b c d e +[insertbefore:start[b],<foo>]").join(",")).toBe("b,a,c,d,e");
+			expect(wiki.filterTiddlers("a b c d e +[insertbefore:end[b],[foo]]").join(",")).toBe("a,c,d,e,b");
+			expect(wiki.filterTiddlers("a b c d e +[insertbefore:end[b],<foo>]").join(",")).toBe("a,c,d,e,b");
 		});
 	
 		it("should handle the move operator", function() {

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

@@ -0,0 +1,95 @@
+/*\
+title: test-json-filters.js
+type: application/javascript
+tags: [[$:/tags/test-spec]]
+
+Tests the JSON filters and the format:json operator
+
+\*/
+(function(){
+
+/* jslint node: true, browser: true */
+/* eslint-env node, browser, jasmine */
+/* eslint no-mixed-spaces-and-tabs: ["error", "smart-tabs"]*/
+/* global $tw, require */
+"use strict";
+
+describe("json filter tests", function() {
+
+	var wiki = new $tw.Wiki();
+	var tiddlers = [{
+		title: "First",
+		text: '{"a":"one","b":"","c":1.618,"d": {"e": "four","f": ["five","six",true,false,null]}}',
+		type: "application/json"
+	},{
+		title: "Second",
+		text: '["une","deux","trois"]',
+		type: "application/json"
+	},{
+		title: "Third",
+		text: "This is not JSON",
+		type: "text/vnd.tiddlywiki"
+	}];
+	wiki.addTiddlers(tiddlers);
+
+	it("should support the getindex operator", function() {
+		expect(wiki.filterTiddlers("[{First}getindex[b]]")).toEqual([]);
+	});
+
+	it("should support the jsonget operator", function() {
+		expect(wiki.filterTiddlers("[{Third}jsonget[]]")).toEqual(["This is not JSON"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}}']);
+		expect(wiki.filterTiddlers("[{First}jsonget[a]]")).toEqual(["one"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[b]]")).toEqual([""]);
+		expect(wiki.filterTiddlers("[{First}jsonget[missing-property]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d]]")).toEqual(['{"e":"four","f":["five","six",true,false,null]}']);
+		expect(wiki.filterTiddlers("[{First}jsonget[d]jsonget[f]]")).toEqual(['["five","six",true,false,null]']);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[e]]")).toEqual(["four"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f]]")).toEqual(['["five","six",true,false,null]']);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[0]]")).toEqual(["five"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[1]]")).toEqual(["six"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[2]]")).toEqual(["true"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[3]]")).toEqual(["false"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[4]]")).toEqual(["null"]);
+	});
+
+	it("should support the jsonindexes operator", function() {
+		expect(wiki.filterTiddlers("[{Second}jsonindexes[]]")).toEqual(["0","1","2"]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[]]")).toEqual(["a","b","c","d"]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[a]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[b]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d]]")).toEqual(["e","f"]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[e]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f]]")).toEqual(["0","1","2","3","4"]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[0]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[1]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[2]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[3]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[4]]")).toEqual([]);
+	});
+
+	it("should support the jsontype operator", function() {
+		expect(wiki.filterTiddlers("[{Third}jsontype[]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[]]")).toEqual(["object"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[a]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[b]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[c]]")).toEqual(["number"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d]]")).toEqual(["object"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[e]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f]]")).toEqual(["array"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[0]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[1]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[2]]")).toEqual(["boolean"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[3]]")).toEqual(["boolean"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[4]]")).toEqual(["null"]);
+	});
+
+	it("should support the format:json operator", function() {
+		expect(wiki.filterTiddlers("[{First}format:json[]]")).toEqual(["{\"a\":\"one\",\"b\":\"\",\"c\":1.618,\"d\":{\"e\":\"four\",\"f\":[\"five\",\"six\",true,false,null]}}"]);
+		expect(wiki.filterTiddlers("[{First}format:json[4]]")).toEqual(["{\n    \"a\": \"one\",\n    \"b\": \"\",\n    \"c\": 1.618,\n    \"d\": {\n        \"e\": \"four\",\n        \"f\": [\n            \"five\",\n            \"six\",\n            true,\n            false,\n            null\n        ]\n    }\n}"]);
+		expect(wiki.filterTiddlers("[{First}format:json[  ]]")).toEqual(["{\n  \"a\": \"one\",\n  \"b\": \"\",\n  \"c\": 1.618,\n  \"d\": {\n    \"e\": \"four\",\n    \"f\": [\n      \"five\",\n      \"six\",\n      true,\n      false,\n      null\n    ]\n  }\n}"]);
+	});
+
+});
+
+})();

editions/test/tiddlers/tests/test-prefixes-filter.js

@@ -416,6 +416,8 @@ describe("'reduce' and 'intersection' filter prefix tests", function() {
 		expect(wiki.filterTiddlers("[tag[shopping]] :map[get[description]else{!!title}]").join(",")).toBe("A square of rich chocolate cake,a round yellow seed,Milk,Rice Pudding");
 		// Return the first title from :map if the filter returns more than one result
 		expect(wiki.filterTiddlers("[tag[shopping]] :map[tags[]]").join(",")).toBe("shopping,shopping,shopping,shopping");
+		// Return all titles from :map if the flat suffix is used
+		expect(wiki.filterTiddlers("[tag[shopping]] :map:flat[tags[]]").join(",")).toBe("shopping,food,shopping,food,shopping,dairy,drinks,shopping,dairy");
 		// Prepend the position in the list using the index and length variables
 		expect(wiki.filterTiddlers("[tag[shopping]] :map[get[title]addprefix[-]addprefix<length>addprefix[of]addprefix<index>]").join(",")).toBe("0of4-Brownies,1of4-Chick Peas,2of4-Milk,3of4-Rice Pudding");
 	});

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

@@ -78,7 +78,12 @@ describe("Utility tests", function() {
 		expect(fds(d,"ddd hh mm ssss")).toBe("Sun 17 41 2828");
 		expect(fds(d,"MM0DD")).toBe("1109");
 		expect(fds(d,"MM0\\D\\D")).toBe("110DD");
-		expect(fds(d,"[UTC]YYYY0MM0DD0hh0mm0ssXXX")).toBe("20141109174128542");
+		const day = d.getUTCDate();
+		const dayStr = ("" + day).padStart(2, '0');
+		const hours = d.getUTCHours();
+		const hoursStr = ("" + hours).padStart(2, '0');
+		const expectedUtcStr = `201411${dayStr}${hoursStr}4128542`;
+		expect(fds(d,"[UTC]YYYY0MM0DD0hh0mm0ssXXX")).toBe(expectedUtcStr);
 
 		// test some edge cases found at: https://en.wikipedia.org/wiki/ISO_week_date
 		// 2016-11-13 is Week 45 and it's a Sunday (month nr: 10)

editions/tw.org/tiddlers/$__config_DefaultSidebarTab.tid

@@ -0,0 +1,6 @@
+created: 20220721202136733
+modified: 20220721202136733
+title: $:/config/DefaultSidebarTab
+type: text/vnd.tiddlywiki
+
+Table of Contents

editions/tw.org/tiddlers/Code of Conduct.tid

@@ -0,0 +1,33 @@
+created: 20220721200137586
+modified: 20220819200137586
+tags: [[Table of Contents]]
+title: Code of Conduct
+type: text/vnd.tiddlywiki
+
+This community exists because TiddlyWiki is more useful when people share and work together.
+
+This community is a beautiful but fragile thing: a collection of diverse people from all over the planet, united in their interest in the project, and their commitment to helping one another achieve and learn more.
+
+We try to make the community as broad and welcoming as possible by remembering some basic principles of culture and behaviour.
+
+These principles guide technical and non-technical decisions, and help contributors and leaders support our project and community.
+
+* We are optimistic and hopeful
+* We aim to foster a learning environment that is collaborative and safe for everyone
+* We recognise that the motivation for sharing and helping is usually for appreciation, and not financial gain, and so we take care to acknowledge and ''thank the people who enrich the community by sharing what they have created''
+* While we are united in our interest in TiddlyWiki, we differ in every other conceivable way. We choose to focus on what unites us, and ''avoid unnecessarily mixing contentious topics like religion and politics''
+* We treat each other with respect, and start with the assumption that ''others are acting in good faith''
+* We avoid discriminatory language
+* We try to use our strength as a community to help others
+* We avoid responding when angry or upset because we try to de-escalate conflict
+* We make sure we critique ideas, not people
+* When we disagree with others we do so graciously, and treat others with dignity and respoect
+* We do not tolerate intolerance towards others
+* We seek first to understand others, and then to be understood
+* We have fun
+
+Our discussions are in English. It is not the first language of many people in the community, nor do we all share the same cultural background and reference points. So we take care to use language that is clear and unambigous, and avoid cultural references or jokes that will not be widely understood.
+
+It is not acceptable to make jokes or other comments that discriminate by race, gender, sexuality, or other protected characteristic.
+
+As an inclusive community, we are committed to making sure that TiddlyWiki is an accessible tool that understands the needs of people with disabilities.

editions/tw5.com/tiddlers/$__StoryList.tid

@@ -1,5 +1,5 @@
-created: 20211126104006194
-list: [[Page and tiddler layout customisation]] [[Creating new buttons for the ViewToolbar and page controls]] [[Structuring TiddlyWiki]] Tagging [[Introduction to Lists]] [[Icon Gallery]] [[How to widen tiddlers (aka storyriver)]] [[How to turn off camel case linking]] [[How to put the last modification date in a banner]] [[How to hide the author's and other fields with CSS]] [[How to export tiddlers]] [[How to Customize TiddlyDesktop]] [[Editing Tiddlers with Vim]] [[Concatenating text and variables using macro substitution]] [[Demonstration: keyboard-driven-input Macro]] HelloThere GettingStarted Community
-modified: 20211126111221917
+created: 20220728145919904
+list: Brackets Base64 HelloThere GettingStarted Community
+modified: 20220728145919904
 title: $:/StoryList
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/Brackets.tid

@@ -0,0 +1,14 @@
+created: 20220728145925343
+modified: 20220728150440771
+tags: Definitions
+title: Brackets
+type: text/vnd.tiddlywiki
+
+WikiText syntax uses a number of different types of brackets. Their names are shown in the table below:
+
+|!Appearance |!Name |!Short name |!Usage |
+|`()` |Round brackets |Parenthesis |Not used in WikiText |
+|`[]` |Square brackets |Brackets |[[Links|Linking in WikiText]], [[Filters|Filters]] |
+|`{}` |Curly brackets |Braces |[[Text references|TextReference]], [[Filtered attributes|HTML in WikiText]] |
+|`<>` |Angle brackets |Chevrons |[[HTML elements and widgets|HTML in WikiText]], [[Macros|Macros in WikiText]] |
+

editions/tw5.com/tiddlers/_tw_shared/styles.tid

@@ -1,6 +1,5 @@
 title: $:/_tw_shared/styles
 tags: $:/tags/Stylesheet TiddlyWikiSitesMenu
-code-body: yes
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
 

editions/tw5.com/tiddlers/community/plugins/GSD5.tid

@@ -1,9 +1,9 @@
 created: 20141230182901899
-modified: 20210106151027090
+modified: 20220226205227090
 tags: [[Community Editions]] [[Community Plugins]]
 title: "GSD5" by Roma Hicks
 type: text/vnd.tiddlywiki
-url: http://gsd5.tiddlyspot.com/
+url: http://gsd5.tiddlyhost.com/
 
 An adaptation of the [[TiddlyWiki powered GTD® system formerly known as MonkeyGTD|http://mgsd.tiddlyspot.com/]] for TiddlyWiki version 5.
 

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

@@ -10,3 +10,10 @@ A ''Keyboard Shortcut Tiddler'' is made of three parts:
 If the [[Keyboard Shortcut Descriptor]] has the form `((my-shortcut))` it's a ''reference'' to a ''configuration Tiddler'' that stores the corresponding [[Keyboard Shortcut|KeyboardShortcuts]]
 
 In order to make a ''shortcut'' editable through the <<.controlpanel-tab KeyboardShortcuts>> Tab in the $:/ControlPanel it's sufficient to create a tiddler `$:/config/ShortcutInfo/my-shortcut`, where the ''suffix'' is the ''reference'' used for the [[Keyboard Shortcut|KeyboardShortcuts]]
+
+!! Notes on wiki navigation
+
+If you want to create keyboard shortcuts for navigation, there are two things to keep in mind:
+
+ * If your shortcut uses ''Ctrl'', you need to include `$scroll="yes"` in the [[ActionNavigateWidget's|ActionNavigateWidget]] attributes otherwise the action will be ignored.
+ * The actions need to be wrapped in [[NavigatorWidget]] like in this [[New Tiddler keyboard shortcut|$:/core/ui/KeyboardShortcuts/new-tiddler]].

editions/tw5.com/tiddlers/concepts/Order of Tagged Tiddlers.tid

@@ -1,5 +1,5 @@
 created: 20150124125646000
-modified: 20211127140005352
+modified: 20220729141540007
 tags: Tagging
 title: Order of Tagged Tiddlers
 type: text/vnd.tiddlywiki
@@ -13,6 +13,8 @@ When ~TiddlyWiki generates a list of the tiddlers that have a particular tag (e.
 
 # In each remaining tiddler <<.place T>>, look for a <<.field list-after>> field. If this has a tiddler title as its value, place tiddler <<.place T>> just <<.em after>> that one.
 
+#* As a special case, if the field exists but its value is empty, place <<.place T>> at the very end of the list.
+
 # If any tiddlers still remain, place them at the end of the list in ascending alphabetical order of title. The difference between capital and lowercase letters is ignored.
 
 The ordering of tiddlers with a particular tag can be directly modified using drag and drop within a tag pill dropdown. The underlying [[list-tagged-draggable Macro]] can also be used elsewhere.

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

@@ -1,7 +1,9 @@
-created: 201308252136
-modified: 201308252136
+created: 20130825213600000
+modified: 20220613145033713
 tags: Concepts
 title: TiddlyWiki5
 type: text/vnd.tiddlywiki
 
 ~TiddlyWiki5 is a reboot of TiddlyWiki for the next 25 years. It is a complete interactive wiki in JavaScript that can be run in the browser or on the server under [[Node.js]].
+
+The ~TiddlyWiki repository can be found at GitHub.

editions/tw5.com/tiddlers/definitions/Node.js.tid

@@ -1,13 +1,15 @@
 created: 20131129094739786
-modified: 20140211195455541
+modified: 20220612091858504
 tags: Definitions
 title: Node.js
 type: text/vnd.tiddlywiki
 
-''Node.js'' is a downloadable application for your PC, Mac or Linux computer that lets it run JavaScript applications. Unlike ~JavaScript applications running in a web browser, Node.js code has full access to the file system and other resources of the computer, enabling it to perform the roles that have traditionally been the preserve of languages like Java, PHP and Python. See http://nodejs.org for more details.
+''Node.js'' is a downloadable application for your PC, Mac or Linux computer that lets it run JavaScript applications. Unlike ~JavaScript applications running in a web browser, Node.js code has full access to the file system and other resources of the computer, enabling it to perform the roles that have traditionally been the preserve of languages like Java, PHP and Python. 
 
 For ~TiddlyWiki, Node.js means that we can have a single code base that can run in the browser or on the server, giving great flexibility in how it is used.
 
 For end users, Node.js is no more complicated to install than a web browser, but unlocks powerful capabilities such as the ability to run ~TiddlyWiki as a web server that you can connect to from other devices.
 
-See [[TiddlyWiki on Node.js]] for more details.
+''Node.js'' is a ''trademark'' of the ~OpenJS Foundation. See: https://nodejs.org fore more details.
+
+[[TiddlyWiki on Node.js]] will give an overview about the possibilities using a client-server configuration.

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

@@ -15,5 +15,6 @@ Other implementations of the API include:
 
 * [[TiddlyWiki App Engine Server|https://github.com/rsc/tiddly]], a 300-line Go implementation from Russ Cox
 * [[TiddlyWiki 5 server module|https://github.com/Jermolene/TiddlyWiki5/blob/master/core/modules/commands/server.js]], the bare-bones subset of the API implemented in TiddlyWiki version 5 for Node.js
+* [[tiddly-wiki-server|https://github.com/nathanielknight/tiddly-wiki-server]], an implementation based on Rust and SQLite
 
 As of early 2017, none is currently as complete as TiddlyWeb itself.

editions/tw5.com/tiddlers/demonstrations/CustomStoryTiddlerTemplateDemo.tid/Styles.tid

@@ -1,6 +1,5 @@
 title: $:/_tw5.com/CustomStoryTiddlerTemplateDemo/Styles
 tags: $:/tags/Stylesheet
-code-body: yes
 
 .tc-custom-tiddler-template {
 	border: 3px solid <<colour muted-foreground>>;

editions/tw5.com/tiddlers/filters/examples/format Operator (Examples).tid

@@ -1,5 +1,5 @@
 created: 20201020102735123
-modified: 20210524044020645
+modified: 20220611104737314
 tags: [[Operator Examples]] [[format Operator]]
 title: format Operator (Examples)
 type: text/vnd.tiddlywiki
@@ -18,9 +18,12 @@ Modified date shown as a relative date:
 A tiddler title with spaces formatted as a title list:
 <<.operator-example 4 """[[Hello There]format:titlelist[]]""">>
 
-All tiddler titles tagged with <<tag TableOfContents>> formatted as a title list :
+All tiddler titles tagged with <<tag TableOfContents>> formatted as a title list:
 <<.operator-example 5 """[tag[TableOfContents]format:titlelist[]]""">>
 
+A JSON string formatted as JSON – note how the JSON string is normalised to remove the duplicated properties:
+<<.operator-example 6 """[[{"one":"first","one":"another","two":"second"}]format:json[]]""">>
+
 <<.tip "To create a string to save a [[title list|Title List]] into a list field, use `format:titlelist[]` with the [[join operator|join Operator]]">>
 <<.operator-example 6 """[tag[TableOfContents]format:titlelist[]join[ ]]""">>
 For example, to save titles tagged `TableOfContents` to the titles field of the tiddler [[format titlelist test]]:

editions/tw5.com/tiddlers/filters/examples/insertafter Operator (Examples).tid

@@ -0,0 +1,28 @@
+created: 20220223004441865
+modified: 20220223004441865
+tags: [[Operator Examples]] [[insertafter Operator]]
+title: insertafter Operator (Examples)
+type: text/vnd.tiddlywiki
+
+\define after-title() Friday
+\define missing-title() Yesterday
+\define display-variable(name)
+''<$text text=<<__name__>>/>'': <code><$text text={{{ [<__name__>getvariable[]] }}}/></code>
+\end
+
+These examples use the following predefined variables:
+
+* <<display-variable after-title>>
+* <<display-variable missing-title>>
+
+<<.operator-example 1 """[list[Days of the Week]insertafter[Today]]""">>
+
+<<.operator-example 2 """[list[Days of the Week]insertafter[Today],[Tuesday]]""">>
+
+<<.operator-example 3 """[list[Days of the Week]insertafter[Today],<after-title>]""">>
+
+<<.operator-example 4 """[list[Days of the Week]insertafter:after-title[Today]]""">>
+
+<<.operator-example 5 """[list[Days of the Week]insertafter[Today],<missing-title>]""">>
+
+<<.operator-example 6 """[list[Days of the Week]insertafter:missing-title[Today]]""">>