Merge branch 'master' into 6684-add-last-saved-timestamp

.gitignore

@@ -8,3 +8,4 @@ node_modules/
 /test-results/
 /playwright-report/
 /playwright/.cache/
+$__StoryList.tid

boot/boot.js

@@ -177,6 +177,7 @@ document: defaults to current document
 eventListeners: array of event listeners (this option won't work until $tw.utils.addEventListeners() has been loaded)
 */
 $tw.utils.domMaker = function(tag,options) {
+	var options = options || {};
 	var doc = options.document || document;
 	var element = doc.createElementNS(options.namespace || "http://www.w3.org/1999/xhtml",tag);
 	if(options["class"]) {
@@ -218,9 +219,34 @@ $tw.utils.error = function(err) {
 			heading = dm("h1",{text: errHeading}),
 			prompt = dm("div",{text: promptMsg, "class": "tc-error-prompt"}),
 			message = dm("div",{text: err, "class":"tc-error-message"}),
-			button = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )})], "class": "tc-error-prompt"}),
+			closeButton = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )})], "class": "tc-error-prompt"}),
-			form = dm("form",{children: [heading,prompt,message,button], "class": "tc-error-form"});
+			downloadButton = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "download tiddlers" : $tw.language.getString("Buttons/EmergencyDownload/Caption") )})], "class": "tc-error-prompt"}),
+			form = dm("form",{children: [heading,prompt,downloadButton,message,closeButton], "class": "tc-error-form"});
 		document.body.insertBefore(form,document.body.firstChild);
