Move the international section into Quick Start

Thanks @linonetwo

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on:
       - master
       - tiddlywiki-com
 env:
-  NODE_VERSION: "18"
+  NODE_VERSION: "12"
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -14,13 +14,7 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: "${{ env.NODE_VERSION }}"
-      - run: "./bin/ci-test.sh"
+      - run: "./bin/test.sh"
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: playwright-report
-          path: playwright-report/
-          retention-days: 30
   build-prerelease:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master'
@@ -60,7 +54,6 @@ jobs:
       TW5_BUILD_TIDDLYWIKI: "./node_modules/tiddlywiki/tiddlywiki.js"
       TW5_BUILD_MAIN_EDITION: "./editions/tw5.com"
       TW5_BUILD_OUTPUT: "./output"
-      TW5_BUILD_ARCHIVE: "./output"
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1

.gitignore

@@ -5,7 +5,4 @@
 tmp/
 output/
 node_modules/
-/test-results/
+
-/playwright-report/
-/playwright/.cache/
-$__StoryList.tid

bin/build-site.sh

@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library
 
 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.3.3
+    TW5_BUILD_VERSION=v5.3.2
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -84,27 +84,10 @@ echo -e -n "title: $:/build\ncommit: $TW5_BUILD_COMMIT\n\n$TW5_BUILD_DETAILS\n"
 
 ######################################################
 #
-# Core distributions
+# Core distribution
 #
 ######################################################
 
-# Conditionally build archive if $TW5_BUILD_ARCHIVE variable is set, otherwise do nothing
-#
-# /archive/Empty-TiddlyWiki-<version>.html	Empty archived version
-# /archive/TiddlyWiki-<version>.html		Full archived version
-
-if [ -n "$TW5_BUILD_ARCHIVE" ]; then
-
-node $TW5_BUILD_TIDDLYWIKI \
-	$TW5_BUILD_MAIN_EDITION \
-	--verbose \
-	--version \
-	--load $TW5_BUILD_OUTPUT/build.tid \
-	--output $TW5_BUILD_ARCHIVE \
-	--build archive \
-	|| exit 1
-fi
-
 # /index.html			Main site
 # /favicon.ico			Favicon for main site
 # /static.html			Static rendering of default tiddlers
@@ -112,7 +95,6 @@ fi
 # /static/*				Static single tiddlers
 # /static/static.css	Static stylesheet
 # /static/favicon.ico	Favicon for static pages
-
 node $TW5_BUILD_TIDDLYWIKI \
 	$TW5_BUILD_MAIN_EDITION \
 	--verbose \
@@ -156,28 +138,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 \

bin/ci-test.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# test TiddlyWiki5 for tiddlywiki.com
-
-node ./tiddlywiki.js \
-	./editions/test \
-	--verbose \
-	--version \
-	--rendertiddler $:/core/save/all test.html text/plain \
-	--test \
-	|| exit 1
-
-npm install playwright @playwright/test
-npx playwright install chromium firefox --with-deps
-
-npx playwright test

boot/boot.js

@@ -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"}),
+			button = 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,message,button], "class": "tc-error-form"});
-			form = dm("form",{children: [heading,prompt,downloadButton,message,closeButton], "class": "tc-error-form"});
 		document.body.insertBefore(form,document.body.firstChild);
