Make the dynamic button be a separate button

For backwards compatibility

bin/build-site.sh

@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library
 
 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.2.5
+    TW5_BUILD_VERSION=v5.2.6
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -359,14 +359,14 @@ node $TW5_BUILD_TIDDLYWIKI \
 
 # Delete any existing static content
 
-rm $TW5_BUILD_OUTPUT/languages/de-AT/static/*
-rm $TW5_BUILD_OUTPUT/languages/de-DE/static/*
-rm $TW5_BUILD_OUTPUT/languages/es-ES/static/*
-rm $TW5_BUILD_OUTPUT/languages/fr-FR/static/*
-rm $TW5_BUILD_OUTPUT/languages/ja-JP/static/*
-rm $TW5_BUILD_OUTPUT/languages/ko-KR/static/*
-rm $TW5_BUILD_OUTPUT/languages/zh-Hans/static/*
-rm $TW5_BUILD_OUTPUT/languages/zh-Hant/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/de-AT/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/de-DE/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/es-ES/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/fr-FR/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/ja-JP/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/ko-KR/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/zh-Hans/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/zh-Hant/static/*
 
 # /languages/de-AT/index.html		Demo wiki with de-AT language
 # /languages/de-AT/empty.html		Empty wiki with de-AT language

boot/boot.js

@@ -313,7 +313,7 @@ $tw.utils.getLocationHash = function() {
 	var idx = href.indexOf('#');
 	if(idx === -1) {
 		return "#";
-	} else if(idx < href.length-1 && href[idx+1] === '#') {
+	} else if(href.substr(idx + 1,1) === "#" ||  href.substr(idx + 1,3) === "%23") {
 		// Special case: ignore location hash if it itself starts with a #
 		return "#";
 	} else {
@@ -375,7 +375,7 @@ $tw.utils.stringifyList = function(value) {
 		var result = new Array(value.length);
 		for(var t=0, l=value.length; t<l; t++) {
 			var entry = value[t] || "";
-			if(entry.indexOf(" ") !== -1) {
+			if(entry.match(/[^\S\xA0]/mg)) {
 				result[t] = "[[" + entry + "]]";
 			} else {
 				result[t] = entry;
@@ -1881,7 +1881,7 @@ A default set of files for TiddlyWiki to ignore during load.
 This matches what NPM ignores, and adds "*.meta" to ignore tiddler
 metadata files.
 */
-$tw.boot.excludeRegExp = /^\.DS_Store$|^.*\.meta$|^\..*\.swp$|^\._.*$|^\.git$|^\.hg$|^\.lock-wscript$|^\.svn$|^\.wafpickle-.*$|^CVS$|^npm-debug\.log$/;
+$tw.boot.excludeRegExp = /^\.DS_Store$|^.*\.meta$|^\..*\.swp$|^\._.*$|^\.git$|^\.github$|^\.vscode$|^\.hg$|^\.lock-wscript$|^\.svn$|^\.wafpickle-.*$|^CVS$|^npm-debug\.log$/;
 
 /*
 Load all the tiddlers recursively from a directory, including honouring `tiddlywiki.files` files for drawing in external files. Returns an array of {filepath:,type:,tiddlers: [{..fields...}],hasMetaFile:}. Note that no file information is returned for externally loaded tiddlers, just the `tiddlers` property.
@@ -2408,6 +2408,7 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("video/webm","base64",".webm");
 	$tw.utils.registerFileType("video/mp4","base64",".mp4");
 	$tw.utils.registerFileType("audio/mp3","base64",".mp3");
+	$tw.utils.registerFileType("audio/mpeg","base64");
 	$tw.utils.registerFileType("text/markdown","utf8",[".md",".markdown"],{deserializerType:"text/x-markdown"});
 	$tw.utils.registerFileType("text/x-markdown","utf8",[".md",".markdown"]);
 	$tw.utils.registerFileType("application/enex+xml","utf8",".enex");

core/copyright.tid

@@ -4,7 +4,7 @@ type: text/plain
 TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com)
 
 Copyright (c) 2004-2007, Jeremy Ruston
-Copyright (c) 2007-2022, UnaMesa Association
+Copyright (c) 2007-2023, UnaMesa Association
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

core/images/save-button-dynamic.tid

@@ -0,0 +1,12 @@
+title: $:/core/images/save-button-dynamic
+tags: $:/tags/Image
+
+<svg width="22pt" height="22pt" class="tc-image-save-button-dynamic tc-image-button" viewBox="0 0 128 128">
+<g class="tc-image-save-button-dynamic-clean">
+<path fill-rule="evenodd" d="M120.783 34.33c4.641 8.862 7.266 18.948 7.266 29.646 0 35.347-28.653 64-64 64-35.346 0-64-28.653-64-64 0-35.346 28.654-64 64-64 18.808 0 35.72 8.113 47.43 21.03l2.68-2.68c3.13-3.13 8.197-3.132 11.321-.008 3.118 3.118 3.121 8.193-.007 11.32l-4.69 4.691zm-12.058 12.058a47.876 47.876 0 013.324 17.588c0 26.51-21.49 48-48 48s-48-21.49-48-48 21.49-48 48-48c14.39 0 27.3 6.332 36.098 16.362L58.941 73.544 41.976 56.578c-3.127-3.127-8.201-3.123-11.32-.005-3.123 3.124-3.119 8.194.006 11.319l22.617 22.617a7.992 7.992 0 005.659 2.347c2.05 0 4.101-.783 5.667-2.349l44.12-44.12z"/>
+</g>
+<g class="tc-image-save-button-dynamic-dirty">
+<path d="M64.856912,0 C100.203136,0 128.856912,28.653776 128.856912,64 C128.856912,99.346224 100.203136,128 64.856912,128 C29.510688,128 0.856911958,99.346224 0.856911958,64 C0.856911958,28.653776 29.510688,0 64.856912,0 Z M64.856912,16 C38.347244,16 16.856912,37.490332 16.856912,64 C16.856912,90.509668 38.347244,112 64.856912,112 C91.3665799,112 112.856912,90.509668 112.856912,64 C112.856912,37.490332 91.3665799,16 64.856912,16 Z"></path>
+<circle cx="65" cy="64" r="32"></circle>
+</g>
+</svg>

core/language/en-GB/Fields.multids

@@ -1,11 +1,13 @@
 title: $:/language/Docs/Fields/
 
 _canonical_uri: The full URI of an external image tiddler
+author: Name of the author of a plugin
 bag: The name of the bag from which a tiddler came
 caption: The text to be displayed on a tab or button
 code-body: The view template will display the tiddler as code if set to ''yes''
 color: The CSS color value associated with a tiddler
 component: The name of the component responsible for an [[alert tiddler|AlertMechanism]]
+core-version: For a plugin, indicates what version of TiddlyWiki with which it is compatible
 current-tiddler: Used to cache the top tiddler in a [[history list|HistoryMechanism]]
 created: The date a tiddler was created
 creator: The name of the person who created a tiddler
@@ -22,7 +24,9 @@ list-before: If set, the title of a tiddler before which this tiddler should be
 list-after: If set, the title of the tiddler after which this tiddler should be added to the ordered list of tiddler titles, or at the end of the list if this field is present but empty
 modified: The date and time at which a tiddler was last modified
 modifier: The tiddler title associated with the person who last modified a tiddler
+module-type: For javascript tiddlers, specifies what kind of module it is
 name: The human readable name associated with a plugin tiddler
+parent-plugin: For a plugin, specifies which plugin of which it is a sub-plugin
 plugin-priority: A numerical value indicating the priority of a plugin tiddler
 plugin-type: The type of plugin in a plugin tiddler
 revision: The revision of the tiddler held at the server

core/modules/commands/rendertiddlers.js

@@ -57,7 +57,7 @@ Command.prototype.execute = function() {
 				exportPath = path.resolve(outputPath,macroPath + extension);
 			}
 		}
-		var finalPath = exportPath || path.resolve(pathname,encodeURIComponent(title) + extension);
+		var finalPath = exportPath || path.resolve(pathname,$tw.utils.encodeURIComponentExtended(title) + extension);
 		$tw.utils.createFileDirectories(finalPath);
 		fs.writeFileSync(finalPath,text,"utf8");
 	});

core/modules/commands/savelibrarytiddlers.js

@@ -65,7 +65,7 @@ Command.prototype.execute = function() {
 	$tw.utils.each(filteredPluginList,function(title) {
 		var tiddler = containerData.tiddlers[title];
 		// Save each JSON file and collect the skinny data
-		var pathname = path.resolve(self.commander.outputPath,basepath + encodeURIComponent(title) + ".json");
+		var pathname = path.resolve(self.commander.outputPath,basepath + $tw.utils.encodeURIComponentExtended(title) + ".json");
 		$tw.utils.createFileDirectories(pathname);
 		fs.writeFileSync(pathname,JSON.stringify(tiddler),"utf8");
 		// Collect the skinny list data

core/modules/commands/savetiddlers.js

@@ -45,7 +45,7 @@ Command.prototype.execute = function() {
 		var tiddler = self.commander.wiki.getTiddler(title),
 			type = tiddler.fields.type || "text/vnd.tiddlywiki",
 			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
-			filename = path.resolve(pathname,encodeURIComponent(title));
+			filename = path.resolve(pathname,$tw.utils.encodeURIComponentExtended(title));
 		fs.writeFileSync(filename,tiddler.fields.text,contentTypeInfo.encoding);
 	});
 	return null;

core/modules/filters/encodings.js

@@ -27,7 +27,7 @@ exports.decodeuricomponent = function(source,operator,options) {
 exports.encodeuricomponent = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		results.push(encodeURIComponent(title));
+		results.push($tw.utils.encodeURIComponentExtended(title));
 	});
 	return results;
 };

core/modules/filters/filter.js

@@ -21,14 +21,15 @@ exports.filter = function(source,operator,options) {
 		target = operator.prefix !== "!";
 	source(function(tiddler,title) {
 		var list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),{
-				getVariable: function(name) {
+				getVariable: function(name,opts) {
+					opts = opts || {};
 					switch(name) {
 						case "currentTiddler":
 							return "" + title;
 						case "..currentTiddler":
 							return options.widget.getVariable("currentTiddler");
 						default:
-							return options.widget.getVariable(name);
+							return options.widget.getVariable(name,opts);
 					}
 				}
 			});

core/modules/filters/json-ops.js

@@ -176,7 +176,11 @@ function getDataItem(data,indexes) {
 	var item = data;
 	for(var i=0; i<indexes.length; i++) {
 		if(item !== undefined) {
-			item = item[indexes[i]];
+			if(item !== null && ["number","string","boolean"].indexOf(typeof item) === -1) {
+				item = item[indexes[i]];
+			} else {
+				item = undefined;
+			}
 		}
 	}
 	return item;

core/modules/filters/reduce.js

@@ -27,7 +27,8 @@ exports.reduce = function(source,operator,options) {
 	for(var index=0; index<results.length; index++) {
 		var title = results[index],
 			list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),{
-				getVariable: function(name) {
+				getVariable: function(name,opts) {
+					opts = opts || {};
 					switch(name) {
 						case "currentTiddler":
 							return "" + title;
@@ -42,7 +43,7 @@ exports.reduce = function(source,operator,options) {
 						case "length":
 							return "" + results.length;
 						default:
-							return options.widget.getVariable(name);
+							return options.widget.getVariable(name,opts);
 					}
 				}
 			});

core/modules/filters/sortsub.js

@@ -26,14 +26,15 @@ exports.sortsub = function(source,operator,options) {
 		var r = filterFn.call(options.wiki,function(iterator) {
 			iterator(options.wiki.getTiddler(title),title);
 		},{
-			getVariable: function(name) {
+			getVariable: function(name,opts) {
+				opts = opts || {};
 				switch(name) {
 					case "currentTiddler":
 						return "" + title;
 					case "..currentTiddler":
 						return options.widget.getVariable("currentTiddler");
 					default:
-						return options.widget.getVariable(name);
+						return options.widget.getVariable(name,opts);
 				}
 			}
 		});

core/modules/parsers/pdfparser.js

@@ -15,7 +15,7 @@ The PDF parser embeds a PDF viewer
 var ImageParser = function(type,text,options) {
 	var element = {
 			type: "element",
-			tag: "embed",
+			tag: "iframe",
 			attributes: {}
 		},
 		src;

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

@@ -25,7 +25,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\import[^\S\n]/mg;
+	this.matchRegExp = /\\import[^\S\n]/mg;
 };
 
 /*

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

@@ -27,7 +27,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\define\s+([^(\s]+)\(\s*([^)]*)\)(\s*\r?\n)?/mg;
+	this.matchRegExp = /\\define\s+([^(\s]+)\(\s*([^)]*)\)(\s*\r?\n)?/mg;
 };
 
 /*
@@ -58,7 +58,7 @@ exports.parse = function() {
 	var reEnd;
 	if(this.match[3]) {
 		// If so, the end of the body is marked with \end
-		reEnd = new RegExp("(\\r?\\n\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
+		reEnd = new RegExp("(\\r?\\n\\s*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
 	} else {
 		// Otherwise, the end of the definition is marked by the end of the line
 		reEnd = /($|\r?\n)/mg;

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

@@ -26,7 +26,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\parsermode[^\S\n]/mg;
+	this.matchRegExp = /\\parsermode[^\S\n]/mg;
 };
 
 /*

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

@@ -26,7 +26,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\rules[^\S\n]/mg;
+	this.matchRegExp = /\\rules[^\S\n]/mg;
 };
 
 /*

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

@@ -26,7 +26,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\whitespace[^\S\n]/mg;
+	this.matchRegExp = /\\whitespace[^\S\n]/mg;
 };
 
 /*

core/modules/savers/beaker.js

@@ -1,64 +0,0 @@
-/*\
-title: $:/core/modules/savers/beaker.js
-type: application/javascript
-module-type: saver
-
-Saves files using the Beaker browser's (https://beakerbrowser.com) Dat protocol (https://datproject.org/)
-Compatible with beaker >= V0.7.2
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Set up the saver
-*/
-var BeakerSaver = function(wiki) {
-	this.wiki = wiki;
-};
-
-BeakerSaver.prototype.save = function(text,method,callback) {
-	var dat = new DatArchive("" + window.location),
-		pathname = ("" + window.location.pathname).split("#")[0];
-	dat.stat(pathname).then(function(value) {
-		if(value.isDirectory()) {
-			pathname = pathname + "/index.html";
-		}
-		dat.writeFile(pathname,text,"utf8").then(function(value) {
-			callback(null);
-		},function(reason) {
-			callback("Beaker Saver Write Error: " + reason);
-		});
-	},function(reason) {
-		callback("Beaker Saver Stat Error: " + reason);
-	});
-	return true;
-};
-
-/*
-Information about this saver
-*/
-BeakerSaver.prototype.info = {
-	name: "beaker",
-	priority: 3000,
-	capabilities: ["save", "autosave"]
-};
-
-/*
-Static method that returns true if this saver is capable of working
-*/
-exports.canSave = function(wiki) {
-	return !!window.DatArchive && location.protocol==="dat:";
-};
-
-/*
-Create an instance of this saver
-*/
-exports.create = function(wiki) {
-	return new BeakerSaver(wiki);
-};
-
-})();