+		downloadButton.addEventListener("click",function(event) {
+			if($tw && $tw.wiki) {
+				var tiddlers = [];
+				$tw.wiki.each(function(tiddler,title) {
+					tiddlers.push(tiddler.fields);
+				});
+				var link = dm("a"),
+					text = JSON.stringify(tiddlers);
+				if(Blob !== undefined) {
+					var blob = new Blob([text], {type: "text/html"});
+					link.setAttribute("href", URL.createObjectURL(blob));
+				} else {
+					link.setAttribute("href","data:text/html," + encodeURIComponent(text));
+				}
+				link.setAttribute("download","emergency-tiddlers-" + (new Date()) + ".json");
+				document.body.appendChild(link);
+				link.click();
+				document.body.removeChild(link);
+			} else {
+				alert("Emergency tiddler download is not available");
+			}
+			event.preventDefault();
+			return false;
+		},true);
 		form.addEventListener("submit",function(event) {
 			document.body.removeChild(form);
 			event.preventDefault();
@@ -786,6 +812,7 @@ $tw.utils.Crypto = function() {
 			}
 			return outputText;
 		};
+	$tw.sjcl = sjcl;
 	this.setPassword = function(newPassword) {
 		currentPassword = newPassword;
 		this.updateCryptoStateTiddler();
@@ -1967,10 +1994,10 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 					var value = tiddler[name];
 					switch(fieldInfo.source) {
 						case "subdirectories":
-							value = path.relative(rootPath, filename).split('/').slice(0, -1);
+							value = path.relative(rootPath, filename).split(path.sep).slice(0, -1);
 							break;
 						case "filepath":
-							value = path.relative(rootPath, filename);
+							value = path.relative(rootPath, filename).split(path.sep).join('/');
 							break;
 						case "filename":
 							value = path.basename(filename);
@@ -2453,8 +2480,12 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("text/x-markdown","utf8",[".md",".markdown"]);
 	$tw.utils.registerFileType("application/enex+xml","utf8",".enex");
 	$tw.utils.registerFileType("application/vnd.openxmlformats-officedocument.wordprocessingml.document","base64",".docx");
+	$tw.utils.registerFileType("application/msword","base64",".doc");
 	$tw.utils.registerFileType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","base64",".xlsx");
+	$tw.utils.registerFileType("application/excel","base64",".xls");
+	$tw.utils.registerFileType("application/vnd.ms-excel","base64",".xls");
 	$tw.utils.registerFileType("application/vnd.openxmlformats-officedocument.presentationml.presentation","base64",".pptx");
+	$tw.utils.registerFileType("application/mspowerpoint","base64",".ppt");
 	$tw.utils.registerFileType("text/x-bibtex","utf8",".bib",{deserializerType:"application/x-bibtex"});
 	$tw.utils.registerFileType("application/x-bibtex","utf8",".bib");
 	$tw.utils.registerFileType("application/epub+zip","base64",".epub");

core/images/default-layout.tid

@@ -0,0 +1,7 @@
+title: $:/core/images/default-layout
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-default-layout tc-image-button" viewBox="0 0 128 128">
+    <path d="M71.93 72A8.07 8.07 0 0 1 80 80.07v7.86A8.071 8.071 0 0 1 71.93 96H8.07A8.067 8.067 0 0 1 0 87.93v-7.86A8.072 8.072 0 0 1 8.07 72h63.86Zm0 32a8.07 8.07 0 0 1 8.07 8.07v7.86a8.071 8.071 0 0 1-8.07 8.07H8.07A8.067 8.067 0 0 1 0 119.93v-7.86A8.072 8.072 0 0 1 8.07 104h63.86Zm0-104A8.068 8.068 0 0 1 80 8.07v47.86A8.073 8.073 0 0 1 71.93 64H8.07A8.07 8.07 0 0 1 0 55.93V8.07A8.072 8.072 0 0 1 8.07 0h63.86Zm48 0c2.14 0 4.193.85 5.706 2.364A8.067 8.067 0 0 1 128 8.07v111.86c0 2.14-.85 4.193-2.364 5.706A8.067 8.067 0 0 1 119.93 128H96.07c-2.14 0-4.193-.85-5.706-2.364A8.067 8.067 0 0 1 88 119.93V8.07c0-2.14.85-4.193 2.364-5.706A8.067 8.067 0 0 1 96.07 0h23.86ZM116 24h-16a3.995 3.995 0 0 0-2.828 1.172 3.995 3.995 0 0 0 0 5.656A3.995 3.995 0 0 0 100 32h16a3.995 3.995 0 0 0 2.828-1.172 3.995 3.995 0 0 0 0-5.656A3.995 3.995 0 0 0 116 24Z"/>
+</svg>

core/language/en-GB/Buttons.multids

@@ -28,6 +28,7 @@ Encryption/ClearPassword/Caption: clear password
 Encryption/ClearPassword/Hint: Clear the password and save this wiki without encryption
 Encryption/SetPassword/Caption: set password
 Encryption/SetPassword/Hint: Set a password for saving this wiki with encryption
+EmergencyDownload/Caption: download tiddlers as json
 ExportPage/Caption: export all
 ExportPage/Hint: Export all tiddlers
 ExportTiddler/Caption: export tiddler

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

@@ -9,7 +9,7 @@ config: Data to be inserted into `$tw.config`.
 filteroperator: Individual filter operator methods.
 global: Global data to be inserted into `$tw`.
 info: Publishes system information via the [[$:/temp/info-plugin]] pseudo-plugin.
-isfilteroperator: Operands for the ''is'' filter operator.
+isfilteroperator: Parameters for the ''is'' filter operator.
 library: Generic module type for general purpose JavaScript modules.
 macro: JavaScript macro definitions.
 parser: Parsers for different content types.

core/language/en-GB/Misc.multids

@@ -30,7 +30,7 @@ Error/DeserializeOperator/UnknownDeserializer: Filter Error: Unknown deserialize
 Error/Filter: Filter error
 Error/FilterSyntax: Syntax error in filter expression
 Error/FilterRunPrefix: Filter Error: Unknown prefix for filter run
-Error/IsFilterOperator: Filter Error: Unknown operand for the 'is' filter operator
+Error/IsFilterOperator: Filter Error: Unknown parameter for the 'is' filter operator
 Error/FormatFilterOperator: Filter Error: Unknown suffix for the 'format' filter operator
 Error/LoadingPluginLibrary: Error loading plugin library
 Error/NetworkErrorAlert: `<h2>''Network Error''</h2>It looks like the connection to the server has been lost. This may indicate a problem with your network connection. Please attempt to restore network connectivity before continuing.<br><br>''Any unsaved changes will be automatically synchronised when connectivity is restored''.`

core/modules/commands/listen.js

@@ -18,7 +18,7 @@ exports.info = {
 	name: "listen",
 	synchronous: true,
 	namedParameterMode: true,
-	mandatoryParameters: [],
+	mandatoryParameters: []
 };
 
 var Command = function(params,commander,callback) {

core/modules/filters/backtranscludes.js

@@ -0,0 +1,26 @@
+/*\
+title: $:/core/modules/filters/backtranscludes.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for returning all the backtranscludes from a tiddler
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.backtranscludes = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		$tw.utils.pushTop(results,options.wiki.getTiddlerBacktranscludes(title));
+	});
+	return results;
+};
+
+})();

core/modules/filters/crypto.js

@@ -14,12 +14,9 @@ Filter operators for cryptography, using the Stanford JavaScript library
 
 exports.sha256 = function(source,operator,options) {
 	var results = [],
-		length = parseInt(operator.operand,10) || 20,
+		length = parseInt(operator.operand,10) || 20;
-		sha256 = function(text) {
-			return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(text)).substr(0,length);
-		};
 	source(function(tiddler,title) {
-		results.push(sha256(title));
+		results.push($tw.utils.sha256(title,{length: length}));
 	});
 	return results;
 };

core/modules/filters/transcludes.js

@@ -0,0 +1,26 @@
+/*\
+title: $:/core/modules/filters/transcludes.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for returning all the transcludes from a tiddler
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.transcludes = function(source,operator,options) {
+	var results = new $tw.utils.LinkedList();
+	source(function(tiddler,title) {
+		results.pushTop(options.wiki.getTiddlerTranscludes(title));
+	});
+	return results.toArray();
+};
+
+})();

core/modules/indexers/back-indexer.js

@@ -0,0 +1,119 @@
+/*\
+title: $:/core/modules/indexers/back-indexer.js
+type: application/javascript
+module-type: indexer
+
+By parsing the tiddler text, indexes the tiddlers' back links, back transclusions, block level back links.
+
+\*/
+function BackIndexer(wiki) {
+	this.wiki = wiki;
+}
+
+BackIndexer.prototype.init = function() {
+	this.subIndexers = {
+		link: new BackSubIndexer(this,"extractLinks"),
+		transclude: new BackSubIndexer(this,"extractTranscludes"),
+	};
+};
+
+BackIndexer.prototype.rebuild = function() {
+	$tw.utils.each(this.subIndexers,function(subIndexer) {
+		subIndexer.rebuild();
+	});
+};
+
+BackIndexer.prototype.update = function(updateDescriptor) {
+	$tw.utils.each(this.subIndexers,function(subIndexer) {
+		subIndexer.update(updateDescriptor);
+	});
+};
+function BackSubIndexer(indexer,extractor) {
+	this.wiki = indexer.wiki;
+	this.indexer = indexer;
+	this.extractor = extractor;
+	/**
+	 * {
+	 *   [target title, e.g. tiddler title being linked to]:
+	 *     {
+	 * 		   [source title, e.g. tiddler title that has link syntax in its text]: true
+	 * 	   }
+	 * }
+	 */
+	this.index = null;
+}
+
+BackSubIndexer.prototype.init = function() {
+	// lazy init until first lookup
+	this.index = null;
+}
+
+BackSubIndexer.prototype._init = function() {
+	this.index = Object.create(null);
+	var self = this;
+	this.wiki.forEachTiddler(function(sourceTitle,tiddler) {
+		var newTargets = self._getTarget(tiddler);
+		$tw.utils.each(newTargets, function(target) {
+			if(!self.index[target]) {
+				self.index[target] = Object.create(null);
+			}
+			self.index[target][sourceTitle] = true;
+		});
+	});
+}
+
+BackSubIndexer.prototype.rebuild = function() {
+	this.index = null;
+}
+
+/*
+* Get things that is being referenced in the text, e.g. tiddler names in the link syntax.
+*/
+BackSubIndexer.prototype._getTarget = function(tiddler) {
+	var parser = this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
+	if(parser) {
+		return this.wiki[this.extractor](parser.tree);
+	}
+	return [];
+}
+
+BackSubIndexer.prototype.update = function(updateDescriptor) {
+	// lazy init/update until first lookup
+	if(!this.index) {
+		return;
+	}
+	var newTargets = [],
+	    oldTargets = [],
+	    self = this;
+	if(updateDescriptor.old.exists) {
+		oldTargets = this._getTarget(updateDescriptor.old.tiddler);
+	}
+	if(updateDescriptor.new.exists) {
+		newTargets = this._getTarget(updateDescriptor.new.tiddler);
+	}
+
+	$tw.utils.each(oldTargets,function(target) {
+		if(self.index[target]) {
+			delete self.index[target][updateDescriptor.old.tiddler.fields.title];
+		}
+	});
+	$tw.utils.each(newTargets,function(target) {
+		if(!self.index[target]) {
+			self.index[target] = Object.create(null);
+		}
+		self.index[target][updateDescriptor.new.tiddler.fields.title] = true;
+	});
+}
+
+BackSubIndexer.prototype.lookup = function(title) {
+	if(!this.index) {
+		this._init();
+	}
+	if(this.index[title]) {
+		return Object.keys(this.index[title]);
+	} else {
+		return [];
+	}
+}
+
+exports.BackIndexer = BackIndexer;

core/modules/indexers/backlinks-index.js

@@ -1,86 +0,0 @@
-/*\
-title: $:/core/modules/indexers/backlinks-indexer.js
-type: application/javascript
-module-type: indexer
-
-Indexes the tiddlers' backlinks
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global modules: false */
-"use strict";
-
-
-function BacklinksIndexer(wiki) {
-	this.wiki = wiki;
-}
-
-BacklinksIndexer.prototype.init = function() {
-	this.index = null;
-}
-
-BacklinksIndexer.prototype.rebuild = function() {
-	this.index = null;
-}
-
-BacklinksIndexer.prototype._getLinks = function(tiddler) {
-	var parser =  this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
-	if(parser) {
-		return this.wiki.extractLinks(parser.tree);
-	}
-	return [];
-}
-
-BacklinksIndexer.prototype.update = function(updateDescriptor) {
-	if(!this.index) {
-		return;
-	}
-	var newLinks = [],
-	    oldLinks = [],
-	    self = this;
-	if(updateDescriptor.old.exists) {
-		oldLinks = this._getLinks(updateDescriptor.old.tiddler);
-	}
-	if(updateDescriptor.new.exists) {
-		newLinks = this._getLinks(updateDescriptor.new.tiddler);
-	}
-
-	$tw.utils.each(oldLinks,function(link) {
-		if(self.index[link]) {
-			delete self.index[link][updateDescriptor.old.tiddler.fields.title];
-		}
-	});
-	$tw.utils.each(newLinks,function(link) {
-		if(!self.index[link]) {
-			self.index[link] = Object.create(null);
-		}
-		self.index[link][updateDescriptor.new.tiddler.fields.title] = true;
-	});
-}
-
-BacklinksIndexer.prototype.lookup = function(title) {
-	if(!this.index) {
-		this.index = Object.create(null);
-		var self = this;
-		this.wiki.forEachTiddler(function(title,tiddler) {
-			var links = self._getLinks(tiddler);
-			$tw.utils.each(links, function(link) {
-				if(!self.index[link]) {
-					self.index[link] = Object.create(null);
-				}
-				self.index[link][title] = true;
-			});
-		});
-	}
-	if(this.index[title]) {
-		return Object.keys(this.index[title]);
-	} else {
-		return [];
-	}
-}
-
-exports.BacklinksIndexer = BacklinksIndexer;
-
-})();

core/modules/macros/csvtiddlers.js

@@ -35,9 +35,11 @@ exports.run = function(filter,format) {
 	// Collect all the fields
 	for(t=0;t<tiddlers.length; t++) {
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-		for(f in tiddler.fields) {
+		if(tiddler) {
-			if(fields.indexOf(f) === -1) {
+			for(f in tiddler.fields) {
-				fields.push(f);
+				if(fields.indexOf(f) === -1) {
+					fields.push(f);
+				}
 			}
 		}
 	}
@@ -60,8 +62,10 @@ exports.run = function(filter,format) {
 	for(var t=0;t<tiddlers.length; t++) {
 		row = [];
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-			for(f=0; f<fields.length; f++) {
+			if(tiddler) {
-				row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
+				for(f=0; f<fields.length; f++) {
+					row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
+				}	
 			}
 		output.push(row.join(","));
 	}

core/modules/utils/utils.js

@@ -819,6 +819,15 @@ exports.hashString = function(str) {
 	},0);
 };
 
+/*
+Cryptographic hash function as used by sha256 filter operator
+options.length .. number of characters returned defaults to 64
+*/
+exports.sha256 = function(str, options) {
+	options = options || {}
+	return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(str)).substr(0,options.length || 64);
+}
+
 /*
 Base64 utility functions that work in either browser or Node.js
 */
@@ -922,7 +931,7 @@ IE does not have sign function
 */
 exports.sign = Math.sign || function(x) {
 	x = +x; // convert to a number
-	if (x === 0 || isNaN(x)) {
+	if(x === 0 || isNaN(x)) {
 		return x;
 	}
 	return x > 0 ? 1 : -1;
@@ -935,7 +944,7 @@ exports.strEndsWith = function(str,ending,position) {
 	if(str.endsWith) {
 		return str.endsWith(ending,position);
 	} else {
-		if (typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > str.length) {
+		if(typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > str.length) {
 			position = str.length;
 		}
 		position -= ending.length;

core/modules/widgets/draggable.js

@@ -119,7 +119,7 @@ DraggableWidget.prototype.refresh = function(changedTiddlers) {
 		return true;
 	} else {
 		if(changedAttributes["class"]) {
-			this.assignDomNodeClasses();
+			this.updateDomNodeClasses();
 		}
 		this.assignAttributes(this.domNodes[0],{
 			changedAttributes: changedAttributes,
@@ -132,4 +132,4 @@ DraggableWidget.prototype.refresh = function(changedTiddlers) {
 
 exports.draggable = DraggableWidget;
 
-})();
+})();

core/modules/widgets/importvariables.js

@@ -49,7 +49,7 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
 	this.tiddlerList = tiddlerList || this.wiki.filterTiddlers(this.filter,this);
 	// Accumulate the <$set> widgets from each tiddler
 	$tw.utils.each(this.tiddlerList,function(title) {
-		var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true, configTrimWhiteSpace:true});
+		var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true, configTrimWhiteSpace:false});
 		if(parser) {
 			var parseTreeNode = parser.tree[0];
 			while(parseTreeNode && ["setvariable","set","parameters"].indexOf(parseTreeNode.type) !== -1) {

core/modules/wiki.js

@@ -534,8 +534,8 @@ Return an array of tiddler titles that link to the specified tiddler
 */
 exports.getTiddlerBacklinks = function(targetTitle) {
 	var self = this,
-		backlinksIndexer = this.getIndexer("BacklinksIndexer"),
+		backIndexer = this.getIndexer("BackIndexer"),
-		backlinks = backlinksIndexer && backlinksIndexer.lookup(targetTitle);
+		backlinks = backIndexer && backIndexer.subIndexers.link.lookup(targetTitle);
 
 	if(!backlinks) {
 		backlinks = [];
@@ -549,6 +549,68 @@ exports.getTiddlerBacklinks = function(targetTitle) {
 	return backlinks;
 };
 
+
+/*
+Return an array of tiddler titles that are directly transcluded within the given parse tree
+ */
+exports.extractTranscludes = function(parseTreeRoot) {
+	// Count up the transcludes
+	var transcludes = [],
+		checkParseTree = function(parseTree, parentNode) {
+			for(var t=0; t<parseTree.length; t++) {
+				var parseTreeNode = parseTree[t];
+				if(parseTreeNode.type === "transclude" && parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
+					var value;
+					// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
+					if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
+						value = parentNode.attributes.tiddler.value;
+					} else {
+						value = parseTreeNode.attributes.$tiddler.value;
+					}
+					if(transcludes.indexOf(value) === -1) {
+						transcludes.push(value);
+					}
+				}
+				if(parseTreeNode.children) {
+					checkParseTree(parseTreeNode.children, parseTreeNode);
+				}
+			}
+		};
+	checkParseTree(parseTreeRoot);
+	return transcludes;
+};
+
+
+/*
+Return an array of tiddler titles that are transcluded from the specified tiddler
+*/
+exports.getTiddlerTranscludes = function(title) {
+	var self = this;
+	// We'll cache the transcludes so they only get computed if the tiddler changes
+	return this.getCacheForTiddler(title,"transcludes",function() {
+		// Parse the tiddler
+		var parser = self.parseTiddler(title);
+		if(parser) {
+			return self.extractTranscludes(parser.tree);
+		}
+		return [];
+	});
+};
+
+/*
+Return an array of tiddler titles that transclude to the specified tiddler
+*/
+exports.getTiddlerBacktranscludes = function(targetTitle) {
+	var self = this,
+		backIndexer = this.getIndexer("BackIndexer"),
+		backtranscludes = backIndexer && backIndexer.subIndexers.transclude.lookup(targetTitle);
+
+	if(!backtranscludes) {
+		backtranscludes = [];
+	}
+	return backtranscludes;
+};
+
 /*
 Return a hashmap of tiddler titles that are referenced but not defined. Each value is the number of times the missing tiddler is referenced
 */

core/ui/AdvancedSearch/Filter.tid

@@ -40,10 +40,8 @@ caption: {{$:/language/Search/Filter/Caption}}
 		<$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/>
 </$list></$list>
 \end
-
 \whitespace trim
 <<lingo Filter/Hint>>
-
 <div class="tc-search tc-advanced-search">
 <$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
 <$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
@@ -65,11 +63,10 @@ caption: {{$:/language/Search/Filter/Caption}}
 &#32;
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch/FilterButton]!has[draft.of]]"><$transclude/></$list>
 </div>
-
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$set name="resultCount" value="<$count filter={{$:/temp/advancedsearch}}/>">
 <div class="tc-search-results">
-<<lingo Filter/Matches>>
+<p><<lingo Filter/Matches>></p>
 <$list filter={{$:/temp/advancedsearch}}>
 <span class={{{[<currentTiddler>addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}>
 <$transclude tiddler="$:/core/ui/ListItemTemplate"/>

core/ui/AdvancedSearch/Standard.tid

@@ -54,17 +54,18 @@ caption: {{$:/language/Search/Standard/Caption}}
 	variable="listItem">
 <$vars
 	userInput={{{ [[$:/temp/advancedsearch]get[text]] }}}
-	configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
+	configTiddler={{{ [[$:/state/advancedsearch/standard/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
 	searchListState="$:/temp/advancedsearch/selected-item">
-<$list
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]">
-	filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]"
-	emptyMessage="<$list filter='[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]'><$transclude/></$list>">
 <$macrocall $name="tabs"
 	tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"
 	default={{$:/config/SearchResults/Default}}
 	actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<<currentTab>>/>"
 	explicitState="$:/state/tab/search-results/advancedsearch" />
 </$list>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]  :else[[]]">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"><$transclude mode="block"/></$list>
+</$list>
 </$vars>
 </$list>
 </$reveal>

core/ui/ControlPanel/Saving/DownloadSaver.tid

@@ -2,10 +2,19 @@ title: $:/core/ui/ControlPanel/Saving/DownloadSaver
 tags: $:/tags/ControlPanel/Saving
 caption: {{$:/language/ControlPanel/Saving/DownloadSaver/Caption}}
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Saving/DownloadSaver/
 
+<div class="tc-control-panel-saving" data-setting-title=<<currentTab>>>
+
 <<lingo Hint>>
 
-!! <$link to="$:/config/DownloadSaver/AutoSave"><<lingo AutoSave/Hint>></$link>
+!!.tc-control-panel-accent <$link to="$:/config/DownloadSaver/AutoSave"><<lingo AutoSave/Hint>></$link>
 
-<$checkbox tiddler="$:/config/DownloadSaver/AutoSave" field="text" checked="yes" unchecked="no" default="no"> <<lingo AutoSave/Description>> </$checkbox>
+<$checkbox tiddler="$:/config/DownloadSaver/AutoSave"
+	field="text" checked="yes" unchecked="no" default="no"
+	class="tc-control-panel-item"
+>
+	<span class="tc-tiny-gap-left"><<lingo AutoSave/Description>></span>
+</$checkbox>
+</div>

core/ui/ControlPanel/Saving/General.tid

@@ -3,14 +3,22 @@ tags: $:/tags/ControlPanel/Saving
 caption: {{$:/language/ControlPanel/Saving/General/Caption}}
 list-before:
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/
 
+<div class="tc-control-panel-saving" data-setting-title=<<currentTab>>>
+
 {{$:/language/ControlPanel/Saving/General/Hint}}
 
-!! <$link to="$:/config/AutoSave"><<lingo AutoSave/Caption>></$link>
+!!.tc-control-panel-accent <$link to="$:/config/AutoSave"><<lingo AutoSave/Caption>></$link>
 
 <<lingo AutoSave/Hint>>
 
-<$radio tiddler="$:/config/AutoSave" value="yes"> <<lingo AutoSave/Enabled/Description>> </$radio>
+<$radio tiddler="$:/config/AutoSave" value="yes">
+	<span class="tc-tiny-gap-left"><<lingo AutoSave/Enabled/Description>></span>
+</$radio>
 
-<$radio tiddler="$:/config/AutoSave" value="no"> <<lingo AutoSave/Disabled/Description>> </$radio>
+<$radio tiddler="$:/config/AutoSave" value="no">
+	<span class="tc-tiny-gap-left"><<lingo AutoSave/Disabled/Description>></span>
+</$radio>
+</div>

core/ui/ControlPanel/Settings/CamelCase.tid

@@ -2,7 +2,16 @@ title: $:/core/ui/ControlPanel/Settings/CamelCase
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/CamelCase/Caption}}
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/CamelCase/
+
 <<lingo Hint>>
 
-<$checkbox tiddler="$:/config/WikiParserRules/Inline/wikilink" field="text" checked="enable" unchecked="disable" default="enable"> <$link to="$:/config/WikiParserRules/Inline/wikilink"><<lingo Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/WikiParserRules/Inline/wikilink"
+	field="text" checked="enable" unchecked="disable" default="enable"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/WikiParserRules/Inline/wikilink" class="tc-tiny-gap-left">
+		<<lingo Description>>
+	</$link>
+</$checkbox>

core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid

@@ -2,13 +2,18 @@ caption: {{$:/language/ControlPanel/Settings/DefaultMoreSidebarTab/Caption}}
 tags: $:/tags/ControlPanel/Settings
 title: $:/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab
 
-\define lingo-base() $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/
 \whitespace trim
+\define lingo-base() $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/
 
-<$link to="$:/config/DefaultMoreSidebarTab"><<lingo Hint>></$link>
+<$link to="$:/config/DefaultMoreSidebarTab" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>
 
-<$select tiddler="$:/config/DefaultMoreSidebarTab">
+<$select tiddler="$:/config/DefaultMoreSidebarTab" class="tc-select">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]">
+	<$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]">
-<option value=<<currentTiddler>>><$transclude field="caption"><$text text=<<currentTiddler>>/></$transclude></option>
+		<option value=<<currentTiddler>>><$transclude field="caption">
-</$list>
+			<$text text=<<currentTiddler>>/>
+			</$transclude>
+		</option>
+	</$list>
 </$select>

core/ui/ControlPanel/Settings/DefaultSidebarTab.tid

@@ -5,10 +5,16 @@ title: $:/core/ui/ControlPanel/Settings/DefaultSidebarTab
 \define lingo-base() $:/language/ControlPanel/Settings/DefaultSidebarTab/
 \whitespace trim
 
-<$link to="$:/config/DefaultSidebarTab"><<lingo Hint>></$link>
+<$link to="$:/config/DefaultSidebarTab" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>
 
-<$select tiddler="$:/config/DefaultSidebarTab">
+<$select tiddler="$:/config/DefaultSidebarTab" class="tc-select">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]">
+	<$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]">
-<option value=<<currentTiddler>>><$transclude field="caption"><$text text=<<currentTiddler>>/></$transclude></option>
+		<option value=<<currentTiddler>>>
-</$list>
+			<$transclude field="caption">
+				<$text text=<<currentTiddler>>/>
+			</$transclude>
+		</option>
+	</$list>
 </$select>

core/ui/ControlPanel/Settings/EditorToolbar.tid

@@ -2,8 +2,15 @@ title: $:/core/ui/ControlPanel/Settings/EditorToolbar
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/EditorToolbar/Caption}}
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/EditorToolbar/
 <<lingo Hint>>
 
-<$checkbox tiddler="$:/config/TextEditor/EnableToolbar" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/TextEditor/EnableToolbar"><<lingo Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/TextEditor/EnableToolbar"
-
+	field="text" checked="yes" unchecked="no" default="yes"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/TextEditor/EnableToolbar" class="tc-tiny-gap-left">
+		<<lingo Description>>
+	</$link>
+</$checkbox>

core/ui/ControlPanel/Settings/InfoPanelMode.tid

@@ -2,9 +2,17 @@ title: $:/core/ui/ControlPanel/Settings/InfoPanelMode
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/InfoPanelMode/Caption}}
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/InfoPanelMode/
-<$link to="$:/config/TiddlerInfo/Mode"><<lingo Hint>></$link>
 
-<$radio tiddler="$:/config/TiddlerInfo/Mode" value="popup"> <<lingo Popup/Description>> </$radio>
+<$link to="$:/config/TiddlerInfo/Mode" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>
 
-<$radio tiddler="$:/config/TiddlerInfo/Mode" value="sticky"> <<lingo Sticky/Description>> </$radio>
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="popup">
+	<span class="tc-tiny-gap-left"><<lingo Popup/Description>></span>
+</$radio>
+
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="sticky">
+	<span class="tc-tiny-gap-left"><<lingo Sticky/Description>></span>
+</$radio>

core/ui/ControlPanel/Settings/LinkToBehaviour.tid

@@ -2,21 +2,25 @@ title: $:/core/ui/ControlPanel/Settings/LinkToBehaviour
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/LinkToBehaviour/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/Settings/LinkToBehaviour/
 \whitespace trim
+\define lingo-base() $:/language/ControlPanel/Settings/LinkToBehaviour/
 
-<$link to="$:/config/Navigation/openLinkFromInsideRiver"><<lingo "InsideRiver/Hint">></$link>
+<$link to="$:/config/Navigation/openLinkFromInsideRiver" class="tc-control-panel-item">
+	<<lingo "InsideRiver/Hint">>
+</$link>
 
-<$select tiddler="$:/config/Navigation/openLinkFromInsideRiver">
+<$select tiddler="$:/config/Navigation/openLinkFromInsideRiver" class="tc-select">
-  <option value="above"><<lingo "OpenAbove">></option>
+	<option value="above"><<lingo "OpenAbove">></option>
-  <option value="below"><<lingo "OpenBelow">></option>
+	<option value="below"><<lingo "OpenBelow">></option>
-  <option value="top"><<lingo "OpenAtTop">></option>
+	<option value="top"><<lingo "OpenAtTop">></option>
-  <option value="bottom"><<lingo "OpenAtBottom">></option>
+	<option value="bottom"><<lingo "OpenAtBottom">></option>
 </$select>
 
-<$link to="$:/config/Navigation/openLinkFromOutsideRiver"><<lingo "OutsideRiver/Hint">></$link>
+<$link to="$:/config/Navigation/openLinkFromOutsideRiver" class="tc-control-panel-item">
+	<<lingo "OutsideRiver/Hint">>
+</$link>
 
-<$select tiddler="$:/config/Navigation/openLinkFromOutsideRiver">
+<$select tiddler="$:/config/Navigation/openLinkFromOutsideRiver" class="tc-select">
-  <option value="top"><<lingo "OpenAtTop">></option>
+	<option value="top"><<lingo "OpenAtTop">></option>
-  <option value="bottom"><<lingo "OpenAtBottom">></option>
+	<option value="bottom"><<lingo "OpenAtBottom">></option>
 </$select>

core/ui/ControlPanel/Settings/MissingLinks.tid

@@ -2,8 +2,12 @@ title: $:/core/ui/ControlPanel/Settings/MissingLinks
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/MissingLinks/Caption}}
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/MissingLinks/
 <<lingo Hint>>
 
-<$checkbox tiddler="$:/config/MissingLinks" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/MissingLinks"><<lingo Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/MissingLinks" field="text" checked="yes" unchecked="no" default="yes">
-
+	<$link to="$:/config/MissingLinks" class="tc-control-panel-item">
+		<span class="tc-tiny-gap-left"><<lingo Description>></span>
+	</$link>
+</$checkbox>

core/ui/ControlPanel/Settings/NavigationAddressBar.tid

@@ -2,12 +2,21 @@ title: $:/core/ui/ControlPanel/Settings/NavigationAddressBar
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/NavigationAddressBar/Caption}}
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/NavigationAddressBar/
 