-		downloadButton.addEventListener("click",function(event) {
-			if($tw && $tw.wiki) {
-				var tiddlers = [];
-				$tw.wiki.each(function(tiddler,title) {
-					tiddlers.push(tiddler.fields);
-				});
-				var link = dm("a"),
-					text = JSON.stringify(tiddlers);
-				if(Blob !== undefined) {
-					var blob = new Blob([text], {type: "text/html"});
-					link.setAttribute("href", URL.createObjectURL(blob));
-				} else {
-					link.setAttribute("href","data:text/html," + encodeURIComponent(text));
-				}
-				link.setAttribute("download","emergency-tiddlers-" + (new Date()) + ".json");
-				document.body.appendChild(link);
-				link.click();
-				document.body.removeChild(link);
-			} else {
-				alert("Emergency tiddler download is not available");
-			}
-			event.preventDefault();
-			return false;
-		},true);
 		form.addEventListener("submit",function(event) {
 			document.body.removeChild(form);
 			event.preventDefault();
@@ -812,7 +786,6 @@ $tw.utils.Crypto = function() {
 			}
 			return outputText;
 		};
-	$tw.sjcl = sjcl;
 	this.setPassword = function(newPassword) {
 		currentPassword = newPassword;
 		this.updateCryptoStateTiddler();
@@ -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);
@@ -2465,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");
@@ -2480,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");

core/copyright.tid

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

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/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/Fields.multids

@@ -4,7 +4,6 @@ _canonical_uri: The full URI of an external image tiddler
 author: Name of the author of a plugin
 bag: The name of the bag from which a tiddler came
 caption: The text to be displayed on a tab or button
-class: The CSS class applied to a tiddler when rendering it - see [[Custom styles by user-class]].  Also used for [[Modals]]
 code-body: The view template will display the tiddler as code if set to ''yes''
 color: The CSS color value associated with a tiddler
 component: The name of the component responsible for an [[alert tiddler|AlertMechanism]]

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

@@ -10,7 +10,7 @@ Sequentially run the command tokens returned from a filter
 Examples
 
 ```
---commands "[enlist:raw{$:/build-commands-as-text}]"
+--commands "[enlist{$:/build-commands-as-text}]"
 ```
 
 ```

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/savetiddlers.js

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

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/encodings.js

@@ -18,20 +18,16 @@ Export our filter functions
 
 exports.decodebase64 = function(source,operator,options) {
 	var results = [];
-	var binary = operator.suffixes && operator.suffixes.indexOf("binary") !== -1;
-	var urlsafe = operator.suffixes && operator.suffixes.indexOf("urlsafe") !== -1;
 	source(function(tiddler,title) {
-		results.push($tw.utils.base64Decode(title,binary,urlsafe));
+		results.push($tw.utils.base64Decode(title));
 	});
 	return results;
 };
 
 exports.encodebase64 = function(source,operator,options) {
 	var results = [];
-	var binary = operator.suffixes && operator.suffixes.indexOf("binary") !== -1;
-	var urlsafe = operator.suffixes && operator.suffixes.indexOf("urlsafe") !== -1;
 	source(function(tiddler,title) {
-		results.push($tw.utils.base64Encode(title,binary,urlsafe));
+		results.push($tw.utils.base64Encode(title));
 	});
 	return results;
 };

core/modules/filters/json-ops.js

@@ -213,18 +213,6 @@ function getDataItemType(data,indexes) {
 	}
 }
 
-function getItemAtIndex(item,index) {
-	if($tw.utils.hop(item,index)) {
-		return item[index];
-	} else if($tw.utils.isArray(item)) {
-		index = $tw.utils.parseInt(index);
-		if(index < 0) { index = index + item.length };
-		return item[index]; // Will be undefined if index was out-of-bounds
-	} else {
-		return undefined;
-	}
-}
-
 /*
 Given a JSON data structure and an array of index strings, return the value at the end of the index chain, or "undefined" if any of the index strings are invalid
 */
@@ -237,7 +225,7 @@ function getDataItem(data,indexes) {
 	for(var i=0; i<indexes.length; i++) {
 		if(item !== undefined) {
 			if(item !== null && ["number","string","boolean"].indexOf(typeof item) === -1) {
-				item = getItemAtIndex(item,indexes[i]);
+				item = item[indexes[i]];
 			} else {
 				item = undefined;
 			}
@@ -261,22 +249,17 @@ function setDataItem(data,indexes,value) {
 	// Traverse the JSON data structure using the index chain
 	var current = data;
 	for(var i = 0; i < indexes.length - 1; i++) {
-		current = getItemAtIndex(current,indexes[i]);
+		var index = indexes[i];
-		if(current === undefined) {
+		if($tw.utils.hop(current,index)) {
+			current = current[index];
+		} else {
 			// Return the original JSON data structure if any of the index strings are invalid
 			return data;
 		}
 	}
 	// Add the value to the end of the index chain
 	var lastIndex = indexes[indexes.length - 1];
-	if($tw.utils.isArray(current)) {
+	current[lastIndex] = value;
-		lastIndex = $tw.utils.parseInt(lastIndex);
-		if(lastIndex < 0) { lastIndex = lastIndex + current.length };
-	}
-	// Only set indexes on objects and arrays
-	if(typeof current === "object") {
-		current[lastIndex] = value;
-	}
 	return data;
 }
 

core/modules/filters/listops.js

@@ -58,7 +58,6 @@ Last entry/entries in list
 exports.last = function(source,operator,options) {
 	var count = $tw.utils.getInt(operator.operand,1),
 		results = [];
-	if(count === 0) return results;
 	source(function(tiddler,title) {
 		results.push(title);
 	});

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,119 +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) {
-	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) {
-			for(f in tiddler.fields) {
+			if(fields.indexOf(f) === -1) {
-				if(fields.indexOf(f) === -1) {
+				fields.push(f);
-					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++) {
-				for(f=0; f<fields.length; f++) {
+				row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
-					row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
-				}	
 			}
 		output.push(row.join(","));
 	}

core/modules/parsers/textparser.js

@@ -14,12 +14,10 @@ The plain text parser processes blocks of source text into a degenerate parse tr
 
 var TextParser = function(type,text,options) {
 	this.tree = [{
-		type: "genesis",
+		type: "codeblock",
 		attributes: {
-			$type: {name: "$type", type: "string", value: "$codeblock"},
+			code: {type: "string", value: text},
-			code: {name: "code", type: "string", value: text},
+			language: {type: "string", value: type}
-			language: {name: "language", type: "string", value: type},
-			$remappable: {name: "$remappable", type:"string", value: "no"}
 		}
 	}];
 	this.source = text;
@@ -34,3 +32,4 @@ exports["text/css"] = TextParser;
 exports["application/x-tiddler-dictionary"] = TextParser;
 
 })();
+

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

@@ -49,11 +49,11 @@ exports.parse = function() {
 	if(this.match[3]) {
 		params = $tw.utils.parseParameterDefinition(this.match[4]);
 	}
-	// Is the remainder of the line blank after the parameter close paren?
+	// Is this a multiline definition?
 	var reEnd;
 	if(this.match[5]) {
-		// If so, it is a multiline definition and the end of the body is marked with \end
+		// If so, the end of the body is marked with \end
-		reEnd = new RegExp("((:?^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[2]) + ")?(?:$|\\r?\\n))","mg");
+		reEnd = new RegExp("(\\r?\\n[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[2]) + ")?(?:$|\\r?\\n))","mg");
 	} else {
 		// Otherwise, the end of the definition is marked by the end of the line
 		reEnd = /($|\r?\n)/mg;

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

@@ -54,11 +54,11 @@ exports.parse = function() {
 			paramMatch = reParam.exec(paramString);
 		}
 	}
-	// Is the remainder of the \define line blank after the parameter close paren?
+	// Is this a multiline definition?
 	var reEnd;
 	if(this.match[3]) {
-		// If so, it is a multiline definition and the end of the body is marked with \end
+		// If so, the end of the body is marked with \end
-		reEnd = new RegExp("((?:^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
+		reEnd = new RegExp("(\\r?\\n[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
 	} else {
 		// Otherwise, the end of the definition is marked by the end of the line
 		reEnd = /($|\r?\n)/mg;

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

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

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

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

core/modules/parsers/wikiparser/wikiparser.js

@@ -194,7 +194,6 @@ Parse any pragmas at the beginning of a block of parse text
 WikiParser.prototype.parsePragmas = function() {
 	var currentTreeBranch = this.tree;
 	while(true) {
-		var savedPos = this.pos;
 		// Skip whitespace
 		this.skipWhitespace();
 		// Check for the end of the text
@@ -205,7 +204,6 @@ WikiParser.prototype.parsePragmas = function() {
 		var nextMatch = this.findNextMatch(this.pragmaRules,this.pos);
 		// If not, just exit
 		if(!nextMatch || nextMatch.matchIndex !== this.pos) {
-			this.pos = savedPos;
 			break;
 		}
 		// Process the pragma rule
@@ -216,8 +214,6 @@ WikiParser.prototype.parsePragmas = function() {
 			subTree[0].children = [];
 			currentTreeBranch = subTree[0].children;
 		}
-		// Skip whitespace after the pragma
-		this.skipWhitespace();
 	}
 	return currentTreeBranch;
 };

core/modules/savers/github.js

@@ -31,7 +31,7 @@ GitHubSaver.prototype.save = function(text,method,callback) {
 		headers = {
 			"Accept": "application/vnd.github.v3+json",
 			"Content-Type": "application/json;charset=UTF-8",
-			"Authorization": "Basic " + $tw.utils.base64Encode(username + ":" + password),
+			"Authorization": "Basic " + window.btoa(username + ":" + password),
 			"If-None-Match": ""
 		};
 	// Bail if we don't have everything we need

core/modules/startup/rootwidget.js

@@ -47,11 +47,7 @@ exports.startup = function() {
 			headers: getPropertiesWithPrefix(params,"header-"),
 			passwordHeaders: getPropertiesWithPrefix(params,"password-header-"),
 			queryStrings: getPropertiesWithPrefix(params,"query-"),
-			passwordQueryStrings: getPropertiesWithPrefix(params,"password-query-"),
+			passwordQueryStrings: getPropertiesWithPrefix(params,"password-query-")
-			basicAuthUsername: params["basic-auth-username"],
-			basicAuthUsernameFromStore: params["basic-auth-username-from-store"],
-			basicAuthPassword: params["basic-auth-password"],
-			basicAuthPasswordFromStore: params["basic-auth-password-from-store"]
 		});
 	});
 	$tw.rootWidget.addEventListener("tm-http-cancel-all-requests",function(event) {

core/modules/startup/windows.js

@@ -40,7 +40,7 @@ exports.startup = function() {
 			variables = $tw.utils.extend({},paramObject,{currentTiddler: title, "tv-window-id": windowID});
 		// Open the window
 		var srcWindow,
-			srcDocument;
+		    srcDocument;
 		// In case that popup blockers deny opening a new window
 		try {
 			srcWindow = window.open("","external-" + windowID,"scrollbars,width=" + width + ",height=" + height + (top ? ",top=" + top : "" ) + (left ? ",left=" + left : "" )),
@@ -52,7 +52,6 @@ exports.startup = function() {
 		$tw.windows[windowID] = srcWindow;
 		// Check for reopening the same window
 		if(srcWindow.haveInitialisedWindow) {
-			srcWindow.focus();
 			return;
 		}
 		// Initialise the document

core/modules/syncer.js

@@ -24,7 +24,7 @@ Syncer.prototype.titleSyncPollingInterval = "$:/config/SyncPollingInterval";
 Syncer.prototype.titleSyncDisableLazyLoading = "$:/config/SyncDisableLazyLoading";
 Syncer.prototype.titleSavedNotification = "$:/language/Notifications/Save/Done";
 Syncer.prototype.titleSyncThrottleInterval = "$:/config/SyncThrottleInterval";
-Syncer.prototype.taskTimerInterval = 0.25 * 1000; // Interval for sync timer
+Syncer.prototype.taskTimerInterval = 1 * 1000; // Interval for sync timer
 Syncer.prototype.throttleInterval = 1 * 1000; // Defer saving tiddlers if they've changed in the last 1s...
 Syncer.prototype.errorRetryInterval = 5 * 1000; // Interval to retry after an error
 Syncer.prototype.fallbackInterval = 10 * 1000; // Unless the task is older than 10s
@@ -74,11 +74,9 @@ function Syncer(options) {
 	this.titlesHaveBeenLazyLoaded = {}; // Hashmap of titles of tiddlers that have already been lazily loaded from the server
 	// Timers
 	this.taskTimerId = null; // Timer for task dispatch
+	this.pollTimerId = null; // Timer for polling server
 	// Number of outstanding requests
 	this.numTasksInProgress = 0;
-	// True when we want to force an immediate sync from the server
-	this.forceSyncFromServer = false;
-	this.timestampLastSyncFromServer = new Date();
 	// Listen out for changes to tiddlers
 	this.wiki.addEventListener("change",function(changes) {
 		// Filter the changes to just include ones that are being synced
@@ -205,37 +203,33 @@ Syncer.prototype.readTiddlerInfo = function() {
 Checks whether the wiki is dirty (ie the window shouldn't be closed)
 */
 Syncer.prototype.isDirty = function() {
-	var self = this;
+	this.logger.log("Checking dirty status");
-	function checkIsDirty() {
+	// Check tiddlers that are in the store and included in the filter function
-		// Check tiddlers that are in the store and included in the filter function
+	var titles = this.getSyncedTiddlers();
-		var titles = self.getSyncedTiddlers();
+	for(var index=0; index<titles.length; index++) {
-		for(var index=0; index<titles.length; index++) {
+		var title = titles[index],
-			var title = titles[index],
+			tiddlerInfo = this.tiddlerInfo[title];
-				tiddlerInfo = self.tiddlerInfo[title];
+		if(this.wiki.tiddlerExists(title)) {
-			if(self.wiki.tiddlerExists(title)) {
+			if(tiddlerInfo) {
-				if(tiddlerInfo) {
+				// If the tiddler is known on the server and has been modified locally then it needs to be saved to the server
-					// If the tiddler is known on the server and has been modified locally then it needs to be saved to the server
+				if(this.wiki.getChangeCount(title) > tiddlerInfo.changeCount) {
-					if(self.wiki.getChangeCount(title) > tiddlerInfo.changeCount) {
-						return true;
-					}
-				} else {
-					// If the tiddler isn't known on the server then it needs to be saved to the server
 					return true;
 				}
-			}
+			} else {
-		}
+				// If the tiddler isn't known on the server then it needs to be saved to the server
-		// Check tiddlers that are known from the server but not currently in the store
-		titles = Object.keys(self.tiddlerInfo);
-		for(index=0; index<titles.length; index++) {
-			if(!self.wiki.tiddlerExists(titles[index])) {
-				// There must be a pending delete
 				return true;
 			}
 		}
-		return false;
 	}
-	var dirtyStatus = checkIsDirty();
+	// Check tiddlers that are known from the server but not currently in the store
-	return dirtyStatus;
+	titles = Object.keys(this.tiddlerInfo);
+	for(index=0; index<titles.length; index++) {
+		if(!this.wiki.tiddlerExists(titles[index])) {
+			// There must be a pending delete
+			return true;
+		}
+	}
+	return false;
 };
 
 /*
@@ -299,16 +293,92 @@ Syncer.prototype.getStatus = function(callback) {
 Synchronise from the server by reading the skinny tiddler list and queuing up loads for any tiddlers that we don't already have up to date
 */
 Syncer.prototype.syncFromServer = function() {
-	if(this.canSyncFromServer()) {
+	var self = this,
-		this.forceSyncFromServer = true;
+		cancelNextSync = function() {
-		this.processTaskQueue();	
+			if(self.pollTimerId) {
+				clearTimeout(self.pollTimerId);
+				self.pollTimerId = null;
+			}
+		},
+		triggerNextSync = function() {
+			self.pollTimerId = setTimeout(function() {
+				self.pollTimerId = null;
+				self.syncFromServer.call(self);
+			},self.pollTimerInterval);
+		},
+		syncSystemFromServer = (self.wiki.getTiddlerText("$:/config/SyncSystemTiddlersFromServer") === "yes" ? true : false);
+	if(this.syncadaptor && this.syncadaptor.getUpdatedTiddlers) {
+		this.logger.log("Retrieving updated tiddler list");
+		cancelNextSync();
+		this.syncadaptor.getUpdatedTiddlers(self,function(err,updates) {
+			triggerNextSync();
+			if(err) {
+				self.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
+				return;
+			}
+			if(updates) {
+				$tw.utils.each(updates.modifications,function(title) {
+					self.titlesToBeLoaded[title] = true;
+				});
+				$tw.utils.each(updates.deletions,function(title) {
+					if(syncSystemFromServer || !self.wiki.isSystemTiddler(title)) {
+						delete self.tiddlerInfo[title];
+						self.logger.log("Deleting tiddler missing from server:",title);
+						self.wiki.deleteTiddler(title);
+					}
+				});
+				if(updates.modifications.length > 0 || updates.deletions.length > 0) {
+					self.processTaskQueue();
+				}				
+			}
+		});
+	} else if(this.syncadaptor && this.syncadaptor.getSkinnyTiddlers) {
+		this.logger.log("Retrieving skinny tiddler list");
+		cancelNextSync();
+		this.syncadaptor.getSkinnyTiddlers(function(err,tiddlers) {
+			triggerNextSync();
+			// Check for errors
+			if(err) {
+				self.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
+				return;
+			}
+			// Keep track of which tiddlers we already know about have been reported this time
+			var previousTitles = Object.keys(self.tiddlerInfo);
+			// Process each incoming tiddler
+			for(var t=0; t<tiddlers.length; t++) {
+				// Get the incoming tiddler fields, and the existing tiddler
+				var tiddlerFields = tiddlers[t],
+					incomingRevision = tiddlerFields.revision + "",
+					tiddler = self.wiki.tiddlerExists(tiddlerFields.title) && self.wiki.getTiddler(tiddlerFields.title),
+					tiddlerInfo = self.tiddlerInfo[tiddlerFields.title],
+					currRevision = tiddlerInfo ? tiddlerInfo.revision : null,
+					indexInPreviousTitles = previousTitles.indexOf(tiddlerFields.title);
+				if(indexInPreviousTitles !== -1) {
+					previousTitles.splice(indexInPreviousTitles,1);
+				}
+				// Ignore the incoming tiddler if it's the same as the revision we've already got
+				if(currRevision !== incomingRevision) {
+					// Only load the skinny version if we don't already have a fat version of the tiddler
+					if(!tiddler || tiddler.fields.text === undefined) {
+						self.storeTiddler(tiddlerFields);
+					}
+					// Do a full load of this tiddler
+					self.titlesToBeLoaded[tiddlerFields.title] = true;
+				}
+			}
+			// Delete any tiddlers that were previously reported but missing this time
+			$tw.utils.each(previousTitles,function(title) {
+				if(syncSystemFromServer || !self.wiki.isSystemTiddler(title)) {
+					delete self.tiddlerInfo[title];
+					self.logger.log("Deleting tiddler missing from server:",title);
+					self.wiki.deleteTiddler(title);
+				}
+			});
+			self.processTaskQueue();
+		});
 	}
 };
 
-Syncer.prototype.canSyncFromServer = function() {
-	return !!this.syncadaptor.getUpdatedTiddlers || !!this.syncadaptor.getSkinnyTiddlers;
-}
-
 /*
 Force load a tiddler from the server
 */
@@ -440,7 +510,7 @@ Syncer.prototype.processTaskQueue = function() {
 				} else {
 					self.updateDirtyStatus();
 					// Process the next task
-					self.processTaskQueue.call(self);
+					self.processTaskQueue.call(self);					
 				}
 			});
 		} else {
@@ -448,39 +518,31 @@ Syncer.prototype.processTaskQueue = function() {
 			this.updateDirtyStatus();
 			// And trigger a timeout if there is a pending task
 			if(task === true) {
-				this.triggerTimeout(this.taskTimerInterval);
+				this.triggerTimeout();				
-			} else if(this.canSyncFromServer()) {
-				this.triggerTimeout(this.pollTimerInterval);
 			}
 		}
 	} else {
-		this.updateDirtyStatus();
+		this.updateDirtyStatus();		
-		this.triggerTimeout(this.taskTimerInterval);
 	}
 };
 
 Syncer.prototype.triggerTimeout = function(interval) {
 	var self = this;
-	if(this.taskTimerId) {
+	if(!this.taskTimerId) {
-		clearTimeout(this.taskTimerId);
+		this.taskTimerId = setTimeout(function() {
+			self.taskTimerId = null;
+			self.processTaskQueue.call(self);
+		},interval || self.taskTimerInterval);
 	}
-	this.taskTimerId = setTimeout(function() {
-		self.taskTimerId = null;
-		self.processTaskQueue.call(self);
-	},interval || self.taskTimerInterval);
 };
 
 /*
-Choose the next sync task. We prioritise saves to the server, then getting updates from the server, then deletes to the server, then loads from the server
+Choose the next sync task. We prioritise saves, then deletes, then loads from the server
 
-Returns either:
+Returns either a task object, null if there's no upcoming tasks, or the boolean true if there are pending tasks that aren't yet due
-* a task object
-* the boolean true if there are pending sync tasks that aren't yet due
-* null if there's no pending sync tasks (just the next poll)
 */
 Syncer.prototype.chooseNextTask = function() {
-	var now = new Date(),
+	var thresholdLastSaved = (new Date()) - this.throttleInterval,
-		thresholdLastSaved = now - this.throttleInterval,
 		havePending = null;
 	// First we look for tiddlers that have been modified locally and need saving back to the server
 	var titles = this.getSyncedTiddlers();
@@ -494,18 +556,14 @@ Syncer.prototype.chooseNextTask = function() {
 				isReadyToSave = !tiddlerInfo || !tiddlerInfo.timestampLastSaved || tiddlerInfo.timestampLastSaved < thresholdLastSaved;
 			if(hasChanged) {
 				if(isReadyToSave) {
-					return new SaveTiddlerTask(this,title);
+					return new SaveTiddlerTask(this,title); 					
 				} else {
 					havePending = true;
 				}
 			}
 		}
 	}
-	// Second we check for an outstanding sync from server
+	// Second, we check tiddlers that are known from the server but not currently in the store, and so need deleting on the server
-	if(this.forceSyncFromServer || (this.timestampLastSyncFromServer && (now.valueOf() >= (this.timestampLastSyncFromServer.valueOf() + this.pollTimerInterval)))) {
-		return new SyncFromServerTask(this);
-	}
-	// Third, we check tiddlers that are known from the server but not currently in the store, and so need deleting on the server
 	titles = Object.keys(this.tiddlerInfo);
 	for(index=0; index<titles.length; index++) {
 		title = titles[index];
@@ -515,13 +573,13 @@ Syncer.prototype.chooseNextTask = function() {
 			return new DeleteTiddlerTask(this,title);
 		}
 	}
-	// Finally, check for tiddlers that need loading
+	// Check for tiddlers that need loading
 	title = Object.keys(this.titlesToBeLoaded)[0];
 	if(title) {
 		delete this.titlesToBeLoaded[title];
 		return new LoadTiddlerTask(this,title);
 	}
-	// No tasks are ready now, but might be in the future
+	// No tasks are ready
 	return havePending;
 };
 
@@ -531,10 +589,6 @@ function SaveTiddlerTask(syncer,title) {
 	this.type = "save";
 }
 
-SaveTiddlerTask.prototype.toString = function() {
-	return "SAVE " + this.title;
-}
-
 SaveTiddlerTask.prototype.run = function(callback) {
 	var self = this,
 		changeCount = this.syncer.wiki.getChangeCount(this.title),
@@ -559,6 +613,7 @@ SaveTiddlerTask.prototype.run = function(callback) {
 			tiddlerInfo: self.syncer.tiddlerInfo[self.title]
 		});
 	} else {
+		this.syncer.logger.log(" Not Dispatching 'save' task:",this.title,"tiddler does not exist");
 		$tw.utils.nextTick(callback(null));
 	}
 };
@@ -569,10 +624,6 @@ function DeleteTiddlerTask(syncer,title) {
 	this.type = "delete";
 }
 
-DeleteTiddlerTask.prototype.toString = function() {
-	return "DELETE " + this.title;
-}
-
 DeleteTiddlerTask.prototype.run = function(callback) {
 	var self = this;
 	this.syncer.logger.log("Dispatching 'delete' task:",this.title);
@@ -596,10 +647,6 @@ function LoadTiddlerTask(syncer,title) {
 	this.type = "load";
 }
 
-LoadTiddlerTask.prototype.toString = function() {
-	return "LOAD " + this.title;
-}
-
 LoadTiddlerTask.prototype.run = function(callback) {
 	var self = this;
 	this.syncer.logger.log("Dispatching 'load' task:",this.title);
@@ -617,91 +664,6 @@ LoadTiddlerTask.prototype.run = function(callback) {
 	});
 };
 
-function SyncFromServerTask(syncer) {
-	this.syncer = syncer;
-	this.type = "syncfromserver";
-}
-
-SyncFromServerTask.prototype.toString = function() {
-	return "SYNCFROMSERVER";
-}
-
-SyncFromServerTask.prototype.run = function(callback) {
-	var self = this;
-	var syncSystemFromServer = (self.syncer.wiki.getTiddlerText("$:/config/SyncSystemTiddlersFromServer") === "yes" ? true : false);
-	var successCallback = function() {
-		self.syncer.forceSyncFromServer = false;
-		self.syncer.timestampLastSyncFromServer = new Date();
-		callback(null);
-	};
-	if(this.syncer.syncadaptor.getUpdatedTiddlers) {
-		this.syncer.syncadaptor.getUpdatedTiddlers(self.syncer,function(err,updates) {
-			if(err) {
-				self.syncer.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
-				return callback(err);
-			}
-			if(updates) {
-				$tw.utils.each(updates.modifications,function(title) {
-					self.syncer.titlesToBeLoaded[title] = true;
-				});
-				$tw.utils.each(updates.deletions,function(title) {
-					if(syncSystemFromServer || !self.syncer.wiki.isSystemTiddler(title)) {
-						delete self.syncer.tiddlerInfo[title];
-						self.syncer.logger.log("Deleting tiddler missing from server:",title);
-						self.syncer.wiki.deleteTiddler(title);
-					}
-				});
-			}
-			return successCallback();
-		});
-	} else if(this.syncer.syncadaptor.getSkinnyTiddlers) {
-		this.syncer.syncadaptor.getSkinnyTiddlers(function(err,tiddlers) {
-			// Check for errors
-			if(err) {
-				self.syncer.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
-				return callback(err);
-			}
-			// Keep track of which tiddlers we already know about have been reported this time
-			var previousTitles = Object.keys(self.syncer.tiddlerInfo);
-			// Process each incoming tiddler
-			for(var t=0; t<tiddlers.length; t++) {
-				// Get the incoming tiddler fields, and the existing tiddler
-				var tiddlerFields = tiddlers[t],
-					incomingRevision = tiddlerFields.revision + "",
-					tiddler = self.syncer.wiki.tiddlerExists(tiddlerFields.title) && self.syncer.wiki.getTiddler(tiddlerFields.title),
-					tiddlerInfo = self.syncer.tiddlerInfo[tiddlerFields.title],
-					currRevision = tiddlerInfo ? tiddlerInfo.revision : null,
-					indexInPreviousTitles = previousTitles.indexOf(tiddlerFields.title);
-				if(indexInPreviousTitles !== -1) {
-					previousTitles.splice(indexInPreviousTitles,1);
-				}
-				// Ignore the incoming tiddler if it's the same as the revision we've already got
-				if(currRevision !== incomingRevision) {
-					// Only load the skinny version if we don't already have a fat version of the tiddler
-					if(!tiddler || tiddler.fields.text === undefined) {
-						self.syncer.storeTiddler(tiddlerFields);
-					}
-					// Do a full load of this tiddler
-					self.syncer.titlesToBeLoaded[tiddlerFields.title] = true;
-				}
-			}
-			// Delete any tiddlers that were previously reported but missing this time
-			$tw.utils.each(previousTitles,function(title) {
-				if(syncSystemFromServer || !self.syncer.wiki.isSystemTiddler(title)) {
-					delete self.syncer.tiddlerInfo[title];
-					self.syncer.logger.log("Deleting tiddler missing from server:",title);
-					self.syncer.wiki.deleteTiddler(title);
-				}
-			});
-			self.syncer.forceSyncFromServer = false;
-			self.syncer.timestampLastSyncFromServer = new Date();
-			return successCallback();
-		});
-	} else {
-		return successCallback();
-	}
-};
-
 exports.Syncer = Syncer;
 
 })();

core/modules/utils/dom/dom.js

@@ -313,7 +313,7 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) {
 			variables["dom-" + attribute.name] = attribute.value.toString();
 		});
 		
-		if("offsetLeft" in selectedNode) {
+		if(selectedNode.offsetLeft) {
 			// Add variables with a (relative and absolute) popup coordinate string for the selected node
 			var nodeRect = {
 				left: selectedNode.offsetLeft,
@@ -338,12 +338,12 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) {
 		}
 	}
 	
-	if(domNode && ("offsetWidth" in domNode)) {
+	if(domNode && domNode.offsetWidth) {
 		variables["tv-widgetnode-width"] = domNode.offsetWidth.toString();
 		variables["tv-widgetnode-height"] = domNode.offsetHeight.toString();
 	}
 
-	if(event && ("clientX" in event) && ("clientY" in event)) {
+	if(event && event.clientX && event.clientY) {
 		if(selectedNode) {
 			// Add variables for event X and Y position relative to selected node
 			selectedNodeRect = selectedNode.getBoundingClientRect();

core/modules/utils/dom/http.js

@@ -100,10 +100,6 @@ headers: hashmap of header name to header value to be sent with the request
 passwordHeaders: hashmap of header name to password store name to be sent with the request
 queryStrings: hashmap of query string parameter name to parameter value to be sent with the request
 passwordQueryStrings: hashmap of query string parameter name to password store name to be sent with the request
-basicAuthUsername: plain username for basic authentication
-basicAuthUsernameFromStore: name of password store entry containing username
-basicAuthPassword: plain password for basic authentication
-basicAuthPasswordFromStore: name of password store entry containing password
 */
 function HttpClientRequest(options) {
 	var self = this;
@@ -132,11 +128,6 @@ function HttpClientRequest(options) {
 	$tw.utils.each(options.passwordHeaders,function(value,name) {
 		self.requestHeaders[name] = $tw.utils.getPassword(value) || "";
 	});
-	this.basicAuthUsername = options.basicAuthUsername || (options.basicAuthUsernameFromStore && $tw.utils.getPassword(options.basicAuthUsernameFromStore)) || "";
-	this.basicAuthPassword = options.basicAuthPassword || (options.basicAuthPasswordFromStore && $tw.utils.getPassword(options.basicAuthPasswordFromStore)) || "";
-	if(this.basicAuthUsername && this.basicAuthPassword) {
-		this.requestHeaders.Authorization = "Basic " + $tw.utils.base64Encode(this.basicAuthUsername + ":" + this.basicAuthPassword);
-	}
 }
 
 HttpClientRequest.prototype.send = function(callback) {
@@ -196,7 +187,7 @@ HttpClientRequest.prototype.send = function(callback) {
 					for (var i=0; i<len; i++) {
 						binary += String.fromCharCode(bytes[i]);
 					}
-					resultVariables.data = $tw.utils.base64Encode(binary,true);
+					resultVariables.data = window.btoa(binary);
 				}
 				self.wiki.addTiddler(new $tw.Tiddler(self.wiki.getTiddler(requestTrackerTitle),{
 					status: completionCode,
@@ -298,7 +289,7 @@ exports.httpRequest = function(options) {
 				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/fakedom.js

@@ -104,11 +104,7 @@ TW_Element.prototype.setAttribute = function(name,value) {
 	if(this.isRaw) {
 		throw "Cannot setAttribute on a raw TW_Element";
 	}
-	if(name === "style") {
+	this.attributes[name] = value + "";
-		this.style = value;
-	} else {
-		this.attributes[name] = value + "";
-	}
 };
 
 TW_Element.prototype.setAttributeNS = function(namespace,name,value) {

core/modules/utils/utils.js

@@ -819,50 +819,18 @@ exports.hashString = function(str) {
 	},0);
 };
 
-/*
-Cryptographic hash function as used by sha256 filter operator
-options.length .. number of characters returned defaults to 64
-*/
-exports.sha256 = function(str, options) {
-	options = options || {}
-	return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(str)).substr(0,options.length || 64);
-}
-
-/*
-Base64 utility functions that work in either browser or Node.js
-*/
-if(typeof window !== 'undefined') {
-	exports.btoa = function(binstr) { return window.btoa(binstr); }
-	exports.atob = function(b64) { return window.atob(b64); }
-} else {
-	exports.btoa = function(binstr) {
-		return Buffer.from(binstr, 'binary').toString('base64');
-	}
-	exports.atob = function(b64) {
-		return Buffer.from(b64, 'base64').toString('binary');
-	}
-}
-
 /*
 Decode a base64 string
 */
-exports.base64Decode = function(string64,binary,urlsafe) {
+exports.base64Decode = function(string64) {
-	var encoded = urlsafe ? string64.replace(/_/g,'/').replace(/-/g,'+') : string64;
+	return base64utf8.base64.decode.call(base64utf8,string64);
-	if(binary) return exports.atob(encoded)
-	else return base64utf8.base64.decode.call(base64utf8,encoded);
 };
 
 /*
 Encode a string to base64
 */
-exports.base64Encode = function(string64,binary,urlsafe) {
+exports.base64Encode = function(string64) {
-	var encoded;
+	return base64utf8.base64.encode.call(base64utf8,string64);
-	if(binary) encoded = exports.btoa(string64);
-	else encoded = base64utf8.base64.encode.call(base64utf8,string64);
-	if(urlsafe) {
-		encoded = encoded.replace(/\+/g,'-').replace(/\//g,'_');
-	}
-	return encoded;
 };
 
 /*
@@ -931,7 +899,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 +912,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/browse.js

@@ -70,11 +70,6 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
 		}
 		return false;
 	},false);
-	// Assign data- attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Insert element
 	parent.insertBefore(domNode,nextSibling);
 	this.renderChildren(domNode,null);
@@ -100,11 +95,6 @@ BrowseWidget.prototype.execute = function() {
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 BrowseWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	if($tw.utils.count(changedAttributes) > 0) {
-		this.refreshSelf();
-		return true;	
-	}
 	return false;
 };
 

core/modules/widgets/button.js

@@ -59,11 +59,6 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
 		$tw.utils.pushTop(classes,"tc-popup-handle");
 	}
 	domNode.className = classes.join(" ");
-	// Assign data- attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Assign other attributes
 	if(this.style) {
 		domNode.setAttribute("style",this.style);
@@ -255,7 +250,7 @@ ButtonWidget.prototype.updateDomNodeClasses = function() {
 	//Add new classes from updated class attribute.
 	$tw.utils.pushTop(domNodeClasses,newClasses);
 	this.domNode.className = domNodeClasses.join(" ");
-};
+}
 
 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
@@ -265,15 +260,8 @@ ButtonWidget.prototype.refresh = function(changedTiddlers) {
 	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
 		this.refreshSelf();
 		return true;
-	} else {
+	} else if(changedAttributes["class"]) {
-		if(changedAttributes["class"]) {
+		this.updateDomNodeClasses();
-			this.updateDomNodeClasses();
-		}
-		this.assignAttributes(this.domNodes[0],{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
 	}
 	return this.refreshChildren(changedTiddlers);
 };

core/modules/widgets/checkbox.js

@@ -53,11 +53,6 @@ CheckboxWidget.prototype.render = function(parent,nextSibling) {
 	this.labelDomNode.appendChild(this.inputDomNode);
 	this.spanDomNode = this.document.createElement("span");
 	this.labelDomNode.appendChild(this.spanDomNode);
-	// Assign data- attributes
-	this.assignAttributes(this.inputDomNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Add a click event handler
 	$tw.utils.addEventListeners(this.inputDomNode,[
 		{name: "change", handlerObject: this, handlerMethod: "handleChangeEvent"}
@@ -330,11 +325,6 @@ CheckboxWidget.prototype.refresh = function(changedTiddlers) {
 				$tw.utils.removeClass(this.labelDomNode,"tc-checkbox-checked");
 			}
 		}
-		this.assignAttributes(this.inputDomNode,{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
 		return this.refreshChildren(changedTiddlers) || refreshed;
 	}
 };
@@ -342,4 +332,3 @@ CheckboxWidget.prototype.refresh = function(changedTiddlers) {
 exports.checkbox = CheckboxWidget;
 
 })();
-	

core/modules/widgets/draggable.js

@@ -52,11 +52,6 @@ DraggableWidget.prototype.render = function(parent,nextSibling) {
 		classes.push("tc-draggable");
 	}
 	domNode.setAttribute("class",classes.join(" "));
-	// Assign data- attributes and style. attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Insert the node into the DOM and render any children
 	parent.insertBefore(domNode,nextSibling);
 	this.renderChildren(domNode,null);
@@ -113,23 +108,17 @@ DraggableWidget.prototype.updateDomNodeClasses = function() {
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 DraggableWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
+	var changedAttributes = this.computeAttributes(),
-	if(changedAttributes.tag || changedAttributes.selector || changedAttributes.dragimagetype || changedAttributes.enable || changedAttributes.startactions || changedAttributes.endactions) {
+		changedAttributesCount = $tw.utils.count(changedAttributes);
+	if(changedAttributesCount === 1 && changedAttributes["class"]) {
+		this.updateDomNodeClasses();
+	} else if(changedAttributesCount > 0) {
 		this.refreshSelf();
 		return true;
-	} else {
-		if(changedAttributes["class"]) {
-			this.updateDomNodeClasses();
-		}
-		this.assignAttributes(this.domNodes[0],{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
 	}
 	return this.refreshChildren(changedTiddlers);
 };
 
 exports.draggable = DraggableWidget;
 
-})();
+})();

core/modules/widgets/droppable.js

@@ -42,11 +42,6 @@ DroppableWidget.prototype.render = function(parent,nextSibling) {
 	domNode = this.document.createElement(tag);
 	this.domNode = domNode;
 	this.assignDomNodeClasses();
-	// Assign data- attributes and style. attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Add event handlers
 	if(this.droppableEnable) {
 		$tw.utils.addEventListeners(domNode,[
@@ -171,15 +166,8 @@ DroppableWidget.prototype.refresh = function(changedTiddlers) {
 	if(changedAttributes.tag || changedAttributes.enable || changedAttributes.disabledClass || changedAttributes.actions || changedAttributes.effect) {
 		this.refreshSelf();
 		return true;
-	} else {
+	} else if(changedAttributes["class"]) {
-		if(changedAttributes["class"]) {
+		this.assignDomNodeClasses();
-			this.assignDomNodeClasses();
-		}
-		this.assignAttributes(this.domNodes[0],{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
 	}
 	return this.refreshChildren(changedTiddlers);
 };

core/modules/widgets/edit.js

@@ -90,7 +90,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 EditWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
 	// Refresh if an attribute has changed, or the type associated with the target tiddler has changed
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || (this.getEditorType() !== this.editorType)) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || (changedTiddlers[this.editTitle] && this.getEditorType() !== this.editorType)) {
 		this.refreshSelf();
 		return true;
 	} else {

core/modules/widgets/image.js

@@ -58,25 +58,24 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 		if(this.wiki.isImageTiddler(this.imageSource)) {
 			var type = tiddler.fields.type,
 				text = tiddler.fields.text,
-				_canonical_uri = tiddler.fields._canonical_uri,
+				_canonical_uri = tiddler.fields._canonical_uri;
-				typeInfo = $tw.config.contentTypeInfo[type] || {},
-				deserializerType = typeInfo.deserializerType || type;
 			// If the tiddler has body text then it doesn't need to be lazily loaded
 			if(text) {
-				// Render the appropriate element for the image type by looking up the encoding in the content type info
+				// Render the appropriate element for the image type
-				var encoding = typeInfo.encoding || "utf8";
+				switch(type) {
-				if (encoding === "base64") {
+					case "application/pdf":
-					// .pdf .png .jpg etc.
-					src = "data:" + deserializerType + ";base64," + text;
-					if (deserializerType === "application/pdf") {
 						tag = "embed";
-					}
+						src = "data:application/pdf;base64," + text;
-				} else {
+						break;
-					// .svg .tid .xml etc.
+					case "image/svg+xml":
-					src = "data:" + deserializerType + "," + encodeURIComponent(text);
+						src = "data:image/svg+xml," + encodeURIComponent(text);
+						break;
+					default:
+						src = "data:" + type + ";base64," + text;
+						break;
 				}
 			} else if(_canonical_uri) {
-				switch(deserializerType) {
+				switch(type) {
 					case "application/pdf":
 						tag = "embed";
 						src = _canonical_uri;
@@ -100,9 +99,6 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 	if(this.imageClass) {
 		domNode.setAttribute("class",this.imageClass);
 	}
-	if(this.imageUsemap) {
-	    	domNode.setAttribute("usemap",this.imageUsemap);
-	}
 	if(this.imageWidth) {
 		domNode.setAttribute("width",this.imageWidth);
 	}
@@ -142,7 +138,6 @@ ImageWidget.prototype.execute = function() {
 	this.imageWidth = this.getAttribute("width");
 	this.imageHeight = this.getAttribute("height");
 	this.imageClass = this.getAttribute("class");
-    	this.imageUsemap = this.getAttribute("usemap");
 	this.imageTooltip = this.getAttribute("tooltip");
 	this.imageAlt = this.getAttribute("alt");
 	this.lazyLoading = this.getAttribute("loading");
@@ -153,7 +148,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 ImageWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.source || changedAttributes.width || changedAttributes.height || changedAttributes["class"] || changedAttributes.usemap || changedAttributes.tooltip || changedTiddlers[this.imageSource]) {
+	if(changedAttributes.source || changedAttributes.width || changedAttributes.height || changedAttributes["class"] || changedAttributes.tooltip || changedTiddlers[this.imageSource]) {
 		this.refreshSelf();
 		return true;
 	} else {

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/link.js

@@ -43,11 +43,6 @@ LinkWidget.prototype.render = function(parent,nextSibling) {
 	} else {
 		// Just insert the link text
 		var domNode = this.document.createElement("span");
-		// Assign data- attributes
-		this.assignAttributes(domNode,{
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
 		parent.insertBefore(domNode,nextSibling);
 		this.renderChildren(domNode,null);
 		this.domNodes.push(domNode);
@@ -143,11 +138,6 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
 			widget: this
 		});
 	}
-	// Assign data- attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Insert the link into the DOM and render any children
 	parent.insertBefore(domNode,nextSibling);
 	this.renderChildren(domNode,null);
@@ -217,7 +207,8 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 LinkWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if($tw.utils.count(changedAttributes) > 0 || changedTiddlers[this.to]) {
+	if(changedAttributes.to || changedTiddlers[this.to] || changedAttributes["aria-label"] || changedAttributes.tooltip ||
+		changedAttributes["class"] || changedAttributes.tabindex || changedAttributes.draggable || changedAttributes.tag) {
 		this.refreshSelf();
 		return true;
 	}
@@ -227,4 +218,3 @@ LinkWidget.prototype.refresh = function(changedTiddlers) {
 exports.link = LinkWidget;
 
 })();
-	

core/modules/widgets/list.js

@@ -28,18 +28,6 @@ Inherit from the base widget class
 */
 ListWidget.prototype = new Widget();
 
-ListWidget.prototype.initialise = function(parseTreeNode,options) {
-	// Bail if parseTreeNode is undefined, meaning that the ListWidget constructor was called without any arguments so that it can be subclassed
-	if(parseTreeNode === undefined) {
-		return;
-	}
-	// First call parent constructor to set everything else up
-	Widget.prototype.initialise.call(this,parseTreeNode,options);
-	// Now look for <$list-template> and <$list-empty> widgets as immediate child widgets
-	// This is safe to do during initialization because parse trees never change after creation
-	this.findExplicitTemplates();
-}
-
 /*
 Render this widget into the DOM
 */
@@ -50,8 +38,8 @@ ListWidget.prototype.render = function(parent,nextSibling) {
 		$tw.modules.applyMethods("storyview",this.storyViews);
 	}
 	this.parentDomNode = parent;
-	var changedAttributes = this.computeAttributes();
+	this.computeAttributes();
-	this.execute(changedAttributes);
+	this.execute();
 	this.renderChildren(parent,nextSibling);
 	// Construct the storyview
 	var StoryView = this.storyViews[this.storyViewName];
@@ -71,7 +59,7 @@ ListWidget.prototype.render = function(parent,nextSibling) {
 /*
 Compute the internal state of the widget
 */
-ListWidget.prototype.execute = function(changedAttributes) {
+ListWidget.prototype.execute = function() {
 	var self = this;
 	// Get our attributes
 	this.template = this.getAttribute("template");
@@ -80,10 +68,8 @@ ListWidget.prototype.execute = function(changedAttributes) {
 	this.counterName = this.getAttribute("counter");
 	this.storyViewName = this.getAttribute("storyview");
 	this.historyTitle = this.getAttribute("history");
-	// Create join template only if needed
+	// Look for <$list-template> and <$list-empty> widgets as immediate child widgets
-	if(this.join === undefined || (changedAttributes && changedAttributes.join)) {
+	this.findExplicitTemplates();
-		this.join = this.makeJoinTemplate();
-	}
 	// Compose the list elements
 	this.list = this.getTiddlerList();
 	var members = [],
@@ -106,27 +92,18 @@ ListWidget.prototype.findExplicitTemplates = function() {
 	var self = this;
 	this.explicitListTemplate = null;
 	this.explicitEmptyTemplate = null;
-	this.explicitJoinTemplate = null;
-	this.hasTemplateInBody = false;
 	var searchChildren = function(childNodes) {
-		var foundInlineTemplate = false;
 		$tw.utils.each(childNodes,function(node) {
 			if(node.type === "list-template") {
 				self.explicitListTemplate = node.children;
 			} else if(node.type === "list-empty") {
 				self.explicitEmptyTemplate = node.children;
-			} else if(node.type === "list-join") {
-				self.explicitJoinTemplate = node.children;
 			} else if(node.type === "element" && node.tag === "p") {
 				searchChildren(node.children);
-				foundInlineTemplate = true;
-			} else {
-				foundInlineTemplate = true;
 			}
 		});
-		return foundInlineTemplate;
 	};
-	this.hasTemplateInBody = searchChildren(this.parseTreeNode.children);
+	searchChildren(this.parseTreeNode.children);
 }
 
 ListWidget.prototype.getTiddlerList = function() {
@@ -162,24 +139,6 @@ ListWidget.prototype.getEmptyMessage = function() {
 	}
 };
 
-/*
-Compose the template for a join between list items
-*/
-ListWidget.prototype.makeJoinTemplate = function() {
-	var parser,
-		join = this.getAttribute("join","");
-	if(join) {
-		parser = this.wiki.parseText("text/vnd.tiddlywiki",join,{parseAsInline:true})
-		if(parser) {
-			return parser.tree;
-		} else {
-			return [];
-		}
-	} else {
-		return this.explicitJoinTemplate; // May be null, and that's fine
-	}
-};
-
 /*
 Compose the template for a list item
 */
@@ -188,7 +147,6 @@ ListWidget.prototype.makeItemTemplate = function(title,index) {
 	var tiddler = this.wiki.getTiddler(title),
 		isDraft = tiddler && tiddler.hasField("draft.of"),
 		template = this.template,
-		join = this.join,
 		templateTree;
 	if(isDraft && this.editTemplate) {
 		template = this.editTemplate;
@@ -202,11 +160,11 @@ ListWidget.prototype.makeItemTemplate = function(title,index) {
 			// Check for a <$list-item> widget
 			if(this.explicitListTemplate) {
 				templateTree = this.explicitListTemplate;
-			} else if(this.hasTemplateInBody) {
+			} else if (!this.explicitEmptyTemplate) {
 				templateTree = this.parseTreeNode.children;
 			}
 		}
-		if(!templateTree || templateTree.length === 0) {
+		if(!templateTree) {
 			// Default template is a link to the title
 			templateTree = [{type: "element", tag: this.parseTreeNode.isBlock ? "div" : "span", children: [{type: "link", attributes: {to: {type: "string", value: title}}, children: [
 				{type: "text", text: title}
@@ -214,12 +172,12 @@ ListWidget.prototype.makeItemTemplate = function(title,index) {
 		}
 	}
 	// Return the list item
-	var parseTreeNode = {type: "listitem", itemTitle: title, variableName: this.variableName, children: templateTree, join: join};
+	var parseTreeNode = {type: "listitem", itemTitle: title, variableName: this.variableName, children: templateTree};
-	parseTreeNode.isLast = index === this.list.length - 1;
 	if(this.counterName) {
 		parseTreeNode.counter = (index + 1).toString();
 		parseTreeNode.counterName = this.counterName;
 		parseTreeNode.isFirst = index === 0;
+		parseTreeNode.isLast = index === this.list.length - 1;
 	}
 	return parseTreeNode;
 };
@@ -235,7 +193,7 @@ ListWidget.prototype.refresh = function(changedTiddlers) {
 		this.storyview.refreshStart(changedTiddlers,changedAttributes);
 	}
 	// Completely refresh if any of our attributes have changed
-	if(changedAttributes.filter || changedAttributes.variable || changedAttributes.counter || changedAttributes.template || changedAttributes.editTemplate || changedAttributes.join || changedAttributes.emptyMessage || changedAttributes.storyview || changedAttributes.history) {
+	if(changedAttributes.filter || changedAttributes.variable || changedAttributes.counter || changedAttributes.template || changedAttributes.editTemplate || changedAttributes.emptyMessage || changedAttributes.storyview || changedAttributes.history) {
 		this.refreshSelf();
 		result = true;
 	} else {
@@ -339,29 +297,10 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 			}
 		} else {
 			// Cycle through the list, inserting and removing list items as needed
-			var mustRecreateLastItem = false;
-			if(this.join && this.join.length) {
-				if(this.children.length !== this.list.length) {
-						mustRecreateLastItem = true;
-				} else if(prevList[prevList.length-1] !== this.list[this.list.length-1]) {
-						mustRecreateLastItem = true;
-				}
-			}
-			var isLast = false, wasLast = false;
 			for(t=0; t<this.list.length; t++) {
-				isLast = t === this.list.length-1;
 				var index = this.findListItem(t,this.list[t]);
-				wasLast = index === this.children.length-1;
-				if(wasLast && (index !== t || this.children.length !== this.list.length)) {
-					mustRecreateLastItem = !!(this.join && this.join.length);
-				}
 				if(index === undefined) {
 					// The list item must be inserted
-					if(isLast && mustRecreateLastItem && t>0) {
-						// First re-create previosly-last item that will no longer be last
-						this.removeListItem(t-1);
-						this.insertListItem(t-1,this.list[t-1]);
-					}
 					this.insertListItem(t,this.list[t]);
 					hasRefreshed = true;
 				} else {
@@ -370,15 +309,9 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 						this.removeListItem(n);
 						hasRefreshed = true;
 					}
-					// Refresh the item we're reusing, or recreate if necessary
+					// Refresh the item we're reusing
-					if(mustRecreateLastItem && (isLast || wasLast)) {
+					var refreshed = this.children[t].refresh(changedTiddlers);
-						this.removeListItem(t);
+					hasRefreshed = hasRefreshed || refreshed;
-						this.insertListItem(t,this.list[t]);
-						hasRefreshed = true;
-					} else {
-						var refreshed = this.children[t].refresh(changedTiddlers);
-						hasRefreshed = hasRefreshed || refreshed;
-					}
 				}
 			}
 		}
@@ -468,17 +401,8 @@ ListItemWidget.prototype.execute = function() {
 		this.setVariable(this.parseTreeNode.counterName + "-first",this.parseTreeNode.isFirst ? "yes" : "no");
 		this.setVariable(this.parseTreeNode.counterName + "-last",this.parseTreeNode.isLast ? "yes" : "no");
 	}
-	// Add join if needed
-	var children = this.parseTreeNode.children,
-		join = this.parseTreeNode.join;
-	if(join && join.length && !this.parseTreeNode.isLast) {
-		children = children.slice(0);
-		$tw.utils.each(join,function(joinNode) {
-			children.push(joinNode);
-		})
-	}
 	// Construct the child widgets
-	this.makeChildWidgets(children);
+	this.makeChildWidgets();
 };
 
 /*
@@ -490,37 +414,4 @@ ListItemWidget.prototype.refresh = function(changedTiddlers) {
 
 exports.listitem = ListItemWidget;
 
-/*
-Make <$list-template> and <$list-empty> widgets that do nothing
-*/
-var ListTemplateWidget = function(parseTreeNode,options) {
-	// Main initialisation inherited from widget.js
-	this.initialise(parseTreeNode,options);
-};
-ListTemplateWidget.prototype = new Widget();
-ListTemplateWidget.prototype.render = function() {}
-ListTemplateWidget.prototype.refresh = function() { return false; }
-
-exports["list-template"] = ListTemplateWidget;
-
-var ListEmptyWidget = function(parseTreeNode,options) {
-	// Main initialisation inherited from widget.js
-	this.initialise(parseTreeNode,options);
-};
-ListEmptyWidget.prototype = new Widget();
-ListEmptyWidget.prototype.render = function() {}
-ListEmptyWidget.prototype.refresh = function() { return false; }
-
-exports["list-empty"] = ListEmptyWidget;
-
-var ListJoinWidget = function(parseTreeNode,options) {
-	// Main initialisation inherited from widget.js
-	this.initialise(parseTreeNode,options);
-};
-ListJoinWidget.prototype = new Widget();
-ListJoinWidget.prototype.render = function() {}
-ListJoinWidget.prototype.refresh = function() { return false; }
-
-exports["list-join"] = ListJoinWidget;
-
 })();

core/modules/widgets/radio.js

@@ -40,10 +40,6 @@ RadioWidget.prototype.render = function(parent,nextSibling) {
 	);
 	this.inputDomNode = this.document.createElement("input");
 	this.inputDomNode.setAttribute("type","radio");
-	this.assignAttributes(this.inputDomNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	if(isChecked) {
 		this.inputDomNode.checked = true;
 	}

core/modules/widgets/range.js

@@ -50,10 +50,6 @@ RangeWidget.prototype.render = function(parent,nextSibling) {
 		this.inputDomNode.setAttribute("disabled",true);
 	}
 	this.inputDomNode.value = this.getValue();
-	this.assignAttributes(this.inputDomNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Add a click event handler
 	$tw.utils.addEventListeners(this.inputDomNode,[
 		{name:"mousedown", handlerObject:this, handlerMethod:"handleMouseDownEvent"},

core/modules/widgets/scrollable.js

@@ -12,8 +12,6 @@ Scrollable widget
 /*global $tw: false */
 "use strict";
 
-var DEBOUNCE_INTERVAL = 100; // Delay after last scroll event before updating the bound tiddler
-
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var ScrollableWidget = function(parseTreeNode,options) {
@@ -173,53 +171,6 @@ ScrollableWidget.prototype.render = function(parent,nextSibling) {
 	parent.insertBefore(this.outerDomNode,nextSibling);
 	this.renderChildren(this.innerDomNode,null);
 	this.domNodes.push(this.outerDomNode);
-	// If the scroll position is bound to a tiddler
-	if(this.scrollableBind) {
-		// After a delay for rendering, scroll to the bound position
-		this.updateScrollPositionFromBoundTiddler();
-		// Set up event listener
-		this.currentListener = this.listenerFunction.bind(this);
-		this.outerDomNode.addEventListener("scroll", this.currentListener);
-	}
-};
-
-ScrollableWidget.prototype.listenerFunction = function(event) {
-	self = this;
-	clearTimeout(this.timeout);
-	this.timeout = setTimeout(function() {
-		var existingTiddler = self.wiki.getTiddler(self.scrollableBind),
-			newTiddlerFields = {
-				title: self.scrollableBind,
-				"scroll-left": self.outerDomNode.scrollLeft.toString(),
-				"scroll-top": self.outerDomNode.scrollTop.toString()
-			};
-		if(!existingTiddler || (existingTiddler.fields["title"] !== newTiddlerFields["title"]) || (existingTiddler.fields["scroll-left"] !== newTiddlerFields["scroll-left"] || existingTiddler.fields["scroll-top"] !== newTiddlerFields["scroll-top"])) {
-			self.wiki.addTiddler(new $tw.Tiddler(existingTiddler,newTiddlerFields));
-		}
-	}, DEBOUNCE_INTERVAL);
-}
-
-ScrollableWidget.prototype.updateScrollPositionFromBoundTiddler = function() {
-	// Bail if we're running on the fakedom
-	if(!this.outerDomNode.scrollTo) {
-		return;
-	}
-	var tiddler = this.wiki.getTiddler(this.scrollableBind);
-	if(tiddler) {
-		var scrollLeftTo = this.outerDomNode.scrollLeft;
-		if(parseFloat(tiddler.fields["scroll-left"]).toString() === tiddler.fields["scroll-left"]) {
-			scrollLeftTo = parseFloat(tiddler.fields["scroll-left"]);
-		}
-		var scrollTopTo = this.outerDomNode.scrollTop;
-		if(parseFloat(tiddler.fields["scroll-top"]).toString() === tiddler.fields["scroll-top"]) {
-			scrollTopTo = parseFloat(tiddler.fields["scroll-top"]);
-		}
-		this.outerDomNode.scrollTo({
-			top: scrollTopTo,
-			left: scrollLeftTo,
-			behavior: "instant"
-		})
-	}
 };
 
 /*
@@ -227,7 +178,6 @@ Compute the internal state of the widget
 */
 ScrollableWidget.prototype.execute = function() {
 	// Get attributes
-	this.scrollableBind = this.getAttribute("bind");
 	this.fallthrough = this.getAttribute("fallthrough","yes");
 	this["class"] = this.getAttribute("class");
 	// Make child widgets
@@ -243,22 +193,7 @@ ScrollableWidget.prototype.refresh = function(changedTiddlers) {
 		this.refreshSelf();
 		return true;
 	}
-	// If the bound tiddler has changed, update the eventListener and update scroll position
+	return this.refreshChildren(changedTiddlers);
-	if(changedAttributes["bind"]) {
-		if(this.currentListener) {
-			this.outerDomNode.removeEventListener("scroll", this.currentListener, false);
-		}
-		this.scrollableBind = this.getAttribute("bind");
-		this.currentListener = this.listenerFunction.bind(this);
-		this.outerDomNode.addEventListener("scroll", this.currentListener);
-	}
-	// Refresh children
-	var result = this.refreshChildren(changedTiddlers);
-	// If the bound tiddler has changed, update scroll position
-	if(changedAttributes["bind"] || changedTiddlers[this.getAttribute("bind")]) {
-		this.updateScrollPositionFromBoundTiddler();
-	}
-	return result;
 };
 
 exports.scrollable = ScrollableWidget;

core/modules/widgets/select.js

@@ -40,31 +40,7 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
 	this.computeAttributes();
 	this.execute();
-	//Create element
+	this.renderChildren(parent,nextSibling);
-	var domNode = this.document.createElement("select");
-	if(this.selectClass) {
-		domNode.className = this.selectClass;
-	}
-	// Assign data- attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
-	if(this.selectMultiple) {
-		domNode.setAttribute("multiple","multiple");
-	}
-	if(this.selectSize) {
-		domNode.setAttribute("size",this.selectSize);
-	}
-	if(this.selectTabindex) {
-		domNode.setAttribute("tabindex",this.selectTabindex);
-	}
-	if(this.selectTooltip) {
-		domNode.setAttribute("title",this.selectTooltip);
-	}
-	this.parentDomNode.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
-	this.domNodes.push(domNode);
 	this.setSelectValue();
 	if(this.selectFocus == "yes") {
 		this.getSelectDomNode().focus();
@@ -137,7 +113,7 @@ SelectWidget.prototype.setSelectValue = function() {
 Get the DOM node of the select element
 */
 SelectWidget.prototype.getSelectDomNode = function() {
-	return this.domNodes[0];
+	return this.children[0].domNodes[0];
 };
 
 // Return an array of the selected opion values
@@ -173,7 +149,27 @@ SelectWidget.prototype.execute = function() {
 	this.selectTooltip = this.getAttribute("tooltip");
 	this.selectFocus = this.getAttribute("focus");
 	// Make the child widgets
-	this.makeChildWidgets();
+	var selectNode = {
+		type: "element",
+		tag: "select",
+		children: this.parseTreeNode.children
+	};
+	if(this.selectClass) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"class",this.selectClass);
+	}
+	if(this.selectMultiple) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"multiple","multiple");
+	}
+	if(this.selectSize) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"size",this.selectSize);
+	}
+	if(this.selectTabindex) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"tabindex",this.selectTabindex);
+	}
+	if(this.selectTooltip) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"title",this.selectTooltip);
+	}
+	this.makeChildWidgets([selectNode]);
 };
 
 /*
@@ -182,21 +178,17 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 SelectWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
 	// If we're using a different tiddler/field/index then completely refresh ourselves
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tooltip || changedAttributes.tabindex) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tooltip) {
 		this.refreshSelf();
 		return true;
+	// If the target tiddler value has changed, just update setting and refresh the children
 	} else {
 		if(changedAttributes.class) {
 			this.selectClass = this.getAttribute("class");
 			this.getSelectDomNode().setAttribute("class",this.selectClass); 
 		}
-		this.assignAttributes(this.getSelectDomNode(),{
+		
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
 		var childrenRefreshed = this.refreshChildren(changedTiddlers);
-		// If the target tiddler value has changed, just update setting and refresh the children
 		if(changedTiddlers[this.selectTitle] || childrenRefreshed) {
 			this.setSelectValue();
 		} 

core/modules/widgets/widget.js

@@ -153,7 +153,7 @@ Widget.prototype.getVariableInfo = function(name,options) {
 		} else if(variable.isFunctionDefinition) {
 			// Function evaluations
 			params = self.resolveVariableParameters(variable.params,actualParams);
-			var variables = options.variables || Object.create(null);
+			var variables = Object.create(null);
 			// Apply default parameter values
 			$tw.utils.each(variable.params,function(param,index) {
 				if(param["default"]) {
@@ -413,34 +413,16 @@ Widget.prototype.getAttribute = function(name,defaultText) {
 };
 
 /*
-Assign the common attributes of the widget to a domNode
+Assign the computed attributes of the widget to a domNode
 options include:
-sourcePrefix: prefix of attributes that are to be directly assigned (defaults to the empty string meaning all attributes)
+excludeEventAttributes: ignores attributes whose name begins with "on"
-destPrefix: prefix to be applied to attribute names that are to be directly assigned (defaults to the emtpy string which means no prefix is added)
-changedAttributes: hashmap by attribute name of attributes to process (if missing, process all attributes)
-excludeEventAttributes: ignores attributes whose name would begin with "on"
 */
 Widget.prototype.assignAttributes = function(domNode,options) {
 	options = options || {};
-	var self = this,
+	var self = this;
-		changedAttributes = options.changedAttributes || this.attributes,
-		sourcePrefix = options.sourcePrefix || "",
-		destPrefix = options.destPrefix || "",
-		EVENT_ATTRIBUTE_PREFIX = "on";
 	var assignAttribute = function(name,value) {
-		// Process any style attributes before considering sourcePrefix and destPrefix
-		if(name.substr(0,6) === "style." && name.length > 6) {
-			domNode.style[$tw.utils.unHyphenateCss(name.substr(6))] = value;
-			return;
-		}
-		// Check if the sourcePrefix is a match
-		if(name.substr(0,sourcePrefix.length) === sourcePrefix) {
-			name = destPrefix + name.substr(sourcePrefix.length);
-		} else {
-			value = undefined;
-		}
 		// Check for excluded attribute names
-		if(options.excludeEventAttributes && name.substr(0,2).toLowerCase() === EVENT_ATTRIBUTE_PREFIX) {
+		if(options.excludeEventAttributes && name.substr(0,2) === "on") {
 			value = undefined;
 		}
 		if(value !== undefined) {
@@ -450,24 +432,26 @@ Widget.prototype.assignAttributes = function(domNode,options) {
 				namespace = "http://www.w3.org/1999/xlink";
 				name = name.substr(6);
 			}
-			// Setting certain attributes can cause a DOM error (eg xmlns on the svg element)
+			// Handle styles
-			try {
+			if(name.substr(0,6) === "style." && name.length > 6) {
-				domNode.setAttributeNS(namespace,name,value);
+				domNode.style[$tw.utils.unHyphenateCss(name.substr(6))] = value;
-			} catch(e) {
+			} else {
+				// Setting certain attributes can cause a DOM error (eg xmlns on the svg element)
+				try {
+					domNode.setAttributeNS(namespace,name,value);
+				} catch(e) {
+				}
 			}
 		}
-	};
+	}
-	// If the parse tree node has the orderedAttributes property then use that order
+	// Not all parse tree nodes have the orderedAttributes property
 	if(this.parseTreeNode.orderedAttributes) {
 		$tw.utils.each(this.parseTreeNode.orderedAttributes,function(attribute,index) {
-			if(attribute.name in changedAttributes) {
+			assignAttribute(attribute.name,self.attributes[attribute.name]);
-				assignAttribute(attribute.name,self.getAttribute(attribute.name));
+		});	
-			}
-		});
-	// Otherwise update each changed attribute irrespective of order
 	} else {
-		$tw.utils.each(changedAttributes,function(value,name) {
+		$tw.utils.each(Object.keys(self.attributes).sort(),function(name) {
-			assignAttribute(name,self.getAttribute(name));
+			assignAttribute(name,self.attributes[name]);
 		});	
 	}
 };

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"),
+		backlinksIndexer = this.getIndexer("BacklinksIndexer"),
-		backlinks = backIndexer && backIndexer.subIndexers.link.lookup(targetTitle);
+		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
 */
@@ -1349,7 +1287,7 @@ exports.search = function(text,options) {
 			console.log("Regexp error parsing /(" + text + ")/" + flags + ": ",e);
 		}
 	} else if(options.some) {
-		terms = text.trim().split(/[^\S\xA0]+/);
+		terms = text.trim().split(/ +/);
 		if(terms.length === 1 && terms[0] === "") {
 			searchTermsRegExps = null;
 		} else {
@@ -1360,7 +1298,7 @@ exports.search = function(text,options) {
 			searchTermsRegExps.push(new RegExp("(" + regExpStr + ")",flags));
 		}
 	} else { // default: words
-		terms = text.split(/[^\S\xA0]+/);
+		terms = text.split(/ +/);
 		if(terms.length === 1 && terms[0] === "") {
 			searchTermsRegExps = null;
 		} else {

core/templates/html-json-skinny-tiddler.tid

@@ -1,3 +1,4 @@
 title: $:/core/templates/html-json-skinny-tiddler
 
-<$text text=<<join>>/><$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>
+<$list filter="[<numTiddlers>compare:number:gteq[1]] ~[<counter>!match[1]]">`,`<$text text=<<newline>>/></$list>
+<$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>

core/templates/html-json-tiddler.tid

@@ -1,3 +1,3 @@
 title: $:/core/templates/html-json-tiddler
 
-<$jsontiddler tiddler=<<currentTiddler>> escapeUnsafeScriptChars="yes"/>
+<$list filter="[<counter>!match[1]]">`,`<$text text=<<newline>>/></$list><$jsontiddler tiddler=<<currentTiddler>> escapeUnsafeScriptChars="yes"/>

core/templates/store.area.template.html.tid

@@ -6,12 +6,14 @@ title: $:/core/templates/store.area.template.html
     <$list filter="[[storeAreaFormat]is[variable]getvariable[]else[json]match[json]]">
         <!-- New-style JSON store area, with an old-style store area for compatibility with v5.1.x tooling -->
         `<script class="tiddlywiki-tiddler-store" type="application/json">[`
-            <$let newline={{{ [charcode[10]] }}} join=`,$(newline)$`>
+            <$vars newline={{{ [charcode[10]] }}}>
                 <$text text=<<newline>>/>
-                <$list filter=<<saveTiddlerFilter>> join=<<join>> template="$:/core/templates/html-json-tiddler"/>
+                <$list filter=<<saveTiddlerFilter>> counter="counter" template="$:/core/templates/html-json-tiddler"/>
-                <$list filter="[subfilter<skinnySaveTiddlerFilter>]"  template="$:/core/templates/html-json-skinny-tiddler"/>
+                <$vars numTiddlers={{{ [subfilter<saveTiddlerFilter>count[]] }}}>
+                    <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} counter="counter" template="$:/core/templates/html-json-skinny-tiddler"/>
+                </$vars>
                 <$text text=<<newline>>/>
-            </$let>
+            </$vars>
         `]</script>`
         `<div id="storeArea" style="display:none;">`
         `</div>`
@@ -20,8 +22,8 @@ title: $:/core/templates/store.area.template.html
         <!-- Old-style DIV/PRE-based store area -->
         <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
             `<div id="storeArea" style="display:none;">`
-                <$list filter={{{ [<saveTiddlerFilter>] }}} template="$:/core/templates/html-div-tiddler"/>
+                <$list filter=<<saveTiddlerFilter>> template="$:/core/templates/html-div-tiddler"/>
-                <$list filter="[subfilter<skinnySaveTiddlerFilter>]" template="$:/core/templates/html-div-skinny-tiddler"/>
+                <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} template="$:/core/templates/html-div-skinny-tiddler"/>
             `</div>`
         </$reveal>
     </$list>

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/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"
+<$checkbox tiddler="$:/config/DownloadSaver/AutoSave" field="text" checked="yes" unchecked="no" default="no"> <<lingo AutoSave/Description>> </$checkbox>
-	field="text" checked="yes" unchecked="no" default="no"
-	class="tc-control-panel-item"
->
-	<span class="tc-tiny-gap-left"><<lingo AutoSave/Description>></span>
-</$checkbox>
-</div>

core/ui/ControlPanel/Saving/General.tid

@@ -3,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">
+<$radio tiddler="$:/config/AutoSave" value="yes"> <<lingo AutoSave/Enabled/Description>> </$radio>
-	<span class="tc-tiny-gap-left"><<lingo AutoSave/Enabled/Description>></span>
-</$radio>
 
-<$radio tiddler="$:/config/AutoSave" value="no">
+<$radio tiddler="$:/config/AutoSave" value="no"> <<lingo AutoSave/Disabled/Description>> </$radio>
-	<span class="tc-tiny-gap-left"><<lingo AutoSave/Disabled/Description>></span>
-</$radio>
-</div>

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

core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid

@@ -2,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">
+<$link to="$:/config/DefaultMoreSidebarTab"><<lingo Hint>></$link>
-	<<lingo Hint>>
-</$link>
 
-<$select tiddler="$:/config/DefaultMoreSidebarTab" class="tc-select">
+<$select tiddler="$:/config/DefaultMoreSidebarTab">
-	<$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]">
-		<option value=<<currentTiddler>>><$transclude field="caption">
+<option value=<<currentTiddler>>><$transclude field="caption"><$text text=<<currentTiddler>>/></$transclude></option>
-			<$text text=<<currentTiddler>>/>
+</$list>
-			</$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">
+<$link to="$:/config/DefaultSidebarTab"><<lingo Hint>></$link>
-	<<lingo Hint>>
-</$link>
 
-<$select tiddler="$:/config/DefaultSidebarTab" class="tc-select">
+<$select tiddler="$:/config/DefaultSidebarTab">
-	<$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]">
-		<option value=<<currentTiddler>>>
+<option value=<<currentTiddler>>><$transclude field="caption"><$text text=<<currentTiddler>>/></$transclude></option>
-			<$transclude field="caption">
+</$list>
-				<$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"
+<$checkbox tiddler="$:/config/TextEditor/EnableToolbar" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/TextEditor/EnableToolbar"><<lingo Description>></$link> </$checkbox>
-	field="text" checked="yes" unchecked="no" default="yes"
+
-	class="tc-control-panel-item"
->
-	<$link to="$:/config/TextEditor/EnableToolbar" class="tc-tiny-gap-left">
-		<<lingo Description>>
-	</$link>
-</$checkbox>

core/ui/ControlPanel/Settings/InfoPanelMode.tid

@@ -2,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">
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="popup"> <<lingo Popup/Description>> </$radio>
-	<<lingo Hint>>
-</$link>
 
-<$radio tiddler="$:/config/TiddlerInfo/Mode" value="popup">
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="sticky"> <<lingo Sticky/Description>> </$radio>
-	<span class="tc-tiny-gap-left"><<lingo Popup/Description>></span>
-</$radio>
-
-<$radio tiddler="$:/config/TiddlerInfo/Mode" value="sticky">
-	<span class="tc-tiny-gap-left"><<lingo Sticky/Description>></span>
-</$radio>

core/ui/ControlPanel/Settings/LinkToBehaviour.tid

@@ -2,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">
+<$link to="$:/config/Navigation/openLinkFromInsideRiver"><<lingo "InsideRiver/Hint">></$link>
-	<<lingo "InsideRiver/Hint">>
-</$link>
 
-<$select tiddler="$:/config/Navigation/openLinkFromInsideRiver" class="tc-select">
+<$select tiddler="$:/config/Navigation/openLinkFromInsideRiver">
-	<option value="above"><<lingo "OpenAbove">></option>
+  <option value="above"><<lingo "OpenAbove">></option>
-	<option value="below"><<lingo "OpenBelow">></option>
+  <option value="below"><<lingo "OpenBelow">></option>
-	<option value="top"><<lingo "OpenAtTop">></option>
+  <option value="top"><<lingo "OpenAtTop">></option>
-	<option value="bottom"><<lingo "OpenAtBottom">></option>
+  <option value="bottom"><<lingo "OpenAtBottom">></option>
 </$select>
 
-<$link to="$:/config/Navigation/openLinkFromOutsideRiver" class="tc-control-panel-item">
+<$link to="$:/config/Navigation/openLinkFromOutsideRiver"><<lingo "OutsideRiver/Hint">></$link>
-	<<lingo "OutsideRiver/Hint">>
-</$link>
 
-<$select tiddler="$:/config/Navigation/openLinkFromOutsideRiver" class="tc-select">
+<$select tiddler="$:/config/Navigation/openLinkFromOutsideRiver">
-	<option value="top"><<lingo "OpenAtTop">></option>
+  <option value="top"><<lingo "OpenAtTop">></option>
-	<option value="bottom"><<lingo "OpenAtBottom">></option>
+  <option value="bottom"><<lingo "OpenAtBottom">></option>
 </$select>

core/ui/ControlPanel/Settings/MissingLinks.tid

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

core/ui/ControlPanel/Settings/NavigationAddressBar.tid

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

core/ui/ControlPanel/Settings/NavigationPermalinkviewMode.tid

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

core/ui/ControlPanel/Settings/PerformanceInstrumentation.tid

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

core/ui/ControlPanel/Settings/TitleLinks.tid

@@ -2,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">
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="yes"> <<lingo Yes/Description>> </$radio>
-	<<lingo Hint>>
-</$link>
 
-<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="yes">
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="no"> <<lingo No/Description>> </$radio>
-	<span class="tc-tiny-gap-left"><<lingo Yes/Description>></span>
-</$radio>
-
-<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="no">
-	<span class="tc-tiny-gap-left"><<lingo No/Description>></span>
-</$radio>

core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid

@@ -2,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">
+<$select tiddler="$:/config/Toolbar/ButtonClass">
-	<<lingo "Hint">>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ToolbarButtonStyle]]">
-</$link>
+<option value={{!!text}}>{{!!caption}}</option>
-
+</$list>
-<$select tiddler="$:/config/Toolbar/ButtonClass" class="tc-select">
-	<$list filter="[all[shadows+tiddlers]tag[$:/tags/ToolbarButtonStyle]]">
-		<option value={{!!text}}>{{!!caption}}</option>
-	</$list>
 </$select>

core/ui/ControlPanel/Settings/ToolbarButtons.tid

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

core/ui/ControlPanel/TiddlyWiki.tid

@@ -9,9 +9,9 @@ list-before:
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]">
 
-<div 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,7 +1,7 @@
 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]]
+[{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] +[get[text]] :else[[no]]
 \end
 
 \define config-visibility-title()
@@ -14,17 +14,15 @@ $:/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>] }}}
 	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={{{ [function[edit-preview-state]match[yes]then[tc-tiddler-preview]] +[join[ ]] }}}>
 
 <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
 
-<$list filter="[<editPreviewStateTiddler>get[text]match[yes]]" variable="ignore">
+<$list filter="[function[edit-preview-state]match[yes]]" variable="ignore">
 
 <div class="tc-tiddler-preview-preview" data-tiddler-title={{!!draft.title}} data-tags={{!!tags}}>
 

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"/>
+<$view field="title"/>
-	<span class="tc-tiddler-controls tc-titlebar">
+<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>
-		<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem">
+<div style="clear: both;"></div>
-			<$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/fields.tid

@@ -54,7 +54,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 \whitespace trim
 <$vars name={{{ [<newFieldNameTiddler>get[text]] }}}>
 <$reveal type="nomatch" text="" default=<<name>>>
-<$button tooltip={{$:/language/EditTemplate/Fields/Add/Button/Hint}}>
+<$button tooltip=<<lingo Fields/Add/Button/Hint>>>
 <$action-sendmessage $message="tm-add-field"
 $name=<<name>>
 $value={{{ [subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
@@ -89,7 +89,7 @@ $value={{{ [subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
 </td>
 <td class="tc-edit-field-remove">
 <$button class="tc-btn-invisible" tooltip={{$:/language/EditTemplate/Field/Remove/Hint}} aria-label={{$:/language/EditTemplate/Field/Remove/Caption}}>
-<$action-deletefield $field=<<currentField>>/>
+<$action-deletefield $field=<<currentField>>/><$set name="currentTiddlerCSSescaped" value={{{ [<currentTiddler>escapecss[]] }}}><$action-sendmessage $message="tm-focus-selector" $param=<<current-tiddler-new-field-selector>>/></$set>
 {{$:/core/images/delete-button}}
 </$button>
 </td>

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

core/ui/EditorToolbar/preview.tid

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

core/ui/PageControls.tid

@@ -1,16 +1,17 @@
 title: $:/core/ui/PageTemplate/pagecontrols
 
 \whitespace trim
-\define config-title() $:/config/PageControlButtons/Visibility/$(listItem)$
+\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="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-		<$set name="hidden" value=<<config-title>>>
+<$set name="hidden" value=<<config-title>>>
-			<$list filter="[<hidden>!text[hide]]" storyview="pop" variable="ignore">
+<$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-]]">
+<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
-					<$transclude tiddler=<<listItem>> mode="inline"/>
+<$transclude tiddler=<<listItem>> mode="inline"/>
-				</$set>
+</$set>
-			</$list>
+</$list>
-		</$set>
+</$set>
-	</$list>
+</$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/ViewTemplate/subtitle.tid

@@ -4,8 +4,11 @@ tags: $:/tags/ViewTemplate
 \whitespace trim
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
 <div class="tc-subtitle">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler" counter="indexSubtitleTiddler">
-<$transclude tiddler=<<subtitleTiddler>> mode="inline"/><$list-join>&nbsp;</$list-join>
+<$list filter="[<indexSubtitleTiddler-first>match[no]]" variable="ignore">
+&nbsp;
+</$list>
+<$transclude tiddler=<<subtitleTiddler>> mode="inline"/>
 </$list>
 </div>
 </$reveal>

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

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)$
+\define config-title()
-
+$:/config/ViewToolbarButtons/Visibility/$(listItem)$
-<$button popup=<<qualify "$:/state/popup/more">>
+\end
-	tooltip={{$:/language/Buttons/More/Hint}}
+<$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">
-	aria-label={{$:/language/Buttons/More/Caption}}
+<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-	class=<<tv-config-toolbar-class>>
+{{$:/core/images/down-arrow}}
-	selectedClass="tc-selected"
+</$list>
->
+<$list filter="[<tv-config-toolbar-text>match[yes]]">
-	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<span class="tc-btn-text">
-		{{$:/core/images/down-arrow}}
+<$text text={{$:/language/Buttons/More/Caption}}/>
-	</$list>
+</span>
-	<$list filter="[<tv-config-toolbar-text>match[yes]]">
+</$list>
-		<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">
+<div class="tc-drop-down">
-			<$set name="tv-config-toolbar-text" value="yes">
+
-				<$set name="tv-config-toolbar-class" value="tc-btn-invisible">
+<$set name="tv-config-toolbar-icons" value="yes">
-					<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] -[[$:/core/ui/Buttons/more-tiddler-actions]]"
+
-						variable="listItem"
+<$set name="tv-config-toolbar-text" value="yes">
-					>
+
-						<$reveal type="match" state=<<config-title>> text="hide">
+<$set name="tv-config-toolbar-class" value="tc-btn-invisible">
-							<$set name="tv-config-toolbar-class"
+
-								filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] -[[$:/core/ui/Buttons/more-tiddler-actions]]" variable="listItem">
-							>
+
-								<$transclude tiddler=<<listItem>> mode="inline"/>
+<$reveal type="match" state=<<config-title>> text="hide">
-							</$set>
+
-						</$reveal>
+<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
-					</$list>
+
-				</$set>
+<$transclude tiddler=<<listItem>> mode="inline"/>
-			</$set>
+
-		</$set>
+</$set>
-	</div>
+
+</$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.3/index.html
+url: https://tiddlywiki.com/library/v5.3.2/index.html
 caption: {{$:/language/OfficialPluginLibrary}}
 
 {{$:/language/OfficialPluginLibrary/Hint}}

core/wiki/macros/CSS.tid

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

core/wiki/macros/colour-picker.tid

@@ -13,7 +13,7 @@ tags: $:/tags/Macro
 
 $(colour-picker-update-recent)$
 
-<$transclude $variable="__actions__"/>
+$actions$
 
 <span style="display:inline-block; background-color: $(colour-picker-value)$; width: 100%; height: 100%; border-radius: 50%;"/>
 
@@ -23,7 +23,7 @@ $(colour-picker-update-recent)$
 \define colour-picker-recent-inner(actions)
 \whitespace trim
 <$set name="colour-picker-value" value="$(recentColour)$">
-<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
+<$macrocall $name="colour-picker-inner" actions="""$actions$"""/>
 </$set>
 \end
 
@@ -31,7 +31,7 @@ $(colour-picker-update-recent)$
 \whitespace trim
 {{$:/language/ColourPicker/Recent}}<$list filter="[list[$:/config/ColourPicker/Recent]]" variable="recentColour">
 &#32;
-<$macrocall $name="colour-picker-recent-inner" actions=<<__actions__>>/>
+<$macrocall $name="colour-picker-recent-inner" actions="""$actions$"""/>
 </$list>
 \end
 
@@ -39,13 +39,13 @@ $(colour-picker-update-recent)$
 \whitespace trim
 <div class="tc-colour-chooser">
 
-<$macrocall $name="colour-picker-recent" actions=<<__actions__>>/>
+<$macrocall $name="colour-picker-recent" actions="""$actions$"""/>
 
 ---
 
 <$list filter="LightPink Pink Crimson LavenderBlush PaleVioletRed HotPink DeepPink MediumVioletRed Orchid Thistle Plum Violet Magenta Fuchsia DarkMagenta Purple MediumOrchid DarkViolet DarkOrchid Indigo BlueViolet MediumPurple MediumSlateBlue SlateBlue DarkSlateBlue Lavender GhostWhite Blue MediumBlue MidnightBlue DarkBlue Navy RoyalBlue CornflowerBlue LightSteelBlue LightSlateGrey SlateGrey DodgerBlue AliceBlue SteelBlue LightSkyBlue SkyBlue DeepSkyBlue LightBlue PowderBlue CadetBlue Azure LightCyan PaleTurquoise Cyan Aqua DarkTurquoise DarkSlateGrey DarkCyan Teal MediumTurquoise LightSeaGreen Turquoise Aquamarine MediumAquamarine MediumSpringGreen MintCream SpringGreen MediumSeaGreen SeaGreen Honeydew LightGreen PaleGreen DarkSeaGreen LimeGreen Lime ForestGreen Green DarkGreen Chartreuse LawnGreen GreenYellow DarkOliveGreen YellowGreen OliveDrab Beige LightGoldenrodYellow Ivory LightYellow Yellow Olive DarkKhaki LemonChiffon PaleGoldenrod Khaki Gold Cornsilk Goldenrod DarkGoldenrod FloralWhite OldLace Wheat Moccasin Orange PapayaWhip BlanchedAlmond NavajoWhite AntiqueWhite Tan BurlyWood Bisque DarkOrange Linen Peru PeachPuff SandyBrown Chocolate SaddleBrown Seashell Sienna LightSalmon Coral OrangeRed DarkSalmon Tomato MistyRose Salmon Snow LightCoral RosyBrown IndianRed Red Brown FireBrick DarkRed Maroon White WhiteSmoke Gainsboro LightGrey Silver DarkGrey Grey DimGrey Black" variable="colour-picker-value">
 &#32;
-<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
+<$macrocall $name="colour-picker-inner" actions="""$actions$"""/>
 </$list>
 
 ---
@@ -54,7 +54,7 @@ $(colour-picker-update-recent)$
 &#32;
 <$edit-text tiddler="$:/config/ColourPicker/New" type="color" tag="input"/>
 <$set name="colour-picker-value" value={{$:/config/ColourPicker/New}}>
-<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
+<$macrocall $name="colour-picker-inner" actions="""$actions$"""/>
 </$set>
 
 </div>

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
-
+<$button class=<<__class__>> style=<<__style__>> message="tm-copy-to-clipboard" param=<<__src__>> tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}>
-\procedure copy-to-clipboard(src,class:"tc-btn-invisible",style)
+{{$:/core/images/copy-clipboard}}
-<$button message="tm-copy-to-clipboard"
+&#32;
-	param=<<src>>
+<$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
-	class=<<class>>
-	style=<<style>>
-	tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}
->
-	{{$:/core/images/copy-clipboard}}
-	<span class="tc-tiny-gap-left">
-		<$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
-	</span>
 </$button>
 \end
 
-\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;">
+<div style="position: absolute; bottom: 0; right: 0;">
-		<$macrocall $name="copy-to-clipboard" src=<<src>> class=<<class>> style=<<style>>/>
+<$macrocall $name="copy-to-clipboard" src=<<__src__>> class=<<__class__>> style=<<__style__>>/>
-	</div>
+</div>
 </div>
 \end

core/wiki/macros/diff.tid

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

core/wiki/macros/image-picker.tid

@@ -5,13 +5,13 @@ title: $:/core/macros/image-picker
 type: text/vnd.tiddlywiki
 
 \define image-picker-thumbnail(actions)
-<$button tag="a" tooltip="""$(imageTitle)$"""><$transclude $variable="__actions__"/><$transclude tiddler=<<imageTitle>>/></$button>
+<$button tag="a" tooltip="""$(imageTitle)$""">$actions$<$transclude tiddler=<<imageTitle>>/></$button>
 \end
 
 \define image-picker-list(filter,actions)
 \whitespace trim
 <$list filter="""$filter$""" variable="imageTitle">
-<$macrocall $name="image-picker-thumbnail" actions=<<__actions__>>/>
+<$macrocall $name="image-picker-thumbnail" actions="""$actions$"""/>
 &#32;
 </$list>
 \end
@@ -25,15 +25,15 @@ type: text/vnd.tiddlywiki
 {{$:/language/SystemTiddlers/Include/Prompt}}
 </$checkbox>
 <$reveal state=<<state-system>> type="match" text="hide" default="hide" tag="div">
-<$macrocall $name="image-picker-list" filter="""$filter$ +[!is[system]]""" actions=<<__actions__>>/>
+<$macrocall $name="image-picker-list" filter="""$filter$ +[!is[system]]""" actions="""$actions$"""/>
 </$reveal>
 <$reveal state=<<state-system>> type="nomatch" text="hide" default="hide" tag="div">
-<$macrocall $name="image-picker-list" filter="""$filter$""" actions=<<__actions__>>/>
+<$macrocall $name="image-picker-list" filter="""$filter$""" actions="""$actions$"""/>
 </$reveal>
 </$vars>
 </div>
 \end
 
 \define image-picker-include-tagged-images(actions)
-<$macrocall $name="image-picker" filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[!has[draft.of]sort[title]]" actions=<<__actions__>>/>
+<$macrocall $name="image-picker" filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[!has[draft.of]sort[title]]" actions="""$actions$"""/>
 \end

core/wiki/macros/list.tid

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

core/wiki/macros/tabs.tid

@@ -4,15 +4,7 @@ code-body: yes
 
 \define tabs-button()
 \whitespace trim
-<$button
+<$button set=<<tabsState>> setTo=<<currentTab>> default=<<__default__>> selectedClass="tc-tab-selected" tooltip={{!!tooltip}} role="switch">
-	set=<<tabsState>>
-	setTo=<<currentTab>>
-	default=<<__default__>>
-	selectedClass="tc-tab-selected"
-	tooltip={{!!tooltip}}
-	role="switch"
-	data-tab-title=<<currentTab>>
->
 	<$tiddler tiddler=<<save-currentTiddler>>>
 		<$set name="tv-wikilinks" value="no">
 			<$transclude tiddler=<<__buttonTemplate__>> mode="inline">

core/wiki/macros/tag-picker.tid

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

core/wiki/macros/toc.tid

@@ -118,7 +118,7 @@ tags: $:/tags/Macro
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item" >
     <li class=<<toc-item-class>>>
       <$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}>
-          <$list filter="[all[current]tagging[]$sort$limit[1]]  -[subfilter<__exclude__>]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>">
+          <$list filter="[all[current]tagging[]$sort$limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>">
           <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
             <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
             <$transclude tiddler=<<toc-closed-icon>> />
@@ -145,7 +145,7 @@ tags: $:/tags/Macro
 <$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix<currentTiddler>] }}}>
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
     <li class=<<toc-item-class>>>
-      <$list filter="[all[current]tagging[]$sort$limit[1]] -[subfilter<__exclude__>]" variable="ignore" emptyMessage="""<$button class="tc-btn-invisible">{{$:/core/images/blank}}</$button><span class="toc-item-muted"><<toc-caption>></span>""">
+      <$list filter="[all[current]tagging[]$sort$limit[1]]" variable="ignore" emptyMessage="""<$button class="tc-btn-invisible">{{$:/core/images/blank}}</$button><span class="toc-item-muted"><<toc-caption>></span>""">
         <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
           <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
             <$transclude tiddler=<<toc-closed-icon>> />

editions/de-AT/tiddlers/HelloThere.tid

@@ -21,8 +21,8 @@ Willkommen bei ''~TiddlyWiki'', dem einzigartigen [[nicht-linearen|Philosophy vo
 Anders, als bei herkömmlichen Online-Diensten, lässt Ihnen ~TiddlyWiki die Freiheit, wo sie ihre Daten speichern. Da ~TiddlyWiki alle Daten als simplen Text speichert, sind Notizen, die Sie heute machen, garantiert in Jahrzehnten noch einfach lesbar. 
 
 <div style="font-size:0.7em;text-align:center;margin-top:3em;margin-bottom:3em;">
-<a href="https://talk.tiddlywiki.org/" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank">
+<a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank">
-{{$:/core/images/help}} ~TiddlyWiki Forum
+{{$:/core/images/mail}} ~TiddlyWiki Mailing List
 </a>
 <a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank">
 {{$:/core/images/twitter}} @~TiddlyWiki on Twitter

editions/de-AT/tiddlers/community/Fur_Entwickler.tid

@@ -7,5 +7,5 @@ type: text/vnd.tiddlywiki
 Es gibt mehrere Ressourcen für Entwickler, um mehr über das TiddlyWiki Projekt zu erfahren, zu diskutieren und vor allem mitzuhelfen. 
 
 * [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] Offizielle Entwickler Doku.
-* [[TiddlyWikiDev group|https://talk.tiddlywiki.org/c/devs/]] Diskussionsforum für Entwickler.
+* [[TiddlyWikiDev group|http://groups.google.com/group/TiddlyWikiDev]] Google Diskussionsforum für Entwickler.
 * https://github.com/Jermolene/TiddlyWiki5 .. Github Repository. 

editions/dev/tiddlers/HelloThere.tid

@@ -16,7 +16,6 @@ Welcome to the developer documentation for TiddlyWiki (https://tiddlywiki.com/).
 ** [[Adding Babel Polyfill to TiddlyWiki]]
 ** [[TiddlyWiki Drag and Drop Interoperability]]
 ** [[Javascript Widget Tutorial]]
-** [[Using TiddlyWiki as a library in another Node.js application]]
 * The original developer documentation from https://tiddlywiki.com:
 ** [[TiddlyWiki for Developers]]
 ** [[TiddlyWiki Coding Style Guidelines]]