core/modules/savers/hyperdrive.js

@@ -1,64 +0,0 @@
-/*\
-title: $:/core/modules/savers/hyperdrive.js
-type: application/javascript
-module-type: saver
-
-Saves files using the Hyperdrive Protocol (https://hypercore-protocol.org/#hyperdrive) Beaker browser beta-1.0 and later (https://beakerbrowser.com)
-Compatible with beaker >= V1.0.0
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Set up the saver
-*/
-var HyperdriveSaver = function(wiki) {
-	this.wiki = wiki;
-};
-
-HyperdriveSaver.prototype.save = function(text,method,callback) {
-	var dat = beaker.hyperdrive.drive("" + window.location),
-		pathname = ("" + window.location.pathname).split("#")[0];
-	dat.stat(pathname).then(function(value) {
-		if(value.isDirectory()) {
-			pathname = pathname + "/index.html";
-		}
-		dat.writeFile(pathname,text,"utf8").then(function(value) {
-			callback(null);
-		},function(reason) {
-			callback("Hyperdrive Saver Write Error: " + reason);
-		});
-	},function(reason) {
-		callback("Hyperdrive Saver Stat Error: " + reason);
-	});
-	return true;
-};
-
-/*
-Information about this saver
-*/
-HyperdriveSaver.prototype.info = {
-	name: "beaker-1.x",
-	priority: 3000,
-	capabilities: ["save", "autosave"]
-};
-
-/*
-Static method that returns true if this saver is capable of working
-*/
-exports.canSave = function(wiki) {
-	return !!window.beaker && !!beaker.hyperdrive && location.protocol==="hyper:";
-};
-
-/*
-Create an instance of this saver
-*/
-exports.create = function(wiki) {
-	return new HyperdriveSaver(wiki);
-};
-
-})();

core/modules/server/routes/get-status.js

@@ -21,6 +21,7 @@ exports.handler = function(request,response,state) {
 		username: state.authenticatedUsername || state.server.get("anon-username") || "",
 		anonymous: !state.authenticatedUsername,
 		read_only: !state.server.isAuthorized("writers",state.authenticatedUsername),
+		logout_is_available: false,
 		space: {
 			recipe: "default"
 		},

core/modules/syncer.js

@@ -402,6 +402,7 @@ Syncer.prototype.handleLazyLoadEvent = function(title) {
 			// Mark the tiddler as needing loading, and having already been lazily loaded
 			this.titlesToBeLoaded[title] = true;
 			this.titlesHaveBeenLazyLoaded[title] = true;
+			this.processTaskQueue();
 		}
 	}
 };

core/modules/utils/filesystem.js

@@ -228,7 +228,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
 			hasUnsafeFields = hasUnsafeFields || /[\x00-\x1F]/mg.test(value);
 			hasUnsafeFields = hasUnsafeFields || ($tw.utils.trim(value) !== value);
 		}
-		hasUnsafeFields = hasUnsafeFields || /:/mg.test(fieldName);
+		hasUnsafeFields = hasUnsafeFields || /:|#/mg.test(fieldName);
 	});
 	// Check for field values 
 	if(hasUnsafeFields) {
@@ -393,7 +393,7 @@ exports.generateTiddlerFilepath = function(title,options) {
 	} while(fs.existsSync(fullPath));
 	// If the last write failed with an error, or if path does not start with:
 	//	the resolved options.directory, the resolved wikiPath directory, the wikiTiddlersPath directory, 
-	//	or the 'originalpath' directory, then encodeURIComponent() and resolve to tiddler directory.
+	//	or the 'originalpath' directory, then $tw.utils.encodeURIComponentExtended() and resolve to tiddler directory.
 	var writePath = $tw.hooks.invokeHook("th-make-tiddler-path",fullPath,fullPath),
 		encode = (options.fileInfo || {writeError: false}).writeError == true;
 	if(!encode) {
@@ -403,7 +403,7 @@ exports.generateTiddlerFilepath = function(title,options) {
 			writePath.indexOf(path.resolve($tw.boot.wikiTiddlersPath,originalpath)) == 0 );
 		}
 	if(encode) {
-		writePath = path.resolve(directory,encodeURIComponent(fullPath));
+		writePath = path.resolve(directory,$tw.utils.encodeURIComponentExtended(fullPath));
 	}
 	// Return the full path to the file
 	return writePath;

core/modules/utils/utils.js

@@ -685,9 +685,19 @@ exports.escapeRegExp = function(s) {
     return s.replace(/[\-\/\\\^\$\*\+\?\.\(\)\|\[\]\{\}]/g, '\\$&');
 };
 
+/*
+Extended version of encodeURIComponent that encodes additional characters including
+those that are illegal within filepaths on various platforms including Windows
+*/
+exports.encodeURIComponentExtended = function(s) {
+	return encodeURIComponent(s).replace(/[!'()*]/g,function(c) {
+		return "%" + c.charCodeAt(0).toString(16).toUpperCase();
+	});
+};
+
 // Checks whether a link target is external, i.e. not a tiddler title
 exports.isLinkExternal = function(to) {
-	var externalRegExp = /^(?:file|http|https|mailto|ftp|irc|news|data|skype):[^\s<>{}\[\]`|"\\^]+(?:\/|\b)/i;
+	var externalRegExp = /^(?:file|http|https|mailto|ftp|irc|news|obsidian|data|skype):[^\s<>{}\[\]`|"\\^]+(?:\/|\b)/i;
 	return externalRegExp.test(to);
 };
 

core/modules/widgets/dropzone.js

@@ -232,10 +232,32 @@ DropZoneWidget.prototype.handleDropEvent  = function(event) {
 };
 
 DropZoneWidget.prototype.handlePasteEvent  = function(event) {
-	var self = this,
-		readFileCallback = function(tiddlerFieldsArray) {
+	var self = this;
+	var	readFileCallback = function(tiddlerFieldsArray) {
 			self.readFileCallback(tiddlerFieldsArray);
 		};
+	var getItem = function(type) {
+			type = type || "text/plain";
+			return function(str) {
+				// Use the deserializer specified if any
+				if(self.dropzoneDeserializer) {
+					tiddlerFields = self.wiki.deserializeTiddlers(null,str,{title: self.wiki.generateNewTitle("Untitled " + type)},{deserializer:self.dropzoneDeserializer});
+					if(tiddlerFields && tiddlerFields.length) {
+						readFileCallback(tiddlerFields);
+					}
+				} else {
+					tiddlerFields = {
+						title: self.wiki.generateNewTitle("Untitled " + type),
+						text: str,
+						type: type
+					};
+					if($tw.log.IMPORT) {
+						console.log("Importing string '" + str + "', type: '" + type + "'");
+					}
+					readFileCallback([tiddlerFields]);
+				}
+			}
+		};
 	// Let the browser handle it if we're in a textarea or input box
 	if(["TEXTAREA","INPUT"].indexOf(event.target.tagName) == -1 && !event.target.isContentEditable) {
 		var self = this,
@@ -251,27 +273,10 @@ DropZoneWidget.prototype.handlePasteEvent  = function(event) {
 				});
 			} else if(item.kind === "string") {
 				// Create tiddlers from string items
-				var tiddlerFields,
-					type = item.type;
-				item.getAsString(function(str) {
-					// Use the deserializer specified if any
-					if(self.dropzoneDeserializer) {
-						tiddlerFields = self.wiki.deserializeTiddlers(null,str,{title: self.wiki.generateNewTitle("Untitled")},{deserializer:self.dropzoneDeserializer});
-						if(tiddlerFields && tiddlerFields.length) {
-							readFileCallback(tiddlerFields);
-						}
-					} else {
-						tiddlerFields = {
-							title: self.wiki.generateNewTitle("Untitled"),
-							text: str,
-							type: type
-						};
-						if($tw.log.IMPORT) {
-							console.log("Importing string '" + str + "', type: '" + type + "'");
-						}
-						readFileCallback([tiddlerFields]);
-					}
-				});
+				var tiddlerFields;
+				// It's important to give getAsString a closure with the right type
+				// So it can be added to the import queue
+				item.getAsString(getItem(item.type));
 			}
 		}
 		// Tell the browser that we've handled the paste

core/modules/widgets/element.js

@@ -34,6 +34,10 @@ ElementWidget.prototype.render = function(parent,nextSibling) {
 	if($tw.config.htmlUnsafeElements.indexOf(this.tag) !== -1) {
 		this.tag = "safe-" + this.tag;
 	}
+	// Restrict tag name to digits, letts and dashes
+	this.tag = this.tag.replace(/[^0-9a-zA-Z\-]/mg,"");
+	// Default to a span
+	this.tag = this.tag || "span";
 	// Adjust headings by the current base level
 	var headingLevel = ["h1","h2","h3","h4","h5","h6"].indexOf(this.tag);
 	if(headingLevel !== -1) {

core/modules/widgets/genesis.js

@@ -42,10 +42,15 @@ Compute the internal state of the widget
 GenesisWidget.prototype.execute = function() {
 	var self = this;
 	// Collect attributes
-	this.genesisType = this.getAttribute("$type","element");
+	this.genesisType = this.getAttribute("$type");
 	this.genesisRemappable = this.getAttribute("$remappable","yes") === "yes";
 	this.genesisNames = this.getAttribute("$names","");
 	this.genesisValues = this.getAttribute("$values","");
+	// Do not create a child widget if the $type attribute is missing or blank
+	if(!this.genesisType) {
+		this.makeChildWidgets(this.parseTreeNode.children);
+		return;
+	}
 	// Construct parse tree
 	var isElementWidget = this.genesisType.charAt(0) !== "$",
 		nodeType = isElementWidget ? "element" : this.genesisType.substr(1),

core/modules/widgets/link.js

@@ -97,8 +97,8 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
 		// Expand the tv-wikilink-template variable to construct the href
 		var wikiLinkTemplateMacro = this.getVariable("tv-wikilink-template"),
 			wikiLinkTemplate = wikiLinkTemplateMacro ? wikiLinkTemplateMacro.trim() : "#$uri_encoded$";
-		wikiLinkText = $tw.utils.replaceString(wikiLinkTemplate,"$uri_encoded$",encodeURIComponent(this.to));
-		wikiLinkText = $tw.utils.replaceString(wikiLinkText,"$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to)));
+		wikiLinkText = $tw.utils.replaceString(wikiLinkTemplate,"$uri_encoded$",$tw.utils.encodeURIComponentExtended(this.to));
+		wikiLinkText = $tw.utils.replaceString(wikiLinkText,"$uri_doubleencoded$",$tw.utils.encodeURIComponentExtended($tw.utils.encodeURIComponentExtended(this.to)));
 	}
 	// Override with the value of tv-get-export-link if defined
 	wikiLinkText = this.getVariable("tv-get-export-link",{params: [{name: "to",value: this.to}],defaultValue: wikiLinkText});

core/modules/widgets/messagecatcher.js

@@ -82,7 +82,7 @@ MessageCatcherWidget.prototype.render = function(parent,nextSibling) {
 		}
 	});
 	// Render children
-	this.renderChildren(parent,null);
+	this.renderChildren(parent,nextSibling);
 };
 
 /*

core/modules/widgets/navigator.js

@@ -227,10 +227,7 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
 		originalTitle = tiddler ? tiddler.fields["draft.of"] : "",
 		originalTiddler = originalTitle ? this.wiki.getTiddler(originalTitle) : undefined,
 		confirmationTitle,
-	    	win = event.event && event.event.view ? event.event.view : window;
-	if(!tiddler) {
-		return false;
-	}
+		win = event.event && event.event.view ? event.event.view : window;
 	// Check if the tiddler we're deleting is in draft mode
 	if(originalTitle) {
 		// If so, we'll prompt for confirmation referencing the original tiddler
@@ -240,7 +237,7 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
 		confirmationTitle = title;
 	}
 	// Seek confirmation
-	if((this.wiki.getTiddler(originalTitle) || (tiddler.fields.text || "") !== "") && !win.confirm($tw.language.getString(
+	if(((originalTitle && this.wiki.getTiddler(originalTitle)) || (tiddler && ((tiddler.fields.text || "") !== ""))) && !win.confirm($tw.language.getString(
 				"ConfirmDeleteTiddler",
 				{variables:
 					{title: confirmationTitle}
@@ -257,8 +254,10 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
 		this.removeTitleFromStory(storyList,originalTitle);
 	}
 	// Invoke the hook function and delete this tiddler
-	$tw.hooks.invokeHook("th-deleting-tiddler",tiddler);
-	this.wiki.deleteTiddler(title);
+	if(tiddler) {
+		$tw.hooks.invokeHook("th-deleting-tiddler",tiddler);
+		this.wiki.deleteTiddler(title);	
+	}
 	// Remove the closed tiddler from the story
 	this.removeTitleFromStory(storyList,title);
 	this.saveStoryList(storyList);

core/modules/widgets/view.js

@@ -168,11 +168,11 @@ ViewWidget.prototype.getValueAsHtmlTextEncoded = function() {
 };
 
 ViewWidget.prototype.getValueAsUrlEncoded = function() {
-	return encodeURIComponent(this.getValueAsText());
+	return $tw.utils.encodeURIComponentExtended(this.getValueAsText());
 };
 
 ViewWidget.prototype.getValueAsDoubleUrlEncoded = function() {
-	return encodeURIComponent(encodeURIComponent(this.getValueAsText()));
+	return $tw.utils.encodeURIComponentExtended($tw.utils.encodeURIComponentExtended(this.getValueAsText()));
 };
 
 ViewWidget.prototype.getValueAsDate = function(format) {

core/templates/external-js/save-all-external-js.tid

@@ -1,5 +1,6 @@
 title: $:/core/save/all-external-js
 
+\whitespace trim
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 \define saveTiddlerFilter()
 [is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$

core/templates/external-js/save-offline-external-js.tid

@@ -1,5 +1,6 @@
 title: $:/core/save/offline-external-js
 
+\whitespace trim
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 \define saveTiddlerFilter()
 [is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$

core/templates/external-js/tiddlywiki.js.load.tid

@@ -0,0 +1,3 @@
+title: $:/core/templates/tiddlywiki.js/load-tiddler
+
+_load(window,<$macrocall $name="jsontiddler" $output="text/raw"/>);

core/templates/external-js/tiddlywiki.js.tid

@@ -1,15 +1,48 @@
+
 title: $:/core/templates/tiddlywiki5.js
 
 \rules only filteredtranscludeinline transcludeinline codeinline
 
-/*
-{{ $:/core/copyright.txt ||$:/core/templates/plain-text-tiddler}}
-`*/
-`<!--~~ Library modules ~~-->
-{{{ [is[system]type[application/javascript]library[yes]] ||$:/core/templates/plain-text-tiddler}}}
-<!--~~ Boot prefix ~~-->
-{{ $:/boot/bootprefix.js ||$:/core/templates/plain-text-tiddler}}
-<!--~~ Core plugin ~~-->
-{{$:/core/templates/tiddlywiki5.js/tiddlers}}
-<!--~~ Boot kernel ~~-->
-{{ $:/boot/boot.js ||$:/core/templates/plain-text-tiddler}}
+`/*
+`{{ $:/core/copyright.txt ||$:/core/templates/plain-text-tiddler}}`
+*/
+
+$tw = (typeof $tw === 'undefined') ? Object.create(null) : $tw;
+
+$tw.preloadTiddlers = $tw.preloadTiddlers || [];
+
+_load = function(window,tiddler) {
+	"use strict";
+	var f;
+	$tw.preloadTiddlers.push(tiddler);
+	if(tiddler.library === "yes") {
+		var module = { exports:{} };
+		var moduleName = function moduleName(path) {
+			var word = path.split("/").pop();
+			word = word.substring(0,word.indexOf(".")) || word;
+			return word;
+		}
+		f = new Function("module",tiddler.text);
+		f(module);
+		window[moduleName(tiddler.title)] = module.exports;
+	} else {
+		f = new Function("window",tiddler.text);
+		f(window);
+	}
+}
+
+/* ~~ Library modules ~~ */
+
+`{{{ [is[system]type[application/javascript]library[yes]] ||$:/core/templates/tiddlywiki.js/load-tiddler}}}`
+
+/* ~~ Boot kernel prologue ~~ */
+
+`{{ $:/boot/bootprefix.js ||$:/core/templates/tiddlywiki.js/load-tiddler}}`
+
+/* ~~ Core tiddlers ~~ */
+
+`{{$:/core/templates/tiddlywiki5.js/tiddlers}}`
+
+/* ~~ Boot kernel ~~ */
+
+`{{ $:/boot/boot.js ||$:/core/templates/tiddlywiki.js/load-tiddler}}`

core/templates/external-js/tiddlywiki5-external-js.html.tid

@@ -1,48 +1,50 @@
 title: $:/core/templates/tiddlywiki5-external-js.html
 
-\rules only filteredtranscludeinline transcludeinline
-<!doctype html>
-{{$:/core/templates/MOTW.html}}<html lang="{{{ [{$:/language}get[name]] }}}">
+<$set name="saveTiddlerAndShadowsFilter" filter="[subfilter<saveTiddlerFilter>] [subfilter<saveTiddlerFilter>plugintiddlers[]]">
+`<!doctype html>
+`{{$:/core/templates/MOTW.html}}`<html lang="`<$text text={{{ [{$:/language}get[name]] }}}/>`">
 <head>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <!--~~ Raw markup for the top of the head section ~~-->
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}`
 <meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
 <meta name="application-name" content="TiddlyWiki" />
 <meta name="generator" content="TiddlyWiki" />
-<meta name="tiddlywiki-version" content="{{$:/core/templates/version}}" />
+<meta name="tiddlywiki-version" content="`{{$:/core/templates/version}}`" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <meta name="mobile-web-app-capable" content="yes"/>
 <meta name="format-detection" content="telephone=no" />
-<meta name="copyright" content="{{$:/core/copyright.txt}}" />
+<meta name="copyright" content="`{{$:/core/copyright.txt}}`" />
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
-<title>{{$:/core/wiki/title}}</title>
+<title>`{{$:/core/wiki/title}}`</title>
 <!--~~ This is a Tiddlywiki file. The points of interest in the file are marked with this pattern ~~-->
 
 <!--~~ Raw markup ~~-->
-{{{ [all[shadows+tiddlers]tag[$:/core/wiki/rawmarkup]] [all[shadows+tiddlers]tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}}
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/core/wiki/rawmarkup]] ||$:/core/templates/plain-text-tiddler}}}`
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}}`
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}}`
 </head>
 <body class="tc-body">
 <!--~~ Raw markup for the top of the body section ~~-->
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}}`
 <!--~~ Static styles ~~-->
 <div id="styleArea">