-<$link to="$:/config/Navigation/UpdateAddressBar"><<lingo Hint>></$link>
+<$link to="$:/config/Navigation/UpdateAddressBar" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>
 
-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permaview"> <<lingo Permaview/Description>> </$radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permaview">
+	<span class="tc-tiny-gap-left"><<lingo Permaview/Description>></span>
+</$radio>
 
-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permalink"> <<lingo Permalink/Description>> </$radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permalink">
+	<span class="tc-tiny-gap-left"><<lingo Permalink/Description>></span>
+</$radio>
 
-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="no"> <<lingo No/Description>> </$radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="no">
+	<span class="tc-tiny-gap-left"><<lingo No/Description>></span>
+</$radio>

core/ui/ControlPanel/Settings/NavigationHistory.tid

@@ -2,9 +2,17 @@ title: $:/core/ui/ControlPanel/Settings/NavigationHistory
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/NavigationHistory/Caption}}
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/NavigationHistory/
-<$link to="$:/config/Navigation/UpdateHistory"><<lingo Hint>></$link>
 
-<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes"> <<lingo Yes/Description>> </$radio>
+<$link to="$:/config/Navigation/UpdateHistory" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>
 
-<$radio tiddler="$:/config/Navigation/UpdateHistory" value="no"> <<lingo No/Description>> </$radio>
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes">
+	<span class="tc-tiny-gap-left"><<lingo Yes/Description>></span>
+</$radio>
+
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="no">
+	<span class="tc-tiny-gap-left"><<lingo No/Description>></span>
+</$radio>

core/ui/ControlPanel/Settings/NavigationPermalinkviewMode.tid

@@ -2,9 +2,24 @@ title: $:/core/ui/ControlPanel/Settings/NavigationPermalinkviewMode
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/NavigationPermalinkviewMode/Caption}}
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/NavigationPermalinkviewMode/
 <<lingo Hint>>
 
-<$checkbox tiddler="$:/config/Navigation/Permalinkview/CopyToClipboard" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/Navigation/Permalinkview/CopyToClipboard"><<lingo CopyToClipboard/Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/Navigation/Permalinkview/CopyToClipboard"
+	field="text" checked="yes" unchecked="no" default="yes"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/Navigation/Permalinkview/CopyToClipboard" class="tc-tiny-gap-left">
+		<<lingo CopyToClipboard/Description>>
+	</$link>
+</$checkbox>
 
-<$checkbox tiddler="$:/config/Navigation/Permalinkview/UpdateAddressBar" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/Navigation/Permalinkview/UpdateAddressBar"><<lingo UpdateAddressBar/Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/Navigation/Permalinkview/UpdateAddressBar"
+	field="text" checked="yes" unchecked="no" default="yes"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/Navigation/Permalinkview/UpdateAddressBar" class="tc-tiny-gap-left">
+		<<lingo UpdateAddressBar/Description>>
+	</$link>
+</$checkbox>

core/ui/ControlPanel/Settings/PerformanceInstrumentation.tid

@@ -2,7 +2,15 @@ title: $:/core/ui/ControlPanel/Settings/PerformanceInstrumentation
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/PerformanceInstrumentation/Caption}}
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/PerformanceInstrumentation/
 <<lingo Hint>>
 
-<$checkbox tiddler="$:/config/Performance/Instrumentation" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/Performance/Instrumentation"><<lingo Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/Performance/Instrumentation"
+	field="text" checked="yes" unchecked="no" default="no"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/Performance/Instrumentation" class="tc-tiny-gap-left">
+		<<lingo Description>>
+	</$link>
+</$checkbox>

core/ui/ControlPanel/Settings/TitleLinks.tid

@@ -2,9 +2,17 @@ title: $:/core/ui/ControlPanel/Settings/TitleLinks
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/TitleLinks/Caption}}
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/TitleLinks/
-<$link to="$:/config/Tiddlers/TitleLinks"><<lingo Hint>></$link>
 
-<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="yes"> <<lingo Yes/Description>> </$radio>
+<$link to="$:/config/Tiddlers/TitleLinks" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>
 
-<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="no"> <<lingo No/Description>> </$radio>
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="yes">
+	<span class="tc-tiny-gap-left"><<lingo Yes/Description>></span>
+</$radio>
+
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="no">
+	<span class="tc-tiny-gap-left"><<lingo No/Description>></span>
+</$radio>

core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid

@@ -2,12 +2,15 @@ title: $:/core/ui/ControlPanel/Settings/ToolbarButtonStyle
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/ToolbarButtonStyle/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtonStyle/
 \whitespace trim
-<$link to="$:/config/Toolbar/ButtonClass"><<lingo "Hint">></$link>
+\define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtonStyle/
 
-<$select tiddler="$:/config/Toolbar/ButtonClass">
+<$link to="$:/config/Toolbar/ButtonClass" class="tc-control-panel-item">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ToolbarButtonStyle]]">
+	<<lingo "Hint">>
-<option value={{!!text}}>{{!!caption}}</option>
+</$link>
-</$list>
+
+<$select tiddler="$:/config/Toolbar/ButtonClass" class="tc-select">
+	<$list filter="[all[shadows+tiddlers]tag[$:/tags/ToolbarButtonStyle]]">
+		<option value={{!!text}}>{{!!caption}}</option>
+	</$list>
 </$select>

core/ui/ControlPanel/Settings/ToolbarButtons.tid

@@ -2,9 +2,24 @@ title: $:/core/ui/ControlPanel/Settings/ToolbarButtons
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/ToolbarButtons/Caption}}
 
+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtons/
 <<lingo Hint>>
 
-<$checkbox tiddler="$:/config/Toolbar/Icons" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/Toolbar/Icons"><<lingo Icons/Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/Toolbar/Icons"
+	field="text" checked="yes" unchecked="no" default="yes"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/Toolbar/Icons" class="tc-tiny-gap-left">
+		<<lingo Icons/Description>>
+	</$link>
+</$checkbox>
 
-<$checkbox tiddler="$:/config/Toolbar/Text" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/Toolbar/Text"><<lingo Text/Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/Toolbar/Text"
+	field="text" checked="yes" unchecked="no" default="no"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/Toolbar/Text" class="tc-tiny-gap-left">
+		<<lingo Text/Description>>
+	</$link>
+</$checkbox>

core/ui/ControlPanel/TiddlyWiki.tid

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

core/ui/EditTemplate/body/default.tid

@@ -1,5 +1,9 @@
 title: $:/core/ui/EditTemplate/body/default
 
+\function edit-preview-state()
+[{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualified-preview-state>] +[get[text]] :else[[no]]
+\end
+
 \define config-visibility-title()
 $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 \end
@@ -10,12 +14,13 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 
 \whitespace trim
 <$let
-	editPreviewStateTiddler={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
+	qualified-preview-state=<<qualify "$:/state/showeditpreview">>
+	editPreviewStateTiddler={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualified-preview-state>] }}}
 	importTitle=<<qualify $:/ImportImage>>
 	importState=<<qualify $:/state/ImportImage>> >
 <$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> >
 <div>
