$parameters widgets now claim index parameters sequentially (#7962)

* $parameters widgets now claim index parameters sequentially

Before, they just always used their own indices, which meant unnamed
parameters would get assigned to multiple values, which wasn't any
use to anyone.

* Elaborated tests for nested parameters

* Added example to clarify how multiple paramter definitions are handled

* Updated \procedure documentation

* Removed depth from $parameters

* Add failing test

* Adjusted transclude to account for refreshing

* This index system should work

It handles some strange edge cases too.

* Stupid end-of-file newlines

* Removed redundant whitespace pragma

---------

Co-authored-by: Jeremy Ruston <jeremy@jermolene.com>

.gitignore

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

bin/build-site.sh

@@ -156,28 +156,6 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--build index favicon static \
 	|| exit 1
 
-# /tour.html			tour edition
-node $TW5_BUILD_TIDDLYWIKI \
-	./editions/tour \
-	--verbose \
-	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all tour.html text/plain \
-	|| exit 1
-
-# /dev/index.html			Developer docs
-# /dev/favicon.ico			Favicon for dev site
-# /dev/static.html			Static rendering of default tiddlers
-# /dev/alltiddlers.html		Static rendering of all tiddlers
-# /dev/static/*				Static single tiddlers
-# /dev/static/static.css	Static stylesheet
-node $TW5_BUILD_TIDDLYWIKI \
-	./editions/dev \
-	--verbose \
-	--load $TW5_BUILD_OUTPUT/build.tid \
-	--output $TW5_BUILD_OUTPUT/dev \
-	--build index favicon static \
-	|| exit 1
-
 # /share.html				Custom edition for sharing via the URL
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/share \

boot/boot.css.tid

@@ -1,3 +1,6 @@
+title: $:/boot/boot.css
+type: text/css
+
 /*
 Basic styles used before we boot up the parsing engine
 */

boot/boot.js

@@ -142,15 +142,15 @@ $tw.utils.each = function(object,callback) {
 	var next,f,length;
 	if(object) {
 		if(Object.prototype.toString.call(object) == "[object Array]") {
-			for(f=0, length=object.length; f<length; f++) {
+			for (f=0, length=object.length; f<length; f++) {
 				next = callback(object[f],f,object);
 				if(next === false) {
 					break;
 				}
-			}
+		    }
 		} else {
 			var keys = Object.keys(object);
-			for(f=0, length=keys.length; f<length; f++) {
+			for (f=0, length=keys.length; f<length; f++) {
 				var key = keys[f];
 				next = callback(object[key],key,object);
 				if(next === false) {
@@ -177,7 +177,6 @@ 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"]) {
@@ -219,34 +218,9 @@ $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"}),
-			closeButton = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )})], "class": "tc-error-prompt"}),
-			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"});
+			button = 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"});
 		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();
@@ -275,7 +249,7 @@ Extend an object with the properties from a list of source objects
 $tw.utils.extend = function(object /*, sourceObjectList */) {
 	$tw.utils.each(Array.prototype.slice.call(arguments,1),function(source) {
 		if(source) {
-			for(var p in source) {
+			for (var p in source) {
 				object[p] = source[p];
 			}
 		}
@@ -289,7 +263,7 @@ Fill in any null or undefined properties of an object with the properties from a
 $tw.utils.deepDefaults = function(object /*, sourceObjectList */) {
 	$tw.utils.each(Array.prototype.slice.call(arguments,1),function(source) {
 		if(source) {
-			for(var p in source) {
+			for (var p in source) {
 				if(object[p] === null || object[p] === undefined) {
 					object[p] = source[p];
 				}
@@ -812,7 +786,6 @@ $tw.utils.Crypto = function() {
 			}
 			return outputText;
 		};
-	$tw.sjcl = sjcl;
 	this.setPassword = function(newPassword) {
 		currentPassword = newPassword;
 		this.updateCryptoStateTiddler();
@@ -893,8 +866,8 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 	} else {
 		/*
 		CommonJS optional require.main property:
-			In a browser we offer a fake main module which points back to the boot function
-			(Theoretically, this may allow TW to eventually load itself as a module in the browser)
+		 In a browser we offer a fake main module which points back to the boot function
+		 (Theoretically, this may allow TW to eventually load itself as a module in the browser)
 		*/
 		Object.defineProperty(sandbox.require, "main", {
 			value: (typeof(require) !== "undefined") ? require.main : {TiddlyWiki: _boot},
@@ -936,9 +909,9 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 				moduleInfo.exports = moduleInfo.definition;
 			}
 		} catch(e) {
-			if(e instanceof SyntaxError) {
+			if (e instanceof SyntaxError) {
 				var line = e.lineNumber || e.line; // Firefox || Safari
-				if(typeof(line) != "undefined" && line !== null) {
+				if (typeof(line) != "undefined" && line !== null) {
 					$tw.utils.error("Syntax error in boot module " + name + ":" + line + ":\n" + e.stack);
 				} else if(!$tw.browser) {
 					// this is the only way to get node.js to display the line at which the syntax error appeared,
@@ -1533,7 +1506,7 @@ Define all modules stored in ordinary tiddlers
 $tw.Wiki.prototype.defineTiddlerModules = function() {
 	this.each(function(tiddler,title) {
 		if(tiddler.hasField("module-type")) {
-			switch(tiddler.fields.type) {
+			switch (tiddler.fields.type) {
 				case "application/javascript":
 					// We only define modules that haven't already been defined, because in the browser modules in system tiddlers are defined in inline script
 					if(!$tw.utils.hop($tw.modules.titles,tiddler.fields.title)) {
@@ -1994,10 +1967,10 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 					var value = tiddler[name];
 					switch(fieldInfo.source) {
 						case "subdirectories":
-							value = path.relative(rootPath, filename).split(path.sep).slice(0, -1);
+							value = path.relative(rootPath, filename).split('/').slice(0, -1);
 							break;
 						case "filepath":
-							value = path.relative(rootPath, filename).split(path.sep).join('/');
+							value = path.relative(rootPath, filename);
 							break;
 						case "filename":
 							value = path.basename(filename);
@@ -2043,7 +2016,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 		arrayOfFiles = arrayOfFiles || [];
 		var files = fs.readdirSync(dirPath);
 		files.forEach(function(file) {
-			if(recurse && fs.statSync(dirPath + path.sep + file).isDirectory()) {
+			if (recurse && fs.statSync(dirPath + path.sep + file).isDirectory()) {
 				arrayOfFiles = getAllFiles(dirPath + path.sep + file, recurse, arrayOfFiles);
 			} else if(fs.statSync(dirPath + path.sep + file).isFile()){
 				arrayOfFiles.push(path.join(dirPath, path.sep, file));
@@ -2188,16 +2161,13 @@ Returns an array of search paths
 */
 $tw.getLibraryItemSearchPaths = function(libraryPath,envVar) {
 	var pluginPaths = [path.resolve($tw.boot.corePath,libraryPath)],
-		env;
-	if(envVar) {
 		env = process.env[envVar];
-		if(env) {
-			env.split(path.delimiter).map(function(item) {
-				if(item) {
-					pluginPaths.push(item);
-				}
-			});
-		}
+	if(env) {
+		env.split(path.delimiter).map(function(item) {
+			if(item) {
+				pluginPaths.push(item);
+			}
+		});
 	}
 	return pluginPaths;
 };
@@ -2283,7 +2253,7 @@ $tw.loadWikiTiddlers = function(wikiPath,options) {
 		}
 		$tw.wiki.addTiddlers(tiddlerFile.tiddlers);
 	});
-	if($tw.boot.wikiPath == wikiPath) {
+	if ($tw.boot.wikiPath == wikiPath) {
 		// Save the original tiddler file locations if requested
 		var output = {}, relativePath, fileInfo;
 		for(var title in $tw.boot.files) {
@@ -2468,7 +2438,6 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("image/svg+xml","utf8",".svg",{flags:["image"]});
 	$tw.utils.registerFileType("image/vnd.microsoft.icon","base64",".ico",{flags:["image"]});
 	$tw.utils.registerFileType("image/x-icon","base64",".ico",{flags:["image"]});
-	$tw.utils.registerFileType("application/wasm","base64",".wasm");
 	$tw.utils.registerFileType("application/font-woff","base64",".woff");
 	$tw.utils.registerFileType("application/x-font-ttf","base64",".woff");
 	$tw.utils.registerFileType("application/font-woff2","base64",".woff2");
@@ -2483,12 +2452,8 @@ $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");
@@ -2637,14 +2602,14 @@ $tw.boot.doesTaskMatchPlatform = function(taskModule) {
 	var platforms = taskModule.platforms;
 	if(platforms) {
 		for(var t=0; t<platforms.length; t++) {
-			switch(platforms[t]) {
+			switch (platforms[t]) {
 				case "browser":
-					if($tw.browser) {
+					if ($tw.browser) {
 						return true;
 					}
 					break;
 				case "node":
-					if($tw.node) {
+					if ($tw.node) {
 						return true;
 					}
 					break;
@@ -2727,7 +2692,7 @@ Invoke the hook by key
 $tw.hooks.invokeHook = function(hookName /*, value,... */) {
 	var args = Array.prototype.slice.call(arguments,1);
 	if($tw.utils.hop($tw.hooks.names,hookName)) {
-		for(var i = 0; i < $tw.hooks.names[hookName].length; i++) {
+		for (var i = 0; i < $tw.hooks.names[hookName].length; i++) {
 			args[0] = $tw.hooks.names[hookName][i].apply(null,args);
 		}
 	}

boot/sjcl.js.meta

@@ -0,0 +1,3 @@
+title: $:/library/sjcl.js
+type: application/javascript
+library: yes

boot/tiddlywiki.files

@@ -1,35 +0,0 @@
-{
-	"tiddlers": [
-		{
-			"file": "sjcl.js",
-			"fields": {
-				"title": "$:/library/sjcl.js",
-				"type": "application/javascript",
-				"library": "yes"
-			},
-			"prefix": "(function(define) {\n",
-			"suffix": "\n})(function (_,defined){window.sjcl = defined()})\n"
-		},
-		{
-			"file": "boot.js",
-			"fields": {
-				"title": "$:/boot/boot.js",
-				"type": "application/javascript"
-			}
-		},
-		{
-			"file": "bootprefix.js",
-			"fields": {
-				"title": "$:/boot/bootprefix.js",
-				"type": "application/javascript"
-			}
-		},
-		{
-			"file": "boot.css",
-			"fields": {
-				"title": "$:/boot/boot.css",
-				"type": "text/css"
-			}
-		}
-	]
-}

core/images/default-layout.tid

@@ -1,7 +0,0 @@
-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,7 +28,6 @@ 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/ControlPanel.multids

@@ -206,12 +206,6 @@ Stylesheets/Caption: Stylesheets
 Stylesheets/Expand/Caption: Expand All
 Stylesheets/Hint: This is the rendered CSS of the current stylesheet tiddlers tagged with <<tag "$:/tags/Stylesheet">>
 Stylesheets/Restore/Caption: Restore
-TestCases/Caption: Test Cases
-TestCases/Hint: Test cases are self contained examples for testing and learning
-TestCases/All/Caption: All Test Cases
-TestCases/All/Hint: All Test Cases
-TestCases/Failed/Caption: Failed Test Cases
-TestCases/Failed/Hint: Only Failed Test Cases
 Theme/Caption: Theme
 Theme/Prompt: Current theme:
 TiddlerFields/Caption: Tiddler Fields

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: Parameters for the ''is'' filter operator.
+isfilteroperator: Operands 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/Docs/PaletteColours.multids

@@ -65,9 +65,6 @@ sidebar-tab-foreground-selected: Sidebar tab foreground for selected tabs
 sidebar-tab-foreground: Sidebar tab foreground
 sidebar-tiddler-link-foreground-hover: Sidebar tiddler link foreground hover
 sidebar-tiddler-link-foreground: Sidebar tiddler link foreground
-testcase-accent-level-1: Test case accent colour with no nesting
-testcase-accent-level-2: Test case accent colour with 2nd level nesting
-testcase-accent-level-3: Test case accent colour with 3rd level nesting or higher
 site-title-foreground: Site title foreground
 static-alert-foreground: Static alert foreground
 tab-background-selected: Tab background for selected tabs

core/language/en-GB/Fields.multids

@@ -30,7 +30,6 @@ name: The human readable name associated with a plugin tiddler
 parent-plugin: For a plugin, specifies which plugin of which it is a sub-plugin
 plugin-priority: A numerical value indicating the priority of a plugin tiddler
 plugin-type: The type of plugin in a plugin tiddler
-stability: The development status of a plugin: deprecated, experimental, stable, or legacy
 revision: The revision of the tiddler held at the server
 released: Date of a TiddlyWiki release
 source: The source URL associated with a tiddler

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 parameter for the 'is' filter operator
+Error/IsFilterOperator: Filter Error: Unknown operand 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/commands/makelibrary.js

@@ -27,8 +27,33 @@ var Command = function(params,commander,callback) {
 
 Command.prototype.execute = function() {
 	var wiki = this.commander.wiki,
+		fs = require("fs"),
+		path = require("path"),
 		upgradeLibraryTitle = this.params[0] || UPGRADE_LIBRARY_TITLE,
-		tiddlers = $tw.utils.getAllPlugins();
+		tiddlers = {};
+	// Collect up the library plugins
+	var collectPlugins = function(folder) {
+			var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
+			for(var p=0; p<pluginFolders.length; p++) {
+				if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
+					pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
+					if(pluginFields && pluginFields.title) {
+						tiddlers[pluginFields.title] = pluginFields;
+					}
+				}
+			}
+		},
+		collectPublisherPlugins = function(folder) {
+			var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
+			for(var t=0; t<publisherFolders.length; t++) {
+				if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
+					collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));
+				}
+			}
+		};
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.pluginsPath,$tw.config.pluginsEnvVar),collectPublisherPlugins);
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.themesPath,$tw.config.themesEnvVar),collectPublisherPlugins);
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,$tw.config.languagesEnvVar),collectPlugins);
 	// Save the upgrade library tiddler
 	var pluginFields = {
 		title: upgradeLibraryTitle,

core/modules/commands/save.js

@@ -43,9 +43,7 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 						directory: path.resolve(self.commander.outputPath),
 						pathFilters: [filenameFilter],
 						wiki: wiki,
-						fileInfo: {
-							overwrite: true
-						}
+						fileInfo: {}
 					});
 					if(self.commander.verbose) {
 						console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");

core/modules/commands/savewikifolder.js

@@ -176,10 +176,7 @@ WikiFolderMaker.prototype.saveCustomPlugin = function(pluginTiddler) {
 	this.saveJSONFile(directory + path.sep + "plugin.info",pluginInfo);
 	self.log("Writing " + directory + path.sep + "plugin.info: " + JSON.stringify(pluginInfo,null,$tw.config.preferences.jsonSpaces));
 	var pluginTiddlers = $tw.utils.parseJSONSafe(pluginTiddler.fields.text).tiddlers; // A hashmap of tiddlers in the plugin
-	$tw.utils.each(pluginTiddlers,function(tiddler,title) {
-		if(!tiddler.title) {
-			tiddler.title = title;
-		 }
+	$tw.utils.each(pluginTiddlers,function(tiddler) {
 		self.saveTiddler(directory,new $tw.Tiddler(tiddler));
 	});
 };

core/modules/filters/backtranscludes.js

@@ -1,26 +0,0 @@
-/*\
-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,9 +14,12 @@ 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($tw.utils.sha256(title,{length: length}));
+		results.push(sha256(title));
 	});
 	return results;
 };

core/modules/filters/transcludes.js

@@ -1,26 +0,0 @@
-/*\
-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/filters/x-listops.js

@@ -202,7 +202,7 @@ Extended filter operators to manipulate the current list.
 		}
 		if(resultsIndex !== -1) {
 			i = i + step;
-			nextOperandIndex = (i < opLength ? i : i % opLength);
+			nextOperandIndex = (i < opLength ? i : i - opLength);
 			if(operands.length > 1) {
 				results.splice(resultsIndex,1,operands[nextOperandIndex]);
 			} else {

core/modules/indexers/back-indexer.js

@@ -1,122 +0,0 @@
-/*\
-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) {
-	if(this.wiki.isBinaryTiddler(tiddler.fields.text)) {
-		return [];
-	}
-	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

@@ -0,0 +1,86 @@
+/*\
+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,11 +35,9 @@ exports.run = function(filter,format) {
 	// Collect all the fields
 	for(t=0;t<tiddlers.length; t++) {
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-		if(tiddler) {
-			for(f in tiddler.fields) {
-				if(fields.indexOf(f) === -1) {
-					fields.push(f);
-				}
+		for(f in tiddler.fields) {
+			if(fields.indexOf(f) === -1) {
+				fields.push(f);
 			}
 		}
 	}
@@ -62,10 +60,8 @@ exports.run = function(filter,format) {
 	for(var t=0;t<tiddlers.length; t++) {
 		row = [];
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-			if(tiddler) {
-				for(f=0; f<fields.length; f++) {
-					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/parsers/wikiparser/rules/quoteblock.js

@@ -3,7 +3,30 @@ title: $:/core/modules/parsers/wikiparser/rules/quoteblock.js
 type: application/javascript
 module-type: wikirule
 
-Wiki text rule for quote blocks.
+Wiki text rule for quote blocks. For example:
+
+```
+	<<<.optionalClass(es) optional cited from
+	a quote
+	<<<
+	
+	<<<.optionalClass(es)
+	a quote
+	<<< optional cited from
+```
+
+Quotes can be quoted by putting more <s
+
+```
+	<<<
+	Quote Level 1
+	
+	<<<<
+	QuoteLevel 2
+	<<<<
+	
+	<<<
+```
 
 \*/
 (function(){
@@ -24,15 +47,16 @@ exports.init = function(parser) {
 exports.parse = function() {
 	var classes = ["tc-quote"];
 	// Get all the details of the match
-	var reEndString = "^\\s*" + this.match[1] + "(?!<)";
+	var reEndString = "^" + this.match[1] + "(?!<)";
 	// Move past the <s
 	this.parser.pos = this.matchRegExp.lastIndex;
+	
 	// Parse any classes, whitespace and then the optional cite itself
 	classes.push.apply(classes, this.parser.parseClasses());
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
 	var cite = this.parser.parseInlineRun(/(\r?\n)/mg);
 	// before handling the cite, parse the body of the quote
-	var tree = this.parser.parseBlocks(reEndString);
+	var tree= this.parser.parseBlocks(reEndString);
 	// If we got a cite, put it before the text
 	if(cite.length > 0) {
 		tree.unshift({

core/modules/server/server.js

@@ -140,11 +140,6 @@ function sendResponse(request,response,statusCode,headers,data,encoding) {
 				return;
 			}
 		}
-	} else {
-		// RFC 7231, 6.1. Overview of Status Codes:
-		// Browser clients may cache 200, 203, 204, 206, 300, 301, 
-		// 404, 405, 410, 414, and 501 unless given explicit cache controls
-		headers["Cache-Control"] = headers["Cache-Control"] || "no-store";
 	}
 	/*
 	If the gzip=yes is set, check if the user agent permits compression. If so,

core/modules/startup/render.js

@@ -81,8 +81,6 @@ exports.startup = function() {
 		deferredChanges = Object.create(null);
 		$tw.hooks.invokeHook("th-page-refreshed");
 	}
-	var throttledRefresh = $tw.perf.report("throttledRefresh",refresh);
-
 	// Add the change event handler
 	$tw.wiki.addEventListener("change",$tw.perf.report("mainRefresh",function(changes) {
 		// Check if only tiddlers that are throttled have changed
@@ -103,7 +101,7 @@ exports.startup = function() {
 			if(isNaN(timeout)) {
 				timeout = THROTTLE_REFRESH_TIMEOUT;
 			}
-			timerId = setTimeout(throttledRefresh,timeout);
+			timerId = setTimeout(refresh,timeout);
 			$tw.utils.extend(deferredChanges,changes);
 		} else {
 			$tw.utils.extend(deferredChanges,changes);

core/modules/startup/rootwidget.js

@@ -68,10 +68,7 @@ exports.startup = function() {
 	});
 	// Install the copy-to-clipboard  mechanism
 	$tw.rootWidget.addEventListener("tm-copy-to-clipboard",function(event) {
-		$tw.utils.copyToClipboard(event.param,{
-			successNotification: event.paramObject.successNotification,
-			failureNotification: event.paramObject.failureNotification
-		});
+		$tw.utils.copyToClipboard(event.param);
 	});
 	// Install the tm-focus-selector message
 	$tw.rootWidget.addEventListener("tm-focus-selector",function(event) {

core/modules/startup/story.js

@@ -93,9 +93,7 @@ exports.startup = function() {
 				updateAddressBar: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_UPDATE_ADDRESS_BAR,"yes").trim() === "yes" ? "permalink" : "none",
 				updateHistory: $tw.wiki.getTiddlerText(CONFIG_UPDATE_HISTORY,"no").trim(),
 				targetTiddler: event.param || event.tiddlerTitle,
-				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permalink" : "none",
-				successNotification: event.paramObject && event.paramObject.successNotification,
-				failureNotification: event.paramObject && event.paramObject.failureNotification
+				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permalink" : "none"
 			});
 		});
 		// Listen for the tm-permaview message
@@ -104,9 +102,7 @@ exports.startup = function() {
 				updateAddressBar: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_UPDATE_ADDRESS_BAR,"yes").trim() === "yes" ? "permaview" : "none",
 				updateHistory: $tw.wiki.getTiddlerText(CONFIG_UPDATE_HISTORY,"no").trim(),
 				targetTiddler: event.param || event.tiddlerTitle,
-				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permaview" : "none",
-				successNotification: event.paramObject && event.paramObject.successNotification,
-				failureNotification: event.paramObject && event.paramObject.failureNotification
+				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permaview" : "none"
 			});
 		});
 	}
@@ -181,8 +177,6 @@ options.updateAddressBar: "permalink", "permaview" or "no" (defaults to "permavi
 options.updateHistory: "yes" or "no" (defaults to "no")
 options.copyToClipboard: "permalink", "permaview" or "no" (defaults to "no")
 options.targetTiddler: optional title of target tiddler for permalink
-options.successNotification: optional title of tiddler to use as the notification in case of success
-options.failureNotification: optional title of tiddler to use as the notification in case of failure
 */
 function updateLocationHash(options) {
 	// Get the story and the history stack
@@ -211,18 +205,14 @@ function updateLocationHash(options) {
 			break;
 	}
 	// Copy URL to the clipboard
-	var url = "";
 	switch(options.copyToClipboard) {
 		case "permalink":
-			url = $tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler);
+			$tw.utils.copyToClipboard($tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler));
 			break;
 		case "permaview":
-			url = $tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler) + ":" + encodeURIComponent($tw.utils.stringifyList(storyList));
+			$tw.utils.copyToClipboard($tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler) + ":" + encodeURIComponent($tw.utils.stringifyList(storyList)));
 			break;
 	}
-	if(url) {
-		$tw.utils.copyToClipboard(url,{successNotification: options.successNotification, failureNotification: options.failureNotification});
-	}
 	// Only change the location hash if we must, thus avoiding unnecessary onhashchange events
 	if($tw.utils.getLocationHash() !== $tw.locationHash) {
 		if(options.updateHistory === "yes") {

core/modules/startup/windows.js

@@ -56,7 +56,7 @@ exports.startup = function() {
 			return;
 		}
 		// Initialise the document
-		srcDocument.write("<!DOCTYPE html><head></head><body class='tc-body tc-single-tiddler-window'></body></html>");
+		srcDocument.write("<html><head></head><body class='tc-body tc-single-tiddler-window'></body></html>");
 		srcDocument.close();
 		srcDocument.title = windowTitle;
 		srcWindow.addEventListener("beforeunload",function(event) {

core/modules/utils/dom/dom.js

@@ -292,9 +292,7 @@ exports.copyToClipboard = function(text,options) {
 	} catch (err) {
 	}
 	if(!options.doNotNotify) {
-		var successNotification = options.successNotification || "$:/language/Notifications/CopiedToClipboard/Succeeded",
-			failureNotification = options.failureNotification || "$:/language/Notifications/CopiedToClipboard/Failed"
-		$tw.notifier.display(succeeded ? successNotification : failureNotification);
+		$tw.notifier.display(succeeded ? "$:/language/Notifications/CopiedToClipboard/Succeeded" : "$:/language/Notifications/CopiedToClipboard/Failed");
 	}
 	document.body.removeChild(textArea);
 };

core/modules/utils/dom/http.js

@@ -283,13 +283,13 @@ exports.httpRequest = function(options) {
 	// Set up the state change handler
 	request.onreadystatechange = function() {
 		if(this.readyState === 4) {
-			if(this.status >= 200 && this.status < 300) {
+			if(this.status === 200 || this.status === 201 || this.status === 204) {
 				// Success!
 				options.callback(null,this[returnProp],this);
 				return;
 			}
 		// Something went wrong
-		options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status,this[returnProp],this);
+		options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status,null,this);
 		}
 	};
 	// Handle progress

core/modules/utils/errors.js

@@ -1,23 +0,0 @@
-/*\
-title: $:/core/modules/utils/errors.js
-type: application/javascript
-module-type: utils
-
-Custom errors for TiddlyWiki.
-
-\*/
-(function(){
-
-function TranscludeRecursionError() {
-	Error.apply(this,arguments);
-	this.signatures = Object.create(null);
-};
-
-/* Maximum permitted depth of the widget tree for recursion detection */
-TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH = 1000;
-
-TranscludeRecursionError.prototype = Object.create(Error);
-
-exports.TranscludeRecursionError = TranscludeRecursionError;
-
-})();

core/modules/utils/fakedom.js

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

core/modules/utils/filesystem.js

@@ -316,13 +316,11 @@ Options include:
 	pathFilters: optional array of filters to be used to generate the base path
 	wiki: optional wiki for evaluating the pathFilters
 	fileInfo: an existing fileInfo object to check against
-	fileInfo.overwrite: if true, turns off filename clash numbers (defaults to false)
 */
 exports.generateTiddlerFilepath = function(title,options) {
 	var directory = options.directory || "",
 		extension = options.extension || "",
 		originalpath = (options.fileInfo && options.fileInfo.originalpath) ? options.fileInfo.originalpath : "",
-		overwrite = options.fileInfo && options.fileInfo.overwrite || false,
 		filepath;
 	// Check if any of the pathFilters applies
 	if(options.pathFilters && options.wiki) {
@@ -383,20 +381,19 @@ exports.generateTiddlerFilepath = function(title,options) {
 			filepath += char.charCodeAt(0).toString();
 		});
 	}
-	// Add a uniquifier if the file already exists (default)
-	var fullPath = path.resolve(directory, filepath + extension);
-	if (!overwrite) {
-		var oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
+	// Add a uniquifier if the file already exists
+	var fullPath, oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
 		count = 0;
-		do {
-			fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
-			if(oldPath && oldPath == fullPath) break;
-			count++;
-		} while(fs.existsSync(fullPath));
-	}
+	do {
+		fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
+		if(oldPath && oldPath == fullPath) {
+			break;
+		}
+		count++;
+	} while(fs.existsSync(fullPath));
 	// If the last write failed with an error, or if path does not start with:
 	//	the resolved options.directory, the resolved wikiPath directory, the wikiTiddlersPath directory, 
-	//	or the 'originalpath' directory, then $tw.utils.encodeURIComponentExtended() and resolve to options.directory.
+	//	or the 'originalpath' directory, then $tw.utils.encodeURIComponentExtended() and resolve to tiddler directory.
 	var writePath = $tw.hooks.invokeHook("th-make-tiddler-path",fullPath,fullPath),
 		encode = (options.fileInfo || {writeError: false}).writeError == true;
 	if(!encode) {

core/modules/utils/repository.js

@@ -1,52 +0,0 @@
-/*\
-title: $:/core/modules/utils/repository.js
-type: application/javascript
-module-type: utils
-
-Utilities for working with the TiddlyWiki repository file structure
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Get an object containing all the plugins as a hashmap by title of the JSON representation of the plugin
-Options:
-
-ignoreEnvironmentVariables: defaults to false
-*/
-exports.getAllPlugins = function(options) {
-	options = options || {};
-	var fs = require("fs"),
-		path = require("path"),
-		tiddlers = {};
-	// Collect up the library plugins
-	var collectPlugins = function(folder) {
-			var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
-			for(var p=0; p<pluginFolders.length; p++) {
-				if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
-					var pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
-					if(pluginFields && pluginFields.title) {
-						tiddlers[pluginFields.title] = pluginFields;
-					}
-				}
-			}
-		},
-		collectPublisherPlugins = function(folder) {
-			var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
-			for(var t=0; t<publisherFolders.length; t++) {
-				if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
-					collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));
-				}
-			}
-		};
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.pluginsPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.pluginsEnvVar),collectPublisherPlugins);
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.themesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.themesEnvVar),collectPublisherPlugins);
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.languagesEnvVar),collectPlugins);
-	return tiddlers;
-};
-
-})();

core/modules/utils/utils.js

@@ -819,15 +819,6 @@ 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 $tw.sjcl.codec.hex.fromBits($tw.sjcl.hash.sha256.hash(str)).substr(0,options.length || 64);
-}
-
 /*
 Base64 utility functions that work in either browser or Node.js
 */
@@ -931,7 +922,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;
@@ -944,7 +935,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/action-deletefield.js

@@ -37,7 +37,6 @@ Compute the internal state of the widget
 DeleteFieldWidget.prototype.execute = function() {
 	this.actionTiddler = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
 	this.actionField = this.getAttribute("$field",null);
-	this.actionTimestamp = this.getAttribute("$timestamp","yes") === "yes";
 };
 
 /*
@@ -70,15 +69,11 @@ DeleteFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
 		$tw.utils.each(this.attributes,function(attribute,name) {
 			if(name.charAt(0) !== "$" && name !== "title") {
 				removeFields[name] = undefined;
-				if(name in tiddler.fields) {
-					hasChanged = true;
-				}
+				hasChanged = true;
 			}
 		});
 		if(hasChanged) {
-			var creationFields = this.actionTimestamp ? this.wiki.getCreationFields() : {};
-			var modificationFields = this.actionTimestamp ? this.wiki.getModificationFields() : {};
-			this.wiki.addTiddler(new $tw.Tiddler(creationFields,tiddler,removeFields,modificationFields));
+			this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),tiddler,removeFields,this.wiki.getModificationFields()));
 		}
 	}
 	return true; // Action was invoked

core/modules/widgets/data.js

@@ -1,145 +0,0 @@
-/*\
-title: $:/core/modules/widgets/data.js
-type: application/javascript
-module-type: widget
-
-Widget to dynamically represent one or more tiddlers
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var Widget = require("$:/core/modules/widgets/widget.js").widget;
-
-var DataWidget = function(parseTreeNode,options) {
-	this.dataWidgetTag = parseTreeNode.type;
-	this.initialise(parseTreeNode,options);
-};
-
-/*
-Inherit from the base widget class
-*/
-DataWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-DataWidget.prototype.render = function(parent,nextSibling) {
-	this.parentDomNode = parent;
-	this.computeAttributes();
-	this.execute();
-	var jsonPayload = JSON.stringify(this.readDataTiddlerValues(),null,4);
-	var textNode = this.document.createTextNode(jsonPayload);
-	parent.insertBefore(textNode,nextSibling);
-	this.domNodes.push(textNode);
-};
-
-/*
-Compute the internal state of the widget
-*/
-DataWidget.prototype.execute = function() {
-	// Construct the child widgets
-	this.makeChildWidgets();
-};
-
-/*
-Read the tiddler value(s) from a data widget – must be called after the .render() method
-*/
-DataWidget.prototype.readDataTiddlerValues = function() {
-	var self = this;
-	// Start with a blank object
-	var item = Object.create(null);
-	// Read any attributes not prefixed with $
-	$tw.utils.each(this.attributes,function(value,name) {
-		if(name.charAt(0) !== "$") {
-			item[name] = value;	
-		}
-	});
-	item = new $tw.Tiddler(item);
-	// Deal with $tiddler, $filter or $compound-tiddler attributes
-	var tiddlers = [],title;
-	if(this.hasAttribute("$tiddler")) {
-		title = this.getAttribute("$tiddler");
-		if(title) {
-			var tiddler = this.wiki.getTiddler(title);
-			if(tiddler) {
-				tiddlers.push(tiddler);
-			}
-		}
-	}
-	if(this.hasAttribute("$filter")) {
-		var filter = this.getAttribute("$filter");
-		if(filter) {
-			var titles = this.wiki.filterTiddlers(filter);
-			$tw.utils.each(titles,function(title) {
-				var tiddler = self.wiki.getTiddler(title);
-				tiddlers.push(tiddler);
-			});
-		}
-	}
-	if(this.hasAttribute("$compound-tiddler")) {
-		title = this.getAttribute("$compound-tiddler");
-		if(title) {
-			tiddlers.push.apply(tiddlers,this.extractCompoundTiddler(title));
-		}
-	}
-	// Convert the literal item to field strings
-	item = item.getFieldStrings();
-	if(tiddlers.length === 0) {
-		if(Object.keys(item).length > 0 && !!item.title) {
-			return [item];
-		} else {
-			return [];
-		}
-	} else {
-		var results = [];
-		$tw.utils.each(tiddlers,function(tiddler,index) {
-			var fields = tiddler.getFieldStrings();
-			results.push($tw.utils.extend({},fields,item));
-		});
-		return results;	
-	}
-};
-
-/*
-Helper to extract tiddlers from text/vnd.tiddlywiki-multiple tiddlers
-*/
-DataWidget.prototype.extractCompoundTiddler = function(title) {
-	var tiddler = this.wiki.getTiddler(title);
-	if(tiddler && tiddler.fields.type === "text/vnd.tiddlywiki-multiple") {
-		var text = tiddler.fields.text || "",
-			rawTiddlers = text.split(/\r?\n\+\r?\n/),
-			tiddlers = [];
-		$tw.utils.each(rawTiddlers,function(rawTiddler) {
-			var fields = Object.create(null),
-				split = rawTiddler.split(/\r?\n\r?\n/mg);
-			if(split.length >= 1) {
-				fields = $tw.utils.parseFields(split[0],fields);
-			}
-			if(split.length >= 2) {
-				fields.text = split.slice(1).join("\n\n");
-			}
-			tiddlers.push(new $tw.Tiddler(fields));
-		});
-		return tiddlers;
-	} else {
-		return [];
-	}
-};
-
-/*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
-*/
-DataWidget.prototype.refresh = function(changedTiddlers) {
-	// It would be expensive to calculate whether the changedTiddlers impact the filter
-	// identified by the $filter attribute so we just refresh ourselves unconditionally
-	this.refreshSelf();
-	return true;
-};
-
-exports.data = DataWidget;
-
-})();

core/modules/widgets/draggable.js

@@ -119,7 +119,7 @@ DraggableWidget.prototype.refresh = function(changedTiddlers) {
 		return true;
 	} else {
 		if(changedAttributes["class"]) {
-			this.updateDomNodeClasses();
+			this.assignDomNodeClasses();
 		}
 		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:false});
+		var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true, configTrimWhiteSpace:true});
 		if(parser) {
 			var parseTreeNode = parser.tree[0];
 			while(parseTreeNode && ["setvariable","set","parameters"].indexOf(parseTreeNode.type) !== -1) {

core/modules/widgets/parameters.js

@@ -42,31 +42,24 @@ Compute the internal state of the widget
 */
 ParametersWidget.prototype.execute = function() {
 	var self = this;
-	this.parametersDepth = Math.max(parseInt(this.getAttribute("$depth","1"),10) || 1,1);
 	// Find the parent transclusions
-	var pointer = this.parentWidget,
-		depth = this.parametersDepth;
-	while(pointer) {
-		if(pointer instanceof TranscludeWidget) {
-			depth--;
-			if(depth <= 0) {
-				break;
-			}
-		}
-		pointer = pointer.parentWidget;
-	}
+	var pointer = this.getContainingTransclude();
 	// Process each parameter
-	if(pointer instanceof TranscludeWidget) {
+	if(pointer) {
+		// It's important to remember this, because when we refresh, we'll need to make sure this widget is starting at the same index.
+		this.initialParameterIndex = pointer.parameterIndex;
 		// Get the value for each defined parameter
-		$tw.utils.each($tw.utils.getOrderedAttributesFromParseTreeNode(self.parseTreeNode),function(attr,index) {
+		$tw.utils.each($tw.utils.getOrderedAttributesFromParseTreeNode(self.parseTreeNode),function(attr) {
 			var name = attr.name;
 			// If the attribute name starts with $$ then reduce to a single dollar
 			if(name.substr(0,2) === "$$") {
 				name = name.substr(1);
 			}
-			var value = pointer.getTransclusionParameter(name,index,self.getAttribute(attr.name,""));
+			var value = pointer.getTransclusionParameter(name,self.getAttribute(attr.name,""));
 			self.setVariable(name,value);
 		});
+		// We remember where we left the unnamed parameter index.
+		this.finalParameterIndex = pointer.parameterIndex;
 		// Assign any metaparameters
 		$tw.utils.each(pointer.getTransclusionMetaParameters(),function(getValue,name) {
 			var variableName = self.getAttribute("$" + name);
@@ -84,13 +77,29 @@ Refresh the widget by ensuring our attributes are up to date
 */
 ParametersWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(Object.keys(changedAttributes).length) {
+	var pointer = this.getContainingTransclude();
+	var currentParameterIndex;
+	if(pointer) {
+		currentParameterIndex = pointer.parameterIndex;
+	}
+	if(Object.keys(changedAttributes).length || currentParameterIndex !== this.initialParameterIndex) {
 		this.refreshSelf();
 		return true;
+	} else if(pointer) {
+		// We set the index for unnamed parameters for our $transclude widget in case any later $parameters show up. They need to be able to confirm their indices are starting in the right place, because if not, they need to refresh.
+		pointer.parameterIndex = this.finalParameterIndex;
 	}
 	return this.refreshChildren(changedTiddlers);
 };
 
+ParametersWidget.prototype.getContainingTransclude = function() {
+	var pointer = this.parentWidget;
+	while(pointer && !(pointer instanceof TranscludeWidget)) {
+		pointer = pointer.parentWidget;
+	}
+	return pointer;
+};
+
 exports.parameters = ParametersWidget;
 
 })();

core/modules/widgets/testcase.js

@@ -1,165 +0,0 @@
-/*\
-title: $:/core/modules/widgets/testcase.js
-type: application/javascript
-module-type: widget
-
-Widget to display a test case
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var Widget = require("$:/core/modules/widgets/widget.js").widget;
-
-var TestCaseWidget = function(parseTreeNode,options) {
-	this.initialise(parseTreeNode,options);
-};
-
-/*
-Inherit from the base widget class
-*/
-TestCaseWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-TestCaseWidget.prototype.render = function(parent,nextSibling) {
-	var self = this;
-	this.parentDomNode = parent;
-	this.computeAttributes();
-	this.execute();
-	// Create container DOM node
-	var domNode = this.document.createElement("div");
-	this.domNodes.push(domNode);
-	parent.insertBefore(domNode,nextSibling);
-	// Render the children into a hidden DOM node
-	var parser = {
-		tree: [{
-			type: "widget",
-			attributes: {},
-			orderedAttributes: [],
-			children: this.parseTreeNode.children || []
-		}]
-	};
-	this.contentRoot = this.wiki.makeWidget(parser,{
-		document: $tw.fakeDocument,
-		parentWidget: this
-	});
-	this.contentContainer = $tw.fakeDocument.createElement("div");
-	this.contentRoot.render(this.contentContainer,null);
-	// Create a wiki
-	this.testcaseWiki = new $tw.Wiki();
-	// Always load the core plugin
-	var loadTiddler = function(title) {
-		var tiddler = self.wiki.getTiddler(title);
-		if(tiddler) {
-			self.testcaseWiki.addTiddler(tiddler);
-		}
-	}
-	loadTiddler("$:/core");
-	loadTiddler("$:/plugins/tiddlywiki/codemirror");
-	// Load tiddlers from child data widgets
-	var tiddlers = [];
-	this.findChildrenDataWidgets(this.contentRoot.children,"data",function(widget) {
-		Array.prototype.push.apply(tiddlers,widget.readDataTiddlerValues());
-	});
-	var jsonPayload = JSON.stringify(tiddlers);
-	this.testcaseWiki.addTiddlers(tiddlers);
-	// Unpack plugin tiddlers
-	this.testcaseWiki.readPluginInfo();
-	this.testcaseWiki.registerPluginTiddlers("plugin");
-	this.testcaseWiki.unpackPluginTiddlers();
-	this.testcaseWiki.addIndexersToWiki();
-	// Generate a `transclusion` variable that depends on the values of the payload tiddlers so that the template can easily make unique state tiddlers
-	this.setVariable("transclusion",$tw.utils.hashString(jsonPayload));
-	// Generate a `payloadTiddlers` variable that contains the payload in JSON format
-	this.setVariable("payloadTiddlers",jsonPayload);
-	// Only run the tests if the testcase output and expected results were specified, and those tiddlers actually exist in the wiki
-	var shouldRunTests = false;
-	if(this.testcaseTestOutput && this.testcaseWiki.tiddlerExists(this.testcaseTestOutput) && this.testcaseTestExpectedResult && this.testcaseWiki.tiddlerExists(this.testcaseTestExpectedResult)) {
-		shouldRunTests = true;
-	}
-	// Render the test rendering if required
-	if(shouldRunTests) {
-		var testcaseOutputContainer = $tw.fakeDocument.createElement("div");
-		var testcaseOutputWidget = this.testcaseWiki.makeTranscludeWidget(this.testcaseTestOutput,{
-			document: $tw.fakeDocument,
-			parseAsInline: false,
-			parentWidget: this,
-			variables: {
-				currentTiddler: this.testcaseTestOutput
-			}
-		});
-		testcaseOutputWidget.render(testcaseOutputContainer);
-	}
-	// Clear changes queue
-	this.testcaseWiki.clearTiddlerEventQueue();
-	// Run the actions if provided
-	if(this.testcaseWiki.tiddlerExists(this.testcaseTestActions)) {
-		testcaseOutputWidget.invokeActionString(this.testcaseWiki.getTiddlerText(this.testcaseTestActions));
-		testcaseOutputWidget.refresh(this.testcaseWiki.changedTiddlers,testcaseOutputContainer);
-	}
-	// Set up the test result variables
-	var testResult = "",
-		outputHTML = "",
-		expectedHTML = "";
-	if(shouldRunTests) {
-		outputHTML = testcaseOutputContainer.children[0].innerHTML;
-		expectedHTML = this.testcaseWiki.getTiddlerText(this.testcaseTestExpectedResult);
-		if(outputHTML === expectedHTML) {
-			testResult = "pass";
-		} else {
-			testResult = "fail";
-		}
-		this.setVariable("outputHTML",outputHTML);
-		this.setVariable("expectedHTML",expectedHTML);
-		this.setVariable("testResult",testResult);
-		this.setVariable("currentTiddler",this.testcaseTestOutput);
-	}
-	// Don't display anything if testHideIfPass is "yes" and the tests have passed
-	if(this.testcaseHideIfPass === "yes" && testResult !== "fail") {
-		return;
-	}
-	// Render the page root template of the subwiki
-	var rootWidget = this.testcaseWiki.makeTranscludeWidget(this.testcaseTemplate,{
-		document: this.document,
-		parseAsInline: false,
-		parentWidget: this
-	});
-	rootWidget.render(domNode);
-	// Trap changes in the wiki and refresh the rendering
-	this.testcaseWiki.addEventListener("change",function(changes) {
-		rootWidget.refresh(changes,domNode);
-	});
-};
-
-/*
-Compute the internal state of the widget
-*/
-TestCaseWidget.prototype.execute = function() {
-	this.testcaseTemplate = this.getAttribute("template","$:/core/ui/testcases/DefaultTemplate");
-	this.testcaseTestOutput = this.getAttribute("testOutput");
-	this.testcaseTestActions = this.getAttribute("testActions");
-	this.testcaseTestExpectedResult = this.getAttribute("testExpectedResult");
-	this.testcaseHideIfPass = this.getAttribute("testHideIfPass");
-};
-
-/*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
-*/
-TestCaseWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	if($tw.utils.count(changedAttributes) > 0) {
-		this.refreshSelf();
-		return true;
-	} else {
-		return this.contentRoot.refresh(changedTiddlers);
-	}
-};
-
-exports["testcase"] = TestCaseWidget;
-
-})();

core/modules/widgets/transclude.js

@@ -30,30 +30,7 @@ TranscludeWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
 	this.computeAttributes();
 	this.execute();
-	try {
-		this.renderChildren(parent,nextSibling);
-	} catch(error) {
-		if(error instanceof $tw.utils.TranscludeRecursionError) {
-			// We were infinite looping.
-			// We need to try and abort as much of the loop as we can, so we will keep "throwing" upward until we find a transclusion that has a different signature.
-			// Hopefully that will land us just outside where the loop began. That's where we want to issue an error.
-			// Rendering widgets beneath this point may result in a freezing browser if they explode exponentially.
-			var transcludeSignature = this.getVariable("transclusion");
-			if(this.getAncestorCount() > $tw.utils.TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH - 50) {
-				// For the first fifty transcludes we climb up, we simply collect signatures.
-				// We're assuming that those first 50 will likely include all transcludes involved in the loop.
-				error.signatures[transcludeSignature] = true;
-			} else if(!error.signatures[transcludeSignature]) {
-				// Now that we're past the first 50, let's look for the first signature that wasn't in the loop. That'll be where we print the error and resume rendering.
-				this.children = [this.makeChildWidget({type: "error", attributes: {
-					"$message": {type: "string", value: $tw.language.getString("Error/RecursiveTransclusion")}
-				}})];
-				this.renderChildren(parent,nextSibling);
-				return;
-			}
-		}
-		throw error;
-	}
+	this.renderChildren(parent,nextSibling);
 };
 
 /*
@@ -381,14 +358,26 @@ TranscludeWidget.prototype.getOrderedTransclusionParameters = function() {
 };
 
 /*
-Fetch the value of a parameter
+The parameter index indicates is used by internal $parameter widgets to sequentially assign unnamed parameters.
 */
-TranscludeWidget.prototype.getTransclusionParameter = function(name,index,defaultValue) {
+Object.defineProperty(TranscludeWidget.prototype, 'parameterIndex', {
+    get: function() { return this.claimedIndices || 0; },
+    set: function(value) { this.claimedIndices = value; }
+});
+
+/*
+Fetch the value of a parameter given either its name or index
+*/
+TranscludeWidget.prototype.getTransclusionParameter = function(name,defaultValue) {
 	if(name in this.stringParametersByName) {
 		return this.stringParametersByName[name];
 	} else {
+		// Let's see if this name was already assigned an index
+		var index = this.parameterIndex;
 		var name = "" + index;
 		if(name in this.stringParametersByName) {
+			// This parameter now corresponds to this index. No other parameters may correspond to it.
+			this.claimedIndices = index + 1;
 			return this.stringParametersByName[name];
 		}
 	}
@@ -471,6 +460,8 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 TranscludeWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
+	// Reset the parameter index so that internal $parameter widgets can double-check their unnamed parameter indices.
+	this.parameterIndex = 0;
 	if(($tw.utils.count(changedAttributes) > 0) || (this.transcludeVariableIsFunction && this.functionNeedsRefresh()) || (!this.transcludeVariable && changedTiddlers[this.transcludeTitle] && this.parserNeedsRefresh())) {
 		this.refreshSelf();
 		return true;

core/modules/widgets/widget.js

@@ -12,6 +12,9 @@ Widget base class
 /*global $tw: false */
 "use strict";
 
+/* Maximum permitted depth of the widget tree for recursion detection */
+var MAX_WIDGET_TREE_DEPTH = 1000;
+
 /*
 Create a widget object for a parse tree node
 	parseTreeNode: reference to the parse tree node to be rendered
@@ -163,8 +166,6 @@ Widget.prototype.getVariableInfo = function(name,options) {
 			});
 			resultList = this.wiki.filterTiddlers(value,this.makeFakeWidgetWithVariables(variables),options.source);
 			value = resultList[0] || "";
-		} else {
-			params = variable.params;
 		}
 		return {
 			text: value,
@@ -493,8 +494,10 @@ Widget.prototype.makeChildWidgets = function(parseTreeNodes,options) {
 	this.children = [];
 	var self = this;
 	// Check for too much recursion
-	if(this.getAncestorCount() > $tw.utils.TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH) {
-		throw new $tw.utils.TranscludeRecursionError();
+	if(this.getAncestorCount() > MAX_WIDGET_TREE_DEPTH) {
+		this.children.push(this.makeChildWidget({type: "error", attributes: {
+			"$message": {type: "string", value: $tw.language.getString("Error/RecursiveTransclusion")}
+		}}));
 	} else {
 		// Create set variable widgets for each variable
 		$tw.utils.each(options.variables,function(value,name) {
@@ -810,21 +813,6 @@ Widget.prototype.allowActionPropagation = function() {
 	return true;
 };
 
-/*
-Find child <$data> widgets recursively. The tag name allows aliased versions of the widget to be found too
-*/
-Widget.prototype.findChildrenDataWidgets = function(children,tag,callback) {
-	var self = this;
-	$tw.utils.each(children,function(child) {
-		if(child.dataWidgetTag === tag) {
-			callback(child);
-		}
-		if(child.children) {
-			self.findChildrenDataWidgets(child.children,tag,callback);
-		}
-	});
-};
-
 /*
 Evaluate a variable with parameters. This is a static convenience method that attempts to evaluate a variable as a function, returning an array of strings
 */

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,
-		backIndexer = this.getIndexer("BackIndexer"),
-		backlinks = backIndexer && backIndexer.subIndexers.link.lookup(targetTitle);
+		backlinksIndexer = this.getIndexer("BacklinksIndexer"),
+		backlinks = backlinksIndexer && backlinksIndexer.lookup(targetTitle);
 
 	if(!backlinks) {
 		backlinks = [];
@@ -549,68 +549,6 @@ 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/palettes/Vanilla.tid

@@ -95,9 +95,6 @@ table-footer-background: #a8a8a8
 table-header-background: #f0f0f0
 tag-background: #ec6
 tag-foreground: #ffffff
-testcase-accent-level-1: #84C5E6
-testcase-accent-level-2: #E3B740
-testcase-accent-level-3: #5FD564
 tiddler-background: <<colour background>>
 tiddler-border: <<colour background>>
 tiddler-controls-foreground-hover: #888888

core/plugin.info

@@ -5,6 +5,5 @@
 	"author": "JeremyRuston",
 	"core-version": ">=5.0.0",
 	"plugin-priority": "0",
-	"list": "readme",
-	"stability": "STABILITY_2_STABLE"
+	"list": "readme"
 }

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

@@ -3,7 +3,7 @@ title: $:/core/save/all-external-js
 \whitespace trim
 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
 
 <!-- Important: core library is provided by serving URI encoded $:/core/templates/tiddlywiki5.js -->

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

@@ -3,7 +3,7 @@ title: $:/core/save/offline-external-js
 \whitespace trim
 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
 \define defaultCoreURL() tiddlywikicore-$(version)$.js
 <$let coreURL={{{ [[coreURL]is[variable]then<coreURL>else<defaultCoreURL>] }}}>

core/templates/save-all.tid

@@ -2,6 +2,6 @@ title: $:/core/save/all
 
 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
 {{$:/core/templates/tiddlywiki5.html}}

core/templates/save-empty.tid

@@ -1,6 +1,6 @@
 title: $:/core/save/empty
 
 \define saveTiddlerFilter()
-[is[system]] -[prefix[$:/state/popup/]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[is[system]] -[prefix[$:/state/popup/]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
 \end
 {{$:/core/templates/tiddlywiki5.html}}

core/templates/save-lazy-all.tid

@@ -1,7 +1,7 @@
 title: $:/core/save/lazy-all
 
 \define saveTiddlerFilter()
-[is[system]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] [is[tiddler]type[application/javascript]] +[sort[title]]
+[is[system]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] [is[tiddler]type[application/javascript]] +[sort[title]]
 \end
 \define skinnySaveTiddlerFilter()
 [!is[system]] -[type[application/javascript]]

core/templates/save-lazy-images.tid

@@ -1,7 +1,7 @@
 title: $:/core/save/lazy-images
 
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[!is[system]is[image]] +[sort[title]] 
+[is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[!is[system]is[image]] +[sort[title]] 
 \end
 \define skinnySaveTiddlerFilter()
 [!is[system]is[image]]

core/ui/AdvancedSearch/Filter.tid

@@ -40,8 +40,10 @@ 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">>>
@@ -63,10 +65,11 @@ 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">
-<p><<lingo Filter/Matches>></p>
+<<lingo Filter/Matches>>
 <$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,18 +54,17 @@ caption: {{$:/language/Search/Standard/Caption}}
 	variable="listItem">
 <$vars
 	userInput={{{ [[$:/temp/advancedsearch]get[text]] }}}
-	configTiddler={{{ [[$:/state/advancedsearch/standard/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
+	configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
 	searchListState="$:/temp/advancedsearch/selected-item">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]">
+<$list
+	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/Components/plugin-info.tid

@@ -45,17 +45,7 @@ $:/config/Plugins/Disabled/$(currentTiddler)$
 		<$view field="title"/>
 	</h2>
 	<h2>
-		<div>
-			<%if [<currentTiddler>get[stability]match[STABILITY_0_DEPRECATED]] %>
-				<span class="tc-plugin-info-stability tc-plugin-info-stability-deprecated">DEPRECATED</span>
-			<%elseif [<currentTiddler>get[stability]match[STABILITY_1_EXPERIMENTAL]] %>
-				<span class="tc-plugin-info-stability tc-plugin-info-stability-experimental">EXPERIMENTAL</span>
-			<%elseif [<currentTiddler>get[stability]match[STABILITY_2_STABLE]] %>
-				<span class="tc-plugin-info-stability tc-plugin-info-stability-stable">STABLE</span>
-			<%elseif [<currentTiddler>get[stability]match[STABILITY_3_LEGACY]] %>
-				<span class="tc-plugin-info-stability tc-plugin-info-stability-legacy">LEGACY</span>
-			<%endif%>
-			<em><$view field="version"/></em></div>
+		<div><em><$view field="version"/></em></div>
 	</h2>
 </div>
 \end

core/ui/ControlPanel/Modals/AddPlugins.tid

@@ -70,20 +70,9 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 <div class="tc-plugin-info-chunk tc-plugin-info-description">
 <h1><strong><$text text={{{ [<assetInfo>get[name]] ~[<assetInfo>get[original-title]split[/]last[1]] }}}/></strong>:
 &#32;
-<$view tiddler=<<assetInfo>> field="description"/>
-</h1>
+<$view tiddler=<<assetInfo>> field="description"/></h1>
 <h2><$view tiddler=<<assetInfo>> field="original-title"/></h2>
-<div>
-<%if [<assetInfo>get[stability]match[STABILITY_0_DEPRECATED]] %>
-	<span class="tc-plugin-info-stability tc-plugin-info-stability-deprecated">DEPRECATED</span>
-<%elseif [<assetInfo>get[stability]match[STABILITY_1_EXPERIMENTAL]] %>
-	<span class="tc-plugin-info-stability tc-plugin-info-stability-experimental">EXPERIMENTAL</span>
-<%elseif [<assetInfo>get[stability]match[STABILITY_2_STABLE]] %>
-	<span class="tc-plugin-info-stability tc-plugin-info-stability-stable">STABLE</span>
-<%elseif [<assetInfo>get[stability]match[STABILITY_3_LEGACY]] %>
-	<span class="tc-plugin-info-stability tc-plugin-info-stability-legacy">LEGACY</span>
-<%endif%>
-<em><$view tiddler=<<assetInfo>> field="version"/></em></div>
+<div><em><$view tiddler=<<assetInfo>> field="version"/></em></div>
 <$list filter="[<assetInfo>get[original-title]get[version]]" variable="installedVersion"><div><em>{{$:/language/ControlPanel/Plugins/AlreadyInstalled/Hint}}</em></div></$list>
 </div>
 <div class="tc-plugin-info-chunk tc-plugin-info-buttons">

core/ui/ControlPanel/Saving/DownloadSaver.tid

@@ -2,19 +2,10 @@ 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>>
 
-!!.tc-control-panel-accent <$link to="$:/config/DownloadSaver/AutoSave"><<lingo AutoSave/Hint>></$link>
+!! <$link to="$:/config/DownloadSaver/AutoSave"><<lingo AutoSave/Hint>></$link>
 
-<$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>
+<$checkbox tiddler="$:/config/DownloadSaver/AutoSave" field="text" checked="yes" unchecked="no" default="no"> <<lingo AutoSave/Description>> </$checkbox>

core/ui/ControlPanel/Saving/General.tid

@@ -3,22 +3,14 @@ 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}}
 
-!!.tc-control-panel-accent <$link to="$:/config/AutoSave"><<lingo AutoSave/Caption>></$link>
+!! <$link to="$:/config/AutoSave"><<lingo AutoSave/Caption>></$link>
 
 <<lingo AutoSave/Hint>>
 
-<$radio tiddler="$:/config/AutoSave" value="yes">
-	<span class="tc-tiny-gap-left"><<lingo AutoSave/Enabled/Description>></span>
-</$radio>
+<$radio tiddler="$:/config/AutoSave" value="yes"> <<lingo AutoSave/Enabled/Description>> </$radio>
 
-<$radio tiddler="$:/config/AutoSave" value="no">
-	<span class="tc-tiny-gap-left"><<lingo AutoSave/Disabled/Description>></span>
-</$radio>
-</div>
+<$radio tiddler="$:/config/AutoSave" value="no"> <<lingo AutoSave/Disabled/Description>> </$radio>

core/ui/ControlPanel/Settings/CamelCase.tid

@@ -2,16 +2,7 @@ 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"
-	class="tc-control-panel-item"
->
-	<$link to="$:/config/WikiParserRules/Inline/wikilink" class="tc-tiny-gap-left">
-		<<lingo Description>>
-	</$link>
-</$checkbox>
+<$checkbox tiddler="$:/config/WikiParserRules/Inline/wikilink" field="text" checked="enable" unchecked="disable" default="enable"> <$link to="$:/config/WikiParserRules/Inline/wikilink"><<lingo Description>></$link> </$checkbox>

core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid

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

core/ui/ControlPanel/Settings/DefaultSidebarTab.tid

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

core/ui/ControlPanel/Settings/EditorToolbar.tid

@@ -2,15 +2,8 @@ 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"
-	class="tc-control-panel-item"
->
-	<$link to="$:/config/TextEditor/EnableToolbar" class="tc-tiny-gap-left">
-		<<lingo Description>>
-	</$link>
-</$checkbox>
+<$checkbox tiddler="$:/config/TextEditor/EnableToolbar" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/TextEditor/EnableToolbar"><<lingo Description>></$link> </$checkbox>
+

core/ui/ControlPanel/Settings/InfoPanelMode.tid

@@ -2,17 +2,9 @@ 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>
 
-<$link to="$:/config/TiddlerInfo/Mode" class="tc-control-panel-item">
-	<<lingo Hint>>
-</$link>
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="popup"> <<lingo Popup/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>
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="sticky"> <<lingo Sticky/Description>> </$radio>

core/ui/ControlPanel/Settings/LinkToBehaviour.tid

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

core/ui/ControlPanel/Settings/MissingLinks.tid

@@ -2,12 +2,8 @@ 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" class="tc-control-panel-item">
-		<span class="tc-tiny-gap-left"><<lingo Description>></span>
-	</$link>
-</$checkbox>
+<$checkbox tiddler="$:/config/MissingLinks" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/MissingLinks"><<lingo Description>></$link> </$checkbox>
+

core/ui/ControlPanel/Settings/NavigationAddressBar.tid

@@ -2,21 +2,12 @@ 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" class="tc-control-panel-item">
-	<<lingo Hint>>
-</$link>
+<$link to="$:/config/Navigation/UpdateAddressBar"><<lingo Hint>></$link>
 
-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permaview">
-	<span class="tc-tiny-gap-left"><<lingo Permaview/Description>></span>
-</$radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permaview"> <<lingo Permaview/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="permalink"> <<lingo Permalink/Description>> </$radio>
 
-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="no">
-	<span class="tc-tiny-gap-left"><<lingo No/Description>></span>
-</$radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="no"> <<lingo No/Description>> </$radio>

core/ui/ControlPanel/Settings/NavigationHistory.tid

@@ -2,17 +2,9 @@ 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>
 
-<$link to="$:/config/Navigation/UpdateHistory" class="tc-control-panel-item">
-	<<lingo Hint>>
-</$link>
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes"> <<lingo Yes/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>
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="no"> <<lingo No/Description>> </$radio>

core/ui/ControlPanel/Settings/NavigationPermalinkviewMode.tid

@@ -2,24 +2,9 @@ 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"
-	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/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/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>
+<$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>

core/ui/ControlPanel/Settings/PerformanceInstrumentation.tid

@@ -2,15 +2,7 @@ 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"
-	class="tc-control-panel-item"
->
-	<$link to="$:/config/Performance/Instrumentation" class="tc-tiny-gap-left">
-		<<lingo Description>>
-	</$link>
-</$checkbox>
+<$checkbox tiddler="$:/config/Performance/Instrumentation" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/Performance/Instrumentation"><<lingo Description>></$link> </$checkbox>

core/ui/ControlPanel/Settings/TitleLinks.tid

@@ -2,17 +2,9 @@ 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>
 
-<$link to="$:/config/Tiddlers/TitleLinks" class="tc-control-panel-item">
-	<<lingo Hint>>
-</$link>
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="yes"> <<lingo Yes/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>
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="no"> <<lingo No/Description>> </$radio>

core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid

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

core/ui/ControlPanel/Settings/ToolbarButtons.tid

@@ -2,24 +2,9 @@ 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"
-	class="tc-control-panel-item"
->
-	<$link to="$:/config/Toolbar/Icons" class="tc-tiny-gap-left">
-		<<lingo Icons/Description>>
-	</$link>
-</$checkbox>
+<$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/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>
+<$checkbox tiddler="$:/config/Toolbar/Text" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/Toolbar/Text"><<lingo Text/Description>></$link> </$checkbox>

core/ui/ControlPanel/TestCases.tid

@@ -1,10 +0,0 @@
-title: $:/core/ui/ControlPanel/TestCases
-tags: $:/tags/ControlPanel/Advanced
-caption: {{$:/language/ControlPanel/TestCases/Caption}}
-
-\whitespace trim
-{{$:/language/ControlPanel/TestCases/Hint}}
-
-<div class="tc-control-panel">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/TestCases]!has[draft.of]]" default="$:/core/ui/ControlPanel/TestCases/All"/>
-</div>

core/ui/ControlPanel/TestCasesAll.tid

@@ -1,24 +0,0 @@
-title: $:/core/ui/ControlPanel/TestCases/All
-tags: $:/tags/ControlPanel/TestCases
-caption: {{$:/language/ControlPanel/TestCases/All/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/
-<<lingo TestCases/All/Hint>>
-
-<$list filter="[all[tiddlers+shadows]tag[$:/tags/wiki-test-spec]type[text/vnd.tiddlywiki-multiple]] [all[tiddlers+shadows]tag[$:/tags/wiki-test-spec-failing]type[text/vnd.tiddlywiki-multiple]]">
-
-<h2>
-
-<$link>
-
-<$text text=<<currentTiddler>>/>
-
-</$link>
-
-</h2>
-
-<$transclude
-	$tiddler="$:/core/ui/TestCaseTemplate"
-/>
-
-</$list>

core/ui/ControlPanel/TestCasesFailed.tid

@@ -1,15 +0,0 @@
-title: $:/core/ui/ControlPanel/TestCases/Failed
-tags: $:/tags/ControlPanel/TestCases
-caption: {{$:/language/ControlPanel/TestCases/Failed/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/
-<<lingo TestCases/Failed/Hint>>
-
-<$list filter="[all[tiddlers+shadows]tag[$:/tags/wiki-test-spec]type[text/vnd.tiddlywiki-multiple]] [all[tiddlers+shadows]tag[$:/tags/wiki-test-spec-failing]type[text/vnd.tiddlywiki-multiple]]">
-
-<$transclude
-	$tiddler="$:/core/ui/TestCaseTemplate"
-	hideIfPass="yes"
-/>
-
-</$list>

core/ui/ControlPanel/TiddlyWiki.tid

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

core/ui/EditTemplate/body/default.tid

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

@@ -1,18 +1,12 @@
 title: $:/core/ui/EditTemplate/controls
 tags: $:/tags/EditTemplate
 
-\define config-title() $:/config/EditToolbarButtons/Visibility/$(listItem)$
+\define config-title()
+$:/config/EditToolbarButtons/Visibility/$(listItem)$
+\end
 \whitespace trim
 <div class="tc-tiddler-title tc-tiddler-edit-title">
-	<$view field="title"/>
-	<span class="tc-tiddler-controls tc-titlebar">
-		<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem">
-			<$let tv-config-toolbar-class={{{ [enlist<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]] +[join[ ]] }}}>
-				<$reveal type="nomatch" state=<<config-title>> text="hide">
-					<$transclude $tiddler=<<listItem>>/>
-				</$reveal>
-			</$let>
-		</$list>
-	</span>
-	<div style="clear: both;"></div>
+<$view field="title"/>
+<span class="tc-tiddler-controls tc-titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$let tv-config-toolbar-class={{{ [enlist<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]] +[join[ ]]}}}><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$let></$list></span>
+<div style="clear: both;"></div>
 </div>

core/ui/EditTemplate/tags.tid

@@ -3,63 +3,39 @@ tags: $:/tags/EditTemplate
 
 \whitespace trim
 
-\procedure lingo-base() $:/language/EditTemplate/
+\define lingo-base() $:/language/EditTemplate/
 
-\procedure tag-body-inner(colour,fallbackTarget,colourA,colourB,icon,tagField:"tags")
-<$wikify name="foregroundColor"
-	text="""<$macrocall $name="contrastcolour"
-		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>
+\define tag-styles()
+background-color:$(backgroundColor)$;
+fill:$(foregroundColor)$;
+color:$(foregroundColor)$;
 \end
 
-\procedure tag-body(colour,palette,icon,tagField:"tags")
-<$macrocall $name="tag-body-inner"
-	colour=`$(colour)$`
-	colourA={{{ [<palette>getindex[foreground]] }}}
-	colourB={{{ [<palette>getindex[background]] }}}
-	fallbackTarget={{{ [<palette>getindex[tag-background]] }}}
-	icon=<<icon>>
-	tagField=<<tagField>>
-/>
+\define tag-body-inner(colour,fallbackTarget,colourA,colourB,icon,tagField:"tags")
+\whitespace trim
+<$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$""">
+<span style=<<tag-styles>> class="tc-tag-label tc-tag-list-item tc-small-gap-right" data-tag-title=<<currentTiddler>>>
+<$transclude tiddler="""$icon$"""/><$view field="title" format="text"/>
+<$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>
+</span>
+</$vars>
 \end
 
-\procedure edit-tags-template(tagField:"tags")
+\define tag-body(colour,palette,icon,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="[<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>>
-		/>
-	</$list>
-	<$let tabIndex={{$:/config/EditTabIndex}} cancelPopups="yes">
-		<$macrocall $name="tag-picker" tagField=<<tagField>>/>
-	</$let>
+<$list filter="[list[!!$tagField$]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__>>/>
+</$list>
+<$vars tabIndex={{$:/config/EditTabIndex}} cancelPopups="yes">
+<$macrocall $name="tag-picker" tagField=<<__tagField__>>/>
+</$vars>
 </div>
 \end
-<$let saveTiddler=<<currentTiddler>>>
-	<$macrocall $name="edit-tags-template" tagField=<<tagField>>/>
-</$let>
+<$set name="saveTiddler" value=<<currentTiddler>>>
+<$macrocall $name="edit-tags-template" tagField=<<tagField>>/>
+</$set>

core/ui/EditorToolbar/preview.tid

@@ -10,7 +10,7 @@ shortcuts: ((preview))
 
 \whitespace trim
 <span>
-	<$transclude $tiddler={{{ [<edit-preview-state>match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} />
+	<$transclude $tiddler={{{ [<editPreviewStateTiddler>get[text]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/KeyboardShortcuts/refresh.tid

@@ -1,5 +0,0 @@
-title: $:/core/ui/KeyboardShortcuts/refresh
-tags: $:/tags/KeyboardShortcut
-key: ((refresh))
-
-<$action-sendmessage $message="tm-browser-refresh"/>

core/ui/PageControls.tid

@@ -1,14 +1,17 @@
 title: $:/core/ui/PageTemplate/pagecontrols
 
 \whitespace trim
-\function config-title() [[$:/config/PageControlButtons/Visibility/$(listItem)$]substitute[]]
-
+\define config-title()
+$:/config/PageControlButtons/Visibility/$(listItem)$
+\end
 <div class="tc-page-controls">
-	<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-		<$list filter="[<config-title>!text[hide]]" storyview="pop" variable="ignore">
-			<$let tv-config-toolbar-class={{{ [enlist<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]] +[join[ ]] }}}>
-				<$transclude $tiddler=<<listItem>> $mode="inline"/>
-			</$let>
-		</$list>
-	</$list>
-</div>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
+<$set name="hidden" value=<<config-title>>>
+<$list filter="[<hidden>!text[hide]]" storyview="pop" variable="ignore">
+<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
+<$transclude tiddler=<<listItem>> mode="inline"/>
+</$set>
+</$list>
+</$set>
+</$list>
+</div>

core/ui/PageControls/more-page-actions.tid

@@ -4,41 +4,48 @@ caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
 description: {{$:/language/Buttons/More/Hint}}
 
 \whitespace trim
-\define config-title() $:/config/PageControlButtons/Visibility/$(listItem)$
+\define config-title()
+$:/config/PageControlButtons/Visibility/$(listItem)$
+\end
+<$button popup=<<qualify "$:/state/popup/more">> tooltip={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
+<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+{{$:/core/images/down-arrow}}
+</$list>
+<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/More/Caption}}/>
+</span>
+</$list>
+</$button><$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes">
+
+<div class="tc-drop-down">
+
+<$set name="tv-config-toolbar-icons" value="yes">
+
+<$set name="tv-config-toolbar-text" value="yes">
+
+<$set name="tv-config-toolbar-class" value="tc-btn-invisible">
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]] -[[$:/core/ui/Buttons/more-page-actions]]" variable="listItem">
+
+<$reveal type="match" state=<<config-title>> text="hide">
+
+<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
+
+<$transclude tiddler=<<listItem>> mode="inline"/>
+
+</$set>
+
+</$reveal>
+
+</$list>
+
+</$set>
+
+</$set>
+
+</$set>
+
+</div>
 
-<$button popup=<<qualify "$:/state/popup/more">>
-	tooltip={{$:/language/Buttons/More/Hint}}
-	aria-label={{$:/language/Buttons/More/Caption}}
-	class=<<tv-config-toolbar-class>>
-	selectedClass="tc-selected"
->
-	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-		{{$:/core/images/down-arrow}}
-	</$list>
-	<$list filter="[<tv-config-toolbar-text>match[yes]]">
-		<span class="tc-btn-text">
-			<$text text={{$:/language/Buttons/More/Caption}}/>
-		</span>
-	</$list>
-</$button>
-<$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes">
-	<div class="tc-drop-down">
-		<$set name="tv-config-toolbar-icons" value="yes">
-			<$set name="tv-config-toolbar-text" value="yes">
-				<$set name="tv-config-toolbar-class" value="tc-btn-invisible">
-					<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]] -[[$:/core/ui/Buttons/more-page-actions]]"
-						variable="listItem"
-					>
-						<$reveal type="match" state=<<config-title>> text="hide">
-							<$set name="tv-config-toolbar-class"
-								filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"
-							>
-								<$transclude tiddler=<<listItem>> mode="inline"/>
-							</$set>
-						</$reveal>
-					</$list>
-				</$set>
-			</$set>
-		</$set>
-	</div>
 </$reveal>

core/ui/PageTemplate.tid

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

core/ui/TestCaseTemplate.tid

@@ -1,19 +0,0 @@
-title: $:/core/ui/TestCaseTemplate
-
-\parameters (hideIfPass:"no")
-\whitespace trim
-<$let
-	linkTarget="yes"
-	displayFormat={{!!display-format}}
-	testcaseTiddler=<<currentTiddler>>
->
-	<$testcase
-		testOutput="Output"
-		testExpectedResult="ExpectedResult"
-		testActions="Actions"
-		testHideIfPass=<<hideIfPass>>
-	>
-		<$data $compound-tiddler=<<currentTiddler>>/>
-		<$data title="Description" text={{!!description}}/>
-	</$testcase>
-</$let>

core/ui/TestCases/DefaultTemplate.tid

@@ -1,66 +0,0 @@
-title: $:/core/ui/testcases/DefaultTemplate
-
-\whitespace trim
-\procedure linkcatcherActions()
-<%if [<navigateTo>has[title]] %>
-	<$qualify title=<<state>> name="qualifiedState">
-		<$action-setfield $tiddler=<<qualifiedState>> text=<<navigateTo>>/>
-	</$qualify>
-<%endif%>
-\end
-
-<$let
-	state={{{ [<qualify "$:/state/testcase">] }}}
->
-	<div class="tc-test-case-wrapper">
-		<div class="tc-test-case-header">
-			<h2>
-				<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[div]] }}} to=<<testcaseTiddler>>>
-					<%if [<testResult>!match[]] %>
-						<span class={{{ tc-test-case-result-icon [<testResult>!match[fail]then[tc-test-case-result-icon-pass]] [<testResult>match[fail]then[tc-test-case-result-icon-fail]] +[join[ ]] }}}>
-							<%if [<testResult>!match[fail]] %>
-								{{$:/core/images/done-button}}
-							<%else%>
-								{{$:/core/images/close-button}}
-							<%endif%>
-						</span>
-					<%endif%>
-					<$view tiddler="Description" mode="inline"/>
-				</$genesis>
-			</h2>
-		</div>
-		<%if [[Narrative]is[tiddler]] %>
-			<div class="tc-test-case-narrative">
-				<$transclude $tiddler="Narrative" mode="block"/>
-			</div>
-		<%endif%>
-		<%if [<testResult>match[fail]] %>
-			<div class="tc-test-case-result-fail">
-				<div class="tc-test-case-result-fail-header">
-					TEST FAILED
-				</div>
-				<div class="tc-test-case-result-fail-body">
-					<$diff-text source=<<expectedHTML>> dest=<<outputHTML>>/>
-				</div>
-			</div>
-		<%endif%>
-		<div class="tc-test-case-panes">
-			<div class="tc-test-case-source">
-				<$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix<state>] -Description -Narrative -ExpectedResult -Output Output +[putfirst[]] -[has[plugin-type]]" state=<<state>> default="Output" template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"/>
-			</div>
-			<div class="tc-test-case-divider">
-			</div>
-			<div class="tc-test-case-output">
-				<%if [<displayFormat>!match[]else[wikitext]match[plaintext]] %>
-					<pre><$view tiddler="Output" format="plainwikified" mode="block"/></pre>
-				<%else%>
-					<$linkcatcher actions=<<linkcatcherActions>>>
-						<$tiddler tiddler="Output">
-							<$transclude $tiddler="Output" $mode="block"/>
-						</$tiddler>
-					</$linkcatcher>
-				<%endif%>
-			</div>
-		</div>
-	</div>
-</$let>

core/ui/TestCases/DefaultTemplateSourceTabs.tid

@@ -1,24 +0,0 @@
-title: $:/core/ui/testcases/DefaultTemplate/SourceTabs
-
-\whitespace trim
-\procedure body()
-<$list filter="[<currentTab>fields[]] -text +[limit[1]]" variable="ignore">
-	<table class="tc-field-table">
-		<tbody>
-			<$list filter="[<currentTab>fields[]sort[]] -text -title title +[putfirst[]]" variable="fieldName">
-				<tr>
-					<td>
-						<$text text=<<fieldName>>/>
-					</td>
-					<td>
-						<$view tiddler=<<currentTab>> field=<<fieldName>>/>
-					</td>
-				</tr>
-			</$list>
-		</tbody>
-	</table>
-</$list>
-<$edit class="tc-edit-texteditor" tiddler=<<currentTab>>/>
-\end
-
-<$transclude $variable="body" $mode="inline"/>

core/ui/TestCases/RawJSONTemplate.tid

@@ -1,4 +0,0 @@
-title: $:/core/ui/testcases/RawJSONTemplate
-
-\whitespace trim
-<$text text=<<payloadTiddlers>>/>

core/ui/ViewTemplate/title.tid

@@ -2,38 +2,31 @@ title: $:/core/ui/ViewTemplate/title
 tags: $:/tags/ViewTemplate
 
 \whitespace trim
-\define title-styles() fill:$(foregroundColor)$;
-
+\define title-styles()
+fill:$(foregroundColor)$;
+\end
 <div class="tc-tiddler-title">
-	<div class="tc-titlebar">
-		<span class="tc-tiddler-controls">
-			<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] :filter[lookup[$:/config/ViewToolbarButtons/Visibility/]!match[hide]]"
-				storyview="pop"
-				variable="listItem"
-			>
-				<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
-					<$transclude tiddler=<<listItem>>/>
-				</$set>
-			</$list>
-		</span>
-		<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
-			<$link>
-				<$list filter="[<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] +[!is[blank]]"
-					variable="ignore"
-				>
-					<$let foregroundColor={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
-						<span class="tc-tiddler-title-icon" style=<<title-styles>>>
-							{{||$:/core/ui/TiddlerIcon}}
-						</span>
-					</$let>
-				</$list>
-				<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/title/default]] }}} />
-			</$link>
-		</$set>
-	</div>
-	<$reveal tag="div" type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes">
-		<$list filter="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfoSegment]!has[draft.of]] [[$:/core/ui/TiddlerInfo]]" variable="listItem">
-			<$transclude tiddler=<<listItem>> mode="block"/>
-		</$list>
-	</$reveal>
+<div class="tc-titlebar">
+<span class="tc-tiddler-controls">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] :filter[lookup[$:/config/ViewToolbarButtons/Visibility/]!match[hide]]" storyview="pop" variable="listItem"><$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"><$transclude tiddler=<<listItem>>/></$set></$list>
+</span>
+<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
+<$link>
+<$list filter="[<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] +[!is[blank]]" variable="ignore">
+<$let foregroundColor={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
+<span class="tc-tiddler-title-icon" style=<<title-styles>>>
+{{||$:/core/ui/TiddlerIcon}}
+</span>
+</$let>
+</$list>
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/title/default]] }}} />
+</$link>
+</$set>
+</div>
+
+<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes">
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfoSegment]!has[draft.of]] [[$:/core/ui/TiddlerInfo]]" variable="listItem"><$transclude tiddler=<<listItem>> mode="block"/></$list>
+
+</$reveal>
 </div>

core/ui/ViewToolbar/more-tiddler-actions.tid

@@ -4,41 +4,49 @@ caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
 description: {{$:/language/Buttons/More/Hint}}
 
 \whitespace trim
-\define config-title() $:/config/ViewToolbarButtons/Visibility/$(listItem)$
-
-<$button popup=<<qualify "$:/state/popup/more">>
-	tooltip={{$:/language/Buttons/More/Hint}}
-	aria-label={{$:/language/Buttons/More/Caption}}
-	class=<<tv-config-toolbar-class>>
-	selectedClass="tc-selected"
->
-	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-		{{$:/core/images/down-arrow}}
-	</$list>
-	<$list filter="[<tv-config-toolbar-text>match[yes]]">
-		<span class="tc-btn-text">
-			<$text text={{$:/language/Buttons/More/Caption}}/>
-		</span>
-	</$list>
+\define config-title()
+$:/config/ViewToolbarButtons/Visibility/$(listItem)$
+\end
+<$button popup=<<qualify "$:/state/popup/more">> tooltip={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
+<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+{{$:/core/images/down-arrow}}
+</$list>
+<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/More/Caption}}/>
+</span>
+</$list>
 </$button>
 <$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="belowleft" animate="yes">
-	<div class="tc-drop-down">
-		<$set name="tv-config-toolbar-icons" value="yes">
-			<$set name="tv-config-toolbar-text" value="yes">
-				<$set name="tv-config-toolbar-class" value="tc-btn-invisible">
-					<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] -[[$:/core/ui/Buttons/more-tiddler-actions]]"
-						variable="listItem"
-					>
-						<$reveal type="match" state=<<config-title>> text="hide">
-							<$set name="tv-config-toolbar-class"
-								filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"
-							>
-								<$transclude tiddler=<<listItem>> mode="inline"/>
-							</$set>
-						</$reveal>
-					</$list>
-				</$set>
-			</$set>
-		</$set>
-	</div>
+
+<div class="tc-drop-down">
+
+<$set name="tv-config-toolbar-icons" value="yes">
+
+<$set name="tv-config-toolbar-text" value="yes">
+
+<$set name="tv-config-toolbar-class" value="tc-btn-invisible">
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] -[[$:/core/ui/Buttons/more-tiddler-actions]]" variable="listItem">
+
+<$reveal type="match" state=<<config-title>> text="hide">
+
+<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
+
+<$transclude tiddler=<<listItem>> mode="inline"/>
+
+</$set>
+
+</$reveal>
+
+</$list>
+
+</$set>
+
+</$set>
+
+</$set>
+
+</div>
+
 </$reveal>

core/wiki/config/OfficialPluginLibrary.tid

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

core/wiki/config/ShortcutInfo.multids

@@ -35,7 +35,6 @@ new-tiddler: {{$:/language/Buttons/NewTiddler/Hint}}
 picture: {{$:/language/Buttons/Picture/Hint}}
 preview: {{$:/language/Buttons/Preview/Hint}}
 quote: {{$:/language/Buttons/Quote/Hint}}
-refresh: {{$:/language/Buttons/Refresh/Hint}}
 save-tiddler: {{$:/language/Buttons/Save/Hint}}
 save-wiki: {{$:/language/Buttons/SaveWiki/Hint}}
 sidebar-search: {{$:/language/Buttons/SidebarSearch/Hint}}

core/wiki/config/ViewTemplateBodyFilters.multids

@@ -1,7 +1,6 @@
 title: $:/config/ViewTemplateBodyFilters/
 tags: $:/tags/ViewTemplateBodyFilter
 
-testcase: [tag[$:/tags/wiki-test-spec]type[text/vnd.tiddlywiki-multiple]then[$:/core/ui/TestCaseTemplate]] [tag[$:/tags/wiki-test-spec-failing]type[text/vnd.tiddlywiki-multiple]then[$:/core/ui/TestCaseTemplate]]
 stylesheet: [tag[$:/tags/Stylesheet]then[$:/core/ui/ViewTemplate/body/rendered-plain-text]]
 core-ui-tags: [tag[$:/tags/PageTemplate]] [tag[$:/tags/EditTemplate]] [tag[$:/tags/ViewTemplate]] [tag[$:/tags/KeyboardShortcut]] [tag[$:/tags/ImportPreview]] [tag[$:/tags/EditPreview]][tag[$:/tags/EditorToolbar]] [tag[$:/tags/Actions]] :then[[$:/core/ui/ViewTemplate/body/code]]
 system: [prefix[$:/boot/]] [prefix[$:/config/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]]  [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/info/]] [prefix[$:/temp/]] +[!is[image]limit[1]then[$:/core/ui/ViewTemplate/body/code]]

core/wiki/config/shortcuts/shortcuts-mac.multids

@@ -6,5 +6,4 @@ underline: meta-U
 new-image: ctrl-I
 new-journal: ctrl-J
 new-tiddler: ctrl-N
-refresh: meta-R
 save-wiki: meta-S

core/wiki/config/shortcuts/shortcuts-not-mac.multids

@@ -6,4 +6,3 @@ underline: ctrl-U
 new-image: alt-I
 new-journal: alt-J
 new-tiddler: alt-N
-refresh: ctrl-R

core/wiki/macros/CSS.tid

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

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

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

core/wiki/macros/diff.tid

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