-{{$:/boot/boot.css||$:/core/templates/css-tiddler}}
+`{{$:/boot/boot.css||$:/core/templates/css-tiddler}}`
 </div>
 <!--~~ Static content for Google and browsers without JavaScript ~~-->
 <noscript>
 <div id="splashArea">
-{{$:/core/templates/static.area}}
+`{{$:/core/templates/static.area}}`
 </div>
 </noscript>
 <!--~~ Ordinary tiddlers ~~-->
-{{$:/core/templates/store.area.template.html}}
+`{{$:/core/templates/store.area.template.html}}`
 <!--~~ Raw markup for the bottom of the body section ~~-->
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}`
+<!--~~ Load external JavaScripts ~~-->
+<script src="`{{{ [<coreURL>] }}}`" onerror="alert('Error: Cannot load `{{{ [<coreURL>] }}}`');"></script>
 </body>
-<!--~~ Load external JS ~~-->
-<script src="{{{ [<coreURL>] }}}" onerror="alert('Error: Cannot load {{{ [<coreURL>] }}}');"></script>
-</html>
+</html>`
+</$set>

core/ui/ControlPanel/Parsing.tid

@@ -12,7 +12,7 @@ field="text"
 checked="enable"
 unchecked="disable"
 default="enable">
-<<rule>>
+<span class="tc-small-gap-left"><<rule>></span>
 </$checkbox>
 \end
 

core/ui/DownloadFullWiki.tid

@@ -0,0 +1,18 @@
+title: $:/core/ui/DownloadFullWiki
+
+\whitespace trim
+\rules except wikilink
+
+To download the standard single-file version of your wiki:
+
+<$wikify name="site-title" text={{$:/config/SaveWikiButton/Filename}}>
+<$let publishFilter="""-[[$:/config/SaveWikiButton/Template]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]]""">
+<$button tooltip="Download fully standalone wiki" aria-label="download full wiki" class="tc-btn-big-green">
+<$action-sendmessage $message="tm-download-file" $param="$:/core/save/all" publishFilter=<<publishFilter>> filename=<<site-title>>/>
+{{$:/core/images/download-button}}
+<span class="tc-tiny-gap-left">
+Download full wiki
+</span>
+</$button>
+</$let>
+</$wikify>

core/ui/EditToolbar/save.tid

@@ -3,16 +3,23 @@ tags: $:/tags/EditToolbar
 caption: {{$:/core/images/done-button}} {{$:/language/Buttons/Save/Caption}}
 description: {{$:/language/Buttons/Save/Hint}}
 
+\whitespace trim
 \define save-tiddler-button()
 \whitespace trim
-<$fieldmangler><$button tooltip={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class=<<tv-config-toolbar-class>>>
-<<save-tiddler-actions>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/done-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Save/Caption}}/></span>
-</$list>
-</$button></$fieldmangler>
+<$fieldmangler>
+	<$button
+		tooltip={{$:/language/Buttons/Save/Hint}}
+		aria-label={{$:/language/Buttons/Save/Caption}}
+		class=<<tv-config-toolbar-class>>
+	>
+		<<save-tiddler-actions>>
+		<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+			{{$:/core/images/done-button}}
+		</$list>
+		<$list filter="[<tv-config-toolbar-text>match[yes]]">
+			<span class="tc-btn-text"><$text text={{$:/language/Buttons/Save/Caption}}/></span>
+		</$list>
+	</$button>
+</$fieldmangler>
 \end
 <<save-tiddler-button>>

core/ui/ExportTiddlyWikiCore.tid

@@ -1,11 +1,6 @@
 title: $:/core/ui/ExportTiddlyWikiCore
 
 \define jsFileName() tiddlywikicore-$(version)$.js
-\define noExportMsg()
-It appears that you have a wiki with an external ~TiddlyWiki core. The export action cannot be performed.
-<p>You will need to view the page source in your browser. Then go to the very bottom the the source, find the last `<script>`
-element, and right-click its `src` URI. Save the link as ''$(jsFileName)$''</p>
-\end
 \rules except wikilink
 \whitespace trim
 
@@ -17,16 +12,11 @@ Export the TiddlyWiki core JavaScript code for running with external JavaScript:
 	tooltip="Export the TiddlyWiki core code for running with external JavaScript"
 	aria-label="export TiddlyWiki core"
 	class="tc-btn-big-green">
-<$list
-	filter="[[$:/boot/boot.js]is[missing]]"
-	variable="ignore"
-	emptyMessage="<$action-sendmessage $message='tm-download-file' $param='$:/core/templates/tiddlywiki5.js' filename=<<jsFileName>>/>" >
-<$action-setfield $tiddler=<<qualify "$:/temp/alert">> text=<<noExportMsg>> subtitle="Export ~TiddllyWiki Core"/>
-<$action-sendmessage $message="tm-modal" $param=<<qualify "$:/temp/alert">>/>
-</$list>
+<$action-sendmessage $message='tm-download-file' $param='$:/core/templates/tiddlywiki5.js' filename=<<jsFileName>>/>
 {{$:/core/images/download-button}}
-&#32;
+<span class="tc-tiny-gap-left">
 Download TiddlyWiki core