-<div class={{{ [<editPreviewStateTiddler>get[text]match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>
+<div class={{{ [<edit-preview-state>match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>
 
 <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
 

core/ui/EditTemplate/tags.tid

@@ -3,39 +3,63 @@ tags: $:/tags/EditTemplate
 
 \whitespace trim
 
-\define lingo-base() $:/language/EditTemplate/
+\procedure lingo-base() $:/language/EditTemplate/
 
-\define tag-styles()
+\procedure tag-body-inner(colour,fallbackTarget,colourA,colourB,icon,tagField:"tags")
-background-color:$(backgroundColor)$;
+<$wikify name="foregroundColor"
-fill:$(foregroundColor)$;
+	text="""<$macrocall $name="contrastcolour"
-color:$(foregroundColor)$;
+		target=<<colour>>
+		fallbackTarget=<<fallbackTarget>>
+		colourA=<<colourA>>
+		colourB=<<colourB>>/>
+	"""
+>
+	<$let backgroundColor=<<colour>> >
+		<span class="tc-tag-label tc-tag-list-item tc-small-gap-right"
+			data-tag-title=<<currentTiddler>>
+			style.color=<<foregroundColor>>
+			style.fill=<<foregroundColor>>
+			style.background-color=<<backgroundColor>>
+		>
+			<$transclude tiddler=<<icon>>/>
+			<$view field="title" format="text"/>
+			<$button class="tc-btn-invisible tc-remove-tag-button"
+				style.fill=<<foregroundColor>>
+			>
+				<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter="-[{!!title}]"/>
+				{{$:/core/images/close-button}}
+			</$button>
+		</span>
+	</$let>
+</$wikify>
 \end
 
-\define tag-body-inner(colour,fallbackTarget,colourA,colourB,icon,tagField:"tags")
+\procedure tag-body(colour,palette,icon,tagField:"tags")
-\whitespace trim
+<$macrocall $name="tag-body-inner"
-<$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$""">
+	colour=`$(colour)$`
-<span style=<<tag-styles>> class="tc-tag-label tc-tag-list-item tc-small-gap-right" data-tag-title=<<currentTiddler>>>
+	colourA={{{ [<palette>getindex[foreground]] }}}
-<$transclude tiddler="""$icon$"""/><$view field="title" format="text"/>
+	colourB={{{ [<palette>getindex[background]] }}}
-<$button class="tc-btn-invisible tc-remove-tag-button" style=<<tag-styles>>><$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="-[{!!title}]"/>{{$:/core/images/close-button}}</$button>
+	fallbackTarget={{{ [<palette>getindex[tag-background]] }}}
-</span>
+	icon=<<icon>>
-</$vars>
+	tagField=<<tagField>>
+/>
 \end
 
-\define tag-body(colour,palette,icon,tagField:"tags")
+\procedure edit-tags-template(tagField:"tags")
-<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} icon="""$icon$""" tagField=<<__tagField__>>/>
-\end
-
-\define edit-tags-template(tagField:"tags")
-\whitespace trim
 <div class="tc-edit-tags">
-<$list filter="[list[!!$tagField$]sort[title]]" storyview="pop">
+	<$list filter="[<currentTiddler>get<tagField>enlist-input[]sort[title]]" storyview="pop">
-<$macrocall $name="tag-body" colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} tagField=<<__tagField__>>/>
+		<$macrocall $name="tag-body"
-</$list>
+			colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
-<$vars tabIndex={{$:/config/EditTabIndex}} cancelPopups="yes">
+			palette={{$:/palette}}
-<$macrocall $name="tag-picker" tagField=<<__tagField__>>/>
+			icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}
-</$vars>
+			tagField=<<tagField>>
+		/>
+	</$list>
+	<$let tabIndex={{$:/config/EditTabIndex}} cancelPopups="yes">
+		<$macrocall $name="tag-picker" tagField=<<tagField>>/>
+	</$let>
 </div>
 \end
-<$set name="saveTiddler" value=<<currentTiddler>>>
+<$let saveTiddler=<<currentTiddler>>>
-<$macrocall $name="edit-tags-template" tagField=<<tagField>>/>
+	<$macrocall $name="edit-tags-template" tagField=<<tagField>>/>
-</$set>
+</$let>

core/ui/EditorToolbar/preview.tid

@@ -10,7 +10,7 @@ shortcuts: ((preview))
 
 \whitespace trim
 <span>
-	<$transclude $tiddler={{{ [<editPreviewStateTiddler>get[text]match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} />
+	<$transclude $tiddler={{{ [<edit-preview-state>match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} />
 </span>
 <$action-setfield $tiddler=<<editPreviewStateTiddler>> $value={{{ [<editPreviewStateTiddler>get[text]toggle[yes],[no]] }}} />
-<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
+<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>

core/ui/PageTemplate.tid

@@ -1,7 +1,7 @@
 title: $:/core/ui/PageTemplate
 name: {{$:/language/PageTemplate/Name}}
 description: {{$:/language/PageTemplate/Description}}
-icon: $:/core/images/layout-button
+icon: $:/core/images/default-layout
 code-body: yes
 
 \whitespace trim

core/wiki/macros/CSS.tid

@@ -1,76 +1,69 @@
 title: $:/core/macros/CSS
-tags: $:/tags/Macro
+tags: $:/tags/Macro $:/tags/Global
 
-\define colour(name)
+\procedure colour(name)
-<$transclude tiddler={{$:/palette}} index="$name$"><$transclude tiddler="$:/palettes/Vanilla" index="$name$"><$transclude tiddler="$:/config/DefaultColourMappings/$name$"/></$transclude></$transclude>
+\whitespace trim
+<$transclude $tiddler={{$:/palette}} $index=`$(name)$`>
+	<$transclude $tiddler="$:/palettes/Vanilla" $index=`$(name)$`>
+		<$transclude $tiddler=`$:/config/DefaultColourMappings/$(name)$`/>
+	</$transclude>
+</$transclude>
 \end
 
-\define color(name)
+\procedure color(name)
-<<colour $name$>>
+<$macrocall $name=colour name=`$(name)$`/>
 \end
 
-\define box-shadow(shadow)
+\function box-shadow(shadow)
-``
+[[ -webkit-box-shadow: $(shadow)$;
-  -webkit-box-shadow: $shadow$;
+	-moz-box-shadow: $(shadow)$;
-     -moz-box-shadow: $shadow$;
+	box-shadow: $(shadow)$;]substitute[]]
-          box-shadow: $shadow$;
-``
 \end
 
-\define filter(filter)
+\function filter(filter)
-``
+[[ -webkit-filter: $(filter)$;
-  -webkit-filter: $filter$;
+	-moz-filter: $(filter)$;
-     -moz-filter: $filter$;
+	filter: $(filter)$;]substitute[]]
-          filter: $filter$;
-``
 \end
 
-\define transition(transition)
+\function transition(transition)
-``
+[[ -webkit-transition: $(transition)$;
-  -webkit-transition: $transition$;
+	-moz-transition: $(transition)$;
-     -moz-transition: $transition$;
+	transition: $(transition)$;]substitute[]]
-          transition: $transition$;
-``
 \end
 
-\define transform-origin(origin)
+\function transform-origin(origin)
-``
+[[ -webkit-transform-origin: $(origin)$;
-  -webkit-transform-origin: $origin$;
+	-moz-transform-origin: $(origin)$;
-     -moz-transform-origin: $origin$;
+	transform-origin: $(origin)$;]substitute[]]
-          transform-origin: $origin$;
-``
 \end
 
-\define background-linear-gradient(gradient)
+\function background-linear-gradient(gradient)
-``
+[[	background-image: linear-gradient($(gradient)$);
-background-image: linear-gradient($gradient$);
+	background-image: -o-linear-gradient($(gradient)$);
-background-image: -o-linear-gradient($gradient$);
+	background-image: -moz-linear-gradient($(gradient)$);
-background-image: -moz-linear-gradient($gradient$);
+	background-image: -webkit-linear-gradient($(gradient)$);
-background-image: -webkit-linear-gradient($gradient$);
+	background-image: -ms-linear-gradient($(gradient)$);]substitute[]]
-background-image: -ms-linear-gradient($gradient$);
-``
 \end
 
-\define column-count(columns)
+\function column-count(columns)
-``
+[[-moz-column-count: $(columns)$;
--moz-column-count: $columns$;
+	-webkit-column-count: $(columns)$;
--webkit-column-count: $columns$;
+	column-count: $(columns)$;]substitute[]]
-column-count: $columns$;
-``
 \end
 
-\define datauri(title)
+\procedure datauri(title)
-<$macrocall $name="makedatauri" type={{$title$!!type}} text={{$title$}} _canonical_uri={{$title$!!_canonical_uri}}/>
+<$macrocall $name="makedatauri" type={{{ [<title>get[type]] }}} text={{{ [<title>get[text]] }}} _canonical_uri={{{ [<title>get[_canonical_uri]] }}}/>
 \end
 
-\define if-sidebar(text)
+\procedure if-sidebar(text)
-<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes">$text$</$reveal>
+<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes"><<text>></$reveal>
 \end
 
-\define if-no-sidebar(text)
+\procedure if-no-sidebar(text)
-<$reveal state="$:/state/sidebar" type="nomatch" text="yes" default="yes">$text$</$reveal>
+<$reveal state="$:/state/sidebar" type="nomatch" text="yes" default="yes"><<text>></$reveal>
 \end
 
-\define if-background-attachment(text)
+\procedure if-background-attachment(text)
-<$reveal state="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" type="nomatch" text="">$text$</$reveal>
+<$reveal state="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" type="nomatch" text=""><<text>></$reveal>
 \end

core/wiki/macros/copy-to-clipboard.tid

@@ -1,20 +1,26 @@
 title: $:/core/macros/copy-to-clipboard
-tags: $:/tags/Macro
+tags: $:/tags/Macro $:/tags/Global
 
-\define copy-to-clipboard(src,class:"tc-btn-invisible",style)
 \whitespace trim
-<$button class=<<__class__>> style=<<__style__>> message="tm-copy-to-clipboard" param=<<__src__>> tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}>
+
-{{$:/core/images/copy-clipboard}}
+\procedure copy-to-clipboard(src,class:"tc-btn-invisible",style)
-&#32;
+<$button message="tm-copy-to-clipboard"
-<$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
+	param=<<src>>
+	class=<<class>>
+	style=<<style>>
+	tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}
+>
+	{{$:/core/images/copy-clipboard}}
+	<span class="tc-tiny-gap-left">
+		<$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
+	</span>
 </$button>
 \end
 
-\define copy-to-clipboard-above-right(src,class:"tc-btn-invisible",style)
+\procedure copy-to-clipboard-above-right(src,class:"tc-btn-invisible",style)
-\whitespace trim
 <div style="position: relative;">
-<div style="position: absolute; bottom: 0; right: 0;">
+	<div style="position: absolute; bottom: 0; right: 0;">
-<$macrocall $name="copy-to-clipboard" src=<<__src__>> class=<<__class__>> style=<<__style__>>/>
+		<$macrocall $name="copy-to-clipboard" src=<<src>> class=<<class>> style=<<style>>/>
-</div>
+	</div>
 </div>
 \end

core/wiki/macros/diff.tid

@@ -1,37 +1,37 @@
 title: $:/core/macros/diff
-tags: $:/tags/Macro
+tags: $:/tags/Macro $:/tags/Global
 
-\define compareTiddlerText(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle)
 \whitespace trim
-<$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>>>
+
-<$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>>>
+\procedure compareTiddlerText(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle)
-<$diff-text source=<<source>> dest=<<dest>>/>
+<$set name="source" tiddler=<<sourceTiddlerTitle>> subtiddler=<<sourceSubTiddlerTitle>>>
-</$set>
+	<$set name="dest" tiddler=<<destTiddlerTitle>> subtiddler=<<destSubTiddlerTitle>>>
+		<$diff-text source=<<source>> dest=<<dest>>/>
+	</$set>
 </$set>
 \end
 
-\define compareTiddlers(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle,exclude)
+\procedure compareTiddlers(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle,exclude)
-\whitespace trim
 <table class="tc-diff-tiddlers">
-<tbody>
+	<tbody>
-<$set name="sourceFields" filter="[<__sourceTiddlerTitle__>fields[]sort[]]">
+		<$set name="sourceFields" filter="[<sourceTiddlerTitle>fields[]sort[]]">
-<$set name="destFields" filter="[<__destSubTiddlerTitle__>subtiddlerfields<__destTiddlerTitle__>sort[]]">
+			<$set name="destFields" filter="[<destSubTiddlerTitle>subtiddlerfields<destTiddlerTitle>sort[]]">
-<$list filter="[enlist<sourceFields>] [enlist<destFields>] -[enlist<__exclude__>] +[sort[]]" variable="fieldName">
+			<$list filter="[enlist<sourceFields>] [enlist<destFields>] -[enlist<exclude>] +[sort[]]" variable="fieldName">
-<tr>
+				<tr>
-<th>
+					<th>
-<$text text=<<fieldName>>/>
+						<$text text=<<fieldName>>/>
-</th>
+					</th>
-<td>
+					<td>
-<$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>> field=<<fieldName>>>
+						<$set name="source" tiddler=<<sourceTiddlerTitle>> subtiddler=<<sourceSubTiddlerTitle>> field=<<fieldName>>>
-<$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>> field=<<fieldName>>>
+							<$set name="dest" tiddler=<<destTiddlerTitle>> subtiddler=<<destSubTiddlerTitle>> field=<<fieldName>>>
-<$diff-text source=<<source>> dest=<<dest>>>&#32;</$diff-text>
+								<$diff-text source=<<source>> dest=<<dest>>>&#32;</$diff-text>
-</$set>
+							</$set>
-</$set>
+						</$set>
-</td>
+					</td>
-</tr>
+				</tr>
-</$list>
+			</$list>
-</$set>
+			</$set>
-</$set>
+		</$set>
-</tbody>
+	</tbody>
 </table>
 \end

core/wiki/macros/tag-picker.tid

@@ -1,32 +1,33 @@
 title: $:/core/macros/tag-picker
-tags: $:/tags/Macro
+tags: $:/tags/Macro $:/tags/Global
 first-search-filter: [tags[]!is[system]search:title<userInput>sort[]]
 second-search-filter: [tags[]is[system]search:title<userInput>sort[]]
 
-\define get-tagpicker-focus-selector() [data-tiddler-title="$(currentTiddlerCSSEscaped)$"] .tc-add-tag-name input
+\procedure get-tagpicker-focus-selector()
+\function currentTiddlerCSSEscaped() [<saveTiddler>escapecss[]]
+[data-tiddler-title=`$(currentTiddlerCSSEscaped)$`] .tc-add-tag-name input
+\end
 
-\define delete-tag-state-tiddlers() <$action-deletetiddler $filter="[<newTagNameTiddler>] [<storeTitle>] [<tagSelectionState>]"/>
+\procedure delete-tag-state-tiddlers() <$action-deletetiddler $filter="[<newTagNameTiddler>] [<storeTitle>] [<tagSelectionState>]"/>
 
-\define add-tag-actions(actions,tagField:"tags")
+\procedure add-tag-actions()
 \whitespace trim
-<$set name="tag" value={{{ [<__tiddler__>get[text]] }}}>
+<$let tag=<<tag>>>
-	<$list
+<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter='+[toggle<tag>trim[]]'/>
-		filter="[<saveTiddler>!contains:$tagField$<tag>!match[]]"
+<$list
-		variable="ignore"
+	filter="[<tag>] :intersection[<saveTiddler>get<tagField>enlist-input[]]"
-		emptyMessage="<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter='-[<tag>]'/>"
+	variable="ignore"
-	>
+	emptyMessage="<<actions>>"
-		<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
+/>
-		<$transclude $variable="__actions__"/>
+</$let>
-	</$list>
-</$set>
 <<delete-tag-state-tiddlers>>
 <$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 \end
 
-\define clear-tags-actions-inner()
+\procedure clear-tags-actions-inner()
 \whitespace trim
 <$list
-	filter="[<storeTitle>has[text]] [<newTagNameTiddler>has[text]]"
+	filter="[<storeTitle>has[text]] ~[<newTagNameTiddler>has[text]]"
 	variable="ignore"
 	emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>"
 >
@@ -34,144 +35,133 @@ second-search-filter: [tags[]is[system]search:title<userInput>sort[]]
 </$list>
 \end
 
-\define clear-tags-actions()
+\procedure clear-tags-actions()
 \whitespace trim
-<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
+<$let userInput=<<userInput>>>
-	<$list filter="[<newTagNameTiddler>get[text]!match<userInput>]" emptyMessage="<<clear-tags-actions-inner>>">
+	<$list
-		<$action-setfield $tiddler=<<newTagNameTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
+		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>
+</$let>
 \end
 
-\define tag-picker-inner(actions,tagField:"tags")
+\procedure add-button-actions()
+<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter="[<tag>trim[]]"/>
+<<actions>>
+<<delete-tag-state-tiddlers>>
+<$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>
+\end
+
+\procedure list-tags(filter, suffix)
 \whitespace trim
-<$vars
+<$list
+	filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]"
+	emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem"
+>
+	<$list filter=<<filter>> variable="tag">
+		<$let
+			button-classes=`tc-btn-invisible ${ [<tag>addsuffix<suffix>] -[<tagSelectionState>get[text]] :then[[]] ~tc-tag-button-selected }$`
+			currentTiddler=<<tag>>
+		>
+			{{||$:/core/ui/TagPickerTagTemplate}}
+		</$let>
+	</$list>
+</$list>
+\end
+
+\procedure tag-picker-inner()
+\whitespace trim
+<$let
 	newTagNameInputTiddlerQualified=<<qualify "$:/temp/NewTagName/input">>
 	newTagNameSelectionTiddlerQualified=<<qualify "$:/temp/NewTagName/selected-item">>
-	fallbackTarget={{$(palette)$##tag-background}}
+	fallbackTarget={{{ [<palette>getindex[tag-background]] }}}
-	colourA={{$(palette)$##foreground}}
+	colourA={{{ [<palette>getindex[foreground]] }}}
-	colourB={{$(palette)$##background}}
+	colourB={{{ [<palette>getindex[background]] }}}
+
+	storeTitle={{{ [<newTagNameInputTiddler>!match[]] ~[<newTagNameInputTiddlerQualified>] }}}
+	tagSelectionState={{{ [<newTagNameSelectionTiddler>!match[]] ~[<newTagNameSelectionTiddlerQualified>] }}}
+	tagAutoComplete=<<qualify "$:/state/popup/tags-auto-complete">>
+
+	refreshTitle=<<qualify "$:/temp/NewTagName/refresh">> 
+	nonSystemTagsFilter="[tags[]!is[system]search:title<userInput>sort[]]"
+	systemTagsFilter="[tags[]is[system]search:title<userInput>sort[]]"
 >
-	<$vars
+	<div class="tc-edit-add-tag">
-		storeTitle={{{ [<newTagNameInputTiddler>!match[]] ~[<newTagNameInputTiddlerQualified>] }}}
+		<div>
-		tagSelectionState={{{ [<newTagNameSelectionTiddler>!match[]] ~[<newTagNameSelectionTiddlerQualified>] }}}
+			<span class="tc-add-tag-name tc-small-gap-right">
-	>
+				<$transclude
-		<$vars
+					$variable="keyboard-driven-input"
-			refreshTitle=<<qualify "$:/temp/NewTagName/refresh">> 
+					tiddler=<<newTagNameTiddler>>
-			nonSystemTagsFilter="[tags[]!is[system]search:title<userInput>sort[]]"
+					storeTitle=<<storeTitle>>
-			systemTagsFilter="[tags[]is[system]search:title<userInput>sort[]]"
+					refreshTitle=<<refreshTitle>>
-		>
+					selectionStateTitle=<<tagSelectionState>>
-			<div class="tc-edit-add-tag">
+					inputAcceptActions=<<add-tag-actions>>
-				<div>
+					inputCancelActions=<<clear-tags-actions>>
-					<span class="tc-add-tag-name tc-small-gap-right">
+					tag="input"
-						<$macrocall
+					placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
-							$name="keyboard-driven-input"
+					focusPopup=<<tagAutoComplete>>
-							tiddler=<<newTagNameTiddler>>
+					class="tc-edit-texteditor tc-popup-handle"
-							storeTitle=<<storeTitle>>
+					tabindex=<<tabIndex>>
-							refreshTitle=<<refreshTitle>>
+					focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}}
-							selectionStateTitle=<<tagSelectionState>>
+					filterMinLength={{$:/config/Tags/MinLength}}
-							inputAcceptActions="<$macrocall $name='add-tag-actions' actions=<<__actions__>> tagField=<<__tagField__>>/>"
+					cancelPopups=<<cancelPopups>>
-							inputCancelActions=<<clear-tags-actions>>
+					configTiddlerFilter="[[$:/core/macros/tag-picker]]"
-							tag="input"
+				/>
-							placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
+			</span>
-							focusPopup=<<qualify "$:/state/popup/tags-auto-complete">>
+			<$button popup=<<tagAutoComplete>> 
-							class="tc-edit-texteditor tc-popup-handle"
+				class="tc-btn-invisible tc-btn-dropdown"
-							tabindex=<<tabIndex>>
+				tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}}
-							focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}}
+				aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}
-							filterMinLength={{$:/config/Tags/MinLength}}
+			>
-							cancelPopups=<<cancelPopups>>
+				{{$:/core/images/down-arrow}}
-							configTiddlerFilter="[[$:/core/macros/tag-picker]]"
+			</$button>
-						/>
+			<$reveal state=<<storeTitle>> type="nomatch" text="">
-					</span>
+				<$button actions=<<delete-tag-state-tiddlers>>
-					<$button popup=<<qualify "$:/state/popup/tags-auto-complete">> 
+					class="tc-btn-invisible tc-small-gap tc-btn-dropdown"
-						class="tc-btn-invisible tc-btn-dropdown"
+					tooltip={{$:/language/EditTemplate/Tags/ClearInput/Hint}}
-						tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}}
+					aria-label={{$:/language/EditTemplate/Tags/ClearInput/Caption}}
-						aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}
+				>
+					{{$:/core/images/close-button}}
+				</$button>
+			</$reveal>
+			<span class="tc-add-tag-button tc-small-gap-left">
+				<$let tag=<<tag>>>
+					<$button set=<<newTagNameTiddler>> setTo=""
+						actions=<<add-button-actions>>
 					>
-						{{$:/core/images/down-arrow}}
+						{{$:/language/EditTemplate/Tags/Add/Button}}
 					</$button>
-					<$reveal state=<<storeTitle>> type="nomatch" text="">
+				</$let>
-						<$button class="tc-btn-invisible tc-small-gap tc-btn-dropdown"
+			</span>
-							tooltip={{$:/language/EditTemplate/Tags/ClearInput/Hint}}
+		</div>
-							aria-label={{$:/language/EditTemplate/Tags/ClearInput/Caption}}
+		<div class="tc-block-dropdown-wrapper">
-						>
+			<$reveal state=<<tagAutoComplete>> type="nomatch" text="">
-							{{$:/core/images/close-button}}<<delete-tag-state-tiddlers>>
+				<div class="tc-block-dropdown tc-block-tags-dropdown">
-						</$button>
+					<$let userInput=<<userInput>>>
-					</$reveal>
+						<$transclude $variable="list-tags" filter=<<nonSystemTagsFilter>> suffix="-primaryList" />
-					<span class="tc-add-tag-button tc-small-gap-left">
+						<hr>
-						<$set name="tag" value={{{ [<newTagNameTiddler>get[text]] }}}>
+						<$transclude $variable="list-tags" filter=<<systemTagsFilter>> suffix="-secondaryList" />
-							<$button set=<<newTagNameTiddler>> setTo="" class="">
+					</$let>
-								<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
-								<$transclude $variable="__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>
-					<$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">
+		</div>
-						<div class="tc-block-dropdown tc-block-tags-dropdown">
+	</div>
-							<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
+</$let>
-								<$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")
+\procedure tag-picker(actions, tagField:"tags")
+\function userInput() [<storeTitle>get[text]]
+\function tag() [<newTagNameTiddler>get[text]]
 \whitespace trim
-<$vars saveTiddler=<<currentTiddler>> palette={{$:/palette}}>
+<$let
-	<$list
+	saveTiddler=<<currentTiddler>>
-		filter="[<newTagNameTiddler>match[]]"
+	palette={{$:/palette}}
-		emptyMessage="<$macrocall $name='tag-picker-inner' actions=<<__actions__>> tagField=<<__tagField__>>/>"
+	qualified=<<qualify "$:/temp/NewTagName">>
-	>
+	newTagNameTiddler={{{ [<newTagNameTiddler>!match[]] ~[<qualified>] }}}
-		<$set name="newTagNameTiddler" value=<<qualify "$:/temp/NewTagName">>>
+>
-			<$macrocall $name="tag-picker-inner" actions=<<__actions__>> tagField=<<__tagField__>>/>
+	<$transclude $variable="tag-picker-inner" />
-		</$set>
+</$let>
-	</$list>
-</$vars>
 \end

editions/dev/tiddlers/javascript-widget-tutorial/Javascript Widget Tutorial.tid

@@ -1,5 +1,5 @@
 created: 20190202035524804
-modified: 20221029161501848
+modified: 20240302110658300
 tags: 
 title: Javascript Widget Tutorial
 type: text/vnd.tiddlywiki
@@ -9,21 +9,23 @@ This tutorial provides step-by-step, interactive examples of how to write code f
 
 Intended audience:
 
-# Those who know tiddlywiki well and know programming and javascript and want to write their own widget. I don't make any effort to explain javascript here. For that you will need other resources.
+# Those who know tiddlywiki well and know programming and javascript and want to write their own widget.
 # Those who know tiddlywiki well and don't know javascript, but want to understand more about how tiddlywiki works. You should be able to skim through and interact with the demos and learn something.
 
-!The tutorial
+We don't make any effort to explain javascript here. For that you will need other resources, like [[MDN|https://developer.mozilla.org/en-US/docs/Web/JavaScript]].
-*[[Undefined widget tutorial]]
-*[[Do nothing widget tutorial]]
-*[[Hello World widget tutorial]]
-*[[Widget refresh tutorial part I]]
-*[[Widget refresh tutorial part II]]
-*[[Widget refresh tutorial part III]]
-*[[Widget attributes tutorial part I]]
-*[[Widget attributes tutorial part II]]
-*[[Child widgets tutorial]]
 
-! Notes
+!! The tutorial
+* [[Undefined widget tutorial]]
+* [[Do nothing widget tutorial]]
+* [[Hello World widget tutorial]]
+* [[Widget refresh tutorial part I]]
+* [[Widget refresh tutorial part II]]
+* [[Widget refresh tutorial part III]]
+* [[Widget attributes tutorial part I]]
+* [[Widget attributes tutorial part II]]
+* [[Child widgets tutorial]]
+
+!! Notes
 
 tiddlywiki doesn't support dynamically reloading javascript. If you change a javascript tiddler, then you need to save and reload  the wiki before the changes will take affect.
 
@@ -31,7 +33,11 @@ To avoid the need for such reloads, the excellent [[innerwiki plugin|https://tid
 
 Without the need for reloads, a tiddlywiki instance with the [[innerwiki plugin|https://tiddlywiki.com/prerelease/plugins/tiddlywiki/innerwiki/]] installed works great as a playground for interacting with tiddlywiki javascript.
 
-! Other documentation on writing TW widgets
+!! Other documentation on writing TW widgets
 
-*WidgetModules
+* WidgetModules
-*[[Widgets]]
+* [[Widgets]]
+
+!! Full API doc
+
+[[Github Pages of TW5-Typed|https://tiddly-gittly.github.io/TW5-Typed/api/classes/modules_widgets.widget]]

editions/dev/tiddlers/new/Using ES2016 for Writing Plugins.tid

@@ -1,5 +1,5 @@
-modified: 20160305222940000
 created: 20160111034749658
+modified: 20240302110735646
 title: Using ES2016 for Writing Plugins
 type: text/vnd.tiddlywiki
 
@@ -7,7 +7,15 @@ With the advent of ES2015 (also known as ES6) and the availability of [[Babel.js
 
 Please understand how the PluginMechanism works since this is all about writing a plugin using Babel to compile the output that will be included in the final TiddlyWiki (for example [[TiddlyWiki on Node.js]]).
 
-!! Installing and Configuring Babel
+!! Use a framework
+
+It is recommended to use develop toolkit managed by community. For example, 
+
+# [[Modern.TiddlyDev|https://tiddly-gittly.github.io/Modern.TiddlyDev/]]
+
+They are known as "~JavaScript Meta-Framework". With them, you can start developing in a few minutes, without hours of configuration and debugging the build steps.
+
+!! Installing and Configuring Babel by yourself
 
 You can install Babel using
 
@@ -33,7 +41,9 @@ Inside your plugin project edit the file `.babelrc` and enter the following:
 
 <<.tip "I found it easier to manage my plugins as if they were ''npm'' modules complete with a `package.json` that compiles the output via `npm run build`. See [[npm-scripts documentation|https://docs.npmjs.com/misc/scripts]] for details.">>
 
-!! Compiling the Output
+Another benefit of using such a "Meta-Framework" is that you can easily maintain your configuration, you will find it difficult to upgrade those config files after several months.
+
+!!! Compiling the Output
 
 Pick a folder to store the ES2015 JavaScript and a folder to output the TiddlyWiki ready JavaScript. In this example I will use `src` and `lib` respectively. With Babel installed and working I can compile all the JavaScript in the `src` folder to the `lib` folder by running this command:
 
@@ -43,7 +53,7 @@ $ babel src -d lib
 
 <<.warning "Babel will //not// copy over non-JavaScript files. It is up to the developer to include all the supporting files themselves. Babel only converts the ~JavaScript files (ending in `.js`) from the `src` folder to the `lib` folder.">>
 
-!! Imports and Exports
+!!! Imports and Exports
 
 In a plugin written pre-ES2015 one would `require` a module through TiddlyWiki like so:
 
@@ -71,7 +81,7 @@ export { MyWidget as mywidget };
 
 It is important to understand that in ES2016 the ''default'' export is not supported in TiddlyWiki. This is mostly because the core code expects specific properties to be attached to the `exports` variable. Bable's `export` conversion plays well with this //except// with the default export.
 
-!! Classes
+!!! Classes
 
 In the example of a widget ES2016 plays well with class inheritance. To contrast the typical Widget definition would look something like this:
 
@@ -104,7 +114,7 @@ class NameWidget extends Widget {
 }
 ```
 
-!!! Non Class Modules
+!!!! Non Class Modules
 
 For non class modules you can use the `export` keyword. Here is a simple [[Startup Module|ModuleType]]:
 
@@ -122,11 +132,11 @@ export const params = {};
 export function run() {…}
 ```
 
-!! Polyfills
+!!! Polyfills
 
 ES2015 comes with some features that are part of the JavaScript core objects. These are not supported by all browsers. To use these features in [[most browsers|BrowserCompatibility]] you will need a <<.def "polyfill">>. Babel has a polyfill package that you can include. See [[Adding Babel Polyfill to TiddlyWiki]] for how to accomplish this.
 
-!! Example
+!!! Example
 
 Here is an example ES2015 plugin/widget that will show the time and update it:
 

editions/es-ES/tiddlers/$__StoryList.tid

@@ -1,6 +0,0 @@
-created: 20160511060801385
-list: Reference JSONTiddlers
-modified: 20160511060801385
-title: $:/StoryList
-type: text/vnd.tiddlywiki
-

editions/full/tiddlywiki.info

@@ -47,6 +47,7 @@
 		"it-IT",
 		"ja-JP",
 		"ko-KR",
+		"mk-MK",
 		"nl-NL",
 		"pa-IN",
 		"pt-PT",

editions/introduction/tiddlers/slides/CecilyMap.tid

@@ -4,17 +4,17 @@ type: application/json
 {
 	"newTiddlerPosition": {"x": 360,"y": 100},
 	"positions": {
-		" ":				{"x":  30,"y": 17,"w": 140,"h": 140, "r": -2},
+		" ":				{"x":  30,"y": 17,"w": 120,"h": 120, "r": -2},
-		"Tiddlers":			{"x":  60,"y": 15,"w": 140,"h": 140, "r": 10},
+		"Tiddlers":			{"x":  60,"y": 15,"w": 120,"h": 120, "r": 10},
-		"Links":			{"x":  90,"y": 13,"w": 140,"h": 140, "r": -7},
+		"Links":			{"x":  90,"y": 13,"w": 120,"h": 120, "r": -7},
-		"Formatting":		{"x": 120,"y": 18,"w": 140,"h": 140, "r": 5},
+		"Formatting":		{"x": 120,"y": 18,"w": 120,"h": 120, "r": 5},
-		"Images":			{"x": 150,"y": 12,"w": 140,"h": 140, "r": -11},
+		"Images":			{"x": 150,"y": 12,"w": 120,"h": 120, "r": -11},
-		"Audio":			{"x": 180,"y": 14,"w": 140,"h": 140, "r": 16},
+		"Audio":			{"x": 180,"y": 14,"w": 120,"h": 120, "r": 16},
-		"Tags":				{"x": 210,"y": 15,"w": 140,"h": 140, "r": 20},
+		"Tags":				{"x": 210,"y": 15,"w": 120,"h": 120, "r": 20},
-		"Transclusion":		{"x": 240,"y": 16,"w": 140,"h": 140, "r": -4},
+		"Transclusion":		{"x": 240,"y": 16,"w": 120,"h": 120, "r": -4},
-		"Lists":			{"x": 275,"y": 13,"w": 140,"h": 140, "r": 6},
+		"Lists":			{"x": 275,"y": 13,"w": 120,"h": 120, "r": 6},
-		"Customisation":	{"x": 310,"y": 19,"w": 140,"h": 140, "r": -5},
+		"Customisation":	{"x": 310,"y": 19,"w": 120,"h": 120, "r": -5},
-		"Plugins":			{"x": 350,"y": 12,"w": 140,"h": 140, "r": 10},
+		"Plugins":			{"x": 350,"y": 12,"w": 120,"h": 120, "r": 10},
-		"Translations":		{"x": 390,"y": 15,"w": 140,"h": 140, "r": 8}
+		"Translations":		{"x": 390,"y": 15,"w": 120,"h": 120, "r": 8}
 	}
 }

editions/introduction/tiddlers/slides/blank.json

@@ -1,3 +1,3 @@
 [
-{"title": " ", "text": "TiddlyWiki"}
+{"title": " ", "text": "[[TiddlyWiki]]"}
 ]

editions/prerelease/tiddlers/system/configPerformanceInstrumentation.tid

@@ -0,0 +1,2 @@
+title: $:/config/Performance/Instrumentation
+text: yes

editions/test/tiddlers/tests/data/importvariables/WithSetWidgets2.tid

@@ -12,6 +12,7 @@ title: Output
 +
 title: Definitions
 
+\whitespace trim
 <$set name="one" value="elephant">
 <$set name="two" value="giraffe">
 </$set>

editions/test/tiddlers/tests/data/importvariables/WithSetWidgetsAndMacros.tid

@@ -14,6 +14,7 @@ title: Output
 +
 title: Definitions
 
+\whitespace trim
 \define name() Bugs Bunny
 \procedure address()
 Bunny Hill

editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace2.tid

@@ -0,0 +1,25 @@
+title: Transclude/Procedures/Whitespace2
+description: Procedures should inherit whitespace settings from definition site
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\procedure testproc()
+This is a sentence    
+\end
+
+\define testmacro()
+This is a sentence    
+\end
+This is a sentence
+[<<testproc>>]
+[<<testmacro>>]
+
++
+title: ExpectedResult
+
+<p>This is a sentence
+[This is a sentence    ]
+[This is a sentence    ]
+</p>

editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace3.tid

@@ -0,0 +1,30 @@
+title: Transclude/Procedures/Whitespace3
+description: Procedures should inherit whitespace settings from definition site
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\import Definitions
+
+This is a sentence
+[<<testproc>>]
+[<<testmacro>>]
+
++
+title: Definitions
+
+\procedure testproc()
+This is a sentence    
+\end
+
+\define testmacro()
+This is a sentence    
+\end
++
+title: ExpectedResult
+
+<p>This is a sentence
+[This is a sentence    ]
+[This is a sentence    ]
+</p>

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

@@ -0,0 +1,148 @@
+/*\
+title: test-backtranscludes.js
+type: application/javascript
+tags: $:/tags/test-spec
+
+Tests the backtranscludes mechanism.
+
+\*/
+(function(){
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+describe('Backtranscludes tests', function() {
+	describe('a tiddler with no transcludes to it', function() {
+		var wiki = new $tw.Wiki();
+
+		wiki.addTiddler({
+			title: 'TestIncoming',
+			text: ''});
+
+		it('should have no backtranscludes', function() {
+			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('');
+		});
+	});
+
+	describe('A tiddler added to the wiki with a transclude to it', function() {
+		var wiki = new $tw.Wiki();
+
+		wiki.addTiddler({
+			title: 'TestIncoming',
+			text: 'something'});
+
+		wiki.addTiddler({
+			title: 'TestOutgoing',
+			text: 'A transclude to {{TestIncoming}}'});
+
+		it('should have a backtransclude', function() {
+			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
+		});
+	});
+
+	describe('A tiddler transclude with template will still use the tiddler as result.', function() {
+		var wiki = new $tw.Wiki();
+
+		wiki.addTiddler({
+			title: 'TestIncoming',
+			text: 'something'});
+
+		wiki.addTiddler({
+			title: 'TestOutgoing',
+			text: 'A transclude to {{TestIncoming||$:/core/ui/TagTemplate}}'});
+
+		it('should have a backtransclude', function() {
+			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
+		});
+	});
+
+	describe('A tiddler that has a transclude added to it later', function() {
+		it('should have an additional backtransclude', function() {
+			var wiki = new $tw.Wiki();
+
+			wiki.addTiddler({
+				title: 'TestIncoming',
+				text: ''});
+
+			wiki.addTiddler({
+				title: 'TestOutgoing',
+				text: 'A transclude to {{TestIncoming}}'});
+
+			wiki.addTiddler({
+				title: 'TestOutgoing2',
+				text: 'Nothing yet!'});
+
+			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
+
+			wiki.addTiddler({
+				title: 'TestOutgoing2',
+				text: 'Updated with transclude to {{TestIncoming}}'});
+
+			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing,TestOutgoing2');
+		});
+	});
+
+	describe('A tiddler that has a transclude remove from it later', function() {
+		var wiki = new $tw.Wiki();
+
+		wiki.addTiddler({
+			title: 'TestIncoming',
+			text: ''});
+
+		wiki.addTiddler({
+			title: 'TestOutgoing',
+			text: 'A transclude to {{TestIncoming}}'});
+
+		it('should have one fewer backtransclude', function() {
+			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
+
+			wiki.addTiddler({
+				title: 'TestOutgoing',
+				text: 'No transclude to ~TestIncoming'});
+
+			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('');
+		});
+	});
+
+	describe('A tiddler transcludeing to another that gets renamed', function() {
+		var wiki = new $tw.Wiki();
+
+		wiki.addTiddler({
+			title: 'TestIncoming',
+			text: ''});
+
+		wiki.addTiddler({
+			title: 'TestOutgoing',
+			text: 'A transclude to {{TestIncoming}}'});
+
+		it('should have its name changed in the backtranscludes', function() {
+			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
+
+			wiki.renameTiddler('TestOutgoing', 'TestExtroverted');
+
+			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestExtroverted');
+		});
+	});
+
+	describe('A tiddler transcludeing to another that gets deleted', function() {
+		var wiki = new $tw.Wiki();
+
+		wiki.addTiddler({
+			title: 'TestIncoming',
+			text: ''});
+
+		wiki.addTiddler({
+			title: 'TestOutgoing',
+			text: 'A transclude to {{TestIncoming}}'});
+
+		it('should be removed from backtranscludes', function() {
+			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
+
+			wiki.deleteTiddler('TestOutgoing');
+
+			expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('');
+		});
+	});
+});
+
+})();

editions/translators/tiddlywiki.info

@@ -22,6 +22,7 @@
 		"it-IT",
 		"ja-JP",
 		"ko-KR",
+		"mk-MK",
 		"nl-NL",
 		"pa-IN",
 		"pl-PL",

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

@@ -1,3 +0,0 @@
-list: HelloThere
-title: $:/StoryList
-type: text/vnd.tiddlywiki

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

@@ -1,5 +0,0 @@
-created: 20220728145919904
-list: Brackets Base64 HelloThere GettingStarted Community
-modified: 20220728145919904
-title: $:/StoryList
-type: text/vnd.tiddlywiki

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

@@ -8,6 +8,7 @@ There are several resources for developers to learn more about TiddlyWiki and to
 
 * [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] is the official developer documentation
 * Get involved in the [[development on GitHub|https://github.com/Jermolene/TiddlyWiki5]]
+** [img[https://repobeats.axiom.co/api/embed/5a3bb51fd1ebe84a2da5548f78d2d74e456cebf3.svg]]
 ** [[Discussions|https://github.com/Jermolene/TiddlyWiki5/discussions]] are for Q&A and open-ended discussion
 ** [[Issues|https://github.com/Jermolene/TiddlyWiki5/issues]] are for raising bug reports and proposing specific, actionable new ideas
 * The older ~TiddlyWikiDev Google Group is now closed in favour of [[GitHub Discussions|https://github.com/Jermolene/TiddlyWiki5/discussions]] but remains a useful archive: https://groups.google.com/group/TiddlyWikiDev

editions/tw5.com/tiddlers/community/plugins/Disqus comments plugin by bimlas.tid

@@ -3,7 +3,7 @@ modified: 20210106151027439
 tags: [[Community Plugins]]
 title: Disqus comments plugin by bimlas
 type: text/vnd.tiddlywiki
-url: https://bimlas.gitlab.io/tw5-disqus/
+url: https://bimlas.github.io/tw5-disqus/
 
 Use this plugin to give your visitors the opportunity to comment on your tiddlers without changing the wiki itself.
 

editions/tw5.com/tiddlers/community/plugins/Kin filter operator by bimlas.tid

@@ -3,7 +3,7 @@ modified: 20210106151027488
 tags: [[Community Plugins]]
 title: Kin filter operator by bimlas
 type: text/vnd.tiddlywiki
-url: https://bimlas.gitlab.io/tw5-kin-filter/
+url: https://bimlas.github.io/tw5-kin-filter/
 
 The purpose of the kin operator with examples:
 

editions/tw5.com/tiddlers/community/plugins/Locator plugin by bimlas.tid

@@ -3,7 +3,7 @@ modified: 20210106151027508
 tags: [[Community Plugins]]
 title: Locator plugin by bimlas
 type: text/vnd.tiddlywiki
-url: https://bimlas.gitlab.io/tw5-locator/
+url: https://bimlas.github.io/tw5-locator/
 
 For those who use many tags or store many different topics in a common wiki the Locator plugin is a table of contents widget and an enhanced search engine that gives you the opportunity to filter results by related tags. Unlike table of contents, standard search and list of tags, this plugin offers these features in an organic, collaborative way.
 

editions/tw5.com/tiddlers/community/themes/Notebook theme by Nicolas Petton.tid

@@ -1,9 +1,9 @@
 created: 20210101154635213
-modified: 20210110210929321
+modified: 20240131143350890
 tags: [[Community Themes]]
 title: "Notebook theme" by Nicolas Petton
 type: text/vnd.tiddlywiki
-url: https://nicolas.petton.fr/tw/notebook.html
+url: https://saqimtiaz.github.io/sq-tw/notebook.html
 
 Notebook is a clean, uncluttered theme for ~TiddlyWiki.
 

editions/tw5.com/tiddlers/concepts/Bags and Recipes.tid

@@ -0,0 +1,42 @@
+created: 20240309135835396
+modified: 20240309142156125
+tags: Concepts
+title: Bags and Recipes
+type: text/vnd.tiddlywiki
+
+The bags and recipes model is a reference architecture for how tiddlers can be shared between multiple wikis. It was first introduced by TiddlyWeb in 2008.
+
+The principles of bags and recipes can be simply stated:
+
+# Tiddlers are stored in named "bags"
+# Bags have access controls that determines which users can read or write to them
+# Recipes are named lists of bags, ordered from lowest priority to highest
+# The tiddlers within a recipe are accumulated in turn from each bag in the recipe in order of increasing priority. Thus, if there are multiple tiddlers with the same title in different bags then the one from the highest priority bag will be used as the recipe tiddler
+# Wikis are composed by splicing the tiddlers from the corresponding recipe into the standard TW5 HTML template
+
+A very simple example of the recipe/bag model might be for a single user who maintains the following bags:
+
+* ''recipes'' - tiddlers related to cooking recipes
+* ''work'' - tiddlers related to work
+* ''app'' - common tiddlers for customising TiddlyWiki
+
+Those bags would be used with the following recipes:
+
+* ''recipes'' --> recipes, app - wiki for working with recipes, with common custom components
+* ''work'' --> work, app - wiki for working with work, with common custom components
+* ''app'' --> app - wiki for maintaining custom components
+
+All of this will work dynamically, so changes to the app bag will instantly ripple into the affected hosted wikis.
+
+A more complex example might be for a teacher working with a group of students:
+
+* ''student-{name}'' bag for each students work
+* ''teacher-course'' bag for the coursework, editable by the teacher
+* ''teacher-tools'' bag for custom tools used by the teacher
+
+Those bags would be exposed through the following hosted wikis:
+
+* ''student-{name}'' hosted wiki for each students work, including the coursework material
+* ''teacher-course'' hosted wiki for the coursework, editable by the teacher
+* ''teacher'' hosted wiki for the teacher, bringing together all the bags, giving them an overview of all the students work
+

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

@@ -1,7 +1,7 @@
 created: 20130827080000000
 list: [[Introduction to filter notation]] [[Filter Syntax]]
-modified: 20220316145511797
+modified: 20230710074511095
-tags: Reference Concepts
+tags: Reference Concepts TableOfContents
 title: Filters
 type: text/vnd.tiddlywiki
 
@@ -15,7 +15,7 @@ You can think of TiddlyWiki as a database in which the records are tiddlers. A d
 
 A <<.def filter>> is a concise notation for selecting a particular [[set of tiddlers|Title Selection]], known as its <<.def "output">>. Whenever ~TiddlyWiki encounters a filter, it calculates the output. Further work can then be done with just those tiddlers, such as [[counting|CountWidget]] or [[listing|ListWidget]] them.
 
-The following example passes a filter to the <<.mlink list-links>> macro to display a list of all tiddlers whose titles are <<.olink2 tagged tag>> with the word <<.word Filters>>:
+The following example passes a filter to the <<.mlink list-links>> macro. It displays a list of all tiddlers using the <<.olink2 tag tag>> <<.word Filters>>:
 
 <<wikitext-example-without-html """<<list-links "[tag[Filters]]">>""" >>
 

editions/tw5.com/tiddlers/concepts/Temporary Tiddlers.tid

@@ -0,0 +1,8 @@
+created: 20240202112358997
+modified: 20240202120248326
+tags: Concepts
+title: Temporary Tiddlers
+
+Temporary tiddlers are tiddlers that will be discarded when TiddlyWiki is saved. Under default configuration of the SavingMechanism (more specifically, the filter in [[$:/core/save/all]]), these are tiddlers prefixed with `$:/temp/`. This prefix makes them SystemTiddlers as well.
+
+One example usage of temporary tiddlers is storing the search queries. The query typed in the [[$:/AdvancedSearch]] is stored in [[$:/temp/advancedsearch]].

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

@@ -1,5 +1,5 @@
 created: 20130827075900000
-modified: 20161216173541948
+modified: 20230321130421587
 tags: Concepts
 title: TextReference
 type: text/vnd.tiddlywiki
@@ -27,7 +27,7 @@ Text references can be used in several places:
 
 * As [[indirect parameters|Filter Parameter]] within [[Filters]] (eg, `<$list filter="[tag{MyTag!!name}]"/>`)
 * As [[indirect attributes|HTML in WikiText]] of an element or widget (eg, `<$widget attrib={{Title!!description}}/>`)
-* As the operand of a shortcut transclusion (eg, `{{MyTiddler!!title}}`)
+* As the parameter of a shortcut transclusion (eg, `{{MyTiddler!!title}}`)
 * As the `state` attribute of the RevealWidget and the LinkCatcherWidget
 
 <$macrocall $name=".tip" _="""Note the distinction between a text reference such as `foo!!bar` and a transclusion of a text reference such as `{{foo!!bar}}`"""/>

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

@@ -0,0 +1,9 @@
+created: 20230319131443509
+modified: 20230319132235520
+tags: Definitions
+title: Legacy
+type: text/vnd.tiddlywiki
+
+>Legacy code is old computer source code that is no longer supported on the standard hardware and environments, and is a codebase that is in some respect obsolete or supporting something obsolete. Legacy code may be written in programming languages, use frameworks and external libraries, or use architecture and patterns that are no longer considered modern, increasing the mental burden and ramp-up time for software engineers who work on the codebase.
+>
+>https://en.wikipedia.org/wiki/Legacy_system

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

@@ -2,8 +2,9 @@ created: 201308300841
 modified: 20170127221451610
 tags: Definitions
 title: TiddlyWeb
+type: text/vnd.tiddlywiki
 
-TiddlyWeb is a reference implementation for an interface to put [[Tiddlers]] on the web.
+TiddlyWeb is a reference implementation for an interface to put [[Tiddlers]] on the web using the [[Bags and Recipes]] model.
 
 It was created by a team led by Chris Dent at [[Osmosoft]] under [[BT]] from 2008 to 2012. 
 
@@ -16,5 +17,3 @@ Other implementations of the API include:
 * [[TiddlyWiki App Engine Server|https://github.com/rsc/tiddly]], a 300-line Go implementation from Russ Cox
 * [[TiddlyWiki 5 server module|https://github.com/Jermolene/TiddlyWiki5/blob/master/core/modules/commands/server.js]], the bare-bones subset of the API implemented in TiddlyWiki version 5 for Node.js
 * [[tiddly-wiki-server|https://github.com/nathanielknight/tiddly-wiki-server]], an implementation based on Rust and SQLite
-
-As of early 2017, none is currently as complete as TiddlyWeb itself.

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

@@ -0,0 +1,9 @@
+created: 20240309100338678
+modified: 20240309135821423
+tags: Definitions
+title: TiddlyWebAdaptor
+type: text/vnd.tiddlywiki
+
+TiddlyWebAdaptor is a component of [[TiddlyWiki on Node.js]]. It provides the means to synchronise changes to tiddlers from the browser to a server, and from the server to the browser. It can be found in the plugin [[$:/plugins/tiddlywiki/tiddlyweb]].
+
+TiddlyWebAdaptor was designed to be compatible both with TiddlyWeb and with TiddlyWiki's own built-in server mechanism. The [[Bags and Recipes]] model is fully supported by [[TiddlyWeb]], but TiddlyWiki's built-in server only supports a simplified model with a single bag and a single recipe.

editions/tw5.com/tiddlers/filters/Conditional Operators.tid

@@ -1,10 +1,10 @@
 created: 20190802113703788
-modified: 20230501175143648
+modified: 20230711082337975
 tags: Filters
 title: Conditional Operators
 type: text/vnd.tiddlywiki
 
-<<.from-version "5.1.20">>The conditional filter operators allow for ''if-then-else'' logic to be expressed within filters.
+<<.from-version "5.1.20">> The conditional filter operators allow ''if-then-else'' logic to be expressed within filters.
 
 The foundation is the convention that an empty list can be used to represent the Boolean value <<.value false>> and a list with at one (or more) entries to represent <<.value true>>.
 
@@ -25,6 +25,8 @@ The <<.olink else>> operator can be used to apply a defaults for missing values.
 
 <<.operator-example 2 "[[HelloThere]get[custom-field]else[default-value]]">>
 
-! Filter Run Prefixes
+''Filter Run Prefixes''
 
-The [[:then|:then Filter Run Prefix]] and [[:else|:else Filter Run Prefix]] filter run prefixes serve a similar purpose as the conditional operators.  Refer to their documentation for more information.
+The [[:then|Then Filter Run Prefix]] and [[:else|Else Filter Run Prefix]] named filter run prefixes serve a similar purpose as the conditional operators. 
+
+Also see: [[Named Filter Run Prefix]]

editions/tw5.com/tiddlers/filters/Filter Operators.tid

@@ -1,5 +1,6 @@
+breadcrumbs: [[Filter Step]]
 created: 20140410103123179
-modified: 20211217141224284
+modified: 20230410114132501
 tags: Filters
 title: Filter Operators
 type: text/vnd.tiddlywiki
@@ -18,13 +19,19 @@ type: text/vnd.tiddlywiki
 <tr class="doc-table-subheading"><th colspan="5" align="center">$_$</th></tr>
 \end
 
-A <<.def "filter operator">> is a predefined keyword attached to an individual [[step|Filter Step]] of a [[filter|Filters]]. It defines the particular action of that step.
+A <<.def "filter operator">> is a predefined keyword attached to an individual step of a [[filter|Filters]]. It defines the particular action of that step.
 
-''Important:'' Each first [[step|Filter Step]] of a [[filter run|Filter Run]] not given any input titles receives the output of <$link to="all Operator">[all[tiddlers]]</$link> as its input.
+''Important:'' In general, each first [[filter step|Filter Step]] of a [[filter run|Filter Run]] not given any input titles receives the output of <$link to="all Operator">[all[tiddlers]]</$link> as its input.
 
-The following table lists all core operators, the most common ones marked ✓. The `!` column indicates whether an operator allows ''negation'' using the <$link to="Filter Step"><code>!</code> prefix</$link>. For specifics as to each operator's negated output please refer to its documentation. 
 
-Most steps process the [[selection of titles|Title Selection]] that are supplied as their input, but a few [[construct an entirely new selection|Selection Constructors]] instead, as indicated by the last column. A `C?` indicates it might construct a new selection, depending on usage. For specifics as to each operator's selection creation please refer to its documentation. 
+''Table legend:''
+
+|tc-table-no-border tc-first-col-min-width|k
+|^ ✓|^... |,Used to mark the most common ones |
+|^ `!`|^... |,The column indicates whether an operator allows ''negation'' using the <$link to="Filter Step"><code>!</code> prefix</$link>.<br>For specifics as to each operator's negated output please refer to its documentation |
+|^ `C`|^... |,Most steps process the [[selection of titles|Title Selection]] that are supplied as their input, but a few [[construct an entirely new selection|Selection Constructors]] instead, as indicated by the last column.<br>A `C?` indicates it might construct a new selection, depending on usage. For specifics as to each operator's selection creation please refer to its documentation |
+
+The following table lists all core operators:
 
 <table>
 <tr>
@@ -49,6 +56,6 @@ Most steps process the [[selection of titles|Title Selection]] that are supplied
 <<.operator-rows "[tag[Filter Operators]!tag[Order Operators]!tag[Mathematics Operators]!tag[String Operators]!tag[Tag Operators]tag[Special Operators]sort[]]">>
 </table>
 
-A typical step is written as `[operator[parameter]]`, although not all of the operators need a [[parameter|Filter Parameter]]. 
+A typical step is written as `[operator[parameter]]`, although not all of the operators need a [[parameter|Filter Parameter]].
 
 For the exact rules, see [[Filter Syntax]].

editions/tw5.com/tiddlers/filters/Mathematics Operators.tid

@@ -1,5 +1,5 @@
 created: 20190206140446821
-modified: 20220330133748666
+modified: 20230321133008898
 tags: Filters
 title: Mathematics Operators
 type: text/vnd.tiddlywiki
@@ -22,7 +22,7 @@ The mathematics operators take three different forms:
 ** <<.inline-operator-example "=1 =2 =3 =4 +[negate[]]">>
 ** <<.inline-operator-example "=1.2 =2.4 =3.6 =4.8 +[trunc[]]">>
 ** <<.inline-operator-example "=1.2 =2.4 =3.6 =4.8 +[round[]]">>
-* ''Binary operators'' apply an operation and operand to each number in the input list (e.g. add, multiply, remainder) 
+* ''Binary operators'' apply an operation and parameter to each number in the input list (e.g. add, multiply, remainder) 
 ** <<.inline-operator-example "=1 =2 =3 =4 +[add[3]]">>
 ** <<.inline-operator-example "=1 =2 =3 =4 +[multiply[8]]">>
 * ''Reducing operators'' apply an operation to all of the numbers in the input list, returning a single result (e.g. sum, product)

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

@@ -1,11 +1,11 @@
 caption: add
 created: 20190206140446821
-modified: 20190611125053329
+modified: 20230321130647487
 op-input: a [[selection of titles|Title Selection]]
 op-output: the input as numbers, but with <<.place N>> added to each one
 op-parameter: a number
 op-parameter-name: N
-op-purpose: treating each input title as a number, add to each the numeric value of the operand
+op-purpose: treating each input title as a number, add to each the numeric value of the parameter
 tags: [[Filter Operators]] [[Mathematics Operators]] [[Binary Mathematics Operators]]
 title: add Operator
 type: text/vnd.tiddlywiki

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

@@ -1,6 +1,6 @@
 caption: all
 created: 20140410103123179
-modified: 20211217135719266
+modified: 20230321131457669
 op-input: ignored, unless the parameter is empty
 op-output: the titles that belong to all the specified categories
 op-parameter: zero or more categories
@@ -9,10 +9,14 @@ tags: [[Filter Operators]] [[Common Operators]] [[Selection Constructors]] [[Sel
 title: all Operator
 type: text/vnd.tiddlywiki
 
-The parameter specifies zero or more fundamental categories using the following syntax:
+The parameter specifies zero or more fundamental categories using the following [[filter step|Filter Step]] syntax:
 
 <$railroad text="""
-[{: ("current" | "missing" |: "orphans" | "shadows" | "tags" | "tiddlers" ) +"+" }]
+\start none
+\end none
+<-"all"->  (  "[" | "<" | "{"  )
+   [{: ("current" | "missing" |: "orphans" | "shadows" | "tags" | "tiddlers" ) +"+" }] 
+   (  "]" | ">" | "}"  )
 """/>
 
 |!Category |!Members |!Sorted |
@@ -25,7 +29,7 @@ The parameter specifies zero or more fundamental categories using the following
 
 If the parameter specifies more than one category, they are processed from left to right. The overall output is initially empty, and each category's output is [[dominantly appended|Dominant Append]] to it in turn. Unrecognised categories contribute nothing to the output.
 
-As a special case, if the parameter is empty, the output is simply a copy of the input. This can be useful when the parameter is [[soft|Filter Parameter]].
+As a special case, if the parameter is empty, the output is simply a copy of the input. This can be useful when the parameter is a [[soft parameter|Filter Parameter]].
 
 The <<.olink is>> operator is similar, but its scope is restricted to its input.
 

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

@@ -1,9 +1,9 @@
 caption: append
 created: 20151017145358368
-modified: 20151108051540981
+modified: 20230321131631510
 op-input: a list of items
-op-neg-output: a list with items appended from the tail of the operand array
+op-neg-output: a list with items appended from the tail of the parameter array
-op-output: a list with items appended from the head of the operand array
+op-output: a list with items appended from the head of the parameter array
 op-parameter: the array of items to be appended to the tail of the list
 op-parameter-name: list
 op-purpose: append a range of items from an array to the list

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

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

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

@@ -2,7 +2,7 @@ caption: charcode
 created: 20210622214425635
 modified: 20210622214425635
 op-input: ignored
-op-output: a string formed from concatenating the characters specified by the numeric codes given in the operand(s)
+op-output: a string formed from concatenating the characters specified by the numeric codes given in the parameter(s)
 op-parameter: numeric character code
 op-parameter-name: C
 op-purpose: generates string characters from their numeric character codes
@@ -12,6 +12,6 @@ type: text/vnd.tiddlywiki
 
 <<.from-version "5.2.0">>
 
-This operator returns a string formed from concatenating the characters specified by the numeric codes given in one or more operands. It is useful for generating special characters such as tab (`charcode[9]`) or new line (`charcode[13],[10]`).
+This operator returns a string formed from concatenating the characters specified by the numeric codes given in one or more parameters. It is useful for generating special characters such as tab (`charcode[9]`) or new line (`charcode[13],[10]`).
 
 <<.operator-examples "charcode">>

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

@@ -4,7 +4,7 @@ tags: [[Filter Operators]] [[Mathematics Operators]] [[String Operators]] [[Nega
 title: compare Operator
 type: text/vnd.tiddlywiki
 caption: compare
-op-purpose: filter the input by comparing each item against the operand
+op-purpose: filter the input by comparing each item against the parameter
 op-input: a [[selection of titles|Title Selection]]
 op-suffix: the <<.op compare>> operator uses a rich suffix, see below for details
 op-parameter: the value to compare
@@ -16,7 +16,7 @@ op-neg-output: those input titles <<.em not>> matching the specified comparison
 The <<.op compare>> operator uses an extended syntax to specify all the options:
 
 ```
-[compare:<type>:<mode>[<operand>]]
+[compare:<type>:<mode>[<parameter>]]
 ```
 
 The ''type'' can be:

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

@@ -4,7 +4,7 @@ modified: 20201118192136472
 op-input: a list of items
 op-output: the input list with the titles specified in the parameter toggled in a cyclical manner
 op-parameter: the <<.op cycle>> operator accepts 1 or 2 parameters, see below for details
-op-purpose: toggle in the input, the titles specified in the first operand in a cyclical manner
+op-purpose: toggle the titles specified in the first parameter in a cyclical manner
 tags: [[Filter Operators]] [[Listops Operators]] [[Order Operators]]
 title: cycle Operator
 type: text/vnd.tiddlywiki

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

@@ -5,7 +5,7 @@ op-input: a [[selection of titles|Title Selection]]
 op-output: the input as numbers, but with each one divided by <<.place N>>
 op-parameter: a number
 op-parameter-name: N
-op-purpose: treating each input title as a number, divide them by the numeric value of the operand
+op-purpose: treating each input title as a number, divide it by the numeric value of the parameter
 tags: [[Filter Operators]] [[Mathematics Operators]] [[Binary Mathematics Operators]]
 title: divide Operator
 type: text/vnd.tiddlywiki

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

@@ -7,14 +7,14 @@ op-neg-output: those input titles that are <<.em not>> listed in <<.place L>>
 op-output: the titles stored as a [[title list|Title List]] at <<.place L>>
 op-parameter: a [[title list|Title List]]
 op-parameter-name: L
-op-purpose: select titles from the operand interpreted as a [[title list|Title List]]
+op-purpose: select titles from the parameter interpreted as a [[title list|Title List]]
 op-suffix: <<.from-version "5.1.20">> `dedupe` (the default) to remove duplicates, `raw` to leave duplicates untouched
 op-suffix-name: D
 tags: [[Filter Operators]] [[Field Operators]] [[Selection Constructors]] [[Negatable Operators]]
 title: enlist Operator
 type: text/vnd.tiddlywiki
 
-<<.tip """Literal filter operands cannot contain square brackets but you can work around the issue by using a variable. ''Learn more at:'' [[SetWidget]] documentation under the heading "Filtered List Variable Assignment" """>>
+<<.tip """Literal filter parameters cannot contain square brackets but you can work around the issue by using a variable. ''Learn more at:'' [[SetWidget]] documentation under the heading "Filtered List Variable Assignment" """>>
 
 ```
 <$set name="myList" value="first [[second with a space]] third">

editions/tw5.com/tiddlers/filters/enlist-input Operator.tid

@@ -12,7 +12,7 @@ type: text/vnd.tiddlywiki
 
 <<.from-version "5.1.23">>
 
-<<.tip " Compare with [[enlist|enlist Operator]] operator that interprets its operand as a title list">>
+<<.tip " Compare with [[enlist|enlist Operator]] operator that interprets its parameter as a title list">>
 
 ```
 <$vars days={{{ [[Days of the Week]get[list]] }}}>

editions/tw5.com/tiddlers/filters/examples/backtransclude.tid

@@ -0,0 +1,7 @@
+tags: [[backtranscludes Operator]] [[Operator Examples]]
+title: backtranscludes Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 "[[Motovun Jack.jpg]backtranscludes[]]">>
+
+<<.operator-example 2 "[[Transclusion]backtranscludes[]]">>

editions/tw5.com/tiddlers/filters/examples/prepend.tid

@@ -1,5 +1,5 @@
 created: 20151017151508135
-modified: 20151108051743531
+modified: 20230321130446467
 tags: [[Operator Examples]] [[prepend Operator]]
 title: prepend Operator (Examples)
 type: text/vnd.tiddlywiki
@@ -10,6 +10,6 @@ The operator may be used to prepend a number of items to the list.
 
 <<.operator-example 1 "[list[Days of the Week]prepend[Yesterday Today Tomorrow]]">>
 
-The operand may list only items without spaces -- to include items with spaces, use a reference to an array e.g. prepend the last three short days of the week to the list
+The parameter may list only items without spaces -- to include items with spaces, use a reference to an array, e.g. prepend the last three short days of the week to the list
 
 <<.operator-example 2 "[list[Days of the Week]!prepend:3{Days of the Week!!short}]">>

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

@@ -0,0 +1,9 @@
+created: 20240308122813807
+modified: 20240308122916812
+tags: [[Operator Examples]] [[sha256 Operator]]
+title: sha256 Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 "[[test]sha256[]]">>
+
+<<.operator-example 2 "[[test]sha256[64]]">>

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

@@ -9,7 +9,7 @@ type: text/vnd.tiddlywiki
 ''<$text text=<<__name__>>/>'': <code><$text text={{{ [<__name__>getvariable[]] }}}/></code>
 \end
 
-Literal filter operands can be used, but such cases are better rewritten without using <<.op subfilter>>:
+Literal filter parameters can be used, but such cases are better rewritten without using <<.op subfilter>>:
 <<.operator-example 1 "[subfilter[one two three]addsuffix[!]]" "same as `one two three +[addsuffix[!]]`">>
 
 The <<.op subfilter>> operator can be used to dynamically define parts of a [[filter run|Filter Run]]. This is useful for sharing a common pieces of a filter across multiple filters.

editions/tw5.com/tiddlers/filters/examples/transclude.tid

@@ -0,0 +1,5 @@
+tags: [[transcludes Operator]] [[Operator Examples]]
+title: transcludes Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 "[[Images in WikiText]transcludes[]]">>

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

@@ -1,23 +1,23 @@
+caption: field
 created: 20140410103123179
-modified: 20150203184718000
+modified: 20230316111901766
+op-input: a [[selection of titles|Title Selection]]
+op-neg-output: those input tiddlers in which field <<.place F>> does <<.em not>> have the value <<.place S>>
+op-output: those input tiddlers in which field <<.place F>> has the value <<.place S>>
+op-parameter: a possible value of field <<.place F>>
+op-parameter-name: S
+op-purpose: filter the input by field
+op-suffix: the name of a [[field|TiddlerFields]]
+op-suffix-name: F
 tags: [[Filter Operators]] [[Common Operators]] [[Field Operators]] [[Negatable Operators]]
 title: field Operator
 type: text/vnd.tiddlywiki
-caption: field
-op-purpose: filter the input by field
-op-input: a [[selection of titles|Title Selection]]
-op-suffix: the name of a [[field|TiddlerFields]]
-op-suffix-name: F
-op-parameter: a possible value of field <<.place F>>
-op-parameter-name: S
-op-output: those input tiddlers in which field <<.place F>> has the value <<.place S>>
-op-neg-output: those input tiddlers in which field <<.place F>> does <<.em not>> have the value <<.place S>>
 
 If <<.place S>> is empty, <<.op field>> will match both of the following:
 
 * tiddlers that don't contain field <<.place F>>
 * tiddlers in which field <<.place F>> exists but has an empty value
 
-The syntax of a [[filter step|Filter Step]] treats any unrecognised [[filter operator|Filter Operators]] as if it was the suffix to the <<.op field>> operator. See the <<.operator-examples "field" "examples">>.
+The syntax of a [[filter step|Filter Step]] treats any unrecognised [[filter operator|Filter Operators]] as if it was the suffix to the <<.op field>> operator.
 
 <<.operator-examples "field">>

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

@@ -1,6 +1,6 @@
 caption: format
 created: 20201020100834443
-modified: 20220611104737314
+modified: 20230321132245053
 op-input: a [[selection of titles|Title Selection]]
 op-output: input strings formatted according to the specified suffix <<.place B>>
 op-parameter: optional format string for the formats
@@ -16,11 +16,11 @@ type: text/vnd.tiddlywiki
 
 The suffix <<.place B>> is one of the following supported string formats:
 
-|!Format |!Description |
+|Format |Description |h
-|^`date` |The input string is interpreted as a UTC date and displayed according to the DateFormat specified in the optional operator operand. (Defaults to "YYYY MM DD 0hh:0mm") |
+|^`date` |The input string is interpreted as a UTC date and displayed according to the DateFormat specified in the optional parameter <<.place C>>. (Defaults to "YYYY MM DD 0hh:0mm") |
-|^`json` |<<.from-version "5.2.4">> The input string is interpreted as JSON and displayed with standard formatting. The optional operator operand specifies the number of spaces to use for indenting, or a string to use for indenting. Nothing is returned if the input string is not valid JSON |
+|^`json` |<<.from-version "5.2.4">> The input string is interpreted as JSON and displayed with standard formatting. The optional parameter <<.place C>> specifies the number of spaces to use for indenting, or a string to use for indenting. Nothing is returned if the input string is not valid JSON |
-|^`relativedate` |The input string is interpreted as a UTC date and displayed as the interval from the present instant. Any operator parameters are ignored |
+|^`relativedate` |The input string is interpreted as a UTC date and displayed as the interval from the present instant. Any operator parameters <<.place C>> are ignored |
-|^`timestamp` |<<.from-version "5.3.0">> The input string is interpreted as number of milliseconds since the [[ECMAScript epoch|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#the_ecmascript_epoch_and_timestamps]], 1 January 1970, and displayed according to the DateFormat specified in the optional operator operand. (Defaults to "[UTC]YYYY0MM0DD0hh0mm0ss0XXX") |
+|^`timestamp` |<<.from-version "5.3.0">> The input string is interpreted as number of milliseconds since the [[ECMAScript epoch|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#the_ecmascript_epoch_and_timestamps]], 1 January 1970, and displayed according to the DateFormat specified in the optional operator parameter. (Defaults to "[UTC]YYYY0MM0DD0hh0mm0ss0XXX") |
 |^`titlelist` |<<.from-version "5.2.0">> The input string wrapped in double square brackets if it contains a space. Appropriate for use in a [[title list|Title List]]. |
 
 Invalid input strings are dropped by the <<.op format>> operator.

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

@@ -43,7 +43,7 @@ Properties within a JSON object are identified by a sequence of indexes. In the
 
 The following examples assume that this JSON data is contained in a variable called `jsondata`.
 
-The <<.op jsonextract>> operator uses multiple operands to specify the indexes of the property to retrieve. Values are returned as literal JSON strings:
+The <<.op jsonextract>> operator uses multiple parameters to specify the indexes of the property to retrieve. Values are returned as literal JSON strings:
 
 ```
 [<jsondata>jsonextract[a]] --> "one"
@@ -67,7 +67,7 @@ Indexes can be dynamically composed from variables and transclusions:
 [<jsondata>jsonextract<variable>,{!!field},[0]]
 ```
 
-A subtlety is that the special case of a single blank operand is used to identify the root object. Thus:
+A subtlety is that the special case of a single blank parameter is used to identify the root object. Thus:
 
 ```
 [<jsondata>jsonextract[]] --> {"a":"one","b":"","c":"three","d":{"e":"four","f":["five","six",true,false,null],"g":{"x":"max","y":"may","z":"maize"}}}

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

@@ -43,7 +43,7 @@ Properties within a JSON object are identified by a sequence of indexes. In the
 
 The following examples assume that this JSON data is contained in a variable called `jsondata`.
 
-The <<.op jsonget>> operator uses multiple operands to specify the indexes of the property to retrieve:
+The <<.op jsonget>> operator uses multiple parameters to specify the indexes of the property to retrieve:
 
 ```
 [<jsondata>jsonget[a]] --> "one"
@@ -94,7 +94,7 @@ If the object or array contains nested child objects or arrays then the values a
 [<jsondata>jsonget[d]] --> "four","five","six","true","false","null","max","may","maize"
 ```
 
-A subtlety is that the special case of a single blank operand is used to identify the root object. Thus:
+A subtlety is that the special case of a single blank parameter is used to identify the root object. Thus:
 
 ```
 [<jsondata>jsonindexes[]] --> "a", "b", "c", "d"

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

@@ -43,7 +43,7 @@ Properties within a JSON object are identified by a sequence of indexes. In the
 
 The following examples assume that this JSON data is contained in a variable called `jsondata`.
 
-The <<.op jsonindexes>> operator uses multiple operands to specify the indexes of the property to retrieve:
+The <<.op jsonindexes>> operator uses multiple parameters to specify the indexes of the property to retrieve:
 
 ```
 [<jsondata>jsonindexes[d],[f]] --> "0", "1", "2", "3", "4"
@@ -58,7 +58,7 @@ Indexes can be dynamically composed from variables and transclusions:
 
 Retrieving the indexes of JSON properties that are not objects or arrays will return nothing.
 
-A subtlety is that the special case of a single blank operand is used to identify the root object. Thus:
+A subtlety is that the special case of a single blank parameter is used to identify the root object. Thus:
 
 ```
 [<jsondata>jsonindexes[]] --> "a", "b", "c", "d"

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

@@ -52,7 +52,7 @@ Properties within a JSON object are identified by a sequence of indexes. In the
 
 The following examples assume that this JSON data is contained in a variable called `jsondata`.
 
-The <<.op jsontype>> operator uses multiple operands to specify the indexes of the property whose type is to be retrieved:
+The <<.op jsontype>> operator uses multiple parameters to specify the indexes of the property whose type is to be retrieved:
 
 ```
 [<jsondata>jsontype[a]] --> "string"
@@ -75,7 +75,7 @@ Indexes can be dynamically composed from variables and transclusions:
 [<jsondata>jsontype<variable>,{!!field},[0]]
 ```
 
-A subtlety is that the special case of a single blank operand is used to identify the root object. Thus:
+A subtlety is that the special case of a single blank parameter is used to identify the root object. Thus:
 
 ```
 [<jsondata>jsontype[]] --> "object"

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

@@ -5,7 +5,7 @@ op-input: a [[selection of titles|Title Selection]]
 op-output: the logarithm of each input title as numbers, with base <<.place N>> if specified otherwise base `e`
 op-parameter: a number
 op-parameter-name: N
-op-purpose: treating each input title as a number, return its logarithm with base equal to the numeric value of the operand if specified, otherwise base `e`
+op-purpose: treating each input title as a number, return its logarithm with base equal to the numeric value of the parameter if specified, otherwise base `e`
 tags: [[Filter Operators]] [[Mathematics Operators]] [[Binary Mathematics Operators]]
 title: log Operator
 type: text/vnd.tiddlywiki

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

@@ -1,11 +1,11 @@
 caption: match
 created: 20190731080209404
-modified: 20190731081047732
+modified: 20230711082432865
 op-input: a [[selection of titles|Title Selection]]
-op-neg-output: each item in the input list that does not match the operand string
+op-neg-output: each item in the input list that does not match the parameter string
-op-output: each item in the input list that matches the operand string (potentially including duplicates)
+op-output: each item in the input list that matches the parameter string (potentially including duplicates)
 op-parameter: the string to be matched
-op-purpose: returns each item in the list that matches the operand string
+op-purpose: returns each item in the list that matches the parameter string
 op-suffix: the <<.op match>> operator uses a rich suffix, see below for details
 tags: [[Filter Operators]]
 title: match Operator
@@ -16,11 +16,10 @@ type: text/vnd.tiddlywiki
 The <<.op match>> operator uses an extended syntax that permits multiple flags to be passed:
 
 ```
-[match:<flag list>[<operand>]]
+[match:<flag list>[<parameter>]]
 ```
 
 * ''flag list'': a comma delimited list of flags
-* ''operand'': filter operand
 
 The available flags are:
 

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

@@ -1,11 +1,11 @@
 caption: max
 created: 20190611130631390
-modified: 20190611131047026
+modified: 20230321133057297
 op-input: a [[selection of titles|Title Selection]]
 op-output: the input as numbers, with any that are less than <<.place N>> being replaced by <<.place N>>
 op-parameter: a number
 op-parameter-name: N
-op-purpose: treating each input title as a number, take the maximum of its value and the numeric value of the operand
+op-purpose: treating each input title as a number, take the maximum of its value and the numeric value of the parameter
 tags: [[Filter Operators]] [[Mathematics Operators]] [[Binary Mathematics Operators]]
 title: max Operator
 type: text/vnd.tiddlywiki

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

@@ -5,7 +5,7 @@ op-input: a [[selection of titles|Title Selection]]
 op-output: the input as numbers, with any that are greater than <<.place N>> being replaced by <<.place N>>
 op-parameter: a number
 op-parameter-name: N
-op-purpose: treating each input title as a number, take the minimum of its value and the numeric value of the operand
+op-purpose: treating each input title as a number, take the minimum of its value and the numeric value of the parameter
 tags: [[Filter Operators]] [[Mathematics Operators]] [[Binary Mathematics Operators]]
 title: min Operator
 type: text/vnd.tiddlywiki

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

@@ -2,7 +2,7 @@ caption: modulesproperty
 created: 20210919201126246
 modified: 20210919201347702
 op-input: a [[selection|Title Selection]] of modules
-op-output: the value of the module property as specified in the operand
+op-output: the value of the module property as specified in the parameter
 op-parameter: module property to retrieve
 op-purpose: retrieve a module property
 tags: [[Filter Operators]] [[Special Operators]]