+</span>
 </$button>
 
 [[Further information|https://tiddlywiki.com/#Using%20the%20external%20JavaScript%20template]]

core/ui/LayoutSwitcher.tid

@@ -13,13 +13,13 @@ caption: {{$:/language/ControlPanel/LayoutSwitcher/Caption}}
 		<$set name="cls" filter="[all[current]field:title{$:/layout}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
 		<div class=<<cls>>>
 		<$link to={{!!title}}>
-		''<$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
+		''<$transclude tiddler={{{ [<currentTiddler>get[icon]] }}}/><$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
 		</$link></div></$set>
 """>
 <$set name="cls" filter="[all[current]field:title[$:/core/ui/PageTemplate]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
 <div class=<<cls>>>
 <$link to={{!!title}}>
-''<$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
+''<$transclude tiddler={{{ [<currentTiddler>get[icon]] }}}/><$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
 </$link>
 </div>
 </$set>

core/ui/MoreSideBar/Tags.tid

@@ -2,26 +2,17 @@ title: $:/core/ui/MoreSideBar/Tags
 tags: $:/tags/MoreSideBar
 caption: {{$:/language/SideBar/Tags/Caption}}
 
-<$set name="tv-config-toolbar-icons" value="yes">
-
-<$set name="tv-config-toolbar-text" value="yes">
-
-<$set name="tv-config-toolbar-class" value="">
-
-{{$:/core/ui/Buttons/tag-manager}}
-
-</$set>
-
-</$set>
-
-</$set>
+\whitespace trim
 
+<$let tv-config-toolbar-icons="yes" tv-config-toolbar-text="yes" tv-config-toolbar-class="">
+	<div class="tc-tiny-v-gap-bottom">
+    	{{$:/core/ui/Buttons/tag-manager}}
+	</div>
+</$let>
 <$list filter={{$:/core/Filters/AllTags!!filter}}>
-
-<$transclude tiddler="$:/core/ui/TagTemplate"/>
-
+	<div class="tc-tiny-v-gap-bottom">
+    	<$transclude tiddler="$:/core/ui/TagTemplate"/>
+	</div>
 </$list>
-
 <hr class="tc-untagged-separator">
-
 {{$:/core/ui/UntaggedTemplate}}

core/ui/PageControls/savewiki.tid

@@ -1,6 +1,6 @@
 title: $:/core/ui/Buttons/save-wiki
 tags: $:/tags/PageControls
-caption: {{$:/core/images/save-button}} {{$:/language/Buttons/SaveWiki/Caption}}
+caption: {{$:/core/images/save-button-dynamic}} {{$:/language/Buttons/SaveWiki/Caption}}
 description: {{$:/language/Buttons/SaveWiki/Hint}}
 
 \whitespace trim
@@ -10,7 +10,7 @@ description: {{$:/language/Buttons/SaveWiki/Hint}}
 </$wikify>
 <span class="tc-dirty-indicator">
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/save-button}}
+{{$:/core/images/save-button-dynamic}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">

core/ui/PageTemplate.tid

@@ -1,6 +1,7 @@
 title: $:/core/ui/PageTemplate
 name: {{$:/language/PageTemplate/Name}}
 description: {{$:/language/PageTemplate/Description}}
+icon: $:/core/images/layout-button
 
 \whitespace trim
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]

core/ui/UntaggedTemplate.tid

@@ -3,10 +3,8 @@ title: $:/core/ui/UntaggedTemplate
 \define lingo-base() $:/language/SideBar/
 \whitespace trim
 <$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-untagged-label tc-tag-label">
-<<lingo Tags/Untagged/Caption>>
+	<<lingo Tags/Untagged/Caption>>
 </$button>
-<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below">
-<div class="tc-drop-down">
-<$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" template="$:/core/ui/ListItemTemplate"/>
-</div>
+<$reveal class="tc-drop-down" tag="div" state=<<qualify "$:/state/popup/tag">> type="popup" position="below">
+	<$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" template="$:/core/ui/ListItemTemplate"/>
 </$reveal>

core/wiki/config/OfficialPluginLibrary.tid

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

core/wiki/download-wiki-button.tid

@@ -4,5 +4,5 @@ title: $:/snippets/download-wiki-button
 \whitespace trim
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-download-file" $param="$:/core/save/all" filename="index.html"/>
-<<lingo Full/Caption>>&#32;{{$:/core/images/save-button}}
+<<lingo Full/Caption>>&#32;{{$:/core/images/save-button-dynamic}}
 </$button>

core/wiki/macros/keyboard-driven-input.tid

@@ -4,76 +4,85 @@ tags: $:/tags/Macro
 \define change-input-tab(stateTitle,tag,beforeafter,defaultState,actions)
 \whitespace trim
 <$set name="tabsList" filter="[all[shadows+tiddlers]tag<__tag__>!has[draft.of]]">
-<$let
-	currentState={{{ [<__stateTitle__>!is[missing]get[text]] ~[<__defaultState__>] }}}
-	firstTab={{{ [enlist<tabsList>nth[1]] }}}
-	lastTab={{{ [enlist<tabsList>last[]] }}}
-	nextTab={{{ [all[shadows+tiddlers]tag<__tag__>!has[draft.of]$beforeafter$<currentState>] ~[[$beforeafter$]removeprefix[after]suffix[]addprefix<firstTab>] ~[[$beforeafter$]removeprefix[before]suffix[]addprefix<lastTab>] }}}>
-<$action-setfield $tiddler=<<__stateTitle__>> text=<<nextTab>>/>
-$actions$
-</$let>
+	<$let
+		currentState={{{ [<__stateTitle__>!is[missing]get[text]] ~[<__defaultState__>] }}}
+		firstTab={{{ [enlist<tabsList>nth[1]] }}}
+		lastTab={{{ [enlist<tabsList>last[]] }}}
+		nextTab={{{ [all[shadows+tiddlers]tag<__tag__>!has[draft.of]$beforeafter$<currentState>] ~[[$beforeafter$]removeprefix[after]suffix[]addprefix<firstTab>] ~[[$beforeafter$]removeprefix[before]suffix[]addprefix<lastTab>] }}}
+	>
+		<$action-setfield $tiddler=<<__stateTitle__>> text=<<nextTab>>/>
+		$actions$
+	</$let>
 </$set>
 \end
 
 \define keyboard-input-actions()
 \whitespace trim
 <$list filter="[<__index__>match[]]">
-<$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>get<__field__>] }}}/>
+	<$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>get<__field__>] }}}/>
 </$list>
 <$list filter="[<__index__>!match[]]">
-<$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>getindex<__index__>] }}}/>
+	<$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>getindex<__index__>] }}}/>
 </$list>
 \end
 
 \define input-next-actions-inner()
 \whitespace trim
 <$list filter="[<nextItem>minlength[1]]" variable="ignore">
-<$action-setfield $tiddler=<<__selectionStateTitle__>> text=<<nextItem>>/>
-<$list filter="[<__index__>match[]]">
-<$action-setfield $tiddler=<<__tiddler__>> $field=<<__field__>> $value={{{ [<nextItem>] +[splitregexp[(?:.(?!-))+$]] }}}/>
-</$list>
-<$list filter="[<__index__>!match[]]">
-<$action-setfield $tiddler=<<__tiddler__>> $index=<<__index__>> $value={{{ [<nextItem>] +[splitregexp[(?:.(?!-))+$]] }}}/>
-</$list>
-<$action-setfield $tiddler=<<__refreshTitle__>> text="yes"/>
+	<$action-setfield $tiddler=<<__selectionStateTitle__>> text=<<nextItem>>/>
+	<$list filter="[<__index__>match[]]">
+		<$action-setfield $tiddler=<<__tiddler__>> $field=<<__field__>> $value={{{ [<nextItem>] +[splitregexp[(?:.(?!-))+$]] }}}/>
+	</$list>
+	<$list filter="[<__index__>!match[]]">
+		<$action-setfield $tiddler=<<__tiddler__>> $index=<<__index__>> $value={{{ [<nextItem>] +[splitregexp[(?:.(?!-))+$]] }}}/>
+	</$list>
+	<$action-setfield $tiddler=<<__refreshTitle__>> text="yes"/>
 </$list>
 \end
 
 \define input-next-actions(afterOrBefore:"after",reverse:"")
 \whitespace trim
-<$list filter="[<__storeTitle__>get[text]minlength<__filterMinLength__>] [<__filterMinLength__>match[0]] +[limit[1]]" variable="ignore">
-<$let
-	userInput={{{ [<__storeTitle__>get[text]] }}}
-	selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}
-	configTiddler={{{ [subfilter<__configTiddlerFilter__>] }}}
-	primaryListFilter={{{ [<configTiddler>get<__firstSearchFilterField__>] }}}
-	secondaryListFilter={{{ [<configTiddler>get<__secondSearchFilterField__>] }}}>
-<$set name="filteredList" filter="[subfilter<primaryListFilter>addsuffix[-primaryList]] =[subfilter<secondaryListFilter>addsuffix[-secondaryList]]">
-<$let
-	nextItem={{{ [enlist<filteredList>$afterOrBefore$<selectedItem>] ~[enlist<filteredList>$reverse$nth[1]] }}}
-	firstItem={{{ [enlist<filteredList>nth[1]] }}}
-	lastItem={{{ [enlist<filteredList>last[]] }}}>
-<$list filter="[<selectedItem>match<firstItem>!match<lastItem>]" variable="ignore">
-<$set name="nextItem" value={{{ [[$afterOrBefore$]match[before]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
-<<input-next-actions-inner>>
-</$set>
-</$list>
-<$list filter="[<selectedItem>match<lastItem>!match<firstItem>]" variable="ignore">
-<$set name="nextItem" value={{{ [[$afterOrBefore$]match[after]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
-<<input-next-actions-inner>>
-</$set>
-</$list>
-<$list filter="[<selectedItem>match<firstItem>match<lastItem>]" variable="ignore">
-<$set name="nextItem" value={{{ [<userInput>addsuffix[-userInput]] }}}>
-<<input-next-actions-inner>>
-</$set>
-</$list>
-<$list filter="[<selectedItem>!match<firstItem>!match<lastItem>]" variable="ignore">
-<<input-next-actions-inner>>
-</$list>
-</$let>
-</$set>
-</$let>
+<$list
+	filter="[<__storeTitle__>get[text]minlength<__filterMinLength__>] [<__filterMinLength__>match[0]] +[limit[1]]"
+	variable="ignore"
+>
+	<$let
+		userInput={{{ [<__storeTitle__>get[text]] }}}
+		selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}
+		configTiddler={{{ [subfilter<__configTiddlerFilter__>] }}}
+		primaryListFilter={{{ [<configTiddler>get<__firstSearchFilterField__>] }}}
+		secondaryListFilter={{{ [<configTiddler>get<__secondSearchFilterField__>] }}}
+	>
+		<$set
+			name="filteredList"
+			filter="[subfilter<primaryListFilter>addsuffix[-primaryList]] =[subfilter<secondaryListFilter>addsuffix[-secondaryList]]"
+		>
+			<$let
+				nextItem={{{ [enlist<filteredList>$afterOrBefore$<selectedItem>] ~[enlist<filteredList>$reverse$nth[1]] }}}
+				firstItem={{{ [enlist<filteredList>nth[1]] }}}
+				lastItem={{{ [enlist<filteredList>last[]] }}}
+			>
+				<$list filter="[<selectedItem>match<firstItem>!match<lastItem>]" variable="ignore">
+					<$set name="nextItem" value={{{ [[$afterOrBefore$]match[before]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
+						<<input-next-actions-inner>>
+					</$set>
+				</$list>
+				<$list filter="[<selectedItem>match<lastItem>!match<firstItem>]" variable="ignore">
+					<$set name="nextItem" value={{{ [[$afterOrBefore$]match[after]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
+						<<input-next-actions-inner>>
+					</$set>
+				</$list>
+				<$list filter="[<selectedItem>match<firstItem>match<lastItem>]" variable="ignore">
+					<$set name="nextItem" value={{{ [<userInput>addsuffix[-userInput]] }}}>
+						<<input-next-actions-inner>>
+					</$set>
+				</$list>
+				<$list filter="[<selectedItem>!match<firstItem>!match<lastItem>]" variable="ignore">
+					<<input-next-actions-inner>>
+				</$list>
+			</$let>
+		</$set>
+	</$let>
 </$list>
 \end
 
@@ -84,12 +93,14 @@ $actions$
 <$keyboard key="((input-up))" actions=<<input-next-actions "before" "reverse[]">>>
 <$keyboard key="((input-down))" actions=<<input-next-actions>>>
 <$keyboard key="((input-cancel))" actions=<<__inputCancelActions__>>>
-<$edit-text tiddler=<<__tiddler__>> field=<<__field__>> index=<<__index__>> 
-		inputActions=<<keyboard-input-actions>> tag=<<__tag__>> class=<<__class__>> 
-		placeholder=<<__placeholder__>> default=<<__default__>> focusPopup=<<__focusPopup__>> 
-		focus=<<__focus__>> type=<<__type__>> rows=<<__rows__>> minHeight=<<__minHeight__>> 
-		tabindex=<<__tabindex__>> size=<<__size__>> autoHeight=<<__autoHeight__>> 
-		refreshTitle=<<__refreshTitle__>> cancelPopups=<<__cancelPopups__>>/>
+	<$edit-text
+		tiddler=<<__tiddler__>> field=<<__field__>> index=<<__index__>>
+		inputActions=<<keyboard-input-actions>> tag=<<__tag__>> class=<<__class__>>
+		placeholder=<<__placeholder__>> default=<<__default__>> focusPopup=<<__focusPopup__>>
+		focus=<<__focus__>> type=<<__type__>> rows=<<__rows__>> minHeight=<<__minHeight__>>
+		tabindex=<<__tabindex__>> size=<<__size__>> autoHeight=<<__autoHeight__>>
+		refreshTitle=<<__refreshTitle__>> cancelPopups=<<__cancelPopups__>>
+	/>
 </$keyboard>
 </$keyboard>
 </$keyboard>

core/wiki/macros/list.tid

@@ -26,7 +26,7 @@ tags: $:/tags/Macro
 \whitespace trim
 <span class="tc-links-draggable-list">
 <$vars targetTiddler="""$tiddler$""" targetField="""$field$""">
-<$type$ class="$class$">
+<$genesis $type=<<__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"/>
@@ -51,7 +51,7 @@ tags: $:/tags/Macro
 <div style="height:0.5em;"/>
 </$droppable>
 </$tiddler>
-</$type$>
+</$genesis>
 </$vars>
 </span>
 \end
@@ -84,24 +84,24 @@ tags: $:/tags/Macro
 <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">
+<$genesis $type=<<__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$>
+<$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
+<$genesis $type=<<__elementTag__>>>
 <$transclude tiddler="""$itemTemplate$""">
 <$link to={{!!title}}>
 <$view field="title"/>
 </$link>
 </$transclude>
-</$elementTag$>
+</$genesis>
 </$droppable>
-</$elementTag$>
+</$genesis>
 </$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$>
+<$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
+<$genesis $type=<<__elementTag__>> style="height:0.5em;">
+</$genesis>
 </$droppable>
 </$tiddler>
 </$set>

core/wiki/macros/tag-picker.tid

@@ -10,10 +10,14 @@ second-search-filter: [tags[]is[system]search:title<userInput>sort[]]
 \define add-tag-actions(actions,tagField:"tags")
 \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>trim[]]"/>
-$actions$
-</$list>
+	<$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>trim[]]"/>
+		$actions$
+	</$list>
 </$set>
 <<delete-tag-state-tiddlers>>
 <$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
@@ -21,80 +25,153 @@ $actions$
 
 \define clear-tags-actions-inner()
 \whitespace trim
-<$list filter="[<storeTitle>has[text]] [<newTagNameTiddler>has[text]]" variable="ignore" emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>">
-<<delete-tag-state-tiddlers>>
+<$list
+	filter="[<storeTitle>has[text]] [<newTagNameTiddler>has[text]]"
+	variable="ignore"
+	emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>"
+>
+	<<delete-tag-state-tiddlers>>
 </$list>
 \end
 
 \define clear-tags-actions()
 \whitespace trim
 <$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-<$list filter="[<newTagNameTiddler>get[text]!match<userInput>]" emptyMessage="<<clear-tags-actions-inner>>">
-<$action-setfield $tiddler=<<newTagNameTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
-</$list>
+	<$list filter="[<newTagNameTiddler>get[text]!match<userInput>]" emptyMessage="<<clear-tags-actions-inner>>">
+		<$action-setfield $tiddler=<<newTagNameTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
+	</$list>
 </$set>
 \end
 
 \define tag-picker-inner(actions,tagField:"tags")
 \whitespace trim
-<$vars newTagNameInputTiddlerQualified=<<qualify "$:/temp/NewTagName/input">> newTagNameSelectionTiddlerQualified=<<qualify "$:/temp/NewTagName/selected-item">> fallbackTarget={{$(palette)$##tag-background}} colourA={{$(palette)$##foreground}} colourB={{$(palette)$##background}}>
-<$vars storeTitle={{{ [<newTagNameInputTiddler>!match[]] ~[<newTagNameInputTiddlerQualified>] }}} tagSelectionState={{{ [<newTagNameSelectionTiddler>!match[]] ~[<newTagNameSelectionTiddlerQualified>] }}}>
-<$vars refreshTitle=<<qualify "$:/temp/NewTagName/refresh">> nonSystemTagsFilter="[tags[]!is[system]search:title<userInput>sort[]]" systemTagsFilter="[tags[]is[system]search:title<userInput>sort[]]">
-<div class="tc-edit-add-tag">
-<div>
-<span class="tc-add-tag-name tc-small-gap-right">
-<$macrocall $name="keyboard-driven-input" tiddler=<<newTagNameTiddler>> storeTitle=<<storeTitle>> refreshTitle=<<refreshTitle>>
-		selectionStateTitle=<<tagSelectionState>> inputAcceptActions="<$macrocall $name='add-tag-actions' actions=<<__actions__>> tagField=<<__tagField__>>/>"
-		inputCancelActions=<<clear-tags-actions>> tag="input" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
-		focusPopup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-edit-texteditor tc-popup-handle" tabindex=<<tabIndex>> 
-		focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}} filterMinLength={{$:/config/Tags/MinLength}} 
-		cancelPopups=<<cancelPopups>> configTiddlerFilter="[[$:/core/macros/tag-picker]]"/>
-</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>trim[]]"/>
-$actions$
-<$set name="currentTiddlerCSSEscaped" value={{{ [<saveTiddler>escapecss[]] }}}>
-<<delete-tag-state-tiddlers>><$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>
-</$set>
-{{$:/language/EditTemplate/Tags/Add/Button}}
-</$button>
-</$set>
-</span>
-</div>
-<div class="tc-block-dropdown-wrapper">
-<$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">
-<div class="tc-block-dropdown tc-block-tags-dropdown">
-<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
-<$list filter=<<nonSystemTagsFilter>> variable="tag">
-<$list filter="[<tag>addsuffix[-primaryList]] -[<tagSelectionState>get[text]]" emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>">
-<$vars button-classes="tc-btn-invisible" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>
-</$list>
-</$list></$list>
-<hr>
-<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
-<$list filter=<<systemTagsFilter>> variable="tag">
-<$list filter="[<tag>addsuffix[-secondaryList]] -[<tagSelectionState>get[text]]" emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>">
-<$vars button-classes="tc-btn-invisible" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>
-</$list>
-</$list></$list>
-</$set>
-</div>
-</$reveal>
-</div>
-</div>
-</$vars>
-</$vars>
+<$vars
+	newTagNameInputTiddlerQualified=<<qualify "$:/temp/NewTagName/input">>
+	newTagNameSelectionTiddlerQualified=<<qualify "$:/temp/NewTagName/selected-item">>
+	fallbackTarget={{$(palette)$##tag-background}}
+	colourA={{$(palette)$##foreground}}
+	colourB={{$(palette)$##background}}
+>
+	<$vars
+		storeTitle={{{ [<newTagNameInputTiddler>!match[]] ~[<newTagNameInputTiddlerQualified>] }}}
+		tagSelectionState={{{ [<newTagNameSelectionTiddler>!match[]] ~[<newTagNameSelectionTiddlerQualified>] }}}
+	>
+		<$vars
+			refreshTitle=<<qualify "$:/temp/NewTagName/refresh">> 
+			nonSystemTagsFilter="[tags[]!is[system]search:title<userInput>sort[]]"
+			systemTagsFilter="[tags[]is[system]search:title<userInput>sort[]]"
+		>
+			<div class="tc-edit-add-tag">
+				<div>
+					<span class="tc-add-tag-name tc-small-gap-right">
+						<$macrocall
+							$name="keyboard-driven-input"
+							tiddler=<<newTagNameTiddler>>
+							storeTitle=<<storeTitle>>
+							refreshTitle=<<refreshTitle>>
+							selectionStateTitle=<<tagSelectionState>>
+							inputAcceptActions="<$macrocall $name='add-tag-actions' actions=<<__actions__>> tagField=<<__tagField__>>/>"
+							inputCancelActions=<<clear-tags-actions>>
+							tag="input"
+							placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
+							focusPopup=<<qualify "$:/state/popup/tags-auto-complete">>
+							class="tc-edit-texteditor tc-popup-handle"
+							tabindex=<<tabIndex>>
+							focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}}
+							filterMinLength={{$:/config/Tags/MinLength}}
+							cancelPopups=<<cancelPopups>>
+							configTiddlerFilter="[[$:/core/macros/tag-picker]]"
+						/>
+					</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>trim[]]"/>
+									$actions$
+								<$set name="currentTiddlerCSSEscaped" value={{{ [<saveTiddler>escapecss[]] }}}>
+									<<delete-tag-state-tiddlers>><$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>
+								</$set>
+								{{$:/language/EditTemplate/Tags/Add/Button}}
+							</$button>
+						</$set>
+					</span>
+				</div>
+				<div class="tc-block-dropdown-wrapper">
+					<$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">
+						<div class="tc-block-dropdown tc-block-tags-dropdown">
+							<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
+								<$list
+									filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]"
+									emptyMessage="<div class='tc-search-results'
+								>
+									{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
+									<$list filter=<<nonSystemTagsFilter>> variable="tag">
+										<$list
+											filter="[<tag>addsuffix[-primaryList]] -[<tagSelectionState>get[text]]" 
+											emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>"
+										>
+											<$vars button-classes="tc-btn-invisible"
+												actions=<<__actions__>> 
+												tagField=<<__tagField__>>
+												currentTiddler=<<tag>>
+											>
+												{{||$:/core/ui/TagPickerTagTemplate}}
+											</$vars>
+										</$list>
+									</$list>
+								</$list>
+								<hr>
+								<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>
+									{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
+									<$list filter=<<systemTagsFilter>> variable="tag">
+										<$list filter="[<tag>addsuffix[-secondaryList]] -[<tagSelectionState>get[text]]"
+											emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>"
+										>
+											<$vars button-classes="tc-btn-invisible"
+												actions=<<__actions__>>
+												tagField=<<__tagField__>>
+												currentTiddler=<<tag>>
+											>
+												{{||$:/core/ui/TagPickerTagTemplate}}
+											</$vars>
+										</$list>
+									</$list>
+								</$list>
+							</$set>
+						</div>
+					</$reveal>
+				</div>
+			</div>
+		</$vars>
+	</$vars>
 </$vars>
 \end
+
 \define tag-picker(actions,tagField:"tags")
 \whitespace trim
 <$vars saveTiddler=<<currentTiddler>> palette={{$:/palette}}>
-<$list filter="[<newTagNameTiddler>match[]]" emptyMessage="<$macrocall $name='tag-picker-inner' actions=<<__actions__>> tagField=<<__tagField__>>/>">
-<$set name="newTagNameTiddler" value=<<qualify "$:/temp/NewTagName">>>
-<$macrocall $name="tag-picker-inner" actions=<<__actions__>> tagField=<<__tagField__>>/>
-</$set>
-</$list>
+	<$list
+		filter="[<newTagNameTiddler>match[]]"
+		emptyMessage="<$macrocall $name='tag-picker-inner' actions=<<__actions__>> tagField=<<__tagField__>>/>"
+	>
+		<$set name="newTagNameTiddler" value=<<qualify "$:/temp/NewTagName">>>
+			<$macrocall $name="tag-picker-inner" actions=<<__actions__>> tagField=<<__tagField__>>/>
+		</$set>
+	</$list>
 </$vars>
 \end

core/wiki/macros/toc.tid

@@ -7,7 +7,7 @@ tags: $:/tags/Macro
 
 \define toc-caption()
 \whitespace trim
-<span class="tc-toc-caption tc-tiny-gap-left">
+<span class="tc-toc-caption">
 <$set name="tv-wikilinks" value="no">
   <$transclude field="caption">
     <$view field="title"/>
@@ -24,7 +24,7 @@ tags: $:/tags/Macro
       <$set name="excluded" filter="""[enlist<__exclude__>] [<__tag__>]""">
         <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
           <li class=<<toc-item-class>>>
-            <$list filter="[all[current]toc-link[no]]" emptyMessage="<$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}><$view field='caption'><$view field='title'/></$view></$link>">
+            <$list filter="[all[current]toc-link[no]]" emptyMessage="<$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}><<toc-caption>></$link>">
               <<toc-caption>>
             </$list>
             <$macrocall $name="toc-body" tag=<<item>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<excluded>> path=<<path>>/>

editions/de-DE/tiddlywiki.info

@@ -1,7 +1,9 @@
 {
 	"description": "Deutsche Basis Edition",
 	"plugins": [
-		"tiddlywiki/browser-sniff"],
+		"tiddlywiki/browser-sniff",
+		"tiddlywiki/internals"
+	],
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
@@ -9,8 +11,7 @@
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
 		"tiddlywiki/tight",
-		"tiddlywiki/readonly",
-		"tiddlywiki/internals"
+		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"de-AT",

editions/empty/tiddlywiki.info

@@ -8,19 +8,19 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+			"--render","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/core/save/all","empty.html","text/plain",
-			"--rendertiddler","$:/core/save/all","empty.hta","text/plain"],
+			"--render","$:/core/save/all","empty.html","text/plain",
+			"--render","$:/core/save/all","empty.hta","text/plain"],
 		"externalimages": [
 			"--savetiddlers","[is[image]]","images",
 			"--setfield","[is[image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
 			"--setfield","[is[image]]","text","","text/plain",
-			"--rendertiddler","$:/core/save/all","externalimages.html","text/plain"],
+			"--render","$:/core/save/all","externalimages.html","text/plain"],
 		"static": [
-			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
-			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
-			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+			"--render","$:/core/templates/static.template.html","static.html","text/plain",
+			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",			
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
 }

editions/es-ES/tiddlywiki.info

@@ -1,6 +1,7 @@
 {
 	"description": "Spanish (Spain) edition",
 	"plugins": [
+		"tiddlywiki/internals"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
@@ -9,8 +10,7 @@
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
 		"tiddlywiki/tight",
-		"tiddlywiki/readonly",
-		"tiddlywiki/internals"
+		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"es-ES"

editions/fr-FR/tiddlywiki.info

@@ -1,6 +1,7 @@
 {
 	"description": "French (France) edition",
 	"plugins": [
+		"tiddlywiki/internals"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
@@ -9,8 +10,7 @@
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
 		"tiddlywiki/tight",
-		"tiddlywiki/readonly",
-		"tiddlywiki/internals"
+		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"fr-FR"

editions/highlightdemo/tiddlywiki.info

@@ -11,11 +11,11 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","highlightdemo.html","text/plain"],
+			"--render","$:/core/save/all","highlightdemo.html","text/plain"],
 		"static": [
-			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
-			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
-			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+			"--render","$:/core/templates/static.template.html","static.html","text/plain",
+			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
 }

editions/introduction/tiddlywiki.info

@@ -49,9 +49,6 @@
 	],
 	"build": {
 		"index": [
-			"--savetiddlers","[tag[external-image]]","images",
-			"--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
-			"--setfield","[tag[external-image]]","text","","text/plain",
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico",

editions/ja-JP/tiddlywiki.info

@@ -1,6 +1,7 @@
 {
 	"description": "Japanese (Japan) edition",
 	"plugins": [
+		"tiddlywiki/internals"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
@@ -9,8 +10,7 @@
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
 		"tiddlywiki/tight",
-		"tiddlywiki/readonly",
-		"tiddlywiki/internals"
+		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"ja-JP"

editions/katexdemo/tiddlywiki.info

@@ -11,11 +11,11 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","katexdemo.html","text/plain"],
+			"--render","$:/core/save/all","katexdemo.html","text/plain"],
 		"static": [
-			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
-			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
-			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+			"--render","$:/core/templates/static.template.html","static.html","text/plain",
+			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
 }

editions/markdowndemo/tiddlers/DefaultTiddlers.tid

@@ -1,4 +1,7 @@
 title: $:/DefaultTiddlers
 
 [[HelloThere]]
-[[MarkdownExample]]
+$:/plugins/tiddlywiki/markdown
+[[MarkdownTutorial]]
+[[QuickDemo]]
+[[QuickDemo Source]]

editions/markdowndemo/tiddlers/HelloThere.tid

@@ -1,11 +1,9 @@
 title: HelloThere
 
-This is a demo of TiddlyWiki5 incorporating a plugin for parsing tiddlers written in the Markdown language. The plugin uses the [[Remarkable|https://github.com/jonschlinkert/remarkable]] Markdown parser internally. The MarkdownExample tiddler below is written in Markdown.
+This is a demo of TiddlyWiki5 incorporating a plugin for parsing tiddlers written in the Markdown language. The plugin uses the [[markdown-it|https://github.com/markdown-it/markdown-it]] Markdown parser internally. The MarkdownTutorial tiddler below is written in Markdown.
 
 ! Installation
 
 To add the plugin to your own TiddlyWiki5, just drag this link to the browser window:
 
-[[$:/plugins/tiddlywiki/markdown]]
-
-{{$:/plugins/tiddlywiki/markdown/usage}}
+[[$:/plugins/tiddlywiki/markdown]]

editions/markdowndemo/tiddlers/MarkdownTutorial.tid

@@ -1,4 +1,4 @@
-title: MarkdownExample
+title: MarkdownTutorial
 type: text/x-markdown
 
 Markdown: Basics
@@ -8,13 +8,13 @@ Getting the Gist of Markdown's Formatting Syntax
 ------------------------------------------------
 
 This page offers a brief overview of what it's like to use Markdown.
-The [syntax page] [s] provides complete, detailed documentation for
+The [syntax page][s] provides complete, detailed documentation for
 every feature, but Markdown should be very easy to pick up simply by
 looking at a few examples of it in action. The examples on this page
 are written in a before/after style, showing example syntax and the
 HTML output produced by Markdown.
 
-It's also helpful to simply try Markdown out; the [Dingus] [d] is a
+It's also helpful to simply try Markdown out; the [Dingus][d] is a
 web application that allows you type your own Markdown-formatted text
 and translate it to XHTML.
 

editions/markdowndemo/tiddlers/QuickDemo.tid

@@ -0,0 +1,220 @@
+title: QuickDemo
+type: text/markdown
+
+<style>
+.tc-image-loaded {
+  width: 35%;
+}
+</style>
+# h1 Heading
+## h2 Heading
+### h3 Heading
+#### h4 Heading
+##### h5 Heading
+###### h6 Heading
+
+
+## Horizontal Rules
+
+____
+
+---
+
+****
+
+
+## Emphasis
+
+
+**This is bold text**
+
+__This is bold text__
+
+*This is italic text*
+
+_This is italic text_
+
+~~Strikethrough~~
+
+
+## Blockquotes
+
+
+> Blockquotes can also be nested...
+>> ...by using additional greater-than signs right next to each other...
+> > > ...or with spaces between arrows.
+
+
+## Unordered List
+
+
++ Create a list by starting a line with `+`, `-`, or `*`
++ Sub-lists are made by indenting 2 spaces:
+  - Marker character change forces new list start:
+    * Ac tristique libero volutpat at
+    + Facilisis in pretium nisl aliquet
+    - Nulla volutpat aliquam velit
++ Very easy!
+
+
+## Ordered List
+
+
+1. Lorem ipsum dolor sit amet
+2. Consectetur adipiscing elit
+3. Integer molestie lorem at massa
+
+
+1. You can use sequential numbers...
+1. ...or keep all the numbers as `1.`
+
+Start numbering with offset:
+
+57. foo
+1. bar
+
+
+## Code
+
+
+Inline `code`
+
+Indented code
+
+    // Some comments
+    line 1 of code
+    line 2 of code
+    line 3 of code
+
+Block code "fences"
+
+```
+Sample text here...
+```
+
+
+## Syntax highlighting
+
+``` js
+var foo = function (bar) {
+  return bar++;
+};
+
+console.log(foo(5));
+```
+
+
+## ~KaTeX
+
+
+Equation $c = \pm\sqrt{a^2 + b^2}$ is typeset in inline mode.
+
+Display style: $$c = \pm\sqrt{a^2 + b^2}$$
+
+
+## Tables
+
+
+| Attribute | Description |
+| --------- | ----------- |
+| multiple  | select multiple files to download |
+| param     | parameter to be passed with the message |
+| tooltip   | optional tooltip text |
+
+Aligning columns:
+
+| Column A | Column B | Column C |
+| :----    | :----:   | ----:    |
+| is   | is     | is    |
+| left | nicely | right |
+| aligned | centered | aligned |
+
+
+## Links
+
+
+[link text](http://google.com)
+
+[link with title](http://nodeca.github.io/pica/demo/ "title text!")
+
+link to tiddler [QuickDemo Source](#QuickDemo%20Source)
+
+URL can contain spaces if enclosed in brackets `<>`: [QuickDemo Source](<#QuickDemo Source>)
+
+
+## Images
+
+
+![Minion](https://octodex.github.com/images/minion.png)
+![Stormtroopocat](https://octodex.github.com/images/stormtroopocat.jpg "The Stormtroopocat")
+
+Like links, images also have a reference style syntax
+
+![Alt text][id]
+
+with a link reference defined later in the document.
+
+[id]: https://octodex.github.com/images/dojocat.jpg  "The Dojocat"
+
+
+## Subscript & Superscript
+
+
+- 19^th^
+- H~2~O
+
+
+## \<ins\>
+
+
+++Inserted text++
+
+
+## \<mark\>
+
+
+==Marked text==
+
+
+## Footnotes
+
+
+Footnote 1 link[^first].
+
+Footnote 2 link[^second].
+
+Inline footnote^[Text of inline footnote] definition.
+
+Duplicated footnote reference[^second].
+
+[^first]: Footnote **can have markup**
+
+    and multiple paragraphs.
+
+[^second]: Footnote text.
+
+
+## Definition Lists
+
+
+Term 1
+
+: Definition 1
+with lazy continuation.
+
+Term 2 with *inline markup*
+
+: Definition 2
+
+        { some code, part of Definition 2 }
+
+    Third paragraph of definition 2.
+
+_Compact style:_
+
+Term 1
+  ~ Definition 1
+
+Term 2
+  ~ Definition 2a
+  ~ Definition 2b

editions/markdowndemo/tiddlers/QuickDemoSource.tid

@@ -0,0 +1,5 @@
+title: QuickDemo Source
+
+<$let tiddler="QuickDemo">
+<$codeblock code={{{ [<tiddler>get[text]] }}} language={{{ [<tiddler>get[type]else[text/vnd.tiddlywiki]] }}}/>
+</$let>

editions/markdowndemo/tiddlywiki.info

@@ -1,7 +1,9 @@
 {
 	"description": "Demo of the Markdown plugin",
 	"plugins": [
-		"tiddlywiki/markdown"
+		"tiddlywiki/markdown",
+		"tiddlywiki/highlight",
+		"tiddlywiki/katex"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",

editions/prerelease/tiddlers/Release 5.2.6.tid

@@ -1,107 +1,97 @@
 caption: 5.2.6
-created: 20221219172444961
-modified: 20221219172444961
+created: 20230119221001957
+modified: 20230119221001957
 tags: ReleaseNotes
 title: Release 5.2.6
 type: text/vnd.tiddlywiki
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.5...master]]//
-! Major Improvements
-
-New [ext[Twitter Archivist|./editions/twitter-archivist]] plugin to import the tweets and associated media from a Twitter Archive as individual tiddlers.
-
-<<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6961">> new GenesisWidget that allows the dynamic construction of another widget, where the name and attributes of the new widget can be dynamically determined, without needing to be known in advance
-
-<<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6936">> (and <<.link-badge-here "https://github.com/Jermolene/TiddlyWiki5/pull/7105">>) new operators for reading and formatting JSON data: [[jsonget Operator]], [[jsonindexes Operator]], [[jsontype Operator]], [[jsonextract Operator]] and [[format Operator]]
 
 ! Translation Improvements
 
 Improvements to the following translations:
 
 * Chinese
-* French
-* German
-* Polish
-* Spanish
-* Japanese
+* Italian
 
-Improvements to the translation features of TiddlyWiki itself:
+! Plugin Improvements
+
+* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/6528">> the [[Markdown Plugin]] to use the newer and better maintained [[markdown-it|https://github.com/markdown-it/markdown-it]] library. The previous Markdown plugin remains available as "markdown-legacy"
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7176">> [[Innerwiki Plugin]] to allow the `<$data>` widget to override existing tiddler fields
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7207">>, <<.link-badge-here "https://github.com/Jermolene/TiddlyWiki5/commit/c39ef398bffae12c0ed7324d9b6d9d29f0f2f9ff">> and <<.link-badge-here "https://github.com/Jermolene/TiddlyWiki5/commit/8f7441f296351a4dd0852c3c782f8874d398e052">> problem preventing [[Share Plugin]] from working properly
 
-* <<.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
 
 ! 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
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/d825f1c875f5e46158c9c41c8c66471138c162d1">> edit preview to use the [[View Template Body Cascade]]
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/36896c3db8c9678c0385a561996248a6f00a45ff">> opening a tiddler in a new window to use the [[View Template Body Cascade]]
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6970">> detection of infinite recursion errors in widgets and filters
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/6877">> default styles for [[styled runs|Styles and Classes in WikiText]]
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6881">> upgrade wizard to make the version number more prominent
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7042">> parsing of tiddlers containing CSV data for greater compatibility
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7076">> new page control button to summon the layout switcher
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7084">> folded tiddlers to ensure that the unfold button is always visible
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7072">> handling of [[Modals]] to optionally allow them to be dismissed by clicking on the background
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7217">> consistency of tiddler deletion by allowing missing tiddlers to be 'deleted', which just results in them being closed
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/34643a42790777f1b235f57b5093bb29bd0b3a14">> layout switcher to include an optional icon for each layout
+* <<.link-badge-removed "https://github.com/Jermolene/TiddlyWiki5/commit/c0615e20ecf7d5d5e66d8a2acd28b80e8d59688d">> [[improvements to table layout|https://github.com/Jermolene/TiddlyWiki5/pull/7010]] from v5.2.5 that have proved to not be backwards compatible
 
 ! 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'"
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7081">> ''focus'' attribute to SelectWidget
-* <<.link-badge-removed "https://github.com/Jermolene/TiddlyWiki5/commit/1df4c29d73073788ba3859668112e8bb46171a6c">> restriction of the LetWidget being unable to create variables whose names begin with a dollar sign
+* 
 
 ! Filter improvements
 
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/6303">> issue with availability of variables within filter runs
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7065">> issue with removing multiple items from a linked list during filter processing
+* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7121">> [[encodeuricomponent Operator]] to encode characters such as `*` that are illegal in Windows filenames
 
 ! Hackability Improvements
 
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7004">> support for nested [[macro definitions|Macro Definitions in WikiText]]
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6976">> support for [[SystemTag: $:/tags/ClassFilters/TiddlerTemplate]] and [[SystemTag: $:/tags/ClassFilters/PageTemplate]] to assign dynamic CSS classes to both tiddler frames and the page template
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/c5d3d4c26e8fe27f272dda004aec27d6b66c4f60">> safe mode to disable wiki store indexers
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/166a1565843878083fb1eba47c73b8e67b78400d">> safe mode to prevent globally disabling parser rules
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/6735">> keyboard shortcut handling to allow to global shortcuts to override all other shortcuts
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/commit/965bd090a905f5756e79124b698c894f7f72ad5b">> [[list-links Macro]] to allow the rendered field to be overriden
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6913">> [[Table-of-Contents Macros]] to allow the default icons to be overridden
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6939">> ''data-tags-*'' and ''data-tiddler-title'' attributes to the edit preview area
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/5947">> [[timeline Macro]] to override the link template
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7043">> support for Unix epoch timestamps in [[date format strings|DateFormat]]
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7064">> the "big green download button" to use the defined palette colour
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7063">> new hidden setting [[to use horizontal tabs for the "more" sidebar tab|Hidden Setting: More Tabs Horizontal]]
-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/commit/bef11fe6a25fb849dee40c4aa4337d6a30daf0b4">> the [[external JavaScript templates|Using the external JavaScript template]] to allow the URL of the external script file to be configured
+* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7185">> the [[pragma|Pragma]] syntax to allow them to be indented with whitespace
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7118">> readability of [[tag-picker Macro]] and [[keyboard-driven-input Macro]]
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7129">> reliability of [[list-links-draggable Macro]] and [[list-tagged-draggable Macro]] by using the new GenesisWidget instead of textual substitution
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7210">> [[external JavaScript core support|Using the external JavaScript template]] to make it possible to save an external JS wiki as a standard single file wiki
 
 ! Bug Fixes
 
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7099">> truncated search results on small screens
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7010">> table contents overflow on small screens
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/fb34df84ed41882c1c2a6ff54f0e908b43ef95a3">> "new image" keyboard shortcut not to assign journal tags
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/6987">> SelectWidget class to update if it uses a filter
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7017">> issue with wikification within the advanced search filter dropdown
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7057">> the table in $:/Import to avoid creating hidden empty rows
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7008">> advanced search keyboard shortcut not navigating correctly
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7083">> erroneous display of drafts within the advanced search filter dropdown
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7092">> backwards compatibility of new field editor cascade introduced in v5.2.3
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/6622">> bug with the DropzoneWidget that prevented all the available formats being pasted
+* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/7102">> PDF rendering to use an `<iframe>` instead of the older `<embed>`
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/8ef6d78beffb6496fe5daa2c81a529a79046ba3c">> issue with `.tid` files with fieldnames containing hash characters by saving such tiddlers in `.json` format
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7121">> (and <<.link-badge-here "https://github.com/Jermolene/TiddlyWiki5/pull/7219">>) overriding `toc-caption` macro for [[Table-of-Contents Macros]]
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7212">> rendering of $:/core/ui/MoreSideBar/Tags when viewed within the story river
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7156">> undefined variable crash in [[reduce Operator]], [[filter Operator]] and [[sortsub Operator]]
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7153">> GenesisWidget not to create anything if the `$type` attribute is blank or missing
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7160">> crash using [[jsonget Operator]] with "fixed" as key name
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/0b39e47ce88c7620b7a66c1553a71efaff06edb9">> importing of MP3 files to match current browser implementations
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7122">> crash when attempting to create an element with a blank tag name
 
 ! Node.js Improvements
 
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7073">> new CommandsCommand to enable command tokens to be dynamically generated from a filter
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6947">> console logging to avoid spaces and `<empty string>` message
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7014">> problem  with lazy loading deleting tiddler bodies under certain circumstances
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/344110e2890caf711ab8f3c4f4deaa7d86771231">> handling of ".mp4" file extension so that it defaults to video not audio
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6588">> test server to the plugin library edition
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7049">> [[Hidden Setting: Sync Logging]] to control logging of sync-related messages
-* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/6944">> Jasmine plugin to require the explicit use of the `--test` command in order to cause the tests to be run
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7169">> integration between the [[BrowserStorage Plugin]] and the client-server configuration to allow changes to be made while offline and then later resynchronised with the server
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7130">> duplicate fields in internal templates used in client-server configuration
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7138">> lazy loading not triggering a sync from the server
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/bf8e1ca5b0587787bf80692b0213bb7b038c7868">> crash on creating a new tiddler if anonymous users manage to create syncable tiddlers in a read only wiki
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/95e61688397ff1bc9be04193bc4ce2e3c8c48dce">> handling of logout in the client-server configuration to avoid 404 errors
 
 ! Performance Improvements
 
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/53d229592df76c6dd607e40be5bea4d5e063c48e">> performance of `wiki.getTiddler()`
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/81ac9874846b3ead275f67010fcfdb49f3d2f43c">> performance of variable prototype chain handling
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6056">> performance of list handling during filter processing
+* 
 
 ! Acknowledgements
 
 [[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
 
 <<.contributors """
+AnthonyMuscio
+BramChen
+btheado
+cdruan
+CrossEye
+cs8425
+fkmiec
+flibbles
+GameDungeon
+jeffrey4l
+joebordes
+kookma
+m42e
+Marxsal
+newmedicine
+pippep
+pmario
+saqimtiaz
+Telumire
+twMat
+wincentbalin
+yaisog
 """>>

editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/prerelease/library/v5.2.5/index.html
+url: https://tiddlywiki.com/prerelease/library/v5.2.6/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/server-external-js/tiddlywiki.info

@@ -13,13 +13,13 @@
 		"listen": [
 			"--listen","root-tiddler=$:/core/save/all-external-js","use-browser-cache=yes"],
 		"index": [
-			"--rendertiddler","$:/core/save/offline-external-js","index.html","text/plain",
+			"--render","$:/core/save/offline-external-js","index.html","text/plain",
 			"--render","$:/core/templates/tiddlywiki5.js","[[tiddlywikicore-]addsuffix<version>addsuffix[.js]]","text/plain"],
 		"static": [
-			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
-			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
-			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"],
+			"--render","$:/core/templates/static.template.html","static.html","text/plain",
+			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",			
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"],
 		"tiddlywikicore": [
 			"--render","$:/core/templates/tiddlywiki5.js","[[tiddlywikicore-]addsuffix<version>addsuffix[.js]]","text/plain"]
 	}

editions/server/tiddlywiki.info

@@ -11,11 +11,11 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/plugins/tiddlywiki/tiddlyweb/save/offline","index.html","text/plain"],
+			"--render","$:/plugins/tiddlywiki/tiddlyweb/save/offline","index.html","text/plain"],
 		"static": [
-			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
-			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
-			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+			"--render","$:/core/templates/static.template.html","static.html","text/plain",
+			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
 }

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

@@ -0,0 +1,14 @@
+title: Genesis/EmptyType
+description: Using an empty type attribute with the genesis widget
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+<$genesis>Mouse</$genesis>
+
+<$genesis $type="">Mouse</$genesis>
++
+title: ExpectedResult
+
+<p>Mouse</p><p>Mouse</p>

editions/test/tiddlers/tests/data/macros/NestedMacros-indented.tid

@@ -0,0 +1,36 @@
+title: Macros/NestedMacros-indented
+description: Nested Macros-indented
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+
+\define outer()
+	\whitespace trim
+
+	\define middle()
+		\whitespace trim
+
+		\define inner()
+			\whitespace trim
+
+			Jaguar
+
+		\end inner
+
+		<<inner>>
+
+	\end middle
+
+	<<middle>>
+
+\end outer
+
+<<outer>>
+
++
+title: ExpectedResult
+
+<p>Jaguar</p>

editions/test/tiddlers/tests/data/macros/NestedMacros-indented2.tid

@@ -0,0 +1,36 @@
+title: Macros/NestedMacros-indented2
+description: Nested Macros-indented with spaces
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+
+\define outer()
+    \whitespace trim
+
+    \define middle()
+        \whitespace trim
+
+        \define inner()
+            \whitespace trim
+
+            Jaguar
+
+        \end inner
+
+        <<inner>>
+
+    \end middle
+
+    <<middle>>
+
+\end outer
+
+<<outer>>
+
++
+title: ExpectedResult
+
+<p>Jaguar</p>

editions/test/tiddlers/tests/data/pragmas/Parsermode-indented.tid

@@ -0,0 +1,36 @@
+title: Pragmas/Parsermode-indented
+description: parsermode pragma
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+{{AlwaysInline}}
+
+{{AlwaysBlock}}
+
+{{AlwaysInline}}{{AlwaysBlock}}
+
++
+title: AlwaysInline
+
+	\parsermode inline
+! Not Heading
+
+Text with ''bold''
++
+title: AlwaysBlock
+
+    \parsermode block
+! Heading
+
+Text with ''bold''
++
+title: ExpectedResult
+
+! Not Heading
+
+Text with <strong>bold</strong><h1 class="">Heading</h1><p>Text with <strong>bold</strong></p><p>! Not Heading
+
+Text with <strong>bold</strong><h1 class="">Heading</h1><p>Text with <strong>bold</strong></p>
+</p>

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

@@ -983,6 +983,9 @@ Tests the filtering mechanism.
 			rootWidget.setVariable("sort2","[get[text]else[]length[]]");
 			rootWidget.setVariable("sort3","[{!!value}divide{!!cost}]");
 			rootWidget.setVariable("sort4","[{!!title}]");
+			rootWidget.setVariable("undefined-variable","[<doesnotexist>]");
+			rootWidget.setVariable("echo","$text$",[{name:"text"}],true);
+			rootWidget.setVariable("sort4-macro-param","[subfilter<echo '[{!!title}]'>]");
 			expect(wiki.filterTiddlers("[sortsub:number<sort1>]",anchorWidget).join(",")).toBe("one,hasList,has filter,TiddlerOne,$:/TiddlerTwo,Tiddler Three,$:/ShadowPlugin,a fourth tiddler,filter regexp test");
 			expect(wiki.filterTiddlers("[!sortsub:number<sort1>]",anchorWidget).join(",")).toBe("filter regexp test,a fourth tiddler,$:/ShadowPlugin,$:/TiddlerTwo,Tiddler Three,has filter,TiddlerOne,hasList,one");
 			expect(wiki.filterTiddlers("[sortsub:string<sort1>]",anchorWidget).join(",")).toBe("has filter,TiddlerOne,$:/TiddlerTwo,Tiddler Three,$:/ShadowPlugin,a fourth tiddler,filter regexp test,one,hasList");
@@ -993,6 +996,9 @@ Tests the filtering mechanism.
 			expect(wiki.filterTiddlers("[!sortsub:string<sort2>]",anchorWidget).join(",")).toBe("filter regexp test,$:/TiddlerTwo,Tiddler Three,a fourth tiddler,$:/ShadowPlugin,has filter,hasList,TiddlerOne,one");
 			expect(wiki.filterTiddlers("[[TiddlerOne]] [[$:/TiddlerTwo]] [[Tiddler Three]] [[a fourth tiddler]] +[!sortsub:number<sort3>]",anchorWidget).join(",")).toBe("$:/TiddlerTwo,Tiddler Three,TiddlerOne,a fourth tiddler");
 			expect(wiki.filterTiddlers("a1 a10 a2 a3 b10 b3 b1 c9 c11 c1 +[sortsub:alphanumeric<sort4>]",anchorWidget).join(",")).toBe("a1,a2,a3,a10,b1,b3,b10,c1,c9,c11");
+			// #7155. The order of the output is the same as the input when an undefined variable is used in the subfitler
+			expect(wiki.filterTiddlers("a2 a10 a1 +[sortsub:alphanumeric<undefined-variable>]",anchorWidget).join(",")).toBe("a2,a10,a1");
+			expect(wiki.filterTiddlers("a1 a10 a2 a3 b10 b3 b1 c9 c11 c1 +[sortsub:alphanumeric<sort4-macro-param>]",anchorWidget).join(",")).toBe("a1,a2,a3,a10,b1,b3,b10,c1,c9,c11");
 		});
 		
 		it("should handle the toggle operator", function() {
@@ -1101,6 +1107,10 @@ Tests the filtering mechanism.
 			{ name: '', params: [] }
 		  );
 		});
+		
+		it("should handle the encodeuricomponent and decodeuricomponent operators", function() {
+			expect(wiki.filterTiddlers("[[<>:\"/\\|?*]encodeuricomponent[]]").join(",")).toBe("%3C%3E%3A%22%2F%5C%7C%3F%2A");
+		});
 	
 	}
 	

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

@@ -41,7 +41,9 @@ describe("json filter tests", function() {
 		expect(wiki.filterTiddlers("[{Second}jsonget[]]")).toEqual(["une","deux","trois","quatre","cinq"]);
 		expect(wiki.filterTiddlers("[{First}jsonget[]]")).toEqual(["one","","1.618","four","five","six","true","false","null"]);
 		expect(wiki.filterTiddlers("[{First}jsonget[a]]")).toEqual(["one"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[a],[fixed]]")).toEqual([]);
 		expect(wiki.filterTiddlers("[{First}jsonget[b]]")).toEqual([""]);
+		expect(wiki.filterTiddlers("[{First}jsonget[c]]")).toEqual(["1.618"]);
 		expect(wiki.filterTiddlers("[{First}jsonget[missing-property]]")).toEqual([]);
 		expect(wiki.filterTiddlers("[{First}jsonget[d]]")).toEqual(["four","five","six","true","false","null"]);
 		expect(wiki.filterTiddlers("[{First}jsonget[d],[e]]")).toEqual(["four"]);

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

@@ -343,6 +343,9 @@ describe("'reduce' and 'intersection' filter prefix tests", function() {
 		rootWidget.setVariable("add-price","[get[price]multiply{!!quantity}add<accumulator>]");
 		rootWidget.setVariable("num-items","[get[quantity]add<accumulator>]");
 		rootWidget.setVariable("join-with-commas","[<index>compare:number:gt[0]then<accumulator>addsuffix[, ]addsuffix<currentTiddler>else<currentTiddler>]");
+		rootWidget.setVariable("undefined-variable","[<doesnotexist>]");
+		rootWidget.setVariable("echo","$text$",[{name:"text"}],true);
+		rootWidget.setVariable("num-items-macro-param","[subfilter<echo '[get[quantity]]'>add<accumulator>]");
 
 		expect(wiki.filterTiddlers("[tag[shopping]reduce<num-items>]",anchorWidget).join(",")).toBe("22");
 		expect(wiki.filterTiddlers("[tag[shopping]reduce<add-price>]",anchorWidget).join(",")).toBe("27.75");
@@ -351,6 +354,9 @@ describe("'reduce' and 'intersection' filter prefix tests", function() {
 		expect(wiki.filterTiddlers("[tag[non-existent]reduce<add-price>,[0]]",anchorWidget).join(",")).not.toBe("0");
 		expect(wiki.filterTiddlers("[tag[non-existent]reduce<add-price>,[0]]",anchorWidget).length).toBe(0);
 		expect(wiki.filterTiddlers("[tag[non-existent]reduce<add-price>else[0]]",anchorWidget).join(",")).toBe("0");
+		// #7155
+		expect(wiki.filterTiddlers("a +[reduce<undefined-variable>]",anchorWidget).join(",")).toBe("");
+		expect(wiki.filterTiddlers("[tag[shopping]reduce<num-items-macro-param>]",anchorWidget).join(",")).toBe("22");
 	});
 
 	it("should handle the average operator", function() {
@@ -392,10 +398,16 @@ describe("'reduce' and 'intersection' filter prefix tests", function() {
 		rootWidget.setVariable("larger-than-18","[get[text]length[]compare:integer:gteq[18]]");
 		rootWidget.setVariable("nr","18");
 		rootWidget.setVariable("larger-than-18-with-var","[get[text]length[]compare:integer:gteq<nr>]");
+		rootWidget.setVariable("undefined-variable","[<doesnotexist>]");
+		rootWidget.setVariable("echo","$text$",[{name:"text"}],true);
+		rootWidget.setVariable("larger-than-18-macro-param","[subfilter<echo '[get[text]length[]compare:integer:gteq[18]]'>]");
 		expect(wiki.filterTiddlers("[tag[textexample]] :filter[get[text]length[]compare:integer:gteq[18]]",anchorWidget).join(",")).toBe("Cheesecake,Chocolate Cake,Red wine");
 		expect(wiki.filterTiddlers("[tag[textexample]]",anchorWidget).join(",")).toBe("Cheesecake,Chocolate Cake,Red wine,Sparkling water");
 		expect(wiki.filterTiddlers("[tag[textexample]filter<larger-than-18>]",anchorWidget).join(",")).toBe("Cheesecake,Chocolate Cake,Red wine");
 		expect(wiki.filterTiddlers("[tag[textexample]filter<larger-than-18-with-var>]",anchorWidget).join(",")).toBe("Cheesecake,Chocolate Cake,Red wine");
+		// #7155
+		expect(wiki.filterTiddlers("a +[filter<undefined-variable>]",anchorWidget).join(",")).toBe("a");
+		expect(wiki.filterTiddlers("[tag[textexample]filter<larger-than-18-macro-param>]",anchorWidget).join(",")).toBe("Cheesecake,Chocolate Cake,Red wine");
 	});
 
 	it("should handle the :sort prefix", function() {

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

@@ -43,7 +43,7 @@ describe("WikiText tests", function() {
 		expect(wiki.renderTiddler("text/html","TiddlerThree")).toBe("<p>The speed of sound</p><p>The light of speed</p>");
 	});
 	it("should support attributes specified as macro invocations", function() {
-		expect(wiki.renderTiddler("text/html","TiddlerFour")).toBe("<p><a class=\"tc-tiddlylink tc-tiddlylink-missing\" href=\"#This%20is%20my%20''amazingly''%20groovy%20macro!\">This is a link</a></p>");
+		expect(wiki.renderTiddler("text/html","TiddlerFour")).toBe("<p><a class=\"tc-tiddlylink tc-tiddlylink-missing\" href=\"#This%20is%20my%20%27%27amazingly%27%27%20groovy%20macro%21\">This is a link</a></p>");
 	});
 	it("should identify wikiwords to automatically link", function() {
 		expect(wiki.renderText("text/html","text/vnd-tiddlywiki","No wikilinks here").indexOf("<a") !== -1).toBe(false);

editions/tw.org/tiddlywiki.info

@@ -15,14 +15,14 @@
 			"--savetiddlers","[tag[external-image]]","images",
 			"--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
 			"--setfield","[tag[external-image]]","text","","text/plain",
-			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+			"--render","$:/core/save/all","index.html","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico"],
 		"static": [
-			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
-			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
-			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+			"--render","$:/core/templates/static.template.html","static.html","text/plain",
+			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",				
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	},
 	"config": {
 		"retain-original-tiddler-path": true

editions/tw5.com-docs/tiddlywiki.info

@@ -10,6 +10,6 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","index.html","text/plain"]
+			"--render","$:/core/save/all","index.html","text/plain"]
 	}
 }

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

@@ -7,6 +7,8 @@ type: text/vnd.tiddlywiki
 A <<.def pragma>> is a special component of WikiText that provides control over the way the remaining text is parsed.
 
 Pragmas occupy lines that start with `\`. They can only appear at the start of the text, but blank lines are allowed between them. If a pragma line appears in the main body of the text, it is treated as if it was ordinary text.
+<<.from-version "5.2.6">> Pragmas can have preceding optional whitespace characters.
+
 
 The following pragmas are available:
 

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

@@ -1,27 +0,0 @@
-title: TWPub
-tags: Federatial
-
-! Introduction
-
-The TWPub format slices publications into independent chunks with metadata. These chunks are then packed into a special type of TiddlyWiki plugin for ease of distribution. The benefit of the chunking is to be able to reference and remix material, and support active reading.
-
-A command line tool is provided that can convert existing EPUB format publications into the new TWPub format. The demo also provides a library of the top 100 public domain books from [[Project Gutenberg|https://www.gutenberg.org/]] preconverted into the TWPub format.
-
-TWPubs can be imported into any TiddlyWiki to enjoy basic functionality. The optional TWPub viewer plugin provides helpful additional features:
-
-* Colour coded annotations/bookmarks
-* Multicolumn display permitting TWPubs to be displayed side-by-side with ordinary TiddlyWiki content
-
-! Demo and Documentation
-
-The TWPub site contains documentation and a demonstration library with over a hundred public domain publications:
-
-https://twpub-tools.org/
-
-The open source code is available on ~GitHub:
-
-https://github.com/TWPUB/TWPUB-Tools
-
-! History
-
-The work on TWPub has been performed by [[Federatial]] and funded by [[immatériel·fr|http://www.immateriel.fr]], a leading independent e-book distributor in France who distribute catalogues for more than 700 publishers and partner with the major global e-book resellers.

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

@@ -1,6 +1,6 @@
 caption: encodeuricomponent
 created: 20161017152747386
-modified: 20161017152809900
+modified: 20230119174350062
 op-input: a [[selection of titles|Title Selection]]
 op-output: the input with URI component encoding applied
 op-parameter: 
@@ -13,4 +13,6 @@ from-version: 5.1.14
 
 See Mozilla Developer Network for details of the [[encodeURIComponent|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent]] operation.
 
+<<.from-version "5.2.6">> In addition to the characters mentioned in the article above, the following additional characters are also percent encoded: `!'()*`
+
 <<.operator-examples "encodeuricomponent">>

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Funding.tid

@@ -5,5 +5,6 @@ image: Funding.png
 link: Funding TiddlyWiki
 tags: HelloThumbnail
 title: HelloThumbnail - Funding
+ribbon-text: NEW
 
 Find out how you can help support ~TiddlyWiki financially

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Marketplace.tid

@@ -5,5 +5,6 @@ background-color: #EAE57D
 image: TiddlyWiki Marketplace Banner
 caption: ~TiddlyWiki Marketplace
 link: TiddlyWiki Marketplace
+ribbon-text: NEW
 
 Explore commercial products and services for ~TiddlyWiki

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWPub.tid

@@ -1,9 +0,0 @@
-title: HelloThumbnail - TWPub
-tags: HelloThumbnail
-color: #D5B7EA
-image: TWPub Thumbnail
-caption: Electronic Books in ~TiddlyWiki
-link: TWPub
-ribbon-text: NEW
-
-The TWPub project uses ~TiddlyWiki to reimagine electronic books as personal interactive cultural artefacts

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid

@@ -6,5 +6,6 @@ link: Federatial
 tags: HelloThumbnail
 title: HelloThumbnail - Federatial
 type: text/vnd.tiddlywiki
+ribbon-text: NEW
 
 Support the development of ~TiddlyWiki by hiring Jeremy Ruston through Federatial Limited

editions/tw5.com/tiddlers/howtos/How to put the last modification date in a banner.tid

@@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki
 Here's how to display the last modification date of a wiki in a banner in the corner of the window:
 
 # [[Install the plugin|Installing a plugin from the plugin library]] <<.def "Corner ribbon">> in your ~TiddlyWiki
-# Save (<<.icon $:/core/images/save-button>>) and reload (<<.icon $:/core/images/refresh-button>>) your wiki
+# Save (<<.icon $:/core/images/save-button-dynamic>>) and reload (<<.icon $:/core/images/refresh-button>>) your wiki
 # Create a new tiddler called [[$:/_MyRibbon]] tagged [[$:/tags/PageControls]] and containing:<div>
 
 ```

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

@@ -27,7 +27,7 @@ This process will work on most desktop browsers. Note that none of your personal
 #* If the file is encrypted you will be prompted for the password
 # Review the list of tiddlers that will be upgraded
 # Click ''Upgrade''
-# Save changes to save the new version (<<.icon $:/core/images/save-button>>)
+# Save changes to save the new version (<<.icon $:/core/images/save-button-dynamic>>)
 
 This will download a file called ''upgrade.html'' to your computer. This file is the upgrade of your old file. You may need to open the location where ''upgrade.html'' was downloaded, rename ''upgrade.html'' with the name of the old file you are upgrading, and replace the old file by moving the new file in its place.
 

editions/tw5.com/tiddlers/images/TWPub Thumbnail.png.meta

@@ -1,3 +0,0 @@
-title: TWPub Thumbnail
-type: image/png
-tags: picture

editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid

@@ -32,7 +32,7 @@ type: text/vnd.tiddlywiki
 ## Visit http://127.0.0.1:8080/ in your browser
 ## Try editing and creating tiddlers
 # Optionally, make an offline copy:
-#* click the <<.icon $:/core/images/save-button>> ''save changes'' button in the sidebar, ''OR''
+#* click the <<.icon $:/core/images/save-button-dynamic>> ''save changes'' button in the sidebar, ''OR''
 #* `tiddlywiki mynewwiki --build index`
 
 The `-g` flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it.

editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid

@@ -27,7 +27,7 @@ Follow these instructions when using TiddlyWiki as a standalone, single file wik
 
 # Click the ''install'' button to install a plugin
 
-# Save your TiddlyWiki <<.icon $:/core/images/save-button>>
+# Save your TiddlyWiki <<.icon $:/core/images/save-button-dynamic>>
 
 # If a yellow warning bar appears at the top of the window,  refresh the window so that TiddlyWiki completes installation of the plugin <<.icon $:/core/images/refresh-button>>
 

editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid

@@ -18,7 +18,7 @@ If you want to follow the steps //side by side// you can <<open-external-window
 
 # Import the new plugin shown in the $:/Import tiddler
 
-# Save your TiddlyWiki (<<.icon $:/core/images/save-button>>)
+# Save your TiddlyWiki (<<.icon $:/core/images/save-button-dynamic>>)
 
 # If a yellow warning bar appears at the top of the window,  refresh the window so that TiddlyWiki completes installation of the plugin <<.icon $:/core/images/refresh-button>>
 

editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid

@@ -19,7 +19,7 @@ Follow these instructions when using TiddlyWiki as a standalone, single file wik
 
 # Click the <<.icon $:/core/images/down-arrow>> ''more'' button and <<.icon $:/core/images/delete-button>> ''delete'' the tiddler
 
-# Save your TiddlyWiki <<.icon $:/core/images/save-button>>
+# Save your TiddlyWiki <<.icon $:/core/images/save-button-dynamic>>
 
 # If a yellow warning bar appears at the top of the window,  refresh the window so that TiddlyWiki completely removes the plugin <<.icon $:/core/images/refresh-button>>
 

editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid

@@ -17,7 +17,7 @@ Instructions for use:
 # Open Quine 2
 # Tap the + toolbar button to create and open a new TiddlyWiki
 # From the file list tap an existing TiddlyWiki file to open it
-# Edit the TiddlyWiki as normal, and save as normal using either Autosave or the TiddlyWiki save button <<.icon $:/core/images/save-button>>
+# Edit the TiddlyWiki as normal, and save as normal using either Autosave or the TiddlyWiki save button <<.icon $:/core/images/save-button-dynamic>>
 # Tap the left hand "Documents" toolbar button to close an open TiddlyWiki
 
 *Quine 2 works natively in iOS with the local file system and the iCloud file system

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

@@ -19,6 +19,6 @@ type: text/vnd.tiddlywiki
 # Choose to open the file in Firefox (rather than the default Android viewer)
 # Click ''OK'' in response to the prompt from TiddlyFox that asks whether to enable saving for this file
 # Try creating a new tiddler using the ''new tiddler'' <<.icon $:/core/images/new-button>> button in the sidebar. Type some content for the tiddler, and click the <<.icon $:/core/images/done-button>> ''ok'' button
-# Save your changes by clicking the <<.icon $:/core/images/save-button>> ''save changes'' button in the sidebar
+# Save your changes by clicking the <<.icon $:/core/images/save-button-dynamic>> ''save changes'' button in the sidebar
 #* Look for the yellow notification ''Saved wiki'' at the top right of the window
 # Refresh the browser window to verify that your changes have been saved correctly

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

@@ -25,6 +25,6 @@ If you're using [[Firefox for Android]], see the instructions for [[Saving with
 #* If you are using TiddlyFox v2.x.x you will need to click on the icon of a kitten standing on a blue globe to activate saving. There is no prompt in v2.0.1.
 #** For TiddlyFox v2.0.1, you can not be using Private Browsing mode nor can you be using "Never Remember History".
 # Try creating a new tiddler using the ''new tiddler'' <<.icon $:/core/images/new-button>> button in the sidebar. Type some content for the tiddler, and click the <<.icon $:/core/images/done-button>> ''ok'' button
-# Save your changes by clicking the <<.icon $:/core/images/save-button>> ''save changes'' button in the sidebar
+# Save your changes by clicking the <<.icon $:/core/images/save-button-dynamic>> ''save changes'' button in the sidebar
 #* Look for the yellow notification ''Saved wiki'' at the top right of the window
 # Refresh the browser window to verify that your changes have been saved correctly

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

@@ -20,5 +20,5 @@ type: text/vnd.tiddlywiki
 #* You may rename it, but be sure to keep the `.html` or `.htm` extension
 # Open the file in Internet Explorer
 # Try creating a new tiddler using the ''new tiddler'' <<.icon $:/core/images/new-button>> button in the sidebar. Type some content for the tiddler, and click the <<.icon $:/core/images/done-button>> ''ok'' button
-# Save your changes by clicking the <<.icon $:/core/images/save-button>> ''save changes'' button in the sidebar. Internet Explorer will ask for your consent to save the file locally by presenting a file ''Save As'' dialog.
+# Save your changes by clicking the <<.icon $:/core/images/save-button-dynamic>> ''save changes'' button in the sidebar. Internet Explorer will ask for your consent to save the file locally by presenting a file ''Save As'' dialog.
 # Refresh the browser window to verify that your changes have been saved correctly